summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-03-11 06:35:51 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-03-11 06:35:51 (GMT)
commit3ed20376e058b8d17c9c91d2c06107fcb67a0c3c (patch)
treec8346273c47d67d80ec2ef517bc09c7532c2d932 /src
parent04a3b2a4580ed6f2df9949d88cd553f85860e91e (diff)
downloadhdf5-3ed20376e058b8d17c9c91d2c06107fcb67a0c3c.zip
hdf5-3ed20376e058b8d17c9c91d2c06107fcb67a0c3c.tar.gz
hdf5-3ed20376e058b8d17c9c91d2c06107fcb67a0c3c.tar.bz2
[svn-r26426] Merge of r26424 from the autotools_rework branch.
Made the chkmanifest script a little more sh-friendly. Tested: Manually on jam by modifying svn-controlled files
Diffstat (limited to 'src')
-rw-r--r--src/H5timer.c35
-rw-r--r--src/H5trace.c10
2 files changed, 23 insertions, 22 deletions
diff --git a/src/H5timer.c b/src/H5timer.c
index 94f2883..fd9dfcb 100644
--- a/src/H5timer.c
+++ b/src/H5timer.c
@@ -125,20 +125,21 @@ H5_timer_begin (H5_timer_t *timer)
HDassert(timer);
#ifdef H5_HAVE_GETRUSAGE
- HDgetrusage (RUSAGE_SELF, &rusage);
+ HDgetrusage(RUSAGE_SELF, &rusage);
timer->utime = (double)rusage.ru_utime.tv_sec +
- ((double)rusage.ru_utime.tv_usec / 1e6F);
+ ((double)rusage.ru_utime.tv_usec / H5_DOUBLE(1e6));
timer->stime = (double)rusage.ru_stime.tv_sec +
- ((double)rusage.ru_stime.tv_usec / 1e6F);
+ ((double)rusage.ru_stime.tv_usec / H5_DOUBLE(1e6));
#else
- timer->utime = 0.0F;
- timer->stime = 0.0F;
+ timer->utime = H5_DOUBLE(0.0);
+ timer->stime = H5_DOUBLE(0.0);
#endif
#ifdef H5_HAVE_GETTIMEOFDAY
- HDgettimeofday (&etime, NULL);
- timer->etime = (double)etime.tv_sec + ((double)etime.tv_usec / 1e6F);
+ HDgettimeofday(&etime, NULL);
+ timer->etime = (double)etime.tv_sec +
+ ((double)etime.tv_usec / H5_DOUBLE(1e6));
#else
- timer->etime = 0.0F;
+ timer->etime = H5_DOUBLE(0.0);
#endif
} /* end H5_timer_begin() */
@@ -166,9 +167,9 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
HDassert(timer);
H5_timer_begin(&now);
- timer->utime = MAX(0.0F, now.utime - timer->utime);
- timer->stime = MAX(0.0F, now.stime - timer->stime);
- timer->etime = MAX(0.0F, now.etime - timer->etime);
+ timer->utime = MAX(H5_DOUBLE(0.0), now.utime - timer->utime);
+ timer->stime = MAX(H5_DOUBLE(0.0), now.stime - timer->stime);
+ timer->etime = MAX(H5_DOUBLE(0.0), now.etime - timer->etime);
if (sum) {
sum->utime += timer->utime;
@@ -184,14 +185,14 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
* Purpose: Prints the bandwidth (bytes per second) in a field 10
* characters wide widh four digits of precision like this:
*
- * NaN If <=0 seconds
+ * NaN If <= 0.0 seconds
* 1234. TB/s
* 123.4 TB/s
* 12.34 GB/s
* 1.234 MB/s
* 4.000 kB/s
* 1.000 B/s
- * 0.000 B/s If NBYTES==0
+ * 0.000 B/s If NBYTES == 0.0
* 1.2345e-10 For bandwidth less than 1
* 6.7893e+94 For exceptionally large values
* 6.678e+106 For really big values
@@ -204,17 +205,17 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
*-------------------------------------------------------------------------
*/
void
-H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
+H5_bandwidth(char *buf /*out*/, double nbytes, double nseconds)
{
double bw;
- if(nseconds <= 0.0F)
+ if(nseconds <= H5_DOUBLE(0.0))
HDstrcpy(buf, " NaN");
else {
bw = nbytes/nseconds;
- if(H5_DBL_ABS_EQUAL(bw, 0.0F))
+ if(H5_DBL_ABS_EQUAL(bw, H5_DOUBLE(0.0)))
HDstrcpy(buf, "0.000 B/s");
- else if(bw < 1.0F)
+ else if(bw < H5_DOUBLE(1.0))
sprintf(buf, "%10.4e", bw);
else if(bw < H5_KB) {
sprintf(buf, "%05.4f", bw);
diff --git a/src/H5trace.c b/src/H5trace.c
index 6634a2a..cb5a8c8 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -129,34 +129,34 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
void *vp = NULL;
FILE *out = H5_debug_g.trace;
H5_timer_t event_time;
- static H5_timer_t first_time = {0.0F, 0.0F, 0.0F};
+ static H5_timer_t first_time = {H5_DOUBLE(0.0), H5_DOUBLE(0.0), H5_DOUBLE(0.0)};
static int current_depth = 0;
static int last_call_depth = 0;
/* FUNC_ENTER() should not be called */
if(!out)
- return 0.0F; /*tracing is off*/
+ return H5_DOUBLE(0.0); /*tracing is off*/
va_start(ap, type);
if(H5_debug_g.ttop) {
if(returning) {
if(current_depth > 1) {
--current_depth;
- return 0.0F;
+ return H5_DOUBLE(0.0);
} /* end if */
} /* end if */
else {
if(current_depth > 0) {
/*do not update last_call_depth*/
current_depth++;
- return 0.0F;
+ return H5_DOUBLE(0.0);
} /* end if */
} /* end else */
} /* end if */
/* Get time for event */
- if(HDfabs(first_time.etime) < 0.0000000001F)
+ if(HDfabs(first_time.etime) < H5_DOUBLE(0.0000000001))
/* That is == 0.0, but direct comparison between floats is bad */
H5_timer_begin(&first_time);
if(H5_debug_g.ttimes)