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

Merge pull request #1017 from jsquyres/pr/fix-cr-exits

Просмотр исходного кода 
dynamics: fix OPAL_CR_EXIT_LIBRARY()
Этот коммит содержится в:
Jeff Squyres 2015-10-14 05:45:05 -04:00
родитель 62351f442a a4adee5329
Коммит 5d97d7b5d5
7 изменённых файлов: 21 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008 University of Houston, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
@ -105,6 +105,8 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root,
&newcomp);
}
OPAL_CR_EXIT_LIBRARY();
*newcomm = newcomp;
OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME );
}

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

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2008 University of Houston. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
@ -107,6 +107,8 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root,
&newcomp);
}
OPAL_CR_EXIT_LIBRARY();
*newcomm = newcomp;
OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
}

3
ompi/mpi/c/comm_join.c
Просмотреть файл

@ -13,6 +13,7 @@
* All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -129,6 +130,8 @@ int MPI_Comm_join(int fd, MPI_Comm *intercomm)
/* use the port to connect/accept */
rc = ompi_dpm_connect_accept (MPI_COMM_SELF, 0, port_name, send_first, &newcomp);
OPAL_CR_EXIT_LIBRARY();
*intercomm = newcomp;
OMPI_ERRHANDLER_RETURN (rc, MPI_COMM_SELF, rc, FUNC_NAME);
}

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

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
@ -132,13 +132,13 @@ int MPI_Comm_spawn(const char *command, char *argv[], int maxprocs, MPI_Info inf
}
error:
OPAL_CR_EXIT_LIBRARY();
/* close the port */
if (rank == root && !non_mpi) {
ompi_dpm_close_port(port_name);
}
OPAL_CR_EXIT_LIBRARY();
/* set error codes */
if (MPI_ERRCODES_IGNORE != array_of_errcodes) {
for ( i=0; i < maxprocs; i++ ) {

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

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
* reserved.
@ -173,13 +173,13 @@ int MPI_Comm_spawn_multiple(int count, char *array_of_commands[], char **array_o
}
error:
OPAL_CR_EXIT_LIBRARY();
/* close the port */
if (rank == root && !non_mpi) {
ompi_dpm_close_port(port_name);
}
OPAL_CR_EXIT_LIBRARY();
/* set array of errorcodes */
if (MPI_ERRCODES_IGNORE != array_of_errcodes) {
if (NULL != newcomp) {

3
ompi/mpi/c/lookup_name.c
Просмотреть файл

@ -15,6 +15,7 @@
* Copyright (c) 2015 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -92,6 +93,7 @@ int MPI_Lookup_name(const char *service_name, MPI_Info info, char *port_name)
} else {
/* unrecognized scope */
OPAL_LIST_DESTRUCT(&pinfo);
OPAL_CR_EXIT_LIBRARY();
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
FUNC_NAME);
}
@ -109,6 +111,7 @@ int MPI_Lookup_name(const char *service_name, MPI_Info info, char *port_name)
if (OPAL_SUCCESS != ret ||
OPAL_STRING != pdat->value.type ||
NULL == pdat->value.data.string) {
OPAL_CR_EXIT_LIBRARY();
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_NAME,
FUNC_NAME);
}

3
ompi/mpi/c/publish_name.c
Просмотреть файл

@ -16,6 +16,7 @@
*
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -93,6 +94,7 @@ int MPI_Publish_name(const char *service_name, MPI_Info info,
} else {
/* unrecognized scope */
OPAL_LIST_DESTRUCT(&values);
OPAL_CR_EXIT_LIBRARY();
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
FUNC_NAME);
}
@ -126,6 +128,7 @@ int MPI_Publish_name(const char *service_name, MPI_Info info,
} else {
/* unrecognized persistence */
OPAL_LIST_DESTRUCT(&values);
OPAL_CR_EXIT_LIBRARY();
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
FUNC_NAME);
}