I think we're missing a couple semicolons (see below).
On Thu, Oct/08/2009 01:53:43PM, r...@osl.iu.edu wrote:
> Author: rhc
> Date: 2009-10-08 13:53:43 EDT (Thu, 08 Oct 2009)
> New Revision: 22077
> URL: https://svn.open-mpi.org/trac/ompi/changeset/22077
>
> Log:
> Closes #2048: Fix uninitialized variable in MPI_Comm_spawn_multiple
>
> Submitted by tdd, reviewed by jsquyres, RM-approved by bbenton
>
> Includes r22075 and r22076
>
>
> Properties modified:
> branches/v1.3/ (props changed)
> Text files modified:
> branches/v1.3/ompi/mpi/c/comm_spawn.c | 5 +++++
>
> branches/v1.3/ompi/mpi/c/comm_spawn_multiple.c | 7 ++++++-
>
> 2 files changed, 11 insertions(+), 1 deletions(-)
>
> Modified: branches/v1.3/ompi/mpi/c/comm_spawn.c
> ==============================================================================
> --- branches/v1.3/ompi/mpi/c/comm_spawn.c (original)
> +++ branches/v1.3/ompi/mpi/c/comm_spawn.c 2009-10-08 13:53:43 EDT (Thu,
> 08 Oct 2009)
> @@ -10,6 +10,7 @@
> * 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) 2009 Sun Microsystems, Inc. All rights reserved.
> * $COPYRIGHT$
> *
> * Additional copyrights may follow
> @@ -106,6 +107,10 @@
> if (OMPI_SUCCESS != (rc = ompi_dpm.open_port (port_name,
> OMPI_RML_TAG_INVALID))) {
> goto error;
> }
> + } else if (1 < ompi_comm_size(comm)) {
> + /* we do not support non_mpi spawns on comms this size */
> + rc = OMPI_ERR_NOT_SUPPORTED
Here.
> + goto error;
> }
> if (OMPI_SUCCESS != (rc = ompi_dpm.spawn (1, &command, &argv,
> &maxprocs,
> &info, port_name))) {
>
> Modified: branches/v1.3/ompi/mpi/c/comm_spawn_multiple.c
> ==============================================================================
> --- branches/v1.3/ompi/mpi/c/comm_spawn_multiple.c (original)
> +++ branches/v1.3/ompi/mpi/c/comm_spawn_multiple.c 2009-10-08 13:53:43 EDT
> (Thu, 08 Oct 2009)
> @@ -10,6 +10,7 @@
> * 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) 2009 Sun Microsystems, Inc. All rights reserved.
> * $COPYRIGHT$
> *
> * Additional copyrights may follow
> @@ -45,7 +46,7 @@
> ompi_communicator_t *newcomp=NULL;
> bool send_first=false; /* they are contacting us first */
> char port_name[MPI_MAX_PORT_NAME];
> - bool non_mpi, cumulative = false;
> + bool non_mpi = false, cumulative = false;
>
> MEMCHECKER(
> memchecker_comm(comm);
> @@ -146,6 +147,10 @@
> if (OMPI_SUCCESS != (rc = ompi_dpm.open_port (port_name,
> OMPI_RML_TAG_INVALID))) {
> goto error;
> }
> + } else if (1 < ompi_comm_size(comm)) {
> + /* we do not support non_mpi spawns on comms this size */
> + rc = OMPI_ERR_NOT_SUPPORTED
And here.
-Ethan
> + goto error;
> }
> if (OMPI_SUCCESS != (rc = ompi_dpm.spawn(count, array_of_commands,
> array_of_argv,
> array_of_maxprocs,
> _______________________________________________
> svn-full mailing list
> svn-f...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
