Forráskód Böngészése

Port r17807 from Loris' work: added handle to _STARTPU_START_DRIVER_COPY macro

Samuel Thibault 9 éve
szülő
commit
e7a67678f3
2 módosított fájl, 4 hozzáadás és 4 törlés
  1. 3 3
      src/common/fxt.h
  2. 1 1
      src/datawizard/copy_driver.c

+ 3 - 3
src/common/fxt.h

@@ -568,8 +568,8 @@ do {										\
 #define _STARPU_TRACE_DATA_COPY(src_node, dst_node, size)	\
 	FUT_DO_PROBE3(_STARPU_FUT_DATA_COPY, src_node, dst_node, size)
 
-#define _STARPU_TRACE_START_DRIVER_COPY(src_node, dst_node, size, com_id, prefetch)	\
-	FUT_DO_PROBE5(_STARPU_FUT_START_DRIVER_COPY, src_node, dst_node, size, com_id, prefetch)
+#define _STARPU_TRACE_START_DRIVER_COPY(src_node, dst_node, size, com_id, prefetch, handle) \
+	FUT_DO_PROBE6(_STARPU_FUT_START_DRIVER_COPY, src_node, dst_node, size, com_id, prefetch, handle)
 
 #define _STARPU_TRACE_END_DRIVER_COPY(src_node, dst_node, size, com_id, prefetch)	\
 	FUT_DO_PROBE5(_STARPU_FUT_END_DRIVER_COPY, src_node, dst_node, size, com_id, prefetch)
@@ -940,7 +940,7 @@ do {										\
 #define _STARPU_TRACE_TASK_DONE(a)		do {} while(0)
 #define _STARPU_TRACE_TAG_DONE(a)		do {} while(0)
 #define _STARPU_TRACE_DATA_COPY(a, b, c)		do {} while(0)
-#define _STARPU_TRACE_START_DRIVER_COPY(a,b,c,d,e)	do {} while(0)
+#define _STARPU_TRACE_START_DRIVER_COPY(a,b,c,d,e,f)	do {} while(0)
 #define _STARPU_TRACE_END_DRIVER_COPY(a,b,c,d,e)	do {} while(0)
 #define _STARPU_TRACE_START_DRIVER_COPY_ASYNC(a,b)	do {} while(0)
 #define _STARPU_TRACE_END_DRIVER_COPY_ASYNC(a,b)	do {} while(0)

+ 1 - 1
src/datawizard/copy_driver.c

@@ -528,7 +528,7 @@ int STARPU_ATTRIBUTE_WARN_UNUSED_RESULT _starpu_driver_copy_data_1_to_1(starpu_d
 
 		dst_replicate->initialized = 1;
 
-		_STARPU_TRACE_START_DRIVER_COPY(src_node, dst_node, size, com_id, prefetch);
+		_STARPU_TRACE_START_DRIVER_COPY(src_node, dst_node, size, com_id, prefetch, handle);
 		ret_copy = copy_data_1_to_1_generic(handle, src_replicate, dst_replicate, req);
 		if (!req)
 			/* Synchronous, this is already finished */