From: Frederic Suter Date: Mon, 20 Mar 2017 15:15:22 +0000 (+0100) Subject: convert another example to s4u X-Git-Tag: v3_15~58 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/515a9f9a38ed3abaaca49227a92f6b10f4de9b3b?hp=6b0c983e80b73eaf2f46b916ff2bc65661e7cea0 convert another example to s4u --- diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index 05e0be26c9..13d30b084c 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -1,4 +1,4 @@ -foreach (example app-masterworker app-token-ring io launching mutex actions-comm) +foreach (example app-masterworker app-token-ring io launching mutex actions-comm actions-storage) add_executable (s4u_${example} ${example}/s4u_${example}.cpp) target_link_libraries(s4u_${example} simgrid) set_target_properties(s4u_${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example}) @@ -12,12 +12,14 @@ set(tesh_files ${tesh_files} PARENT_SCO set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/launching/deployment.xml ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/s4u_app-masterworker_d.xml PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u_actions-storage_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/s4u_app-masterworker_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 ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm.txt + ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u_actions-storage.txt ${CMAKE_CURRENT_SOURCE_DIR}/README.doc PARENT_SCOPE) -foreach(example app-masterworker app-token-ring io launching mutex actions-comm) +foreach(example app-masterworker app-token-ring io launching mutex actions-comm actions-storage) 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 --git a/examples/s4u/actions-storage/s4u_actions-storage.cpp b/examples/s4u/actions-storage/s4u_actions-storage.cpp new file mode 100644 index 0000000000..0c10dedde9 --- /dev/null +++ b/examples/s4u/actions-storage/s4u_actions-storage.cpp @@ -0,0 +1,138 @@ +/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "simgrid/s4u.hpp" +#include +#include +#include + +XBT_LOG_NEW_DEFAULT_CATEGORY(storage_actions, "Messages specific for this example"); + +static std::unordered_map opened_files; + +#define ACT_DEBUG(...) \ + if (XBT_LOG_ISENABLED(storage_actions, xbt_log_priority_verbose)) { \ + char* NAME = xbt_str_join_array(action, " "); \ + XBT_DEBUG(__VA_ARGS__); \ + xbt_free(NAME); \ + } else \ + ((void)0) + +static void log_action(const char* const* action, double date) +{ + if (XBT_LOG_ISENABLED(storage_actions, xbt_log_priority_verbose)) { + char* name = xbt_str_join_array(action, " "); + XBT_VERB("%s %f", name, date); + xbt_free(name); + } +} + +static simgrid::s4u::File* get_file_descriptor(const char* file_name) +{ + std::string full_name = simgrid::s4u::this_actor::name() + ":" + file_name; + + return opened_files.at(full_name); +} + +class Replayer { +public: + explicit Replayer(std::vector args) + { + int argc; + char* argv[2]; + argv[0] = &args.at(0)[0]; + if (args.size() == 1) { + argc = 1; + } else { + argc = 2; + argv[1] = &args.at(1)[0]; + } + simgrid::xbt::replay_runner(argc, argv); + } + + void operator()() + { + // Nothing to do here + } + + /* My actions */ + static void open(const char* const* action) + { + const char* file_name = action[2]; + double clock = simgrid::s4u::Engine::getClock(); + std::string full_name = simgrid::s4u::this_actor::name() + ":" + file_name; + + ACT_DEBUG("Entering Open: %s (filename: %s)", NAME, file_name); + simgrid::s4u::File* file = new simgrid::s4u::File(file_name, NULL); + + opened_files.insert({full_name, file}); + + log_action(action, simgrid::s4u::Engine::getClock() - clock); + } + + static void read(const char* const* action) + { + const char* file_name = action[2]; + sg_size_t size = std::stoul(action[3]); + double clock = simgrid::s4u::Engine::getClock(); + + simgrid::s4u::File* file = get_file_descriptor(file_name); + + ACT_DEBUG("Entering Read: %s (size: %llu)", NAME, size); + file->read(size); + + log_action(action, simgrid::s4u::Engine::getClock() - clock); + } + + static void close(const char* const* action) + { + const char* file_name = action[2]; + double clock = simgrid::s4u::Engine::getClock(); + + simgrid::s4u::File* file = get_file_descriptor(file_name); + + ACT_DEBUG("Entering Close: %s (filename: %s)", NAME, file_name); + delete file; + + log_action(action, simgrid::s4u::Engine::getClock() - clock); + } +}; + +int main(int argc, char* argv[]) +{ + simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); + + xbt_assert(argc > 3, "Usage: %s platform_file deployment_file [action_files]\n" + "\texample: %s platform.xml deployment.xml actions # if all actions are in the same file\n" + "\t# if actions are in separate files, specified in deployment\n" + "\texample: %s platform.xml deployment.xml", + argv[0], argv[0], argv[0]); + + e->loadPlatform(argv[1]); + e->registerDefault(&simgrid::xbt::replay_runner); + e->registerFunction("p0"); + e->loadDeployment(argv[2]); + + /* Action registration */ + xbt_replay_action_register("open", Replayer::open); + xbt_replay_action_register("read", Replayer::read); + xbt_replay_action_register("close", Replayer::close); + + /* Actually do the simulation using MSG_action_trace_run */ + if (argv[3]) { + simgrid::xbt::action_fs = new std::ifstream(argv[3], std::ifstream::in); + } + + e->run(); + + if (argv[3]) { + delete simgrid::xbt::action_fs; + simgrid::xbt::action_fs = nullptr; + } + + XBT_INFO("Simulation time %g", e->getClock()); + + return 0; +} diff --git a/examples/s4u/actions-storage/s4u_actions-storage.tesh b/examples/s4u/actions-storage/s4u_actions-storage.tesh new file mode 100644 index 0000000000..9e6f09df4e --- /dev/null +++ b/examples/s4u/actions-storage/s4u_actions-storage.tesh @@ -0,0 +1,6 @@ +! output sort 19 +$ ${bindir:=.}/s4u_actions-storage --log=storage_actions.thres=verbose ${srcdir:=.}/storage/storage.xml s4u_actions-storage_d.xml s4u_actions-storage.txt "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +> [ 0.000000] (p0@denise) p0 open /home/lib/libsimgrid.so.3.6.2 0.000000 +> [ 0.063552] (p0@denise) p0 read /home/lib/libsimgrid.so.3.6.2 12710497 0.063552 +> [ 0.063552] (p0@denise) p0 close /home/lib/libsimgrid.so.3.6.2 0.000000 +> [ 0.063552] (maestro@) Simulation time 0.0635525 diff --git a/examples/s4u/actions-storage/s4u_actions-storage.txt b/examples/s4u/actions-storage/s4u_actions-storage.txt new file mode 100644 index 0000000000..cc9142a1fe --- /dev/null +++ b/examples/s4u/actions-storage/s4u_actions-storage.txt @@ -0,0 +1,3 @@ +p0 open /home/lib/libsimgrid.so.3.6.2 +p0 read /home/lib/libsimgrid.so.3.6.2 12710497 +p0 close /home/lib/libsimgrid.so.3.6.2 diff --git a/examples/s4u/actions-storage/s4u_actions-storage_d.xml b/examples/s4u/actions-storage/s4u_actions-storage_d.xml new file mode 100644 index 0000000000..d2eb6821bc --- /dev/null +++ b/examples/s4u/actions-storage/s4u_actions-storage_d.xml @@ -0,0 +1,5 @@ + + + + +