* Cleanup the DTD by renaming:

[simgrid.git] / src / simix / smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index ea86881..52dc6c2 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -8,6 +8,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
                                "Logging specific to SIMIX (process)");
@@ -27,7 +28,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,7 +55,7 @@ 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, /*props*/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);
@@ -64,7 +65,7 @@ smx_process_t SIMIX_process_create(const char *name,
   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;
@@ -79,6 +80,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 */
@@ -92,7 +96,6 @@ smx_process_t SIMIX_process_create(const char *name,
 
   return process;
 }
-
 /** 
  * \brief Creates and runs a new #smx_process_t hosting a JAVA thread
  *
@@ -126,7 +129,7 @@ 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;
@@ -169,7 +172,7 @@ 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 */
   if (p_simdata->mutex)
@@ -232,7 +235,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);
 }
 
 /**
@@ -250,6 +253,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.
  *
@@ -292,7 +305,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 {
@@ -300,16 +313,14 @@ 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);
+    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);
@@ -342,17 +353,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;
@@ -390,26 +401,6 @@ 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);