mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r10206]

Browse Source 
Purpose:
Bug fix.

Description:
ph5diff fails on modi4 due to the way snprintf works on IRIX.

Solution:
The C99 standard says that, if there isn't enough room in the string,
 snprintf should return the number of characters that
would have been written to the output string if there were enough room.

The snprintf on modi4 would return the number of characters that is was able to write
succesfully to the string if space ran out. The ph5diff logic that checks if
the output buffer was full did not handle this sort of return value correctly.

Used  VSNPRINTF_WORKS from configure test to check how snprintf works and do
the logic accordingly.

Platforms tested:
modi4

Misc. update:
This commit is contained in:
Leon Arber 2005-03-13 18:38:11 -05:00
parent c33f593665
commit 82b3a0ca4a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/h5diff/ph5diff_main.c
View File

@ -53,7 +53,6 @@ static void ph5diff_worker(int );
int main(int argc, const char *argv[])
{
int i;
int nID = 0;
const char *fname1 = NULL;
const char *fname2 = NULL;
@ -61,7 +60,6 @@ int main(int argc, const char *argv[])
const char *objname2 = NULL;
hsize_t nfound=0;
diff_opt_t options;
MPI_Status Status;
outBuffOffset = 0;
g_Parallel = 1;
@ -133,8 +131,8 @@ ph5diff_worker(int nID)
char filenames[2][1024];
char out_data[PRINT_DATA_MAX_SIZE] = {0};
hsize_t nfound=0;
int i;
MPI_Status Status;
int i;
MPI_Comm_rank(MPI_COMM_WORLD, &nID);
outBuffOffset = 0;

16
tools/lib/h5diff_util.c
View File

@ -49,17 +49,20 @@ void parallel_print(const char* format, ...)
if(overflow_file == NULL) /*no overflow has occurred yet */
{
bytes_written = HDvsnprintf(outBuff+outBuffOffset, OUTBUFF_SIZE-outBuffOffset, format, ap);
va_end(ap);
va_end(ap);
va_start(ap, format);
if(bytes_written >= (OUTBUFF_SIZE-outBuffOffset))
#ifdef VSNPRINTF_WORKS
if(bytes_written >= (OUTBUFF_SIZE-outBuffOffset))
#else
if((bytes_written+1) == (OUTBUFF_SIZE-outBuffOffset))
#endif
{
/* Delete the characters that were written to outBuff since they will be written to the overflow_file */
memset(outBuff+outBuffOffset, 0, OUTBUFF_SIZE - outBuffOffset);
memset(outBuff+outBuffOffset, 0, OUTBUFF_SIZE - outBuffOffset);
overflow_file = tmpfile();
if(overflow_file == NULL)
printf("Warning: Could not create overflow file. Output may be truncated.\n");
else
@ -71,7 +74,6 @@ void parallel_print(const char* format, ...)
else
bytes_written = HDvfprintf(overflow_file, format, ap);
}
va_end(ap);
}

2
tools/lib/ph5diff.h
View File

@ -17,7 +17,7 @@
#define PRINT_DATA_MAX_SIZE 512
#define OUTBUFF_SIZE PRINT_DATA_MAX_SIZE*2
#define OUTBUFF_SIZE PRINT_DATA_MAX_SIZE*4
/* Send from manager to workers */
#define MPI_TAG_ARGS 1
#define MPI_TAG_PRINT_TOK 2