From 11f8dcb538ce8bed6856397f83ecb484f7842003 Mon Sep 17 00:00:00 2001 From: Eugene Loh Date: Mon, 1 Oct 2012 05:18:21 +0000 Subject: [PATCH] Update Mprobe/Improbe man page for MPI_PROC_NULL case and mprobe.c/improbe.c for MPI_STATUS_IGNORE/MPI_PROC_NULL case. This commit was SVN r27386. --- ompi/mpi/c/improbe.c | 3 ++- ompi/mpi/c/mprobe.c | 3 ++- ompi/mpi/man/man3/MPI_Improbe.3in | 3 ++- ompi/mpi/man/man3/MPI_Mprobe.3in | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ompi/mpi/c/improbe.c b/ompi/mpi/c/improbe.c index 3c58b64734..269c965111 100644 --- a/ompi/mpi/c/improbe.c +++ b/ompi/mpi/c/improbe.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,8 +63,8 @@ int MPI_Improbe(int source, int tag, MPI_Comm comm, int *flag, MEMCHECKER( opal_memchecker_base_mem_undefined(&status->MPI_ERROR, sizeof(int)); ); - *message = &ompi_message_no_proc.message; } + *message = &ompi_message_no_proc.message; *flag = 1; return MPI_SUCCESS; } diff --git a/ompi/mpi/c/mprobe.c b/ompi/mpi/c/mprobe.c index ae32ccc6ca..23e99964cd 100644 --- a/ompi/mpi/c/mprobe.c +++ b/ompi/mpi/c/mprobe.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,8 +63,8 @@ int MPI_Mprobe(int source, int tag, MPI_Comm comm, MEMCHECKER( opal_memchecker_base_mem_undefined(&status->MPI_ERROR, sizeof(int)); ); - *message = &ompi_message_no_proc.message; } + *message = &ompi_message_no_proc.message; return MPI_SUCCESS; } diff --git a/ompi/mpi/man/man3/MPI_Improbe.3in b/ompi/mpi/man/man3/MPI_Improbe.3in index 758ef3d427..d1dffa16eb 100644 --- a/ompi/mpi/man/man3/MPI_Improbe.3in +++ b/ompi/mpi/man/man3/MPI_Improbe.3in @@ -1,3 +1,4 @@ +.\" Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. .\" Copyright 2012 Cisco Systems, Inc. All rights reserved. .\" Copyright 2006-2008 Sun Microsystems, Inc. .\" Copyright (c) 1996 Thinking Machines Corporation @@ -71,7 +72,7 @@ allocate memory for the receive buffer according to the length of the probed message. .sp A matching probe with MPI_PROC_NULL as \fIsource\fP returns \fIflag\fP -= true, \fImessage\fP = MPI_MESSAGE_NULL, and the \fIstatus\fP object += true, \fImessage\fP = MPI_MESSAGE_NO_PROC, and the \fIstatus\fP object returns source = MPI_PROC_NULL, tag = MPI_ANY_TAG, and count = 0. .sp MPI_Iprobe returns a true value in \fIflag\fP if a message has been diff --git a/ompi/mpi/man/man3/MPI_Mprobe.3in b/ompi/mpi/man/man3/MPI_Mprobe.3in index f30de7c0fd..7fb3d0168b 100644 --- a/ompi/mpi/man/man3/MPI_Mprobe.3in +++ b/ompi/mpi/man/man3/MPI_Mprobe.3in @@ -1,3 +1,4 @@ +.\" Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. .\" Copyright 2012 Cisco Systems, Inc. All rights reserved. .\" Copyright 2006-2008 Sun Microsystems, Inc. .\" Copyright (c) 1996 Thinking Machines Corporation @@ -66,7 +67,7 @@ allocate memory for the receive buffer according to the length of the probed message. .sp A matching probe with MPI_PROC_NULL as \fIsource\fP returns -\fImessage\fP = MPI_MESSAGE_NULL, and the \fIstatus\fP object returns +\fImessage\fP = MPI_MESSAGE_NO_PROC, and the \fIstatus\fP object returns source = MPI_PROC_NULL, tag = MPI_ANY_TAG, and count = 0. .sp When MPI_Mprobe returns (from a non-MPI_PROC_NULL \fIsource\fP), the