mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r6313] Purpose:

Browse Source 
Updated
Description:
    Updated Copyright notice.
    Replaced HGOTO_ERROR calls involving MPI calls with HMPI_GOTO_ERROR.
Platforms tested:
    Tested h5committest {arabica (fortran), eirene (fortran, C++)
	modi4 (parallel, fortran)}?  Tested on Eirene (PP) only since
	the code is in the MPIO module only.
This commit is contained in:
Albert Cheng 2003-01-22 14:56:45 -05:00
parent 5fba11cf8a
commit daa26b6c11
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/H5FDmpio.c
View File

@ -1,7 +1,18 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the files COPYING and Copyright.html. COPYING can be found at the root *
* of the source code distribution tree; Copyright.html can be found at the *
* root level of an installed copy of the electronic HDF5 document set and *
* is linked from the top-level documents page. It can also be found at *
* http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* /*
* Copyright (c) 1999-2002 NCSA
* All rights reserved.
*
* Programmer: Robb Matzke <matzke@llnl.gov> * Programmer: Robb Matzke <matzke@llnl.gov>
* Thursday, July 29, 1999 * Thursday, July 29, 1999
* *
@ -670,7 +681,8 @@ H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file)
H5FD_mpio_t *file = (H5FD_mpio_t*)_file; H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
char msgbuf[1]; char msgbuf[1];
MPI_Status rcvstat; MPI_Status rcvstat;
herr_t ret_value=SUCCEED; /* Return value */ int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_wait_for_left_neighbor, FAIL); FUNC_ENTER_NOAPI(H5FD_mpio_wait_for_left_neighbor, FAIL);
@ -682,8 +694,9 @@ H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file)
/* p0 has no left neighbor; all other procs wait for msg */ /* p0 has no left neighbor; all other procs wait for msg */
if (file->mpi_rank != 0) { if (file->mpi_rank != 0) {
if (MPI_SUCCESS!= MPI_Recv( &msgbuf, 1, MPI_CHAR, file->mpi_rank-1, MPI_ANY_TAG, file->comm, &rcvstat )) if (MPI_SUCCESS != (mpi_code=MPI_Recv( &msgbuf, 1, MPI_CHAR,
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_Recv failed"); file->mpi_rank-1, MPI_ANY_TAG, file->comm, &rcvstat )))
HMPI_GOTO_ERROR(FAIL, "MPI_Recv failed", mpi_code);
} }
done: done:
@ -722,6 +735,7 @@ H5FD_mpio_signal_right_neighbor(H5FD_t *_file)
{ {
H5FD_mpio_t *file = (H5FD_mpio_t*)_file; H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
char msgbuf[1]; char msgbuf[1];
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */ herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_signal_right_neighbor, FAIL); FUNC_ENTER_NOAPI(H5FD_mpio_signal_right_neighbor, FAIL);
@ -730,8 +744,9 @@ H5FD_mpio_signal_right_neighbor(H5FD_t *_file)
assert(H5FD_MPIO==file->pub.driver_id); assert(H5FD_MPIO==file->pub.driver_id);
if (file->mpi_rank != (file->mpi_size-1)) { if (file->mpi_rank != (file->mpi_size-1)) {
if (MPI_SUCCESS!= MPI_Send(&msgbuf, 0/*empty msg*/, MPI_CHAR, file->mpi_rank+1, 0, file->comm)) if (MPI_SUCCESS != (mpi_code=MPI_Send(&msgbuf, 0/*empty msg*/, MPI_CHAR,
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_Send failed"); file->mpi_rank+1, 0, file->comm)))
HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mpi_code);
} }
done: done: