X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d06231bf31deb78e97d5f2408e300c0e4f55af1..4d02714ee138a3bd9b02e0064b7a2aa26407e9e8:/include/simgrid/msg.h
diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 47da526f94..7a3e616dff 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -37,10 +37,17 @@ class Task;
}
}
typedef simgrid::msg::Comm sg_msg_Comm;
-typedef simgrid::msg::Task* simdata_task_t;
+/** @brief Task datatype.
+ *
+ * Since most scheduling algorithms rely on a concept of task that can be either computed locally or
+ * transferred on another processor, it seems to be the right level of abstraction for our purposes.
+ * A task may then be defined by a computing amount, a message size and
+ * some private data.
+ */
+typedef simgrid::msg::Task* msg_task_t;
#else
typedef struct msg_Comm sg_msg_Comm;
-typedef struct msg_Task* simdata_task_t;
+typedef struct msg_Task* msg_task_t;
#endif
#ifdef __cplusplus
@@ -239,22 +246,6 @@ typedef sg_msg_Comm* msg_comm_t;
/* ******************************** Task ************************************ */
-typedef struct msg_task {
- simdata_task_t simdata; /**< @brief simulator data */
- void* data; /**< @brief user data */
- long long int counter; /* task unique identifier for instrumentation */
- char* category; /* task category for instrumentation */
-} s_msg_task_t;
-
-/** @brief Task datatype.
- *
- * Since most scheduling algorithms rely on a concept of task that can be either computed locally or
- * transferred on another processor, it seems to be the right level of abstraction for our purposes.
- * A task may then be defined by a computing amount, a message size and
- * some private data.
- */
-
-typedef struct msg_task* msg_task_t;
/** @brief Default value for an uninitialized #msg_task_t. */
#define MSG_TASK_UNINITIALIZED NULL
@@ -338,7 +329,7 @@ XBT_PUBLIC int MSG_process_get_number();
XBT_PUBLIC void* MSG_process_get_data(msg_process_t process);
XBT_PUBLIC msg_error_t MSG_process_set_data(msg_process_t process, void* data);
-XBT_PUBLIC void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void* data);
+XBT_PUBLIC void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data);
XBT_PUBLIC void MSG_process_ref(msg_process_t process);
XBT_PUBLIC void MSG_process_unref(msg_process_t process);