Direct context switching: clean the semantics of parmap

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

diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c
index 7a5734d..ea4317b 100644 (file)
--- a/src/surf/surf_action.c
+++ b/src/surf/surf_action.c
@@ -5,6 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf_private.h"
+#include "network_private.h"
+#include "xbt/mallocator.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 
@@ -21,10 +23,54 @@ const char *surf_action_state_names[6] = {
   "SURF_ACTION_NOT_IN_THE_SYSTEM"
 };
 
+/* Surf actions mallocator */
+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);
+static void surf_action_mallocator_reset_f(void* action);
+
+/**
+ * \brief Initializes the action module of Surf.
+ */
+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 = xbt_mallocator_new(65536, surf_action_mallocator_new_f,
+      surf_action_mallocator_free_f, surf_action_mallocator_reset_f);
+}
+
+/**
+ * \brief Uninitializes the action module of Surf.
+ */
+void surf_action_exit(void) {
+
+  xbt_mallocator_free(action_mallocator);
+}
+
+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);
+}
+
 void *surf_action_new(size_t size, double cost, surf_model_t model,
                       int failed)
 {
-  surf_action_t action = xbt_malloc0(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);
+
+  surf_action_t action = xbt_mallocator_get(action_mallocator);
   action->refcount = 1;
   action->cost = cost;
   action->remains = cost;
@@ -33,6 +79,9 @@ void *surf_action_new(size_t size, double cost, surf_model_t model,
   action->start = surf_get_clock();
   action->finish = -1.0;
   action->model_type = model;
+#ifdef HAVE_TRACING
+  action->category = NULL;
+#endif
 
   if (failed)
     action->state_set = model->states.failed_action_set;
@@ -72,15 +121,15 @@ double surf_action_get_finish_time(surf_action_t action)
 
 XBT_INLINE void surf_action_free(surf_action_t * action)
 {
-  (*action)->model_type->action_cancel(*action);
-  free(*action);
+  xbt_mallocator_release(action_mallocator, *action);
   *action = NULL;
 }
 
-void surf_action_state_set(surf_action_t action, e_surf_action_state_t state)
+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_IN2("(%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)
@@ -96,7 +145,7 @@ void surf_action_state_set(surf_action_t action, e_surf_action_state_t state)
 
   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)