"Messages specific for this msg example");
int communicator_size = 0;
-static void action_Isend(xbt_dynar_t action);
+static void action_Isend(char*const* action);
typedef struct {
int last_Irecv_sender_id;
}
/* My actions */
-static void action_send(xbt_dynar_t action)
+static void action_send(char*const* action)
{
char *name = NULL;
char to[250];
- char *size_str = xbt_dynar_get_as(action, 3, char *);
+ const char *size_str = action[3];
double size=parse_double(size_str);
double clock = MSG_get_clock(); /* this "call" is free thanks to inlining */
- sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),
- xbt_dynar_get_as(action, 2, char *));
- // char *to = xbt_dynar_get_as(action, 2, char *);
+ sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),action[2]);
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- name = xbt_str_join(action, " ");
+ name = xbt_str_join_array(action, " ");
#ifdef HAVE_TRACING
int rank = get_rank(MSG_process_get_name(MSG_process_self()));
asynchronous_cleanup();
}
-static void action_Isend(xbt_dynar_t action)
+static void action_Isend(char*const* action)
{
char to[250];
- // char *to = xbt_dynar_get_as(action, 2, char *);
- char *size = xbt_dynar_get_as(action, 3, char *);
+ const char *size = action[3];
double clock = MSG_get_clock();
process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
- sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),
- xbt_dynar_get_as(action, 2, char *));
-
+ sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),action[2]);
msg_comm_t comm =
MSG_task_isend( MSG_task_create(to,0,parse_double(size),NULL), to);
xbt_dynar_push(globals->isends,&comm);
DEBUG1("Isend on %s", MSG_process_get_name(MSG_process_self()));
- VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock);
+ VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
asynchronous_cleanup();
}
-static void action_recv(xbt_dynar_t action)
+static void action_recv(char*const* action)
{
char *name = NULL;
char mailbox_name[250];
m_task_t task = NULL;
double clock = MSG_get_clock();
- sprintf(mailbox_name, "%s_%s", xbt_dynar_get_as(action, 2, char *),
+ sprintf(mailbox_name, "%s_%s", action[2],
MSG_process_get_name(MSG_process_self()));
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- name = xbt_str_join(action, " ");
+ name = xbt_str_join_array(action, " ");
#ifdef HAVE_TRACING
int rank = get_rank(MSG_process_get_name(MSG_process_self()));
asynchronous_cleanup();
}
-static void action_Irecv(xbt_dynar_t action)
+static void action_Irecv(char*const* action)
{
char mailbox[250];
double clock = MSG_get_clock();
TRACE_smpi_ptp_in(rank, src_traced, rank, "Irecv");
#endif
- sprintf(mailbox, "%s_%s", xbt_dynar_get_as(action, 2, char *),
+ sprintf(mailbox, "%s_%s", action[2],
MSG_process_get_name(MSG_process_self()));
m_task_t t=NULL;
xbt_dynar_push(globals->tasks,&t);
mailbox);
xbt_dynar_push(globals->irecvs,&c);
- VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock);
+ VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, src_traced, rank, "Irecv");
}
-static void action_wait(xbt_dynar_t action)
+static void action_wait(char*const* action)
{
char *name = NULL;
m_task_t task = NULL;
process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
xbt_assert1(xbt_dynar_length(globals->irecvs),
- "action wait not preceeded by any irecv: %s", xbt_str_join(action," "));
+ "action wait not preceded by any irecv: %s", xbt_str_join_array(action," "));
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- name = xbt_str_join(action, " ");
+ name = xbt_str_join_array(action, " ");
#ifdef HAVE_TRACING
process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
int src_traced = counters->last_Irecv_sender_id;
}
/* FIXME: that's a poor man's implementation: we should take the message exchanges into account */
-static void action_barrier(xbt_dynar_t action)
+static void action_barrier(char*const* action)
{
char *name = NULL;
static smx_mutex_t mutex = NULL;
static int processes_arrived_sofar=0;
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- name = xbt_str_join(action, " ");
+ name = xbt_str_join_array(action, " ");
if (mutex == NULL) { // first arriving on the barrier
mutex = SIMIX_req_mutex_init();
}
-static void action_reduce(xbt_dynar_t action)
+static void action_reduce(char*const* action)
{
int i;
char *reduce_identifier;
char mailbox[80];
- double comm_size = parse_double(xbt_dynar_get_as(action, 2, char *));
- double comp_size = parse_double(xbt_dynar_get_as(action, 3, char *));
+ double comm_size = parse_double(action[2]);
+ double comp_size = parse_double(action[3]);
m_task_t comp_task = NULL;
const char *process_name;
double clock = MSG_get_clock();
mailbox);
}
- VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock);
+ VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
free(reduce_identifier);
}
-static void action_bcast(xbt_dynar_t action)
+static void action_bcast(char*const* action)
{
int i;
char *bcast_identifier;
char mailbox[80];
- double comm_size = parse_double(xbt_dynar_get_as(action, 2, char *));
+ double comm_size = parse_double(action[2]);
m_task_t task = NULL;
const char *process_name;
double clock = MSG_get_clock();
DEBUG2("%s: %s has received", bcast_identifier, process_name);
}
- VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock);
+ VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
free(bcast_identifier);
}
-static void action_sleep(xbt_dynar_t action)
+static void action_sleep(char*const* action)
{
char *name = NULL;
- char *duration = xbt_dynar_get_as(action, 2, char *);
+ const char *duration = action[2];
double clock = MSG_get_clock();
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- name = xbt_str_join(action, " ");
+ name = xbt_str_join_array(action, " ");
DEBUG1("Entering %s", name);
MSG_process_sleep(parse_double(duration));
free(name);
}
-static void action_allReduce(xbt_dynar_t action) {
+static void action_allReduce(char*const* action) {
int i;
char *allreduce_identifier;
char mailbox[80];
- double comm_size = parse_double(xbt_dynar_get_as(action, 2, char *));
- double comp_size = parse_double(xbt_dynar_get_as(action, 3, char *));
+ double comm_size = parse_double(action[2]);
+ double comp_size = parse_double(action[3]);
m_task_t task = NULL, comp_task = NULL;
const char *process_name;
double clock = MSG_get_clock();
DEBUG2("%s: %s has received", allreduce_identifier, process_name);
}
- VERB2("%s %f", xbt_str_join(action, " "), MSG_get_clock() - clock);
+ VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
free(allreduce_identifier);
}
-static void action_comm_size(xbt_dynar_t action)
+static void action_comm_size(char*const* action)
{
char *name = NULL;
- char *size = xbt_dynar_get_as(action, 2, char *);
+ const char *size = action[2];
double clock = MSG_get_clock();
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- name = xbt_str_join(action, " ");
+ name = xbt_str_join_array(action, " ");
communicator_size = parse_double(size);
VERB2("%s %f", name, MSG_get_clock() - clock);
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
free(name);
}
-static void action_compute(xbt_dynar_t action)
+static void action_compute(char*const* action)
{
char *name = NULL;
- char *amout = xbt_dynar_get_as(action, 2, char *);
+ const char *amout = action[2];
m_task_t task = MSG_task_create(name, parse_double(amout), 0, NULL);
double clock = MSG_get_clock();
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- name = xbt_str_join(action, " ");
+ name = xbt_str_join_array(action, " ");
DEBUG1("Entering %s", name);
MSG_task_execute(task);
MSG_task_destroy(task);
free(name);
}
-static void action_init(xbt_dynar_t action)
+static void action_init(char*const* action)
{
#ifdef HAVE_TRACING
TRACE_smpi_init(get_rank(MSG_process_get_name(MSG_process_self())));
}
-static void action_finalize(xbt_dynar_t action)
+static void action_finalize(char*const* action)
{
#ifdef HAVE_TRACING
TRACE_smpi_finalize(get_rank(MSG_process_get_name(MSG_process_self())));
#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 char*const* 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;
+ char *const*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 *));
+ msg_action_fun function = xbt_dict_get(action_funs, evt[1]);
(*function) (evt);
- xbt_dynar_free(&evt);
+ free((char**)evt);
}
} else { // Should have got my trace file in argument
xbt_assert1(argc >= 2,
"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 *));
+ 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((char**)evt);
} else {
- WARN1("Ignore trace element not for me: %s",
- xbt_str_join(evt, " "));
+ WARN1("%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;
}
}
-static xbt_dynar_t action_get_action(char *name)
+static char*const* action_get_action(char *name)
{
ssize_t read;
xbt_dynar_t evt = 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);
}