Merge pull request #179 from Takishipp/signals

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

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index bb2c594..98580d4 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -7,7 +7,6 @@
 #ifndef MSG_H
 #define MSG_H
 
-#include "xbt.h"
 #include "xbt/lib.h"
 #include "simgrid/forward.h"
 #include "simgrid/simix.h"
@@ -68,7 +67,6 @@ typedef struct msg_file_priv {
   char* mount_point;
   char* storageId;
   char* storage_type;
-  char* content_type;
   int desc_id;
   void *data;
   simdata_file_t simdata;
@@ -180,10 +178,10 @@ XBT_PUBLIC(unsigned long int) MSG_get_sent_msg();
 XBT_PUBLIC(msg_netzone_t) MSG_zone_get_root();
 XBT_PUBLIC(const char*) MSG_zone_get_name(msg_netzone_t zone);
 XBT_PUBLIC(msg_netzone_t) MSG_zone_get_by_name(const char* name);
-XBT_PUBLIC(xbt_dict_t) MSG_zone_get_sons(msg_netzone_t zone);
+XBT_PUBLIC(void) MSG_zone_get_sons(msg_netzone_t zone, xbt_dict_t whereto);
 XBT_PUBLIC(const char*) MSG_zone_get_property_value(msg_netzone_t as, const char* name);
 XBT_PUBLIC(void) MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value);
-XBT_PUBLIC(xbt_dynar_t) MSG_zone_get_hosts(msg_netzone_t zone);
+XBT_PUBLIC(void) MSG_zone_get_hosts(msg_netzone_t zone, xbt_dynar_t whereto);
 
 /* Deprecated forms of the previous functions */
 static inline XBT_ATTRIB_DEPRECATED("Please use MSG_zone_get_root since v3.16")
@@ -200,7 +198,9 @@ static inline XBT_ATTRIB_DEPRECATED("Please use MSG_zone_get_by_name since v3.16
 }
 static inline XBT_ATTRIB_DEPRECATED("Please use MSG_zone_get_sons since v3.16")
     xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t zone) {
-  return MSG_zone_get_sons(zone);
+  xbt_dict_t res = xbt_dict_new_homogeneous(NULL);
+  MSG_zone_get_sons(zone, res);
+  return res;
 }
 static inline XBT_ATTRIB_DEPRECATED("Please use MSG_zone_get_property_value since v3.16")
     const char* MSG_environment_as_get_property_value(msg_netzone_t zone, const char* name) {
@@ -212,7 +212,9 @@ static inline XBT_ATTRIB_DEPRECATED("Please use MSG_zone_set_property_value sinc
 }
 static inline XBT_ATTRIB_DEPRECATED("Please use MSG_zone_get_hosts since v3.16")
     xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t zone) {
-  return MSG_zone_get_hosts(zone);
+  xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), NULL);
+  MSG_zone_get_hosts(zone, res);
+  return res;
 }
 
 /************************** File handling ***********************************/
@@ -489,8 +491,9 @@ XBT_PUBLIC(void) MSG_vm_set_params(msg_vm_t vm, vm_params_t params);
 
 // TODO add VDI later
 XBT_PUBLIC(msg_vm_t) MSG_vm_create_core(msg_host_t location, const char *name);
+XBT_PUBLIC(msg_vm_t) MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount);
 XBT_PUBLIC(msg_vm_t)
-MSG_vm_create(msg_host_t ind_pm, const char* name, int ramsize, int mig_netspeed, int dp_intensity);
+MSG_vm_create(msg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity);
 
 XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm);