Procházet zdrojové kódy

Use a macro to hide FUT_DO_PROBE2 call

Samuel Thibault před 11 roky
rodič
revize
0b407a7c7a
2 změnil soubory, kde provedl 5 přidání a 3 odebrání
  1. 4 0
      src/common/fxt.h
  2. 1 3
      src/datawizard/coherency.c

+ 4 - 0
src/common/fxt.h

@@ -627,6 +627,9 @@ do {										\
 #define _STARPU_TRACE_MEMORY_FULL(size)	\
 	FUT_DO_PROBE2(_STARPU_FUT_MEMORY_FULL,size,_starpu_gettid());
 
+#define _STARPU_TRACE_DATA_LOAD(workerid,size)	\
+	FUT_DO_PROBE2(_STARPU_FUT_DATA_LOAD, workerid, size);
+
 #define _STARPU_TRACE_START_UNPARTITION(handle, memnode)		\
 	FUT_DO_PROBE3(_STARPU_FUT_START_UNPARTITION, memnode, _starpu_gettid(), handle);
 	
@@ -704,6 +707,7 @@ do {										\
 #define _STARPU_TRACE_BARRIER_WAIT_BEGIN()		do {} while(0)
 #define _STARPU_TRACE_BARRIER_WAIT_END()			do {} while(0)
 #define _STARPU_TRACE_MEMORY_FULL(size)				do {} while(0)
+#define _STARPU_TRACE_MEMORY_FULL(workerid,size)		do {} while(0)
 #define _STARPU_TRACE_START_UNPARTITION(handle, memnode)	do {} while(0)
 #define _STARPU_TRACE_END_UNPARTITION(handle, memnode)		do {} while(0)
 #define _STARPU_TRACE_HYPERVISOR_BEGIN()        do {} while(0)

+ 1 - 3
src/datawizard/coherency.c

@@ -736,9 +736,7 @@ int _starpu_fetch_task_input(struct _starpu_job *j)
 #endif
 	}
 
-#ifdef STARPU_USE_FXT
-	FUT_DO_PROBE2(_STARPU_FUT_DATA_LOAD, workerid, total_size);
-#endif
+	_STARPU_TRACE_DATA_LOAD(workerid,total_size)
 	/* Now that we have taken the data locks in locking order, fill the codelet interfaces in function order.  */
 	for (index = 0; index < nbuffers; index++)
 	{