#ifndef MSG_H
#define MSG_H
-#include "xbt.h"
#include "xbt/lib.h"
#include "simgrid/forward.h"
#include "simgrid/simix.h"
char* mount_point;
char* storageId;
char* storage_type;
- char* content_type;
int desc_id;
void *data;
simdata_file_t simdata;
typedef struct msg_file_priv* msg_file_t;
/* ******************************** Storage ************************************ */
-/* TODO: PV: to comment */
-
-extern int MSG_STORAGE_LEVEL;
/** @brief Storage datatype.
* @ingroup msg_storage_management
*
* You should consider this as an opaque object.
*/
-typedef xbt_dictelm_t msg_storage_t;
-
-struct msg_storage_priv {
- const char* name;
- const char* hostname;
- sg_size_t size;
- void* data;
-};
-typedef struct msg_storage_priv s_msg_storage_priv_t;
-typedef struct msg_storage_priv* msg_storage_priv_t;
-
-static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){
- return (msg_storage_priv_t )xbt_lib_get_level(storage, MSG_STORAGE_LEVEL);
-}
+typedef sg_storage_t msg_storage_t;
/**
* \brief @brief Communication action.
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")
}
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) {
}
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 ***********************************/
// 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);