/* 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"
while ((evt = action_get_action(argv[0]))) {
msg_action_fun function = xbt_dict_get(action_funs, evt[1]);
- (*function) (evt);
+ 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]
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);
+ function(evt);
free(evt);
} else {
- WARN1("%s: Ignore trace element not for me",
+ XBT_WARN("%s: Ignore trace element not for me",
xbt_replay_trace_reader_position(reader));
}
}
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);
}
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;
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;
}