From: Zitagcc <toufik.boubehziz@inria.fr>
Date: Mon, 2 Oct 2017 16:02:10 +0000 (+0200)
Subject: Merge branch 'master' into async-wait
X-Git-Tag: v3_17~48^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a001b13d7aa269a90f035f58c71778c6812b07f6?hp=-c

Merge branch 'master' into async-wait
---

a001b13d7aa269a90f035f58c71778c6812b07f6
diff --combined examples/s4u/CMakeLists.txt
index d3ce9a6a11,19857060f3..0ee6b1e500
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -1,7 -1,7 +1,7 @@@
  foreach (example actions-comm actions-storage 
                   actor-create actor-daemon actor-kill actor-migration actor-suspend 
                   app-masterworker app-pingpong app-token-ring
 -		 async-waitany async-waitall
 +		 async-wait async-waitany async-waitall
  		 plugin-hostload io mutex)
    add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
    target_link_libraries(s4u-${example}  simgrid)
@@@ -31,9 -31,7 +31,8 @@@ endforeach(
  
  set(examples_src  ${examples_src}                                                                          PARENT_SCOPE)
  set(tesh_files    ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.tesh
 +                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall.tesh         PARENT_SCOPE)
  set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split_d.xml
@@@ -44,7 -42,6 +43,7 @@@
                                    ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/s4u-app-masterworker_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall_d.xml
 +                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml                PARENT_SCOPE)
  set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split-p0.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split-p1.txt
@@@ -55,7 -52,7 +54,7 @@@
  foreach(example actions-comm actions-storage 
                  actor-create actor-daemon actor-kill actor-migration actor-suspend
                  app-bittorrent app-masterworker app-pingpong app-token-ring 
 -		async-waitall async-waitany
 +		async-wait async-waitall async-waitany
  		dht-chord plugin-hostload io mutex)
    ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example} s4u-${example}.tesh)
  endforeach()
diff --combined examples/s4u/async-waitall/s4u-async-waitall.cpp
index 332ce0ab6d,3437e4ad6f..55f645e4e1
--- a/examples/s4u/async-waitall/s4u-async-waitall.cpp
+++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp
@@@ -17,7 -17,7 +17,7 @@@
  #include <cstdlib>
  #include <iostream>
  
 -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this msg example");
 +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this s4u example");
  
  class sender {
    long messages_count;
@@@ -102,16 -102,15 +102,15 @@@ void operator()(
  
  int main(int argc, char *argv[])
  {
-   simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv);
- 
    xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]);
  
-   e->registerFunction<sender>("sender");
-   e->registerFunction<receiver>("receiver");
+   simgrid::s4u::Engine e(&argc, argv);
+   e.registerFunction<sender>("sender");
+   e.registerFunction<receiver>("receiver");
  
-   e->loadPlatform(argv[1]);
-   e->loadDeployment(argv[2]);
-   e->run();
+   e.loadPlatform(argv[1]);
+   e.loadDeployment(argv[2]);
+   e.run();
  
    return 0;
  }