Browse Source

Move dyn_* task fields, to make sure we can detect nbuffers being bigger than STARPU_NMAXBUFS without using dyn_handles

Samuel Thibault 8 years ago
parent
commit
d9671ac8fa
1 changed files with 7 additions and 4 deletions
  1. 7 4
      include/starpu_task.h

+ 7 - 4
include/starpu_task.h

@@ -138,14 +138,17 @@ struct starpu_task
 
 	int nbuffers;
 
-	starpu_data_handle_t handles[STARPU_NMAXBUFS];
-	void *interfaces[STARPU_NMAXBUFS];
-	enum starpu_data_access_mode modes[STARPU_NMAXBUFS];
-
+        /* We keep these before the static arrays, so we can detect dyn_handles
+	 * being NULL while nbuffers being bigger that STARPU_NMAXBUFS
+	 * (otherwise the overflow would put a non-NULL) */
 	starpu_data_handle_t *dyn_handles;
 	void **dyn_interfaces;
 	enum starpu_data_access_mode *dyn_modes;
 
+	starpu_data_handle_t handles[STARPU_NMAXBUFS];
+	void *interfaces[STARPU_NMAXBUFS];
+	enum starpu_data_access_mode modes[STARPU_NMAXBUFS];
+
 	void *cl_arg;
 	size_t cl_arg_size;