Merge network.c and network_im.c

[simgrid.git] / src / surf / surf_action.c

diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c
index 95fe801..e8eb85f 100644 (file)
--- a/src/surf/surf_action.c
+++ b/src/surf/surf_action.c
@@ -27,7 +27,7 @@ const char *surf_action_state_names[6] = {
 static xbt_mallocator_t action_mallocator = NULL;
 static int action_mallocator_allocated_size = 0;
 static void* surf_action_mallocator_new_f(void);
-static void surf_action_mallocator_free_f(void* action);
+#define surf_action_mallocator_free_f xbt_free_f
 static void surf_action_mallocator_reset_f(void* action);
 
 /**
@@ -38,7 +38,7 @@ void surf_action_init(void) {
   /* the action mallocator will always provide actions of the following size,
    * so this size should be set to the maximum size of the surf action structures
    */
-  action_mallocator_allocated_size = sizeof(s_surf_action_network_CM02_t);
+  action_mallocator_allocated_size = sizeof(s_surf_action_network_CM02_im_t);
   action_mallocator = xbt_mallocator_new(65536, surf_action_mallocator_new_f,
       surf_action_mallocator_free_f, surf_action_mallocator_reset_f);
 }
@@ -55,10 +55,6 @@ static void* surf_action_mallocator_new_f(void) {
   return xbt_malloc(action_mallocator_allocated_size);
 }
 
-static void surf_action_mallocator_free_f(void* action) {
-  xbt_free(action);
-}
-
 static void surf_action_mallocator_reset_f(void* action) {
   memset(action, 0, action_mallocator_allocated_size);
 }
@@ -66,7 +62,7 @@ static void surf_action_mallocator_reset_f(void* action) {
 void *surf_action_new(size_t size, double cost, surf_model_t model,
                       int failed)
 {
-  xbt_assert2(size <= action_mallocator_allocated_size,
+  xbt_assert(size <= action_mallocator_allocated_size,
       "Cannot create a surf action of size %zu: the mallocator only provides actions of size %d",
       size, action_mallocator_allocated_size);
 
@@ -129,7 +125,7 @@ void surf_action_state_set(surf_action_t action,
                            e_surf_action_state_t state)
 {
   surf_action_state_t action_state = &(action->model_type->states);
-  XBT_IN_F("(%p,%s)", action, surf_action_state_names[state]);
+  XBT_IN("(%p,%s)", action, surf_action_state_names[state]);
   xbt_swag_remove(action, action->state_set);
 
   if (state == SURF_ACTION_READY)
@@ -145,7 +141,7 @@ void surf_action_state_set(surf_action_t action,
 
   if (action->state_set)
     xbt_swag_insert(action, action->state_set);
-  XBT_OUT;
+  XBT_OUT();
 }
 
 void surf_action_data_set(surf_action_t action, void *data)