Merge pull request #307 from Jean-Emile/v3.20-expose-simgrid-jni

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

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 1df82a2..7db7b04 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -115,14 +115,11 @@ XBT_PUBLIC void MSG_host_get_process_list(sg_host_t host, xbt_dynar_t whereto);
 
 /** @brief Return the location on which the current process is executed */
 XBT_PUBLIC sg_host_t MSG_host_self();
+XBT_PUBLIC double MSG_host_get_load(sg_host_t host);
 
 /* ******************************** VMs ************************************* */
 typedef sg_vm_t msg_vm_t;
 
-XBT_ATTRIB_DEPRECATED_v322("Use sg_vm_create_migratable() from the live migration plugin: "
-                           "v3.22 will drop MSG_vm_create() completely.") XBT_PUBLIC sg_vm_t
-    MSG_vm_create(sg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity);
-
 XBT_PUBLIC msg_vm_t MSG_vm_create_core(msg_host_t pm, const char* name);
 XBT_PUBLIC msg_vm_t MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount);
 
@@ -240,9 +237,7 @@ typedef struct msg_task* msg_task_t;
 /** @brief Default value for an uninitialized #msg_task_t. */
 #define MSG_TASK_UNINITIALIZED NULL
 
-/** @brief Return code of most MSG functions
-    @ingroup msg_simulation
-    @{ */
+/** @brief Return code of most MSG functions */
 /* Keep these code as binary values: java bindings manipulate | of these values */
 typedef enum {
   MSG_OK = 0,                 /**< @brief Everything is right. Keep on going this way ! */
@@ -255,7 +250,6 @@ typedef enum {
       return now !*/
   MSG_TASK_CANCELED = 8      /**< @brief Canceled task. This task has been canceled by somebody!*/
 } msg_error_t;
-/** @} */
 
 /************************** Global ******************************************/
 /** @brief set a configuration variable