X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6c509ce8004986a1cb97b1a59db92f0eb4d6c28..0941c6f37ed53034c8310f0f318cb844b2f113a1:/src/msg/msg_actions.c diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c index f5427481ee..aab6aaac45 100644 --- a/src/msg/msg_actions.c +++ b/src/msg/msg_actions.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2009 The SimGrid team. All rights reserved. */ +/* Copyright (c) 2009, 2010. 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. */ @@ -8,11 +9,25 @@ #include "xbt/str.h" #include "xbt/dynar.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action,msg,"MSG actions for trace driven simulation"); +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; +/* To split the file if a unique one is given (specific variable for the other case live in runner()) */ +static FILE *action_fp = NULL; +static char *action_line = NULL; +static size_t action_len = 0; + static xbt_dynar_t action_get_action(char *name); /** \ingroup msg_actions @@ -43,15 +58,61 @@ void MSG_action_unregister(const char *action_name) static int MSG_action_runner(int argc, char *argv[]) { - xbt_dynar_t evt=NULL; + 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; + 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); - } + 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); + } + } else { // Should have got my trace file in argument + xbt_assert1(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); + } else { + WARN1("Ignore trace element not for me: %s", + xbt_str_join(evt, " ")); + } + xbt_dynar_free(&evt); + } + fclose(fp); + + } return 0; } @@ -62,28 +123,27 @@ void _MSG_action_init() MSG_function_register_default(MSG_action_runner); } -void _MSG_action_exit() { +void _MSG_action_exit() +{ xbt_dict_free(&action_queues); xbt_dict_free(&action_funs); } -static FILE *action_fp=NULL; -static char *action_line = NULL; -static size_t action_len = 0; -static xbt_dynar_t action_get_action(char *name) { +static xbt_dynar_t action_get_action(char *name) +{ ssize_t read; - xbt_dynar_t evt=NULL; - + 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 + 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 (action_fp==NULL) { // File closed now. There's nothing more to read. I'm out of here + 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 + // 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) { // cleanup and split the string I just read char *comment = strchr(action_line, '#'); @@ -92,34 +152,40 @@ static xbt_dynar_t action_get_action(char *name) { xbt_str_trim(action_line, NULL); 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 - char *evtname = xbt_dynar_get_as(evt, 0, char *); - if (!strcmp(name,evtname)) { + evtname = xbt_dynar_get_as(evt, 0, char *); + if (!strcmp(name, evtname)) { return evt; } else { // Else, I have to store it for the relevant colleague - xbt_dynar_t otherqueue = xbt_dict_get_or_null(action_queues,evtname); - if (otherqueue == NULL) { // Damn. Create the queue of that guy - otherqueue = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp); - xbt_dict_set(action_queues ,evtname, otherqueue, NULL); + xbt_dynar_t otherqueue = + xbt_dict_get_or_null(action_queues, evtname); + if (otherqueue == NULL) { // Damn. Create the queue of that guy + otherqueue = + xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp); + xbt_dict_set(action_queues, evtname, otherqueue, NULL); } - xbt_dynar_push(otherqueue,&evt); + xbt_dynar_push(otherqueue, &evt); } } - goto todo_done; // end of file reached in vain while searching for more work + goto todo_done; // 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); + xbt_dynar_shift(myqueue, &evt); return evt; } - todo_done: // I did all my actions for me in the file. cleanup before leaving + // I did all my actions for me in the file (either I closed the file, or a colleague did) + // Let's cleanup before leaving +todo_done: if (myqueue != NULL) { xbt_dynar_free(&myqueue); - xbt_dict_remove(action_queues,name); + xbt_dict_remove(action_queues, name); } return NULL; } @@ -127,31 +193,37 @@ static xbt_dynar_t action_get_action(char *name) { /** \ingroup msg_actions * \brief A trace loader * - * Load a trace file containing actions, and execute them. + * If path!=NULL, load a trace file containing actions, and execute them. + * Else, assume that each process gets the path in its deployment file */ MSG_error_t MSG_action_trace_run(char *path) { MSG_error_t res; - - action_fp = fopen(path, "r"); - xbt_assert2(action_fp != NULL, "Cannot open %s: %s", path, strerror(errno)); - + char *name; + xbt_dynar_t todo; + xbt_dict_cursor_t cursor; + + if (path) { + action_fp = fopen(path, "r"); + xbt_assert2(action_fp != NULL, "Cannot open %s: %s", path, + strerror(errno)); + } res = MSG_main(); if (xbt_dict_size(action_queues)) { - WARN0("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_cursor_t cursor; - char *name; - xbt_dynar_t todo; + WARN0 + ("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_dict_foreach(action_queues, cursor, name, todo) { + WARN2("Still %lu actions for %s", xbt_dynar_length(todo), name); } } if (action_line) free(action_line); - fclose(action_fp); + if (path) + fclose(action_fp); xbt_dict_free(&action_queues); action_queues = xbt_dict_new();