Merge cpu and network for action functions.

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index f115c12..6fb1dc7 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -17,12 +17,6 @@
 
 #define NO_MAX_DURATION -1.0
 
-typedef enum {
-  UM_FULL,
-  UM_LAZY,
-  UM_UNDEFINED
-} e_UM_t;
-
 /* user-visible parameters */
 extern double sg_tcp_gamma;
 extern double sg_sender_gap;
@@ -39,6 +33,12 @@ extern int sg_gtnets_jitter_seed;
 
 extern const char *surf_action_state_names[6];
 
+typedef enum {
+  UM_FULL,
+  UM_LAZY,
+  UM_UNDEFINED
+} e_UM_t;
+
 typedef struct surf_model_private {
   int (*resource_used) (void *resource_id);
   /* Share the resources to the actions and return in how much time
@@ -49,12 +49,20 @@ typedef struct surf_model_private {
   void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
                                  double value, double time);
   void (*finalize) (void);
+
+  lmm_system_t maxmin_system;
+  e_UM_t update_mechanism;
+  xbt_swag_t modified_set;
+  xbt_heap_t action_heap;
+  int selective_update;
+
 } s_surf_model_private_t;
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       size_t offset,
                                       lmm_system_t sys,
                                       void (*solve) (lmm_system_t));
+void generic_update_action_remaining_lazy( surf_action_t action, double now);
 
 /* Generic functions common to all models */
 void surf_action_init(void);
@@ -72,6 +80,18 @@ void surf_action_lmm_heap_insert(xbt_heap_t heap, surf_action_lmm_t action,
     double key, enum heap_action_type hat);
 void surf_action_lmm_heap_remove(xbt_heap_t heap,surf_action_lmm_t action);
 
+void surf_action_cancel(surf_action_t action);
+int surf_action_unref(surf_action_t action);
+void surf_action_suspend(surf_action_t action);
+void surf_action_resume(surf_action_t action);
+int surf_action_is_suspended(surf_action_t action);
+void surf_action_set_max_duration(surf_action_t action, double duration);
+void surf_action_set_priority(surf_action_t action, double priority);
+#ifdef HAVE_TRACING
+void surf_action_set_category(surf_action_t action,
+                                    const char *category);
+#endif
+double surf_action_get_remains(surf_action_t action);
 
 FILE *surf_fopen(const char *name, const char *mode);
 
@@ -87,7 +107,7 @@ double net_action_get_remains(surf_action_t action);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 int net_get_link_latency_limited(surf_action_t action);
 #endif
-void net_action_set_max_duration(surf_action_t action, double duration);
+
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other