Explorar o código

really fix r19261 : add prefix _starpu_ to worker_drives_memory

Corentin Salingue %!s(int64=8) %!d(string=hai) anos
pai
achega
e1f46dab74

+ 1 - 1
src/datawizard/datawizard.c

@@ -73,7 +73,7 @@ int __starpu_datawizard_progress(unsigned may_alloc, unsigned push_requests)
 
     for (memnode = 0; memnode < STARPU_MAXNODES; memnode++)
     {
-        if (worker_drives_memory[current_worker_id][memnode] == 1)
+        if (_starpu_worker_drives_memory[current_worker_id][memnode] == 1)
             ret |= ___starpu_datawizard_progress(memnode, may_alloc, push_requests);
     }
 

+ 1 - 1
src/datawizard/memory_nodes.c

@@ -25,7 +25,7 @@
 #include "copy_driver.h"
 #include "memalloc.h"
 
-static char worker_drives_memory[STARPU_NMAXWORKERS][STARPU_MAXNODES];
+char _starpu_worker_drives_memory[STARPU_NMAXWORKERS][STARPU_MAXNODES];
 
 struct _starpu_memory_node_descr _starpu_descr;
 starpu_pthread_key_t _starpu_memory_node_key STARPU_ATTRIBUTE_INTERNAL;

+ 2 - 2
src/datawizard/memory_nodes.h

@@ -33,7 +33,7 @@
 #define _STARPU_MEMORY_NODE_TUPLE_FIRST(tuple) (tuple & 0x0F)
 #define _STARPU_MEMORY_NODE_TUPLE_SECOND(tuple) (tuple & 0xF0)
 
-extern char worker_drives_memory[STARPU_NMAXWORKERS][STARPU_MAXNODES];
+extern char _starpu_worker_drives_memory[STARPU_NMAXWORKERS][STARPU_MAXNODES];
 
 struct _starpu_cond_and_mutex
 {
@@ -101,7 +101,7 @@ static inline void _starpu_memory_node_add_nworkers(unsigned node)
 /* same utility as _starpu_memory_node_add_nworkers */
 static inline void _starpu_worker_drives_memory_node(unsigned worker_id, unsigned memnode)
 {
-    worker_drives_memory[worker_id][memnode] = 1;   
+    _starpu_worker_drives_memory[worker_id][memnode] = 1;   
 }
 
 static inline unsigned _starpu_memory_node_get_nworkers(unsigned node)