X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be3d6e14a901f6df074da0498f3b45a261b75cb9..48358ed87fd24b70850ed140ea72e40cf8e04df2:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 09f0db0416..b7d707e7e5 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -301,30 +301,9 @@ static inline const char * surf_cpu_name(surf_cpu_t cpu) {
 /** @brief Get the properties of an host */
 XBT_PUBLIC(xbt_dict_t) sg_host_get_properties(sg_host_t host);
 
-
-/** @brief Get the state of a surf resource (cpu, host, network, …) */
-XBT_PUBLIC(e_surf_resource_state_t) surf_resource_get_state(surf_cpp_resource_t resource);
-
-static XBT_INLINE e_surf_resource_state_t surf_host_get_state(surf_host_t host) {
-	return surf_resource_get_state((surf_cpp_resource_t)host);
-}
-
-
-/** @brief Set the state of a surf resource (cpu, host, network, …) */
-XBT_PUBLIC(void) surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state);
-static inline void surf_host_set_state(surf_host_t host, e_surf_resource_state_t state) {
-	surf_resource_set_state((surf_cpp_resource_t)host, state);
-}
-
-/** @brief Get the speed of the cpu associated to a host */
-XBT_PUBLIC(double) surf_host_get_speed(sg_host_t resource, double load);
-
 /** @brief Get the available speed of cpu associated to a host */
 XBT_PUBLIC(double) surf_host_get_available_speed(sg_host_t host);
 
-/** @brief Get the number of cores of the cpu associated to a host */
-XBT_PUBLIC(int) surf_host_get_core(sg_host_t host);
-
 /** @brief Create a computation action on the given host */
 XBT_PUBLIC(surf_action_t) surf_host_execute(sg_host_t host, double size);
 
@@ -451,25 +430,6 @@ XBT_PUBLIC(void) surf_vm_set_bound(sg_host_t resource, double bound);
  */
 XBT_PUBLIC(void) surf_vm_set_affinity(sg_host_t resource, sg_host_t cpu, unsigned long mask);
 
-/**
- * @brief Execute some quantity of computation
- *
- * @param cpu The surf cpu
- * @param size The value of the processing amount (in flop) needed to process
- * @return The surf action corresponding to the processing
- */
-XBT_PUBLIC(surf_action_t) surf_cpu_execute(sg_host_t cpu, double size);
-
-/**
- * @brief Make the cpu sleep for duration (in seconds)
- * @details [long description]
- *
- * @param cpu The surf cpu
- * @param duration The number of seconds to sleep
- * @return The surf action corresponding to the sleeping
- */
-XBT_PUBLIC(surf_action_t) surf_cpu_sleep(sg_host_t cpu, double duration);
-
 /**
  * @brief Get the host power peak
  * @details [long description]
@@ -638,13 +598,6 @@ XBT_PUBLIC(void*) surf_action_get_data(surf_action_t action);
  */
 XBT_PUBLIC(void) surf_action_set_data(surf_action_t action, void *data);
 
-/**
- * @brief Unreference an action
- *
- * @param action The surf action
- */
-XBT_PUBLIC(void) surf_action_unref(surf_action_t action);
-
 /**
  * @brief Get the start time of an action
  *
@@ -1081,7 +1034,7 @@ XBT_PUBLIC_DATA(const char *) surf_AS_get_model(AS_t as);
 XBT_PUBLIC_DATA(xbt_dynar_t) surf_AS_get_hosts(AS_t as);
 XBT_PUBLIC_DATA(void) surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
 XBT_PUBLIC_DATA(AS_t) surf_platf_get_root(routing_platf_t platf);
-XBT_PUBLIC_DATA(e_surf_network_element_type_t) surf_routing_edge_get_rc_type(sg_routing_edge_t edge);
+XBT_PUBLIC_DATA(e_surf_network_element_type_t) surf_routing_edge_get_rc_type(sg_netcard_t edge);
 
 /*******************************************/
 /*** SURF Globals **************************/
@@ -1189,7 +1142,7 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi
 /********** Routing **********/
 void routing_AS_begin(sg_platf_AS_cbarg_t AS);
 void routing_AS_end(void);
-surf_RoutingEdge* routing_add_host(surf_As* as, sg_platf_host_cbarg_t host);
+surf_NetCard* routing_add_host(surf_As* as, sg_platf_host_cbarg_t host);
 void routing_cluster_add_backbone(void* bb);
 surf_As* routing_get_current();