Merge branch ' master' on https://github.com/wrench-project/wrench

.travis.yml

@@ -171,13 +171,12 @@ install:
   #install LIBSODIUM
   - git clone git://github.com/jedisct1/libsodium.git
   - cd libsodium && ./autogen.sh && ./configure && make check && sudo make install
-  - sudo ldconfig
   - cd ..
 
   #install ZMQ
   - wget http://download.zeromq.org/zeromq-4.0.5.tar.gz
   - tar xvzf zeromq-4.0.5.tar.gz
-  - cd zeromq-4.0.5 && ./configure && sudo make install && sudo ldconfig && cd ..
+  - cd zeromq-4.0.5 && ./configure && sudo make install && cd ..
 
   #install CPPZMQ
   - git clone https://github.com/zeromq/cppzmq.git
@@ -189,8 +188,9 @@ install:
   - cd gmp-6.1.2/ && ./configure && make && sudo make install && cd ..
 
   #install RAPIDJSON
-  - git clone https://github.com/Tencent/rapidjson.git
-  - cd rapidjson
+  - wget https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
+  - gunzip v1.1.0.tar.gz && tar -xf v1.1.0.tar
+  - cd rapidjson-1*
   - mkdir build
   - cd build && cmake .. && make && sudo make install && cd ../../
 
@@ -251,4 +251,4 @@ notifications:
     recipients:
       - wrench@mailman.isi.edu
     on_success: change
-    on_failure: always
+    on_failure: always

CMakeLists.txt

@@ -4,6 +4,9 @@ message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CM
 project(wrench CXX)
 
 add_definitions("-Wall -Wno-unused-variable -Wno-unused-private-field")
+if (ENABLE_BATSCHED)
+    add_definitions(-DENABLE_BATSCHED)
+endif()
 
 set(CMAKE_CXX_STANDARD 11)
 
@@ -71,7 +74,7 @@ set(HEADER_FILES
         include/wrench/services/file_registry/FileRegistryServiceProperty.h
         include/wrench/services/network_proximity/NetworkProximityService.h
         include/wrench/services/network_proximity/NetworkProximityServiceProperty.h
-        include/wrench/services/network_proximity/NetworkDaemons.h
+        include/wrench/services/network_proximity/NetworkProximityDaemon.h
         include/wrench/simulation/Simulation.h
         include/wrench/simulation/SimulationTimestampTypes.h
         include/wrench/simulation/SimulationOutput.h
@@ -88,6 +91,8 @@ set(HEADER_FILES
         include/wrench/util/WorkflowUtil.h
         include/wrench/services/helpers/Alarm.h
         include/wrench/util/PointerUtil.h
+        include/wrench/util/MessageManager.h
+        include/wrench/util/TraceFileLoader.h
         )
 
 # source files
@@ -157,7 +162,7 @@ set(SOURCE_FILES
         src/wrench/services/network_proximity/NetworkProximityServiceProperty.cpp
         src/wrench/services/network_proximity/NetworkProximityMessage.cpp
         src/wrench/services/network_proximity/NetworkProximityMessage.h
-        src/wrench/services/network_proximity/NetworkDaemons.cpp
+        src/wrench/services/network_proximity/NetworkProximityDaemon.cpp
         src/wrench/services/compute/batch/BatchJob.cpp
         src/wrench/services/compute/batch/BatchServiceMessage.cpp
         src/wrench/services/compute/batch/BatchService.cpp
@@ -167,6 +172,8 @@ set(SOURCE_FILES
         src/wrench/util/WorkflowUtil.cpp
         src/wrench/services/helpers/Alarm.cpp
         src/wrench/util/PointerUtil.cpp
+        src/wrench/util/MessageManager.cpp
+        src/wrench/util/TraceFileLoader.cpp
         )
 
 # test files
@@ -188,8 +195,7 @@ set(TEST_FILES
         test/simulation/BatchServiceTest.cpp
         test/simulation/CloudServiceTest.cpp
         test/simulation/NoopScheduler.cpp
-        test/simulation/NoopScheduler.h
-        )
+        test/simulation/NoopScheduler.h)
 
 # wrench library
 find_library(SIMGRID_LIBRARY NAMES simgrid)
@@ -206,7 +212,13 @@ install(DIRECTORY include/ DESTINATION include)
 
 # generate unit tests
 add_executable(unit_tests EXCLUDE_FROM_ALL ${SOURCE_FILES} ${HEADER_FILES} ${TEST_FILES})
-target_link_libraries(unit_tests ${GTEST_LIBRARY} wrench -lpthread -lm -lzmq)
+if (ENABLE_BATSCHED)
+    target_link_libraries(unit_tests ${GTEST_LIBRARY} wrench -lpthread -lm -lzmq)
+else()
+    target_link_libraries(unit_tests ${GTEST_LIBRARY} wrench -lpthread -lm)
+endif()
+
+
 set_target_properties(unit_tests PROPERTIES COMPILE_FLAGS "-g -O0 --coverage")
 set_target_properties(unit_tests PROPERTIES LINK_FLAGS "--coverage")
 add_custom_command(TARGET unit_tests COMMAND find . -name *.gcda -delete)

README.md

@@ -36,6 +36,8 @@ And, one of the following:
 - [Google Test](https://github.com/google/googletest) - version 1.8 or higher (only required for running test cases)
 - [Doxygen](http://www.doxygen.org) - version 1.8 or higher (only required for generating documentation)
 
+- [Batsched](https://gitlab.inria.fr/batsim/batsched) -- only needed for batch-scheduled resource simulation
+
 
 ## Building From Source
 
@@ -47,6 +49,14 @@ make
 make install  # try "sudo make install" if you don't have the permission to write
 ```
 
+For enabling the use of Batsched:
+```bash
+cmake -DENABLE_BATSCHED=on .
+make
+make install  # try "sudo make install" if you don't have the permission to write
+```
+
+
 ## Get in Touch
 
 The main channel to reach the WRENCH team is via the support email: 

doc/install.md

@@ -29,6 +29,9 @@ And, one of the following:
 - [Google Test](https://github.com/google/googletest) - version 1.8 or higher (only required for running test cases)
 - [Doxygen](http://www.doxygen.org) - version 1.8 or higher (only required for generating documentation)
 
+- [Batsched](https://gitlab.inria.fr/batsim/batsched) -- only needed for batch-scheduled resource simulation
+
+
 
 # Source Install #                  {#install-source}
 
@@ -46,13 +49,22 @@ make
 make install # try "sudo make install" if you don't have the permission to write
 ~~~~~~~~~~~~~
 
+To enable the use of Batsched (provided you have installed that package, see above):
+~~~~~~~~~~~~~{.sh}
+cmake -DENABLE_BATSCHED .
+~~~~~~~~~~~~~
+
+
+
 If you want to stay on the bleeding edge, you should get the latest git version, and recompile it as you would do for an official archive:
 
 ~~~~~~~~~~~~~{.sh}
 git clone https://github.com/wrench-project/wrench
 ~~~~~~~~~~~~~
 
 
+
+
 ## Existing Compilation Targets ##  {#install-source-targets}
 
 In most cases, compiling and installing WRENCH is enough:

doc/layout/jquery.smartmenus.js

@@ -895,7 +895,7 @@
 					// neglect event if we touched a visible deeper level sub menu
 					if (this.getClosestMenu(touchPoint.target) == $sub[0]) {
 						var data = $sub.dataSM('scroll');
-						if (/(start|down)$/i.test(e.type)) {
+						if (/(start_daemon|down)$/i.test(e.type)) {
 							if (this.menuScrollStop($sub)) {
 								// if we were scrolling, just stop and don't activate any link on the first touch
 								e.preventDefault();

examples/simple-wms/CMakeLists.txt

@@ -24,11 +24,19 @@ set(SOURCE_FILES
 # cloud example
 set(APP_CLOUD_FILES SimpleWMSCloud.cpp)
 add_executable(wrench-simple-wms-cloud ${SOURCE_FILES} ${APP_CLOUD_FILES})
-target_link_libraries(wrench-simple-wms-cloud wrench ${SIMGRID_LIBRARY} ${PUGIXML_LIBRARY} ${LEMON_LIBRARY} -lzmq)
+if (ENABLE_BATSCHED)
+    target_link_libraries(wrench-simple-wms-cloud wrench ${SIMGRID_LIBRARY} ${PUGIXML_LIBRARY} ${LEMON_LIBRARY} -lzmq)
+else()
+    target_link_libraries(wrench-simple-wms-cloud wrench ${SIMGRID_LIBRARY} ${PUGIXML_LIBRARY} ${LEMON_LIBRARY})
+endif()
 install(TARGETS wrench-simple-wms-cloud DESTINATION bin)
 
 # batch example
 set(APP_BATCH_FILES SimpleWMSBatch.cpp)
 add_executable(wrench-simple-wms-batch ${SOURCE_FILES} ${APP_BATCH_FILES})
-target_link_libraries(wrench-simple-wms-batch wrench ${SIMGRID_LIBRARY} ${PUGIXML_LIBRARY} ${LEMON_LIBRARY} -lzmq)
+if (ENABLE_BATSCHED)
+    target_link_libraries(wrench-simple-wms-batch wrench ${SIMGRID_LIBRARY} ${PUGIXML_LIBRARY} ${LEMON_LIBRARY} -lzmq)
+else()
+    target_link_libraries(wrench-simple-wms-batch wrench ${SIMGRID_LIBRARY} ${PUGIXML_LIBRARY} ${LEMON_LIBRARY})
+endif()
 install(TARGETS wrench-simple-wms-batch DESTINATION bin)

include/wrench/services/Service.h

@@ -38,6 +38,8 @@ namespace wrench {
             DOWN,
         };
 
+        virtual void start();
+
         virtual void stop();
 
         std::string getHostname();
@@ -72,7 +74,7 @@ namespace wrench {
 
         friend class Simulation;
 
-        Service(std::string process_name_prefix, std::string mailbox_name_prefix);
+        Service(std::string hostname, std::string process_name_prefix, std::string mailbox_name_prefix);
 
         // Property stuff
         void setProperty(std::string, std::string);

include/wrench/services/compute/ComputeService.h

@@ -78,7 +78,8 @@ namespace wrench {
 
         virtual void terminatePilotJob(PilotJob *job);
 
-        ComputeService(std::string service_name,
+        ComputeService(std::string hostname,
+                       std::string service_name,
                        std::string mailbox_name_prefix,
                        bool supports_standard_jobs,
                        bool supports_pilot_jobs,