rename STARPU_TRACE_CODELET_TAG* to STARPU_TRACE_TAG*

src/common/fxt.h

@@ -52,8 +52,8 @@
 #define STARPU_FUT_START_PUSH_OUTPUT	0x5109
 #define STARPU_FUT_END_PUSH_OUTPUT	0x5110
 
-#define STARPU_FUT_CODELET_TAG		0x5111
-#define STARPU_FUT_CODELET_TAG_DEPS	0x5112
+#define STARPU_FUT_TAG		0x5111
+#define STARPU_FUT_TAG_DEPS	0x5112
 
 #define STARPU_FUT_TASK_DEPS		0x5113
 
@@ -192,11 +192,11 @@ do {									\
 #define STARPU_TRACE_END_PUSH_OUTPUT(job)	\
 	FUT_DO_PROBE2(STARPU_FUT_END_PUSH_OUTPUT, job, syscall(SYS_gettid));
 
-#define STARPU_TRACE_CODELET_TAG(tag, job)	\
-	FUT_DO_PROBE2(STARPU_FUT_CODELET_TAG, tag, (job)->job_id)
+#define STARPU_TRACE_TAG(tag, job)	\
+	FUT_DO_PROBE2(STARPU_FUT_TAG, tag, (job)->job_id)
 
-#define STARPU_TRACE_CODELET_TAG_DEPS(tag_child, tag_father)	\
-	FUT_DO_PROBE2(STARPU_FUT_CODELET_TAG_DEPS, tag_child, tag_father)
+#define STARPU_TRACE_TAG_DEPS(tag_child, tag_father)	\
+	FUT_DO_PROBE2(STARPU_FUT_TAG_DEPS, tag_child, tag_father)
 
 #define STARPU_TRACE_TASK_DEPS(job_prev, job_succ)	\
 	FUT_DO_PROBE2(STARPU_FUT_TASK_DEPS, (job_prev)->job_id, (job_succ)->job_id)
@@ -307,8 +307,8 @@ do {										\
 #define STARPU_TRACE_END_FETCH_INPUT(job)	do {} while(0);
 #define STARPU_TRACE_START_PUSH_OUTPUT(job)	do {} while(0);
 #define STARPU_TRACE_END_PUSH_OUTPUT(job)	do {} while(0);
-#define STARPU_TRACE_CODELET_TAG(tag, job)	do {} while(0);
-#define STARPU_TRACE_CODELET_TAG_DEPS(a, b)	do {} while(0);
+#define STARPU_TRACE_TAG(tag, job)	do {} while(0);
+#define STARPU_TRACE_TAG_DEPS(a, b)	do {} while(0);
 #define STARPU_TRACE_TASK_DEPS(a, b)		do {} while(0);
 #define STARPU_TRACE_TASK_DONE(a)		do {} while(0);
 #define STARPU_TRACE_TAG_DONE(a)		do {} while(0);

src/core/dependencies/tags.c

@@ -193,7 +193,7 @@ void starpu_tag_notify_from_apps(starpu_tag_t id)
 
 void _starpu_tag_declare(starpu_tag_t id, struct starpu_job_s *job)
 {
-	STARPU_TRACE_CODELET_TAG(id, job);
+	STARPU_TRACE_TAG(id, job);
 	job->task->use_tag = 1;
 	
 	struct starpu_tag_s *tag= gettag_struct(id);
@@ -227,7 +227,7 @@ void starpu_tag_declare_deps_array(starpu_tag_t id, unsigned ndeps, starpu_tag_t
 		
 		/* id depends on dep_id
 		 * so cg should be among dep_id's successors*/
-		STARPU_TRACE_CODELET_TAG_DEPS(id, dep_id);
+		STARPU_TRACE_TAG_DEPS(id, dep_id);
 		struct starpu_tag_s *tag_dep = gettag_struct(dep_id);
 		STARPU_ASSERT(tag_dep != tag_child);
 		_starpu_spin_lock(&tag_dep->lock);
@@ -260,7 +260,7 @@ void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...)
 	
 		/* id depends on dep_id
 		 * so cg should be among dep_id's successors*/
-		STARPU_TRACE_CODELET_TAG_DEPS(id, dep_id);
+		STARPU_TRACE_TAG_DEPS(id, dep_id);
 		struct starpu_tag_s *tag_dep = gettag_struct(dep_id);
 		STARPU_ASSERT(tag_dep != tag_child);
 		_starpu_spin_lock(&tag_dep->lock);

tools/fxt_tool.c

@@ -877,11 +877,11 @@ void parse_new_file(char *filename_in, char *file_prefix, uint64_t file_offset)
 				handle_end_sleep();
 				break;
 
-			case STARPU_FUT_CODELET_TAG:
+			case STARPU_FUT_TAG:
 				/* XXX */
 				break;
 
-			case STARPU_FUT_CODELET_TAG_DEPS:
+			case STARPU_FUT_TAG_DEPS:
 				handle_codelet_tag_deps();
 				break;