Merge pull request #315 from simgrid/smpirun-replay

replay from smpirun (without a dedicated replayer program)

diff --git a/.gitignore b/.gitignore
index a3295e5..f1d7590 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -114,11 +114,6 @@ tags
 callgrind.out.*
 ### Examples and traces
 *.exe
-doc/tuto-msg/masterworker
-doc/tuto-msg/masterworker-sol1
-doc/tuto-msg/masterworker-sol2
-doc/tuto-msg/masterworker-sol3
-doc/tuto-msg/masterworker-sol4
 examples/msg/app-masterworker/app-masterworker
 examples/msg/cloud-masterworker/cloud-masterworker
 examples/msg/dht-kademlia/dht-kademlia

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 9e19c0b..e9de18f 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -660,7 +660,6 @@ INPUT                  = @CMAKE_HOME_DIRECTORY@/doc/doxygen/index.doc \
                          @CMAKE_HOME_DIRECTORY@/doc/doxygen/outcomes_logs.doc \
                          @CMAKE_HOME_DIRECTORY@/doc/doxygen/outcomes_vizu.doc \
                          @CMAKE_HOME_DIRECTORY@/doc/doxygen/outcomes_MC.doc \
-                         @CMAKE_HOME_DIRECTORY@/doc/tuto-msg/tuto-msg.doc \
                          @CMAKE_HOME_DIRECTORY@/doc/doxygen/tutorial_smpi.doc \
                          @CMAKE_HOME_DIRECTORY@/doc/doxygen/examples.doc \
                          @CMAKE_HOME_DIRECTORY@/doc/doxygen/howtos.doc \
@@ -770,8 +769,7 @@ EXAMPLE_PATH           = ./ \
                          @CMAKE_HOME_DIRECTORY@/src/xbt/ \
                          @CMAKE_HOME_DIRECTORY@/include \
                          @CMAKE_HOME_DIRECTORY@/examples \
-                         @CMAKE_BINARY_DIR@/doc/example_lists \
-                         @CMAKE_HOME_DIRECTORY@/doc/tuto-msg
+                         @CMAKE_BINARY_DIR@/doc/example_lists
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp

diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst
index f0b7d30..c4dbd41 100644 (file)
--- a/docs/source/app_s4u.rst
+++ b/docs/source/app_s4u.rst
@@ -394,6 +394,8 @@ s4u::Actor
 
 .. doxygentypedef:: ActorPtr
 
+.. doxygentypedef:: aid_t
+
 .. doxygenclass:: simgrid::s4u::Actor
    :members:
    :protected-members:

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 4da6084..2ebb20b 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -232,6 +232,7 @@ typedef unsigned long long sg_size_t;
  */
 typedef long long sg_offset_t;
 
+/** Actor's ID, just like the classical processes' have PID in UNIX */
 typedef long aid_t;
 
 #endif /* SIMGRID_TYPES_H */

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 61a78a0..757fadf 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -206,13 +206,9 @@ public:
   const char* get_cname() const;
   /** Retrieves the host on which that actor is running */
   s4u::Host* get_host();
-  /** Retrieves the PID of that actor
-   *
-   * aid_t is an alias for long */
+  /** Retrieves the actor ID of that actor */
   aid_t get_pid() const;
-  /** Retrieves the PPID of that actor
-   *
-   * aid_t is an alias for long */
+  /** Retrieves the actor ID of that actor's creator */
   aid_t get_ppid() const;
 
   /** Suspend an actor by suspending the task on which it was waiting for the completion. */
@@ -485,7 +481,7 @@ XBT_ATTRIB_DEPRECATED_v325("Please use std::vectors as parameters") XBT_PUBLIC
 XBT_PUBLIC ExecPtr exec_init(double flops_amounts);
 XBT_PUBLIC ExecPtr exec_async(double flops_amounts);
 
-/** @brief Returns the actor ID of the current actor). */
+/** @brief Returns the actor ID of the current actor. */
 XBT_PUBLIC aid_t get_pid();
 
 /** @brief Returns the ancestor's actor ID of the current actor. */

diff --git a/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp b/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp
index 1cbb06b..4aca6ec 100644 (file)
--- a/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp
+++ b/teshsuite/s4u/cloud-sharing/cloud-sharing.cpp
@@ -7,6 +7,7 @@
 #include "simgrid/s4u.hpp"
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/VirtualMachine.hpp"
+#include <cmath>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this msg example");
 

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index b82cfc7..06cc7a7 100644 (file)
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -5,10 +5,13 @@ default:
        @echo "   make unstable   -> build the git version of SimGrid (with SMPI, w/o MC)"
        @echo "   make tuto-s4u   -> build all what you need to take the S4U tutorial"
        @echo "   make tuto-smpi  -> build all what you need to take the SMPI tutorial"
+       @echo "   make all        -> build all but stable (ie, build-deps unstable tuto-s4u tuto-smpi)"
        @echo "   make push       -> push all images to the cloud"
        @echo "All our images are based on debian:testing"
        @echo "Also possible: DOCKER_EXTRA=--no-cache make unstable"
 
+all: build-deps unstable tuto-s4u tuto-smpi
+
 stable:
        export last_tag=`wget https://framagit.org/simgrid/simgrid/tags 2>/dev/null -O - | grep /simgrid/simgrid/tags/v | head -n1  | sed 's/[^>]*>//' | sed 's/<.*//'`; \
        export url=`wget https://framagit.org/simgrid/simgrid/tags/$${last_tag} 2>/dev/null -O - | grep SimGrid- | perl -pe 's/.*?<li><a href="//' | sed 's/tar.gz.*/tar.gz/'` ;\

diff --git a/tools/doxygen/list_routing_models_examples.sh b/tools/doxygen/list_routing_models_examples.sh
index 42e529b..a239337 100755 (executable)
--- a/tools/doxygen/list_routing_models_examples.sh
+++ b/tools/doxygen/list_routing_models_examples.sh
@@ -2,11 +2,13 @@
 
 cd $(dirname $0)/../../
 
+export LC_ALL=C
+
 # -R -- we want to search recursively
 # -l -- only filenames, nothing else
 # $1 -- argument to this script, name of the routing model (e.g., "Floyd")
 # .  -- search in the examples folder and search EVERYTHING
 # --include -- but only include results that end in ".xml"
-grep -R -l "$1" examples/ --include "*.xml"
+grep -R -l "$1" examples/ --include "*.xml" | sort
 
 exit 0