소스 검색

Fix build with simgrid 3.24

Samuel Thibault 5 년 전
부모
커밋
985e35a370
3개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      doc/doxygen/chapters/470_simgrid.doxy
  2. 2 2
      src/common/thread.c
  3. 1 1
      src/core/simgrid.c

+ 1 - 1
doc/doxygen/chapters/470_simgrid.doxy

@@ -23,7 +23,7 @@
 /*! \page SimGridSupport SimGrid Support
 
 StarPU can use Simgrid in order to simulate execution on an arbitrary
-platform. This was tested with SimGrid from 3.11 to 3.16, and 3.18 to 3.23.
+platform. This was tested with SimGrid from 3.11 to 3.16, and 3.18 to 3.24.
 Other versions may have compatibility issues. 3.17 notably does not build at
 all. MPI simulation does not work with version 3.22.
 

+ 2 - 2
src/common/thread.c

@@ -310,7 +310,7 @@ int starpu_pthread_setspecific(starpu_pthread_key_t key, const void *pointer)
 {
 	void **array;
 #ifdef HAVE_SG_ACTOR_DATA
-	array = sg_actor_self_data();
+	array = sg_actor_data(sg_actor_self());
 #else
 #if defined(HAVE_SMPI_PROCESS_SET_USER_DATA) || defined(smpi_process_get_user_data)
 #if defined(HAVE_MSG_PROCESS_SELF_NAME) || defined(MSG_process_self_name)
@@ -337,7 +337,7 @@ void* starpu_pthread_getspecific(starpu_pthread_key_t key)
 {
 	void **array;
 #ifdef HAVE_SG_ACTOR_DATA
-	array = sg_actor_self_data();
+	array = sg_actor_data(sg_actor_self());
 #else
 #if defined(HAVE_SMPI_PROCESS_SET_USER_DATA) || defined(smpi_process_get_user_data)
 #if defined(HAVE_MSG_PROCESS_SELF_NAME) || defined(MSG_process_self_name)

+ 1 - 1
src/core/simgrid.c

@@ -443,7 +443,7 @@ void _starpu_simgrid_init_early(int *argc STARPU_ATTRIBUTE_UNUSED, char ***argv
 		void **tsd;
 		_STARPU_CALLOC(tsd, MAX_TSD+1, sizeof(void*));
 #ifdef HAVE_SG_ACTOR_DATA
-		sg_actor_self_data_set(tsd);
+		sg_actor_data_set(sg_actor_self(), tsd);
 #else
 		smpi_process_set_user_data(tsd);
 #endif