removing the current version of the mpi_appnum paramter, since it will be handled now using the registry
This commit was SVN r4027.
Этот коммит содержится в:
родитель
72a28e7796
Коммит
ba31e74ec3
@ -488,8 +488,6 @@ int ompi_comm_dyn_init (void)
|
||||
ompi_process_name_t *port_proc_name=NULL;
|
||||
ompi_group_t *group = NULL;
|
||||
ompi_errhandler_t *errhandler = NULL;
|
||||
char remainder[128];
|
||||
int appnum=0;
|
||||
|
||||
/* get jobid */
|
||||
/* JMS: Previous was using ompi_proc_self() here, which
|
||||
@ -510,9 +508,8 @@ int ompi_comm_dyn_init (void)
|
||||
ompi_communicator_t *oldcomm;
|
||||
|
||||
/* split the content of the environment variable into
|
||||
its pieces, which are : port_name, tag, and mpi_appnum. */
|
||||
oob_port = ompi_parse_port (port_name, &tag, &(remainder[0]));
|
||||
sscanf (remainder, "%d", &appnum);
|
||||
its pieces, which are : port_name and tag */
|
||||
oob_port = ompi_parse_port (port_name, &tag);
|
||||
|
||||
port_proc_name = ompi_name_server.convert_string_to_process_name(oob_port);
|
||||
ompi_comm_connect_accept (MPI_COMM_WORLD, root, port_proc_name,
|
||||
|
@ -59,7 +59,7 @@ int ompi_open_port(char *port_name)
|
||||
/* takes a port_name and separates it into the process_name
|
||||
and the tag
|
||||
*/
|
||||
char *ompi_parse_port (char *port_name, int *tag, char **remainder)
|
||||
char *ompi_parse_port (char *port_name, int *tag )
|
||||
{
|
||||
char tmp_port[MPI_MAX_PORT_NAME], *tmp_string;
|
||||
|
||||
@ -71,9 +71,6 @@ char *ompi_parse_port (char *port_name, int *tag, char **remainder)
|
||||
strncpy (tmp_port, port_name, MPI_MAX_PORT_NAME);
|
||||
strncpy (tmp_string, strtok(tmp_port, ":"), MPI_MAX_PORT_NAME);
|
||||
sscanf( strtok(NULL, ":"),"%d", tag);
|
||||
if ( NULL != remainder ) {
|
||||
*remainder = strtok(NULL, ":");
|
||||
}
|
||||
|
||||
return tmp_string;
|
||||
}
|
||||
|
@ -372,7 +372,7 @@ struct ompi_communicator_t {
|
||||
* takes a port_name and returns the oob-contact information
|
||||
* and the tag
|
||||
*/
|
||||
char * ompi_parse_port (char *port_name, int *tag, char **remainder) ;
|
||||
char * ompi_parse_port (char *port_name, int *tag ) ;
|
||||
|
||||
/**
|
||||
* routines handling name publishing, lookup and unpublishing
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user