From: Frederic Suter Date: Tue, 14 Mar 2017 12:43:35 +0000 (+0100) Subject: one step further on C++ization of replay X-Git-Tag: v3_15~122 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ea2e2f84bb9c4d52951666f7f7136213483523a2 one step further on C++ization of replay still too ugly --- diff --git a/examples/msg/actions-comm/actions-comm.c b/examples/msg/actions-comm/actions-comm.c index e9888db542..9379174add 100644 --- a/examples/msg/actions-comm/actions-comm.c +++ b/examples/msg/actions-comm/actions-comm.c @@ -5,7 +5,7 @@ #include "simgrid/msg.h" #include "simgrid/simix.h" /* semaphores for the barrier */ -#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example"); int communicator_size = 0; diff --git a/examples/msg/actions-storage/actions-storage.c b/examples/msg/actions-storage/actions-storage.c index f9b6f64e33..a4e0becd77 100644 --- a/examples/msg/actions-storage/actions-storage.c +++ b/examples/msg/actions-storage/actions-storage.c @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/msg.h" -#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(storage_actions, "Messages specific for this example"); diff --git a/examples/smpi/replay/replay.c b/examples/smpi/replay/replay.c index 8ac5990c2a..ea0d438e3e 100644 --- a/examples/smpi/replay/replay.c +++ b/examples/smpi/replay/replay.c @@ -3,7 +3,7 @@ /* 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 "xbt/replay.h" +#include "xbt/replay.hpp" #include "smpi/smpi.h" /* This shows how to extend the trace format by adding a new kind of events. diff --git a/include/xbt/replay.h b/include/xbt/replay.h deleted file mode 100644 index e6bc6739f9..0000000000 --- a/include/xbt/replay.h +++ /dev/null @@ -1,40 +0,0 @@ -/* xbt/replay_reader.h -- Tools to parse a replay file */ - -/* Copyright (c) 2010, 2012-2015. 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. */ - -#ifndef XBT_REPLAY_H -#define XBT_REPLAY_H - -#include "xbt/dict.h" - -#include - -SG_BEGIN_DECL() - -typedef struct s_replay_reader *xbt_replay_reader_t; -typedef void (*action_fun) (const char *const *args); - -XBT_PUBLIC_DATA(xbt_dict_t) xbt_action_funs; -XBT_PUBLIC_DATA(xbt_dict_t) xbt_action_queues; - -/* To split the file if a unique one is given (specific variable for the other case live in runner()) */ -XBT_PUBLIC_DATA(FILE *) xbt_action_fp; - -XBT_PUBLIC(xbt_replay_reader_t) xbt_replay_reader_new(const char*filename); -XBT_PUBLIC(const char **) xbt_replay_reader_get(xbt_replay_reader_t reader); -XBT_PUBLIC(void) xbt_replay_reader_free(xbt_replay_reader_t *reader); - -XBT_PUBLIC(void) xbt_replay_action_register(const char *action_name, action_fun function); -XBT_PUBLIC(int) xbt_replay_action_runner(int argc, char *argv[]); - -XBT_PUBLIC(int) _xbt_replay_is_active(); -XBT_PUBLIC(int) _xbt_replay_action_init(); -XBT_PUBLIC(void) _xbt_replay_action_exit(); - -SG_END_DECL() - -#endif /* XBT_REPLAY_H */ diff --git a/include/xbt/replay.hpp b/include/xbt/replay.hpp new file mode 100644 index 0000000000..7b55760f71 --- /dev/null +++ b/include/xbt/replay.hpp @@ -0,0 +1,39 @@ +/* xbt/replay_reader.h -- Tools to parse a replay file */ + +/* Copyright (c) 2010, 2012-2015, 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. */ + +#ifndef XBT_REPLAY_HPP +#define XBT_REPLAY_HPP + +#include "xbt/dict.h" +#ifdef __cplusplus +#include + +namespace simgrid { +namespace xbt { +/* To split the file if a unique one is given (specific variable for the other case live in runner()) */ +XBT_PUBLIC_DATA(std::ifstream*) action_fs; +XBT_PUBLIC(bool) replay_is_active(); +} +} +#endif + +SG_BEGIN_DECL() + +typedef void (*action_fun)(const char* const* args); + +XBT_PUBLIC_DATA(xbt_dict_t) xbt_action_queues; + +XBT_PUBLIC(void) xbt_replay_action_register(const char* action_name, action_fun function); +XBT_PUBLIC(int) xbt_replay_action_runner(int argc, char* argv[]); + +XBT_PUBLIC(void) _xbt_replay_action_init(); +XBT_PUBLIC(void) _xbt_replay_action_exit(); + +SG_END_DECL() + +#endif diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp index 944d9e3d9c..6edbf1b5ea 100644 --- a/src/msg/msg_actions.cpp +++ b/src/msg/msg_actions.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/msg/msg_private.h" -#include "xbt/replay.h" +#include "xbt/replay.hpp" #include @@ -36,10 +36,8 @@ msg_error_t MSG_action_trace_run(char *path) xbt_dynar_t todo; xbt_dict_cursor_t cursor; - xbt_action_fp=nullptr; if (path) { - xbt_action_fp = fopen(path, "r"); - xbt_assert(xbt_action_fp != nullptr, "Cannot open %s: %s", path, strerror(errno)); + simgrid::xbt::action_fs = new std::ifstream(path, std::ifstream::in); } res = MSG_main(); @@ -52,8 +50,11 @@ msg_error_t MSG_action_trace_run(char *path) } } - if (path) - fclose(xbt_action_fp); + if (path) { + delete simgrid::xbt::action_fs; + simgrid::xbt::action_fs = nullptr; + } + xbt_dict_free(&xbt_action_queues); xbt_action_queues = xbt_dict_new_homogeneous(nullptr); diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp index 9ae72b3544..34065aacaf 100644 --- a/src/smpi/smpi_global.cpp +++ b/src/smpi/smpi_global.cpp @@ -14,7 +14,7 @@ #include "src/msg/msg_private.h" #include "src/simix/smx_private.h" #include "surf/surf.h" -#include "xbt/replay.h" +#include "xbt/replay.hpp" #include /* DBL_MAX */ #include @@ -212,7 +212,8 @@ bool smpi_process_get_replaying(){ int index = smpi_process_index(); if (index != MPI_UNDEFINED) return process_data[index_to_process_data[index]]->replaying; - else return (_xbt_replay_is_active() != 0); + else + return !simgrid::xbt::replay_is_active(); } int smpi_global_size() diff --git a/src/smpi/smpi_replay.cpp b/src/smpi/smpi_replay.cpp index 95e10a6e33..282eb70e7d 100644 --- a/src/smpi/smpi_replay.cpp +++ b/src/smpi/smpi_replay.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "xbt/replay.h" +#include "xbt/replay.hpp" #include #include @@ -907,33 +907,31 @@ void smpi_replay_run(int *argc, char***argv){ TRACE_smpi_collective_in(rank, -1, operation, extra); TRACE_smpi_collective_out(rank, -1, operation); xbt_free(operation); - - if (_xbt_replay_action_init()==0) { - xbt_replay_action_register("init", action_init); - xbt_replay_action_register("finalize", action_finalize); - xbt_replay_action_register("comm_size", action_comm_size); - xbt_replay_action_register("comm_split", action_comm_split); - xbt_replay_action_register("comm_dup", action_comm_dup); - xbt_replay_action_register("send", action_send); - xbt_replay_action_register("Isend", action_Isend); - xbt_replay_action_register("recv", action_recv); - xbt_replay_action_register("Irecv", action_Irecv); - xbt_replay_action_register("test", action_test); - xbt_replay_action_register("wait", action_wait); - xbt_replay_action_register("waitAll", action_waitall); - xbt_replay_action_register("barrier", action_barrier); - xbt_replay_action_register("bcast", action_bcast); - xbt_replay_action_register("reduce", action_reduce); - xbt_replay_action_register("allReduce", action_allReduce); - xbt_replay_action_register("allToAll", action_allToAll); - xbt_replay_action_register("allToAllV", action_allToAllv); - xbt_replay_action_register("gather", action_gather); - xbt_replay_action_register("gatherV", action_gatherv); - xbt_replay_action_register("allGather", action_allgather); - xbt_replay_action_register("allGatherV", action_allgatherv); - xbt_replay_action_register("reduceScatter", action_reducescatter); - xbt_replay_action_register("compute", action_compute); - } + _xbt_replay_action_init(); + xbt_replay_action_register("init", action_init); + xbt_replay_action_register("finalize", action_finalize); + xbt_replay_action_register("comm_size", action_comm_size); + xbt_replay_action_register("comm_split", action_comm_split); + xbt_replay_action_register("comm_dup", action_comm_dup); + xbt_replay_action_register("send", action_send); + xbt_replay_action_register("Isend", action_Isend); + xbt_replay_action_register("recv", action_recv); + xbt_replay_action_register("Irecv", action_Irecv); + xbt_replay_action_register("test", action_test); + xbt_replay_action_register("wait", action_wait); + xbt_replay_action_register("waitAll", action_waitall); + xbt_replay_action_register("barrier", action_barrier); + xbt_replay_action_register("bcast", action_bcast); + xbt_replay_action_register("reduce", action_reduce); + xbt_replay_action_register("allReduce", action_allReduce); + xbt_replay_action_register("allToAll", action_allToAll); + xbt_replay_action_register("allToAllV", action_allToAllv); + xbt_replay_action_register("gather", action_gather); + xbt_replay_action_register("gatherV", action_gatherv); + xbt_replay_action_register("allGather", action_allgather); + xbt_replay_action_register("allGatherV", action_allgatherv); + xbt_replay_action_register("reduceScatter", action_reducescatter); + xbt_replay_action_register("compute", action_compute); //if we have a delayed start, sleep here. if(*argc>2){ diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp index 2c93ae5d90..044a56da64 100644 --- a/src/xbt/xbt_replay.cpp +++ b/src/xbt/xbt_replay.cpp @@ -1,21 +1,22 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. +/* Copyright (c) 2010, 2012-2015, 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 #include "src/internal_config.h" -#include "xbt/sysdep.h" +#include "xbt/ex.hpp" #include "xbt/log.h" +#include "xbt/replay.hpp" #include "xbt/str.h" -#include "xbt/file.h" -#include "xbt/replay.h" +#include "xbt/sysdep.h" #include #include #include #include +#include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader"); @@ -23,6 +24,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader"); namespace simgrid { namespace xbt { +bool is_replay_active = false; +typedef std::vector ReplayAction; + +bool replay_is_active() +{ + return is_replay_active; +} + class ReplayReader { std::ifstream* fs; std::string line; @@ -31,7 +40,7 @@ public: char* filename_; int linenum = 0; - ReplayReader(const char* filename) + explicit ReplayReader(const char* filename) { filename_ = xbt_strdup(filename); fs = new std::ifstream(filename, std::ifstream::in); @@ -41,10 +50,10 @@ public: free(filename_); delete fs; } - bool get(std::vector* evt); + bool get(ReplayAction* action); }; -bool ReplayReader::get(std::vector* evt) +bool ReplayReader::get(ReplayAction* action) { std::getline(*fs, line); boost::trim(line); @@ -52,52 +61,26 @@ bool ReplayReader::get(std::vector* evt) linenum++; if (line.length() > 0 && line.find("#") == std::string::npos) { - std::vector res; - boost::split(*evt, line, boost::is_any_of(" \t"), boost::token_compress_on); + boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on); return !fs->eof(); } else { if (fs->eof()) return false; else - return this->get(evt); + return this->get(action); } } +std::ifstream* action_fs = nullptr; } } -typedef struct s_replay_reader { - FILE *fp; - char *line; - size_t line_len; - char *position; /* stable storage */ - char *filename; - int linenum; -} s_xbt_replay_reader_t; - -FILE *xbt_action_fp; +std::unordered_map xbt_action_funs; -xbt_dict_t xbt_action_funs = nullptr; xbt_dict_t xbt_action_queues = nullptr; -static char *action_line = nullptr; -static size_t action_len = 0; - -int is_replay_active = 0 ; +bool is_replay_active = false; -static char **action_get_action(char *name); - -static char *str_tolower (const char *str) -{ - char *ret = xbt_strdup (str); - int n = strlen(ret); - for (int i = 0; i < n; i++) - ret[i] = tolower (str[i]); - return ret; -} - -int _xbt_replay_is_active(){ - return is_replay_active; -} +static simgrid::xbt::ReplayAction* action_get_action(char* name); /** * \ingroup XBT_replay @@ -106,43 +89,30 @@ int _xbt_replay_is_active(){ * Registers a function to handle a kind of action * This table is then used by \ref xbt_replay_action_runner * - * The argument of the function is the line describing the action, splitted on spaces with xbt_str_split_quoted() + * The argument of the function is the line describing the action, fields separated by spaces. * * \param action_name the reference name of the action. - * \param function prototype given by the type: void...(xbt_dynar_t action) + * \param function prototype given by the type: void...(const char** action) */ void xbt_replay_action_register(const char *action_name, action_fun function) { - if (xbt_action_funs == nullptr) // If the user registers a function before the start + if (!is_replay_active) // If the user registers a function before the start _xbt_replay_action_init(); - - char* lowername = str_tolower (action_name); - xbt_dict_set(xbt_action_funs, lowername, (void*) function, nullptr); - xbt_free(lowername); + xbt_action_funs.insert({std::string(action_name), function}); } -/** @brief Initializes the replay mechanism, and returns true if (and only if) it was necessary - * - * It returns false if it was already done by another process. - */ -int _xbt_replay_action_init() +void _xbt_replay_action_init() { - if (xbt_action_funs) - return 0; - is_replay_active = 1; - xbt_action_funs = xbt_dict_new_homogeneous(nullptr); - xbt_action_queues = xbt_dict_new_homogeneous(nullptr); - return 1; + if (!is_replay_active) { + xbt_action_queues = xbt_dict_new_homogeneous(nullptr); + is_replay_active = true; + } } void _xbt_replay_action_exit() { xbt_dict_free(&xbt_action_queues); - xbt_dict_free(&xbt_action_funs); - free(action_line); xbt_action_queues = nullptr; - xbt_action_funs = nullptr; - action_line = nullptr; } /** @@ -154,27 +124,34 @@ void _xbt_replay_action_exit() */ int xbt_replay_action_runner(int argc, char *argv[]) { - if (xbt_action_fp) { // A unique trace file + if (simgrid::xbt::action_fs) { // A unique trace file while (true) { - char **evt = action_get_action(argv[0]); + simgrid::xbt::ReplayAction* evt = action_get_action(argv[0]); if (evt == nullptr) break; - char* lowername = str_tolower (evt[1]); - action_fun function = (action_fun)xbt_dict_get(xbt_action_funs, lowername); - xbt_free(lowername); + char** args = new char*[evt->size() + 1]; + int i = 0; + for (auto arg : *evt) { + args[i] = xbt_strdup(arg.c_str()); + i++; + } + args[i] = nullptr; + action_fun function = xbt_action_funs.at(evt->at(1)); + try { - function((const char **)evt); + function(args); } catch(xbt_ex& e) { xbt_die("Replay error :\n %s", e.what()); } - for (int i=0;evt[i]!= nullptr;i++) - free(evt[i]); - free(evt); + for (unsigned int j = 0; j < evt->size(); j++) + xbt_free(args[j]); + delete[] args; + delete evt; } } else { // Should have got my trace file in argument - std::vector* evt = new std::vector(); + simgrid::xbt::ReplayAction* evt = new simgrid::xbt::ReplayAction(); xbt_assert(argc >= 2, "No '%s' agent function provided, no simulation-wide trace file provided, " "and no process-wide trace file provided in deployment file. Aborting.", argv[0] @@ -182,8 +159,6 @@ int xbt_replay_action_runner(int argc, char *argv[]) simgrid::xbt::ReplayReader* reader = new simgrid::xbt::ReplayReader(argv[1]); while (reader->get(evt)) { if (evt->at(0).compare(argv[0]) == 0) { - std::string lowername = evt->at(1); - boost::algorithm::to_lower(lowername); char** args = new char*[evt->size() + 1]; int i = 0; for (auto arg : *evt) { @@ -191,7 +166,7 @@ int xbt_replay_action_runner(int argc, char *argv[]) i++; } args[i] = nullptr; - action_fun function = (action_fun)xbt_dict_get(xbt_action_funs, lowername.c_str()); + action_fun function = xbt_action_funs.at(evt->at(1)); try { function(args); } catch(xbt_ex& e) { @@ -215,57 +190,55 @@ int xbt_replay_action_runner(int argc, char *argv[]) return 0; } -static char **action_get_action(char *name) +static simgrid::xbt::ReplayAction* action_get_action(char* name) { - xbt_dynar_t evt = nullptr; - char *evtname = nullptr; + simgrid::xbt::ReplayAction* action; - xbt_dynar_t myqueue = (xbt_dynar_t) xbt_dict_get_or_null(xbt_action_queues, name); - if (myqueue == nullptr || xbt_dynar_is_empty(myqueue)) { // nothing stored for me. Read the file further - if (xbt_action_fp == nullptr) { // File closed now. There's nothing more to read. I'm out of here + std::queue* myqueue = + (std::queue*)xbt_dict_get_or_null(xbt_action_queues, name); + if (myqueue == nullptr || myqueue->empty()) { // nothing stored for me. Read the file further + if (simgrid::xbt::action_fs == nullptr) { // File closed now. There's nothing more to read. I'm out of here goto todo_done; } - // Read lines until I reach something for me (which breaks in loop body) - // or end of file reached - while (xbt_getline(&action_line, &action_len, xbt_action_fp) != -1) { + // Read lines until I reach something for me (which breaks in loop body) or end of file reached + while (!simgrid::xbt::action_fs->eof()) { + std::string action_line; + std::getline(*simgrid::xbt::action_fs, action_line); // cleanup and split the string I just read - char *comment = strchr(action_line, '#'); - if (comment != nullptr) - *comment = '\0'; - xbt_str_trim(action_line, nullptr); - if (action_line[0] == '\0') - continue; - /* we cannot split in place here because we parse&store several lines for - * the colleagues... */ - evt = xbt_str_split_quoted(action_line); - - // if it's for me, I'm done - evtname = xbt_dynar_get_as(evt, 0, char *); - if (!strcasecmp(name, evtname)) { - return (char**) xbt_dynar_to_array(evt); - } else { - // Else, I have to store it for the relevant colleague - xbt_dynar_t otherqueue = - (xbt_dynar_t) xbt_dict_get_or_null(xbt_action_queues, evtname); - if (otherqueue == nullptr) { // Damn. Create the queue of that guy - otherqueue = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp); - xbt_dict_set(xbt_action_queues, evtname, otherqueue, nullptr); + boost::trim(action_line); + if (action_line.length() > 0 && action_line.find("#") == std::string::npos) { + /* we cannot split in place here because we parse&store several lines for the colleagues... */ + action = new simgrid::xbt::ReplayAction(); + boost::split(*action, action_line, boost::is_any_of(" \t"), boost::token_compress_on); + + // if it's for me, I'm done + std::string evtname = action->front(); + if (evtname.compare(name) == 0) { + return action; + } else { + // Else, I have to store it for the relevant colleague + std::queue* otherqueue = + (std::queue*)xbt_dict_get_or_null(xbt_action_queues, evtname.c_str()); + if (otherqueue == nullptr) { // Damn. Create the queue of that guy + otherqueue = new std::queue(); + xbt_dict_set(xbt_action_queues, evtname.c_str(), otherqueue, nullptr); + } + otherqueue->push(action); } - xbt_dynar_push(otherqueue, &evt); } } // end of file reached while searching in vain for more work } else { // Get something from my queue and return it - xbt_dynar_shift(myqueue, &evt); - return (char**) xbt_dynar_to_array(evt); + action = myqueue->front(); + myqueue->pop(); + return action; } - // I did all my actions for me in the file (either I closed the file, or a colleague did) - // Let's cleanup before leaving +// All my actions in the file are done and either I or a colleague closed the file. Let's cleanup before leaving. todo_done: if (myqueue != nullptr) { - xbt_dynar_free(&myqueue); + delete myqueue; xbt_dict_remove(xbt_action_queues, name); } return nullptr; diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index ad723417a0..6217f8d80f 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -718,7 +718,7 @@ set(headers_to_install include/xbt/module.h include/xbt/parmap.h include/xbt/range.hpp - include/xbt/replay.h + include/xbt/replay.hpp include/xbt/str.h include/xbt/strbuff.h include/xbt/swag.h