mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
2183c5971a
Fixed numerous ph5diff bugs. Description: Fixed manager output printing Fixed out of order output printing Fixed test script execution problem Temporary fix for large amounts of output overflowing buffer. Solution: The manager task buffers its output. However, since the manager task never gets a print token, this output was lost. Solution: new function called print_manager_output that prints buffered output is called in places where the manager buffers its output. printf was apparently buffering output. This means that a task would sometimes print even after it had given up its print token. Added fflush() call after printf() calls, which seems to have fixed the problem. calling rsh multiple times in succession seems to overwhelm something in Linux, as it begins to refuse new connections until the old ones reset. Since each call to mpirun in the test script starts up 4 rsh sessions, the test script eventually is unable to run any further tests. Solution: Added a short delay in the testscript between successive calls to mpirun to allow old connections to reset. The 10k output buffer was of insufficient size to hold the large amounts of output generated by some of the tests. Since code to buffer to a file has not been implemented yet, a temporary fix was to increase the size of the output buffer to 50k. Platforms tested: heping Misc. update:
51 lines
1.7 KiB
C
51 lines
1.7 KiB
C
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
* 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. *
|
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
|
|
|
#ifndef _PH5DIFF_H__
|
|
#define _PH5DIFF_H__
|
|
|
|
|
|
#define OUTBUFF_SIZE 50000
|
|
/* Send from manager to workers */
|
|
#define MPI_TAG_ARGS 1
|
|
#define MPI_TAG_PRINT_TOK 2
|
|
|
|
/*Sent from workers to manager */
|
|
#define MPI_TAG_TOK_REQUEST 3
|
|
#define MPI_TAG_DONE 4
|
|
#define MPI_TAG_TOK_RETURN 5
|
|
|
|
/* Operational tags used to init and complete diff */
|
|
#define MPI_TAG_END 6
|
|
#define MPI_TAG_PARALLEL 7
|
|
|
|
extern int g_nTasks;
|
|
extern unsigned char g_Parallel;
|
|
extern char outBuff[OUTBUFF_SIZE];
|
|
extern unsigned int outBuffOffset;
|
|
|
|
struct diff_args
|
|
{
|
|
char name[256];
|
|
H5G_obj_t type;
|
|
diff_opt_t options;
|
|
};
|
|
|
|
#ifdef H5_HAVE_PARALLEL
|
|
#include <mpi.h>
|
|
#endif
|
|
|
|
|
|
#endif /* _PH5DIFF_H__ */
|