Bläddra i källkod

mpi: fix return type, and remove now un-needed function parameter

Nathalie Furmento 8 år sedan
förälder
incheckning
9d8907e6d3
3 ändrade filer med 11 tillägg och 11 borttagningar
  1. 8 8
      mpi/src/starpu_mpi_cache.c
  2. 1 1
      mpi/src/starpu_mpi_cache_stats.c
  3. 2 2
      mpi/src/starpu_mpi_cache_stats.h

+ 8 - 8
mpi/src/starpu_mpi_cache.c

@@ -77,7 +77,7 @@ void _starpu_mpi_cache_init(MPI_Comm comm)
 
 
 	_starpu_cache_comm = comm;
 	_starpu_cache_comm = comm;
 	starpu_mpi_comm_size(comm, &_starpu_cache_comm_size);
 	starpu_mpi_comm_size(comm, &_starpu_cache_comm_size);
-	_starpu_mpi_cache_stats_init(comm);
+	_starpu_mpi_cache_stats_init();
 	STARPU_PTHREAD_MUTEX_INIT(&_cache_mutex, NULL);
 	STARPU_PTHREAD_MUTEX_INIT(&_cache_mutex, NULL);
 }
 }
 
 
@@ -104,7 +104,7 @@ void _starpu_mpi_cache_data_clear(starpu_data_handle_t data_handle)
 	int i;
 	int i;
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 
 
-	if (_starpu_cache_enabled == 0) return 0;
+	if (_starpu_cache_enabled == 0) return;
 
 
 	_starpu_mpi_cache_flush(data_handle);
 	_starpu_mpi_cache_flush(data_handle);
 	for(i=0 ; i<_starpu_cache_comm_size ; i++)
 	for(i=0 ; i<_starpu_cache_comm_size ; i++)
@@ -120,7 +120,7 @@ void _starpu_mpi_cache_data_init(starpu_data_handle_t data_handle)
 	int i;
 	int i;
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 
 
-	if (_starpu_cache_enabled == 0) return 0;
+	if (_starpu_cache_enabled == 0) return;
 
 
 	STARPU_PTHREAD_MUTEX_INIT(&mpi_data->cache_received_mutex, NULL);
 	STARPU_PTHREAD_MUTEX_INIT(&mpi_data->cache_received_mutex, NULL);
 	mpi_data->cache_received = 0;
 	mpi_data->cache_received = 0;
@@ -137,7 +137,7 @@ static void _starpu_mpi_cache_data_add(starpu_data_handle_t data_handle)
 {
 {
 	struct _starpu_data_entry *entry;
 	struct _starpu_data_entry *entry;
 
 
-	if (_starpu_cache_enabled == 0) return 0;
+	if (_starpu_cache_enabled == 0) return;
 
 
 	STARPU_PTHREAD_MUTEX_LOCK(&_cache_mutex);
 	STARPU_PTHREAD_MUTEX_LOCK(&_cache_mutex);
 	HASH_FIND_PTR(_cache_data, &data_handle, entry);
 	HASH_FIND_PTR(_cache_data, &data_handle, entry);
@@ -154,7 +154,7 @@ static void _starpu_mpi_cache_data_remove(starpu_data_handle_t data_handle)
 {
 {
 	struct _starpu_data_entry *entry;
 	struct _starpu_data_entry *entry;
 
 
-	if (_starpu_cache_enabled == 0) return 0;
+	if (_starpu_cache_enabled == 0) return;
 
 
 	STARPU_PTHREAD_MUTEX_LOCK(&_cache_mutex);
 	STARPU_PTHREAD_MUTEX_LOCK(&_cache_mutex);
 	HASH_FIND_PTR(_cache_data, &data_handle, entry);
 	HASH_FIND_PTR(_cache_data, &data_handle, entry);
@@ -174,7 +174,7 @@ void _starpu_mpi_cache_received_data_clear(starpu_data_handle_t data_handle)
 	int mpi_rank = starpu_mpi_data_get_rank(data_handle);
 	int mpi_rank = starpu_mpi_data_get_rank(data_handle);
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 
 
-	if (_starpu_cache_enabled == 0) return 0;
+	if (_starpu_cache_enabled == 0) return;
 
 
 	STARPU_ASSERT(mpi_data->magic == 42);
 	STARPU_ASSERT(mpi_data->magic == 42);
 	STARPU_MPI_ASSERT_MSG(mpi_rank < _starpu_cache_comm_size, "Node %d invalid. Max node is %d\n", mpi_rank, _starpu_cache_comm_size);
 	STARPU_MPI_ASSERT_MSG(mpi_rank < _starpu_cache_comm_size, "Node %d invalid. Max node is %d\n", mpi_rank, _starpu_cache_comm_size);
@@ -249,7 +249,7 @@ void _starpu_mpi_cache_sent_data_clear(starpu_data_handle_t data_handle)
 	int n, size;
 	int n, size;
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 
 
-	if (_starpu_cache_enabled == 0) return 0;
+	if (_starpu_cache_enabled == 0) return;
 
 
 	starpu_mpi_comm_size(mpi_data->node_tag.comm, &size);
 	starpu_mpi_comm_size(mpi_data->node_tag.comm, &size);
 	for(n=0 ; n<size ; n++)
 	for(n=0 ; n<size ; n++)
@@ -354,7 +354,7 @@ static void _starpu_mpi_cache_flush_and_invalidate(MPI_Comm comm, starpu_data_ha
 
 
 void starpu_mpi_cache_flush(MPI_Comm comm, starpu_data_handle_t data_handle)
 void starpu_mpi_cache_flush(MPI_Comm comm, starpu_data_handle_t data_handle)
 {
 {
-	if (_starpu_cache_enabled == 0) return 0;
+	if (_starpu_cache_enabled == 0) return;
 
 
 	_starpu_mpi_cache_flush_and_invalidate(comm, data_handle);
 	_starpu_mpi_cache_flush_and_invalidate(comm, data_handle);
 	_starpu_mpi_cache_data_remove(data_handle);
 	_starpu_mpi_cache_data_remove(data_handle);

+ 1 - 1
mpi/src/starpu_mpi_cache_stats.c

@@ -21,7 +21,7 @@
 
 
 static int stats_enabled=0;
 static int stats_enabled=0;
 
 
-void _starpu_mpi_cache_stats_init(MPI_Comm comm)
+void _starpu_mpi_cache_stats_init()
 {
 {
 	stats_enabled = starpu_get_env_number("STARPU_MPI_CACHE_STATS");
 	stats_enabled = starpu_get_env_number("STARPU_MPI_CACHE_STATS");
 	if (stats_enabled == -1)
 	if (stats_enabled == -1)

+ 2 - 2
mpi/src/starpu_mpi_cache_stats.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  *
- * Copyright (C) 2014, 2015, 2016  CNRS
+ * Copyright (C) 2014, 2015, 2016, 2017  CNRS
  *
  *
  * StarPU is free software; you can redistribute it and/or modify
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * it under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,7 @@
 extern "C" {
 extern "C" {
 #endif
 #endif
 
 
-void _starpu_mpi_cache_stats_init(MPI_Comm comm);
+void _starpu_mpi_cache_stats_init();
 void _starpu_mpi_cache_stats_shutdown();
 void _starpu_mpi_cache_stats_shutdown();
 
 
 void _starpu_mpi_cache_stats_update(unsigned dst, starpu_data_handle_t data_handle, int count);
 void _starpu_mpi_cache_stats_update(unsigned dst, starpu_data_handle_t data_handle, int count);