Skip to content

Commit

Permalink
cleanup: rename oge to ocs in namespaces and file names
Browse files Browse the repository at this point in the history
  • Loading branch information
jgabler-hpc committed Jun 25, 2024
1 parent 8a6c909 commit ffe8a2e
Show file tree
Hide file tree
Showing 206 changed files with 1,102 additions and 1,102 deletions.
8 changes: 4 additions & 4 deletions source/clients/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
# source/clients/common
set(LIBRARY_NAME clientscommon)
set(LIBRARY_SOURCES
"oge_client_print.cc"
"oge_client_parse.cc"
"oge_client_cqueue.cc"
"oge_client_job.cc")
"ocs_client_print.cc"
"ocs_client_parse.cc"
"ocs_client_cqueue.cc"
"ocs_client_job.cc")
set(LIBRARY_INCLUDES "./" ${SGE_INCLUDES})

add_library(${LIBRARY_NAME} STATIC ${LIBRARY_SOURCES})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
#include "sched/valid_queue_user.h"

#include "msg_clients_common.h"
#include "oge_client_cqueue.h"
#include "oge_client_print.h"
#include "ocs_client_cqueue.h"
#include "ocs_client_print.h"
#include "uti/sge.h"

bool cqueue_calculate_summary(const lListElem *cqueue, const lList *exechost_list, const lList *centry_list,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#include "sgeobj/sge_var.h"

#include "get_path.h"
#include "oge_client_job.h"
#include "ocs_client_job.h"
#include "parse_qsub.h"

#include "msg_clients_common.h"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

#include "msg_clients_common.h"
#include "msg_common.h"
#include "oge_client_parse.h"
#include "ocs_client_parse.h"
#include "parse_job_cull.h"
#include "parse_qsub.h"
#include "sge_options.h"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
#include "sched/sge_complex_schedd.h"

#include "msg_clients_common.h"
#include "oge_client_job.h"
#include "oge_client_print.h"
#include "ocs_client_job.h"
#include "ocs_client_print.h"
#include "sig_handlers.h"
#include "uti/sge.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void sge_printf_header(u_long32 full_listing, u_long32 sge_ext);
/*
** for qhost_report_handler_t
*/
#include "../qhost/oge_qhost_print.h"
#include "../qhost/ocs_qhost_print.h"

int sge_print_jobs_queue(lListElem *qep, lList *job_list, const lList *pe_list, lList *user_list, lList *ehl, lList *cl,
int print_jobs_of_queue, u_long32 full_listing, const char *indent, u_long32 group_opt,
Expand Down
2 changes: 1 addition & 1 deletion source/clients/qacct/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#___INFO__MARK_END_NEW__

# source/clients/qacct
add_executable(qacct oge_qacct.cc ../../common/execution_states.cc
add_executable(qacct ocs_qacct.cc ../../common/execution_states.cc
../../common/sig_handlers.cc)
target_include_directories(qacct PRIVATE ${SGE_INCLUDES})
target_link_libraries(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#include "gdi/qm_name.h"
#include "gdi/sge_gdi.h"
#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "sched/sge_select_queue.h"

Expand Down
2 changes: 1 addition & 1 deletion source/clients/qalter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# source/clients/qalter
add_executable(
qalter
oge_qalter.cc
ocs_qalter.cc
../../common/parse_job_cull.cc
../../common/parse_qsub.cc
../../common/sig_handlers.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@

#include "gdi/sge_gdi.h"
#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "comm/commlib.h"

#include "sig_handlers.h"
#include "oge_client_job.h"
#include "ocs_client_job.h"
#include "usage.h"
#include "parse_qsub.h"
#include "symbols.h"
#include "oge_client_parse.h"
#include "ocs_client_parse.h"
#include "msg_common.h"
#include "msg_clients_common.h"
#include "msg_qalter.h"
Expand Down
12 changes: 6 additions & 6 deletions source/clients/qconf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
# source/clients/qconf
add_executable(
qconf
oge_qconf_cqueue.cc
oge_qconf_centry.cc
ocs_qconf_cqueue.cc
ocs_qconf_centry.cc
sge_qconf_hgroup.cc
oge_qconf_rqs.cc
oge_qconf.cc
oge_qconf_parse.cc
oge_qconf_acl.cc
ocs_qconf_rqs.cc
ocs_qconf.cc
ocs_qconf_parse.cc
ocs_qconf_acl.cc
../../common/sig_handlers.cc
../../common/sge_options.cc
../../common/usage.cc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
#include "sgeobj/sge_feature.h"

#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "comm/commlib.h"

#include "oge_qconf_parse.h"
#include "ocs_qconf_parse.h"
#include "sig_handlers.h"

extern char **environ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

#include "cull/cull.h"

#include "oge_qconf_acl.h"
#include "ocs_qconf_acl.h"
#include "msg_qconf.h"

/* - -- -- -- -- -- -- -- -- -- -- -- -- -- -
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

#include "msg_common.h"
#include "msg_qconf.h"
#include "oge_qconf_centry.h"
#include "ocs_qconf_centry.h"

static bool centry_provide_modify_context(lListElem **this_elem, lList **answer_list);

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include "gdi/sge_gdi.h"
#include "sgeobj/sge_daemonize.h"

#include "oge_qconf_cqueue.h"
#include "ocs_qconf_cqueue.h"
#include "msg_qconf.h"

static void insert_custom_complex_values_writer(spooling_field *fields);
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@
#include "sge.h"
#include "sge_options.h"
#include "usage.h"
#include "oge_qconf_acl.h"
#include "oge_qconf_parse.h"
#include "ocs_qconf_acl.h"
#include "ocs_qconf_parse.h"
#include "sge_qconf_hgroup.h"
#include "oge_qconf_centry.h"
#include "oge_qconf_cqueue.h"
#include "oge_qconf_rqs.h"
#include "ocs_qconf_centry.h"
#include "ocs_qconf_cqueue.h"
#include "ocs_qconf_rqs.h"
#include "msg_common.h"
#include "msg_clients_common.h"
#include "msg_qconf.h"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
#include "gdi/sge_gdi.h"
#include "gdi/sge_gdi.h"

#include "sgeobj/oge_DataStore.h"
#include "sgeobj/ocs_DataStore.h"
#include "sgeobj/sge_resource_quota.h"
#include "sgeobj/sge_answer.h"

#include "spool/flatfile/sge_flatfile.h"
#include "spool/flatfile/sge_flatfile_obj.h"

#include "oge_qconf_rqs.h"
#include "ocs_qconf_rqs.h"
#include "msg_common.h"
#include "msg_clients_common.h"
#include "msg_qconf.h"
Expand Down Expand Up @@ -485,7 +485,7 @@ bool
rqs_add_del_mod_via_gdi(lList *rqs_list, lList **answer_list, u_long32 gdi_command)
{
bool ret = false;
const lList *master_centry_list = *oge::DataStore::get_master_list(SGE_TYPE_CENTRY);
const lList *master_centry_list = *ocs::DataStore::get_master_list(SGE_TYPE_CENTRY);

DENTER(TOP_LAYER);

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion source/clients/qdel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#___INFO__MARK_END_NEW__

# source/clients/qdel
add_executable(qdel oge_qdel.cc ../../common/sge_options.cc ../../common/usage.cc)
add_executable(qdel ocs_qdel.cc ../../common/sge_options.cc ../../common/usage.cc)
target_include_directories(qdel PUBLIC ${SGE_INCLUDES})
target_link_libraries(
qdel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

#include "gdi/sge_gdi.h"
#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "comm/commlib.h"

Expand Down
2 changes: 1 addition & 1 deletion source/clients/qevent/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# source/clients/qevent
add_executable(
qevent oge_qevent.cc
qevent ocs_qevent.cc
../../common/sig_handlers.cc
../../common/sge_options.cc
../../common/usage.cc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@

#include "mir/sge_mirror.h"

#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "oge_qevent.h"
#include "ocs_qevent.h"
#include "sig_handlers.h"
#include "msg_clients_common.h"

Expand Down Expand Up @@ -480,7 +480,7 @@ int main(int argc, char *argv[])
sge_setup_sig_handlers(QEVENT);

// select primary DS
oge::DataStore::select_active_ds(oge::DataStore::Id::GLOBAL);
ocs::DataStore::select_active_ds(ocs::DataStore::Id::GLOBAL);

/* setup event client */
gdi_setup = gdi_client_setup_and_enroll(QEVENT, MAIN_THREAD, &alp);
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions source/clients/qhost/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# source/clients/qhost
add_executable(
qhost
oge_qhost.cc
oge_qhost_print.cc
ocs_qhost.cc
ocs_qhost_print.cc
../../common/sig_handlers.cc
../../common/sge_options.cc
../../common/usage.cc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
#include "sgeobj/sge_cull_xml.h"

#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "comm/commlib.h"

#include "basis_types.h"
#include "sig_handlers.h"
#include "oge_qhost_print.h"
#include "ocs_qhost_print.h"
#include "msg_common.h"
#include "msg_clients_common.h"
#include "msg_qhost.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
#include "basis_types.h"
#include "sge.h"
#include "sig_handlers.h"
#include "oge_client_print.h"
#include "oge_qhost_print.h"
#include "ocs_client_print.h"
#include "ocs_qhost_print.h"

#include "msg_common.h"
#include "msg_clients_common.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion source/clients/qmod/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#___INFO__MARK_END_NEW__

# source/clients/qmod
add_executable(qmod oge_qmod.cc ../../common/sig_handlers.cc
add_executable(qmod ocs_qmod.cc ../../common/sig_handlers.cc
../../common/sge_options.cc ../../common/usage.cc)
target_include_directories(qmod PRIVATE ${SGE_INCLUDES})
target_link_libraries(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "sgeobj/sge_qinstance_state.h"

#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "sge_options.h"
#include "sig_handlers.h"
Expand Down
4 changes: 2 additions & 2 deletions source/clients/qquota/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# source/clients/qquota
add_executable(
qquota
oge_qquota.cc
oge_qquota_print.cc
ocs_qquota.cc
ocs_qquota_print.cc
../../common/parse_job_cull.cc
../../common/parse_qsub.cc
../../common/sig_handlers.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
#include "sgeobj/sge_cull_xml.h"

#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "comm/commlib.h"

#include "sig_handlers.h"
#include "oge_qquota_print.h"
#include "oge_client_parse.h"
#include "ocs_qquota_print.h"
#include "ocs_client_parse.h"
#include "msg_common.h"
#include "msg_clients_common.h"
#include "msg_qquota.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
#include "sgeobj/sge_daemonize.h"

#include "basis_types.h"
#include "../qstat/oge_qstat_filter.h"
#include "oge_qquota_print.h"
#include "../qstat/ocs_qstat_filter.h"
#include "ocs_qquota_print.h"
#include "sge.h"

#include "msg_clients_common.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion source/clients/qrdel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# source/clients/qrdel
add_executable(
qrdel
oge_qrdel.cc ../../common/parse_job_cull.cc ../../common/parse_qsub.cc
ocs_qrdel.cc ../../common/parse_job_cull.cc ../../common/parse_qsub.cc
../../common/sig_handlers.cc ../../common/sge_options.cc ../../common/usage.cc)
target_include_directories(qrdel PRIVATE ${SGE_INCLUDES})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "sgeobj/sge_str.h"

#include "gdi/sge_gdi.h"
#include "gdi/oge_gdi_client.h"
#include "gdi/ocs_gdi_client.h"

#include "parse_qsub.h"
#include "usage.h"
Expand Down
2 changes: 1 addition & 1 deletion source/clients/qrsh_starter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#___INFO__MARK_END_NEW__

# source/clients/qrsh
add_executable(qrsh_starter oge_qrsh_starter.cc)
add_executable(qrsh_starter ocs_qrsh_starter.cc)
target_include_directories(qrsh_starter PRIVATE ${SGE_INCLUDES})
target_link_libraries(qrsh_starter PRIVATE uti commlists ${SGE_LIBS})

Expand Down
Loading

0 comments on commit ffe8a2e

Please sign in to comment.