X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c856ab29791883f3ca4f8d526bac816cb08546d..f4a258218681d1002c99d4556ba4b21bc6a6adff:/src/msg/m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 924f80db5b..3ecbc09eec 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -5,13 +5,58 @@
 /* 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"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
 				"Logging specific to MSG (process)");
 
+/** \defgroup m_process_management Management Functions of Agents
+ *  \brief This section describes the agent structure of MSG
+ *  (#m_process_t) and the functions for managing it.
+ *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Agents" --> \endhtmlonly
+ * 
+ *  We need to simulate many independent scheduling decisions, so
+ *  the concept of <em>process</em> is at the heart of the
+ *  simulator. A process may be defined as a <em>code</em>, with
+ *  some <em>private data</em>, executing in a <em>location</em>.
+ *  \see m_process_t
+ */
+
 /******************************** Process ************************************/
+/** \ingroup m_process_management
+ * \brief Creates and runs a new #m_process_t.
+ *
+ * Does exactly the same as #MSG_process_create_with_arguments but without 
+   providing standard arguments (\a argc, \a argv, \a start_time, \a kill_time).
+ * \sa MSG_process_create_with_arguments
+ */
+m_process_t MSG_process_create(const char *name,
+			       m_process_code_t code, void *data,
+			       m_host_t host)
+{
+  return MSG_process_create_with_arguments(name, code, data, host, -1, NULL);
+}
+
+static void MSG_process_cleanup(void *arg)
+{
+
+  while(((m_process_t)arg)->simdata->paje_state) {
+    PAJE_PROCESS_POP_STATE((m_process_t)arg);
+  }
+
+  PAJE_PROCESS_FREE(arg);
+
+  xbt_fifo_remove(msg_global->process_list, arg);
+  xbt_fifo_remove(msg_global->process_to_run, arg);
+  xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
+  free(((m_process_t) arg)->name);
+  ((m_process_t) arg)->name = NULL;
+  free(((m_process_t) arg)->simdata);
+  ((m_process_t) arg)->simdata = NULL;
+  free(arg);
+}
+
 /** \ingroup m_process_management
  * \brief Creates and runs a new #m_process_t.
 
@@ -27,30 +72,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
    name contains the word get), in \ref m_task_management (to create
    or destroy some #m_task_t for example) and in \ref
    msg_gos_functions (to handle file transfers and task processing).
- * \param data a pointer to any data may want to attach to the new
+ * \param data a pointer to any data one may want to attach to the new
    object.  It is for user-level information and can be NULL. It can
    be retrieved with the function \ref MSG_process_get_data.
  * \param host the location where the new agent is executed.
+ * \param argc first argument passed to \a code
+ * \param argv second argument passed to \a code
  * \see m_process_t
  * \return The new corresponding object.
  */
-m_process_t MSG_process_create(const char *name,
-			       m_process_code_t code, void *data,
-			       m_host_t host)
-{
-  return MSG_process_create_with_arguments(name, code, data, host, -1, NULL);
-}
-
-static void MSG_process_cleanup(void *arg)
-{
-  xbt_fifo_remove(msg_global->process_list, arg);
-  xbt_fifo_remove(msg_global->process_to_run, arg);
-  xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
-  xbt_free(((m_process_t) arg)->name);
-  xbt_free(((m_process_t) arg)->simdata);
-  xbt_free(arg);
-}
-
 m_process_t MSG_process_create_with_arguments(const char *name,
 					      m_process_code_t code, void *data,
 					      m_host_t host, int argc, char **argv)
@@ -58,12 +88,11 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   simdata_process_t simdata = xbt_new0(s_simdata_process_t,1);
   m_process_t process = xbt_new0(s_m_process_t,1);
   m_process_t self = NULL;
-  static int PID = 1;
 
   xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
   /* Simulator Data */
 
-  simdata->PID = PID++;
+  simdata->PID = msg_global->PID++;
   simdata->host = host;
   simdata->waiting_task = NULL;
   simdata->argc = argc;
@@ -85,24 +114,73 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   process->simdata = simdata;
   process->data = data;
 
-  xbt_fifo_push(host->simdata->process_list, process);
+  xbt_fifo_unshift(host->simdata->process_list, process);
 
-  /* /////////////// FIX du current_process !!! ////////////// */
+  /* *************** FIX du current_process !!! *************** */
   self = msg_global->current_process;
   xbt_context_start(process->simdata->context);
   msg_global->current_process = self;
 
-  xbt_fifo_push(msg_global->process_list, process);
-  xbt_fifo_push(msg_global->process_to_run, process);
+  xbt_fifo_unshift(msg_global->process_list, process);
+  DEBUG2("Inserting %s(%s) in the to_run list",process->name,
+	 host->name);
+  xbt_fifo_unshift(msg_global->process_to_run, process);
+
+  PAJE_PROCESS_NEW(process);
 
   return process;
 }
 
-void MSG_process_free(m_process_t process)
+/** \ingroup m_process_management
+ * \param process poor victim
+ *
+ * This function simply kills a \a process... scarry isn't it ? :)
+ */
+void MSG_process_kill(m_process_t process)
 {
+  int i;
+  simdata_process_t p_simdata = process->simdata;
+  simdata_host_t h_simdata= p_simdata->host->simdata;
+  int _cursor;
+  m_process_t proc = NULL;
+
+/*   fprintf(stderr,"Killing %s(%d) on %s.\n",process->name, */
+/* 	  p_simdata->PID,p_simdata->host->name); */
+  
+  for (i=0; i<msg_global->max_channel; i++) {
+    if (h_simdata->sleeping[i] == process) {
+      h_simdata->sleeping[i] = NULL;
+      break;
+    }
+  }
+  if (i==msg_global->max_channel) {
+    if(p_simdata->waiting_task) {
+      xbt_dynar_foreach(p_simdata->waiting_task->simdata->sleeping,_cursor,proc) {
+	if(proc==process) 
+	  xbt_dynar_remove_at(p_simdata->waiting_task->simdata->sleeping,_cursor,&proc);
+      }
+      if(p_simdata->waiting_task->simdata->compute)
+	surf_workstation_resource->common_public->
+	  action_free(p_simdata->waiting_task->simdata->compute);
+      else if (p_simdata->waiting_task->simdata->comm) {
+	surf_workstation_resource->common_public->
+	  action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
+	surf_workstation_resource->common_public->
+	  action_free(p_simdata->waiting_task->simdata->comm);
+      } else 
+	CRITICAL0("UNKNOWN STATUS. Please report this bug.");
+    } else { /* Must be trying to put a task somewhere */
+      if(process==MSG_process_self()) {
+	return;
+      } else {
+	CRITICAL0("UNKNOWN STATUS. Please report this bug.");
+      }
+    }
+  }
+
+  xbt_fifo_remove(msg_global->process_to_run,process);
   xbt_fifo_remove(msg_global->process_list,process);
   xbt_context_free(process->simdata->context);
-  MSG_process_cleanup(process);
 }
 
 /** \ingroup m_process_management
@@ -123,7 +201,7 @@ MSG_error_t MSG_process_change_host(m_process_t process, m_host_t host)
 
   xbt_fifo_remove(simdata->host->simdata->process_list,process);
   simdata->host = host;
-  xbt_fifo_push(host->simdata->process_list,process);
+  xbt_fifo_unshift(host->simdata->process_list,process);
 
   return MSG_OK;
 }
@@ -203,7 +281,6 @@ int MSG_process_get_PID(m_process_t process)
   return (((simdata_process_t) process->simdata)->PID);
 }
 
-
 /** \ingroup m_process_management
  * \brief Returns the process ID of the parent of \a process.
  *
@@ -259,7 +336,7 @@ int MSG_process_self_PPID(void)
  */
 m_process_t MSG_process_self(void)
 {
-  return msg_global->current_process;
+  return msg_global ? msg_global->current_process : NULL;
 }
 
 /** \ingroup m_process_management
@@ -272,10 +349,13 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
-  int i;
+
+  XBT_IN2("(%p(%s))", process, process->name);
 
   xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
 
+  PAJE_PROCESS_PUSH_STATE(process,"S",NULL);
+
   if(process!=MSG_process_self()) {
     simdata = process->simdata;
     
@@ -284,7 +364,10 @@ MSG_error_t MSG_process_suspend(m_process_t process)
     simdata_task = simdata->waiting_task->simdata;
 
     simdata->suspended = 1;
-    if(simdata->blocked) return MSG_OK;
+    if(simdata->blocked) {
+      XBT_OUT;
+      return MSG_OK;
+    }
 
     xbt_assert0(((simdata_task->compute)||(simdata_task->comm))&&
 		!((simdata_task->compute)&&(simdata_task->comm)),
@@ -307,6 +390,7 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 
     MSG_task_destroy(dummy);
   }
+  XBT_OUT;
   return MSG_OK;
 }
 
@@ -320,30 +404,45 @@ MSG_error_t MSG_process_resume(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
-  int i;
 
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
   CHECK_HOST();
 
+  XBT_IN2("(%p(%s))", process, process->name);
+
+  if(process == MSG_process_self()) {
+    XBT_OUT;
+    MSG_RETURN(MSG_OK);
+  }
+
   simdata = process->simdata;
 
   if(simdata->blocked) {
+    PAJE_PROCESS_POP_STATE(process);
+
     simdata->suspended = 0; /* He'll wake up by itself */
+    XBT_OUT;
     MSG_RETURN(MSG_OK);
   }
 
   if(!(simdata->waiting_task)) {
     xbt_assert0(0,"Process not waiting for anything else. Weird !");
+    XBT_OUT;
     return MSG_WARNING;
   }
   simdata_task = simdata->waiting_task->simdata;
 
 
-  if(simdata_task->compute) 
+  if(simdata_task->compute) {
     surf_workstation_resource->common_public->resume(simdata_task->compute);
-  else 
+    PAJE_PROCESS_POP_STATE(process);
+  }
+  else {
+    PAJE_PROCESS_POP_STATE(process);
     surf_workstation_resource->common_public->resume(simdata_task->comm);
+  }
 
+  XBT_OUT;
   MSG_RETURN(MSG_OK);
 }
 
@@ -353,50 +452,61 @@ MSG_error_t MSG_process_resume(m_process_t process)
  * This checks whether a process is suspended or not by inspecting the
  * task on which it was waiting for the completion.
  */
-int MSG_process_isSuspended(m_process_t process)
+int MSG_process_is_suspended(m_process_t process)
 {
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
 
   return (process->simdata->suspended);
 }
 
-
-
-
-
-MSG_error_t __MSG_process_block(void)
+int __MSG_process_block(double max_duration, const char *info)
 {
   m_process_t process = MSG_process_self();
-
   m_task_t dummy = MSG_TASK_UNINITIALIZED;
-  dummy = MSG_task_create("blocked", 0.0, 0, NULL);
+  char blocked_name[512];
+  snprintf(blocked_name,512,"blocked [%s] (%s:%s)",
+	  info, process->name, process->simdata->host->name);
+
+  XBT_IN1(": max_duration=%g",max_duration);
+
+  dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
   
+  PAJE_PROCESS_PUSH_STATE(process,"B",NULL);
+
   process->simdata->blocked=1;
   __MSG_task_execute(process,dummy);
   surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
+  if(max_duration>=0)
+    surf_workstation_resource->common_public->set_max_duration(dummy->simdata->compute, 
+							       max_duration);
   __MSG_wait_for_computation(process,dummy);
+  MSG_task_destroy(dummy);
   process->simdata->blocked=0;
 
-  if(process->simdata->suspended)
+  if(process->simdata->suspended) {
+    DEBUG0("I've been suspended in the meantime");    
     MSG_process_suspend(process);
-  
-  MSG_task_destroy(dummy);
+    DEBUG0("I've been resumed, let's keep going");    
+  }
 
-  return MSG_OK;
+  XBT_OUT;
+  return 1;
 }
 
 MSG_error_t __MSG_process_unblock(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
-  int i;
 
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
   CHECK_HOST();
 
+  XBT_IN2(": %s unblocking %s", MSG_process_self()->name,process->name);
+
   simdata = process->simdata;
   if(!(simdata->waiting_task)) {
     xbt_assert0(0,"Process not waiting for anything else. Weird !");
+    XBT_OUT;
     return MSG_WARNING;
   }
   simdata_task = simdata->waiting_task->simdata;
@@ -405,6 +515,10 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
 
   surf_workstation_resource->common_public->resume(simdata_task->compute);
 
+  PAJE_PROCESS_POP_STATE(process);
+
+  XBT_OUT;
+
   MSG_RETURN(MSG_OK);
 }