use vector for file descriptor table

[simgrid.git] / src / msg / msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index a984787..3482e3c 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -27,7 +27,15 @@
 SG_BEGIN_DECL()
 
 /**************** datatypes **********************************/
-
+/********************************* Host **************************************/
+typedef struct s_msg_host_priv {
+  int        dp_enabled;
+  xbt_dict_t dp_objs;
+  double     dp_updated_by_deleted_tasks;
+  int        is_migrating;
+
+  std::vector<int> *file_descriptor_table;
+} s_msg_host_priv_t;
 /********************************* Task **************************************/
 
 typedef struct simdata_task {
@@ -38,8 +46,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 +64,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 !!!! *******/
@@ -142,12 +145,12 @@ 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);
+                                   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();