* 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 <unordered_map>
#include <vector>
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){
-/* 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 <xbt/ex.hpp>
#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 <boost/algorithm/string.hpp>
#include <ctype.h>
#include <errno.h>
#include <fstream>
+#include <queue>
+#include <unordered_map>
#include <wchar.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
namespace simgrid {
namespace xbt {
+bool is_replay_active = false;
+typedef std::vector<std::string> ReplayAction;
+
+bool replay_is_active()
+{
+ return is_replay_active;
+}
+
class ReplayReader {
std::ifstream* fs;
std::string line;
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);
free(filename_);
delete fs;
}
- bool get(std::vector<std::string>* evt);
+ bool get(ReplayAction* action);
};
-bool ReplayReader::get(std::vector<std::string>* evt)
+bool ReplayReader::get(ReplayAction* action)
{
std::getline(*fs, line);
boost::trim(line);
linenum++;
if (line.length() > 0 && line.find("#") == std::string::npos) {
- std::vector<std::string> 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<std::string, action_fun> 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
* 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;
}
/**
*/
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<std::string>* evt = new std::vector<std::string>();
+ 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]
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) {
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) {
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<simgrid::xbt::ReplayAction*>* myqueue =
+ (std::queue<simgrid::xbt::ReplayAction*>*)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<simgrid::xbt::ReplayAction*>* otherqueue =
+ (std::queue<simgrid::xbt::ReplayAction*>*)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<simgrid::xbt::ReplayAction*>();
+ 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;
