ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

* rename ompi_argv to opal_argv

Просмотр исходного кода 
* rename ompi_basename to opal_basename
* rename ompi bitop functions to opal
* rename ompi_cmd_line to opal_cmd_line
* rename ompi_sizet2int to opal_sizet2int
* rename orte_daemon_init to opal_daemon_init
* rename ompi_few to opal_few

This commit was SVN r6330.
Этот коммит содержится в:
Brian Barrett 2005-07-04 00:13:44 +00:00
родитель a13166b500
Коммит 9f44b80291
96 изменённых файлов: 889 добавлений и 885 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
ompi/communicator/comm.c
Просмотреть файл

@ -23,9 +23,9 @@
#include "dps/dps.h"
#include "proc/proc.h"
#include "opal/threads/mutex.h"
#include "util/bit_ops.h"
#include "opal/util/bit_ops.h"
#include "opal/util/output.h"
#include "util/convert.h"
#include "opal/util/convert.h"
#include "mca/topo/topo.h"
#include "mca/topo/base/base.h"
#include "mca/ns/ns.h"
@ -861,7 +861,7 @@ ompi_proc_t **ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
if ( OMPI_SUCCESS != rc ) {
goto err_exit;
}
if (OMPI_SUCCESS != (rc = ompi_sizet2int(size_len, &int_len, true))) {
if (OMPI_SUCCESS != (rc = opal_size2int(size_len, &int_len, true))) {
goto err_exit;
}
printf("Got sizet len: %ld, int %d\n", size_len, int_len);
@ -1380,7 +1380,7 @@ static int ompi_comm_fill_rest (ompi_communicator_t *comm,
comm->c_contextid);
/* determine the cube dimensions */
comm->c_cube_dim = ompi_cube_dim(comm->c_local_group->grp_proc_count);
comm->c_cube_dim = opal_cube_dim(comm->c_local_group->grp_proc_count);
/* initialize PML stuff on the communicator */
if (OMPI_SUCCESS != (ret = MCA_PML_CALL(add_comm(comm)))) {

4
ompi/communicator/comm_cid.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "dps/dps.h"
#include "util/convert.h"
#include "opal/util/convert.h"
#include "mca/ns/ns_types.h"
#include "communicator/communicator.h"
#include "proc/proc.h"
@ -658,7 +658,7 @@ static int ompi_comm_allreduce_intra_oob (int *inbuf, int *outbuf,
}
OBJ_RELEASE(sbuf);
OBJ_RELEASE(rbuf);
if (ORTE_SUCCESS != (rc = ompi_sizet2int(size_count, &count, true))) {
if (ORTE_SUCCESS != (rc = opal_size2int(size_count, &count, true))) {
goto exit;
}

4
ompi/communicator/comm_dyn.c
Просмотреть файл

@ -33,8 +33,8 @@
#include "info/info.h"
#include "opal/threads/mutex.h"
#include "util/proc_info.h"
#include "util/bit_ops.h"
#include "util/argv.h"
#include "opal/util/bit_ops.h"
#include "opal/util/argv.h"
#include "include/constants.h"
#include "mca/pml/pml.h"
#include "mca/ns/ns.h"

6
ompi/communicator/comm_init.c
Просмотреть файл

@ -20,7 +20,7 @@
#include "mpi.h"
#include "util/bit_ops.h"
#include "opal/util/bit_ops.h"
#include "include/constants.h"
#include "mca/pml/pml.h"
#include "mca/coll/base/base.h"
@ -81,7 +81,7 @@ int ompi_comm_init(void)
ompi_mpi_comm_world.c_my_rank = group->grp_my_rank;
ompi_mpi_comm_world.c_local_group = group;
ompi_mpi_comm_world.c_remote_group = group;
ompi_mpi_comm_world.c_cube_dim = ompi_cube_dim(size);
ompi_mpi_comm_world.c_cube_dim = opal_cube_dim(size);
ompi_mpi_comm_world.error_handler = &ompi_mpi_errors_are_fatal;
OBJ_RETAIN( &ompi_mpi_errors_are_fatal );
OMPI_COMM_SET_PML_ADDED(&ompi_mpi_comm_world);
@ -178,7 +178,7 @@ ompi_communicator_t *ompi_comm_allocate ( int local_size, int remote_size )
}
/* fill in the inscribing hyper-cube dimensions */
new_comm->c_cube_dim = ompi_cube_dim(local_size);
new_comm->c_cube_dim = opal_cube_dim(local_size);
if ( OMPI_ERROR == new_comm->c_cube_dim ) {
OBJ_RELEASE(new_comm);
new_comm = NULL;

6
ompi/mca/btl/base/btl_base_select.c
Просмотреть файл

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "runtime/runtime.h"
#include "mca/mca.h"
#include "mca/base/base.h"
@ -48,8 +48,8 @@ int mca_btl_base_select(bool enable_progress_threads,
mca_btl_base_module_t **modules;
mca_btl_base_selected_module_t *sm;
char** include = ompi_argv_split(mca_btl_base_include, ',');
char** exclude = ompi_argv_split(mca_btl_base_exclude, ',');
char** include = opal_argv_split(mca_btl_base_include, ',');
char** exclude = opal_argv_split(mca_btl_base_exclude, ',');
/* Traverse the list of opened modules; call their init
functions. */

2
ompi/mca/btl/gm/btl_gm_component.c
Просмотреть файл

@ -20,7 +20,7 @@
#include "include/constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"

2
ompi/mca/btl/mvapi/btl_mvapi_component.c
Просмотреть файл

@ -19,7 +19,7 @@
#include "include/constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"

2
ompi/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -19,7 +19,7 @@
#include "include/constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"

2
ompi/mca/btl/self/btl_self_component.c
Просмотреть файл

@ -26,7 +26,7 @@
#include "include/sys/cache.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/sys_info.h"
#include "util/proc_info.h"

2
ompi/mca/btl/sm/btl_sm_component.c
Просмотреть файл

@ -26,7 +26,7 @@
#include "include/sys/cache.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/sys_info.h"
#include "util/proc_info.h"

2
ompi/mca/btl/template/btl_template_component.c
Просмотреть файл

@ -19,7 +19,7 @@
#include "include/constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"

8
ompi/mca/coll/base/coll_base_comm_select.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "mpi.h"
#include "communicator/communicator.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/show_help.h"
#include "opal/class/opal_list.h"
#include "opal/class/opal_object.h"
@ -188,15 +188,15 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm,
in the MCA parameter; parse them and check them all */
else if (NULL != names && 0 < strlen(names)) {
name_array = ompi_argv_split(names, ',');
num_names = ompi_argv_count(name_array);
name_array = opal_argv_split(names, ',');
num_names = opal_argv_count(name_array);
opal_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: Checking specific modules: %s",
names);
selectable = check_components(&mca_coll_base_components_available,
comm, name_array, num_names);
ompi_argv_free(name_array);
opal_argv_free(name_array);
}
/* Nope -- a specific [set of] component[s] was not requested. Go

4
ompi/mca/coll/basic/coll_basic_barrier.c
Просмотреть файл

@ -20,7 +20,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "communicator/communicator.h"
#include "util/bit_ops.h"
#include "opal/util/bit_ops.h"
#include "mca/pml/pml.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/coll_tags.h"
@ -106,7 +106,7 @@ int mca_coll_basic_barrier_intra_log(struct ompi_communicator_t *comm)
root (rank 0). */
dim = comm->c_cube_dim;
hibit = ompi_hibit(rank, dim);
hibit = opal_hibit(rank, dim);
--dim;
/* Receive from children. */

4
ompi/mca/coll/basic/coll_basic_bcast.c
Просмотреть файл

@ -25,7 +25,7 @@
#include "mca/coll/base/coll_tags.h"
#include "coll_basic.h"
#include "mca/pml/pml.h"
#include "util/bit_ops.h"
#include "opal/util/bit_ops.h"
/*
@ -126,7 +126,7 @@ int mca_coll_basic_bcast_log_intra(void *buff, int count,
vrank = (rank + size - root) % size;
dim = comm->c_cube_dim;
hibit = ompi_hibit(vrank, dim);
hibit = opal_hibit(vrank, dim);
--dim;
/* Receive data from parent in the tree. */

8
ompi/mca/io/base/io_base_delete.c
Просмотреть файл

@ -23,7 +23,7 @@
#include "mpi.h"
#include "file/file.h"
#include "opal/class/opal_list.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/mca.h"
#include "mca/base/base.h"
@ -101,15 +101,15 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info)
err = OMPI_ERROR;
if (NULL != names && 0 < strlen(names)) {
name_array = ompi_argv_split(names, ',');
num_names = ompi_argv_count(name_array);
name_array = opal_argv_split(names, ',');
num_names = opal_argv_count(name_array);
opal_output_verbose(10, mca_io_base_output,
"io:base:delete: Checking specific modules: %s",
names);
selectable = check_components(&mca_io_base_components_available,
filename, info, name_array, num_names);
ompi_argv_free(name_array);
opal_argv_free(name_array);
}
/* Nope -- a specific [set of] component[s] was not requested. Go

8
ompi/mca/io/base/io_base_file_select.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "mpi.h"
#include "file/file.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "opal/class/opal_list.h"
#include "opal/class/opal_object.h"
@ -141,15 +141,15 @@ int mca_io_base_file_select(ompi_file_t *file,
listed in the MCA parameter; parse them and check them all */
else if (NULL != names && 0 < strlen(names)) {
name_array = ompi_argv_split(names, ',');
num_names = ompi_argv_count(name_array);
name_array = opal_argv_split(names, ',');
num_names = opal_argv_count(name_array);
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: Checking specific modules: %s",
names);
selectable = check_components(&mca_io_base_components_available,
file, name_array, num_names);
ompi_argv_free(name_array);
opal_argv_free(name_array);
}
/* Nope -- a specific [set of] component[s] was not requested. Go

2
ompi/mca/pml/example/pml_example.h
Просмотреть файл

@ -14,7 +14,7 @@
#include "opal/threads/thread.h"
#include "opal/threads/condition.h"
#include "class/ompi_free_list.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "request/request.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"

2
ompi/mca/pml/ob1/pml_ob1.h
Просмотреть файл

@ -24,7 +24,7 @@
#include "opal/threads/thread.h"
#include "opal/threads/condition.h"
#include "class/ompi_free_list.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "request/request.h"
#include "mca/pml/pml.h"
#include "mca/pml/base/pml_base_request.h"

2
ompi/mca/pml/teg/pml_teg.h
Просмотреть файл

@ -23,7 +23,7 @@
#include "opal/threads/thread.h"
#include "opal/threads/condition.h"
#include "class/ompi_free_list.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "request/request.h"
#include "mca/pml/pml.h"
#include "mca/pml/base/pml_base_request.h"

2
ompi/mca/pml/uniq/pml_uniq.h
Просмотреть файл

@ -23,7 +23,7 @@
#include "opal/threads/thread.h"
#include "opal/threads/condition.h"
#include "class/ompi_free_list.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "request/request.h"
#include "mca/pml/pml.h"
#include "mca/pml/base/pml_base_request.h"

6
ompi/mca/ptl/base/ptl_base_select.c
Просмотреть файл

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "runtime/runtime.h"
#include "mca/mca.h"
#include "mca/base/base.h"
@ -42,8 +42,8 @@ int mca_ptl_base_select(bool enable_progress_threads,
mca_ptl_base_module_t **modules;
mca_ptl_base_selected_module_t *sm;
char** include = ompi_argv_split(mca_ptl_base_include, ',');
char** exclude = ompi_argv_split(mca_ptl_base_exclude, ',');
char** include = opal_argv_split(mca_ptl_base_include, ',');
char** exclude = opal_argv_split(mca_ptl_base_exclude, ',');
/* Traverse the list of opened modules; call their init
functions. */

2
ompi/mca/ptl/elan/src/ptl_elan_component.c
Просмотреть файл

@ -27,7 +27,7 @@
#include "constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"

2
ompi/mca/ptl/elan/src/ptl_elan_priv.h
Просмотреть файл

@ -28,7 +28,7 @@
#include "constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"

2
ompi/mca/ptl/mx/ptl_mx.c
Просмотреть файл

@ -19,7 +19,7 @@
#include <string.h>
#include "include/constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"

2
ompi/mca/ptl/prof/ptl_prof_component.c
Просмотреть файл

@ -27,7 +27,7 @@
#include "constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"

2
ompi/mca/ptl/self/ptl_self.c
Просмотреть файл

@ -37,7 +37,7 @@
#include "include/constants.h"
#include "class/ompi_bitmap.h"
#include "opal/event/event.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "datatype/datatype.h"
#include "mca/pml/pml.h"

2
ompi/mca/ptl/self/ptl_self_component.c
Просмотреть файл

@ -37,7 +37,7 @@
#include "include/constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"

2
ompi/mca/ptl/sm/src/ptl_sm_component.c
Просмотреть файл

@ -26,7 +26,7 @@
#include "include/sys/cache.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/sys_info.h"
#include "util/proc_info.h"

10
ompi/mca/ptl/tcp/ptl_tcp_component.c
Просмотреть файл

@ -36,7 +36,7 @@
#include "include/constants.h"
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"
@ -343,7 +343,7 @@ static int mca_ptl_tcp_component_create_instances(void)
return OMPI_ERR_OUT_OF_RESOURCE;
/* if the user specified an interface list - use these exclusively */
argv = include = ompi_argv_split(mca_ptl_tcp_component.tcp_if_include,',');
argv = include = opal_argv_split(mca_ptl_tcp_component.tcp_if_include,',');
while(argv && *argv) {
char* if_name = *argv;
int if_index = ompi_ifnametoindex(if_name);
@ -354,14 +354,14 @@ static int mca_ptl_tcp_component_create_instances(void)
}
argv++;
}
ompi_argv_free(include);
opal_argv_free(include);
if(mca_ptl_tcp_component.tcp_num_ptl_modules)
return OMPI_SUCCESS;
/* if the interface list was not specified by the user, create
* a PTL for each interface that was not excluded.
*/
exclude = ompi_argv_split(mca_ptl_tcp_component.tcp_if_exclude,',');
exclude = opal_argv_split(mca_ptl_tcp_component.tcp_if_exclude,',');
for(if_index = ompi_ifbegin(); if_index >= 0; if_index = ompi_ifnext(if_index)) {
char if_name[32];
ompi_ifindextoname(if_index, if_name, sizeof(if_name));
@ -382,7 +382,7 @@ static int mca_ptl_tcp_component_create_instances(void)
mca_ptl_tcp_create(if_index, if_name);
}
}
ompi_argv_free(exclude);
opal_argv_free(exclude);
return OMPI_SUCCESS;
}

6
ompi/mca/topo/base/topo_base_comm_select.c
Просмотреть файл

@ -19,7 +19,7 @@
#include <string.h>
#include "opal/class/opal_list.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "runtime/runtime.h"
#include "mca/mca.h"
#include "mca/base/base.h"
@ -162,8 +162,8 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm,
mca_base_param_lookup_string (mca_topo_base_param, &names);
if (NULL != names && 0 < strlen(names)) {
name_array = ompi_argv_split (names, ',');
num_names = ompi_argv_count (name_array);
name_array = opal_argv_split (names, ',');
num_names = opal_argv_count (name_array);
opal_output_verbose(10, mca_topo_base_output,
"topo:base:comm_Select: Checking all available module");

2
ompi/mca/topo/unity/topo_unity.h
Просмотреть файл

@ -19,7 +19,7 @@
#include "ompi_config.h"
#include "opal/threads/condition.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "request/request.h"
#include "mca/topo/topo.h"

4
ompi/mpi/f77/comm_spawn_f.c
Просмотреть файл

@ -19,7 +19,7 @@
#include "mpi/f77/bindings.h"
#include "mpi/f77/constants.h"
#include "mpi/f77/strings.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
#pragma weak PMPI_COMM_SPAWN = mpi_comm_spawn_f
@ -103,7 +103,7 @@ void mpi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs,
}
free(c_command);
if (MPI_ARGV_NULL != c_argv && NULL != c_argv) {
ompi_argv_free(c_argv);
opal_argv_free(c_argv);
}
if (!OMPI_IS_FORTRAN_ERRCODES_IGNORE(array_of_errcodes)) {
OMPI_ARRAY_INT_2_FINT(array_of_errcodes, size);

6
ompi/mpi/f77/comm_spawn_multiple_f.c
Просмотреть файл

@ -19,7 +19,7 @@
#include "mpi/f77/bindings.h"
#include "mpi/f77/constants.h"
#include "mpi/f77/strings.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
@ -127,11 +127,11 @@ void mpi_comm_spawn_multiple_f(MPI_Fint *count, char *array_commands,
}
OMPI_ARRAY_FINT_2_INT_CLEANUP(array_maxprocs);
ompi_argv_free(c_array_commands);
opal_argv_free(c_array_commands);
if (MPI_ARGVS_NULL != c_array_argv && NULL != c_array_argv) {
for (i = 0; i < OMPI_FINT_2_INT(*count); ++i) {
ompi_argv_free(c_array_argv[i]);
opal_argv_free(c_array_argv[i]);
}
}
free(c_array_argv);

8
ompi/mpi/f77/strings.c
Просмотреть файл

@ -21,7 +21,7 @@
#include <stdio.h>
#include "include/constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "mpi/f77/strings.h"
@ -100,7 +100,7 @@ int ompi_fortran_argv_f2c(char *array, int len, char ***argv)
while (1) {
if (OMPI_SUCCESS != (err = ompi_fortran_string_f2c(array, len,
&cstr))) {
ompi_argv_free(*argv);
opal_argv_free(*argv);
return err;
}
@ -108,8 +108,8 @@ int ompi_fortran_argv_f2c(char *array, int len, char ***argv)
break;
}
if (OMPI_SUCCESS != (err = ompi_argv_append(&argc, argv, cstr))) {
ompi_argv_free(*argv);
if (OMPI_SUCCESS != (err = opal_argv_append(&argc, argv, cstr))) {
opal_argv_free(*argv);
return err;
}

4
ompi/mpi/f77/strings.h
Просмотреть файл

@ -68,7 +68,7 @@ extern "C" {
* This function is intented to be used in the MPI F77 bindings to
* convert arrays of fortran strings to argv-style arrays of C
* strings. The argv array will be allocated and returned; it is
* the caller's responsibility to invoke ompi_argv_free() to free
* the caller's responsibility to invoke opal_argv_free() to free
* it later (or equivalent).
*/
int ompi_fortran_argv_f2c(char *farray, int len, char ***cargv);
@ -83,7 +83,7 @@ extern "C" {
* This function is intented to be used in the MPI F77 bindings to
* convert arrays of fortran strings to argv-style arrays of C
* strings. The argv array will be allocated and returned; it is
* the caller's responsibility to invoke ompi_argv_free() to free
* the caller's responsibility to invoke opal_argv_free() to free
* each content of argv array and call free to deallocate the argv
* array itself
*/

64
ompi/tools/ompi_info/ompi_info.cc
Просмотреть файл

@ -37,8 +37,8 @@
#include "opal/class/opal_object.h"
#include "runtime/runtime.h"
#include "opal/util/output.h"
#include "util/cmd_line.h"
#include "util/argv.h"
#include "opal/util/cmd_line.h"
#include "opal/util/argv.h"
#include "util/show_help.h"
#include "communicator/communicator.h"
#include "mca/base/base.h"
@ -54,7 +54,7 @@ using namespace ompi_info;
//
bool ompi_info::pretty = true;
ompi_cmd_line_t *ompi_info::cmd_line = NULL;
opal_cmd_line_t *ompi_info::cmd_line = NULL;
const string ompi_info::type_all = "all";
const string ompi_info::type_ompi = "ompi";
@ -74,38 +74,38 @@ int main(int argc, char *argv[])
// Initialize the argv parsing handle
cmd_line = OBJ_NEW(ompi_cmd_line_t);
cmd_line = OBJ_NEW(opal_cmd_line_t);
if (NULL == cmd_line) {
ret = errno;
ompi_show_help("help-ompi_info.txt", "lib-call-fail", true,
"ompi_cmd_line_create", __FILE__, __LINE__, NULL);
"opal_cmd_line_create", __FILE__, __LINE__, NULL);
exit(ret);
}
ompi_cmd_line_make_opt(cmd_line, 'v', "version", 2,
opal_cmd_line_make_opt(cmd_line, 'v', "version", 2,
"Show version of Open MPI or a component");
ompi_cmd_line_make_opt(cmd_line, '\0', "param", 2,
opal_cmd_line_make_opt(cmd_line, '\0', "param", 2,
"Show MCA parameters");
ompi_cmd_line_make_opt(cmd_line, '\0', "internal", 0,
opal_cmd_line_make_opt(cmd_line, '\0', "internal", 0,
"Show internal MCA parameters (not meant to be modified by users)");
ompi_cmd_line_make_opt(cmd_line, '\0', "path", 1,
opal_cmd_line_make_opt(cmd_line, '\0', "path", 1,
"Show paths that Open MPI was configured with");
ompi_cmd_line_make_opt(cmd_line, '\0', "arch", 0,
opal_cmd_line_make_opt(cmd_line, '\0', "arch", 0,
"Show architecture Open MPI was compiled on");
ompi_cmd_line_make_opt(cmd_line, 'c', "config", 0,
opal_cmd_line_make_opt(cmd_line, 'c', "config", 0,
"Show configuration options");
ompi_cmd_line_make_opt(cmd_line, 'h', "help", 0,
opal_cmd_line_make_opt(cmd_line, 'h', "help", 0,
"Show this help message");
ompi_cmd_line_make_opt(cmd_line, '\0', "pretty", 0,
opal_cmd_line_make_opt(cmd_line, '\0', "pretty", 0,
"Display output in 'prettyprint' format (default)");
ompi_cmd_line_make_opt(cmd_line, '\0', "parsable", 0,
opal_cmd_line_make_opt(cmd_line, '\0', "parsable", 0,
"Display output in parsable format");
ompi_cmd_line_make_opt(cmd_line, '\0', "parseable", 0,
opal_cmd_line_make_opt(cmd_line, '\0', "parseable", 0,
"Synonym for --parsable");
ompi_cmd_line_make_opt(cmd_line, '\0', "hostname", 0,
opal_cmd_line_make_opt(cmd_line, '\0', "hostname", 0,
"Show the hostname that Open MPI was configured "
"and built on");
ompi_cmd_line_make_opt(cmd_line, 'a', "all", 0,
opal_cmd_line_make_opt(cmd_line, 'a', "all", 0,
"Show all configuration options and MCA parameters");
// Call some useless functions in order to guarantee to link in some
@ -129,15 +129,15 @@ int main(int argc, char *argv[])
// Do the parsing
if (OMPI_SUCCESS != ompi_cmd_line_parse(cmd_line, false, argc, argv)) {
if (OMPI_SUCCESS != opal_cmd_line_parse(cmd_line, false, argc, argv)) {
cmd_error = true;
}
if (!cmd_error && ompi_cmd_line_is_taken(cmd_line, "help") ||
ompi_cmd_line_is_taken(cmd_line, "h")) {
if (!cmd_error && opal_cmd_line_is_taken(cmd_line, "help") ||
opal_cmd_line_is_taken(cmd_line, "h")) {
want_help = true;
}
if (cmd_error || want_help) {
char *usage = ompi_cmd_line_get_usage_msg(cmd_line);
char *usage = opal_cmd_line_get_usage_msg(cmd_line);
ompi_show_help("help-ompi_info.txt", "usage", true, usage);
free(usage);
exit(cmd_error ? 1 : 0);
@ -150,7 +150,7 @@ int main(int argc, char *argv[])
// creates a memory leak, but that's unfortunately how putenv()
// works. :-(
len = ompi_argv_count(env);
len = opal_argv_count(env);
for (i = 0; i < len; ++i) {
putenv(env[i]);
}
@ -181,31 +181,31 @@ int main(int argc, char *argv[])
// Execute the desired action(s)
if (ompi_cmd_line_is_taken(cmd_line, "pretty")) {
if (opal_cmd_line_is_taken(cmd_line, "pretty")) {
ompi_info::pretty = true;
} else if (ompi_cmd_line_is_taken(cmd_line, "parsable")) {
} else if (opal_cmd_line_is_taken(cmd_line, "parsable")) {
ompi_info::pretty = false;
}
want_all = ompi_cmd_line_is_taken(cmd_line, "all");
if (want_all || ompi_cmd_line_is_taken(cmd_line, "version")) {
want_all = opal_cmd_line_is_taken(cmd_line, "all");
if (want_all || opal_cmd_line_is_taken(cmd_line, "version")) {
do_version(want_all, cmd_line);
acted = true;
}
if (want_all || ompi_cmd_line_is_taken(cmd_line, "path")) {
if (want_all || opal_cmd_line_is_taken(cmd_line, "path")) {
do_path(want_all, cmd_line);
acted = true;
}
if (want_all || ompi_cmd_line_is_taken(cmd_line, "arch")) {
if (want_all || opal_cmd_line_is_taken(cmd_line, "arch")) {
do_arch(cmd_line);
acted = true;
}
if (want_all || ompi_cmd_line_is_taken(cmd_line, "config")) {
if (want_all || opal_cmd_line_is_taken(cmd_line, "config")) {
do_config(true);
acted = true;
}
if (want_all || ompi_cmd_line_is_taken(cmd_line, "param")) {
do_params(want_all, ompi_cmd_line_is_taken(cmd_line, "internal"));
if (want_all || opal_cmd_line_is_taken(cmd_line, "param")) {
do_params(want_all, opal_cmd_line_is_taken(cmd_line, "internal"));
acted = true;
}
@ -229,7 +229,7 @@ int main(int argc, char *argv[])
// All done
if (NULL != env) {
ompi_argv_free(env);
opal_argv_free(env);
}
ompi_info::close_components();
OBJ_RELEASE(cmd_line);

10
ompi/tools/ompi_info/ompi_info.h
Просмотреть файл

@ -22,7 +22,7 @@
#include <map>
#include "opal/class/opal_list.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "mca/mca.h"
@ -35,7 +35,7 @@ namespace ompi_info {
typedef std::vector<std::string> type_vector_t;
extern bool pretty;
extern ompi_cmd_line_t *cmd_line;
extern opal_cmd_line_t *cmd_line;
extern const std::string type_all;
extern const std::string type_ompi;
@ -54,7 +54,7 @@ namespace ompi_info {
extern const std::string ver_beta;
extern const std::string ver_svn;
void do_version(bool want_all, ompi_cmd_line_t *cmd_line);
void do_version(bool want_all, opal_cmd_line_t *cmd_line);
void show_ompi_version(const std::string& scope);
void show_component_version(const std::string& type_name,
const std::string& component_name,
@ -79,10 +79,10 @@ namespace ompi_info {
void show_mca_params(const std::string& type, const std::string& component,
const std::string& param, bool want_internal);
void do_path(bool want_all, ompi_cmd_line_t *cmd_line);
void do_path(bool want_all, opal_cmd_line_t *cmd_line);
void show_path(const std::string& type, const std::string& value);
void do_arch(ompi_cmd_line_t *cmd_line);
void do_arch(opal_cmd_line_t *cmd_line);
void do_config(bool want_all);
//

22
ompi/tools/ompi_info/param.cc
Просмотреть файл

@ -76,9 +76,9 @@ void ompi_info::do_params(bool want_all, bool want_internal)
// See if the special param "all" was givin to --param; that
// superceeds any individual type
count = ompi_cmd_line_get_ninsts(cmd_line, "param");
count = opal_cmd_line_get_ninsts(cmd_line, "param");
for (i = 0; i < count; ++i) {
type = ompi_cmd_line_get_param(cmd_line, "param", i, 0);
type = opal_cmd_line_get_param(cmd_line, "param", i, 0);
if (type_all == type) {
want_all = true;
break;
@ -93,8 +93,8 @@ void ompi_info::do_params(bool want_all, bool want_internal)
}
} else {
for (i = 0; i < count; ++i) {
type = ompi_cmd_line_get_param(cmd_line, "param", i, 0);
component = ompi_cmd_line_get_param(cmd_line, "param", i, 1);
type = opal_cmd_line_get_param(cmd_line, "param", i, 0);
component = opal_cmd_line_get_param(cmd_line, "param", i, 1);
for (found = false, i = 0; i < mca_types.size(); ++i) {
if (mca_types[i] == type) {
@ -104,7 +104,7 @@ void ompi_info::do_params(bool want_all, bool want_internal)
}
if (!found) {
char *usage = ompi_cmd_line_get_usage_msg(cmd_line);
char *usage = opal_cmd_line_get_usage_msg(cmd_line);
ompi_show_help("help-ompi_info.txt", "usage", true, usage);
free(usage);
exit(1);
@ -222,7 +222,7 @@ void ompi_info::show_mca_params(const string& type, const string& component,
}
void ompi_info::do_path(bool want_all, ompi_cmd_line_t *cmd_line)
void ompi_info::do_path(bool want_all, opal_cmd_line_t *cmd_line)
{
int i, count;
string scope;
@ -235,9 +235,9 @@ void ompi_info::do_path(bool want_all, ompi_cmd_line_t *cmd_line)
show_path(path_pkglibdir, OMPI_PKGLIBDIR);
show_path(path_sysconfdir, OMPI_SYSCONFDIR);
} else {
count = ompi_cmd_line_get_ninsts(cmd_line, "path");
count = opal_cmd_line_get_ninsts(cmd_line, "path");
for (i = 0; i < count; ++i) {
scope = ompi_cmd_line_get_param(cmd_line, "path", i, 0);
scope = opal_cmd_line_get_param(cmd_line, "path", i, 0);
if (path_prefix == scope)
show_path(path_prefix, OMPI_PREFIX);
@ -252,7 +252,7 @@ void ompi_info::do_path(bool want_all, ompi_cmd_line_t *cmd_line)
else if (path_sysconfdir == scope)
show_path(path_sysconfdir, OMPI_SYSCONFDIR);
else {
char *usage = ompi_cmd_line_get_usage_msg(cmd_line);
char *usage = opal_cmd_line_get_usage_msg(cmd_line);
ompi_show_help("help-ompi_info.txt", "usage", true, usage);
free(usage);
exit(1);
@ -271,12 +271,12 @@ void ompi_info::show_path(const string& type, const string& value)
}
void ompi_info::do_arch(ompi_cmd_line_t *cmd_line)
void ompi_info::do_arch(opal_cmd_line_t *cmd_line)
{
string prefix;
char hostname[MAXHOSTNAMELEN];
if (ompi_cmd_line_is_taken(cmd_line, "hostname")) {
if (opal_cmd_line_is_taken(cmd_line, "hostname")) {
gethostname(hostname, MAXHOSTNAMELEN);
prefix = hostname + string(":");
}

8
ompi/tools/ompi_info/version.cc
Просмотреть файл

@ -70,7 +70,7 @@ static string make_version_str(const string& scope,
// - want_all: True if all components' info is required.
// - cmd_line: The constructed command line argument
//
void ompi_info::do_version(bool want_all, ompi_cmd_line_t *cmd_line)
void ompi_info::do_version(bool want_all, opal_cmd_line_t *cmd_line)
{
unsigned int count;
ompi_info::type_vector_t::size_type i;
@ -85,10 +85,10 @@ void ompi_info::do_version(bool want_all, ompi_cmd_line_t *cmd_line)
show_component_version(mca_types[i], component_all, ver_full, type_all);
}
} else {
count = ompi_cmd_line_get_ninsts(cmd_line, "version");
count = opal_cmd_line_get_ninsts(cmd_line, "version");
for (i = 0; i < count; ++i) {
arg1 = ompi_cmd_line_get_param(cmd_line, "version", i, 0);
scope = ompi_cmd_line_get_param(cmd_line, "version", i, 1);
arg1 = opal_cmd_line_get_param(cmd_line, "version", i, 0);
scope = opal_cmd_line_get_param(cmd_line, "version", i, 1);
// Version of Open MPI

12
ompi/tools/wrappers/wrap.cc
Просмотреть файл

@ -29,8 +29,8 @@
#include <errno.h>
#include "util/path.h"
#include "util/argv.h"
#include "util/few.h"
#include "opal/util/argv.h"
#include "opal/util/few.h"
#include "util/path.h"
#include "util/show_help.h"
#include "tools/wrappers/ompi_wrap.h"
@ -422,10 +422,10 @@ ompi_wrap_exec_sv(const ompi_sv_t & sv)
// Build up a C array of the args
for (i = 0; i < sv.size(); ++i) {
ompi_argv_append(&ac, &av, (char *) sv[i].c_str());
opal_argv_append(&ac, &av, (char *) sv[i].c_str());
}
// There is no way to tell whether ompi_few returned non-zero because
// There is no way to tell whether opal_few returned non-zero because
// the called app returned non-zero or if there was a failure in the
// exec (like the file not being found). So we look for the
// compiler first, just to try to eliminate that case.
@ -437,7 +437,7 @@ ompi_wrap_exec_sv(const ompi_sv_t & sv)
status = -1;
} else {
free(tmp);
ret = ompi_few(av, &status);
ret = opal_few(av, &status);
status = WIFEXITED(status) ? WEXITSTATUS(status) :
(WIFSIGNALED(status) ? WTERMSIG(status) :
(WIFSTOPPED(status) ? WSTOPSIG(status) : 255));
@ -448,7 +448,7 @@ ompi_wrap_exec_sv(const ompi_sv_t & sv)
}
// Free the C array
ompi_argv_free(av);
opal_argv_free(av);
return status;
}

4
opal/mca/base/base.h
Просмотреть файл

@ -101,8 +101,8 @@ OMPI_DECLSPEC int mca_base_close(void);
/* mca_base_cmd_line.c */
OMPI_DECLSPEC int mca_base_cmd_line_setup(ompi_cmd_line_t *cmd);
OMPI_DECLSPEC int mca_base_cmd_line_process_args(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC int mca_base_cmd_line_setup(opal_cmd_line_t *cmd);
OMPI_DECLSPEC int mca_base_cmd_line_process_args(opal_cmd_line_t *cmd,
char ***env);
OMPI_DECLSPEC int mca_base_cmd_line_process_arg(const char *param, const char *value);

26
opal/mca/base/mca_base_cmd_line.c
Просмотреть файл

@ -20,8 +20,8 @@
#include <string.h>
#include "include/constants.h"
#include "util/cmd_line.h"
#include "util/argv.h"
#include "opal/util/cmd_line.h"
#include "opal/util/argv.h"
#include "util/ompi_environ.h"
#include "mca/base/base.h"
@ -38,9 +38,9 @@ static char **mca_value_argv = NULL;
/*
* Add -mca to the possible command line options list
*/
int mca_base_cmd_line_setup(ompi_cmd_line_t *cmd)
int mca_base_cmd_line_setup(opal_cmd_line_t *cmd)
{
return ompi_cmd_line_make_opt3(cmd, '\0', "mca", "mca", 2,
return opal_cmd_line_make_opt3(cmd, '\0', "mca", "mca", 2,
"General mechanism to pass MCA parameters");
}
@ -48,7 +48,7 @@ int mca_base_cmd_line_setup(ompi_cmd_line_t *cmd)
/*
* Look for and handle any -mca options on the command line
*/
int mca_base_cmd_line_process_args(ompi_cmd_line_t *cmd,
int mca_base_cmd_line_process_args(opal_cmd_line_t *cmd,
char ***env)
{
int i, num_insts;
@ -57,24 +57,24 @@ int mca_base_cmd_line_process_args(ompi_cmd_line_t *cmd,
/* First, wipe out any previous results */
if (mca_param_argc > 0) {
ompi_argv_free(mca_param_argv);
ompi_argv_free(mca_value_argv);
opal_argv_free(mca_param_argv);
opal_argv_free(mca_value_argv);
mca_param_argv = mca_value_argv = NULL;
mca_param_argc = mca_value_argc = 0;
}
/* If no "-mca" parameters were given, just return */
if (!ompi_cmd_line_is_taken(cmd, "mca")) {
if (!opal_cmd_line_is_taken(cmd, "mca")) {
return OMPI_SUCCESS;
}
/* Otherwise, assemble them into an argc/argv */
num_insts = ompi_cmd_line_get_ninsts(cmd, "mca");
num_insts = opal_cmd_line_get_ninsts(cmd, "mca");
for (i = 0; i < num_insts; ++i) {
mca_base_cmd_line_process_arg(ompi_cmd_line_get_param(cmd, "mca", i, 0),
ompi_cmd_line_get_param(cmd, "mca", i, 1));
mca_base_cmd_line_process_arg(opal_cmd_line_get_param(cmd, "mca", i, 0),
opal_cmd_line_get_param(cmd, "mca", i, 1));
}
/* Now put that argc/argv in the environment */
@ -124,8 +124,8 @@ int mca_base_cmd_line_process_arg(const char *param, const char *value)
/* If we didn't already have an value for the same param, save this
one away */
ompi_argv_append(&mca_param_argc, &mca_param_argv, param);
ompi_argv_append(&mca_value_argc, &mca_value_argv, value);
opal_argv_append(&mca_param_argc, &mca_param_argv, param);
opal_argv_append(&mca_value_argc, &mca_value_argv, value);
return OMPI_SUCCESS;
}

6
opal/mca/base/mca_base_components_open.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "opal/class/opal_list.h"
#include "util/strncpy.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/mca.h"
#include "mca/base/base.h"
@ -113,7 +113,7 @@ int mca_base_components_open(const char *type_name, int output_id,
OBJ_RELEASE(item);
}
if (NULL != requested_component_names) {
ompi_argv_free(requested_component_names);
opal_argv_free(requested_component_names);
}
/* All done */
@ -136,7 +136,7 @@ static int parse_requested(int mca_param, char ***requested_component_names)
if (NULL == requested) {
return OMPI_SUCCESS;
}
*requested_component_names = ompi_argv_split(requested, ',');
*requested_component_names = opal_argv_split(requested, ',');
/* All done */

14
opal/mca/base/mca_base_param.c
Просмотреть файл

@ -30,7 +30,7 @@
#include "attribute/attribute.h"
#endif
#include "util/printf.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "mca/mca.h"
#include "mca/base/mca_base_param.h"
#include "mca/base/mca_base_param_internal.h"
@ -540,14 +540,14 @@ int mca_base_param_build_env(char ***env, int *num_env, bool internal)
if (MCA_BASE_PARAM_TYPE_INT == array[i].mbp_type) {
asprintf(&str, "%s=%d", array[i].mbp_env_var_name,
storage.intval);
ompi_argv_append(num_env, env, str);
opal_argv_append(num_env, env, str);
free(str);
} else if (MCA_BASE_PARAM_TYPE_STRING == array[i].mbp_type) {
if (NULL != storage.stringval) {
asprintf(&str, "%s=%s", array[i].mbp_env_var_name,
storage.stringval);
free(storage.stringval);
ompi_argv_append(num_env, env, str);
opal_argv_append(num_env, env, str);
free(str);
}
} else {
@ -567,7 +567,7 @@ int mca_base_param_build_env(char ***env, int *num_env, bool internal)
cleanup:
if (*num_env > 0) {
ompi_argv_free(*env);
opal_argv_free(*env);
*num_env = 0;
*env = NULL;
}
@ -639,11 +639,11 @@ static int read_files(char *file_list)
order so that we preserve unix/shell path-like semantics (i.e.,
the entries farthest to the left get precedence) */
files = ompi_argv_split(file_list, ':');
for (i = ompi_argv_count(files) - 1; i >= 0; --i) {
files = opal_argv_split(file_list, ':');
for (i = opal_argv_count(files) - 1; i >= 0; --i) {
mca_base_parse_paramfile(files[i]);
}
ompi_argv_free(files);
opal_argv_free(files);
return OMPI_SUCCESS;
}

2
opal/mca/mca.h
Просмотреть файл

@ -25,7 +25,7 @@
#include "ompi_config.h"
#include "opal/class/opal_list.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
/**
* MCA component open function.

46
opal/util/argv.c
Просмотреть файл

@ -19,7 +19,7 @@
#include <string.h>
#include "include/constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/strncpy.h"
#define ARGSIZE 128
@ -28,21 +28,21 @@
/*
* Append a string to the end of a new or existing argv array.
*/
int ompi_argv_append(int *argc, char ***argv, const char *arg)
int opal_argv_append(int *argc, char ***argv, const char *arg)
{
int rc;
/* add the new element */
if (OMPI_SUCCESS != (rc = ompi_argv_append_nosize(argv, arg))) {
if (OMPI_SUCCESS != (rc = opal_argv_append_nosize(argv, arg))) {
return rc;
}
*argc = ompi_argv_count(*argv);
*argc = opal_argv_count(*argv);
return OMPI_SUCCESS;
}
int ompi_argv_append_nosize(char ***argv, const char *arg)
int opal_argv_append_nosize(char ***argv, const char *arg)
{
int argc;
@ -60,7 +60,7 @@ int ompi_argv_append_nosize(char ***argv, const char *arg)
/* Extend existing argv. */
else {
/* count how many entries currently exist */
argc = ompi_argv_count(*argv);
argc = opal_argv_count(*argv);
*argv = (char**) realloc(*argv, (argc + 2) * sizeof(char *));
if (NULL == *argv)
@ -83,7 +83,7 @@ int ompi_argv_append_nosize(char ***argv, const char *arg)
/*
* Free a NULL-terminated argv array.
*/
void ompi_argv_free(char **argv)
void opal_argv_free(char **argv)
{
char **p;
@ -101,7 +101,7 @@ void ompi_argv_free(char **argv)
/*
* Split a string into a NULL-terminated argv array.
*/
char **ompi_argv_split(const char *src_string, int delimiter)
char **opal_argv_split(const char *src_string, int delimiter)
{
char arg[ARGSIZE];
char **argv = NULL;
@ -128,7 +128,7 @@ char **ompi_argv_split(const char *src_string, int delimiter)
/* tail argument, add straight from the original string */
else if ('\0' == *p) {
if (OMPI_ERROR == ompi_argv_append(&argc, &argv, src_string))
if (OMPI_ERROR == opal_argv_append(&argc, &argv, src_string))
return NULL;
}
@ -142,7 +142,7 @@ char **ompi_argv_split(const char *src_string, int delimiter)
strncpy(argtemp, src_string, arglen);
argtemp[arglen] = '\0';
if (OMPI_ERROR == ompi_argv_append(&argc, &argv, argtemp)) {
if (OMPI_ERROR == opal_argv_append(&argc, &argv, argtemp)) {
free(argtemp);
return NULL;
}
@ -156,7 +156,7 @@ char **ompi_argv_split(const char *src_string, int delimiter)
strncpy(arg, src_string, arglen);
arg[arglen] = '\0';
if (OMPI_ERROR == ompi_argv_append(&argc, &argv, arg))
if (OMPI_ERROR == opal_argv_append(&argc, &argv, arg))
return NULL;
}
@ -172,7 +172,7 @@ char **ompi_argv_split(const char *src_string, int delimiter)
/*
* Return the length of a NULL-terminated argv array.
*/
int ompi_argv_count(char **argv)
int opal_argv_count(char **argv)
{
char **p;
int i;
@ -191,7 +191,7 @@ int ompi_argv_count(char **argv)
* Join all the elements of an argv array into a single
* newly-allocated string.
*/
char *ompi_argv_join(char **argv, int delimiter)
char *opal_argv_join(char **argv, int delimiter)
{
char **p;
char *pp;
@ -246,7 +246,7 @@ char *ompi_argv_join(char **argv, int delimiter)
/*
* Return the number of bytes consumed by an argv array.
*/
size_t ompi_argv_len(char **argv)
size_t opal_argv_len(char **argv)
{
char **p;
size_t length;
@ -267,7 +267,7 @@ size_t ompi_argv_len(char **argv)
/*
* Copy a NULL-terminated argv array.
*/
char **ompi_argv_copy(char **argv)
char **opal_argv_copy(char **argv)
{
char **dupv = NULL;
int dupc = 0;
@ -276,8 +276,8 @@ char **ompi_argv_copy(char **argv)
return NULL;
while (NULL != *argv) {
if (OMPI_ERROR == ompi_argv_append(&dupc, &dupv, *argv)) {
ompi_argv_free(dupv);
if (OMPI_ERROR == opal_argv_append(&dupc, &dupv, *argv)) {
opal_argv_free(dupv);
return NULL;
}
@ -290,7 +290,7 @@ char **ompi_argv_copy(char **argv)
}
int ompi_argv_delete(int *argc, char ***argv, int start, int num_to_delete)
int opal_argv_delete(int *argc, char ***argv, int start, int num_to_delete)
{
int i;
int count;
@ -301,7 +301,7 @@ int ompi_argv_delete(int *argc, char ***argv, int start, int num_to_delete)
if (NULL == argv || NULL == *argv || 0 == num_to_delete) {
return OMPI_SUCCESS;
}
count = ompi_argv_count(*argv);
count = opal_argv_count(*argv);
if (start > count) {
return OMPI_SUCCESS;
} else if (start < 0 || num_to_delete < 0) {
@ -340,7 +340,7 @@ int ompi_argv_delete(int *argc, char ***argv, int start, int num_to_delete)
}
int ompi_argv_insert(char ***target, int start, char **source)
int opal_argv_insert(char ***target, int start, char **source)
{
int i, source_count, target_count;
int suffix_count;
@ -355,11 +355,11 @@ int ompi_argv_insert(char ***target, int start, char **source)
/* Easy case: appending to the end */
target_count = ompi_argv_count(*target);
source_count = ompi_argv_count(source);
target_count = opal_argv_count(*target);
source_count = opal_argv_count(source);
if (start > target_count) {
for (i = 0; i < source_count; ++i) {
ompi_argv_append(&target_count, target, source[i]);
opal_argv_append(&target_count, target, source[i]);
}
}

28
opal/util/argv.h
Просмотреть файл

@ -21,8 +21,8 @@
* arrays of strings, especially when creating command lines.
*/
#ifndef OMPI_ARGV_H
#define OMPI_ARGV_H
#ifndef OPAL_ARGV_H
#define OPAL_ARGV_H
#include "ompi_config.h"
#include "include/types.h"
@ -58,8 +58,8 @@ extern "C" {
* value into the argv array; there is no need to keep the original
* string (i.e., the arg parameter) after invoking this function.
*/
OMPI_DECLSPEC int ompi_argv_append(int *argc, char ***argv, const char *arg);
OMPI_DECLSPEC int ompi_argv_append_nosize(char ***argv, const char *arg);
OMPI_DECLSPEC int opal_argv_append(int *argc, char ***argv, const char *arg);
OMPI_DECLSPEC int opal_argv_append_nosize(char ***argv, const char *arg);
/**
* Free a NULL-terminated argv array.
@ -74,7 +74,7 @@ OMPI_DECLSPEC int ompi_argv_append_nosize(char ***argv, const char *arg);
* not safe to invoke this function with a non-NULL-terminated argv
* array.
*/
OMPI_DECLSPEC void ompi_argv_free(char **argv);
OMPI_DECLSPEC void opal_argv_free(char **argv);
/**
* Split a string into a NULL-terminated argv array.
@ -90,7 +90,7 @@ OMPI_DECLSPEC void ompi_argv_free(char **argv);
* argument (i.e., it can be freed after calling this function
* without invalidating the output argv).
*/
OMPI_DECLSPEC char **ompi_argv_split(const char *src_string, int delimiter);
OMPI_DECLSPEC char **opal_argv_split(const char *src_string, int delimiter);
/**
* Return the length of a NULL-terminated argv array.
@ -102,7 +102,7 @@ OMPI_DECLSPEC char **ompi_argv_split(const char *src_string, int delimiter);
*
* The argv array must be NULL-terminated.
*/
OMPI_DECLSPEC int ompi_argv_count(char **argv);
OMPI_DECLSPEC int opal_argv_count(char **argv);
/**
* Join all the elements of an argv array into a single
@ -120,7 +120,7 @@ OMPI_DECLSPEC int ompi_argv_count(char **argv);
*
* It is the callers responsibility to free the returned string.
*/
OMPI_DECLSPEC char *ompi_argv_join(char **argv, int delimiter);
OMPI_DECLSPEC char *opal_argv_join(char **argv, int delimiter);
/**
* Return the number of bytes consumed by an argv array.
@ -131,7 +131,7 @@ OMPI_DECLSPEC char *ompi_argv_join(char **argv, int delimiter);
* array. This includes the number of bytes used by each of the
* strings as well as the pointers used in the argv array.
*/
OMPI_DECLSPEC size_t ompi_argv_len(char **argv);
OMPI_DECLSPEC size_t opal_argv_len(char **argv);
/**
* Copy a NULL-terminated argv array.
@ -145,7 +145,7 @@ OMPI_DECLSPEC size_t ompi_argv_len(char **argv);
* Specifically, the output argv will be an array of the same length
* as the input argv, and strcmp(argv_in[i], argv_out[i]) will be 0.
*/
OMPI_DECLSPEC char **ompi_argv_copy(char **argv);
OMPI_DECLSPEC char **opal_argv_copy(char **argv);
/**
* Delete one or more tokens from the middle of an argv.
@ -172,7 +172,7 @@ OMPI_DECLSPEC char **ompi_argv_copy(char **argv);
* free()ed (it is assumed that the argv "owns" the memory that
* the pointer points to).
*/
OMPI_DECLSPEC int ompi_argv_delete(int *argc, char ***argv,
OMPI_DECLSPEC int opal_argv_delete(int *argc, char ***argv,
int start, int num_to_delete);
/**
@ -188,7 +188,7 @@ OMPI_DECLSPEC int ompi_argv_delete(int *argc, char ***argv,
* This function takes one arg and inserts it in the middle of
* another. The first token in source will be insertted at index
* start in the target argv; all other tokens will follow it.
* Similar to ompi_argv_append(), the target may be realloc()'ed
* Similar to opal_argv_append(), the target may be realloc()'ed
* to accomodate the new storage requirements.
*
* The source array is left unaffected -- its contents are copied
@ -196,9 +196,9 @@ OMPI_DECLSPEC int ompi_argv_delete(int *argc, char ***argv,
* source points to are strdup'ed into the new locations in
* target).
*/
OMPI_DECLSPEC int ompi_argv_insert(char ***target, int start, char **source);
OMPI_DECLSPEC int opal_argv_insert(char ***target, int start, char **source);
#if defined(c_plusplus) || defined(__cplusplus)
}
#endif
#endif /* OMPI_ARGV_H */
#endif /* OPAL_ARGV_H */

4
opal/util/basename.c
Просмотреть файл

@ -20,10 +20,10 @@
#include <string.h>
#include "include/constants.h"
#include "util/basename.h"
#include "opal/util/basename.h"
char *ompi_basename(const char *filename)
char *opal_basename(const char *filename)
{
size_t i;
char *tmp, *ret = NULL;

8
opal/util/basename.h
Просмотреть файл

@ -20,8 +20,8 @@
* Returns an OS-independant basename() of a given filename.
*/
#ifndef OMPI_OS_BASENAME_H
#define OMPI_OS_BASENAME_H
#ifndef OPAL_BASENAME_H
#define OPAL_BASENAME_H
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {
@ -61,10 +61,10 @@ extern "C" {
*
* G:\ returns "G:"
*/
char *ompi_basename(const char* filename);
char *opal_basename(const char* filename);
#if defined(c_plusplus) || defined(__cplusplus)
}
#endif
#endif /* OMPI_OS_BASENAME_H */
#endif /* OPAL_BASENAME_H */

10
opal/util/bit_ops.h
Просмотреть файл

@ -14,8 +14,8 @@
* $HEADER$
*/
#ifndef OMPI_BIT_OPS_H
#define OMPI_BIT_OPS_H
#ifndef OPAL_BIT_OPS_H
#define OPAL_BIT_OPS_H
/**
* Calculates the highest bit in an integer
@ -32,7 +32,7 @@
* WARNING: *NO* error checking is performed. This is meant to be a
* fast inline function.
*/
static inline int ompi_hibit(int value, int start)
static inline int opal_hibit(int value, int start)
{
unsigned int mask;
@ -62,7 +62,7 @@ static inline int ompi_hibit(int value, int start)
* WARNING: *NO* error checking is performed. This is meant to be a
* fast inline function.
*/
static inline int ompi_cube_dim(int value)
static inline int opal_cube_dim(int value)
{
int dim, size;
@ -73,4 +73,4 @@ static inline int ompi_cube_dim(int value)
return dim;
}
#endif /* OMPI_BIT_OPS_H */
#endif /* OPAL_BIT_OPS_H */

152
opal/util/cmd_line.c
Просмотреть файл

@ -24,8 +24,8 @@
#include "opal/class/opal_object.h"
#include "opal/class/opal_list.h"
#include "opal/threads/mutex.h"
#include "util/argv.h"
#include "util/cmd_line.h"
#include "opal/util/argv.h"
#include "opal/util/cmd_line.h"
#include "util/strncpy.h"
#include "opal/util/output.h"
#include "mca/base/mca_base_param.h"
@ -56,7 +56,7 @@ struct cmd_line_option_t {
int clo_num_params;
char *clo_description;
ompi_cmd_line_type_t clo_type;
opal_cmd_line_type_t clo_type;
char *clo_mca_param_env_var;
void *clo_variable_dest;
bool clo_variable_set;
@ -100,11 +100,11 @@ static OBJ_CLASS_INSTANCE(cmd_line_param_t,
param_constructor, param_destructor);
/*
* Instantiate the ompi_cmd_line_t class
* Instantiate the opal_cmd_line_t class
*/
static void cmd_line_constructor(ompi_cmd_line_t *cmd);
static void cmd_line_destructor(ompi_cmd_line_t *cmd);
OBJ_CLASS_INSTANCE(ompi_cmd_line_t,
static void cmd_line_constructor(opal_cmd_line_t *cmd);
static void cmd_line_destructor(opal_cmd_line_t *cmd);
OBJ_CLASS_INSTANCE(opal_cmd_line_t,
opal_object_t,
cmd_line_constructor,
cmd_line_destructor);
@ -119,13 +119,13 @@ static char special_empty_token[] = {
/*
* Private functions
*/
static int make_opt(ompi_cmd_line_t *cmd, ompi_cmd_line_init_t *e);
static void free_parse_results(ompi_cmd_line_t *cmd);
static int split_shorts(ompi_cmd_line_t *cmd,
static int make_opt(opal_cmd_line_t *cmd, opal_cmd_line_init_t *e);
static void free_parse_results(opal_cmd_line_t *cmd);
static int split_shorts(opal_cmd_line_t *cmd,
char *token, char **args,
int *output_argc, char ***output_argv,
int *num_args_used, bool ignore_unknown);
static cmd_line_option_t *find_option(ompi_cmd_line_t *cmd,
static cmd_line_option_t *find_option(opal_cmd_line_t *cmd,
const char *option_name);
static void set_dest(cmd_line_option_t *option, char *sval);
@ -133,8 +133,8 @@ static void set_dest(cmd_line_option_t *option, char *sval);
/*
* Create an entire command line handle from a table
*/
int ompi_cmd_line_create(ompi_cmd_line_t *cmd,
ompi_cmd_line_init_t *table)
int opal_cmd_line_create(opal_cmd_line_t *cmd,
opal_cmd_line_init_t *table)
{
int i, ret;
@ -143,7 +143,7 @@ int ompi_cmd_line_create(ompi_cmd_line_t *cmd,
if (NULL == cmd) {
return OMPI_ERR_BAD_PARAM;
}
OBJ_CONSTRUCT(cmd, ompi_cmd_line_t);
OBJ_CONSTRUCT(cmd, opal_cmd_line_t);
/* Ensure we got a table */
@ -175,11 +175,11 @@ int ompi_cmd_line_create(ompi_cmd_line_t *cmd,
/*
* Create a command line option, --long-name and/or -s (short name).
*/
int ompi_cmd_line_make_opt(ompi_cmd_line_t *cmd, char short_name,
int opal_cmd_line_make_opt(opal_cmd_line_t *cmd, char short_name,
const char *long_name, int num_params,
const char *desc)
{
ompi_cmd_line_init_t e;
opal_cmd_line_init_t e;
e.ocl_mca_type_name = NULL;
e.ocl_mca_component_name = NULL;
@ -192,7 +192,7 @@ int ompi_cmd_line_make_opt(ompi_cmd_line_t *cmd, char short_name,
e.ocl_num_params = num_params;
e.ocl_variable_dest = NULL;
e.ocl_variable_type = OMPI_CMD_LINE_TYPE_NULL;
e.ocl_variable_type = OPAL_CMD_LINE_TYPE_NULL;
e.ocl_description = desc;
@ -203,11 +203,11 @@ int ompi_cmd_line_make_opt(ompi_cmd_line_t *cmd, char short_name,
/*
* Create a command line option, --long-name and/or -s (short name).
*/
int ompi_cmd_line_make_opt3(ompi_cmd_line_t *cmd, char short_name,
int opal_cmd_line_make_opt3(opal_cmd_line_t *cmd, char short_name,
const char *sd_name, const char *long_name,
int num_params, const char *desc)
{
ompi_cmd_line_init_t e;
opal_cmd_line_init_t e;
e.ocl_mca_type_name = NULL;
e.ocl_mca_component_name = NULL;
@ -220,7 +220,7 @@ int ompi_cmd_line_make_opt3(ompi_cmd_line_t *cmd, char short_name,
e.ocl_num_params = num_params;
e.ocl_variable_dest = NULL;
e.ocl_variable_type = OMPI_CMD_LINE_TYPE_NULL;
e.ocl_variable_type = OPAL_CMD_LINE_TYPE_NULL;
e.ocl_description = desc;
@ -229,10 +229,10 @@ int ompi_cmd_line_make_opt3(ompi_cmd_line_t *cmd, char short_name,
/*
* Parse a command line according to a pre-built OMPI command line
* Parse a command line according to a pre-built OPAL command line
* handle.
*/
int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
int opal_cmd_line_parse(opal_cmd_line_t *cmd, bool ignore_unknown,
int argc, char **argv)
{
int i, j, orig, ret;
@ -261,7 +261,7 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
/* Analyze each token */
cmd->lcl_argc = argc;
cmd->lcl_argv = ompi_argv_copy(argv);
cmd->lcl_argv = opal_argv_copy(argv);
/* Now traverse the easy-to-parse sequence of tokens. Note that
incrementing i must happen elsehwere; it can't be the third
@ -280,7 +280,7 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
if (0 == strcmp(cmd->lcl_argv[i], "--")) {
++i;
while (i < cmd->lcl_argc) {
ompi_argv_append(&cmd->lcl_tail_argc, &cmd->lcl_tail_argv,
opal_argv_append(&cmd->lcl_tail_argc, &cmd->lcl_tail_argv,
cmd->lcl_argv[i]);
++i;
}
@ -325,15 +325,15 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
option = find_option(cmd, shortsv[0] + 1);
if (NULL != option) {
ompi_argv_delete(&cmd->lcl_argc,
opal_argv_delete(&cmd->lcl_argc,
&cmd->lcl_argv, i,
1 + num_args_used);
ompi_argv_insert(&cmd->lcl_argv, i, shortsv);
cmd->lcl_argc = ompi_argv_count(cmd->lcl_argv);
opal_argv_insert(&cmd->lcl_argv, i, shortsv);
cmd->lcl_argc = opal_argv_count(cmd->lcl_argv);
} else {
is_unknown = true;
}
ompi_argv_free(shortsv);
opal_argv_free(shortsv);
} else {
is_unknown = true;
}
@ -392,7 +392,7 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
cmd->lcl_argv[orig],
option->clo_num_params);
if (NULL != param->clp_argv)
ompi_argv_free(param->clp_argv);
opal_argv_free(param->clp_argv);
OBJ_RELEASE(param);
i = cmd->lcl_argc;
break;
@ -403,7 +403,7 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
else {
/* Save in the argv on the param entry */
ompi_argv_append(&param->clp_argc,
opal_argv_append(&param->clp_argc,
&param->clp_argv,
cmd->lcl_argv[i]);
@ -427,7 +427,7 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
}
/* If we succeeded in all that, save the param to the
list on the ompi_cmd_line_t handle */
list on the opal_cmd_line_t handle */
if (NULL != param) {
opal_list_append(&cmd->lcl_params, &param->super);
@ -446,7 +446,7 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
cmd->lcl_argv[i]);
}
while (i < cmd->lcl_argc) {
ompi_argv_append(&cmd->lcl_tail_argc, &cmd->lcl_tail_argv,
opal_argv_append(&cmd->lcl_tail_argc, &cmd->lcl_tail_argv,
cmd->lcl_argv[i]);
++i;
}
@ -464,9 +464,9 @@ int ompi_cmd_line_parse(ompi_cmd_line_t *cmd, bool ignore_unknown,
/*
* Return a consolidated "usage" message for a OMPI command line handle.
* Return a consolidated "usage" message for a OPAL command line handle.
*/
char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
char *opal_cmd_line_get_usage_msg(opal_cmd_line_t *cmd)
{
int i, len=MAX_WIDTH * 2, prev_len;
int argc;
@ -537,7 +537,7 @@ char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
and start adding the description on the next line. */
if (strlen(line) > PARAM_WIDTH) {
ompi_argv_append(&argc, &argv, line);
opal_argv_append(&argc, &argv, line);
/* Now reset the line to be all blanks up to
PARAM_WIDTH so that we can start adding the
@ -584,7 +584,7 @@ char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
if (strlen(start) < (MAX_WIDTH - PARAM_WIDTH)) {
strcat(line, start);
ompi_argv_append(&argc, &argv, line);
opal_argv_append(&argc, &argv, line);
break;
}
@ -597,7 +597,7 @@ char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
if (isspace(*ptr)) {
*ptr = '\0';
strcat(line, start);
ompi_argv_append(&argc, &argv, line);
opal_argv_append(&argc, &argv, line);
start = ptr + 1;
memset(line, ' ', PARAM_WIDTH);
@ -617,7 +617,7 @@ char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
*ptr = '\0';
strcat(line, start);
ompi_argv_append(&argc, &argv, line);
opal_argv_append(&argc, &argv, line);
start = ptr + 1;
memset(line, ' ', PARAM_WIDTH);
@ -631,7 +631,7 @@ char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
if (ptr >= start + len) {
strcat(line, start);
ompi_argv_append(&argc, &argv, line);
opal_argv_append(&argc, &argv, line);
start = desc + len + 1;
}
}
@ -640,8 +640,8 @@ char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
}
}
if (NULL != argv) {
ret = ompi_argv_join(argv, '\n');
ompi_argv_free(argv);
ret = opal_argv_join(argv, '\n');
opal_argv_free(argv);
} else {
ret = strdup("");
}
@ -659,16 +659,16 @@ char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd)
/*
* Test if a given option was taken on the parsed command line.
*/
bool ompi_cmd_line_is_taken(ompi_cmd_line_t *cmd, const char *opt)
bool opal_cmd_line_is_taken(opal_cmd_line_t *cmd, const char *opt)
{
return (ompi_cmd_line_get_ninsts(cmd, opt) > 0);
return (opal_cmd_line_get_ninsts(cmd, opt) > 0);
}
/*
* Return the number of instances of an option found during parsing.
*/
int ompi_cmd_line_get_ninsts(ompi_cmd_line_t *cmd, const char *opt)
int opal_cmd_line_get_ninsts(opal_cmd_line_t *cmd, const char *opt)
{
int ret;
opal_list_item_t *item;
@ -709,7 +709,7 @@ int ompi_cmd_line_get_ninsts(ompi_cmd_line_t *cmd, const char *opt)
* Return a specific parameter for a specific instance of a option
* from the parsed command line.
*/
char *ompi_cmd_line_get_param(ompi_cmd_line_t *cmd, const char *opt, int inst,
char *opal_cmd_line_get_param(opal_cmd_line_t *cmd, const char *opt, int inst,
int idx)
{
int num_found;
@ -758,18 +758,18 @@ char *ompi_cmd_line_get_param(ompi_cmd_line_t *cmd, const char *opt, int inst,
/*
* Return the number of arguments parsed on a OMPI command line handle.
* Return the number of arguments parsed on a OPAL command line handle.
*/
int ompi_cmd_line_get_argc(ompi_cmd_line_t *cmd)
int opal_cmd_line_get_argc(opal_cmd_line_t *cmd)
{
return (NULL != cmd) ? cmd->lcl_argc : OMPI_ERROR;
}
/*
* Return a string argument parsed on a OMPI command line handle.
* Return a string argument parsed on a OPAL command line handle.
*/
char *ompi_cmd_line_get_argv(ompi_cmd_line_t *cmd, int index)
char *opal_cmd_line_get_argv(opal_cmd_line_t *cmd, int index)
{
return (NULL == cmd) ? NULL :
(index >= cmd->lcl_argc || index < 0) ? NULL : cmd->lcl_argv[index];
@ -777,15 +777,15 @@ char *ompi_cmd_line_get_argv(ompi_cmd_line_t *cmd, int index)
/*
* Return the entire "tail" of unprocessed argv from a OMPI command
* Return the entire "tail" of unprocessed argv from a OPAL command
* line handle.
*/
int ompi_cmd_line_get_tail(ompi_cmd_line_t *cmd, int *tailc, char ***tailv)
int opal_cmd_line_get_tail(opal_cmd_line_t *cmd, int *tailc, char ***tailv)
{
if (NULL != cmd) {
opal_mutex_lock(&cmd->lcl_mutex);
*tailc = cmd->lcl_tail_argc;
*tailv = ompi_argv_copy(cmd->lcl_tail_argv);
*tailv = opal_argv_copy(cmd->lcl_tail_argv);
opal_mutex_unlock(&cmd->lcl_mutex);
return OMPI_SUCCESS;
} else {
@ -806,7 +806,7 @@ static void option_constructor(cmd_line_option_t *o)
o->clo_num_params = 0;
o->clo_description = NULL;
o->clo_type = OMPI_CMD_LINE_TYPE_NULL;
o->clo_type = OPAL_CMD_LINE_TYPE_NULL;
o->clo_mca_param_env_var = NULL;
o->clo_variable_dest = NULL;
o->clo_variable_set = false;
@ -842,12 +842,12 @@ static void param_constructor(cmd_line_param_t *p)
static void param_destructor(cmd_line_param_t *p)
{
if (NULL != p->clp_argv) {
ompi_argv_free(p->clp_argv);
opal_argv_free(p->clp_argv);
}
}
static void cmd_line_constructor(ompi_cmd_line_t *cmd)
static void cmd_line_constructor(opal_cmd_line_t *cmd)
{
/* Initialize the mutex. Since we're creating (and therefore the
only thread that has this instance), there's no need to lock it
@ -869,7 +869,7 @@ static void cmd_line_constructor(ompi_cmd_line_t *cmd)
}
static void cmd_line_destructor(ompi_cmd_line_t *cmd)
static void cmd_line_destructor(opal_cmd_line_t *cmd)
{
opal_list_item_t *item;
@ -897,7 +897,7 @@ static void cmd_line_destructor(ompi_cmd_line_t *cmd)
}
static int make_opt(ompi_cmd_line_t *cmd, ompi_cmd_line_init_t *e)
static int make_opt(opal_cmd_line_t *cmd, opal_cmd_line_init_t *e)
{
cmd_line_option_t *option;
@ -953,7 +953,7 @@ static int make_opt(ompi_cmd_line_t *cmd, ompi_cmd_line_init_t *e)
}
static void free_parse_results(ompi_cmd_line_t *cmd)
static void free_parse_results(opal_cmd_line_t *cmd)
{
opal_list_item_t *item;
@ -969,13 +969,13 @@ static void free_parse_results(ompi_cmd_line_t *cmd)
/* Free the argv's */
if (NULL != cmd->lcl_argv) {
ompi_argv_free(cmd->lcl_argv);
opal_argv_free(cmd->lcl_argv);
}
cmd->lcl_argv = NULL;
cmd->lcl_argc = 0;
if (NULL != cmd->lcl_tail_argv) {
ompi_argv_free(cmd->lcl_tail_argv);
opal_argv_free(cmd->lcl_tail_argv);
}
cmd->lcl_tail_argv = NULL;
cmd->lcl_tail_argc = 0;
@ -988,7 +988,7 @@ static void free_parse_results(ompi_cmd_line_t *cmd)
* short name). Ensure to differentiate the resulting options from
* "single dash" names.
*/
static int split_shorts(ompi_cmd_line_t *cmd, char *token, char **args,
static int split_shorts(opal_cmd_line_t *cmd, char *token, char **args,
int *output_argc, char ***output_argv,
int *num_args_used, bool ignore_unknown)
{
@ -999,7 +999,7 @@ static int split_shorts(ompi_cmd_line_t *cmd, char *token, char **args,
/* Setup that we didn't use any of the args */
num_args = ompi_argv_count(args);
num_args = opal_argv_count(args);
*num_args_used = 0;
/* Traverse the token. If it's empty (e.g., if someone passes a
@ -1024,7 +1024,7 @@ static int split_shorts(ompi_cmd_line_t *cmd, char *token, char **args,
if (!ignore_unknown) {
return OMPI_ERR_BAD_PARAM;
} else {
ompi_argv_append(output_argc, output_argv, fake_token);
opal_argv_append(output_argc, output_argv, fake_token);
}
}
@ -1034,14 +1034,14 @@ static int split_shorts(ompi_cmd_line_t *cmd, char *token, char **args,
handled at a higher level) */
else {
ompi_argv_append(output_argc, output_argv, fake_token);
opal_argv_append(output_argc, output_argv, fake_token);
for (j = 0; j < option->clo_num_params; ++j) {
if (*num_args_used < num_args) {
ompi_argv_append(output_argc, output_argv,
opal_argv_append(output_argc, output_argv,
args[*num_args_used]);
++(*num_args_used);
} else {
ompi_argv_append(output_argc, output_argv,
opal_argv_append(output_argc, output_argv,
special_empty_token);
}
}
@ -1054,14 +1054,14 @@ static int split_shorts(ompi_cmd_line_t *cmd, char *token, char **args,
}
static cmd_line_option_t *find_option(ompi_cmd_line_t *cmd,
static cmd_line_option_t *find_option(opal_cmd_line_t *cmd,
const char *option_name)
{
opal_list_item_t *item;
cmd_line_option_t *option;
/* Iterate through the list of options hanging off the
ompi_cmd_line_t and see if we find a match in either the short
opal_cmd_line_t and see if we find a match in either the short
or long names */
for (item = opal_list_get_first(&cmd->lcl_options);
@ -1102,12 +1102,12 @@ static void set_dest(cmd_line_option_t *option, char *sval)
if (NULL != option->clo_mca_param_env_var) {
switch(option->clo_type) {
case OMPI_CMD_LINE_TYPE_STRING:
case OMPI_CMD_LINE_TYPE_INT:
case OMPI_CMD_LINE_TYPE_SIZE_T:
case OPAL_CMD_LINE_TYPE_STRING:
case OPAL_CMD_LINE_TYPE_INT:
case OPAL_CMD_LINE_TYPE_SIZE_T:
asprintf(&str, "%s=%s", option->clo_mca_param_env_var, sval);
break;
case OMPI_CMD_LINE_TYPE_BOOL:
case OPAL_CMD_LINE_TYPE_BOOL:
asprintf(&str, "%s=1", option->clo_mca_param_env_var);
break;
default:
@ -1122,16 +1122,16 @@ static void set_dest(cmd_line_option_t *option, char *sval)
if (NULL != option->clo_variable_dest) {
switch(option->clo_type) {
case OMPI_CMD_LINE_TYPE_STRING:
case OPAL_CMD_LINE_TYPE_STRING:
*((char**) option->clo_variable_dest) = strdup(sval);
break;
case OMPI_CMD_LINE_TYPE_INT:
case OPAL_CMD_LINE_TYPE_INT:
*((int*) option->clo_variable_dest) = ival;
break;
case OMPI_CMD_LINE_TYPE_SIZE_T:
case OPAL_CMD_LINE_TYPE_SIZE_T:
*((size_t*) option->clo_variable_dest) = lval;
break;
case OMPI_CMD_LINE_TYPE_BOOL:
case OPAL_CMD_LINE_TYPE_BOOL:
*((bool*) option->clo_variable_dest) = 1;
break;
default:

198
opal/util/cmd_line.h
Просмотреть файл

@ -47,7 +47,7 @@
* "foo":
*
* \code
* ompi_cmd_line_make_opt3(cmd, 'a', NULL, 'add', 1, "Add a user");
* opal_cmd_line_make_opt3(cmd, 'a', NULL, 'add', 1, "Add a user");
* \endcode
*
* In this case, the following command lines are exactly equivalent:
@ -66,10 +66,10 @@
* \endverbatim
*
* The caller to this interface creates a command line handle
* (ompi_cmd_line_t) with OBJ_NEW() and then uses it to register the
* desired parameters via ompi_cmd_line_make_opt3() (or the deprecated
* ompi_cmd_line_make_opt()). Once all the parameters have been
* registered, the user invokes ompi_cmd_line_parse() with the command
* (opal_cmd_line_t) with OBJ_NEW() and then uses it to register the
* desired parameters via opal_cmd_line_make_opt3() (or the deprecated
* opal_cmd_line_make_opt()). Once all the parameters have been
* registered, the user invokes opal_cmd_line_parse() with the command
* line handle and the argv/argc pair to be parsed (typically the
* arguments from main()). The parser will examine the argv and find
* registered options and parameters. It will stop parsing when it
@ -79,34 +79,34 @@
* used to determine which options were selected, what parameters were
* passed to them, etc.:
*
* - ompi_cmd_line_get_usage_msg() returns a string suitable for "help"
* - opal_cmd_line_get_usage_msg() returns a string suitable for "help"
* kinds of messages.
* - ompi_cmd_line_is_taken() returns a true or false indicating
* - opal_cmd_line_is_taken() returns a true or false indicating
* whether a given command line option was found on the command
* line.
* - ompi_cmd_line_get_argc() returns the number of tokens parsed on
* - opal_cmd_line_get_argc() returns the number of tokens parsed on
* the handle.
* - ompi_cmd_line_get_argv() returns any particular string from the
* - opal_cmd_line_get_argv() returns any particular string from the
* original argv.
* - ompi_cmd_line_get_ninsts() returns the number of times a
* - opal_cmd_line_get_ninsts() returns the number of times a
* particular option was found on a command line.
* - ompi_cmd_line_get_param() returns the Nth parameter in the Mth
* - opal_cmd_line_get_param() returns the Nth parameter in the Mth
* instance of a given parameter.
* - ompi_cmd_line_get_tail() returns an array of tokens not parsed
* - opal_cmd_line_get_tail() returns an array of tokens not parsed
* (i.e., if the parser ran into "--" or an unrecognized token).
*
* Note that a shortcut to creating a large number of options exists
* -- one can make a table of ompi_cmd_line_init_t instances and the
* table to ompi_cmd_line_create(). This creates an ompi_cmd_line_t
* -- one can make a table of opal_cmd_line_init_t instances and the
* table to opal_cmd_line_create(). This creates an opal_cmd_line_t
* handle that is pre-seeded with all the options from the table
* without the need to repeatedly invoke ompi_cmd_line_make_opt3() (or
* equivalent). This ompi_cmd_line_t instance is just like any other;
* without the need to repeatedly invoke opal_cmd_line_make_opt3() (or
* equivalent). This opal_cmd_line_t instance is just like any other;
* it is still possible to add more options via
* ompi_cmd_line_make_opt3(), etc.
* opal_cmd_line_make_opt3(), etc.
*/
#ifndef OMPI_CMD_LINE_H
#define OMPI_CMD_LINE_H
#ifndef OPAL_CMD_LINE_H
#define OPAL_CMD_LINE_H
#include "ompi_config.h"
@ -122,7 +122,7 @@ extern "C" {
*
* Main top-level handle. This interface should not be used by users!
*/
struct ompi_cmd_line_t {
struct opal_cmd_line_t {
/** Make this an OBJ handle */
opal_object_t super;
@ -132,9 +132,9 @@ extern "C" {
/** List of cmd_line_option_t's (defined internally) */
opal_list_t lcl_options;
/** Duplicate of argc from ompi_cmd_line_parse() */
/** Duplicate of argc from opal_cmd_line_parse() */
int lcl_argc;
/** Duplicate of argv from ompi_cmd_line_parse() */
/** Duplicate of argv from opal_cmd_line_parse() */
char **lcl_argv;
/** Parsed output; list of cmd_line_param_t's (defined internally) */
@ -150,32 +150,32 @@ extern "C" {
*
* Convenience typedef
*/
typedef struct ompi_cmd_line_t ompi_cmd_line_t;
typedef struct opal_cmd_line_t opal_cmd_line_t;
/**
* Data types supported by the parser
*/
enum ompi_cmd_line_type_t {
OMPI_CMD_LINE_TYPE_NULL,
OMPI_CMD_LINE_TYPE_STRING,
OMPI_CMD_LINE_TYPE_INT,
OMPI_CMD_LINE_TYPE_SIZE_T,
OMPI_CMD_LINE_TYPE_BOOL,
enum opal_cmd_line_type_t {
OPAL_CMD_LINE_TYPE_NULL,
OPAL_CMD_LINE_TYPE_STRING,
OPAL_CMD_LINE_TYPE_INT,
OPAL_CMD_LINE_TYPE_SIZE_T,
OPAL_CMD_LINE_TYPE_BOOL,
OMPI_CMD_LINE_TYPE_MAX
OPAL_CMD_LINE_TYPE_MAX
};
/**
* \internal
*
* Convenience typedef
*/
typedef enum ompi_cmd_line_type_t ompi_cmd_line_type_t;
typedef enum opal_cmd_line_type_t opal_cmd_line_type_t;
/**
* Datatype used to construct a command line handle; see
* ompi_cmd_line_create().
* opal_cmd_line_create().
*/
struct ompi_cmd_line_init_t {
struct opal_cmd_line_init_t {
/** If want to set an MCA parameter, set its type name here.
WARNING: This MCA tuple (type, component, param) will
eventually be replaced with a single name! */
@ -206,10 +206,10 @@ extern "C" {
void *ocl_variable_dest;
/** If an ocl_variable_dest is given, its datatype must be
supplied as well. */
ompi_cmd_line_type_t ocl_variable_type;
opal_cmd_line_type_t ocl_variable_type;
/** Description of the command line option, to be used with
ompi_cmd_line_get_usage_msg(). */
opal_cmd_line_get_usage_msg(). */
const char *ocl_description;
};
/**
@ -217,39 +217,39 @@ extern "C" {
*
* Convenience typedef
*/
typedef struct ompi_cmd_line_init_t ompi_cmd_line_init_t;
typedef struct opal_cmd_line_init_t opal_cmd_line_init_t;
/**
* Top-level command line handle.
*
* This handle is used for accessing all command line functionality
* (i.e., all ompi_cmd_line*() functions). Multiple handles can be
* (i.e., all opal_cmd_line*() functions). Multiple handles can be
* created and simultaneously processed; each handle is independant
* from others.
*
* The ompi_cmd_line_t handles are [simplisticly] thread safe;
* The opal_cmd_line_t handles are [simplisticly] thread safe;
* processing is guaranteed to be mutually exclusive if multiple
* threads invoke functions on the same handle at the same time --
* access will be serialized in an unspecified order.
*
* Once finished, handles should be released with OBJ_RELEASE(). The
* destructor for ompi_cmd_line_t handles will free all memory
* destructor for opal_cmd_line_t handles will free all memory
* associated with the handle.
*/
OMPI_DECLSPEC OBJ_CLASS_DECLARATION(ompi_cmd_line_t);
OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_cmd_line_t);
/**
* Make a command line handle from a table of initializers.
*
* @param cmd OMPI command line handle.
* @param table Table of ompi_cmd_line_init_t instances for all
* @param cmd OPAL command line handle.
* @param table Table of opal_cmd_line_init_t instances for all
* the options to be included in the resulting command line
* handler.
*
* @retval OMPI_SUCCESS Upon success.
*
* This function takes a table of ompi_cmd_line_init_t instances
* to pre-seed an OMPI command line handle. The last instance in
* This function takes a table of opal_cmd_line_init_t instances
* to pre-seed an OPAL command line handle. The last instance in
* the table must have '\0' for the short name and NULL for the
* single-dash and long names. The handle is expected to have
* been OBJ_NEW'ed or OBJ_CONSTRUCT'ed already.
@ -258,32 +258,32 @@ extern "C" {
* sample using this syntax:
*
* \code
* ompi_cmd_line_init_t cmd_line_init[] = {
* opal_cmd_line_init_t cmd_line_init[] = {
* { NULL, NULL, NULL, 'h', NULL, "help", 0,
* &orterun_globals.help, OMPI_CMD_LINE_TYPE_BOOL,
* &orterun_globals.help, OPAL_CMD_LINE_TYPE_BOOL,
* "This help message" },
*
* { NULL, NULL, NULL, '\0', NULL, "wd", 1,
* &orterun_globals.wd, OMPI_CMD_LINE_TYPE_STRING,
* &orterun_globals.wd, OPAL_CMD_LINE_TYPE_STRING,
* "Set the working directory of the started processes" },
*
* { NULL, NULL, NULL, '\0', NULL, NULL, 0,
* NULL, OMPI_CMD_LINE_TYPE_NULL, NULL }
* NULL, OPAL_CMD_LINE_TYPE_NULL, NULL }
* };
* \endcode
*/
OMPI_DECLSPEC int ompi_cmd_line_create(ompi_cmd_line_t *cmd,
ompi_cmd_line_init_t *table);
OMPI_DECLSPEC int opal_cmd_line_create(opal_cmd_line_t *cmd,
opal_cmd_line_init_t *table);
/**
* Create a command line option.
*
* This function is an older [deprecated] form of
* ompi_cmd_line_make_opt3(). It is exactly equivalent to
* ompi_cmd_line_make_opt3(cmd, short_name, NULL, long_name,
* opal_cmd_line_make_opt3(). It is exactly equivalent to
* opal_cmd_line_make_opt3(cmd, short_name, NULL, long_name,
* num_params, desc).
*/
OMPI_DECLSPEC int ompi_cmd_line_make_opt(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC int opal_cmd_line_make_opt(opal_cmd_line_t *cmd,
char short_name,
const char *long_name,
int num_params,
@ -292,7 +292,7 @@ extern "C" {
/**
* Create a command line option.
*
* @param cmd OMPI command line handle.
* @param cmd OPAL command line handle.
* @param short_name "Short" name of the command line option.
* @param sd_name "Single dash" name of the command line option.
* @param long_name "Long" name of the command line option.
@ -303,7 +303,7 @@ extern "C" {
* @retval OMPI_ERR_BAD_PARAM If bad parameters passed.
* @retval OMPI_SUCCESS Upon success.
*
* Adds a command line option to the list of options that a a OMPI
* Adds a command line option to the list of options that a a OPAL
* command line handle will accept. The short_name may take the
* special value '\0' to not have a short name. Likewise, the
* sd_name and long_name may take the special value NULL to not have
@ -314,10 +314,10 @@ extern "C" {
* must be greater than or equal to 0.
*
* Finally, desc is a short string description of this option. It is
* used to generate the output from ompi_cmd_line_get_usage_msg().
* used to generate the output from opal_cmd_line_get_usage_msg().
*
*/
OMPI_DECLSPEC int ompi_cmd_line_make_opt3(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC int opal_cmd_line_make_opt3(opal_cmd_line_t *cmd,
char short_name,
const char *sd_name,
const char *long_name,
@ -325,19 +325,19 @@ extern "C" {
const char *desc);
/**
* Parse a command line according to a pre-built OMPI command line
* Parse a command line according to a pre-built OPAL command line
* handle.
*
* @param cmd OMPI command line handle.
* @param cmd OPAL command line handle.
* @param ignore_unknown Whether to print an error message upon
* finding an unknown token or not
* @param argc Length of the argv array.
* @param argv Array of strings from the command line.
*
* @retval OMPI_SUCCESS Upon success.
* @retval OPAL_SUCCESS Upon success.
*
* Parse a series of command line tokens according to the option
* descriptions from a OMPI command line handle. The OMPI command line
* descriptions from a OPAL command line handle. The OPAL command line
* handle can then be queried to see what options were used, what
* their parameters were, etc.
*
@ -360,7 +360,7 @@ extern "C" {
* Upon any of these conditions, any remaining tokens will be placed
* in the "tail" (and therefore not examined by the parser),
* regardless of the value of ignore_unknown. The set of tail
* tokens is available from the ompi_cmd_line_get_tail() function.
* tokens is available from the opal_cmd_line_get_tail() function.
*
* Note that "--" is ignored if it is found in the middle an expected
* number of arguments. For example, if "--foo" is expected to have 3
@ -375,21 +375,21 @@ extern "C" {
* Invoking this function multiple times on different sets of argv
* tokens is safe, but will erase any previous parsing results.
*/
OMPI_DECLSPEC int ompi_cmd_line_parse(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC int opal_cmd_line_parse(opal_cmd_line_t *cmd,
bool ignore_unknown,
int argc, char **argv);
/**
* Return a consolidated "usage" message for a OMPI command line handle.
* Return a consolidated "usage" message for a OPAL command line handle.
*
* @param cmd OMPI command line handle.
* @param cmd OPAL command line handle.
*
* @retval str Usage message.
*
* Returns a formatted string suitable for printing that lists the
* expected usage message and a short description of each option on
* the OMPI command line handle. Options that passed a NULL
* description to ompi_cmd_line_make_opt() will not be included in the
* the OPAL command line handle. Options that passed a NULL
* description to opal_cmd_line_make_opt() will not be included in the
* display (to allow for undocumented options).
*
* This function is typically only invoked internally by the
@ -400,47 +400,47 @@ extern "C" {
*
* The returned string must be freed by the caller.
*/
OMPI_DECLSPEC char *ompi_cmd_line_get_usage_msg(ompi_cmd_line_t *cmd);
OMPI_DECLSPEC char *opal_cmd_line_get_usage_msg(opal_cmd_line_t *cmd);
/**
* Test if a given option was taken on the parsed command line.
*
* @param cmd OMPI command line handle.
* @param cmd OPAL command line handle.
* @param opt Short or long name of the option to check for.
*
* @retval true If the command line option was found during
* ompi_cmd_line_parse().
* opal_cmd_line_parse().
*
* @retval false If the command line option was not found during
* ompi_cmd_line_parse(), or ompi_cmd_line_parse() was not invoked on
* opal_cmd_line_parse(), or opal_cmd_line_parse() was not invoked on
* this handle.
*
* This function should only be called after ompi_cmd_line_parse().
* This function should only be called after opal_cmd_line_parse().
*
* The function will return true if the option matching opt was found
* (either by its short or long name) during token parsing.
* Otherwise, it will return false.
*/
OMPI_DECLSPEC bool ompi_cmd_line_is_taken(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC bool opal_cmd_line_is_taken(opal_cmd_line_t *cmd,
const char *opt);
/**
* Return the number of arguments parsed on a OMPI command line handle.
* Return the number of arguments parsed on a OPAL command line handle.
*
* @param cmd A pointer to the OMPI command line handle.
* @param cmd A pointer to the OPAL command line handle.
*
* @retval OMPI_ERROR If cmd is NULL.
* @retval argc Number of arguments previously added to the handle.
*
* Arguments are added to the handle via the ompi_cmd_line_parse()
* Arguments are added to the handle via the opal_cmd_line_parse()
* function.
*/
OMPI_DECLSPEC int ompi_cmd_line_get_argc(ompi_cmd_line_t *cmd);
OMPI_DECLSPEC int opal_cmd_line_get_argc(opal_cmd_line_t *cmd);
/**
* Return a string argument parsed on a OMPI command line handle.
* Return a string argument parsed on a OPAL command line handle.
*
* @param cmd A pointer to the OMPI command line handle.
* @param cmd A pointer to the OPAL command line handle.
* @param index The nth argument from the command line (0 is
* argv[0], etc.).
*
@ -449,42 +449,42 @@ extern "C" {
*
* This function returns a single token from the arguments parsed
* on this handle. Arguments are added bia the
* ompi_cmd_line_parse() function.
* opal_cmd_line_parse() function.
*
* What is returned is a pointer to the actual string that is on
* the handle; it should not be modified or freed.
*/
OMPI_DECLSPEC char *ompi_cmd_line_get_argv(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC char *opal_cmd_line_get_argv(opal_cmd_line_t *cmd,
int index);
/**
* Return the number of instances of an option found during parsing.
*
* @param cmd OMPI command line handle.
* @param cmd OPAL command line handle.
* @param opt Short or long name of the option to check for.
*
* @retval num Number of instances (to include 0) of a given potion
* found during ompi_cmd_line_parse().
* found during opal_cmd_line_parse().
*
* @retval OMPI_ERR If the command line option was not found during
* ompi_cmd_line_parse(), or ompi_cmd_line_parse() was not invoked on
* opal_cmd_line_parse(), or opal_cmd_line_parse() was not invoked on
* this handle.
*
* This function should only be called after ompi_cmd_line_parse().
* This function should only be called after opal_cmd_line_parse().
*
* The function will return the number of instances of a given option
* (either by its short or long name) -- to include 0 -- or OMPI_ERR if
* either the option was not specified as part of the OMPI command line
* handle, or ompi_cmd_line_parse() was not invoked on this handle.
* either the option was not specified as part of the OPAL command line
* handle, or opal_cmd_line_parse() was not invoked on this handle.
*/
OMPI_DECLSPEC int ompi_cmd_line_get_ninsts(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC int opal_cmd_line_get_ninsts(opal_cmd_line_t *cmd,
const char *opt);
/**
* Return a specific parameter for a specific instance of a option
* from the parsed command line.
*
* @param cmd OMPI command line handle.
* @param cmd OPAL command line handle.
* @param opt Short or long name of the option to check for.
* @param instance_num Instance number of the option to query.
* @param param_num Which parameter to return.
@ -492,7 +492,7 @@ extern "C" {
* @retval param String of the parameter.
* @retval NULL If any of the input values are invalid.
*
* This function should only be called after ompi_cmd_line_parse().
* This function should only be called after opal_cmd_line_parse().
*
* This function returns the Nth parameter for the Ith instance of a
* given option on the parsed command line (both N and I are
@ -500,23 +500,23 @@ extern "C" {
*
* executable --foo bar1 bar2 --foo bar3 bar4
*
* The call to ompi_cmd_line_get_param(cmd, "foo", 1, 1) would return
* "bar4". ompi_cmd_line_get_param(cmd, "bar", 0, 0) would return
* NULL, as would ompi_cmd_line_get_param(cmd, "foo", 2, 2);
* The call to opal_cmd_line_get_param(cmd, "foo", 1, 1) would return
* "bar4". opal_cmd_line_get_param(cmd, "bar", 0, 0) would return
* NULL, as would opal_cmd_line_get_param(cmd, "foo", 2, 2);
*
* The returned string should \em not be modified or freed by the
* caller.
*/
OMPI_DECLSPEC char *ompi_cmd_line_get_param(ompi_cmd_line_t *cmd,
OMPI_DECLSPEC char *opal_cmd_line_get_param(opal_cmd_line_t *cmd,
const char *opt,
int instance_num,
int param_num);
/**
* Return the entire "tail" of unprocessed argv from a OMPI
* Return the entire "tail" of unprocessed argv from a OPAL
* command line handle.
*
* @param cmd A pointer to the OMPI command line handle.
* @param cmd A pointer to the OPAL command line handle.
* @param tailc Pointer to the output length of the null-terminated
* tail argv array.
* @param tailv Pointer to the output null-terminated argv of all
@ -537,9 +537,9 @@ extern "C" {
* length of the null-terminated tailv array (length including the
* final NULL entry). The output tailv parameter will be a copy
* of the tail parameters, and must be freed (likely with a call
* to ompi_argv_free()) by the caller.
* to opal_argv_free()) by the caller.
*/
OMPI_DECLSPEC int ompi_cmd_line_get_tail(ompi_cmd_line_t *cmd, int *tailc,
OMPI_DECLSPEC int opal_cmd_line_get_tail(opal_cmd_line_t *cmd, int *tailc,
char ***tailv);
#if defined(c_plusplus) || defined(__cplusplus)
@ -547,4 +547,4 @@ extern "C" {
#endif
#endif /* OMPI_CMD_LINE_H */
#endif /* OPAL_CMD_LINE_H */

12
opal/util/convert.c
Просмотреть файл

@ -20,13 +20,13 @@
#include <stdlib.h>
#include "include/constants.h"
#include "util/convert.h"
#include "opal/util/convert.h"
#if SIZEOF_SIZE_T <= SIZEOF_INT
/*
* This is the [short] case where we can just cast and we're all good
*/
int ompi_sizet2int(size_t in, int *out, bool want_check)
int opal_size2int(size_t in, int *out, bool want_check)
{
*out = in;
return OMPI_SUCCESS;
@ -42,17 +42,17 @@ static bool init_done = false;
static unsigned int int_pos = -1;
static void ompi_sizet2int_init(void);
static void opal_size2int_init(void);
static void warn(void);
int ompi_sizet2int(size_t in, int *out, bool want_check)
int opal_size2int(size_t in, int *out, bool want_check)
{
int *pos = (int *) &in;
unsigned int i;
if (!init_done) {
ompi_sizet2int_init();
opal_size2int_init();
}
*out = pos[int_pos];
@ -74,7 +74,7 @@ int ompi_sizet2int(size_t in, int *out, bool want_check)
}
static void ompi_sizet2int_init(void)
static void opal_size2int_init(void)
{
size_t bogus = 1;
int *i = (int *) &bogus;

2
opal/util/convert.h
Просмотреть файл

@ -68,6 +68,6 @@
* On platforms where sizeof(size_t) <= sizeof(int), this function
* will aways return OMPI_SUCCESS.
*/
int ompi_sizet2int(size_t in, int *out, bool want_check);
int opal_size2int(size_t in, int *out, bool want_check);
#endif

14
opal/util/daemon_init.c
Просмотреть файл

@ -15,7 +15,7 @@
*/
#include "orte_config.h"
#include "ompi_config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@ -26,10 +26,10 @@
#endif
#include <stdlib.h>
#include "include/orte_constants.h"
#include "util/daemon_init.h"
#include "include/constants.h"
#include "opal/util/daemon_init.h"
int orte_daemon_init(char *working_dir)
int opal_daemon_init(char *working_dir)
{
#ifndef WIN32
/* it seems that there is an entirely different way to write daemons in
@ -41,7 +41,7 @@ int orte_daemon_init(char *working_dir)
int fd;
if ((pid = fork()) < 0) {
return ORTE_ERROR;
return OMPI_ERROR;
} else if (pid != 0) {
exit(0); /* parent goes bye-bye */
}
@ -77,10 +77,10 @@ int orte_daemon_init(char *working_dir)
close(fd);
}
} else {
return ORTE_ERR_FATAL;
return OMPI_ERR_FATAL;
}
return ORTE_SUCCESS;
return OMPI_SUCCESS;
#else
printf ("This function has not been implemented in windows yet, file %s line %d\n", __FILE__, __LINE__);
abort();

7
opal/util/daemon_init.h
Просмотреть файл

@ -15,7 +15,8 @@
*/
/** @file **/
#include "orte_config.h"
#ifndef OPAL_DAEMON_INIT_H
#define OPAL_DAEMON_INIT_H
/*
* Turn a process into a daemon.
@ -30,4 +31,6 @@
* @retval OMPI_SUCCESS Indicates that the conversion was successful
* @retval OMPI_ERROR Indicates that the conversion was not successful - a fork could not be completed.
*/
OMPI_DECLSPEC int orte_daemon_init(char *working_dir);
OMPI_DECLSPEC int opal_daemon_init(char *working_dir);
#endif /* OPAL_DAEMON_INIT_H */

5
opal/util/few.c
Просмотреть файл

@ -16,6 +16,7 @@
#include "ompi_config.h"
#include <stdio.h>
#include <errno.h>
#ifdef HAVE_SYS_WAIT_H
@ -27,9 +28,9 @@
#endif
#include "include/constants.h"
#include "util/few.h"
#include "opal/util/few.h"
int ompi_few(char *argv[], int *status)
int opal_few(char *argv[], int *status)
{
#ifndef WIN32
pid_t pid, ret;

12
opal/util/few.h
Просмотреть файл

@ -14,9 +14,9 @@
* $HEADER$
*/
#ifndef OMPI_FEW_H
#define OMPI_FEW_H
#include "ompi_config.h"
#ifndef OPAL_FEW_H
#define OPAL_FEW_H
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {
#endif
@ -37,7 +37,7 @@ extern "C" {
*
* This function forks, execs, and waits for an executable to
* complete. The input argv must be a NULL-terminated array (perhaps
* built with the ompi_arr_*() interface). Upon success, OMPI_SUCCESS
* built with the opal_arr_*() interface). Upon success, OMPI_SUCCESS
* is returned. This function will wait either until the child
* process has exited or waitpid() returns an error other than EINTR.
*
@ -46,12 +46,12 @@ extern "C" {
* process exited. The WIF* macros (see waitpid(2)) should be used to
* examine the status to see hold the child exited.
*
* \warning This function should not be called if \c ompi_rte_init()
* \warning This function should not be called if \c orte_init()
* or \c MPI_Init() have been called. This function is not
* safe in a multi-threaded environment in which a handler
* for \c SIGCHLD has been registered.
*/
OMPI_DECLSPEC int ompi_few(char *argv[], int *status);
OMPI_DECLSPEC int opal_few(char *argv[], int *status);
#if defined(c_plusplus) || defined(__cplusplus)
}

12
opal/util/ompi_environ.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "include/constants.h"
#include "util/printf.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/ompi_environ.h"
@ -42,13 +42,13 @@ char **ompi_environ_merge(char **minor, char **major)
if (NULL == minor) {
return NULL;
} else {
return ompi_argv_copy(minor);
return opal_argv_copy(minor);
}
}
/* First, copy major */
ret = ompi_argv_copy(major);
ret = opal_argv_copy(major);
/* Do we have something in minor? */
@ -110,7 +110,7 @@ int ompi_setenv(const char *name, const char *value, bool overwrite,
return OMPI_ERR_BAD_PARAM;
} else if (NULL == *env) {
i = 0;
ompi_argv_append(&i, env, newvalue);
opal_argv_append(&i, env, newvalue);
return OMPI_SUCCESS;
}
@ -154,8 +154,8 @@ int ompi_setenv(const char *name, const char *value, bool overwrite,
/* If we found no match, append this value */
i = ompi_argv_count(*env);
ompi_argv_append(&i, env, newvalue);
i = opal_argv_count(*env);
opal_argv_append(&i, env, newvalue);
/* All done */

2
opal/util/ompi_environ.h
Просмотреть файл

@ -45,7 +45,7 @@ extern "C" {
* arrays (i.e., terminated with a NULL pointer).
*
* The array that is returned is an unencumbered array that should
* later be freed with a call to ompi_argv_free().
* later be freed with a call to opal_argv_free().
*
* Either (or both) of \em major and \em minor can be NULL. If
* one of the two is NULL, the other list is simply copied to the

10
opal/util/os_create_dirpath.c
Просмотреть файл

@ -29,7 +29,7 @@
#include "include/constants.h"
#include "util/os_create_dirpath.h"
#include "util/sys_info.h"
#include "util/argv.h"
#include "opal/util/argv.h"
int orte_os_create_dirpath(const char *path, const mode_t mode)
{
@ -62,7 +62,7 @@ int orte_os_create_dirpath(const char *path, const mode_t mode)
/* Split the requested path up into its individual parts */
parts = ompi_argv_split(path, orte_system_info.path_sep[0]);
parts = opal_argv_split(path, orte_system_info.path_sep[0]);
/* Ensure to allocate enough space for tmp: the strlen of the
incoming path + 1 (for \0) */
@ -89,7 +89,7 @@ int orte_os_create_dirpath(const char *path, const mode_t mode)
guaranteed to exist on valid POSIX filesystems, and is
therefore not worth checking for). */
len = ompi_argv_count(parts);
len = opal_argv_count(parts);
for (i = 0; i < len; ++i) {
if (i == 0) {
@ -137,7 +137,7 @@ int orte_os_create_dirpath(const char *path, const mode_t mode)
if (0 != stat(tmp, &buf)) {
if (0 != mkdir(tmp, mode) && 0 != stat(tmp, &buf)) {
ompi_argv_free(parts);
opal_argv_free(parts);
free(tmp);
return OMPI_ERROR;
}
@ -146,7 +146,7 @@ int orte_os_create_dirpath(const char *path, const mode_t mode)
/* All done */
ompi_argv_free(parts);
opal_argv_free(parts);
free(tmp);
return OMPI_SUCCESS;
}

8
opal/util/path.c
Просмотреть файл

@ -22,7 +22,7 @@
#endif
#include "util/path.h"
#include "util/argv.h"
#include "opal/util/argv.h"
/*
* PATH environment variable separator
@ -139,13 +139,13 @@ char *ompi_path_findv(char *fname, int mode, char **envv, char *wrkdir)
the wrkdir to the end of the path */
if (!found_dot && NULL != wrkdir) {
ompi_argv_append(&dirc, &dirv, wrkdir);
opal_argv_append(&dirc, &dirv, wrkdir);
}
if(NULL == dirv)
return NULL;
fullpath = ompi_path_find(fname, dirv, mode, envv);
ompi_argv_free(dirv);
opal_argv_free(dirv);
return fullpath;
}
@ -229,7 +229,7 @@ static void path_env_load(char *path, int *pargc, char ***pargv)
if (p != path) {
saved = *p;
*p = '\0';
ompi_argv_append(pargc, pargv, path);
opal_argv_append(pargc, pargv, path);
*p = saved;
path = p;
}

8
opal/util/show_help.c
Просмотреть файл

@ -24,7 +24,7 @@
#include "util/show_help.h"
#include "util/show_help_lex.h"
#include "util/printf.h"
#include "util/argv.h"
#include "opal/util/argv.h"
static int open_file(const char *base, const char *topic);
static int find_topic(const char *base, const char *topic);
@ -222,7 +222,7 @@ static int read_message(char ***array)
if (NULL == tmp) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
ompi_argv_append_nosize(array, tmp);
opal_argv_append_nosize(array, tmp);
break;
default:
@ -251,7 +251,7 @@ static int output(bool want_error_header, char **lines,
/* See how much space we need */
len = want_error_header ? 2 * strlen(dash_line) : 0;
count = ompi_argv_count(lines);
count = opal_argv_count(lines);
for (i = 0; i < count; ++i) {
if (NULL == lines[i]) {
break;
@ -310,7 +310,7 @@ static int destroy_message(char **lines)
{
int i, count;
count = ompi_argv_count(lines);
count = opal_argv_count(lines);
for (i = 0; i < count; ++i) {
if (NULL == lines[i]) {
break;

6
orte/mca/gpr/base/gpr_base_xfer_payload.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "include/orte_constants.h"
#include "include/constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/errmgr/errmgr.h"
@ -142,9 +142,9 @@ int orte_gpr_base_xfer_payload(orte_gpr_value_union_t *dest,
}
dest->app_context->num_procs = src->app_context->num_procs;
dest->app_context->argc = src->app_context->argc;
dest->app_context->argv = ompi_argv_copy(src->app_context->argv);
dest->app_context->argv = opal_argv_copy(src->app_context->argv);
dest->app_context->num_env = src->app_context->num_env;
dest->app_context->env = ompi_argv_copy(src->app_context->env);
dest->app_context->env = opal_argv_copy(src->app_context->env);
if(NULL != src->app_context->cwd) {
dest->app_context->cwd = strdup(src->app_context->cwd);
} else {

2
orte/mca/gpr/replica/functional_layer/gpr_replica_segment_fn.c
Просмотреть файл

@ -27,7 +27,7 @@
#include "opal/class/opal_object.h"
#include "opal/util/output.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "mca/errmgr/errmgr.h"
#include "mca/gpr/replica/transition_layer/gpr_replica_tl.h"

10
orte/mca/oob/base/oob_base_init.c
Просмотреть файл

@ -23,7 +23,7 @@
#include "runtime/runtime.h"
#include "opal/util/output.h"
#include "util/proc_info.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "mca/mca.h"
#include "mca/base/base.h"
#include "mca/errmgr/errmgr.h"
@ -81,7 +81,7 @@ int mca_oob_parse_contact_info(
if (NULL != uri) {
/* parse the remainder of the string into an array of uris */
*uri = ompi_argv_split(ptr, ';');
*uri = opal_argv_split(ptr, ';');
}
free(cinfo);
return ORTE_SUCCESS;
@ -104,8 +104,8 @@ int mca_oob_base_init(void)
mca_oob_t *s_module = NULL;
int s_priority = -1;
char** include = ompi_argv_split(mca_oob_base_include, ',');
char** exclude = ompi_argv_split(mca_oob_base_exclude, ',');
char** include = opal_argv_split(mca_oob_base_include, ',');
char** exclude = opal_argv_split(mca_oob_base_exclude, ',');
/* Traverse the list of available modules; call their init functions. */
for (item = opal_list_get_first(&mca_oob_base_components);
@ -238,7 +238,7 @@ int mca_oob_set_contact_info(const char* contact_info)
}
if(uri != NULL) {
ompi_argv_free(uri);
opal_argv_free(uri);
}
return ORTE_SUCCESS;
}

4
orte/mca/oob/base/oob_base_ping.c
Просмотреть файл

@ -24,7 +24,7 @@
#endif
#include "include/constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "mca/ns/ns_types.h"
#include "mca/oob/oob.h"
#include "mca/oob/base/base.h"
@ -47,7 +47,7 @@ int mca_oob_ping(const char* contact_info, struct timeval* tv)
break;
ptr++;
}
ompi_argv_free(uris);
opal_argv_free(uris);
return rc;
}

20
orte/mca/pls/bproc/pls_bproc.c
Просмотреть файл

@ -25,7 +25,7 @@
#include <fcntl.h>
#include <string.h>
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/ompi_environ.h"
#include "util/proc_info.h"
@ -337,7 +337,7 @@ static int orte_pls_bproc_launch_app(orte_jobid_t jobid,
free(var);
/* overwrite previously specified values with the above settings */
map->app->num_env = ompi_argv_count(map->app->env);
map->app->num_env = opal_argv_count(map->app->env);
/* allocate a range of vpids for the daemons */
rc = orte_ns_base_get_jobid(&daemon_jobid, orte_process_info.my_name);
@ -365,23 +365,23 @@ static int orte_pls_bproc_launch_app(orte_jobid_t jobid,
}
argc = 0;
ompi_argv_append(&argc, &argv, mca_pls_bproc_component.orted);
opal_argv_append(&argc, &argv, mca_pls_bproc_component.orted);
/* check for debug flags */
if (mca_pls_bproc_component.debug) {
ompi_argv_append(&argc, &argv, "--debug");
ompi_argv_append(&argc, &argv, "--debug-daemons");
opal_argv_append(&argc, &argv, "--debug");
opal_argv_append(&argc, &argv, "--debug-daemons");
}
ompi_argv_append(&argc, &argv, "--bootproxy");
opal_argv_append(&argc, &argv, "--bootproxy");
orte_ns.convert_jobid_to_string(&param, jobid);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(param);
/* pass along the universe name and location info */
ompi_argv_append(&argc, &argv, "--universe");
opal_argv_append(&argc, &argv, "--universe");
asprintf(&param, "%s@%s:%s", orte_universe_info.uid,
orte_universe_info.host, orte_universe_info.name);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(param);
if(0 < mca_pls_bproc_component.debug) {
@ -489,7 +489,7 @@ cleanup:
free(node_array);
}
if(NULL != argv) {
ompi_argv_free(argv);
opal_argv_free(argv);
}
if(NULL != pids) {
free(pids);

4
orte/mca/pls/bproc_seed/pls_bproc_seed.c
Просмотреть файл

@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <fcntl.h>
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/ompi_environ.h"
#include "util/proc_info.h"
@ -416,7 +416,7 @@ static int orte_pls_bproc_launch_app(
free(var);
/* overwrite previously specified values with the above settings */
map->app->num_env = ompi_argv_count(map->app->env);
map->app->num_env = opal_argv_count(map->app->env);
/* read process image */
if(ORTE_SUCCESS != (rc = orte_pls_bproc_dump(map->app, &image, &image_len))) {

2
orte/mca/pls/fork/pls_fork_component.c
Просмотреть файл

@ -27,7 +27,7 @@
#endif
#include "include/orte_constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/path.h"
#include "mca/pls/pls.h"
#include "mca/pls/fork/pls_fork.h"

8
orte/mca/pls/fork/pls_fork_module.c
Просмотреть файл

@ -35,7 +35,7 @@
#include "include/orte_constants.h"
#include "opal/event/event.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/sys_info.h"
#include "util/univ_info.h"
@ -163,7 +163,7 @@ static int orte_pls_fork_proc(
return ORTE_ERROR;
#if 0
{
/* Do fork the windows way: see ompi_few() for example */
/* Do fork the windows way: see opal_few() for example */
HANDLE new_process;
STARTUPINFO si;
PROCESS_INFORMATION pi;
@ -229,7 +229,7 @@ static int orte_pls_fork_proc(
if (NULL != context->env) {
environ_copy = ompi_environ_merge(environ, context->env);
} else {
environ_copy = ompi_argv_copy(environ);
environ_copy = opal_argv_copy(environ);
}
param = mca_base_param_environ_variable("rmgr","bootproxy","jobid");
ompi_unsetenv(param, &environ_copy);
@ -313,7 +313,7 @@ static int orte_pls_fork_proc(
execve(context->app, context->argv, environ_copy);
opal_output(0, "orte_pls_fork: %s - %s\n", context->app,
ompi_argv_join(context->argv, ' '));
opal_argv_join(context->argv, ' '));
opal_output(0, "orte_pls_fork: execv failed with errno=%d\n", errno);
exit(-1);

6
orte/mca/pls/poe/pls_poe_component.c
Просмотреть файл

@ -26,7 +26,7 @@
#include "mca/pls/pls.h"
#include "pls_poe.h"
#include "util/path.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "mca/pls/poe/pls-poe-version.h"
#include "mca/base/mca_base_param.h"
@ -138,8 +138,8 @@ int orte_pls_poe_component_open(void)
mca_pls_poe_component.env = orte_pls_poe_param_reg_string("progenv","env");
param = orte_pls_poe_param_reg_string("progpoe","poe");
mca_pls_poe_component.argv = ompi_argv_split(param, ' ');
mca_pls_poe_component.argc = ompi_argv_count(mca_pls_poe_component.argv);
mca_pls_poe_component.argv = opal_argv_split(param, ' ');
mca_pls_poe_component.argc = opal_argv_count(mca_pls_poe_component.argv);
if (mca_pls_poe_component.argc > 0) {
mca_pls_poe_component.path = strdup(mca_pls_poe_component.argv[0]);
return ORTE_SUCCESS;

108
orte/mca/pls/poe/pls_poe_module.c
Просмотреть файл

@ -35,7 +35,7 @@
#include "mca/errmgr/errmgr.h"
#include "mca/soh/soh.h"
#include "util/univ_info.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/ompi_environ.h"
#include "pls_poe.h"
@ -82,9 +82,9 @@ static inline int __poe_argv_append_int(int *argc, char ***argv, int varname, in
{
char *tmp_string;
if(varname >= min) {
ompi_argv_append(argc, argv, argname);
opal_argv_append(argc, argv, argname);
asprintf(&tmp_string, "%d", varname);
ompi_argv_append(argc, argv, tmp_string);
opal_argv_append(argc, argv, tmp_string);
free(tmp_string);
} else {
return ORTE_ERR_BAD_PARAM;
@ -146,54 +146,54 @@ int pls_poe_launch_interactive_orted(orte_jobid_t jobid)
}
/* application */
argv = ompi_argv_copy(ompi_argv_split(mca_pls_poe_component.orted, ' '));
argc = ompi_argv_count(argv);
argv = opal_argv_copy(opal_argv_split(mca_pls_poe_component.orted, ' '));
argc = opal_argv_count(argv);
if (mca_pls_poe_component.debug) {
ompi_argv_append(&argc, &argv, "--debug");
opal_argv_append(&argc, &argv, "--debug");
}
ompi_argv_append(&argc, &argv, "--debug-daemons");
opal_argv_append(&argc, &argv, "--debug-daemons");
ompi_argv_append(&argc, &argv, "--no-daemonize");
ompi_argv_append(&argc, &argv, "--bootproxy");
opal_argv_append(&argc, &argv, "--no-daemonize");
opal_argv_append(&argc, &argv, "--bootproxy");
/* need integer value for command line parameter - NOT hex */
asprintf(&tmp_string, "%lu", (unsigned long)jobid);
ompi_argv_append(&argc, &argv, tmp_string);
opal_argv_append(&argc, &argv, tmp_string);
free(tmp_string);
ompi_argv_append(&argc, &argv, "--name");
opal_argv_append(&argc, &argv, "--name");
proc_name_index = argc;
ompi_argv_append(&argc, &argv, "");
ompi_argv_append(&argc, &argv, "--nodename");
opal_argv_append(&argc, &argv, "");
opal_argv_append(&argc, &argv, "--nodename");
node_name_index2 = argc;
ompi_argv_append(&argc, &argv, "");
opal_argv_append(&argc, &argv, "");
/* pass along the universe name and location info */
ompi_argv_append(&argc, &argv, "--universe");
opal_argv_append(&argc, &argv, "--universe");
asprintf(&tmp_string, "%s@%s:%s", orte_universe_info.uid,
orte_universe_info.host, orte_universe_info.name);
ompi_argv_append(&argc, &argv, tmp_string);
opal_argv_append(&argc, &argv, tmp_string);
free(tmp_string);
/* setup ns contact info */
ompi_argv_append(&argc, &argv, "--nsreplica");
opal_argv_append(&argc, &argv, "--nsreplica");
if(NULL != orte_process_info.ns_replica_uri) {
uri = strdup(orte_process_info.ns_replica_uri);
} else {
uri = orte_rml.get_uri();
}
asprintf(&param, "\"%s\"", uri);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(uri);
/* setup gpr contact info */
ompi_argv_append(&argc, &argv, "--gprreplica");
opal_argv_append(&argc, &argv, "--gprreplica");
if(NULL != orte_process_info.gpr_replica_uri) {
uri = strdup(orte_process_info.gpr_replica_uri);
} else {
uri = orte_rml.get_uri();
}
asprintf(&param, "\"%s\"", uri);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(uri);
/*
@ -233,7 +233,7 @@ int pls_poe_launch_interactive_orted(orte_jobid_t jobid)
fprintf(cfp,"\n");
if (mca_pls_poe_component.verbose) {
opal_output(0, "%s:cmdfile %s\n", __FUNCTION__, ompi_argv_join(argv, ' '));
opal_output(0, "%s:cmdfile %s\n", __FUNCTION__, opal_argv_join(argv, ' '));
}
vpid++;
free(name);
@ -242,33 +242,33 @@ int pls_poe_launch_interactive_orted(orte_jobid_t jobid)
fclose(cfp);
fclose(hfp);
argv = ompi_argv_copy(mca_pls_poe_component.argv);
argv = opal_argv_copy(mca_pls_poe_component.argv);
argc = mca_pls_poe_component.argc;
ompi_argv_append(&argc, &argv, "-hostfile");
ompi_argv_append(&argc, &argv, mca_pls_poe_component.hostfile);
ompi_argv_append(&argc, &argv, "-cmdfile");
ompi_argv_append(&argc, &argv, mca_pls_poe_component.cmdfile);
ompi_argv_append(&argc, &argv, "-procs");
opal_argv_append(&argc, &argv, "-hostfile");
opal_argv_append(&argc, &argv, mca_pls_poe_component.hostfile);
opal_argv_append(&argc, &argv, "-cmdfile");
opal_argv_append(&argc, &argv, mca_pls_poe_component.cmdfile);
opal_argv_append(&argc, &argv, "-procs");
asprintf(&tmp_string, "%d", num_nodes);
ompi_argv_append(&argc, &argv, tmp_string);
opal_argv_append(&argc, &argv, tmp_string);
free(tmp_string);
ompi_argv_append(&argc, &argv, "-pgmmodel");
ompi_argv_append(&argc, &argv, "mpmd");
ompi_argv_append(&argc, &argv, "-resd");
ompi_argv_append(&argc, &argv, "no");
ompi_argv_append(&argc, &argv, "-labelio");
ompi_argv_append(&argc, &argv, "yes");
ompi_argv_append(&argc, &argv, "-infolevel");
ompi_argv_append(&argc, &argv, "6");
ompi_argv_append(&argc, &argv, "-stdoutmode");
ompi_argv_append(&argc, &argv, "ordered");
opal_argv_append(&argc, &argv, "-pgmmodel");
opal_argv_append(&argc, &argv, "mpmd");
opal_argv_append(&argc, &argv, "-resd");
opal_argv_append(&argc, &argv, "no");
opal_argv_append(&argc, &argv, "-labelio");
opal_argv_append(&argc, &argv, "yes");
opal_argv_append(&argc, &argv, "-infolevel");
opal_argv_append(&argc, &argv, "6");
opal_argv_append(&argc, &argv, "-stdoutmode");
opal_argv_append(&argc, &argv, "ordered");
rc=__poe_argv_append_int(&argc, &argv, mca_pls_poe_component.mp_retry, 0, "-retry");
if(ORTE_SUCCESS!=rc) { ORTE_ERROR_LOG(rc); goto cleanup; }
rc=__poe_argv_append_int(&argc, &argv, mca_pls_poe_component.mp_retrycount, 0, "-retrycount");
if(ORTE_SUCCESS!=rc) { ORTE_ERROR_LOG(rc); goto cleanup; }
if (mca_pls_poe_component.verbose) {
opal_output(0, "%s:cmdline %s\n", __FUNCTION__, ompi_argv_join(argv, ' '));
opal_output(0, "%s:cmdline %s\n", __FUNCTION__, opal_argv_join(argv, ' '));
}
pid = fork();
@ -422,7 +422,7 @@ static int __poe_create_cmd_file(
while(environ_copy[i]!=NULL) {
fprintf(cfp," %s",environ_copy[i++]);
}
ompi_argv_free(environ_copy);
opal_argv_free(environ_copy);
fprintf(cfp," %s",context->app);
i=1;
while(context->argv[i]!=NULL) {
@ -516,26 +516,26 @@ static inline int __poe_launch_interactive(orte_jobid_t jobid)
/* Generate POE command line */
argv = ompi_argv_copy(mca_pls_poe_component.argv);
argv = opal_argv_copy(mca_pls_poe_component.argv);
argc = mca_pls_poe_component.argc;
if(num_nodes > 0) {
ompi_argv_append(&argc, &argv, "-hostfile");
ompi_argv_append(&argc, &argv, mca_pls_poe_component.hostfile);
ompi_argv_append(&argc, &argv, "-resd");
ompi_argv_append(&argc, &argv, "no");
opal_argv_append(&argc, &argv, "-hostfile");
opal_argv_append(&argc, &argv, mca_pls_poe_component.hostfile);
opal_argv_append(&argc, &argv, "-resd");
opal_argv_append(&argc, &argv, "no");
rc=__poe_argv_append_int(&argc, &argv, num_nodes, 1, "-nodes");
if(ORTE_SUCCESS!=rc) { ORTE_ERROR_LOG(rc); goto cleanup; }
}
ompi_argv_append(&argc, &argv, "-pgmmodel");
ompi_argv_append(&argc, &argv, "mpmd");
ompi_argv_append(&argc, &argv, "-cmdfile");
ompi_argv_append(&argc, &argv, mca_pls_poe_component.cmdfile);
ompi_argv_append(&argc, &argv, "-labelio");
ompi_argv_append(&argc, &argv, mca_pls_poe_component.mp_labelio);
ompi_argv_append(&argc, &argv, "-stdoutmode");
ompi_argv_append(&argc, &argv, mca_pls_poe_component.mp_stdoutmode);
opal_argv_append(&argc, &argv, "-pgmmodel");
opal_argv_append(&argc, &argv, "mpmd");
opal_argv_append(&argc, &argv, "-cmdfile");
opal_argv_append(&argc, &argv, mca_pls_poe_component.cmdfile);
opal_argv_append(&argc, &argv, "-labelio");
opal_argv_append(&argc, &argv, mca_pls_poe_component.mp_labelio);
opal_argv_append(&argc, &argv, "-stdoutmode");
opal_argv_append(&argc, &argv, mca_pls_poe_component.mp_stdoutmode);
rc=__poe_argv_append_int(&argc, &argv, num_procs, 1, "-procs");
if(ORTE_SUCCESS!=rc) { ORTE_ERROR_LOG(rc); goto cleanup; }
@ -547,7 +547,7 @@ static inline int __poe_launch_interactive(orte_jobid_t jobid)
if(ORTE_SUCCESS!=rc) { ORTE_ERROR_LOG(rc); goto cleanup; }
if(mca_pls_poe_component.verbose>10) {
opal_output(0, "%s:POE cmdline %s\n", __FUNCTION__, ompi_argv_join(argv, ' '));
opal_output(0, "%s:POE cmdline %s\n", __FUNCTION__, opal_argv_join(argv, ' '));
}
/* Start job with POE */

14
orte/mca/pls/rsh/pls_rsh_component.c
Просмотреть файл

@ -27,9 +27,9 @@
#endif
#include "include/orte_constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/path.h"
#include "util/basename.h"
#include "opal/util/basename.h"
#include "mca/pls/pls.h"
#include "mca/pls/rsh/pls_rsh.h"
#include "mca/pls/rsh/pls-rsh-version.h"
@ -142,13 +142,13 @@ int orte_pls_rsh_component_open(void)
mca_pls_rsh_component.reap = orte_pls_rsh_param_register_int("reap",1);
param = orte_pls_rsh_param_register_string("agent","ssh");
mca_pls_rsh_component.argv = ompi_argv_split(param, ' ');
mca_pls_rsh_component.argc = ompi_argv_count(mca_pls_rsh_component.argv);
mca_pls_rsh_component.argv = opal_argv_split(param, ' ');
mca_pls_rsh_component.argc = opal_argv_count(mca_pls_rsh_component.argv);
if (mca_pls_rsh_component.argc > 0) {
/* If the agent is ssh, and debug was not selected, then
automatically add "-x" */
bname = ompi_basename(mca_pls_rsh_component.argv[0]);
bname = opal_basename(mca_pls_rsh_component.argv[0]);
if (NULL != bname && 0 == strcmp(bname, "ssh") &&
mca_pls_rsh_component.debug == 0) {
for (i = 1; NULL != mca_pls_rsh_component.argv[i]; ++i) {
@ -157,7 +157,7 @@ int orte_pls_rsh_component_open(void)
}
}
if (NULL == mca_pls_rsh_component.argv[i]) {
ompi_argv_append(&mca_pls_rsh_component.argc,
opal_argv_append(&mca_pls_rsh_component.argc,
&mca_pls_rsh_component.argv, "-x");
}
}
@ -197,7 +197,7 @@ int orte_pls_rsh_component_close(void)
OBJ_DESTRUCT(&mca_pls_rsh_component.lock);
OBJ_DESTRUCT(&mca_pls_rsh_component.cond);
if(NULL != mca_pls_rsh_component.argv)
ompi_argv_free(mca_pls_rsh_component.argv);
opal_argv_free(mca_pls_rsh_component.argv);
if(NULL != mca_pls_rsh_component.path)
free(mca_pls_rsh_component.path);
return ORTE_SUCCESS;

52
orte/mca/pls/rsh/pls_rsh_module.c
Просмотреть файл

@ -36,7 +36,7 @@
#include <signal.h>
#include "include/orte_constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/ompi_environ.h"
#include "opal/util/output.h"
#include "util/univ_info.h"
@ -299,79 +299,79 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
/*
* Build argv array
*/
argv = ompi_argv_copy(mca_pls_rsh_component.argv);
argv = opal_argv_copy(mca_pls_rsh_component.argv);
argc = mca_pls_rsh_component.argc;
node_name_index1 = argc;
ompi_argv_append(&argc, &argv, ""); /* placeholder for node name */
opal_argv_append(&argc, &argv, ""); /* placeholder for node name */
/* add the daemon command (as specified by user) */
local_exec_index = argc;
ompi_argv_append(&argc, &argv, mca_pls_rsh_component.orted);
opal_argv_append(&argc, &argv, mca_pls_rsh_component.orted);
/* check for debug flags */
id = mca_base_param_register_int("orte","debug",NULL,NULL,0);
mca_base_param_lookup_int(id,&rc);
if (rc) {
ompi_argv_append(&argc, &argv, "--debug");
opal_argv_append(&argc, &argv, "--debug");
}
id = mca_base_param_register_int("orte","debug","daemons",NULL,0);
mca_base_param_lookup_int(id,&rc);
if (rc) {
ompi_argv_append(&argc, &argv, "--debug-daemons");
opal_argv_append(&argc, &argv, "--debug-daemons");
}
id = mca_base_param_register_int("orte","debug","daemons_file",NULL,0);
mca_base_param_lookup_int(id,&rc);
if (rc) {
ompi_argv_append(&argc, &argv, "--debug-daemons-file");
opal_argv_append(&argc, &argv, "--debug-daemons-file");
}
ompi_argv_append(&argc, &argv, "--bootproxy");
ompi_argv_append(&argc, &argv, jobid_string);
ompi_argv_append(&argc, &argv, "--name");
opal_argv_append(&argc, &argv, "--bootproxy");
opal_argv_append(&argc, &argv, jobid_string);
opal_argv_append(&argc, &argv, "--name");
proc_name_index = argc;
ompi_argv_append(&argc, &argv, "");
opal_argv_append(&argc, &argv, "");
/* tell the daemon how many procs are in the daemon's job */
ompi_argv_append(&argc, &argv, "--num_procs");
opal_argv_append(&argc, &argv, "--num_procs");
asprintf(&param, "%lu", (unsigned long)(vpid + num_nodes));
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(param);
/* tell the daemon the starting vpid of the daemon's job */
ompi_argv_append(&argc, &argv, "--vpid_start");
ompi_argv_append(&argc, &argv, "0");
opal_argv_append(&argc, &argv, "--vpid_start");
opal_argv_append(&argc, &argv, "0");
ompi_argv_append(&argc, &argv, "--nodename");
opal_argv_append(&argc, &argv, "--nodename");
node_name_index2 = argc;
ompi_argv_append(&argc, &argv, "");
opal_argv_append(&argc, &argv, "");
/* pass along the universe name and location info */
ompi_argv_append(&argc, &argv, "--universe");
opal_argv_append(&argc, &argv, "--universe");
asprintf(&param, "%s@%s:%s", orte_universe_info.uid,
orte_universe_info.host, orte_universe_info.name);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(param);
/* setup ns contact info */
ompi_argv_append(&argc, &argv, "--nsreplica");
opal_argv_append(&argc, &argv, "--nsreplica");
if(NULL != orte_process_info.ns_replica_uri) {
uri = strdup(orte_process_info.ns_replica_uri);
} else {
uri = orte_rml.get_uri();
}
asprintf(&param, "\"%s\"", uri);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(uri);
free(param);
/* setup gpr contact info */
ompi_argv_append(&argc, &argv, "--gprreplica");
opal_argv_append(&argc, &argv, "--gprreplica");
if(NULL != orte_process_info.gpr_replica_uri) {
uri = strdup(orte_process_info.gpr_replica_uri);
} else {
uri = orte_rml.get_uri();
}
asprintf(&param, "\"%s\"", uri);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(uri);
free(param);
@ -406,7 +406,7 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
return;
#if 0
{
/* Do fork the windows way: see ompi_few() for example */
/* Do fork the windows way: see opal_few() for example */
HANDLE new_process;
STARTUPINFO si;
PROCESS_INFORMATION pi;
@ -476,7 +476,7 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
if (mca_pls_rsh_component.debug > 2) {
/* debug output */
char* cmd = ompi_argv_join(argv, ' ');
char* cmd = opal_argv_join(argv, ' ');
opal_output(0, "orte_pls_rsh: %s %s\n", exec_path, cmd);
exit(0);
}
@ -516,7 +516,7 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
#endif
/* setup environment */
env = ompi_argv_copy(environ);
env = opal_argv_copy(environ);
var = mca_base_param_environ_variable("seed",NULL,NULL);
ompi_setenv(var, "0", true, &env);

18
orte/mca/pls/tm/src/pls_tm_child.c
Просмотреть файл

@ -29,7 +29,7 @@
#include "include/orte_constants.h"
#include "include/orte_types.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/ompi_environ.h"
#include "runtime/runtime.h"
@ -217,14 +217,14 @@ int orte_pls_tm_child_launch(orte_jobid_t jobid)
free(app->argv[0]);
app->argv[0] = strdup(app->app);
flat = ompi_argv_join(app->argv, ' ');
flat = opal_argv_join(app->argv, ' ');
/* Make a global env for the app */
tmp_env = ompi_environ_merge(app->env, mca_env);
local_env = ompi_environ_merge(environ, tmp_env);
if (NULL != tmp_env) {
ompi_argv_free(tmp_env);
opal_argv_free(tmp_env);
}
/* Ensure "." is in the PATH. If it's not there, add it at
@ -334,7 +334,7 @@ int orte_pls_tm_child_launch(orte_jobid_t jobid)
/* Free things from the last app */
ompi_argv_free(local_env);
opal_argv_free(local_env);
free(flat);
}
@ -345,7 +345,7 @@ int orte_pls_tm_child_launch(orte_jobid_t jobid)
"pls:tm:launch:child: launched %d processes", num_spawned);
if (NULL != mca_env) {
ompi_argv_free(mca_env);
opal_argv_free(mca_env);
}
if (mapping_valid) {
while (NULL != (item = opal_list_remove_first(&mapping))) {
@ -452,7 +452,7 @@ int orte_pls_tm_child_wait(orte_jobid_t jobid)
int orte_pls_tm_child_finalize(void)
{
if (NULL != tm_hostnames) {
ompi_argv_free(tm_hostnames);
opal_argv_free(tm_hostnames);
tm_hostnames = NULL;
}
if (NULL != tm_node_ids) {
@ -536,7 +536,7 @@ static int query_tm_hostnames(void)
num_tm_hostnames = 0;
for (i = 0; i < num_node_ids; ++i) {
h = get_tm_hostname(tm_node_ids[i]);
ompi_argv_append(&num_tm_hostnames, &tm_hostnames, h);
opal_argv_append(&num_tm_hostnames, &tm_hostnames, h);
free(h);
}
@ -577,12 +577,12 @@ static char* get_tm_hostname(tm_node_id node)
trick to get it. */
buffer[sizeof(buffer) - 1] = '\0';
argv = ompi_argv_split(buffer, ' ');
argv = opal_argv_split(buffer, ' ');
if (NULL == argv) {
return NULL;
}
hostname = strdup(argv[1]);
ompi_argv_free(argv);
opal_argv_free(argv);
/* All done */

2
orte/mca/pls/tm/src/pls_tm_module.c
Просмотреть файл

@ -31,7 +31,7 @@
#include "include/orte_constants.h"
#include "include/orte_types.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/ompi_environ.h"
#include "runtime/runtime.h"

4
orte/mca/pls/xgrid/src/pls_xgrid_component.m
Просмотреть файл

@ -26,9 +26,9 @@
#import <unistd.h>
#import "include/orte_constants.h"
#import "util/argv.h"
#import "opal/util/argv.h"
#import "util/path.h"
#import "util/basename.h"
#import "opal/util/basename.h"
#import "mca/pls/pls.h"
#import "mca/pls/base/base.h"
#import "mca/pls/xgrid/pls-xgrid-version.h"

2
orte/mca/pls/xgrid/src/pls_xgrid_module.m
Просмотреть файл

@ -31,7 +31,7 @@
#import <fcntl.h>
#import "include/orte_constants.h"
#import "util/argv.h"
#import "opal/util/argv.h"
#import "opal/util/output.h"
#import "util/session_dir.h"
#import "opal/event/event.h"

4
orte/mca/ras/bjs/ras_bjs.c
Просмотреть файл

@ -21,7 +21,7 @@
#include "include/orte_constants.h"
#include "include/orte_types.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/ras/base/base.h"
#include "mca/ras/base/ras_base_node.h"
@ -72,7 +72,7 @@ static size_t orte_ras_bjs_node_slots(char* node_name)
char** ptr;
size_t count = 0;
if(nodelist == NULL)
nodelist = ompi_argv_split(getenv("NODELIST"), ',');
nodelist = opal_argv_split(getenv("NODELIST"), ',');
ptr = nodelist;
while(ptr && *ptr) {
if(strcmp(*ptr, node_name) == 0)

6
orte/mca/ras/tm/src/ras_tm_module.c
Просмотреть файл

@ -23,7 +23,7 @@
#include "include/orte_constants.h"
#include "include/orte_types.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/ras/base/base.h"
#include "mca/ras/base/ras_base_node.h"
@ -273,13 +273,13 @@ static int get_tm_hostname(tm_node_id node, char **hostname, char **arch)
opal_output(orte_ras_base.ras_output,
"ras:tm:hostname: got back %s", buffer);
buffer[sizeof(buffer) - 1] = '\0';
argv = ompi_argv_split(buffer, ' ');
argv = opal_argv_split(buffer, ' ');
if (NULL == argv) {
return ORTE_ERROR;
}
*hostname = strdup(argv[1]);
*arch = strdup(buffer);
ompi_argv_free(argv);
opal_argv_free(argv);
/* All done */

2
orte/mca/ras/xgrid/src/ras_xgrid_module.c
Просмотреть файл

@ -21,7 +21,7 @@
#include "include/orte_constants.h"
#include "include/orte_types.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "mca/ras/base/base.h"
#include "mca/ras/base/ras_base_node.h"

6
orte/mca/rmgr/base/rmgr_base_open.c
Просмотреть файл

@ -24,7 +24,7 @@
#include "mca/base/mca_base_param.h"
#include "mca/errmgr/errmgr.h"
#include "opal/util/output.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "mca/rmgr/base/base.h"
@ -91,11 +91,11 @@ static void orte_app_context_destructor(orte_app_context_t* app_context)
/* argv and env lists created by util/argv copy functions */
if (NULL != app_context->argv) {
ompi_argv_free(app_context->argv);
opal_argv_free(app_context->argv);
}
if (NULL != app_context->env) {
ompi_argv_free(app_context->env);
opal_argv_free(app_context->env);
}
if (NULL != app_context->cwd) {

2
orte/runtime/orte_init_stage1.c
Просмотреть файл

@ -45,7 +45,7 @@
#include "util/proc_info.h"
#include "util/session_dir.h"
#include "util/sys_info.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "util/universe_setup_file_io.h"
#include "util/os_path.h"

36
orte/runtime/orte_setup_hnp.c
Просмотреть файл

@ -43,7 +43,7 @@
#include "opal/threads/mutex.h"
#include "opal/threads/condition.h"
#include "runtime/orte_wait.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/ompi_environ.h"
#include "opal/util/output.h"
#include "util/path.h"
@ -346,8 +346,8 @@ MOVEON:
mca_base_param_lookup_string(id, &param);
/* Initialize the argv array */
argv = ompi_argv_split(param, ' ');
argc = ompi_argv_count(argv);
argv = opal_argv_split(param, ' ');
argc = opal_argv_count(argv);
if (argc <= 0) {
ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM);
rc = ORTE_ERR_BAD_PARAM;
@ -359,46 +359,46 @@ MOVEON:
path = ompi_path_findv(argv[0], 0, environ, NULL);
/* add the username and nodename */
ompi_argv_append(&argc, &argv, "-l");
ompi_argv_append(&argc, &argv, uid);
ompi_argv_append(&argc, &argv, hn);
opal_argv_append(&argc, &argv, "-l");
opal_argv_append(&argc, &argv, uid);
opal_argv_append(&argc, &argv, hn);
/* add the probe application */
ompi_argv_append(&argc, &argv, orteprobe);
opal_argv_append(&argc, &argv, orteprobe);
/* tell the probe it's name */
ompi_argv_append(&argc, &argv, "--name");
ompi_argv_append(&argc, &argv, name_string);
opal_argv_append(&argc, &argv, "--name");
opal_argv_append(&argc, &argv, name_string);
/* setup probe's ns contact info */
ompi_argv_append(&argc, &argv, "--nsreplica");
opal_argv_append(&argc, &argv, "--nsreplica");
if(NULL != orte_process_info.ns_replica_uri) {
uri = strdup(orte_process_info.ns_replica_uri);
} else {
uri = orte_rml.get_uri();
}
asprintf(&param, "\"%s\"", uri);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(param);
free(uri);
/* setup probe's gpr contact info */
ompi_argv_append(&argc, &argv, "--gprreplica");
opal_argv_append(&argc, &argv, "--gprreplica");
if(NULL != orte_process_info.gpr_replica_uri) {
uri = strdup(orte_process_info.gpr_replica_uri);
} else {
uri = orte_rml.get_uri();
}
asprintf(&param, "\"%s\"", uri);
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, param);
free(param);
free(uri);
/* tell the probe who to report to */
uri = orte_rml.get_uri();
asprintf(&param, "\"%s\"", uri);
ompi_argv_append(&argc, &argv, "--requestor");
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, "--requestor");
opal_argv_append(&argc, &argv, param);
free(param);
free(uri);
@ -407,14 +407,14 @@ MOVEON:
*/
id = mca_base_param_register_string("scope",NULL,NULL,NULL,"private");
mca_base_param_lookup_string(id, &param);
ompi_argv_append(&argc, &argv, "--scope");
ompi_argv_append(&argc, &argv, param);
opal_argv_append(&argc, &argv, "--scope");
opal_argv_append(&argc, &argv, param);
free(param);
id = mca_base_param_register_int("persistent",NULL,NULL,NULL,(int)false);
mca_base_param_lookup_int(id, &intparam);
if (intparam) {
ompi_argv_append(&argc, &argv, "--persistent");
opal_argv_append(&argc, &argv, "--persistent");
}
/* issue the non-blocking recv to get the probe's findings */

2
orte/runtime/runtime.h
Просмотреть файл

@ -29,7 +29,7 @@
#endif
#include "mca/gpr/gpr_types.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "runtime/runtime_types.h"
#include "util/univ_info.h"

24
orte/tools/console/orteconsole.c
Просмотреть файл

@ -27,7 +27,7 @@
#include "dps/dps.h"
#include "util/sys_info.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "util/proc_info.h"
#include "util/session_dir.h"
#include "opal/util/output.h"
@ -54,7 +54,7 @@ static void orte_console_sendcmd(orte_daemon_cmd_flag_t usercmd);
int main(int argc, char *argv[])
{
int ret=0;
ompi_cmd_line_t *cmd_line;
opal_cmd_line_t *cmd_line;
bool exit_cmd;
char *usercmd, *str_response;
orte_buffer_t *buffer = NULL;
@ -62,19 +62,19 @@ int main(int argc, char *argv[])
size_t n;
/* setup to check common command line options that just report and die */
cmd_line = OBJ_NEW(ompi_cmd_line_t);
cmd_line = OBJ_NEW(opal_cmd_line_t);
ompi_cmd_line_make_opt(cmd_line, 'v', "version", 0,
opal_cmd_line_make_opt(cmd_line, 'v', "version", 0,
"Show version of this program");
ompi_cmd_line_make_opt(cmd_line, 'h', "help", 0,
opal_cmd_line_make_opt(cmd_line, 'h', "help", 0,
"Show help for this function");
/* parse the local commands */
if (OMPI_SUCCESS != ompi_cmd_line_parse(cmd_line, true, argc, argv)) {
if (OMPI_SUCCESS != opal_cmd_line_parse(cmd_line, true, argc, argv)) {
char *args = NULL;
args = ompi_cmd_line_get_usage_msg(cmd_line);
args = opal_cmd_line_get_usage_msg(cmd_line);
ompi_show_help("help-console.txt", "console:usage", false,
argv[0], args);
free(args);
@ -82,18 +82,18 @@ int main(int argc, char *argv[])
}
/* check for help and version requests */
if (ompi_cmd_line_is_taken(cmd_line, "help") ||
ompi_cmd_line_is_taken(cmd_line, "h")) {
if (opal_cmd_line_is_taken(cmd_line, "help") ||
opal_cmd_line_is_taken(cmd_line, "h")) {
char *args = NULL;
args = ompi_cmd_line_get_usage_msg(cmd_line);
args = opal_cmd_line_get_usage_msg(cmd_line);
ompi_show_help("help-console.txt", "console:usage", false,
argv[0], args);
free(args);
return 1;
}
if (ompi_cmd_line_is_taken(cmd_line, "version") ||
ompi_cmd_line_is_taken(cmd_line, "v")) {
if (opal_cmd_line_is_taken(cmd_line, "version") ||
opal_cmd_line_is_taken(cmd_line, "v")) {
printf("...showing off my version!\n");
exit(1);
}

22
orte/tools/openmpi/openmpi.c
Просмотреть файл

@ -40,12 +40,12 @@
#include "opal/event/event.h"
#include "include/constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "util/os_path.h"
#include "util/sys_info.h"
#include "util/univ_info.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "util/proc_info.h"
#include "util/session_dir.h"
#include "util/universe_setup_file_io.h"
@ -61,7 +61,7 @@
int main(int argc, char **argv)
{
#if 0
ompi_cmd_line_t *cmd_line = NULL;
opal_cmd_line_t *cmd_line = NULL;
char *universe = NULL;
pid_t pid;
bool multi_thread = false;
@ -78,12 +78,12 @@ int main(int argc, char **argv)
}
/* setup to read common command line options that span all Open MPI programs */
cmd_line = OBJ_NEW(ompi_cmd_line_t);
cmd_line = OBJ_NEW(opal_cmd_line_t);
ompi_cmd_line_make_opt(cmd_line, 'v', "version", 0,
opal_cmd_line_make_opt(cmd_line, 'v', "version", 0,
"Show version of Open MPI and this program");
ompi_cmd_line_make_opt(cmd_line, 'h', "help", 0,
opal_cmd_line_make_opt(cmd_line, 'h', "help", 0,
"Show help for this function");
@ -106,18 +106,18 @@ int main(int argc, char **argv)
}
/* parse the local commands */
if (OMPI_SUCCESS != ompi_cmd_line_parse(cmd_line, true, argc, argv)) {
if (OMPI_SUCCESS != opal_cmd_line_parse(cmd_line, true, argc, argv)) {
exit(ret);
}
if (ompi_cmd_line_is_taken(cmd_line, "help") ||
ompi_cmd_line_is_taken(cmd_line, "h")) {
if (opal_cmd_line_is_taken(cmd_line, "help") ||
opal_cmd_line_is_taken(cmd_line, "h")) {
printf("...showing ompi_info help message...\n");
exit(1);
}
if (ompi_cmd_line_is_taken(cmd_line, "version") ||
ompi_cmd_line_is_taken(cmd_line, "v")) {
if (opal_cmd_line_is_taken(cmd_line, "version") ||
opal_cmd_line_is_taken(cmd_line, "v")) {
printf("...showing off my version!\n");
exit(1);
}

58
orte/tools/orted/orted.c
Просмотреть файл

@ -41,12 +41,12 @@
#include "util/show_help.h"
#include "util/sys_info.h"
#include "util/os_path.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "util/proc_info.h"
#include "util/univ_info.h"
#include "util/session_dir.h"
#include "util/printf.h"
#include "util/daemon_init.h"
#include "opal/util/daemon_init.h"
#include "util/universe_setup_file_io.h"
#include "mca/base/base.h"
@ -72,87 +72,87 @@ static void orte_daemon_recv(int status, orte_process_name_t* sender,
/*
* define the orted context table for obtaining parameters
*/
ompi_cmd_line_init_t orte_cmd_line_opts[] = {
opal_cmd_line_init_t orte_cmd_line_opts[] = {
/* Various "obvious" options */
{ NULL, NULL, NULL, 'h', NULL, "help", 0,
&orted_globals.help, OMPI_CMD_LINE_TYPE_BOOL,
&orted_globals.help, OPAL_CMD_LINE_TYPE_BOOL,
"This help message" },
{ NULL, NULL, NULL, '\0', NULL, "version", 0,
&orted_globals.version, OMPI_CMD_LINE_TYPE_BOOL,
&orted_globals.version, OPAL_CMD_LINE_TYPE_BOOL,
"Show the orted version" },
{ "orte", "debug", NULL, 'd', NULL, "debug", 0,
&orted_globals.debug, OMPI_CMD_LINE_TYPE_BOOL,
&orted_globals.debug, OPAL_CMD_LINE_TYPE_BOOL,
"Debug the OpenRTE" },
{ "orte", "no_daemonize", NULL, '\0', NULL, "no-daemonize", 0,
&orted_globals.no_daemonize, OMPI_CMD_LINE_TYPE_BOOL,
&orted_globals.no_daemonize, OPAL_CMD_LINE_TYPE_BOOL,
"Don't daemonize into the background" },
{ "orte", "debug", "daemons", '\0', NULL, "debug-daemons", 0,
&orted_globals.debug_daemons, OMPI_CMD_LINE_TYPE_BOOL,
&orted_globals.debug_daemons, OPAL_CMD_LINE_TYPE_BOOL,
"Enable debugging of OpenRTE daemons" },
{ "orte", "debug", "daemons_file", '\0', NULL, "debug-daemons-file", 0,
&orted_globals.debug_daemons_file, OMPI_CMD_LINE_TYPE_BOOL,
&orted_globals.debug_daemons_file, OPAL_CMD_LINE_TYPE_BOOL,
"Enable debugging of OpenRTE daemons, storing output in files" },
{ "rmgr", "bootproxy", "jobid", '\0', NULL, "bootproxy", 1,
&orted_globals.bootproxy, OMPI_CMD_LINE_TYPE_INT,
&orted_globals.bootproxy, OPAL_CMD_LINE_TYPE_INT,
"Run as boot proxy for <job-id>" },
{ NULL, NULL, NULL, '\0', NULL, "name", 1,
&orted_globals.name, OMPI_CMD_LINE_TYPE_STRING,
&orted_globals.name, OPAL_CMD_LINE_TYPE_STRING,
"Set the orte process name"},
{ NULL, NULL, NULL, '\0', NULL, "vpid_start", 1,
&orted_globals.vpid_start, OMPI_CMD_LINE_TYPE_STRING,
&orted_globals.vpid_start, OPAL_CMD_LINE_TYPE_STRING,
"Set the starting vpid for this job"},
{ NULL, NULL, NULL, '\0', NULL, "num_procs", 1,
&orted_globals.num_procs, OMPI_CMD_LINE_TYPE_STRING,
&orted_globals.num_procs, OPAL_CMD_LINE_TYPE_STRING,
"Set the number of process in this job"},
{ NULL, NULL, NULL, '\0', NULL, "nsreplica", 1,
&orte_process_info.ns_replica_uri, OMPI_CMD_LINE_TYPE_STRING,
&orte_process_info.ns_replica_uri, OPAL_CMD_LINE_TYPE_STRING,
"Name service contact information."},
{ NULL, NULL, NULL, '\0', NULL, "gprreplica", 1,
&orte_process_info.gpr_replica_uri, OMPI_CMD_LINE_TYPE_STRING,
&orte_process_info.gpr_replica_uri, OPAL_CMD_LINE_TYPE_STRING,
"Registry contact information."},
{ NULL, NULL, NULL, '\0', NULL, "nodename", 1,
&orte_system_info.nodename, OMPI_CMD_LINE_TYPE_STRING,
&orte_system_info.nodename, OPAL_CMD_LINE_TYPE_STRING,
"Node name as specified by host/resource description." },
{ "universe", NULL, NULL, '\0', NULL, "universe", 1,
&orted_globals.universe, OMPI_CMD_LINE_TYPE_STRING,
&orted_globals.universe, OPAL_CMD_LINE_TYPE_STRING,
"Set the universe name as username@hostname:universe_name for this application" },
{ "tmpdir", "base", NULL, '\0', NULL, "tmpdir", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"Set the root for the session directory tree" },
{ "seed", NULL, NULL, '\0', NULL, "seed", 0,
NULL, OMPI_CMD_LINE_TYPE_BOOL,
NULL, OPAL_CMD_LINE_TYPE_BOOL,
"Host replicas for the core universe services"},
{ "universe", "persistence", NULL, '\0', NULL, "persistent", 0,
NULL, OMPI_CMD_LINE_TYPE_BOOL,
NULL, OPAL_CMD_LINE_TYPE_BOOL,
"Remain alive after the application process completes"},
{ "universe", "scope", NULL, '\0', NULL, "scope", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"Set restrictions on who can connect to this universe"},
{ NULL, NULL, NULL, '\0', NULL, "report-uri", 1,
&orted_globals.uri_pipe, OMPI_CMD_LINE_TYPE_INT,
&orted_globals.uri_pipe, OPAL_CMD_LINE_TYPE_INT,
"Report this process' uri on indicated pipe"},
/* End of list */
{ NULL, NULL, NULL, '\0', NULL, NULL, 0,
NULL, OMPI_CMD_LINE_TYPE_NULL, NULL }
NULL, OPAL_CMD_LINE_TYPE_NULL, NULL }
};
extern char **environ;
@ -162,16 +162,16 @@ int main(int argc, char *argv[])
{
int ret = 0;
int fd;
ompi_cmd_line_t *cmd_line = NULL;
opal_cmd_line_t *cmd_line = NULL;
char *log_path = NULL;
char log_file[PATH_MAX];
char *jobidstring;
/* setup to check common command line options that just report and die */
memset(&orted_globals, 0, sizeof(orted_globals_t));
cmd_line = OBJ_NEW(ompi_cmd_line_t);
ompi_cmd_line_create(cmd_line, orte_cmd_line_opts);
if (OMPI_SUCCESS != (ret = ompi_cmd_line_parse(cmd_line, true,
cmd_line = OBJ_NEW(opal_cmd_line_t);
opal_cmd_line_create(cmd_line, orte_cmd_line_opts);
if (OMPI_SUCCESS != (ret = opal_cmd_line_parse(cmd_line, true,
argc, argv))) {
return ret;
}
@ -179,7 +179,7 @@ int main(int argc, char *argv[])
/* check for help and version requests */
if (orted_globals.help) {
char *args = NULL;
args = ompi_cmd_line_get_usage_msg(cmd_line);
args = opal_cmd_line_get_usage_msg(cmd_line);
ompi_show_help("help-orted.txt", "orted:usage", false,
argv[0], args);
free(args);
@ -241,7 +241,7 @@ int main(int argc, char *argv[])
if(orted_globals.debug == false &&
orted_globals.debug_daemons == false &&
orted_globals.no_daemonize == false) {
orte_daemon_init(NULL);
opal_daemon_init(NULL);
}
/* Intialize the Open RTE */

4
orte/tools/orted/orted.h
Просмотреть файл

@ -25,7 +25,7 @@
#include "opal/threads/mutex.h"
#include "opal/threads/condition.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "mca/mca.h"
/*
@ -78,7 +78,7 @@ extern orted_globals_t orted_globals;
/* extern const char *ver_beta; */
/* extern const char *ver_svn; */
/* void do_version(bool want_all, ompi_cmd_line_t *cmd_line); */
/* void do_version(bool want_all, opal_cmd_line_t *cmd_line); */
/* void show_ompi_version(const char *scope); */
/*

58
orte/tools/orteprobe/orteprobe.c
Просмотреть файл

@ -37,18 +37,18 @@
#include "dps/dps.h"
#include "opal/event/event.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/path.h"
#include "opal/util/output.h"
#include "util/show_help.h"
#include "util/sys_info.h"
#include "util/os_path.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "util/proc_info.h"
#include "util/univ_info.h"
#include "util/session_dir.h"
#include "util/printf.h"
#include "util/daemon_init.h"
#include "opal/util/daemon_init.h"
#include "util/universe_setup_file_io.h"
#include "util/malloc.h"
@ -72,55 +72,55 @@ orteprobe_globals_t orteprobe_globals;
/*
* define the orteprobe context table for obtaining parameters
*/
ompi_cmd_line_init_t orte_cmd_line_opts[] = {
opal_cmd_line_init_t orte_cmd_line_opts[] = {
/* Various "obvious" options */
{ NULL, NULL, NULL, 'h', NULL, "help", 0,
&orteprobe_globals.help, OMPI_CMD_LINE_TYPE_BOOL,
&orteprobe_globals.help, OPAL_CMD_LINE_TYPE_BOOL,
"This help message" },
{ NULL, NULL, NULL, '\0', NULL, "version", 0,
&orteprobe_globals.version, OMPI_CMD_LINE_TYPE_BOOL,
&orteprobe_globals.version, OPAL_CMD_LINE_TYPE_BOOL,
"Show the orteprobe version" },
{ NULL, NULL, NULL, 'd', NULL, "debug", 0,
&orteprobe_globals.debug, OMPI_CMD_LINE_TYPE_BOOL,
&orteprobe_globals.debug, OPAL_CMD_LINE_TYPE_BOOL,
"Run in debug mode (not generally intended for users)" },
{ NULL, NULL, NULL, '\0', NULL, "name", 1,
&orteprobe_globals.name_string, OMPI_CMD_LINE_TYPE_STRING,
&orteprobe_globals.name_string, OPAL_CMD_LINE_TYPE_STRING,
"Set the orte process name"},
{ NULL, NULL, NULL, '\0', NULL, "nsreplica", 1,
&orte_process_info.ns_replica_uri, OMPI_CMD_LINE_TYPE_STRING,
&orte_process_info.ns_replica_uri, OPAL_CMD_LINE_TYPE_STRING,
"Name service contact information."},
{ NULL, NULL, NULL, '\0', NULL, "gprreplica", 1,
&orte_process_info.gpr_replica_uri, OMPI_CMD_LINE_TYPE_STRING,
&orte_process_info.gpr_replica_uri, OPAL_CMD_LINE_TYPE_STRING,
"Registry contact information."},
{ NULL, NULL, NULL, '\0', NULL, "nodename", 1,
&orte_system_info.nodename, OMPI_CMD_LINE_TYPE_STRING,
&orte_system_info.nodename, OPAL_CMD_LINE_TYPE_STRING,
"Node name as specified by host/resource description." },
{ NULL, NULL, NULL, '\0', NULL, "requestor", 1,
&orteprobe_globals.requestor_string, OMPI_CMD_LINE_TYPE_STRING,
&orteprobe_globals.requestor_string, OPAL_CMD_LINE_TYPE_STRING,
"Set the orte process name"},
{ "seed", NULL, NULL, '\0', NULL, "seed", 0,
&orte_process_info.seed, OMPI_CMD_LINE_TYPE_BOOL,
&orte_process_info.seed, OPAL_CMD_LINE_TYPE_BOOL,
"seed"},
{ "universe", "persistence", NULL, '\0', NULL, "persistent", 0,
&orte_universe_info.persistence, OMPI_CMD_LINE_TYPE_BOOL,
&orte_universe_info.persistence, OPAL_CMD_LINE_TYPE_BOOL,
"persistent"},
{ "universe", "scope", NULL, '\0', NULL, "scope", 1,
&orte_universe_info.scope, OMPI_CMD_LINE_TYPE_STRING,
&orte_universe_info.scope, OPAL_CMD_LINE_TYPE_STRING,
"scope"},
/* End of list */
{ NULL, NULL, NULL, '\0', NULL, NULL, 0,
NULL, OMPI_CMD_LINE_TYPE_NULL, NULL }
NULL, OPAL_CMD_LINE_TYPE_NULL, NULL }
};
extern char **environ;
@ -128,7 +128,7 @@ extern char **environ;
int main(int argc, char *argv[])
{
int ret = 0, ortedargc;
ompi_cmd_line_t *cmd_line = NULL;
opal_cmd_line_t *cmd_line = NULL;
char *contact_path = NULL, *orted=NULL;
char *log_path = NULL, **ortedargv;
char *universe, orted_uri[256], **orted_uri_ptr, *path, *param;
@ -140,9 +140,9 @@ int main(int argc, char *argv[])
/* setup to check common command line options that just report and die */
memset(&orteprobe_globals, 0, sizeof(orteprobe_globals));
cmd_line = OBJ_NEW(ompi_cmd_line_t);
ompi_cmd_line_create(cmd_line, orte_cmd_line_opts);
if (OMPI_SUCCESS != (ret = ompi_cmd_line_parse(cmd_line, true,
cmd_line = OBJ_NEW(opal_cmd_line_t);
opal_cmd_line_create(cmd_line, orte_cmd_line_opts);
if (OMPI_SUCCESS != (ret = opal_cmd_line_parse(cmd_line, true,
argc, argv))) {
return ret;
}
@ -150,7 +150,7 @@ int main(int argc, char *argv[])
/* check for help and version requests */
if (orteprobe_globals.help) {
char *args = NULL;
args = ompi_cmd_line_get_usage_msg(cmd_line);
args = opal_cmd_line_get_usage_msg(cmd_line);
ompi_show_help("help-orteprobe.txt", "orteprobe:usage", false,
argv[0], args);
free(args);
@ -362,8 +362,8 @@ fprintf(stderr, "existing universe did not respond\n");
fprintf(stderr, "using %s for orted command\n", orted);
/* Initialize the argv array */
ortedargv = ompi_argv_split(orted, ' ');
ortedargc = ompi_argv_count(ortedargv);
ortedargv = opal_argv_split(orted, ' ');
ortedargc = opal_argv_count(ortedargv);
if (ortedargc <= 0) {
fprintf(stderr, "orteprobe: could not initialize argv array for daemon\n");
exit(1);
@ -375,21 +375,21 @@ fprintf(stderr, "using %s for orted command\n", orted);
fprintf(stderr, "path setup as %s\n", path);
/* tell the daemon it's the seed */
ompi_argv_append(&ortedargc, &ortedargv, "--seed");
opal_argv_append(&ortedargc, &ortedargv, "--seed");
/* tell the daemon it's scope */
ompi_argv_append(&ortedargc, &ortedargv, "--scope");
ompi_argv_append(&ortedargc, &ortedargv, orte_universe_info.scope);
opal_argv_append(&ortedargc, &ortedargv, "--scope");
opal_argv_append(&ortedargc, &ortedargv, orte_universe_info.scope);
/* tell the daemon if it's to be persistent */
if (orte_universe_info.persistence) {
ompi_argv_append(&ortedargc, &ortedargv, "--persistent");
opal_argv_append(&ortedargc, &ortedargv, "--persistent");
}
/* tell the daemon to report its uri to us */
asprintf(&param, "%d", orted_pipe[1]);
ompi_argv_append(&ortedargc, &ortedargv, "--report-uri");
ompi_argv_append(&ortedargc, &ortedargv, param);
opal_argv_append(&ortedargc, &ortedargv, "--report-uri");
opal_argv_append(&ortedargc, &ortedargv, param);
free(param);
fprintf(stderr, "forking now\n");

2
orte/tools/orteprobe/orteprobe.h
Просмотреть файл

@ -25,7 +25,7 @@
#include "opal/threads/mutex.h"
#include "opal/threads/condition.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "mca/mca.h"
/*

152
orte/tools/orterun/orterun.c
Просмотреть файл

@ -35,15 +35,15 @@
#include "opal/event/event.h"
#include "class/orte_pointer_array.h"
#include "util/proc_info.h"
#include "util/argv.h"
#include "opal/util/argv.h"
#include "util/ompi_environ.h"
#include "util/path.h"
#include "util/cmd_line.h"
#include "opal/util/cmd_line.h"
#include "util/sys_info.h"
#include "opal/util/output.h"
#include "util/universe_setup_file_io.h"
#include "util/show_help.h"
#include "util/basename.h"
#include "opal/util/basename.h"
#include "opal/threads/condition.h"
#include "mca/base/base.h"
@ -107,105 +107,105 @@ struct proc_info_t {
struct proc_info_t *proc_infos = NULL;
ompi_cmd_line_init_t cmd_line_init[] = {
opal_cmd_line_init_t cmd_line_init[] = {
/* Various "obvious" options */
{ NULL, NULL, NULL, 'h', NULL, "help", 0,
&orterun_globals.help, OMPI_CMD_LINE_TYPE_BOOL,
&orterun_globals.help, OPAL_CMD_LINE_TYPE_BOOL,
"This help message" },
{ NULL, NULL, NULL, '\0', NULL, "version", 0,
&orterun_globals.version, OMPI_CMD_LINE_TYPE_BOOL,
&orterun_globals.version, OPAL_CMD_LINE_TYPE_BOOL,
"Show the orterun version" },
{ NULL, NULL, NULL, 'v', NULL, "verbose", 0,
&orterun_globals.verbose, OMPI_CMD_LINE_TYPE_BOOL,
&orterun_globals.verbose, OPAL_CMD_LINE_TYPE_BOOL,
"Be verbose" },
/* Use an appfile */
{ NULL, NULL, NULL, '\0', NULL, "app", 1,
&orterun_globals.appfile, OMPI_CMD_LINE_TYPE_STRING,
&orterun_globals.appfile, OPAL_CMD_LINE_TYPE_STRING,
"Provide an appfile; ignore all other command line options" },
/* Number of processes; -c, -n, --n, -np, and --np are all
synonyms */
{ NULL, NULL, NULL, 'c', "np", "np", 1,
&orterun_globals.num_procs, OMPI_CMD_LINE_TYPE_SIZE_T,
&orterun_globals.num_procs, OPAL_CMD_LINE_TYPE_SIZE_T,
"Number of processes to run" },
{ NULL, NULL, NULL, '\0', "n", "n", 1,
&orterun_globals.num_procs, OMPI_CMD_LINE_TYPE_SIZE_T,
&orterun_globals.num_procs, OPAL_CMD_LINE_TYPE_SIZE_T,
"Number of processes to run" },
/* Set a hostfile */
{ "rds", "hostfile", "path", '\0', "hostfile", "hostfile", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"Provide a hostfile" },
{ "rds", "hostfile", "path", '\0', "machinefile", "machinefile", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"Provide a hostfile" },
/* Don't wait for the process to finish before exiting */
{ NULL, NULL, NULL, '\0', "nw", "nw", 0,
&orterun_globals.no_wait_for_job_completion, OMPI_CMD_LINE_TYPE_BOOL,
&orterun_globals.no_wait_for_job_completion, OPAL_CMD_LINE_TYPE_BOOL,
"Launch the processes and do not wait for their completion (i.e., let orterun complete as soon a successful launch occurs)" },
/* Set the max number of aborted processes to show */
{ NULL, NULL, NULL, '\0', "aborted", "aborted", 1,
&max_display_aborted, OMPI_CMD_LINE_TYPE_INT,
&max_display_aborted, OPAL_CMD_LINE_TYPE_INT,
"The maximum number of aborted processes to display" },
/* Export environment variables; potentially used multiple times,
so it does not make sense to set into a variable */
{ NULL, NULL, NULL, 'x', NULL, NULL, 1,
NULL, OMPI_CMD_LINE_TYPE_NULL,
NULL, OPAL_CMD_LINE_TYPE_NULL,
"Export an environment variable, optionally specifying a value (e.g., \"-x foo\" exports the environment variable foo and takes its value from the current environment; \"-x foo=bar\" exports the environment variable name foo and sets its value to \"bar\" in the started processes)" },
/* Specific mapping (C, cX, N, nX) */
{ NULL, NULL, NULL, '\0', NULL, "map", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"Mapping of processes to nodes / CPUs" },
{ NULL, NULL, NULL, '\0', "bynode", "bynode", 0,
&orterun_globals.by_node, OMPI_CMD_LINE_TYPE_BOOL,
&orterun_globals.by_node, OPAL_CMD_LINE_TYPE_BOOL,
"Whether to allocate/map processes round-robin by node" },
{ NULL, NULL, NULL, '\0', "byslot", "byslot", 0,
&orterun_globals.by_slot, OMPI_CMD_LINE_TYPE_BOOL,
&orterun_globals.by_slot, OPAL_CMD_LINE_TYPE_BOOL,
"Whether to allocate/map processes round-robin by slot (the default)" },
/* mpiexec-like arguments */
{ NULL, NULL, NULL, '\0', "wdir", "wdir", 1,
&orterun_globals.wdir, OMPI_CMD_LINE_TYPE_STRING,
&orterun_globals.wdir, OPAL_CMD_LINE_TYPE_STRING,
"Set the working directory of the started processes" },
{ NULL, NULL, NULL, '\0', "path", "path", 1,
&orterun_globals.path, OMPI_CMD_LINE_TYPE_STRING,
&orterun_globals.path, OPAL_CMD_LINE_TYPE_STRING,
"PATH to be used to look for executables to start processes" },
/* These arguments can be specified multiple times */
{ NULL, NULL, NULL, '\0', "arch", "arch", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"Architecture to start processes on" },
{ NULL, NULL, NULL, 'H', "host", "host", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"List of hosts to invoke processes on" },
/* OpenRTE arguments */
{ "orte", "debug", NULL, 'd', NULL, "debug", 0,
NULL, OMPI_CMD_LINE_TYPE_BOOL,
NULL, OPAL_CMD_LINE_TYPE_BOOL,
"Enable debugging of OpenRTE" },
{ "orte", "debug", "daemons", '\0', NULL, "debug-daemons", 0,
NULL, OMPI_CMD_LINE_TYPE_INT,
NULL, OPAL_CMD_LINE_TYPE_INT,
"Enable debugging of any OpenRTE daemons used by this application" },
{ "orte", "debug", "daemons_file", '\0', NULL, "debug-daemons-file", 0,
NULL, OMPI_CMD_LINE_TYPE_BOOL,
NULL, OPAL_CMD_LINE_TYPE_BOOL,
"Enable debugging of any OpenRTE daemons used by this application, storing output in files" },
{ "orte", "no_daemonize", NULL, '\0', NULL, "no-daemonize", 0,
NULL, OMPI_CMD_LINE_TYPE_BOOL,
NULL, OPAL_CMD_LINE_TYPE_BOOL,
"Do not detach OpenRTE daemons used by this application" },
{ "universe", NULL, NULL, '\0', NULL, "universe", 1,
NULL, OMPI_CMD_LINE_TYPE_STRING,
NULL, OPAL_CMD_LINE_TYPE_STRING,
"Set the universe name as username@hostname:universe_name for this application" },
{ NULL, NULL, NULL, '\0', NULL, "tmpdir", 1,
&orte_process_info.tmpdir_base, OMPI_CMD_LINE_TYPE_STRING,
&orte_process_info.tmpdir_base, OPAL_CMD_LINE_TYPE_STRING,
"Set the root for the session directory tree for orterun ONLY" },
/* End of list */
{ NULL, NULL, NULL, '\0', NULL, NULL, 0,
NULL, OMPI_CMD_LINE_TYPE_NULL, NULL }
NULL, OPAL_CMD_LINE_TYPE_NULL, NULL }
};
@ -231,7 +231,7 @@ int main(int argc, char *argv[])
/* Setup the abort message (for use in the signal handler) */
orterun_basename = ompi_basename(argv[0]);
orterun_basename = opal_basename(argv[0]);
asprintf(&abort_msg, "%s: killing job...\n", orterun_basename);
abort_msg_len = strlen(abort_msg);
@ -623,20 +623,20 @@ static int init_globals(void)
static int parse_globals(int argc, char* argv[])
{
ompi_cmd_line_t cmd_line;
opal_cmd_line_t cmd_line;
int ras;
/* Setup and parse the command line */
init_globals();
ompi_cmd_line_create(&cmd_line, cmd_line_init);
ompi_cmd_line_parse(&cmd_line, true, argc, argv);
opal_cmd_line_create(&cmd_line, cmd_line_init);
opal_cmd_line_parse(&cmd_line, true, argc, argv);
/* Check for help and version requests */
if (1 == argc || orterun_globals.help) {
char *args = NULL;
args = ompi_cmd_line_get_usage_msg(&cmd_line);
args = opal_cmd_line_get_usage_msg(&cmd_line);
ompi_show_help("help-orterun.txt", "orterun:usage", false,
orterun_basename, args);
free(args);
@ -690,7 +690,7 @@ static int parse_locals(int argc, char* argv[])
temp_argc = 0;
temp_argv = NULL;
ompi_argv_append(&temp_argc, &temp_argv, argv[0]);
opal_argv_append(&temp_argc, &temp_argv, argv[0]);
orte_pointer_array_init(&apps_pa, 1, argc + 1, 2);
env = NULL;
@ -699,9 +699,9 @@ static int parse_locals(int argc, char* argv[])
/* Make an app with this argv */
if (ompi_argv_count(temp_argv) > 1) {
if (opal_argv_count(temp_argv) > 1) {
if (NULL != env) {
ompi_argv_free(env);
opal_argv_free(env);
env = NULL;
}
@ -724,14 +724,14 @@ static int parse_locals(int argc, char* argv[])
temp_argc = 0;
temp_argv = NULL;
ompi_argv_append(&temp_argc, &temp_argv, argv[0]);
opal_argv_append(&temp_argc, &temp_argv, argv[0]);
}
} else {
ompi_argv_append(&temp_argc, &temp_argv, argv[i]);
opal_argv_append(&temp_argc, &temp_argv, argv[i]);
}
}
if (ompi_argv_count(temp_argv) > 1) {
if (opal_argv_count(temp_argv) > 1) {
app = OBJ_NEW(orte_app_context_t);
rc = create_app(temp_argc, temp_argv, &app, &made_app, &env);
if (ORTE_SUCCESS != rc) {
@ -747,9 +747,9 @@ static int parse_locals(int argc, char* argv[])
}
}
if (NULL != env) {
ompi_argv_free(env);
opal_argv_free(env);
}
ompi_argv_free(temp_argv);
opal_argv_free(temp_argv);
/* All done */
@ -760,7 +760,7 @@ static int parse_locals(int argc, char* argv[])
static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
bool *made_app, char ***env)
{
ompi_cmd_line_t cmd_line;
opal_cmd_line_t cmd_line;
char cwd[OMPI_PATH_MAX];
int i, j, rc;
char *param, *value, *value2;
@ -818,8 +818,8 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
else if (0 == strcmp("-arch", argv[i])) {
char str[2] = { '0' + ORTE_APP_CONTEXT_MAP_ARCH, '\0' };
ompi_argv_append(&new_argc, &new_argv, "-rawmap");
ompi_argv_append(&new_argc, &new_argv, str);
opal_argv_append(&new_argc, &new_argv, "-rawmap");
opal_argv_append(&new_argc, &new_argv, str);
save_arg = false;
}
@ -828,8 +828,8 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
else if (0 == strcmp("-host", argv[i])) {
char str[2] = { '0' + ORTE_APP_CONTEXT_MAP_HOSTNAME, '\0' };
ompi_argv_append(&new_argc, &new_argv, "-rawmap");
ompi_argv_append(&new_argc, &new_argv, str);
opal_argv_append(&new_argc, &new_argv, "-rawmap");
opal_argv_append(&new_argc, &new_argv, str);
save_arg = false;
}
@ -838,12 +838,12 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
if (map_data) {
char str[2] = { '0' + ORTE_APP_CONTEXT_MAP_CN, '\0' };
ompi_argv_append(&new_argc, &new_argv, "-rawmap");
ompi_argv_append(&new_argc, &new_argv, str);
opal_argv_append(&new_argc, &new_argv, "-rawmap");
opal_argv_append(&new_argc, &new_argv, str);
}
if (save_arg) {
ompi_argv_append(&new_argc, &new_argv, argv[i]);
opal_argv_append(&new_argc, &new_argv, argv[i]);
}
}
@ -852,13 +852,13 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
message. */
init_globals();
ompi_cmd_line_create(&cmd_line, cmd_line_init);
opal_cmd_line_create(&cmd_line, cmd_line_init);
mca_base_cmd_line_setup(&cmd_line);
cmd_line_made = true;
ompi_cmd_line_make_opt3(&cmd_line, '\0', NULL, "rawmap", 2,
opal_cmd_line_make_opt3(&cmd_line, '\0', NULL, "rawmap", 2,
"Hidden / internal parameter -- users should not use this!");
rc = ompi_cmd_line_parse(&cmd_line, true, new_argc, new_argv);
ompi_argv_free(new_argv);
rc = opal_cmd_line_parse(&cmd_line, true, new_argc, new_argv);
opal_argv_free(new_argv);
new_argv = NULL;
if (OMPI_SUCCESS != rc) {
goto cleanup;
@ -875,7 +875,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
/* Setup application context */
app = OBJ_NEW(orte_app_context_t);
ompi_cmd_line_get_tail(&cmd_line, &app->argc, &app->argv);
opal_cmd_line_get_tail(&cmd_line, &app->argc, &app->argv);
/* See if we have anything left */
@ -888,31 +888,31 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
/* Grab all OMPI_* environment variables */
app->env = ompi_argv_copy(*env);
app->num_env = ompi_argv_count(*env);
app->env = opal_argv_copy(*env);
app->num_env = opal_argv_count(*env);
for (i = 0; NULL != environ[i]; ++i) {
if (0 == strncmp("OMPI_", environ[i], 5)) {
ompi_argv_append_nosize(&app->env, environ[i]);
opal_argv_append_nosize(&app->env, environ[i]);
}
}
/* Did the user request to export any environment variables? */
if (ompi_cmd_line_is_taken(&cmd_line, "x")) {
j = ompi_cmd_line_get_ninsts(&cmd_line, "x");
if (opal_cmd_line_is_taken(&cmd_line, "x")) {
j = opal_cmd_line_get_ninsts(&cmd_line, "x");
for (i = 0; i < j; ++i) {
param = ompi_cmd_line_get_param(&cmd_line, "x", i, 0);
param = opal_cmd_line_get_param(&cmd_line, "x", i, 0);
if (NULL != strchr(param, '=')) {
ompi_argv_append_nosize(&app->env, param);
opal_argv_append_nosize(&app->env, param);
} else {
value = getenv(param);
if (NULL != value) {
if (NULL != strchr(value, '=')) {
ompi_argv_append_nosize(&app->env, value);
opal_argv_append_nosize(&app->env, value);
} else {
asprintf(&value2, "%s=%s", param, value);
ompi_argv_append_nosize(&app->env, value2);
opal_argv_append_nosize(&app->env, value2);
free(value2);
}
} else {
@ -921,13 +921,13 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
}
}
}
app->num_env = ompi_argv_count(app->env);
app->num_env = opal_argv_count(app->env);
/* Did the user request a specific path? */
if (NULL != orterun_globals.path) {
asprintf(&value, "PATH=%s", orterun_globals.path);
ompi_argv_append_nosize(&app->env, value);
opal_argv_append_nosize(&app->env, value);
free(value);
}
@ -943,8 +943,8 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
/* Did the user request any mappings? They were all converted to
--rawmap items, above. */
if (ompi_cmd_line_is_taken(&cmd_line, "rawmap")) {
j = ompi_cmd_line_get_ninsts(&cmd_line, "rawmap");
if (opal_cmd_line_is_taken(&cmd_line, "rawmap")) {
j = opal_cmd_line_get_ninsts(&cmd_line, "rawmap");
app->map_data = malloc(sizeof(orte_app_context_map_t*) * j);
if (NULL == app->map_data) {
rc = ORTE_ERR_OUT_OF_RESOURCE;
@ -955,8 +955,8 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
app->map_data[i] = NULL;
}
for (i = 0; i < j; ++i) {
value = ompi_cmd_line_get_param(&cmd_line, "rawmap", i, 0);
value2 = ompi_cmd_line_get_param(&cmd_line, "rawmap", i, 1);
value = opal_cmd_line_get_param(&cmd_line, "rawmap", i, 0);
value2 = opal_cmd_line_get_param(&cmd_line, "rawmap", i, 1);
app->map_data[i] = OBJ_NEW(orte_app_context_map_t);
if (NULL == app->map_data[i]) {
rc = ORTE_ERR_OUT_OF_RESOURCE;
@ -984,7 +984,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
/* Find the argv[0] in the path, but only if not absolute or
relative pathname was specified */
value = ompi_basename(app->argv[0]);
value = opal_basename(app->argv[0]);
if (strlen(value) == strlen(app->argv[0])) {
app->app = ompi_path_findv(app->argv[0], 0, environ, app->cwd);
} else {
@ -1010,7 +1010,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
OBJ_RELEASE(app);
}
if (NULL != new_argv) {
ompi_argv_free(new_argv);
opal_argv_free(new_argv);
}
if (cmd_line_made) {
OBJ_DESTRUCT(&cmd_line);
@ -1096,8 +1096,8 @@ static int parse_appfile(char *filename, char ***env)
/* We got a line with *something* on it. So process it */
argv = ompi_argv_split(line, ' ');
argc = ompi_argv_count(argv);
argv = opal_argv_split(line, ' ');
argc = opal_argv_count(argv);
if (argc > 0) {
/* Create a temporary env to play with in the recursive
@ -1105,7 +1105,7 @@ static int parse_appfile(char *filename, char ***env)
we can have a consistent global env */
if (NULL != *env) {
tmp_env = ompi_argv_copy(*env);
tmp_env = opal_argv_copy(*env);
if (NULL == tmp_env) {
return ORTE_ERR_OUT_OF_RESOURCE;
}
@ -1120,7 +1120,7 @@ static int parse_appfile(char *filename, char ***env)
exit(1);
}
if (NULL != tmp_env) {
ompi_argv_free(tmp_env);
opal_argv_free(tmp_env);
}
if (made_app) {
size_t dummy;

16
test/util/Makefile.am
Просмотреть файл

@ -24,8 +24,8 @@ check_PROGRAMS = \
orte_sys_info \
orte_os_create_dirpath \
orte_session_dir \
ompi_argv \
ompi_basename \
opal_argv \
opal_basename \
orte_universe_setup_file_io
TESTS = \
@ -43,17 +43,17 @@ ompi_if_LDADD = \
$(top_builddir)/test/support/libsupport.a
ompi_if_DEPENDENCIES = $(ompi_if_LDADD)
ompi_argv_SOURCES = ompi_argv.c
ompi_argv_LDADD = \
opal_argv_SOURCES = opal_argv.c
opal_argv_LDADD = \
$(top_builddir)/src/libmpi.la \
$(top_builddir)/test/support/libsupport.a
ompi_argv_DEPENDENCIES = $(ompi_argv_LDADD)
opal_argv_DEPENDENCIES = $(opal_argv_LDADD)
ompi_basename_SOURCES = ompi_basename.c
ompi_basename_LDADD = \
opal_basename_SOURCES = opal_basename.c
opal_basename_LDADD = \
$(top_builddir)/src/libmpi.la \
$(top_builddir)/test/support/libsupport.a
ompi_basename_DEPENDENCIES = $(ompi_basename_LDADD)
opal_basename_DEPENDENCIES = $(opal_basename_LDADD)
orte_os_path_SOURCES = orte_os_path.c
orte_os_path_LDADD = \

266
test/util/ompi_argv.c
Просмотреть файл

@ -21,7 +21,7 @@
#include "support.h"
#include "include/constants.h"
#include "util/argv.h"
#include "opal/util/argv.h"
static bool test1(void);
static bool test2(void);
@ -38,7 +38,7 @@ static bool test10(void);
int main(int argc, char* argv[])
{
test_init("ompi_argv_t");
test_init("opal_argv_t");
if( test1() ) test_success();
else test_failure("test1 argv test failed");
@ -90,7 +90,7 @@ static bool test1(void)
/* Test basic functionality. Start with a NULL argv and add the
contents of the a array.
Set argc to be an initiall bogus number -- ompi_argv_add() should
Set argc to be an initiall bogus number -- opal_argv_add() should
reset it back to zero after the first iteration.
After adding the a[i], ensure that argv[0 - (i-1)] are the same
@ -100,7 +100,7 @@ static bool test1(void)
value. */
for (i = 0; a[i] != NULL; ++i) {
if (ompi_argv_append(&argc, &argv, a[i]) != OMPI_SUCCESS) {
if (opal_argv_append(&argc, &argv, a[i]) != OMPI_SUCCESS) {
return false;
}
for (j = 0; j <= i; ++j) {
@ -115,7 +115,7 @@ static bool test1(void)
return false;
}
}
ompi_argv_free(argv);
opal_argv_free(argv);
return true;
}
@ -129,9 +129,9 @@ static bool test2(void)
char *a[] = { "aaa", "bbb", "ccc", NULL };
char *b[4];
/* Similar test to above, but ensure that ompi_argv_add is actually
/* Similar test to above, but ensure that opal_argv_add is actually
*copying* the string by value, not by reference. So copy the a
array into b, and then ompi_argv_add() from b. After that,
array into b, and then opal_argv_add() from b. After that,
scribble in the first character of the b[] string that we just
added, and compare all entries in a to argv -- they should be
identical (even though b is now corrupted). */
@ -142,7 +142,7 @@ static bool test2(void)
b[i] = NULL;
for (i = 0; b[i] != NULL; ++i) {
if (ompi_argv_append(&argc, &argv, b[i]) != OMPI_SUCCESS) {
if (opal_argv_append(&argc, &argv, b[i]) != OMPI_SUCCESS) {
return false;
}
++b[i][0];
@ -159,7 +159,7 @@ static bool test2(void)
}
}
ompi_argv_free(argv);
opal_argv_free(argv);
for (i = 0; b[i] != NULL; ++i) {
free(b[i]);
}
@ -179,21 +179,21 @@ static bool test3(void)
/* Try to free a null argv -- should be harmless (we'll seg fault if
it's not!) */
ompi_argv_free(argv);
opal_argv_free(argv);
/* Now add some stuff and try to free it. We'll seg fault if
anything goes wrong. a is on the stack, so if it mistakenly
tries to free it, we should get a seg fault. */
for (i = 0; a[i] != NULL; ++i) {
if (ompi_argv_append(&argc, &argv, a[i]) != OMPI_SUCCESS) {
if (opal_argv_append(&argc, &argv, a[i]) != OMPI_SUCCESS) {
return false;
}
}
ompi_argv_free(argv);
opal_argv_free(argv);
/* Do the same thing but guarantee that the copied array was from
the heap and was freed before we call ompi_argv_free(). */
the heap and was freed before we call opal_argv_free(). */
argc = 0;
argv = NULL;
@ -202,14 +202,14 @@ static bool test3(void)
}
b[i] = NULL;
for (i = 0; b[i] != NULL; ++i) {
if (ompi_argv_append(&argc, &argv, b[i]) != OMPI_SUCCESS) {
if (opal_argv_append(&argc, &argv, b[i]) != OMPI_SUCCESS) {
return false;
}
}
for (i = 0; b[i] != NULL; ++i) {
free(b[i]);
}
ompi_argv_free(argv);
opal_argv_free(argv);
/* All done */
@ -225,10 +225,10 @@ static bool test4(void)
char *start;
/* split a string into an argv, and compare it against the original
string. Add double spaces into the string; ompi_argv_split()
string. Add double spaces into the string; opal_argv_split()
should skip them. */
b = ompi_argv_split(a, ' ');
b = opal_argv_split(a, ' ');
for (count = i = 1; i < strlen(a); ++i) {
if (a[i] != ' ' && a[i - 1] == ' ') {
@ -263,7 +263,7 @@ static bool test4(void)
/* all done */
ompi_argv_free(b);
opal_argv_free(b);
free(a);
return true;
}
@ -273,7 +273,7 @@ static bool test5(void)
{
char *a[] = { "aaa", "bbb", "ccc", NULL };
return (ompi_argv_count(NULL) == 0 && ompi_argv_count(a) == 3);
return (opal_argv_count(NULL) == 0 && opal_argv_count(a) == 3);
}
@ -286,8 +286,8 @@ static bool test6(void)
/* split the string above and then join it -- the joined version
should be just like the original */
b = ompi_argv_split(a, ' ');
c = ompi_argv_join(b, ' ');
b = opal_argv_split(a, ' ');
c = opal_argv_join(b, ' ');
if (strcmp(a, c) != 0) {
return false;
@ -296,7 +296,7 @@ static bool test6(void)
/* All done */
free(c);
ompi_argv_free(b);
opal_argv_free(b);
return true;
}
@ -308,7 +308,7 @@ static bool test7(void)
/* check a NULL pointer first -- should return 0 */
if (ompi_argv_len(NULL) != (size_t) 0) {
if (opal_argv_len(NULL) != (size_t) 0) {
return false;
}
@ -316,7 +316,7 @@ static bool test7(void)
/* size should be (sizeof(char **) + (sizeof(char) + sizeof('\0') +
sizeof(char*)) * 3) */
if (ompi_argv_len(a) != a_len) {
if (opal_argv_len(a) != a_len) {
return false;
}
@ -334,15 +334,15 @@ static bool test8(void)
/* bozo case */
if (NULL != ompi_argv_copy(NULL)) {
if (NULL != opal_argv_copy(NULL)) {
return false;
}
/* dup the a array and compare it (array length, contents, etc.) */
b = ompi_argv_copy(a);
b = opal_argv_copy(a);
if (ompi_argv_count(a) != ompi_argv_count(b)) {
if (opal_argv_count(a) != opal_argv_count(b)) {
return false;
}
for (i = 0; a[i] != NULL; ++i) {
@ -353,7 +353,7 @@ static bool test8(void)
/* All done */
ompi_argv_free(b);
opal_argv_free(b);
return true;
}
@ -365,41 +365,41 @@ static bool test9(void)
/* bozo cases */
if (OMPI_SUCCESS != ompi_argv_delete(NULL, NULL, 0, 0)) {
if (OMPI_SUCCESS != opal_argv_delete(NULL, NULL, 0, 0)) {
return false;
}
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "foo");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 7, 1) ||
1 != ompi_argv_count(a)) {
opal_argv_append(&argc, &a, "foo");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 7, 1) ||
1 != opal_argv_count(a)) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "foo");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 0, 0) ||
1 != ompi_argv_count(a)) {
opal_argv_append(&argc, &a, "foo");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 0, 0) ||
1 != opal_argv_count(a)) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
/* now some real tests */
/* delete 1 off the top */
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "a");
ompi_argv_append(&argc, &a, "b");
ompi_argv_append(&argc, &a, "c");
ompi_argv_append(&argc, &a, "d");
ompi_argv_append(&argc, &a, "e");
ompi_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 0, 1) ||
5 != ompi_argv_count(a) ||
opal_argv_append(&argc, &a, "a");
opal_argv_append(&argc, &a, "b");
opal_argv_append(&argc, &a, "c");
opal_argv_append(&argc, &a, "d");
opal_argv_append(&argc, &a, "e");
opal_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 0, 1) ||
5 != opal_argv_count(a) ||
0 != strcmp(a[0], "b") ||
0 != strcmp(a[1], "c") ||
0 != strcmp(a[2], "d") ||
@ -407,40 +407,40 @@ static bool test9(void)
0 != strcmp(a[4], "f")) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
/* delete 2 off the top */
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "a");
ompi_argv_append(&argc, &a, "b");
ompi_argv_append(&argc, &a, "c");
ompi_argv_append(&argc, &a, "d");
ompi_argv_append(&argc, &a, "e");
ompi_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 0, 2) ||
4 != ompi_argv_count(a) ||
opal_argv_append(&argc, &a, "a");
opal_argv_append(&argc, &a, "b");
opal_argv_append(&argc, &a, "c");
opal_argv_append(&argc, &a, "d");
opal_argv_append(&argc, &a, "e");
opal_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 0, 2) ||
4 != opal_argv_count(a) ||
0 != strcmp(a[0], "c") ||
0 != strcmp(a[1], "d") ||
0 != strcmp(a[2], "e") ||
0 != strcmp(a[3], "f")) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
/* delete 1 in the middle */
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "a");
ompi_argv_append(&argc, &a, "b");
ompi_argv_append(&argc, &a, "c");
ompi_argv_append(&argc, &a, "d");
ompi_argv_append(&argc, &a, "e");
ompi_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 1, 1) ||
5 != ompi_argv_count(a) ||
opal_argv_append(&argc, &a, "a");
opal_argv_append(&argc, &a, "b");
opal_argv_append(&argc, &a, "c");
opal_argv_append(&argc, &a, "d");
opal_argv_append(&argc, &a, "e");
opal_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 1, 1) ||
5 != opal_argv_count(a) ||
0 != strcmp(a[0], "a") ||
0 != strcmp(a[1], "c") ||
0 != strcmp(a[2], "d") ||
@ -448,52 +448,52 @@ static bool test9(void)
0 != strcmp(a[4], "f")) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
/* delete 2 in the middle */
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "a");
ompi_argv_append(&argc, &a, "b");
ompi_argv_append(&argc, &a, "c");
ompi_argv_append(&argc, &a, "d");
ompi_argv_append(&argc, &a, "e");
ompi_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 1, 2) ||
4 != ompi_argv_count(a) ||
opal_argv_append(&argc, &a, "a");
opal_argv_append(&argc, &a, "b");
opal_argv_append(&argc, &a, "c");
opal_argv_append(&argc, &a, "d");
opal_argv_append(&argc, &a, "e");
opal_argv_append(&argc, &a, "f");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 1, 2) ||
4 != opal_argv_count(a) ||
0 != strcmp(a[0], "a") ||
0 != strcmp(a[1], "d") ||
0 != strcmp(a[2], "e") ||
0 != strcmp(a[3], "f")) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
/* delete everything from the top */
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "a");
ompi_argv_append(&argc, &a, "b");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 0, 99) ||
0 != ompi_argv_count(a)) {
opal_argv_append(&argc, &a, "a");
opal_argv_append(&argc, &a, "b");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 0, 99) ||
0 != opal_argv_count(a)) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
/* delete everything from the middle */
a = NULL;
argc = 0;
ompi_argv_append(&argc, &a, "a");
ompi_argv_append(&argc, &a, "b");
if (OMPI_SUCCESS != ompi_argv_delete(&argc, &a, 1, 99) ||
1 != ompi_argv_count(a) ||
opal_argv_append(&argc, &a, "a");
opal_argv_append(&argc, &a, "b");
if (OMPI_SUCCESS != opal_argv_delete(&argc, &a, 1, 99) ||
1 != opal_argv_count(a) ||
0 != strcmp(a[0], "a")) {
return false;
}
ompi_argv_free(a);
opal_argv_free(a);
/* All done */
@ -513,19 +513,19 @@ static bool test10(void)
o = 0;
insert = NULL;
i = 0;
ompi_argv_append(&i, &insert, "insert a");
if (OMPI_SUCCESS == ompi_argv_insert(NULL, 0, insert)) {
opal_argv_append(&i, &insert, "insert a");
if (OMPI_SUCCESS == opal_argv_insert(NULL, 0, insert)) {
return false;
}
ompi_argv_append(&o, &orig, "orig a");
if (OMPI_SUCCESS != ompi_argv_insert(&orig, 0, NULL)) {
opal_argv_append(&o, &orig, "orig a");
if (OMPI_SUCCESS != opal_argv_insert(&orig, 0, NULL)) {
return false;
}
if (OMPI_SUCCESS == ompi_argv_insert(&orig, -1, insert)) {
if (OMPI_SUCCESS == opal_argv_insert(&orig, -1, insert)) {
return false;
}
ompi_argv_free(orig);
ompi_argv_free(insert);
opal_argv_free(orig);
opal_argv_free(insert);
/* append to the end */
@ -533,14 +533,14 @@ static bool test10(void)
o = 0;
insert = NULL;
i = 0;
ompi_argv_append(&i, &insert, "insert a");
ompi_argv_append(&i, &insert, "insert b");
ompi_argv_append(&i, &insert, "insert c");
ompi_argv_append(&o, &orig, "orig a");
ompi_argv_append(&o, &orig, "orig b");
ompi_argv_append(&o, &orig, "orig c");
if (OMPI_SUCCESS != ompi_argv_insert(&orig, 99, insert) ||
6 != ompi_argv_count(orig) ||
opal_argv_append(&i, &insert, "insert a");
opal_argv_append(&i, &insert, "insert b");
opal_argv_append(&i, &insert, "insert c");
opal_argv_append(&o, &orig, "orig a");
opal_argv_append(&o, &orig, "orig b");
opal_argv_append(&o, &orig, "orig c");
if (OMPI_SUCCESS != opal_argv_insert(&orig, 99, insert) ||
6 != opal_argv_count(orig) ||
0 != strcmp(orig[0], "orig a") ||
0 != strcmp(orig[1], "orig b") ||
0 != strcmp(orig[2], "orig c") ||
@ -549,8 +549,8 @@ static bool test10(void)
0 != strcmp(orig[5], "insert c")) {
return false;
}
ompi_argv_free(orig);
ompi_argv_free(insert);
opal_argv_free(orig);
opal_argv_free(insert);
/* insert at the beginning */
@ -558,14 +558,14 @@ static bool test10(void)
o = 0;
insert = NULL;
i = 0;
ompi_argv_append(&i, &insert, "insert a");
ompi_argv_append(&i, &insert, "insert b");
ompi_argv_append(&i, &insert, "insert c");
ompi_argv_append(&o, &orig, "orig a");
ompi_argv_append(&o, &orig, "orig b");
ompi_argv_append(&o, &orig, "orig c");
if (OMPI_SUCCESS != ompi_argv_insert(&orig, 0, insert) ||
6 != ompi_argv_count(orig) ||
opal_argv_append(&i, &insert, "insert a");
opal_argv_append(&i, &insert, "insert b");
opal_argv_append(&i, &insert, "insert c");
opal_argv_append(&o, &orig, "orig a");
opal_argv_append(&o, &orig, "orig b");
opal_argv_append(&o, &orig, "orig c");
if (OMPI_SUCCESS != opal_argv_insert(&orig, 0, insert) ||
6 != opal_argv_count(orig) ||
0 != strcmp(orig[3], "orig a") ||
0 != strcmp(orig[4], "orig b") ||
0 != strcmp(orig[5], "orig c") ||
@ -574,8 +574,8 @@ static bool test10(void)
0 != strcmp(orig[2], "insert c")) {
return false;
}
ompi_argv_free(orig);
ompi_argv_free(insert);
opal_argv_free(orig);
opal_argv_free(insert);
/* insert in the middle */
@ -583,14 +583,14 @@ static bool test10(void)
o = 0;
insert = NULL;
i = 0;
ompi_argv_append(&i, &insert, "insert a");
ompi_argv_append(&i, &insert, "insert b");
ompi_argv_append(&i, &insert, "insert c");
ompi_argv_append(&o, &orig, "orig a");
ompi_argv_append(&o, &orig, "orig b");
ompi_argv_append(&o, &orig, "orig c");
if (OMPI_SUCCESS != ompi_argv_insert(&orig, 1, insert) ||
6 != ompi_argv_count(orig) ||
opal_argv_append(&i, &insert, "insert a");
opal_argv_append(&i, &insert, "insert b");
opal_argv_append(&i, &insert, "insert c");
opal_argv_append(&o, &orig, "orig a");
opal_argv_append(&o, &orig, "orig b");
opal_argv_append(&o, &orig, "orig c");
if (OMPI_SUCCESS != opal_argv_insert(&orig, 1, insert) ||
6 != opal_argv_count(orig) ||
0 != strcmp(orig[0], "orig a") ||
0 != strcmp(orig[4], "orig b") ||
0 != strcmp(orig[5], "orig c") ||
@ -599,8 +599,8 @@ static bool test10(void)
0 != strcmp(orig[3], "insert c")) {
return false;
}
ompi_argv_free(orig);
ompi_argv_free(insert);
opal_argv_free(orig);
opal_argv_free(insert);
/* insert in the middle */
@ -608,17 +608,17 @@ static bool test10(void)
o = 0;
insert = NULL;
i = 0;
ompi_argv_append(&i, &insert, "insert a");
ompi_argv_append(&i, &insert, "insert b");
ompi_argv_append(&i, &insert, "insert c");
ompi_argv_append(&o, &orig, "orig a");
ompi_argv_append(&o, &orig, "orig b");
ompi_argv_append(&o, &orig, "orig c");
ompi_argv_append(&o, &orig, "orig d");
ompi_argv_append(&o, &orig, "orig e");
ompi_argv_append(&o, &orig, "orig f");
if (OMPI_SUCCESS != ompi_argv_insert(&orig, 1, insert) ||
9 != ompi_argv_count(orig) ||
opal_argv_append(&i, &insert, "insert a");
opal_argv_append(&i, &insert, "insert b");
opal_argv_append(&i, &insert, "insert c");
opal_argv_append(&o, &orig, "orig a");
opal_argv_append(&o, &orig, "orig b");
opal_argv_append(&o, &orig, "orig c");
opal_argv_append(&o, &orig, "orig d");
opal_argv_append(&o, &orig, "orig e");
opal_argv_append(&o, &orig, "orig f");
if (OMPI_SUCCESS != opal_argv_insert(&orig, 1, insert) ||
9 != opal_argv_count(orig) ||
0 != strcmp(orig[0], "orig a") ||
0 != strcmp(orig[4], "orig b") ||
0 != strcmp(orig[5], "orig c") ||
@ -630,8 +630,8 @@ static bool test10(void)
0 != strcmp(orig[3], "insert c")) {
return false;
}
ompi_argv_free(orig);
ompi_argv_free(insert);
opal_argv_free(orig);
opal_argv_free(insert);
/* All done */

6
test/util/ompi_basename.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "support.h"
#include "include/constants.h"
#include "util/basename.h"
#include "opal/util/basename.h"
static void test(const char* in, const char* out);
@ -30,7 +30,7 @@ static void test(const char* in, const char* out);
int main(int argc, char* argv[])
{
test_init("ompi_basename()");
test_init("opal_basename()");
test("foo.txt", "foo.txt");
test("/foo/bar/baz", "baz");
@ -58,7 +58,7 @@ int main(int argc, char* argv[])
void test(const char* in, const char* out)
{
char *msg;
char *ret = ompi_basename(in);
char *ret = opal_basename(in);
if (0 == strcmp(ret, out)) {
test_success();