X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64d2562eea7ac471385b53b55a338ab3a15fd746..e81a23d99673c6b8ebefa9fc0cb613f30b58dd18:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 74750b065c..f9514ecb72 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -1,4 +1,4 @@
-/* 	$Id$	 */
+//*     $Id$     */
 
 /* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
 
@@ -26,7 +26,9 @@ void SIMIX_process_cleanup(void *arg)
 {
   xbt_swag_remove(arg, simix_global->process_list);
   xbt_swag_remove(arg, simix_global->process_to_run);
-  xbt_swag_remove(arg, ((smx_process_t) arg)->simdata->s_host->simdata->process_list);
+  xbt_swag_remove(arg,
+		  ((smx_process_t) arg)->simdata->s_host->simdata->
+		  process_list);
   free(((smx_process_t) arg)->name);
   ((smx_process_t) arg)->name = NULL;
 
@@ -50,12 +52,12 @@ void SIMIX_process_cleanup(void *arg)
  * \return The new corresponding object.
  */
 smx_process_t SIMIX_process_create(const char *name,
-				   smx_process_code_t code, void *data,
-				   const char * hostname, int argc, char **argv, 
-				   void * clean_process_function)
+				   xbt_main_func_t code, void *data,
+				   const char *hostname, int argc,
+				   char **argv)
 {
-  smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t,1);
-  smx_process_t process = xbt_new0(s_smx_process_t,1);
+  smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t, 1);
+  smx_process_t process = xbt_new0(s_smx_process_t, 1);
   smx_process_t self = NULL;
   smx_host_t host = SIMIX_host_get_by_name(hostname);
 
@@ -63,20 +65,14 @@ smx_process_t SIMIX_process_create(const char *name,
   /* Simulator Data */
 
   simdata->s_host = host;
-	simdata->mutex = NULL;
-	simdata->cond = NULL;
+  simdata->mutex = NULL;
+  simdata->cond = NULL;
   simdata->argc = argc;
   simdata->argv = argv;
-	if (clean_process_function) {
-  	simdata->context = xbt_context_new(code, NULL, NULL, 
-					     clean_process_function, process, 
-					     simdata->argc, simdata->argv);
-	}
-	else {
-  	simdata->context = xbt_context_new(code, NULL, NULL, 
-					     SIMIX_process_cleanup, process, 
-					     simdata->argc, simdata->argv);
-	}
+  simdata->context = xbt_context_new(code, NULL, NULL,
+				     simix_global->
+				     cleanup_process_function, process,
+				     simdata->argc, simdata->argv);
 
   /* Process structure */
   process->name = xbt_strdup(name);
@@ -85,15 +81,14 @@ smx_process_t SIMIX_process_create(const char *name,
 
   xbt_swag_insert(process, host->simdata->process_list);
 
-  /* *************** FIX du current_process !!! *************** */
+  /* fix current_process, about which xbt_context_start mocks around */
   self = simix_global->current_process;
   xbt_context_start(process->simdata->context);
   simix_global->current_process = self;
 
-  xbt_swag_insert(process,simix_global->process_list);
-  DEBUG2("Inserting %s(%s) in the to_run list",process->name,
-	 host->name);
-  xbt_swag_insert(process,simix_global->process_to_run);
+  xbt_swag_insert(process, simix_global->process_list);
+  DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
+  xbt_swag_insert(process, simix_global->process_to_run);
 
   return process;
 }
@@ -104,16 +99,31 @@ smx_process_t SIMIX_process_create(const char *name,
  * Warning: this should only be used in libsimgrid4java, since it create
  * a context with no code, which leads to segfaults in plain libsimgrid 
  */
-smx_process_t SIMIX_jprocess_create(const char *name, smx_host_t host,
-				    void *data,
-				    void *jprocess, void *jenv)
+void SIMIX_jprocess_create(const char *name, smx_host_t host,
+			   void *data,
+			   void *jprocess, void *jenv, smx_process_t * res)
 {
-  smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t,1);
-  smx_process_t process = xbt_new0(s_smx_process_t,1);
+  smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t, 1);
+  smx_process_t process = xbt_new0(s_smx_process_t, 1);
   smx_process_t self = NULL;
 
+  /* HACK: We need this trick because when we xbt_context_new() do
+     syncronization stuff, the s_process field in the m_process needs 
+     to have a valid value, and we call xbt_context_new() before 
+     returning, of course, ie, before providing a right value to the 
+     caller (Java_simgrid_msg_Msg_processCreate) have time to store it  
+     in place. This way, we initialize the m_process->simdata->s_process 
+     field ourself ASAP.
+
+     All this would be much simpler if the synchronization stuff would be done
+     in the JAVA world, I think.
+   */
+  *res = process;
+
+
+
   DEBUG5("jprocess_create(name=%s,host=%p,data=%p,jproc=%p,jenv=%p)",
-	 name,host,data,jprocess,jenv);
+	 name, host, data, jprocess, jenv);
   xbt_assert0(host, "Invalid parameters");
   /* Simulator Data */
   simdata->s_host = host;
@@ -121,56 +131,59 @@ smx_process_t SIMIX_jprocess_create(const char *name, smx_host_t host,
   simdata->cond = NULL;
   simdata->argc = 0;
   simdata->argv = NULL;
-  
-  simdata->context = xbt_context_new(NULL, NULL, NULL, 
-				     SIMIX_process_cleanup, process, 
-				     /* argc/argv*/0,NULL);
+
+  simdata->context = xbt_context_new(NULL, NULL, NULL,
+				     simix_global->
+				     cleanup_process_function, process,
+				     /* argc/argv */ 0, NULL);
+
   /* Process structure */
   process->name = xbt_strdup(name);
-  process->simdata = simdata; 
+  process->simdata = simdata;
   process->data = data;
-  SIMIX_process_set_jprocess(process,jprocess);
-  SIMIX_process_set_jenv(process,jenv);
+  SIMIX_process_set_jprocess(process, jprocess);
+  SIMIX_process_set_jenv(process, jenv);
 
   xbt_swag_insert(process, host->simdata->process_list);
 
-  /* *************** FIX du current_process !!! *************** */
+  /* fix current_process, about which xbt_context_start mocks around */
   self = simix_global->current_process;
   xbt_context_start(process->simdata->context);
   simix_global->current_process = self;
 
-  xbt_swag_insert(process,simix_global->process_list);
-  DEBUG2("Inserting %s(%s) in the to_run list",process->name,
-	 host->name);
-  xbt_swag_insert(process,simix_global->process_to_run);
+  xbt_swag_insert(process, simix_global->process_list);
+  DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
+  xbt_swag_insert(process, simix_global->process_to_run);
 
-  return process;
 }
 
 
 /** \brief Kill a SIMIX process
  *
- * This function simply kills a \a process... scarry isn't it ? :). Removes it from the mutex or condition that it can be blocked.
+ * This function simply kills a \a process... scarry isn't it ? :).
  * \param process poor victim
  *
  */
 void SIMIX_process_kill(smx_process_t process)
-{	
+{
   smx_simdata_process_t p_simdata = process->simdata;
 
-  DEBUG2("Killing %s on %s",process->name, p_simdata->s_host->name);
-  
-	if (p_simdata->mutex) {
-		xbt_swag_remove(process,p_simdata->mutex->sleeping);
-	}
-	if (p_simdata->cond) {
-		xbt_swag_remove(process,p_simdata->cond->sleeping);
-	}
-  xbt_swag_remove(process,simix_global->process_to_run);
-  xbt_swag_remove(process,simix_global->process_list);
+  DEBUG2("Killing process %s on %s", process->name,
+	 p_simdata->s_host->name);
+
+  /* Cleanup if we were waiting for something */
+  if (p_simdata->mutex)
+    xbt_swag_remove(process, p_simdata->mutex->sleeping);
+
+  if (p_simdata->cond)
+    xbt_swag_remove(process, p_simdata->cond->sleeping);
+
+  xbt_swag_remove(process, simix_global->process_to_run);
+  xbt_swag_remove(process, simix_global->process_list);
+  DEBUG2("%p here! killing %p", simix_global->current_process, process);
   xbt_context_kill(process->simdata->context);
 
-  if(process==SIMIX_process_self()) {
+  if (process == SIMIX_process_self()) {
     /* I just killed myself */
     xbt_context_yield();
   }
@@ -197,14 +210,14 @@ void *SIMIX_process_get_data(smx_process_t process)
  * \param process SIMIX process
  * \param data User data
  */
-void SIMIX_process_set_data(smx_process_t process,void *data)
+void SIMIX_process_set_data(smx_process_t process, void *data)
 {
   xbt_assert0((process != NULL), "Invalid parameters");
-  xbt_assert0((process->data == NULL), "Data already set");
-  
+  //xbt_assert0((process->data == NULL), "Data already set");
+
   process->data = data;
-   
-  return ;
+
+  return;
 }
 
 /**
@@ -216,7 +229,8 @@ void SIMIX_process_set_data(smx_process_t process,void *data)
  */
 smx_host_t SIMIX_process_get_host(smx_process_t process)
 {
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+  xbt_assert0(((process != NULL)
+	       && (process->simdata)), "Invalid parameters");
 
   return (process->simdata->s_host);
 }
@@ -230,7 +244,8 @@ smx_host_t SIMIX_process_get_host(smx_process_t process)
  */
 const char *SIMIX_process_get_name(smx_process_t process)
 {
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+  xbt_assert0(((process != NULL)
+	       && (process->simdata)), "Invalid parameters");
 
   return (process->name);
 }
@@ -249,57 +264,58 @@ smx_process_t SIMIX_process_self(void)
 /**
  * \brief Suspend the process.
  *
- * This functions suspend the process by suspending the action on which it was waiting for the completion.
- *	\param process SIMIX process
+ * This functions suspend the process by suspending the action on
+ * which it was waiting for the completion.
+ *
+ * \param process SIMIX process
  */
 void SIMIX_process_suspend(smx_process_t process)
 {
   smx_simdata_process_t simdata = NULL;
-	
+
   xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
 
-  if(process!=SIMIX_process_self()) {
+  if (process != SIMIX_process_self()) {
     simdata = process->simdata;
-    
-		if (simdata->mutex) {
-			/* process blocked on a mutex, only set suspend=1 */
-			simdata->suspended = 1;
-		}
-		else if (simdata->cond){
-			/* process blocked cond, suspend all actions */
-
-			/* temporaries variables */ 
-			smx_cond_t c;
-			xbt_fifo_item_t i;
-			smx_action_t act;
-
-			simdata->suspended = 1;
-			c = simdata->cond;
-			xbt_fifo_foreach(c->actions,i,act, smx_action_t) {
-				surf_workstation_resource->common_public->suspend(act->simdata->surf_action);
-			}
-		}
-		else {
-			simdata->suspended = 1;
-		}
+
+    if (simdata->mutex) {
+      /* process blocked on a mutex, only set suspend=1 */
+      simdata->suspended = 1;
+    } else if (simdata->cond) {
+      /* process blocked cond, suspend all actions */
+
+      /* temporaries variables */
+      smx_cond_t c;
+      xbt_fifo_item_t i;
+      smx_action_t act;
+
+      simdata->suspended = 1;
+      c = simdata->cond;
+      xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
+	surf_workstation_resource->common_public->suspend(act->simdata->
+							  surf_action);
+      }
+    } else {
+      simdata->suspended = 1;
+    }
+  } else {
+    /* process executing, I can create an action and suspend it */
+    process->simdata->suspended = 1;
+    smx_action_t dummy;
+    smx_cond_t cond;
+    char name[] = "dummy";
+
+    cond = SIMIX_cond_init();
+    dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
+    surf_workstation_resource->common_public->set_priority(dummy->simdata->
+							   surf_action,
+							   0.0);
+    SIMIX_register_action_to_condition(dummy, cond);
+    __SIMIX_cond_wait(cond);
+    //SIMIX_action_destroy(dummy);
+    //SIMIX_cond_destroy(cond);
   }
-	else {
-		/* process executing, I can create an action and suspend it */
-		process->simdata->suspended = 1;
-		smx_action_t dummy;
-		smx_cond_t cond;
-		char name[] = "dummy";
-
-		cond = SIMIX_cond_init();
-		dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
-		surf_workstation_resource->common_public->set_priority(dummy->simdata->surf_action,0.0);
-		SIMIX_register_condition_to_action(dummy,cond);
-		SIMIX_register_action_to_condition(dummy,cond);
-		__SIMIX_cond_wait(cond);	
-		//SIMIX_action_destroy(dummy);
-		//SIMIX_cond_destroy(cond);
-	}
-  return ;
+  return;
 }
 
 /**
@@ -312,36 +328,36 @@ void SIMIX_process_resume(smx_process_t process)
 {
   smx_simdata_process_t simdata = NULL;
 
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+  xbt_assert0(((process != NULL)
+	       && (process->simdata)), "Invalid parameters");
   SIMIX_CHECK_HOST();
 
-  if(process == SIMIX_process_self()) {
- 		return; 
+  if (process == SIMIX_process_self()) {
+    return;
   }
 
   simdata = process->simdata;
-  if(simdata->mutex) {
-		DEBUG0("Resume process blocked on a mutex");
-    simdata->suspended = 0; /* He'll wake up by itself */
- 		return; 
+  if (simdata->mutex) {
+    DEBUG0("Resume process blocked on a mutex");
+    simdata->suspended = 0;	/* He'll wake up by itself */
+    return;
+  } else if (simdata->cond) {
+    DEBUG0("Resume process blocked on a conditional");
+    /* temporaries variables */
+    smx_cond_t c;
+    xbt_fifo_item_t i;
+    smx_action_t act;
+    simdata->suspended = 0;
+    c = simdata->cond;
+    xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
+      surf_workstation_resource->common_public->resume(act->simdata->
+						       surf_action);
+    }
+    return;
+  } else {
+    simdata->suspended = 0;
+    xbt_swag_insert(process, simix_global->process_to_run);
   }
-	else if (simdata->cond) {
-		DEBUG0("Resume process blocked on a conditional");
-		/* temporaries variables */ 
-		smx_cond_t c;
-		xbt_fifo_item_t i;
-		smx_action_t act;
-		simdata->suspended = 0;
-		c = simdata->cond;
-		xbt_fifo_foreach(c->actions,i,act, smx_action_t) {
-			surf_workstation_resource->common_public->resume(act->simdata->surf_action);
-		}
-		return;
-	}
-	else {
-		simdata->suspended = 0;
-		xbt_swag_insert(process,simix_global->process_to_run);
-	}
 
 }
 
@@ -354,39 +370,52 @@ void SIMIX_process_resume(smx_process_t process)
  */
 int SIMIX_process_is_suspended(smx_process_t process)
 {
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+  xbt_assert0(((process != NULL)
+	       && (process->simdata)), "Invalid parameters");
 
   return (process->simdata->suspended);
 }
 
 
 /* Helper functions for jMSG: manipulate the context data without breaking the module separation */
-#include "xbt/context.h" /* to pass java objects from MSG to the context */
-void SIMIX_process_set_jprocess(smx_process_t process, void *jp) {
-   xbt_context_set_jprocess(process->simdata->context,jp);
-}
-void* SIMIX_process_get_jprocess(smx_process_t process) {
-   return xbt_context_get_jprocess(process->simdata->context);
+#include "xbt/context.h"	/* to pass java objects from MSG to the context */
+
+void SIMIX_process_set_jprocess(smx_process_t process, void *jp)
+{
+  xbt_context_set_jprocess(process->simdata->context, jp);
 }
 
-void SIMIX_process_set_jmutex(smx_process_t process, void *jm) {
-   xbt_context_set_jmutex(process->simdata->context,jm);
+void *SIMIX_process_get_jprocess(smx_process_t process)
+{
+  return xbt_context_get_jprocess(process->simdata->context);
 }
-void* SIMIX_process_get_jmutex(smx_process_t process) {
-   return xbt_context_get_jmutex(process->simdata->context);
+
+void SIMIX_process_set_jmutex(smx_process_t process, void *jm)
+{
+  xbt_context_set_jmutex(process->simdata->context, jm);
 }
 
-void SIMIX_process_set_jcond(smx_process_t process, void *jc) {
-   xbt_context_set_jcond(process->simdata->context,jc);
+void *SIMIX_process_get_jmutex(smx_process_t process)
+{
+  return xbt_context_get_jmutex(process->simdata->context);
 }
-void* SIMIX_process_get_jcond(smx_process_t process) {
-   return xbt_context_get_jcond(process->simdata->context);
+
+void SIMIX_process_set_jcond(smx_process_t process, void *jc)
+{
+  xbt_context_set_jcond(process->simdata->context, jc);
 }
 
-void SIMIX_process_set_jenv(smx_process_t process, void *je) {
-   xbt_context_set_jenv(process->simdata->context,je);
+void *SIMIX_process_get_jcond(smx_process_t process)
+{
+  return xbt_context_get_jcond(process->simdata->context);
 }
-void* SIMIX_process_get_jenv(smx_process_t process) {
-   return xbt_context_get_jenv(process->simdata->context);
+
+void SIMIX_process_set_jenv(smx_process_t process, void *je)
+{
+  xbt_context_set_jenv(process->simdata->context, je);
 }
 
+void *SIMIX_process_get_jenv(smx_process_t process)
+{
+  return xbt_context_get_jenv(process->simdata->context);
+}