From: Martin Quinson <624847+mquinson@users.noreply.github.com>
Date: Thu, 11 Oct 2018 20:09:28 +0000 (+0200)
Subject: Merge pull request #307 from Jean-Emile/v3.20-expose-simgrid-jni
X-Git-Tag: v3_22~909^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/717bb82fd56727b8a066418eaa654290373736ea?hp=-c

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

Expose Host Load for Java API through JNI
---

717bb82fd56727b8a066418eaa654290373736ea
diff --combined ChangeLog
index 622c291e43,2c3c853201..ee1a24f5eb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,10 @@@
  SimGrid (3.22) NOT RELEASED (Release Target: December 21. 2018, 22:23 UTC)
  
 +Fixed bugs:
 + - #261: Document the parameters of parallel execution's constructor
 +
 +----------------------------------------------------------------------------
 +
  SimGrid (3.21) October 3. 2018
  
  The Restarting Documentation (TRD) Release.
@@@ -61,6 -56,7 +61,7 @@@ SMPI
  Java:
   - Due to an internal bug, Msg.run() must now be your last line.
     We hope to fix it in a future release, and we are sorry for the inconvenience.
+  - Expose host load plugin (i.e. loadInit, getCurrentLoad, getComputedFlops,getAvgLoad)
  
  Fixed bugs:
   - #22: Process autorestart seem to only work with CAS01 cpus 
diff --combined include/simgrid/msg.h
index a62ed6facb,9f103aecdc..7db7b0492b
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@@ -115,6 -115,7 +115,7 @@@ XBT_PUBLIC void MSG_host_get_process_li
  
  /** @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;
@@@ -236,7 -237,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 ! */
@@@ -249,6 -252,7 +250,6 @@@
        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