merge trunk

examples/basic_examples/vector_scal.c

@@ -112,7 +112,12 @@ int main(int argc, char **argv)
 	int ret = starpu_init(NULL);
 
 	unsigned dd = starpu_disk_register(&write_on_file, (void *) "/home/corentin/");
-	
+
+	unsigned dc = starpu_disk_register(&write_on_file, (void *) "/home/corentin/");
+
+
+	starpu_disk_free(dc);
+
 	starpu_disk_free(dd);
 
 	if (ret == -ENODEV) goto enodev;

include/starpu_data.h

@@ -98,6 +98,7 @@ int starpu_data_prefetch_on_node(starpu_data_handle_t handle, unsigned node, uns
 
 #define STARPU_MAIN_RAM 0
 
+<<<<<<< .courant
 enum starpu_node_kind
 {
 	STARPU_UNUSED     = 0x00,
@@ -112,6 +113,21 @@ unsigned starpu_memory_nodes_get_count(void);
 enum starpu_node_kind starpu_node_get_kind(unsigned node);
 
 
+=======
+enum starpu_node_kind
+{
+	STARPU_UNUSED     = 0x00,
+	STARPU_CPU_RAM    = 0x01,
+	STARPU_CUDA_RAM   = 0x02,
+	STARPU_OPENCL_RAM = 0x03
+};
+
+unsigned starpu_worker_get_memory_node(unsigned workerid);
+unsigned starpu_memory_nodes_get_count(void);
+enum starpu_node_kind starpu_node_get_kind(unsigned node);
+
+
+>>>>>>> .fusion-droit.r9881
 /* It is possible to associate a mask to a piece of data (and its children) so
  * that when it is modified, it is automatically transfered into those memory
  * node. For instance a (1<<0) write-through mask means that the CUDA workers will

src/datawizard/memory_nodes.c

@@ -111,6 +111,7 @@ unsigned _starpu_memory_node_register(enum starpu_node_kind kind, int devid)
 	unsigned nnodes;
 	/* ATOMIC_ADD returns the new value ... */
 	nnodes = STARPU_ATOMIC_ADD(&descr.nnodes, 1);
+	STARPU_ASSERT_MSG(nnodes < STARPU_MAXNODES,"Too many nodes !");
 
 	descr.nodes[nnodes-1] = kind;
 	_STARPU_TRACE_NEW_MEM_NODE(nnodes-1);
@@ -121,6 +122,7 @@ unsigned _starpu_memory_node_register(enum starpu_node_kind kind, int devid)
 	descr.condition_count[nnodes-1] = 0;
 
 	return (nnodes-1);
+
 }
 
 #ifdef STARPU_SIMGRID