From e82dfb29054b08518732bca66c586cf0e83cf66f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 27 Nov 2017 21:21:21 +0100 Subject: [PATCH] cosmetics --- examples/s4u/CMakeLists.txt | 14 +++++++------- examples/s4u/README.doc | 6 +++--- examples/s4u/actor-yield/s4u-actor-yield.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index 3e90de1bdc..38866d4ead 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -1,7 +1,7 @@ foreach (example actions-comm actions-storage - actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority + actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority actor-yield app-masterworker app-pingpong app-token-ring - async-wait async-waitany async-waitall actor-yield + async-wait async-waitany async-waitall energy-link plugin-hostload io mutex) add_executable (s4u-${example} ${example}/s4u-${example}.cpp) @@ -33,9 +33,9 @@ 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}/actor-yield/s4u-actor-yield.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/actor-priority/s4u-actor-priority.tesh ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/actor-priority/s4u-actor-priority.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield.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 @@ -46,12 +46,12 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-a ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u-actions-storage_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-actor-create_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-priority/s4u-actor-priority_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent_d.xml ${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}/actor-yield/s4u-actor-yield_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime_d.xml PARENT_SCOPE) @@ -62,9 +62,9 @@ set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-a ${CMAKE_CURRENT_SOURCE_DIR}/README.doc PARENT_SCOPE) foreach(example actions-comm actions-storage - actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend + actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority actor-yield app-bittorrent app-masterworker app-pingpong app-token-ring - async-wait async-waitall async-waitany actor-priority actor-yield + async-wait async-waitall async-waitany dht-chord energy-link plugin-hostload io mutex) diff --git a/examples/s4u/README.doc b/examples/s4u/README.doc index f626d7ec70..6c88294972 100644 --- a/examples/s4u/README.doc +++ b/examples/s4u/README.doc @@ -103,9 +103,9 @@ documentation, but it should remain readable directly. - Yielding to other actor. @ref examples/s4u/actor-yield/s4u-actor-yield.c\n - The @ref yield function interrupts the execution of the - current actor, leaving a chance to run to the other actor - that are ready to run at the exact same timestamp + The simgrid::s4u::this_actor::yield() function interrupts the + execution of the current actor, leaving a chance to the other actors + that are ready to run at this timestamp. @section s4u_ex_synchro Inter-Actor Synchronization diff --git a/examples/s4u/actor-yield/s4u-actor-yield.cpp b/examples/s4u/actor-yield/s4u-actor-yield.cpp index 7eea17a88e..903ade338b 100644 --- a/examples/s4u/actor-yield/s4u-actor-yield.cpp +++ b/examples/s4u/actor-yield/s4u-actor-yield.cpp @@ -8,7 +8,7 @@ /* This example does not much: It just spans over-polite actor that yield a large amount * of time before ending. * -* This serves as an example for the s4u-actor-yield() function, with which an actor can request +* This serves as an example for the simgrid::s4u::this_actor::yield() function, with which an actor can request * to be rescheduled after the other actor that are ready at the current timestamp. * * It can also be used to benchmark our context-switching mechanism. -- 2.20.1