merge suite

configure.ac

@@ -204,7 +204,7 @@ if test x$enable_simgrid = xyes ; then
 	AC_CHECK_TYPES([smx_actor_t], [AC_DEFINE([STARPU_HAVE_SMX_ACTOR_T], [1], [Define to 1 if you have the smx_actor_t type.])], [], [[#include <simgrid/simix.h>]])
 
 	# Latest functions
-	AC_CHECK_FUNCS([MSG_process_attach sg_actor_attach sg_actor_init sg_actor_set_stacksize MSG_zone_get_hosts sg_zone_get_hosts MSG_process_self_name MSG_process_userdata_init sg_actor_data])
+A	AC_CHECK_FUNCS([MSG_process_attach sg_actor_attach sg_actor_init sg_actor_set_stacksize sg_actor_on_exit MSG_zone_get_hosts sg_zone_get_hosts MSG_process_self_name MSG_process_userdata_init sg_actor_data])
 	AC_CHECK_FUNCS([xbt_mutex_try_acquire smpi_process_set_user_data SMPI_thread_create sg_zone_get_by_name sg_link_name sg_link_bandwidth_set sg_host_route sg_host_self sg_host_list sg_host_speed simcall_process_create sg_config_continue_after_help])
 	AC_CHECK_FUNCS([simgrid_init], [AC_DEFINE([STARPU_SIMGRID_HAVE_SIMGRID_INIT], [1], [Define to 1 if you have the `simgrid_init' function.])])
 	AC_CHECK_FUNCS([xbt_barrier_init], [AC_DEFINE([STARPU_SIMGRID_HAVE_XBT_BARRIER_INIT], [1], [Define to 1 if you have the `xbt_barrier_init' function.])])

mpi/src/starpu_mpi_checkpoint.h

@@ -19,13 +19,25 @@
 
 #include <starpu_mpi.h>
 #include <common/list.h>
-#include "starpu_mpi_private.h"
+#include <starpu_mpi_private.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+struct _starpu_mpi_cp_ack_msg
+{
+	int checkpoint_id;
+	int checkpoint_instance;
+};
+
+struct _starpu_mpi_cp_ack_arg_cb
+{
+	int rank;
+	struct _starpu_mpi_cp_ack_msg msg;
+};
+
 LIST_TYPE(_starpu_mpi_checkpoint_template_item,
     int type;
     void* ptr;
@@ -129,18 +141,6 @@ static inline int _starpu_mpi_checkpoint_template_freeze(starpu_mpi_checkpoint_t
 	return cp_template->size;
 }
 
-struct _starpu_mpi_cp_ack_msg
-{
-	int checkpoint_id;
-	int checkpoint_instance;
-};
-
-struct _starpu_mpi_cp_ack_arg_cb
-{
-	int rank;
-	struct _starpu_mpi_cp_ack_msg msg;
-};
-
 static inline int _starpu_checkpoint_template_free(starpu_mpi_checkpoint_template_t cp_template)
 {
 	struct _starpu_mpi_checkpoint_template_item* item;