X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a57d8d507653b5c412c4ac94c1634b9c0f6278e4..b8ba0bc2f48c6b9b96dfedd8fd383b941d5fdd0b:/src/msg/msg_actions.c diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c index dcb00c2433..ea4bdba612 100644 --- a/src/msg/msg_actions.c +++ b/src/msg/msg_actions.c @@ -1,17 +1,28 @@ -/* 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. */ -#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 xbt_dict_t action_funs; static xbt_dict_t action_queues; -static xbt_dynar_t action_get_action(char *name); +/* 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 const char **action_get_action(char *name); /** \ingroup msg_actions * \brief Registers a function to handle a kind of action @@ -41,47 +52,64 @@ void MSG_action_unregister(const char *action_name) static int MSG_action_runner(int argc, char *argv[]) { - xbt_dynar_t evt=NULL; + 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); + while ((evt = action_get_action(argv[0]))) { + 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_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] + ); + 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 { + XBT_WARN("%s: Ignore trace element not for me", + xbt_replay_trace_reader_position(reader)); + } + } + 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); } -void _MSG_action_exit() { +void _MSG_action_exit() +{ xbt_dict_free(&action_queues); - action_queues = xbt_dict_new(); + 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 const char **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_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 - return NULL; + 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, '#'); @@ -90,47 +118,79 @@ 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)) { - return evt; + evtname = xbt_dynar_get_as(evt, 0, char *); + if (!strcmp(name, evtname)) { + return xbt_dynar_to_array(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_free_voidp*/); + 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); } } - return NULL; // 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); - return evt; + xbt_dynar_shift(myqueue, &evt); + return xbt_dynar_to_array(evt); } + + + // 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); + } + return NULL; } /** \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; + char *name; + xbt_dynar_t todo; + xbt_dict_cursor_t cursor; + + if (path) { + action_fp = fopen(path, "r"); + xbt_assert(action_fp != NULL, "Cannot open %s: %s", path, + strerror(errno)); + } + res = MSG_main(); - action_fp = fopen(path, "r"); - xbt_assert2(action_fp != NULL, "Cannot open %s: %s", path, strerror(errno)); + 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."); - res = MSG_main(); - if (action_line) - free(action_line); - fclose(action_fp); + xbt_dict_foreach(action_queues, cursor, name, todo) { + XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name); + } + } + + free(action_line); + if (path) + fclose(action_fp); + xbt_dict_free(&action_queues); + action_queues = xbt_dict_new_homogeneous(NULL); return res; }