X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..e25d6f4f9fafeb2508be1de0250dcf5be824f8fd:/src/include/surf/surf.h?ds=sidebyside

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 97bdd5705d..2d12f29149 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -18,6 +18,7 @@
 #include "xbt/lib.h"
 #include "surf/surf_routing.h"
 #include "simgrid/platf_interface.h"
+#include "simgrid/datatypes.h"
 
 SG_BEGIN_DECL()
 /* Actions and models are highly connected structures... */
@@ -47,7 +48,7 @@ class Model;
 class CpuModel;
 class WorkstationModel;
 class WorkstationVMModel;
-class NetworkCm02Model;
+class NetworkModel;
 class StorageModel;
 class Resource;
 class ResourceLmm;
@@ -57,15 +58,15 @@ class Cpu;
 class Action;
 class ActionLmm;
 class StorageActionLmm;
-class As;
-class RoutingEdge;
+struct As;
+struct RoutingEdge;
 class RoutingPlatf;
 #else
 typedef struct Model Model;
 typedef struct CpuModel CpuModel;
 typedef struct WorkstationModel WorkstationModel;
 typedef struct WorkstationVMModel WorkstationVMModel;
-typedef struct NetworkCm02Model NetworkCm02Model;
+typedef struct NetworkModel NetworkModel;
 typedef struct StorageModel StorageModel;
 typedef struct Resource Resource;
 typedef struct ResourceLmm ResourceLmm;
@@ -91,7 +92,7 @@ typedef CpuModel *surf_cpu_model_t;
 typedef WorkstationModel *surf_workstation_model_t;
 typedef WorkstationVMModel *surf_vm_workstation_model_t;
 
-typedef NetworkCm02Model *surf_network_model_t;
+typedef NetworkModel *surf_network_model_t;
 typedef StorageModel *surf_storage_model_t;
 
 typedef xbt_dictelm_t surf_resource_t;
@@ -183,28 +184,6 @@ typedef enum {
 
 } e_surf_vm_state_t;
 
-typedef struct ws_params {
-  int ncpus;
-  long ramsize;
-  int overcommit;
-
-  /* The size of other states than memory pages, which is out-of-scope of dirty
-   * page tracking. */
-  long devsize;
-  int skip_stage1;
-  int skip_stage2;
-  double max_downtime;
-
-  double dp_rate;
-  double dp_cap; /* bytes per 1 flop execution */
-
-  double xfer_cpu_overhead;
-  double dpt_cpu_overhead;
-
-  /* set migration speed */
-  double mig_speed;
-} s_ws_params_t, *ws_params_t;
-
 /***************************/
 /* Generic model object */
 /***************************/
@@ -231,9 +210,6 @@ static inline void *surf_storage_resource_by_name(const char *name){
   return xbt_lib_get_elm_or_null(storage_lib, name);
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 char *surf_routing_edge_name(sg_routing_edge_t edge);
 void *surf_as_cluster_get_backbone(AS_t as);
 void surf_as_cluster_set_backbone(AS_t as, void* backbone);
@@ -252,7 +228,7 @@ surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model,
 xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t model, surf_resource_t src, surf_resource_t dst);
 void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host);
 surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate);
-const char *surf_resource_name(surf_cpp_resource_t resource);
+XBT_PUBLIC(const char * ) surf_resource_name(surf_cpp_resource_t resource);
 xbt_dict_t surf_resource_get_properties(surf_cpp_resource_t resource);
 e_surf_resource_state_t surf_resource_get_state(surf_cpp_resource_t resource);
 void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state);
@@ -263,11 +239,11 @@ surf_action_t surf_workstation_execute(surf_resource_t resource, double size);
 surf_action_t surf_workstation_sleep(surf_resource_t resource, double duration);
 surf_action_t surf_workstation_open(surf_resource_t workstation, const char* mount, const char* path);
 surf_action_t surf_workstation_close(surf_resource_t workstation, surf_file_t fd);
-surf_action_t surf_workstation_read(surf_resource_t resource, surf_file_t fd, sg_storage_size_t size);
-surf_action_t surf_workstation_write(surf_resource_t resource, surf_file_t fd, sg_storage_size_t size);
+surf_action_t surf_workstation_read(surf_resource_t resource, surf_file_t fd, sg_size_t size);
+surf_action_t surf_workstation_write(surf_resource_t resource, surf_file_t fd, sg_size_t size);
 xbt_dynar_t surf_workstation_get_info(surf_resource_t resource, surf_file_t fd);
-sg_storage_size_t surf_workstation_get_free_size(surf_resource_t resource, const char* name);
-sg_storage_size_t surf_workstation_get_used_size(surf_resource_t resource, const char* name);
+sg_size_t surf_workstation_get_free_size(surf_resource_t resource, const char* name);
+sg_size_t surf_workstation_get_used_size(surf_resource_t resource, const char* name);
 xbt_dynar_t surf_workstation_get_vms(surf_resource_t resource);
 void surf_workstation_get_params(surf_resource_t resource, ws_params_t params);
 void surf_workstation_set_params(surf_resource_t resource, ws_params_t params);
@@ -291,11 +267,13 @@ xbt_dict_t surf_workstation_get_storage_list(surf_resource_t workstation);
 int surf_workstation_unlink(surf_resource_t workstation, surf_file_t fd);
 surf_action_t surf_workstation_ls(surf_resource_t workstation, const char* mount, const char *path);
 size_t surf_workstation_get_size(surf_resource_t workstation, surf_file_t fd);
+size_t surf_workstation_file_tell(surf_resource_t workstation, surf_file_t fd);
+int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd, sg_size_t offset, int origin);
 int surf_network_link_is_shared(surf_cpp_resource_t link);
 double surf_network_link_get_bandwidth(surf_cpp_resource_t link);
 double surf_network_link_get_latency(surf_cpp_resource_t link);
 xbt_dict_t surf_storage_get_content(surf_resource_t resource);
-sg_storage_size_t surf_storage_get_size(surf_resource_t resource);
+sg_size_t surf_storage_get_size(surf_resource_t resource);
 void surf_storage_rename(surf_resource_t resource, const char* src, const char* dest);
 void *surf_action_get_data(surf_action_t action);
 void surf_action_set_data(surf_action_t action, void *data);
@@ -315,9 +293,6 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound);
 surf_file_t surf_storage_action_get_file(surf_action_t action);
 xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action);
 surf_model_t surf_resource_model(const void *host, int level);
-#ifdef __cplusplus
-}
-#endif
 
 /**************************************/
 /* Implementations of model object */
@@ -612,9 +587,6 @@ XBT_PUBLIC(xbt_dict_t) watched_hosts_lib;
 /*******************************************/
 /*** SURF Platform *************************/
 /*******************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
 XBT_PUBLIC_DATA(AS_t) surf_AS_get_routing_root(void); 
 XBT_PUBLIC_DATA(const char *) surf_AS_get_name(AS_t as);
 XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_routing_sons(AS_t as);
@@ -623,9 +595,6 @@ 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);
-#ifdef __cplusplus
-}
-#endif
 
 /*******************************************/
 /*** SURF Globals **************************/