Prefixing of src/datawizard/datastats.h

find . -type f -not -name "*svn*"|xargs sed -i s/"\bmsi_cache_hit\b"/starpu_msi_cache_hit/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bmsi_cache_miss\b"/starpu_msi_cache_miss/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\ballocation_cache_hit\b"/starpu_allocation_cache_hit/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bdata_allocation_inc_stats\b"/starpu_data_allocation_inc_stats/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bdisplay_comm_ammounts\b"/starpu_display_comm_amounts/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bdisplay_alloc_cache_stats\b"/starpu_display_alloc_cache_stats/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bupdate_comm_ammount\b"/starpu_update_comm_amount/g

src/core/workers.c

@@ -430,13 +430,13 @@ static void _starpu_kill_all_workers(struct machine_config_s *config)
 void starpu_shutdown(void)
 {
 	starpu_display_msi_stats();
-	display_alloc_cache_stats();
+	starpu_display_alloc_cache_stats();
 
 	/* tell all workers to shutdown */
 	_starpu_kill_all_workers(&config);
 
 #ifdef STARPU_DATA_STATS
-	display_comm_ammounts();
+	starpu_display_comm_amounts();
 #endif
 
 	if (starpu_get_env_number("STARPU_CALIBRATE") != -1)

src/datawizard/coherency.c

@@ -153,7 +153,7 @@ int starpu_fetch_data_on_node(starpu_data_handle handle, uint32_t requesting_nod
 	{
 		/* the data is already available so we can stop */
 		starpu_update_data_state(handle, requesting_node, write);
-		msi_cache_hit(requesting_node);
+		starpu_msi_cache_hit(requesting_node);
 		starpu_spin_unlock(&handle->header_lock);
 		return 0;
 	}
@@ -161,7 +161,7 @@ int starpu_fetch_data_on_node(starpu_data_handle handle, uint32_t requesting_nod
 	/* the only remaining situation is that the local copy was invalid */
 	STARPU_ASSERT(handle->per_node[requesting_node].state == STARPU_INVALID);
 
-	msi_cache_miss(requesting_node);
+	starpu_msi_cache_miss(requesting_node);
 
 	starpu_data_request_t r;
 

src/datawizard/copy-driver.c

@@ -219,7 +219,7 @@ int __attribute__((warn_unused_result)) starpu_driver_copy_data_1_to_1(starpu_da
 
 #ifdef STARPU_DATA_STATS
 		size_t size = handle->ops->get_size(handle);
-		update_comm_ammount(src_node, dst_node, size);
+		starpu_update_comm_amount(src_node, dst_node, size);
 #endif
 		
 #ifdef STARPU_USE_FXT

src/datawizard/datastats.c

@@ -26,14 +26,14 @@ static unsigned hit_cnt[STARPU_MAXNODES];
 static unsigned miss_cnt[STARPU_MAXNODES];
 #endif
 
-inline void msi_cache_hit(unsigned node __attribute__ ((unused)))
+inline void starpu_msi_cache_hit(unsigned node __attribute__ ((unused)))
 {
 #ifdef STARPU_DATA_STATS
 	hit_cnt[node]++;
 #endif
 }
 
-inline void msi_cache_miss(unsigned node __attribute__ ((unused)))
+inline void starpu_msi_cache_miss(unsigned node __attribute__ ((unused)))
 {
 #ifdef STARPU_DATA_STATS
 	miss_cnt[node]++;
@@ -76,21 +76,21 @@ static unsigned alloc_cnt[STARPU_MAXNODES];
 static unsigned alloc_cache_hit_cnt[STARPU_MAXNODES];
 #endif
 
-inline void allocation_cache_hit(unsigned node __attribute__ ((unused)))
+inline void starpu_allocation_cache_hit(unsigned node __attribute__ ((unused)))
 {
 #ifdef STARPU_DATA_STATS
 	alloc_cache_hit_cnt[node]++;
 #endif
 }
 
-inline void data_allocation_inc_stats(unsigned node __attribute__ ((unused)))
+inline void starpu_data_allocation_inc_stats(unsigned node __attribute__ ((unused)))
 {
 #ifdef STARPU_DATA_STATS
 	alloc_cnt[node]++;
 #endif
 }
 
-void display_alloc_cache_stats(void)
+void starpu_display_alloc_cache_stats(void)
 {
 #ifdef STARPU_DATA_STATS
 	fprintf(stderr, "Allocation cache stats:\n");
@@ -113,7 +113,7 @@ void display_alloc_cache_stats(void)
 
 static size_t comm_ammount[STARPU_MAXNODES][STARPU_MAXNODES];
 
-void display_comm_ammounts(void)
+void starpu_display_comm_amounts(void)
 {
 	unsigned src, dst;
 
@@ -138,14 +138,14 @@ void display_comm_ammounts(void)
 	}
 }
 
-inline void update_comm_ammount(uint32_t src_node, uint32_t dst_node, size_t size)
+inline void starpu_update_comm_amount(uint32_t src_node, uint32_t dst_node, size_t size)
 {
 	comm_ammount[src_node][dst_node] += size;
 }
 
 #else
 
-inline void display_comm_ammounts(void)
+inline void starpu_display_comm_amounts(void)
 {
 }
 

src/datawizard/datastats.h

@@ -21,20 +21,20 @@
 #include <stdlib.h>
 
 
-inline void msi_cache_hit(unsigned node);
-inline void msi_cache_miss(unsigned node);
+inline void starpu_msi_cache_hit(unsigned node);
+inline void starpu_msi_cache_miss(unsigned node);
 
 void starpu_display_msi_stats(void);
 
-inline void allocation_cache_hit(unsigned node __attribute__ ((unused)));
-inline void data_allocation_inc_stats(unsigned node __attribute__ ((unused)));
+inline void starpu_allocation_cache_hit(unsigned node __attribute__ ((unused)));
+inline void starpu_data_allocation_inc_stats(unsigned node __attribute__ ((unused)));
 
 
-void display_comm_ammounts(void);
-void display_alloc_cache_stats(void);
+void starpu_display_comm_amounts(void);
+void starpu_display_alloc_cache_stats(void);
 
 #ifdef STARPU_DATA_STATS
-inline void update_comm_ammount(uint32_t src_node, uint32_t dst_node, size_t size);
+inline void starpu_update_comm_amount(uint32_t src_node, uint32_t dst_node, size_t size);
 #endif
 
 #endif

src/datawizard/memalloc.c

@@ -548,7 +548,7 @@ int _starpu_allocate_memory_on_node(starpu_data_handle handle, uint32_t dst_node
 	if (!may_alloc)
 		return ENOMEM;
 
-	data_allocation_inc_stats(dst_node);
+	starpu_data_allocation_inc_stats(dst_node);
 
 #ifdef STARPU_USE_ALLOCATION_CACHE
 	/* perhaps we can directly reuse a buffer in the free-list */
@@ -557,7 +557,7 @@ int _starpu_allocate_memory_on_node(starpu_data_handle handle, uint32_t dst_node
 	TRACE_START_ALLOC_REUSE(dst_node);
 	if (try_to_find_reusable_mem_chunk(dst_node, handle, footprint))
 	{
-		allocation_cache_hit(dst_node);
+		starpu_allocation_cache_hit(dst_node);
 		return 0;
 	}
 	TRACE_END_ALLOC_REUSE(dst_node);