Put XBT_ATTRIB_DEPRECATED at proper place.

[simgrid.git] / include / simgrid / msg.h

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 1014114..29ce2e3 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -33,11 +33,21 @@
 namespace simgrid {
 namespace msg {
 class Comm;
+class Task;
 }
 }
 typedef simgrid::msg::Comm sg_msg_Comm;
+/** @brief Task datatype.
+ *
+ *  Since most scheduling algorithms rely on a concept of task  that can be either <em>computed</em> locally or
+ *  <em>transferred</em> on another processor, it seems to be the right level of abstraction for our purposes.
+ *  A <em>task</em> may then be defined by a <em>computing amount</em>, a <em>message size</em> and
+ *  some <em>private data</em>.
+ */
+typedef simgrid::msg::Task* msg_task_t;
 #else
 typedef struct msg_Comm sg_msg_Comm;
+typedef struct msg_Task* msg_task_t;
 #endif
 
 #ifdef __cplusplus
@@ -236,25 +246,6 @@ typedef sg_msg_Comm* msg_comm_t;
 
 /* ******************************** Task ************************************ */
 
-typedef struct s_simdata_task_t* simdata_task_t;
-
-typedef struct msg_task {
-  char* name;             /**< @brief task name if any */
-  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 <em>computed</em> locally or
- *  <em>transferred</em> on another processor, it seems to be the right level of abstraction for our purposes.
- *  A <em>task</em> may then be defined by a <em>computing amount</em>, a <em>message size</em> and
- *  some <em>private data</em>.
- */
-
-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);
@@ -450,9 +441,8 @@ XBT_PUBLIC int MSG_barrier_wait(msg_bar_t bar);
 
 /* ****************************************************************************************** */
 /* DO NOT USE this nasty pimple (unless if you're writing a binding) */
-XBT_PUBLIC smx_context_t
 XBT_ATTRIB_DEPRECATED_v323("MSG_process_get_smx_ctx is deprecated. Please contact us if you need it.")
-MSG_process_get_smx_ctx(msg_process_t process);
+    XBT_PUBLIC smx_context_t MSG_process_get_smx_ctx(msg_process_t process);
 
 #ifdef __cplusplus
 }