diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-27 20:43:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-27 20:43:30 (GMT) |
commit | 1e91d96fa02466ffe451319bdac1005f84dc7993 (patch) | |
tree | 4de04ef502c313dfd766497b20235188761146c0 /src/H5FDlog.c | |
parent | 95e5349089b95dfb95f0f8ce2d6db1bc04ba6c82 (diff) | |
download | hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.zip hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.tar.gz hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.tar.bz2 |
Brings over most of the HD prefix removal (#3293)
Diffstat (limited to 'src/H5FDlog.c')
-rw-r--r-- | src/H5FDlog.c | 214 |
1 files changed, 107 insertions, 107 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 225c1a1..3c412c5 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -316,7 +316,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, si /* Do this first, so that we don't try to free a wild pointer if * H5P_object_verify() fails. */ - HDmemset(&fa, 0, sizeof(H5FD_log_fapl_t)); + memset(&fa, 0, sizeof(H5FD_log_fapl_t)); /* Check arguments */ if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) @@ -393,7 +393,7 @@ H5FD__log_fapl_copy(const void *_old_fa) FUNC_ENTER_PACKAGE - HDassert(old_fa); + assert(old_fa); /* Allocate the new FAPL info */ if (NULL == (new_fa = (H5FD_log_fapl_t *)H5MM_calloc(sizeof(H5FD_log_fapl_t)))) @@ -586,20 +586,20 @@ H5FD__log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) file->iosize = fa->buf_size; if (file->fa.flags & H5FD_LOG_FILE_READ) { file->nread = (unsigned char *)H5MM_calloc(file->iosize); - HDassert(file->nread); + assert(file->nread); } if (file->fa.flags & H5FD_LOG_FILE_WRITE) { file->nwrite = (unsigned char *)H5MM_calloc(file->iosize); - HDassert(file->nwrite); + assert(file->nwrite); } if (file->fa.flags & H5FD_LOG_FLAVOR) { file->flavor = (unsigned char *)H5MM_calloc(file->iosize); - HDassert(file->flavor); + assert(file->flavor); } /* Set the log file pointer */ if (fa->logfile) - file->logfp = HDfopen(fa->logfile, "w"); + file->logfp = fopen(fa->logfile, "w"); else file->logfp = stderr; @@ -608,13 +608,13 @@ H5FD__log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) H5_timevals_t open_times; /* Elapsed time for open() call */ H5_timer_get_times(open_timer, &open_times); - HDfprintf(file->logfp, "Open took: (%f s)\n", open_times.elapsed); + fprintf(file->logfp, "Open took: (%f s)\n", open_times.elapsed); } if (file->fa.flags & H5FD_LOG_TIME_STAT) { H5_timevals_t stat_times; /* Elapsed time for stat() call */ H5_timer_get_times(stat_timer, &stat_times); - HDfprintf(file->logfp, "Stat took: (%f s)\n", stat_times.elapsed); + fprintf(file->logfp, "Stat took: (%f s)\n", stat_times.elapsed); } } @@ -677,7 +677,7 @@ H5FD__log_close(H5FD_t *_file) FUNC_ENTER_PACKAGE /* Sanity check */ - HDassert(file); + assert(file); /* Initialize timer */ H5_timer_init(&close_timer); @@ -704,89 +704,89 @@ H5FD__log_close(H5FD_t *_file) H5_timevals_t close_times; /* Elapsed time for close() call */ H5_timer_get_times(close_timer, &close_times); - HDfprintf(file->logfp, "Close took: (%f s)\n", close_times.elapsed); + fprintf(file->logfp, "Close took: (%f s)\n", close_times.elapsed); } /* Dump the total number of seek/read/write operations */ if (file->fa.flags & H5FD_LOG_NUM_READ) - HDfprintf(file->logfp, "Total number of read operations: %llu\n", file->total_read_ops); + fprintf(file->logfp, "Total number of read operations: %llu\n", file->total_read_ops); if (file->fa.flags & H5FD_LOG_NUM_WRITE) - HDfprintf(file->logfp, "Total number of write operations: %llu\n", file->total_write_ops); + fprintf(file->logfp, "Total number of write operations: %llu\n", file->total_write_ops); if (file->fa.flags & H5FD_LOG_NUM_SEEK) - HDfprintf(file->logfp, "Total number of seek operations: %llu\n", file->total_seek_ops); + fprintf(file->logfp, "Total number of seek operations: %llu\n", file->total_seek_ops); if (file->fa.flags & H5FD_LOG_NUM_TRUNCATE) - HDfprintf(file->logfp, "Total number of truncate operations: %llu\n", file->total_truncate_ops); + fprintf(file->logfp, "Total number of truncate operations: %llu\n", file->total_truncate_ops); /* Dump the total time in seek/read/write */ if (file->fa.flags & H5FD_LOG_TIME_READ) - HDfprintf(file->logfp, "Total time in read operations: %f s\n", file->total_read_time); + fprintf(file->logfp, "Total time in read operations: %f s\n", file->total_read_time); if (file->fa.flags & H5FD_LOG_TIME_WRITE) - HDfprintf(file->logfp, "Total time in write operations: %f s\n", file->total_write_time); + fprintf(file->logfp, "Total time in write operations: %f s\n", file->total_write_time); if (file->fa.flags & H5FD_LOG_TIME_SEEK) - HDfprintf(file->logfp, "Total time in seek operations: %f s\n", file->total_seek_time); + fprintf(file->logfp, "Total time in seek operations: %f s\n", file->total_seek_time); if (file->fa.flags & H5FD_LOG_TIME_TRUNCATE) - HDfprintf(file->logfp, "Total time in truncate operations: %f s\n", file->total_truncate_time); + fprintf(file->logfp, "Total time in truncate operations: %f s\n", file->total_truncate_time); /* Dump the write I/O information */ if (file->fa.flags & H5FD_LOG_FILE_WRITE) { - HDfprintf(file->logfp, "Dumping write I/O information:\n"); + fprintf(file->logfp, "Dumping write I/O information:\n"); last_val = file->nwrite[0]; last_addr = 0; addr = 1; while (addr < file->eoa) { if (file->nwrite[addr] != last_val) { - HDfprintf(file->logfp, - "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n", - last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); + fprintf(file->logfp, + "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n", + last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); last_val = file->nwrite[addr]; last_addr = addr; } addr++; } - HDfprintf(file->logfp, - "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n", - last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); + fprintf(file->logfp, + "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n", + last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); } /* Dump the read I/O information */ if (file->fa.flags & H5FD_LOG_FILE_READ) { - HDfprintf(file->logfp, "Dumping read I/O information:\n"); + fprintf(file->logfp, "Dumping read I/O information:\n"); last_val = file->nread[0]; last_addr = 0; addr = 1; while (addr < file->eoa) { if (file->nread[addr] != last_val) { - HDfprintf(file->logfp, - "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n", - last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); + fprintf(file->logfp, + "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n", + last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); last_val = file->nread[addr]; last_addr = addr; } addr++; } - HDfprintf(file->logfp, - "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n", - last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); + fprintf(file->logfp, + "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n", last_addr, + (addr - 1), (unsigned long)(addr - last_addr), (int)last_val); } /* Dump the I/O flavor information */ if (file->fa.flags & H5FD_LOG_FLAVOR) { - HDfprintf(file->logfp, "Dumping I/O flavor information:\n"); + fprintf(file->logfp, "Dumping I/O flavor information:\n"); last_val = file->flavor[0]; last_addr = 0; addr = 1; while (addr < file->eoa) { if (file->flavor[addr] != last_val) { - HDfprintf(file->logfp, - "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n", - last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]); + fprintf(file->logfp, + "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n", + last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]); last_val = file->flavor[addr]; last_addr = addr; } addr++; } - HDfprintf(file->logfp, "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n", - last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]); + fprintf(file->logfp, "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n", + last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]); } /* Free the logging information */ @@ -860,9 +860,9 @@ H5FD__log_cmp(const H5FD_t *_f1, const H5FD_t *_f2) * determine if the values are the same or not. The actual return value * shouldn't really matter... */ - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) HGOTO_DONE(-1) - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) HGOTO_DONE(1) #endif /* H5_DEV_T_IS_SCALAR */ @@ -950,15 +950,15 @@ H5FD__log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hs /* Retain the (first) flavor of the information written to the file */ if (file->fa.flags != 0) { if (file->fa.flags & H5FD_LOG_FLAVOR) { - HDassert(addr < file->iosize); + assert(addr < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[addr], (int)type, (size_t)size); + memset(&file->flavor[addr], (int)type, (size_t)size); } if (file->fa.flags & H5FD_LOG_ALLOC) - HDfprintf(file->logfp, - "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n", addr, - (haddr_t)((addr + size) - 1), size, flavors[type]); + fprintf(file->logfp, + "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n", addr, + (haddr_t)((addr + size) - 1), size, flavors[type]); } /* Set return value */ @@ -989,15 +989,15 @@ H5FD__log_free(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had if (file->fa.flags != 0) { /* Reset the flavor of the information in the file */ if (file->fa.flags & H5FD_LOG_FLAVOR) { - HDassert(addr < file->iosize); + assert(addr < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); + memset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); } /* Log the file memory freed */ if (file->fa.flags & H5FD_LOG_FREE) - HDfprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n", - addr, (haddr_t)((addr + size) - 1), size, flavors[type]); + fprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n", + addr, (haddr_t)((addr + size) - 1), size, flavors[type]); } FUNC_LEAVE_NOAPI(SUCCEED) @@ -1056,16 +1056,16 @@ H5FD__log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) /* Retain the flavor of the space allocated by the extension */ if (file->fa.flags & H5FD_LOG_FLAVOR) { - HDassert(addr < file->iosize); + assert(addr < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[file->eoa], (int)type, (size_t)size); + memset(&file->flavor[file->eoa], (int)type, (size_t)size); } /* Log the extension like an allocation */ if (file->fa.flags & H5FD_LOG_ALLOC) - HDfprintf(file->logfp, - "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n", - file->eoa, addr, size, flavors[type]); + fprintf(file->logfp, + "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n", + file->eoa, addr, size, flavors[type]); } /* Check for decreasing file size */ @@ -1074,16 +1074,16 @@ H5FD__log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) /* Reset the flavor of the space freed by the shrink */ if (file->fa.flags & H5FD_LOG_FLAVOR) { - HDassert((addr + size) < file->iosize); + assert((addr + size) < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); + memset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); } /* Log the shrink like a free */ if (file->fa.flags & H5FD_LOG_FREE) - HDfprintf(file->logfp, - "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n", - file->eoa, addr, size, flavors[type]); + fprintf(file->logfp, + "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n", file->eoa, + addr, size, flavors[type]); } } @@ -1178,8 +1178,8 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had FUNC_ENTER_PACKAGE - HDassert(file && file->pub.cls); - HDassert(buf); + assert(file && file->pub.cls); + assert(buf); /* Initialize timer */ H5_timer_init(&read_timer); @@ -1197,7 +1197,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had /* Log information about the number of times these locations are read */ if (file->fa.flags & H5FD_LOG_FILE_READ) { - HDassert((addr + size) < file->iosize); + assert((addr + size) < file->iosize); while (tmp_size-- > 0) file->nread[tmp_addr++]++; } @@ -1235,16 +1235,16 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had /* Emit log string if we're tracking individual seek events. */ if (file->fa.flags & H5FD_LOG_LOC_SEEK) { - HDfprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr); + fprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr); /* Add the seek time, if we're tracking that. * Note that the seek time is NOT emitted for when just H5FD_LOG_TIME_SEEK * is set. */ if (file->fa.flags & H5FD_LOG_TIME_SEEK) - HDfprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed); + fprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed); else - HDfprintf(file->logfp, "\n"); + fprintf(file->logfp, "\n"); } } #endif /* H5_HAVE_PREADWRITE */ @@ -1286,8 +1286,8 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had offset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR); if (file->fa.flags & H5FD_LOG_LOC_READ) - HDfprintf(file->logfp, "Error! Reading: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n", - orig_addr, (orig_addr + orig_size) - 1, orig_size); + fprintf(file->logfp, "Error! Reading: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n", + orig_addr, (orig_addr + orig_size) - 1, orig_size); HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, " @@ -1300,12 +1300,12 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had if (0 == bytes_read) { /* End of file but not end of format address space */ - HDmemset(buf, 0, size); + memset(buf, 0, size); break; } - HDassert(bytes_read >= 0); - HDassert((size_t)bytes_read <= size); + assert(bytes_read >= 0); + assert((size_t)bytes_read <= size); size -= (size_t)bytes_read; addr += (haddr_t)bytes_read; @@ -1328,16 +1328,16 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had /* Log information about the read */ if (file->fa.flags & H5FD_LOG_LOC_READ) { - HDfprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Read", orig_addr, - (orig_addr + orig_size) - 1, orig_size, flavors[type]); + fprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Read", orig_addr, + (orig_addr + orig_size) - 1, orig_size, flavors[type]); /* Verify that we are reading in the type of data we allocated in this location */ if (file->flavor) { - HDassert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[orig_addr] || - (H5FD_mem_t)file->flavor[orig_addr] == H5FD_MEM_DEFAULT); - HDassert(type == H5FD_MEM_DEFAULT || - type == (H5FD_mem_t)file->flavor[(orig_addr + orig_size) - 1] || - (H5FD_mem_t)file->flavor[(orig_addr + orig_size) - 1] == H5FD_MEM_DEFAULT); + assert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[orig_addr] || + (H5FD_mem_t)file->flavor[orig_addr] == H5FD_MEM_DEFAULT); + assert(type == H5FD_MEM_DEFAULT || + type == (H5FD_mem_t)file->flavor[(orig_addr + orig_size) - 1] || + (H5FD_mem_t)file->flavor[(orig_addr + orig_size) - 1] == H5FD_MEM_DEFAULT); } /* Add the read time, if we're tracking that. @@ -1345,9 +1345,9 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had * is set. */ if (file->fa.flags & H5FD_LOG_TIME_READ) - HDfprintf(file->logfp, " (%fs @ %f)\n", read_times.elapsed, read_timer.initial.elapsed); + fprintf(file->logfp, " (%fs @ %f)\n", read_times.elapsed, read_timer.initial.elapsed); else - HDfprintf(file->logfp, "\n"); + fprintf(file->logfp, "\n"); } /* Update current position */ @@ -1392,19 +1392,19 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha FUNC_ENTER_PACKAGE - HDassert(file && file->pub.cls); - HDassert(size > 0); - HDassert(buf); + assert(file && file->pub.cls); + assert(size > 0); + assert(buf); /* Initialize timer */ H5_timer_init(&write_timer); /* Verify that we are writing out the type of data we allocated in this location */ if (file->flavor) { - HDassert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[addr] || - (H5FD_mem_t)file->flavor[addr] == H5FD_MEM_DEFAULT); - HDassert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[(addr + size) - 1] || - (H5FD_mem_t)file->flavor[(addr + size) - 1] == H5FD_MEM_DEFAULT); + assert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[addr] || + (H5FD_mem_t)file->flavor[addr] == H5FD_MEM_DEFAULT); + assert(type == H5FD_MEM_DEFAULT || type == (H5FD_mem_t)file->flavor[(addr + size) - 1] || + (H5FD_mem_t)file->flavor[(addr + size) - 1] == H5FD_MEM_DEFAULT); } /* Check for overflow conditions */ @@ -1420,7 +1420,7 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha haddr_t tmp_addr = addr; /* Log information about the number of times these locations are read */ - HDassert((addr + size) < file->iosize); + assert((addr + size) < file->iosize); while (tmp_size-- > 0) file->nwrite[tmp_addr++]++; } @@ -1457,16 +1457,16 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha /* Emit log string if we're tracking individual seek events. */ if (file->fa.flags & H5FD_LOG_LOC_SEEK) { - HDfprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr); + fprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr); /* Add the seek time, if we're tracking that. * Note that the seek time is NOT emitted for when just H5FD_LOG_TIME_SEEK * is set. */ if (file->fa.flags & H5FD_LOG_TIME_SEEK) - HDfprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed); + fprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed); else - HDfprintf(file->logfp, "\n"); + fprintf(file->logfp, "\n"); } } #endif /* H5_HAVE_PREADWRITE */ @@ -1508,8 +1508,8 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha offset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR); if (file->fa.flags & H5FD_LOG_LOC_WRITE) - HDfprintf(file->logfp, "Error! Writing: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n", - orig_addr, (orig_addr + orig_size) - 1, orig_size); + fprintf(file->logfp, "Error! Writing: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n", + orig_addr, (orig_addr + orig_size) - 1, orig_size); HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, " @@ -1520,8 +1520,8 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha (unsigned long long)bytes_wrote, (unsigned long long)offset); } /* end if */ - HDassert(bytes_wrote > 0); - HDassert((size_t)bytes_wrote <= size); + assert(bytes_wrote > 0); + assert((size_t)bytes_wrote <= size); size -= (size_t)bytes_wrote; addr += (haddr_t)bytes_wrote; @@ -1544,15 +1544,15 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha /* Log information about the write */ if (file->fa.flags & H5FD_LOG_LOC_WRITE) { - HDfprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Written", orig_addr, - (orig_addr + orig_size) - 1, orig_size, flavors[type]); + fprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Written", orig_addr, + (orig_addr + orig_size) - 1, orig_size, flavors[type]); /* Check if this is the first write into a "default" section, grabbed by the metadata aggregation * algorithm */ if (file->fa.flags & H5FD_LOG_FLAVOR) { if ((H5FD_mem_t)file->flavor[orig_addr] == H5FD_MEM_DEFAULT) { - HDmemset(&file->flavor[orig_addr], (int)type, orig_size); - HDfprintf(file->logfp, " (fresh)"); + memset(&file->flavor[orig_addr], (int)type, orig_size); + fprintf(file->logfp, " (fresh)"); } } @@ -1561,9 +1561,9 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha * is set. */ if (file->fa.flags & H5FD_LOG_TIME_WRITE) - HDfprintf(file->logfp, " (%fs @ %f)\n", write_times.elapsed, write_timer.initial.elapsed); + fprintf(file->logfp, " (%fs @ %f)\n", write_times.elapsed, write_timer.initial.elapsed); else - HDfprintf(file->logfp, "\n"); + fprintf(file->logfp, "\n"); } /* Update current position and eof */ @@ -1603,7 +1603,7 @@ H5FD__log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_ FUNC_ENTER_PACKAGE - HDassert(file); + assert(file); /* Extend the file to make sure it's large enough */ if (!H5F_addr_eq(file->eoa, file->eof)) { @@ -1666,16 +1666,16 @@ H5FD__log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_ /* Emit log string if we're tracking individual truncate events. */ if (file->fa.flags & H5FD_LOG_TRUNCATE) { - HDfprintf(file->logfp, "Truncate: To %10" PRIuHADDR, file->eoa); + fprintf(file->logfp, "Truncate: To %10" PRIuHADDR, file->eoa); /* Add the truncate time, if we're tracking that. * Note that the truncate time is NOT emitted for when just H5FD_LOG_TIME_TRUNCATE * is set. */ if (file->fa.flags & H5FD_LOG_TIME_TRUNCATE) - HDfprintf(file->logfp, " (%fs @ %f)\n", trunc_times.elapsed, trunc_timer.initial.elapsed); + fprintf(file->logfp, " (%fs @ %f)\n", trunc_times.elapsed, trunc_timer.initial.elapsed); else - HDfprintf(file->logfp, "\n"); + fprintf(file->logfp, "\n"); } /* Update the eof value */ @@ -1712,7 +1712,7 @@ H5FD__log_lock(H5FD_t *_file, hbool_t rw) FUNC_ENTER_PACKAGE /* Sanity check */ - HDassert(file); + assert(file); /* Set exclusive or shared lock based on rw status */ lock_flags = rw ? LOCK_EX : LOCK_SH; @@ -1752,7 +1752,7 @@ H5FD__log_unlock(H5FD_t *_file) FUNC_ENTER_PACKAGE - HDassert(file); + assert(file); if (HDflock(file->fd, LOCK_UN) < 0) { if (file->ignore_disabled_file_locks && ENOSYS == errno) { @@ -1785,7 +1785,7 @@ H5FD__log_delete(const char *filename, hid_t H5_ATTR_UNUSED fapl_id) FUNC_ENTER_PACKAGE - HDassert(filename); + assert(filename); if (HDremove(filename) < 0) HSYS_GOTO_ERROR(H5E_VFL, H5E_CANTDELETEFILE, FAIL, "unable to delete file") |