/* 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_config.h" /* getline */
-#include "msg/private.h"
+#include "simgrid_config.h" //For getline, keep that include first
+
+#include "msg_private.h"
#include "xbt/str.h"
#include "xbt/dynar.h"
+#include "xbt/replay_trace_reader.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg,
"MSG actions for trace driven simulation");
-static int paranoid_action_replayer=1;
-/** \ingroup msg_actions
- * \brief set the paranoid mode: true if we must check our input, false if it's well formated
- */
-void MSG_action_paranoid_mode_set(int mode) {
- paranoid_action_replayer = mode;
-}
-
static xbt_dict_t action_funs;
static xbt_dict_t action_queues;
static char *action_line = NULL;
static size_t action_len = 0;
-static xbt_dynar_t action_get_action(char *name);
+static const char **action_get_action(char *name);
/** \ingroup msg_actions
* \brief Registers a function to handle a kind of action
static int MSG_action_runner(int argc, char *argv[])
{
- xbt_dynar_t evt = NULL;
- char *line = NULL;
- size_t line_len = 0;
- FILE *fp = NULL;
- char *comment = NULL;
- char *evtname = NULL;
- ssize_t read;
+ const char **evt;
if (action_fp) { // A unique trace file
while ((evt = action_get_action(argv[0]))) {
- msg_action_fun function =
- xbt_dict_get(action_funs, xbt_dynar_get_as(evt, 1, char *));
- (*function) (evt);
- xbt_dynar_free(&evt);
+ msg_action_fun function = xbt_dict_get(action_funs, evt[1]);
+ function(evt);
+ free(evt);
}
} else { // Should have got my trace file in argument
- xbt_assert1(argc >= 2,
+ xbt_assert(argc >= 2,
"No '%s' agent function provided, no simulation-wide trace file provided to MSG_action_trace_run(), "
"and no process-wide trace file provided in deployment file. Aborting.",
argv[0]
);
-
- fp = fopen(argv[1], "r");
- xbt_assert2(fp != NULL, "Cannot open %s: %s", argv[1],
- strerror(errno));
-
- // Read lines and execute them until I reach the end of file
- while ((read = getline(&line, &line_len, fp)) != -1) {
- // cleanup and split the string I just read
- if (paranoid_action_replayer) {
- comment = strchr(line, '#');
- if (comment != NULL)
- *comment = '\0';
- xbt_str_trim(line, NULL);
- }
- evt = xbt_str_split_quoted_in_place(line);
- if (xbt_dynar_length(evt)==0) {
- xbt_dynar_free(&evt);
- continue;
- }
-
- evtname = xbt_dynar_get_as(evt, 0, char *);
- if (!strcmp(argv[0], evtname)) {
- msg_action_fun function =
- xbt_dict_get(action_funs, xbt_dynar_get_as(evt, 1, char *));
- (*function) (evt);
+ xbt_replay_trace_reader_t reader = xbt_replay_trace_reader_new(argv[1]);
+ while ((evt=xbt_replay_trace_reader_get(reader))) {
+ if (!strcmp(argv[0],evt[0])) {
+ msg_action_fun function = xbt_dict_get(action_funs, evt[1]);
+ function(evt);
+ free(evt);
} else {
- WARN1("Ignore trace element not for me: %s",
- xbt_str_join(evt, " "));
+ XBT_WARN("%s: Ignore trace element not for me",
+ xbt_replay_trace_reader_position(reader));
}
- xbt_dynar_free(&evt);
}
- fclose(fp);
-
+ xbt_replay_trace_reader_free(&reader);
}
return 0;
}
void _MSG_action_init()
{
- action_funs = xbt_dict_new();
- action_queues = xbt_dict_new();
+ action_funs = xbt_dict_new_homogeneous(NULL);
+ action_queues = xbt_dict_new_homogeneous(NULL);
MSG_function_register_default(MSG_action_runner);
}
}
-static xbt_dynar_t action_get_action(char *name)
+static const char **action_get_action(char *name)
{
- ssize_t read;
xbt_dynar_t evt = NULL;
char *evtname = NULL;
xbt_dynar_t myqueue = xbt_dict_get_or_null(action_queues, name);
- if (myqueue == NULL || xbt_dynar_length(myqueue) == 0) { // nothing stored for me. Read the file further
+ if (myqueue == NULL || xbt_dynar_is_empty(myqueue)) { // nothing stored for me. Read the file further
if (action_fp == NULL) { // 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 ((read = getline(&action_line, &action_len, action_fp)) != -1) {
+ while (getline(&action_line, &action_len, action_fp) != -1) {
// cleanup and split the string I just read
char *comment = strchr(action_line, '#');
if (comment != NULL)
// if it's for me, I'm done
evtname = xbt_dynar_get_as(evt, 0, char *);
if (!strcmp(name, evtname)) {
- return evt;
+ return xbt_dynar_to_array(evt);
} else {
// Else, I have to store it for the relevant colleague
xbt_dynar_t otherqueue =
} else {
// Get something from my queue and return it
xbt_dynar_shift(myqueue, &evt);
- return evt;
+ return xbt_dynar_to_array(evt);
}
if (path) {
action_fp = fopen(path, "r");
- xbt_assert2(action_fp != NULL, "Cannot open %s: %s", path,
+ xbt_assert(action_fp != NULL, "Cannot open %s: %s", path,
strerror(errno));
}
res = MSG_main();
- if (xbt_dict_size(action_queues)) {
- WARN0
+ if (!xbt_dict_is_empty(action_queues)) {
+ XBT_WARN
("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file.");
xbt_dict_foreach(action_queues, cursor, name, todo) {
- WARN2("Still %lu actions for %s", xbt_dynar_length(todo), name);
+ XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);
}
}
- if (action_line)
- free(action_line);
+ free(action_line);
if (path)
fclose(action_fp);
xbt_dict_free(&action_queues);
- action_queues = xbt_dict_new();
+ action_queues = xbt_dict_new_homogeneous(NULL);
return res;
}
