Compile trace_mgr with g++. Next step: objectification

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 702678e..0cc2122 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -35,10 +35,10 @@ extern XBT_PRIVATE int sg_network_crosstraffic;
 extern XBT_PRIVATE xbt_dynar_t surf_path;
 
 typedef enum {
-  SURF_NETWORK_ELEMENT_NULL = 0,        /* NULL */
-  SURF_NETWORK_ELEMENT_HOST,    /* host type */
-  SURF_NETWORK_ELEMENT_ROUTER,  /* router type */
-  SURF_NETWORK_ELEMENT_AS       /* AS type */
+  SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */
+  SURF_NETWORK_ELEMENT_HOST,     /* host type */
+  SURF_NETWORK_ELEMENT_ROUTER,   /* router type */
+  SURF_NETWORK_ELEMENT_AS        /* AS type */
 } e_surf_network_element_type_t;
 
 #ifdef __cplusplus
@@ -223,22 +223,6 @@ XBT_PUBLIC(surf_action_t) surf_model_extract_done_action_set(surf_model_t model)
  */
 XBT_PUBLIC(surf_action_t) surf_model_extract_failed_action_set(surf_model_t model);
 
-/**
- * @brief Pop an action from the ready actions set
- *
- * @param model The model from which the action is extracted
- * @return An action in ready state
- */
-XBT_PUBLIC(surf_action_t) surf_model_extract_ready_action_set(surf_model_t model);
-
-/**
- * @brief Pop an action from the running actions set
- *
- * @param model The model from which the action is extracted
- * @return An action in running state
- */
-XBT_PUBLIC(surf_action_t) surf_model_extract_running_action_set(surf_model_t model);
-
 /**
  * @brief Get the size of the running action set of a model
  *
@@ -247,25 +231,6 @@ XBT_PUBLIC(surf_action_t) surf_model_extract_running_action_set(surf_model_t mod
  */
 XBT_PUBLIC(int) surf_model_running_action_set_size(surf_model_t model);
 
-/**
- * @brief Execute a parallel task
- * @details [long description]
- *
- * @param model The model which handle the parallelisation
- * @param host_nb The number of hosts
- * @param host_list The list of hosts on which the task is executed
- * @param flops_amount The processing amount (in flop) needed to process
- * @param bytes_amount The amount of data (in bytes) needed to transfer
- * @param rate [description]
- * @return The action corresponding to the parallele execution task
- */
-XBT_PUBLIC(surf_action_t) surf_host_model_execute_parallel_task(surf_host_model_t model,
-                                                   int host_nb,
-                                        sg_host_t *host_list,
-                                            double *flops_amount,
-                                            double *bytes_amount,
-                                            double rate);
-
 /** @brief Get the route (dynar of sg_link_t) between two hosts */
 XBT_PUBLIC(xbt_dynar_t) surf_host_model_get_route(
   surf_host_model_t model, sg_host_t src, sg_host_t dst);
@@ -563,36 +528,6 @@ XBT_PUBLIC(double) surf_action_get_finish_time(surf_action_t action);
  */
 XBT_PUBLIC(double) surf_action_get_remains(surf_action_t action);
 
-/**
- * @brief Suspend an action
- *
- * @param action The surf action
- */
-XBT_PUBLIC(void) surf_action_suspend(surf_action_t action);
-
-/**
- * @brief Resume an action
- *
- * @param action The surf action
- */
-XBT_PUBLIC(void) surf_action_resume(surf_action_t action);
-
-/**
- * @brief Cancel an action
- *
- * @param action The surf action
- */
-XBT_PUBLIC(void) surf_action_cancel(surf_action_t action);
-
-/**
- * @brief Set the priority of an action
- * @details [long description]
- *
- * @param action The surf action
- * @param priority The new priority [TODO]
- */
-XBT_PUBLIC(void) surf_action_set_priority(surf_action_t action, double priority);
-
 /**
  * @brief Set the category of an action
  * @details [long description]