X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/702dbc47db2ffe8af2f299c49f64a04a3b8dfc30..8a9181b377af88ec561a2147e21bb158657cb0dc:/src/msg/global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index ec674e987d..0da383133a 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -325,11 +325,11 @@ MSG_error_t MSG_main(void)
   while (1) {
     xbt_context_empty_trash();
     while ((process = xbt_fifo_pop(msg_global->process_to_run))) {
-/*       fprintf(stderr,"-> %s (%d)\n",process->name, process->simdata->PID); */
       DEBUG3("Scheduling  %s(%d) on %s",	     
 	     process->name,process->simdata->PID,
 	     process->simdata->host->name);
       msg_global->current_process = process;
+      fflush(NULL);
       xbt_context_schedule(process->simdata->context);
       msg_global->current_process = NULL;
     }
@@ -350,6 +350,31 @@ MSG_error_t MSG_main(void)
       surf_action_t action = NULL;
       surf_resource_t resource = NULL;
       m_task_t task = NULL;
+
+      void *fun = NULL;
+      void *arg = NULL;
+      while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
+	DEBUG2("got %p %p", fun, arg);
+	if(fun==MSG_process_create_with_arguments) {
+	  process_arg_t args = arg;
+	  DEBUG2("Launching %s on %s", args->name, args->host->name);
+	  process = MSG_process_create_with_arguments(args->name, args->code, 
+						      args->data, args->host,
+						      args->argc,args->argv);
+	  if(args->kill_time > MSG_getClock()) {
+	    surf_timer_resource->extension_public->set(args->kill_time, 
+						       (void*) &MSG_process_kill,
+						       (void*) process);
+	  }
+	  xbt_free(args);
+	}
+	if(fun==MSG_process_kill) {
+	  process = arg;
+	  DEBUG3("Killing %s(%d) on %s", process->name, process->simdata->PID, 
+		 process->simdata->host->name);
+	  MSG_process_kill(process);
+	}
+      }
       
       xbt_dynar_foreach(resource_list, i, resource) {
 	while ((action =
@@ -359,7 +384,6 @@ MSG_error_t MSG_main(void)
 	  if(task) {
 	    int _cursor;
 	    DEBUG1("** %s failed **",task->name);
-/* 	    fprintf(stderr,"** %s **\n",task->name); */
 	    xbt_dynar_foreach(task->simdata->sleeping,_cursor,process) {
 	      DEBUG3("\t preparing to wake up %s(%d) on %s",	     
 		     process->name,process->simdata->PID,
@@ -376,7 +400,6 @@ MSG_error_t MSG_main(void)
 	  if(task) {
 	    int _cursor;
 	    DEBUG1("** %s done **",task->name);
-/* 	    fprintf(stderr,"** %s **\n",task->name); */
 	    xbt_dynar_foreach(task->simdata->sleeping,_cursor,process) {
 	      DEBUG3("\t preparing to wake up %s(%d) on %s",	     
 		     process->name,process->simdata->PID,