-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})
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()
--- /dev/null
+/* 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 <boost/algorithm/string/join.hpp>
+#include <xbt/replay.hpp>
+#include <xbt/str.h>
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(storage_actions, "Messages specific for this example");
+
+static std::unordered_map<std::string, simgrid::s4u::File*> 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<std::string> 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<Replayer>("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;
+}
