Use a mallocator for SIMIX actions

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

diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index 7f6fae4..d292255 100644 (file)
--- a/src/simix/smx_synchro.c
+++ b/src/simix/smx_synchro.c
@@ -24,9 +24,8 @@ static void SIMIX_sem_block_onto(smx_sem_t sem);
 static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
 {
   smx_action_t action;
-  action = xbt_new0(s_smx_action_t, 1);
+  action = xbt_mallocator_get(simix_global->action_mallocator);
   action->type = SIMIX_ACTION_SYNCHRO;
-  action->request_list = xbt_fifo_new();
   action->name = xbt_strdup("synchro");
   action->synchro.sleep = 
     surf_workstation_model->extension.workstation.sleep(smx_host->host, timeout);
@@ -68,9 +67,8 @@ void SIMIX_synchro_destroy(smx_action_t action)
 {
   DEBUG1("Destroying synchro %p", action);
   action->synchro.sleep->model_type->action_unref(action->synchro.sleep);
-  xbt_fifo_free(action->request_list);
   xbt_free(action->name);
-  xbt_free(action);
+  xbt_mallocator_release(simix_global->action_mallocator, action);
 }
 
 void SIMIX_post_synchro(smx_action_t action)
@@ -80,8 +78,6 @@ void SIMIX_post_synchro(smx_action_t action)
   else if(surf_workstation_model->action_state_get(action->synchro.sleep) == SURF_ACTION_DONE)
     action->state = SIMIX_SRC_TIMEOUT;
 
-  action->synchro.sleep->model_type->action_unref(action->synchro.sleep);
-
   SIMIX_synchro_finish(action);  
 }
 
@@ -201,7 +197,7 @@ void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer)
     SIMIX_synchro_destroy(p->waiting_action);
     p->waiting_action = NULL;
     mutex->owner = p;
-    SIMIX_request_answer(p->request);
+    SIMIX_request_answer(&p->request);
   } else {
     /* nobody to wake up */
     mutex->locked = 0;
@@ -313,7 +309,7 @@ void SIMIX_cond_signal(smx_cond_t cond)
     proc->waiting_action = NULL;
 
     /* Now transform the cond wait request into a mutex lock one */
-    req = proc->request;
+    req = &proc->request;
     if(req->call == REQ_COND_WAIT)
       mutex = req->cond_wait.mutex;
     else
@@ -401,7 +397,7 @@ void SIMIX_sem_release(smx_sem_t sem)
     proc = xbt_swag_extract(sem->sleeping);
     SIMIX_synchro_destroy(proc->waiting_action);
     proc->waiting_action = NULL;
-    SIMIX_request_answer(proc->request);
+    SIMIX_request_answer(&proc->request);
   } else if (sem->value < SMX_SEM_NOLIMIT) {
     sem->value++;
   }