From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 21 Feb 2018 17:42:19 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3.19~181
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/697e297f282dd1c06b0848d7bcbefd087f8d8730?hp=2dcd0715d4d0b4f3e4774c36fd0207af8591e3f1

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java
index 7dc38c9e39..6c06550e87 100644
--- a/src/bindings/java/org/simgrid/msg/Process.java
+++ b/src/bindings/java/org/simgrid/msg/Process.java
@@ -107,7 +107,7 @@ public abstract class Process implements Runnable {
 	 *
 	 * @param host			Where to create the process.
 	 * @param name			The name of the process.
-	 * @param args			The arguments of main method of the process.
+	 * @param argsParam		The arguments of main method of the process.
 	 */	
 	public Process(Host host, String name, String[]argsParam) 
 	{
diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 88656c0d29..44767bcff1 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -57,7 +57,7 @@ std::set<SD_task_t>* simulate(double how_long){
     /* let's see which tasks are done */
     for (auto const& model : *all_existing_models) {
       surf_action_t action = surf_model_extract_done_action_set(model);
-      while (action != nullptr) {
+      while (action != nullptr && action->getData() != nullptr) {
         SD_task_t task = static_cast<SD_task_t>(action->getData());
         XBT_VERB("Task '%s' done", SD_task_get_name(task));
         SD_task_set_state(task, SD_DONE);
diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 369d1f78ab..6d8ca3cc7c 100644
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -156,10 +156,11 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
 }
 
 /** @brief Start a new execution on this CPU lasting @param size flops and using one core */
-CpuAction *CpuCas01::execution_start(double size)
+CpuAction* CpuCas01::execution_start(double size)
 {
   return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint());
 }
+
 CpuAction* CpuCas01::execution_start(double size, int requestedCores)
 {
   return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores);
diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 4516d98968..938c39e0ba 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -40,9 +40,9 @@ public:
   CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
   ~CpuCas01() override;
   void apply_event(tmgr_trace_event_t event, double value) override;
-  CpuAction *execution_start(double size) override;
+  CpuAction* execution_start(double size) override;
   CpuAction* execution_start(double size, int requestedCore) override;
-  CpuAction *sleep(double duration) override;
+  CpuAction* sleep(double duration) override;
 
   bool isUsed() override;
 
diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 70d128ba5a..4ae5bb8dd8 100644
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -76,8 +76,9 @@ public:
   ~CpuL07() override;
   bool isUsed() override;
   void apply_event(tmgr_trace_event_t event, double value) override;
-  Action *execution_start(double size) override;
-  Action *sleep(double duration) override;
+  Action* execution_start(double size) override;
+  Action* sleep(double duration) override;
+
 protected:
   void onSpeedChange() override;
 };