diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-06-12 02:59:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-06-12 02:59:49 (GMT) |
| commit | c0f9f41be8d453550694103a69cf902de79b6b84 (patch) | |
| tree | bbb7fbab5b1c552f328f2a51facc017c258089b4 | |
| parent | 09da63a8b952ebf2572c741c9f3855ad492441a7 (diff) | |
| download | hdf5-c0f9f41be8d453550694103a69cf902de79b6b84.zip hdf5-c0f9f41be8d453550694103a69cf902de79b6b84.tar.gz hdf5-c0f9f41be8d453550694103a69cf902de79b6b84.tar.bz2 | |
[svn-r7027] Purpose:
Bug fix
Description:
MPE instrumentation was out of date and wasn't reporting the correct name
of the API functions in the library.
Platforms tested:
IBM p690 (copper)
h5committest not performed because it doesn't test MPE.
| -rw-r--r-- | src/H5MPprivate.h | 15 | ||||
| -rw-r--r-- | src/H5private.h | 8 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h index 348a302..1fed1c9 100644 --- a/src/H5MPprivate.h +++ b/src/H5MPprivate.h @@ -31,16 +31,13 @@ /* * #define eventa(func_name) h5_mpe_ ## func_name ## _a * #define eventb(func_name) h5_mpe_ ## func_name ## _b - * #define eventc(func_name) h5_mpe_ ## func_name ## _counter */ #define eventa(func_name) h5_mpe_eventa #define eventb(func_name) h5_mpe_eventb -#define eventc(func_name) h5_mpe_counter #define COLOR(func_name) color_ ## func_name #define MPE_LOG_VARS(func_name) \ static int eventa(func_name) = -1; \ static int eventb(func_name) = -1; \ -/* static int eventc(func_name) = 0; */ \ char* p_end_funcname = #func_name; \ char* p_event_start = "start" #func_name; @@ -64,8 +61,7 @@ */ #define FINISH_MPE_LOG \ if (H5_MPEinit_g) { \ - MPE_Log_event(eventb(func_name), 0, p_end_funcname); \ -/* eventc(func_name)++ */ \ + MPE_Log_event(eventb(func_name), 0, p_end_funcname); \ } @@ -312,10 +308,14 @@ #define color_H5Pget_buffer "red" #define color_H5Pset_preserve "red" #define color_H5Pget_preserve "red" +#define color_H5Pall_filters_avail "red" #define color_H5Pset_filter "red" +#define color_H5Pmodify_filter "red" #define color_H5Pget_nfilters "red" -#define color_H5Pget_fileter "red" +#define color_H5Pget_filter "red" +#define color_H5Pget_filter_by_id "red" #define color_H5Pset_deflate "red" +#define color_H5Pset_fletcher32 "red" #define color_H5Pset_szip "red" #define color_H5Pset_cache "red" #define color_H5Pget_cache "red" @@ -344,6 +344,9 @@ #define color_H5Pget_hyper_vector_size "red" #define color_H5Pset_small_data_block_size "red" #define color_H5Pget_small_data_block_size "red" +#define color_H5Pget_edc_check "red" +#define color_H5Pset_edc_check "red" +#define color_H5Pset_filter_callback "red" #define color_H5Screate "red" #define color_H5Screate_simple "red" diff --git a/src/H5private.h b/src/H5private.h index 33a7d42..dacefd8 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1144,13 +1144,13 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ H5_API_LOCK /* Local variables for API routines */ -#define FUNC_ENTER_API_VARS \ +#define FUNC_ENTER_API_VARS(func_name) \ MPE_LOG_VARS(func_name) \ H5TRACE_DECL /* Use this macro for all "normal" API functions */ #define FUNC_ENTER_API(func_name,err) {{ \ - FUNC_ENTER_API_VARS \ + FUNC_ENTER_API_VARS(func_name) \ FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ FUNC_ENTER_API_THREADSAFE; \ FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \ @@ -1163,7 +1163,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ * like H5Eprint and H5Ewalk. */ #define FUNC_ENTER_API_NOCLEAR(func_name,err) {{ \ - FUNC_ENTER_API_VARS \ + FUNC_ENTER_API_VARS(func_name) \ FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ FUNC_ENTER_API_THREADSAFE; \ FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \ @@ -1175,7 +1175,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ * are: H5close, H5check_version, H5Eget_major, H5Eget_minor. */ #define FUNC_ENTER_API_NOINIT(func_name) {{ \ - FUNC_ENTER_API_VARS \ + FUNC_ENTER_API_VARS(func_name) \ FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ FUNC_ENTER_API_THREADSAFE; \ H5_PUSH_FUNC; \ |