X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..9a49e52a154ce58d498f0d6cc77ee7165adece18:/include/simgrid/msg.h?ds=sidebyside

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 95f014ffd2..37eca20384 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -37,10 +37,11 @@ typedef struct s_msg_host_priv {
   double     dp_updated_by_deleted_tasks;
   int        is_migrating;
 
-  xbt_dict_t affinity_mask_db;
   xbt_dynar_t file_descriptor_table;
 } s_msg_host_priv_t;
 
+XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors;
+
 /* ******************************** Task ************************************ */
 
 typedef struct simdata_task *simdata_task_t;
@@ -70,7 +71,6 @@ typedef msg_host_t msg_vm_t;
 /** @brief Opaque object describing a File in MSG.
  *  @ingroup msg_file */
 typedef xbt_dictelm_t msg_file_t;
-typedef s_xbt_dictelm_t s_msg_file_t;
 
 extern int MSG_FILE_LEVEL;
 typedef struct simdata_file *simdata_file_t;
@@ -86,6 +86,7 @@ struct msg_file_priv  {
   void *data;
   simdata_file_t simdata;
 };
+
 typedef struct msg_file_priv s_msg_file_priv_t;
 typedef struct msg_file_priv* msg_file_priv_t;
 
@@ -104,7 +105,6 @@ extern int MSG_STORAGE_LEVEL;
  *  You should consider this as an opaque object.
  */
 typedef xbt_dictelm_t msg_storage_t;
-typedef s_xbt_dictelm_t s_msg_storage_t;
 
 struct msg_storage_priv  {
   const char *hostname;
@@ -369,7 +369,6 @@ XBT_PUBLIC(msg_error_t) MSG_task_execute(msg_task_t task);
 XBT_PUBLIC(msg_error_t) MSG_parallel_task_execute(msg_task_t task);
 XBT_PUBLIC(void) MSG_task_set_priority(msg_task_t task, double priority);
 XBT_PUBLIC(void) MSG_task_set_bound(msg_task_t task, double bound);
-XBT_PUBLIC(void) MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask);
 
 XBT_PUBLIC(msg_error_t) MSG_process_join(msg_process_t process, double timeout);
 XBT_PUBLIC(msg_error_t) MSG_process_sleep(double nb_sec);
@@ -410,7 +409,7 @@ XBT_PUBLIC(msg_error_t) MSG_task_receive_bounded(msg_task_t * task, const char *
 XBT_PUBLIC(msg_comm_t) MSG_task_isend(msg_task_t task, const char *alias);
 XBT_PUBLIC(msg_comm_t) MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate);
 XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(msg_task_t task, const char *alias,
-    int (*match_fun)(void*,void*, smx_synchro_t), void *match_data);
+    int (*match_fun)(void*,void*, smx_activity_t), void *match_data);
 
 XBT_PUBLIC(void) MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup);
 XBT_PUBLIC(void) MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t cleanup, double maxrate);
@@ -518,7 +517,6 @@ XBT_PUBLIC(void) MSG_vm_restore(msg_vm_t vm);
 
 XBT_PUBLIC(msg_host_t) MSG_vm_get_pm(msg_vm_t vm);
 XBT_PUBLIC(void) MSG_vm_set_bound(msg_vm_t vm, double bound);
-XBT_PUBLIC(void) MSG_vm_set_affinity(msg_vm_t vm, msg_host_t pm, unsigned long mask);
 
 /* TODO: do we need this? */
 // XBT_PUBLIC(xbt_dynar_t) MSG_vms_as_dynar();