X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e99be14456cffb23fdd550aa42230e3b0843740..2c1cf331f7be1c55098faf7ba7a542149576614c:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index d6cd014cff..52a2e56a62 100644
--- 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
  *
@@ -544,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]
@@ -1021,20 +975,15 @@ XBT_PUBLIC(void) parse_platform_file(const char *file);
 
 /* For the trace and trace:connect tag (store their content till the end of the parsing) */
 XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_speed;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_bw;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_lat;
 
-
-XBT_PUBLIC(double) get_cpu_speed(const char *power);
+XBT_PUBLIC(double) parse_cpu_speed(const char *str_speed);
 
 XBT_PUBLIC(xbt_dict_t) get_as_router_properties(const char* name);
 
-int surf_get_nthreads(void);
-void surf_set_nthreads(int nthreads);
-
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other