diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-26 21:48:43 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-26 21:48:43 (GMT) |
| commit | 78dccd425965e35ead292a02578f71d1ffda4f24 (patch) | |
| tree | 7c140f0d92d34ac185a9085b861df986eee545e9 /src | |
| parent | 814c2225da42a7fa3b071fbec74536c1b5ea2db4 (diff) | |
| download | hdf5-78dccd425965e35ead292a02578f71d1ffda4f24.zip hdf5-78dccd425965e35ead292a02578f71d1ffda4f24.tar.gz hdf5-78dccd425965e35ead292a02578f71d1ffda4f24.tar.bz2 | |
[svn-r20653] Description:
Bring r20651 & r20652 from trunk to 1.8 branch:
Switch from using 'pthread_create' to 'pthread_self' when trying to
detect the pthread library, so that the Intel C compiler is happier with the
prototype.
Teach the tracing script & routines about the 'unsigned long' and
'unsigned long long' types, so that the H5Pset_fapl_log() API routine gets
tracing information correct.
Tested on:
FreeBSD/32 6.3 (duty)
(h5committested on trunk)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDlog.c | 2 | ||||
| -rw-r--r-- | src/H5trace.c | 56 |
2 files changed, 57 insertions, 1 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 96df596..76053ec 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -318,7 +318,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, si herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_log, FAIL) - H5TRACE4("e", "i*sIuz", fapl_id, logfile, flags, buf_size); + H5TRACE4("e", "i*sULz", fapl_id, logfile, flags, buf_size); if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") diff --git a/src/H5trace.c b/src/H5trace.c index 870e881..0c6faed 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -2167,6 +2167,62 @@ H5_trace(const double *returning, const char *func, const char *type, ...) } /* end else */ break; + case 'U': + switch(type[1]) { + case 'l': + if(ptr) { + if(vp) { + fprintf(out, "0x%lx", (unsigned long)vp); + if(asize_idx >= 0 && asize[asize_idx] >= 0) { + unsigned long *p = (unsigned long *)vp; + + fprintf(out, " {"); + for(i = 0; i < asize[asize_idx]; i++) + HDfprintf(out, "%s%lu", i?", ":"", p[i]); + fprintf(out, "}"); + } /* end if */ + } /* end if */ + else + fprintf(out, "NULL"); + } /* end if */ + else { + unsigned long iul = va_arg(ap, unsigned long); /*lint !e732 Loss of sign not really occuring */ + + fprintf(out, "%lu", iul); + asize[argno] = iul; + } /* end else */ + break; + + case 'L': + if(ptr) { + if(vp) { + fprintf(out, "0x%lx", (unsigned long)vp); + if(asize_idx >= 0 && asize[asize_idx] >= 0) { + unsigned long long *p = (unsigned long long *)vp; + + fprintf(out, " {"); + for(i = 0; i < asize[asize_idx]; i++) + HDfprintf(out, "%s%llu", i?", ":"", p[i]); + fprintf(out, "}"); + } /* end if */ + } /* end if */ + else + fprintf(out, "NULL"); + } /* end if */ + else { + unsigned long long iull = va_arg(ap, unsigned long long); /*lint !e732 Loss of sign not really occuring */ + + fprintf(out, "%llu", iull); + asize[argno] = iull; + } /* end else */ + break; + + default: + fprintf (out, "BADTYPE(U%c)", type[1]); + goto error; + } /* end switch */ + break; + case 'x': if(ptr) { if(vp) { |