Now the java implementation of the msg process don't use the os locks. The functions...

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

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 652e87a..f904952 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -27,7 +27,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;
@@ -64,12 +64,12 @@ 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;
   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);
@@ -126,13 +126,13 @@ 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, NULL,
                                     simix_global->
                                     cleanup_process_function, process,
                                     /* argc/argv */ 0, NULL);
@@ -169,31 +169,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 +232,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);
 }
 
 /**
@@ -271,8 +264,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 +292,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,17 +300,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);
-    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);
@@ -348,17 +340,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;
@@ -396,26 +388,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);