X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b69e984a013e4e9e2d98fc4013cd1721bf2f0245..0b2482fb84dd0615cd537f7c5bb8cb2dc4b0110c:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 652e87adaa..a1abeceade 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -8,6 +8,8 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
+#include "msg/mailbox.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
 				"Logging specific to SIMIX (process)");
@@ -27,7 +29,7 @@ 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->
+		  ((smx_process_t) arg)->simdata->smx_host->simdata->
 		  process_list);
   free(((smx_process_t) arg)->name);
   ((smx_process_t) arg)->name = NULL;
@@ -54,22 +56,24 @@ void SIMIX_process_cleanup(void *arg)
 smx_process_t SIMIX_process_create(const char *name,
 				   xbt_main_func_t code, void *data,
 				   const char *hostname, int argc,
-				   char **argv)
+				   char **argv, xbt_dict_t properties)
 {
   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);
-
+  /*char alias[MAX_ALIAS_NAME + 1] = {0};
+  msg_mailbox_t mailbox;*/
+	
   xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
   /* Simulator Data */
 
-  simdata->s_host = host;
+  simdata->smx_host = host;
   simdata->mutex = NULL;
   simdata->cond = NULL;
   simdata->argc = argc;
   simdata->argv = argv;
-  simdata->context = xbt_context_new(code, NULL, NULL,
+  simdata->context = xbt_context_new(name,code, NULL, NULL,
 				     simix_global->
 				     cleanup_process_function, process,
 				     simdata->argc, simdata->argv);
@@ -79,6 +83,9 @@ smx_process_t SIMIX_process_create(const char *name,
   process->simdata = simdata;
   process->data = data;
 
+  /* Add properties*/
+  simdata->properties = properties;
+
   xbt_swag_insert(process, host->simdata->process_list);
 
   /* fix current_process, about which xbt_context_start mocks around */
@@ -89,10 +96,14 @@ smx_process_t SIMIX_process_create(const char *name,
   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);
+  
+  /*sprintf(alias,"%s:%s",hostname,process->name);
+
+	mailbox = MSG_mailbox_new(alias);
+	MSG_mailbox_set_hostname(mailbox, hostname);*/
 
   return process;
 }
-
 /** 
  * \brief Creates and runs a new #smx_process_t hosting a JAVA thread
  *
@@ -126,29 +137,30 @@ void SIMIX_jprocess_create(const char *name, smx_host_t host,
 	 name, host, data, jprocess, jenv);
   xbt_assert0(host, "Invalid parameters");
   /* Simulator Data */
-  simdata->s_host = host;
+  simdata->smx_host = host;
   simdata->mutex = NULL;
   simdata->cond = NULL;
   simdata->argc = 0;
   simdata->argv = NULL;
 
-  simdata->context = xbt_context_new(NULL, NULL, NULL,
+ 
+  simdata->context = xbt_context_new(name,NULL, NULL, jprocess,
 				     simix_global->
 				     cleanup_process_function, process,
 				     /* argc/argv */ 0, NULL);
-
+	
   /* Process structure */
   process->name = xbt_strdup(name);
   process->simdata = simdata;
   process->data = data;
-  SIMIX_process_set_jprocess(process, jprocess);
-  SIMIX_process_set_jenv(process, jenv);
 
   xbt_swag_insert(process, host->simdata->process_list);
 
   /* 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);
@@ -169,31 +181,24 @@ void SIMIX_process_kill(smx_process_t process)
   smx_simdata_process_t p_simdata = process->simdata;
 
   DEBUG2("Killing process %s on %s", process->name,
-	 p_simdata->s_host->name);
+	 p_simdata->smx_host->name);
 
   /* Cleanup if we were waiting for something */
-  DEBUG0("Here!");
   if (p_simdata->mutex)
     xbt_swag_remove(process, p_simdata->mutex->sleeping);
 
-  DEBUG0("Here!");
   if (p_simdata->cond)
     xbt_swag_remove(process, p_simdata->cond->sleeping);
 
-  DEBUG0("Here!");
   xbt_swag_remove(process, simix_global->process_to_run);
-  DEBUG0("Here!");
   xbt_swag_remove(process, simix_global->process_list);
   DEBUG2("%p here! killing %p", simix_global->current_process, process);
   xbt_context_kill(process->simdata->context);
 
-  DEBUG0("Here!");
   if (process == SIMIX_process_self()) {
     /* I just killed myself */
-    DEBUG0("Here!");
     xbt_context_yield();
   }
-  DEBUG0("Here!");
 }
 
 /**
@@ -239,7 +244,7 @@ smx_host_t SIMIX_process_get_host(smx_process_t process)
   xbt_assert0(((process != NULL)
 	       && (process->simdata)), "Invalid parameters");
 
-  return (process->simdata->s_host);
+  return (process->simdata->smx_host);
 }
 
 /**
@@ -257,6 +262,31 @@ const char *SIMIX_process_get_name(smx_process_t process)
   return (process->name);
 }
 
+/**
+ * \brief Changes the name of an agent.
+ *
+ * This functions checks whether \a process is a valid pointer or not and return its name.
+ * \param process SIMIX process
+ * \param name The new process name
+ */
+void SIMIX_process_set_name(smx_process_t process, char *name)
+{
+  xbt_assert0(((process != NULL)
+	       && (process->simdata)), "Invalid parameters");
+
+  process->name = name;
+}
+
+/** \ingroup m_process_management
+ * \brief Return the properties
+ *
+ * This functions returns the properties associated with this process
+ */
+xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
+{
+  return process->simdata->properties;
+}
+
 /**
  * \brief Return the current agent.
  *
@@ -271,8 +301,10 @@ 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)
 {
@@ -297,7 +329,7 @@ void SIMIX_process_suspend(smx_process_t process)
       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_workstation_model->common_public->suspend(act->simdata->
 							  surf_action);
       }
     } else {
@@ -305,21 +337,19 @@ void SIMIX_process_suspend(smx_process_t process)
     }
   } 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";
+    process->simdata->suspended = 1;
 
     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);
+    surf_workstation_model->common_public->suspend(dummy->simdata->surf_action);
     SIMIX_register_action_to_condition(dummy, cond);
     __SIMIX_cond_wait(cond);
-    //SIMIX_action_destroy(dummy);
-    //SIMIX_cond_destroy(cond);
+    SIMIX_unregister_action_to_condition(dummy, cond);
+    SIMIX_action_destroy(dummy);
+    SIMIX_cond_destroy(cond);
   }
   return;
 }
@@ -348,17 +378,17 @@ void SIMIX_process_resume(smx_process_t process)
     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;
+	DEBUG0("Resume process blocked on a conditional");
     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);
+      surf_workstation_model->common_public->resume(act->simdata->surf_action);
     }
+    SIMIX_cond_signal(c);
     return;
   } else {
     simdata->suspended = 0;
@@ -367,6 +397,21 @@ void SIMIX_process_resume(smx_process_t process)
 
 }
 
+/**
+ * \brief Migrates an agent to another location.
+ *
+ * This function changes the value of the host on which \a process is running.
+ */
+void SIMIX_process_change_host(smx_process_t process, char *source, char *dest)
+{
+  smx_simdata_process_t p_simdata = process->simdata;
+  smx_host_t h1 = SIMIX_host_get_by_name(source);
+  smx_host_t h2 = SIMIX_host_get_by_name(dest);
+  p_simdata->smx_host =  h2;
+  xbt_swag_remove(process, h1->simdata->process_list);
+  xbt_swag_insert(process, h2->simdata->process_list);
+}
+
 /**
  * \brief Returns true if the process is suspended .
  *
@@ -383,45 +428,3 @@ int SIMIX_process_is_suspended(smx_process_t process)
 }
 
 
-/* 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);
-}
-
-void SIMIX_process_set_jmutex(smx_process_t process, void *jm)
-{
-  xbt_context_set_jmutex(process->simdata->context, jm);
-}
-
-void *SIMIX_process_get_jmutex(smx_process_t process)
-{
-  return xbt_context_get_jmutex(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_get_jcond(smx_process_t process)
-{
-  return xbt_context_get_jcond(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);
-}