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

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index f539ee8cf4..fa1fc6640e 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)");
@@ -54,13 +56,15 @@ 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 */
 
@@ -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
  *
@@ -132,23 +143,24 @@ void SIMIX_jprocess_create(const char *name, smx_host_t host,
   simdata->argc = 0;
   simdata->argv = NULL;
 
-  simdata->context = xbt_context_new(name,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);
@@ -250,6 +262,16 @@ const char *SIMIX_process_get_name(smx_process_t process)
   return (process->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.
  *
@@ -310,8 +332,9 @@ void SIMIX_process_suspend(smx_process_t process)
     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;
 }
@@ -359,6 +382,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 .
  *
@@ -375,45 +413,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);
-}