X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f7e9bf9cd6ea2c2cfb9246613c03d667d66fd79..a182030b5a8c0db05a1de18ca230b61e76363ebc:/src/msg/msg_actions.c

diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c
index f2b1e812a7..58f96b0ebc 100644
--- a/src/msg/msg_actions.c
+++ b/src/msg/msg_actions.c
@@ -3,13 +3,22 @@
 /* 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 "xbt/str.h"
 #include "xbt/dynar.h"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action,msg,"MSG actions for trace driven simulation");
+
 static xbt_dict_t action_funs;
-static xbt_dynar_t action_list;
+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
  * \brief Registers a function to handle a kind of action
@@ -22,74 +31,171 @@ static xbt_dynar_t action_list;
  * \param name the reference name of the action.
  * \param code the function; prototype given by the type: void...(xbt_dynar_t action)
  */
-void MSG_action_register(const char*action_name, msg_action_fun function) {
-	xbt_dict_set(action_funs,action_name,function,NULL);
+void MSG_action_register(const char *action_name, msg_action_fun function)
+{
+  xbt_dict_set(action_funs, action_name, function, NULL);
 }
+
 /** \ingroup msg_actions
  * \brief Unregisters a function, which handled a kind of action
  *
  * \param name the reference name of the action.
  */
-void MSG_action_unregister(const char*action_name) {
-	xbt_dict_remove(action_funs,action_name);
+void MSG_action_unregister(const char *action_name)
+{
+  xbt_dict_remove(action_funs, action_name);
 }
 
-static int MSG_action_runner(int argc, char* argv[]) {
-	xbt_dynar_t evt;
-	unsigned int cursor;
+static int MSG_action_runner(int argc, char *argv[]) {
+  xbt_dynar_t evt=NULL;
+  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);
+    }
+  } else { // Should have got my trace file in argument
+    xbt_assert0(argc>=2,
+          "No simulation-wide trace file provided to MSG_action_trace_run(), "
+          "and no process-wide trace file provided in deployment file. Aborting."
+    );
+
+    char *line = NULL;
+    size_t line_len = 0;
+    FILE *fp = fopen(argv[1], "r");
+    xbt_assert2(fp != NULL, "Cannot open %s: %s", argv[1], strerror(errno));
 
-	xbt_dynar_foreach(action_list,cursor,evt) {
-		if (!strcmp(xbt_dynar_get_as(evt,0,char*),argv[0])) {
-			msg_action_fun function = xbt_dict_get(action_funs,xbt_dynar_get_as(evt,1,char*));
-			(*function)(evt);
-		}
-	}
+    ssize_t read;
+    // 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
+      char *comment = strchr(line, '#');
+      if (comment != NULL)
+        *comment = '\0';
+      xbt_str_trim(line, NULL);
+      if (line[0] == '\0')
+        continue;
+      evt = xbt_str_split_quoted(line);
+
+      char *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);
+    }
 
-	return 0;
+  }
+  return 0;
 }
 
-void _MSG_action_init() {
-	action_funs = xbt_dict_new();
-	action_list = xbt_dynar_new(sizeof(xbt_dynar_t),xbt_dynar_free_voidp);
-	MSG_function_register_default(MSG_action_runner);
+void _MSG_action_init()
+{
+  action_funs = xbt_dict_new();
+  action_queues = xbt_dict_new();
+  MSG_function_register_default(MSG_action_runner);
 }
 
-/** \ingroup msg_actions
- * \brief A trace loader
- *
- *  Load a trace file containing actions, and execute them.
- */
-MSG_error_t MSG_action_trace_run(char*path) {
-	MSG_error_t res;
+void _MSG_action_exit() {
+  xbt_dict_free(&action_queues);
+  xbt_dict_free(&action_funs);
+}
 
-    FILE * fp;
-    char * line = NULL;
-    size_t len = 0;
-    ssize_t read;
 
-    xbt_dynar_t evt;
+static xbt_dynar_t action_get_action(char *name) {
+  ssize_t read;
+  xbt_dynar_t evt=NULL;
+
 
-    fp = fopen(path, "r");
-    xbt_assert2(fp != NULL,"Cannot open %s: %s",path,strerror(errno));
+  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
 
-    while ((read = getline(&line, &len, fp)) != -1) {
-    	char *comment = strchr(line,'#');
-    	if (comment!=NULL)
-    		*comment='\0';
-    	xbt_str_trim(line,NULL);
-    	if (line[0]=='\0')
-    		continue;
-    	evt = xbt_str_split_quoted(line);
-    	xbt_dynar_push(action_list,&evt);
+    if (action_fp==NULL) { // File closed now. There's nothing more to read. I'm out of here
+      goto todo_done;
     }
 
-    if (line)
-        free(line);
-    fclose(fp);
+    // 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, '#');
+      if (comment != NULL)
+        *comment = '\0';
+      xbt_str_trim(action_line, NULL);
+      if (action_line[0] == '\0')
+        continue;
+      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;
+      } 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_push(otherqueue,&evt);
+      }
+    }
+    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;
+  }
+
+
+  // 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
+ *
+ *  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;
+
+  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;
+
+    xbt_dict_foreach(action_queues,cursor,name,todo) {
+      WARN2("Still %lu actions for %s",xbt_dynar_length(todo),name);
+    }
+  }
 
-	res = MSG_main();
-	xbt_dynar_free(&action_list);
-	action_list = xbt_dynar_new(sizeof(xbt_dynar_t),xbt_dynar_free_voidp);
+  if (action_line)
+    free(action_line);
+  if (path)
+    fclose(action_fp);
+  xbt_dict_free(&action_queues);
+  action_queues = xbt_dict_new();
 
-	return res;
+  return res;
 }