Use tid argument vs drhook_oml_get_thread_num()

Andrew-Beggs-ECMWF · Andrew-Beggs-ECMWF · commit 19522b3c88b6 · 2024-10-30T12:06:43.000Z
diff --git a/src/fiat/drhook/drhook.c b/src/fiat/drhook/drhook.c
@@ -2938,7 +2938,7 @@ getkey(int tid, const char *name, int name_len,
         }
 #if defined(DR_HOOK_HAVE_NVTX)
         // Helps filter out wrapper calls that may be noise
-        if (opt_nvtx && drhook_oml_get_thread_num() == 1){
+        if (opt_nvtx && tid == 1){
           if (keyptr->calls > opt_nvtx_SCC && keyptr->delta_wall_all < opt_nvtx_SWT) {
             if (!opt_silent)
               fprintf(stderr,"DRHOOK:NVTX: Skipping opening of region %s\n", keyptr->name);

Original file line number	Diff line number	Diff line change
`@@ -2938,7 +2938,7 @@ getkey(int tid, const char *name, int name_len,`
`2938`	`2938`	`}`
`2939`	`2939`	`#if defined(DR_HOOK_HAVE_NVTX)`
`2940`	`2940`	`// Helps filter out wrapper calls that may be noise`
`2941`		`- if (opt_nvtx && drhook_oml_get_thread_num() == 1){`
	`2941`	`+ if (opt_nvtx && tid == 1){`
`2942`	`2942`	`if (keyptr->calls > opt_nvtx_SCC && keyptr->delta_wall_all < opt_nvtx_SWT) {`
`2943`	`2943`	`if (!opt_silent)`
`2944`	`2944`	`fprintf(stderr,"DRHOOK:NVTX: Skipping opening of region %s\n", keyptr->name);`