瀏覽代碼

src: fix task name handling in fxt trace
- this is a followup to a620daf0ec
- add the then-deleted _starpu_gettid() parameter

Nathalie Furmento 4 年之前
父節點
當前提交
780fc6f15f
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      src/common/fxt.h
  2. 1 1
      src/debug/traces/starpu_fxt.c

+ 3 - 3
src/common/fxt.h

@@ -867,13 +867,13 @@ do {									\
 	const char *name = _starpu_job_get_task_name((job));			\
 	if (name)					                        \
 	{									\
-		_STARPU_FUT_FULL_PROBE1STR(_STARPU_FUT_KEYMASK_TASK, _STARPU_FUT_TASK_NAME, (job)->job_id, name);\
+		_STARPU_FUT_FULL_PROBE2STR(_STARPU_FUT_KEYMASK_TASK, _STARPU_FUT_TASK_NAME, (job)->job_id, _starpu_gettid(), name); \
 	}									\
 	else {									\
-		_STARPU_FUT_FULL_PROBE1STR(_STARPU_FUT_KEYMASK_TASK, _STARPU_FUT_TASK_NAME, (job)->job_id, "unknown");\
+		_STARPU_FUT_FULL_PROBE2STR(_STARPU_FUT_KEYMASK_TASK, _STARPU_FUT_TASK_NAME, (job)->job_id, _starpu_gettid(), "unknown");\
 	}									\
 	if (model_name)					\
-		_STARPU_FUT_FULL_PROBE1STR(_STARPU_FUT_KEYMASK_TASK, _STARPU_FUT_MODEL_NAME, (job)->job_id, model_name); \
+		_STARPU_FUT_FULL_PROBE2STR(_STARPU_FUT_KEYMASK_TASK, _STARPU_FUT_MODEL_NAME, (job)->job_id, _starpu_gettid(), model_name); \
 } while(0)
 
 #define _STARPU_TRACE_TASK_COLOR(job)						\

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

@@ -2817,7 +2817,7 @@ static void handle_task_exclude_from_dag(struct fxt_ev_64 *ev, struct starpu_fxt
 static void handle_task_name(struct fxt_ev_64 *ev, struct starpu_fxt_options *options)
 {
 	unsigned long job_id = ev->param[0];
-	char *name = get_fxt_string(ev,1);
+	char *name = get_fxt_string(ev,2);
 
 	char *prefix = options->file_prefix;
 	struct task_info *task = get_task(job_id, options->file_rank);