X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/808bc801011b8291383a7fb87669eb67f46f3a07..d9d29f9c45022aeb18af277c995291c0547bbc0d:/src/msg/msg_private.h?ds=sidebyside

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index d7d6610035..d81cd1520d 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -38,8 +38,6 @@ typedef struct simdata_task {
 
     /* parallel tasks only */
     xbt_free(this->host_list);
-
-    xbt_dict_free(&this->affinity_mask_db);
   }
   void setUsed();
   void setNotUsed()
@@ -58,9 +56,6 @@ typedef struct simdata_task {
   double bound = 0.0; /* Capping for CPU resource */
   double rate = 0.0;  /* Capping for network resource */
 
-  /* CPU affinity database of this task */
-  xbt_dict_t affinity_mask_db = nullptr; /* smx_host_t host => unsigned long mask */
-
   bool isused = false;  /* Indicates whether the task is used in SIMIX currently */
   int host_nb = 0;      /* ==0 if sequential task; parallel task if not */
   /*******  Parallel Tasks Only !!!! *******/
@@ -85,7 +80,7 @@ XBT_PRIVATE void __MSG_host_release_file_descriptor_id(msg_host_t host, int id);
 typedef struct simdata_process {
   msg_host_t m_host;              /* the host on which the process is running */
   msg_host_t put_host;            /* used for debugging purposes */
-  smx_synchro_t waiting_action;
+  smx_activity_t waiting_action;
   msg_task_t waiting_task;
   msg_error_t last_errno;       /* the last value returned by a MSG_function */
 
@@ -103,7 +98,7 @@ typedef struct process_arg {
 } s_process_arg_t, *process_arg_t;
 
 typedef struct msg_comm {
-  smx_synchro_t s_comm;          /* SIMIX communication object encapsulated (the same for both processes) */
+  smx_activity_t s_comm;          /* SIMIX communication object encapsulated (the same for both processes) */
   msg_task_t task_sent;           /* task sent (NULL for the receiver) */
   msg_task_t *task_received;      /* where the task will be received (NULL for the sender) */
   msg_error_t status;           /* status of the communication once finished */
@@ -136,24 +131,21 @@ typedef struct MSG_Global {
 XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 
 /*************************************************************/
-// FIXME: KILLME
-#  define MSG_RETURN(val) return(val)
-
 XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
 XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
 XBT_PRIVATE void __MSG_host_priv_free(msg_host_priv_t priv);
 XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);
 XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
 
-XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
-XBT_PRIVATE smx_process_t MSG_process_create_from_SIMIX(const char *name,
+XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
+XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char *name,
                                    std::function<void()> code, void *data,
                                    const char *hostname, double kill_time,
                                    xbt_dict_t properties, int auto_restart,
-                                   smx_process_t parent_process);
-XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size);
+                                   smx_actor_t parent_process);
+XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size);
 
-XBT_PRIVATE void MSG_post_create_environment(void);
+XBT_PRIVATE void MSG_post_create_environment();
 
 XBT_PRIVATE void MSG_host_add_task(msg_host_t host, msg_task_t task);
 XBT_PRIVATE void MSG_host_del_task(msg_host_t host, msg_task_t task);
@@ -166,9 +158,9 @@ XBT_PRIVATE void TRACE_msg_task_execute_start(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_get_end(double start_time, msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_get_start(void);
+XBT_PRIVATE void TRACE_msg_task_get_start();
 XBT_PRIVATE int TRACE_msg_task_put_start(msg_task_t task);    //returns TRUE if the task_put_end must be called
-XBT_PRIVATE void TRACE_msg_task_put_end(void);
+XBT_PRIVATE void TRACE_msg_task_put_end();
 
 /* declaration of instrumentation functions from msg_process_instr.c */
 XBT_PRIVATE char *instr_process_id (msg_process_t proc, char *str, int len);