Browse Source

Fix variable names exposed globally

Samuel Thibault 8 years ago
parent
commit
242e436a14
3 changed files with 9 additions and 10 deletions
  1. 2 6
      src/debug/traces/starpu_fxt.c
  2. 3 0
      src/debug/traces/starpu_fxt.h
  3. 4 4
      src/debug/traces/starpu_paje.c

+ 2 - 6
src/debug/traces/starpu_fxt.c

@@ -23,10 +23,6 @@
 #ifdef STARPU_HAVE_POTI
 #include <poti.h>
 #define STARPU_POTI_STR_LEN 200
-#ifdef HAVE_POTI_INIT_CUSTOM
-extern int extendedSetState;
-extern int semiExtendedSetState;
-#endif
 #endif
 #define STARPU_TRACE_STR_LEN 200
 
@@ -861,7 +857,7 @@ static void worker_set_detailed_state(double time, const char *prefix, long unsi
 	snprintf(iteration_str, STARPU_POTI_STR_LEN, "%ld", iteration);
 	snprintf(subiteration_str, STARPU_POTI_STR_LEN, "%ld", subiteration);
 
-	poti_user_SetState(extendedSetState, time, container, "WS", name, 11, size_str,
+	poti_user_SetState(_starpu_poti_extendedSetState, time, container, "WS", name, 11, size_str,
 			   parameters_str,
 			   footprint_str,
 			   tag_str,
@@ -1579,7 +1575,7 @@ static void handle_codelet_details(struct fxt_ev_64 *ev, struct starpu_fxt_optio
 			snprintf(tag_str, STARPU_POTI_STR_LEN, "%016lx", ev->param[4]);
 			snprintf(jobid_str, STARPU_POTI_STR_LEN, "%s%lu", prefix, job_id);
 
-			poti_user_SetState(semiExtendedSetState, last_codelet_start[worker], container, typectx, name, 5, size_str,
+			poti_user_SetState(_starpu_poti_semiExtendedSetState, last_codelet_start[worker], container, typectx, name, 5, size_str,
 					   parameters_str,
 					   footprint_str,
 					   tag_str,

+ 3 - 0
src/debug/traces/starpu_fxt.h

@@ -62,6 +62,9 @@ void _starpu_fxt_display_mpi_transfers(struct starpu_fxt_options *options, int *
 
 void _starpu_fxt_write_paje_header(FILE *file);
 
+extern int _starpu_poti_extendedSetState;
+extern int _starpu_poti_semiExtendedSetState;
+
 /*
  * Animation
  */

+ 4 - 4
src/debug/traces/starpu_paje.c

@@ -24,8 +24,8 @@
 
 #ifdef STARPU_HAVE_POTI
 #ifdef HAVE_POTI_INIT_CUSTOM
-int extendedSetState = -1;
-int semiExtendedSetState = -1;
+int _starpu_poti_extendedSetState = -1;
+int _starpu_poti_semiExtendedSetState = -1;
 #endif
 #endif
 
@@ -35,7 +35,7 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED)
 #ifdef STARPU_HAVE_POTI
 #ifdef HAVE_POTI_INIT_CUSTOM
 	poti_header();     /* see poti_init_custom to customize the header */
-	extendedSetState = poti_header_DeclareEvent (PAJE_SetState,
+	_starpu_poti_extendedSetState = poti_header_DeclareEvent (PAJE_SetState,
 						     11,
 						     "Size string",
 						     "Params string",
@@ -48,7 +48,7 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED)
 						     "Z string",
 						     "Iteration string",
 						     "Subiteration string");
-	semiExtendedSetState = poti_header_DeclareEvent (PAJE_SetState,
+	_starpu_poti_semiExtendedSetState = poti_header_DeclareEvent (PAJE_SetState,
 						     5,
 						     "Size string",
 						     "Params string",