From 3922ecf35babad02cc4ad9d5ad3a7fcb4e7eeabd Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 27 Nov 2017 21:28:40 +0100 Subject: [PATCH 1/1] move examples/msg/process-yield to teshsuite --- examples/msg/CMakeLists.txt | 6 +++--- examples/msg/README.doc | 7 ------- teshsuite/msg/CMakeLists.txt | 10 +++++++--- .../msg/process-yield/process-yield.c | 0 .../msg/process-yield/process-yield.tesh | 0 .../msg/process-yield/process-yield_d.xml | 0 6 files changed, 10 insertions(+), 13 deletions(-) rename {examples => teshsuite}/msg/process-yield/process-yield.c (100%) rename {examples => teshsuite}/msg/process-yield/process-yield.tesh (100%) rename {examples => teshsuite}/msg/process-yield/process-yield_d.xml (100%) diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index af786dcfc5..d55fb5c7ea 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -4,7 +4,7 @@ foreach(x app-masterworker app-pingpong app-token-ring async-wait async-waitall dht-pastry energy-consumption energy-onoff energy-pstate energy-ptask energy-vm platform-failures io-file io-remote io-storage task-priority plugin-hostload - process-create process-daemon process-join process-kill process-migration process-suspend process-yield + process-create process-daemon process-join process-kill process-migration process-suspend platform-properties process-startkilltime synchro-semaphore trace-categories trace-route-user-variables trace-link-user-variables trace-masterworker trace-platform trace-process-migration trace-host-user-variables) @@ -45,7 +45,7 @@ foreach (file answer dht-kademlia node routing_table task) endforeach() foreach (file app-chainsend app-masterworker app-pingpong async-wait - async-waitall async-waitany dht-kademlia dht-pastry io-remote platform-properties process-yield + async-waitall async-waitany dht-kademlia dht-pastry io-remote platform-properties task-priority) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml) endforeach() @@ -83,7 +83,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/a foreach(x app-chainsend app-masterworker app-pingpong app-token-ring async-wait async-waitall async-waitany cloud-capping cloud-masterworker cloud-migration cloud-simple cloud-two-tasks dht-pastry dht-kademlia platform-failures io-file io-remote io-storage task-priority - process-create process-daemon process-join process-kill process-migration process-startkilltime process-suspend process-yield + process-create process-daemon process-join process-kill process-migration process-startkilltime process-suspend platform-properties synchro-semaphore) ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh) endforeach() diff --git a/examples/msg/README.doc b/examples/msg/README.doc index 63afa511bc..42597dd873 100644 --- a/examples/msg/README.doc +++ b/examples/msg/README.doc @@ -84,12 +84,6 @@ shipped in the archive: @ref examples/msg/process-migration/process-migration.c \n Processes can move or be moved from a host to another with the @ref MSG_process_migrate function. - - Yielding to other processes. - @ref examples/msg/process-yield/process-yield.c\n - The @ref MSG_process_yield function interrupts the execution of the - current process, leaving a chance to run to the other processes - that are ready to run at the exact same timestamp - - Controling the process life cycle from the XML. @ref examples/msg/process-startkilltime/process-startkilltime.c \n You can specify a start time and a kill time in the deployment @@ -235,7 +229,6 @@ top of the example file). @example examples/msg/async-wait/async-wait.c @example examples/msg/async-waitall/async-waitall.c @example examples/msg/async-waitany/async-waitany.c -@example examples/msg/async-yield/async-yield.c @example examples/msg/process-create/process-create.c @example examples/msg/process-suspend/process-suspend.c diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index 0556ec3706..c52f14fa86 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -1,5 +1,6 @@ # C examples -foreach(x actions-comm actions-storage cloud-sharing get_sender host_on_off host_on_off_recv host_on_off_processes +foreach(x actions-comm actions-storage cloud-sharing get_sender host_on_off host_on_off_recv host_on_off_processes + process-yield trace_integration) add_executable (${x} ${x}/${x}.c) target_link_libraries(${x} simgrid) @@ -38,7 +39,8 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/acti ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/actions-comm_split_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/actions-storage_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/app-bittorrent_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/process-yield/process-yield_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.5-hbp1.5.xml ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s0-c0s1.xml @@ -52,7 +54,9 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/acti ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp2.5-hbp1.5.xml PARENT_SCOPE) foreach(x get_sender host_on_off host_on_off_processes host_on_off_recv - task_destroy_cancel task_listen_from task_progress trace_integration) + task_destroy_cancel task_listen_from task_progress + process-yield + trace_integration) ADD_TESH_FACTORIES(tesh-msg-${x} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/${x} --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/${x} ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/${x}/${x}.tesh) endforeach() diff --git a/examples/msg/process-yield/process-yield.c b/teshsuite/msg/process-yield/process-yield.c similarity index 100% rename from examples/msg/process-yield/process-yield.c rename to teshsuite/msg/process-yield/process-yield.c diff --git a/examples/msg/process-yield/process-yield.tesh b/teshsuite/msg/process-yield/process-yield.tesh similarity index 100% rename from examples/msg/process-yield/process-yield.tesh rename to teshsuite/msg/process-yield/process-yield.tesh diff --git a/examples/msg/process-yield/process-yield_d.xml b/teshsuite/msg/process-yield/process-yield_d.xml similarity index 100% rename from examples/msg/process-yield/process-yield_d.xml rename to teshsuite/msg/process-yield/process-yield_d.xml -- 2.20.1