Browse Source

Fix crash with fxt enabled: _STARPU_TRACE_TASK_WAIT_END can not assume the job is still available for read, since the task is done. We don't use the information anyway

Samuel Thibault 9 years ago
parent
commit
416bcd1761
3 changed files with 5 additions and 5 deletions
  1. 3 3
      src/common/fxt.h
  2. 1 1
      src/core/task.c
  3. 1 1
      src/debug/traces/starpu_fxt.c

+ 3 - 3
src/common/fxt.h

@@ -643,8 +643,8 @@ do {										\
 #define _STARPU_TRACE_TASK_WAIT_START(job)	\
 	FUT_DO_PROBE2(_STARPU_FUT_TASK_WAIT_START, (job)->job_id, _starpu_gettid());
 
-#define _STARPU_TRACE_TASK_WAIT_END(job)	\
-	FUT_DO_PROBE2(_STARPU_FUT_TASK_WAIT_END, (job)->job_id, _starpu_gettid());
+#define _STARPU_TRACE_TASK_WAIT_END()	\
+	FUT_DO_PROBE2(_STARPU_FUT_TASK_WAIT_END, _starpu_gettid());
 
 #define _STARPU_TRACE_TASK_WAIT_FOR_ALL_START()	\
 	FUT_DO_PROBE1(_STARPU_FUT_TASK_WAIT_FOR_ALL_START, _starpu_gettid());
@@ -965,7 +965,7 @@ do {										\
 #define _STARPU_TRACE_TASK_MPI_POST_START()		do {} while(0)
 #define _STARPU_TRACE_TASK_MPI_POST_END()		do {} while(0)
 #define _STARPU_TRACE_TASK_WAIT_START(job)		do {} while(0)
-#define _STARPU_TRACE_TASK_WAIT_END(job)		do {} while(0)
+#define _STARPU_TRACE_TASK_WAIT_END()			do {} while(0)
 #define _STARPU_TRACE_TASK_WAIT_FOR_ALL_START()		do {} while(0)
 #define _STARPU_TRACE_TASK_WAIT_FOR_ALL_END()		do {} while(0)
 #define _STARPU_TRACE_USER_DEFINED_START		do {} while(0)

+ 1 - 1
src/core/task.c

@@ -239,7 +239,7 @@ int starpu_task_wait(struct starpu_task *task)
 	if (task->destroy)
 		_starpu_task_destroy(task);
 
-	_STARPU_TRACE_TASK_WAIT_END(j);
+	_STARPU_TRACE_TASK_WAIT_END();
         _STARPU_LOG_OUT();
 	return 0;
 }

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

@@ -2569,7 +2569,7 @@ void _starpu_fxt_parse_new_file(char *filename_in, struct starpu_fxt_options *op
 				break;
 
 			case _STARPU_FUT_TASK_WAIT_END:
-				handle_task_submit_event(&ev, options, ev.param[1], NULL);
+				handle_task_submit_event(&ev, options, ev.param[0], NULL);
 				break;
 
 			case _STARPU_FUT_TASK_DONE: