Quellcode durchsuchen

fix duplicate event type, thanks Luka and Marcos for the investigation

Samuel Thibault vor 9 Jahren
Ursprung
Commit
66ff1dca7e
2 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 1 1
      src/debug/traces/starpu_fxt.c
  2. 4 4
      src/debug/traces/starpu_paje.c

+ 1 - 1
src/debug/traces/starpu_fxt.c

@@ -1231,7 +1231,7 @@ static void handle_user_event(struct fxt_ev_64 *ev, struct starpu_fxt_options *o
 #ifdef STARPU_HAVE_POTI
 			program_container_alias (container, STARPU_POTI_STR_LEN, prefix);
 #else
-			fprintf(out_paje_file, "9	%.9f	user_event	%sp	%lu\n", get_event_time_stamp(ev, options), prefix, code);
+			fprintf(out_paje_file, "9	%.9f	user_user_event	%sp	%lu\n", get_event_time_stamp(ev, options), prefix, code);
 #endif
 	}
 	else

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

@@ -222,8 +222,8 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED)
 	poti_DefineEntityValue("Su", "CtS", "Submiting task", ".3 .09 .0");
 
 	/* Type for other threads */
-	poti_DefineEventType("user_event", "UT", "user event type");
-	poti_DefineEventType("thread_event", "UT", "thread event type");
+	poti_DefineEventType("user_user_event", "UT", "user event type");
+	poti_DefineEventType("user_thread_event", "UT", "thread event type");
 	poti_DefineStateType("US", "UT", "User Thread State");
 	poti_DefineEntityValue("Bu", "US", "Building task", ".5 .18 .0");
 	poti_DefineEntityValue("Su", "US", "Submiting task", ".3 .09 .0");
@@ -282,8 +282,8 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED)
 2       prog_event   P       \"program event type\"				\n\
 2       user_event   T       \"user event type\"				\n\
 2       thread_event   T       \"thread event type\"				\n\
-2       user_event   UT       \"user event type\"				\n\
-2       thread_event   UT       \"thread event type\"				\n\
+2       user_user_event   UT       \"user event type\"				\n\
+2       user_thread_event   UT       \"thread event type\"				\n\
 2       MPIev   MPICt    \"MPI event type\"			\n\
 3       S       T       \"Thread State\"                        \n\
 3       CtS     MPICt    \"Communication Thread State\"          \n");