Browse Source

Avoid useless dereference

Samuel Thibault 7 years ago
parent
commit
d2aa39b0f0

+ 7 - 7
mpi/src/starpu_mpi_early_data.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010-2014  Université de Bordeaux
+ * Copyright (C) 2009, 2010-2014, 2017  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 
 struct _starpu_mpi_early_data_handle_hashlist
 {
-	struct _starpu_mpi_early_data_handle_list *list;
+	struct _starpu_mpi_early_data_handle_list list;
 	UT_hash_handle hh;
 	struct _starpu_mpi_node_tag node_tag;
 };
@@ -50,7 +50,7 @@ void _starpu_mpi_early_data_shutdown(void)
 	struct _starpu_mpi_early_data_handle_hashlist *current, *tmp;
 	HASH_ITER(hh, _starpu_mpi_early_data_handle_hashmap, current, tmp)
 	{
-		_starpu_mpi_early_data_handle_list_delete(current->list);
+		_starpu_mpi_early_data_handle_list_delete(&current->list);
 		HASH_DEL(_starpu_mpi_early_data_handle_hashmap, current);
 		free(current);
 	}
@@ -84,14 +84,14 @@ struct _starpu_mpi_early_data_handle *_starpu_mpi_early_data_find(struct _starpu
 	}
 	else
 	{
-		if (_starpu_mpi_early_data_handle_list_empty(hashlist->list))
+		if (_starpu_mpi_early_data_handle_list_empty(&hashlist->list))
 		{
 			early_data_handle = NULL;
 		}
 		else
 		{
 			_starpu_mpi_early_data_handle_hashmap_count --;
-			early_data_handle = _starpu_mpi_early_data_handle_list_pop_front(hashlist->list);
+			early_data_handle = _starpu_mpi_early_data_handle_list_pop_front(&hashlist->list);
 		}
 	}
 	_STARPU_MPI_DEBUG(60, "Found early_data_handle %p with comm %ld source %d tag %d\n", early_data_handle, (long int)node_tag->comm, node_tag->rank, node_tag->data_tag);
@@ -110,11 +110,11 @@ void _starpu_mpi_early_data_add(struct _starpu_mpi_early_data_handle *early_data
 	if (hashlist == NULL)
 	{
 		_STARPU_MPI_MALLOC(hashlist, sizeof(struct _starpu_mpi_early_data_handle_hashlist));
-		hashlist->list = _starpu_mpi_early_data_handle_list_new();
+		_starpu_mpi_early_data_handle_list_init(&hashlist->list);
 		hashlist->node_tag = early_data_handle->node_tag;
 		HASH_ADD(hh, _starpu_mpi_early_data_handle_hashmap, node_tag, sizeof(hashlist->node_tag), hashlist);
 	}
-	_starpu_mpi_early_data_handle_list_push_back(hashlist->list, early_data_handle);
+	_starpu_mpi_early_data_handle_list_push_back(&hashlist->list, early_data_handle);
 	_starpu_mpi_early_data_handle_hashmap_count ++;
 	STARPU_PTHREAD_MUTEX_UNLOCK(&_starpu_mpi_early_data_handle_mutex);
 }

+ 7 - 7
mpi/src/starpu_mpi_early_request.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010-2014, 2016  Université de Bordeaux
+ * Copyright (C) 2009, 2010-2014, 2016-2017  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 /** stores application requests for which data have not been received yet */
 struct _starpu_mpi_early_request_hashlist
 {
-	struct _starpu_mpi_req_list *list;
+	struct _starpu_mpi_req_list list;
 	UT_hash_handle hh;
 	struct _starpu_mpi_node_tag node_tag;
 };
@@ -46,7 +46,7 @@ void _starpu_mpi_early_request_shutdown()
 	HASH_ITER(hh, _starpu_mpi_early_request_hash, entry, tmp)
 	{
 		HASH_DEL(_starpu_mpi_early_request_hash, entry);
-		_starpu_mpi_req_list_delete(entry->list);
+		_starpu_mpi_req_list_delete(&entry->list);
 		free(entry);
 	}
 	STARPU_PTHREAD_MUTEX_DESTROY(&_starpu_mpi_early_request_mutex);
@@ -82,13 +82,13 @@ struct _starpu_mpi_req* _starpu_mpi_early_request_dequeue(int data_tag, int sour
 	}
 	else
 	{
-		if (_starpu_mpi_req_list_empty(hashlist->list))
+		if (_starpu_mpi_req_list_empty(&hashlist->list))
 		{
 			found = NULL;
 		}
 		else
 		{
-			found = _starpu_mpi_req_list_pop_front(hashlist->list);
+			found = _starpu_mpi_req_list_pop_front(&hashlist->list);
 			_starpu_mpi_early_request_hash_count --;
 		}
 	}
@@ -107,11 +107,11 @@ void _starpu_mpi_early_request_enqueue(struct _starpu_mpi_req *req)
 	if (hashlist == NULL)
 	{
 		_STARPU_MPI_MALLOC(hashlist, sizeof(struct _starpu_mpi_early_request_hashlist));
-		hashlist->list = _starpu_mpi_req_list_new();
+		_starpu_mpi_req_list_init(&hashlist->list);
 		hashlist->node_tag = req->node_tag;
 		HASH_ADD(hh, _starpu_mpi_early_request_hash, node_tag, sizeof(hashlist->node_tag), hashlist);
 	}
-	_starpu_mpi_req_list_push_back(hashlist->list, req);
+	_starpu_mpi_req_list_push_back(&hashlist->list, req);
 	_starpu_mpi_early_request_hash_count ++;
 	STARPU_PTHREAD_MUTEX_UNLOCK(&_starpu_mpi_early_request_mutex);
 }

+ 9 - 9
mpi/src/starpu_mpi_sync_data.c

@@ -22,7 +22,7 @@
 
 struct _starpu_mpi_sync_data_handle_hashlist
 {
-	struct _starpu_mpi_req_list *list;
+	struct _starpu_mpi_req_list list;
 	UT_hash_handle hh;
 	struct _starpu_mpi_node_tag node_tag;
 };
@@ -44,7 +44,7 @@ void _starpu_mpi_sync_data_shutdown(void)
 	struct _starpu_mpi_sync_data_handle_hashlist *current, *tmp;
 	HASH_ITER(hh, _starpu_mpi_sync_data_handle_hashmap, current, tmp)
 	{
-		_starpu_mpi_req_list_delete(current->list);
+		_starpu_mpi_req_list_delete(&current->list);
 		HASH_DEL(_starpu_mpi_sync_data_handle_hashmap, current);
 		free(current);
 	}
@@ -62,15 +62,15 @@ void _starpu_mpi_sync_data_handle_display_hash(struct _starpu_mpi_node_tag *node
 	{
 		_STARPU_MPI_DEBUG(60, "Hashlist for comm %ld source %d and tag %d does not exist\n", (long int)node_tag->comm, node_tag->rank, node_tag->data_tag);
 	}
-	else if (_starpu_mpi_req_list_empty(hashlist->list))
+	else if (_starpu_mpi_req_list_empty(&hashlist->list))
 	{
 		_STARPU_MPI_DEBUG(60, "Hashlist for comm %ld source %d and tag %d is empty\n", (long int)node_tag->comm, node_tag->rank, node_tag->data_tag);
 	}
 	else
 	{
 		struct _starpu_mpi_req *cur;
-		for (cur = _starpu_mpi_req_list_begin(hashlist->list) ;
-		     cur != _starpu_mpi_req_list_end(hashlist->list);
+		for (cur = _starpu_mpi_req_list_begin(&hashlist->list) ;
+		     cur != _starpu_mpi_req_list_end(&hashlist->list);
 		     cur = _starpu_mpi_req_list_next(cur))
 		{
 			_STARPU_MPI_DEBUG(60, "Element for comm %ld source %d and tag %d: %p\n", (long int)node_tag->comm, node_tag->rank, node_tag->data_tag, cur);
@@ -110,13 +110,13 @@ struct _starpu_mpi_req *_starpu_mpi_sync_data_find(int data_tag, int source, MPI
 	}
 	else
 	{
-		if (_starpu_mpi_req_list_empty(found->list))
+		if (_starpu_mpi_req_list_empty(&found->list))
 		{
 			req = NULL;
 		}
 		else
 		{
-			req = _starpu_mpi_req_list_pop_front(found->list);
+			req = _starpu_mpi_req_list_pop_front(&found->list);
 			_starpu_mpi_sync_data_handle_hashmap_count --;
 		}
 	}
@@ -136,11 +136,11 @@ void _starpu_mpi_sync_data_add(struct _starpu_mpi_req *sync_req)
 	if (hashlist == NULL)
 	{
 		_STARPU_MPI_MALLOC(hashlist, sizeof(struct _starpu_mpi_sync_data_handle_hashlist));
-		hashlist->list = _starpu_mpi_req_list_new();
+		_starpu_mpi_req_list_init(&hashlist->list);
 		hashlist->node_tag = sync_req->node_tag;
 		HASH_ADD(hh, _starpu_mpi_sync_data_handle_hashmap, node_tag, sizeof(hashlist->node_tag), hashlist);
 	}
-	_starpu_mpi_req_list_push_back(hashlist->list, sync_req);
+	_starpu_mpi_req_list_push_back(&hashlist->list, sync_req);
 	_starpu_mpi_sync_data_handle_hashmap_count ++;
 	STARPU_PTHREAD_MUTEX_UNLOCK(&_starpu_mpi_sync_data_handle_mutex);
 #ifdef STARPU_VERBOSE