A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uniformization
[simgrid.git]
/
src
/
include
/
surf
/
surf.h
diff --git
a/src/include/surf/surf.h
b/src/include/surf/surf.h
index
addf3d5
..
09941a4
100644
(file)
--- a/
src/include/surf/surf.h
+++ b/
src/include/surf/surf.h
@@
-1,11
+1,10
@@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#ifndef
_
SURF_SURF_H
-#define
_
SURF_SURF_H
+#ifndef SURF_SURF_H
+#define SURF_SURF_H
#include "xbt/swag.h"
#include "xbt/dynar.h"
#include "xbt/swag.h"
#include "xbt/dynar.h"
@@
-31,7
+30,6
@@
extern XBT_PRIVATE double sg_latency_factor;
extern XBT_PRIVATE double sg_bandwidth_factor;
extern XBT_PRIVATE double sg_weight_S_parameter;
extern XBT_PRIVATE int sg_network_crosstraffic;
extern XBT_PRIVATE double sg_bandwidth_factor;
extern XBT_PRIVATE double sg_weight_S_parameter;
extern XBT_PRIVATE int sg_network_crosstraffic;
-extern XBT_PRIVATE xbt_dynar_t surf_path;
#ifdef __cplusplus
#ifdef __cplusplus
@@
-44,12
+42,8
@@
class HostModel;
class NetworkModel;
class StorageModel;
class Resource;
class NetworkModel;
class StorageModel;
class Resource;
-class ResourceLmm;
-class HostCLM03;
class NetworkCm02Link;
class Action;
class NetworkCm02Link;
class Action;
-class ActionLmm;
-class StorageActionLmm;
}
}
}
}
@@
-58,15
+52,11
@@
typedef simgrid::surf::CpuModel surf_CpuModel;
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::HostModel surf_HostModel;
typedef simgrid::surf::NetworkModel surf_NetworkModel;
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::HostModel surf_HostModel;
typedef simgrid::surf::NetworkModel surf_NetworkModel;
+typedef simgrid::surf::Storage surf_Storage;
typedef simgrid::surf::StorageModel surf_StorageModel;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::surf::StorageModel surf_StorageModel;
typedef simgrid::surf::Resource surf_Resource;
-typedef simgrid::surf::ResourceLmm surf_ResourceLmm;
typedef simgrid::surf::HostImpl surf_Host;
typedef simgrid::surf::HostImpl surf_Host;
-typedef simgrid::surf::HostCLM03 surf_HostCLM03;
-typedef simgrid::surf::NetworkCm02Link surf_NetworkCm02Link;
typedef simgrid::surf::Action surf_Action;
typedef simgrid::surf::Action surf_Action;
-typedef simgrid::surf::ActionLmm surf_ActionLmm;
-typedef simgrid::surf::StorageActionLmm surf_StorageActionLmm;
#else
#else
@@
-75,15
+65,11
@@
typedef struct surf_CpuModel surf_CpuModel;
typedef struct surf_Cpu surf_Cpu;
typedef struct surf_HostModel surf_HostModel;
typedef struct surf_NetworkModel surf_NetworkModel;
typedef struct surf_Cpu surf_Cpu;
typedef struct surf_HostModel surf_HostModel;
typedef struct surf_NetworkModel surf_NetworkModel;
+typedef struct surf_Storage surf_Storage;
typedef struct surf_StorageModel surf_StorageModel;
typedef struct surf_Resource surf_Resource;
typedef struct surf_StorageModel surf_StorageModel;
typedef struct surf_Resource surf_Resource;
-typedef struct surf_ResourceLmm surf_ResourceLmm;
-typedef struct surf_HostCLM03 surf_HostCLM03;
typedef struct surf_Host surf_Host;
typedef struct surf_Host surf_Host;
-typedef struct surf_NetworkCm02Link surf_NetworkCm02Link;
typedef struct surf_Action surf_Action;
typedef struct surf_Action surf_Action;
-typedef struct surf_ActionLmm surf_ActionLmm;
-typedef struct surf_StorageActionLmm surf_StorageActionLmm;
#endif
#endif
@@
-95,15
+81,12
@@
typedef struct surf_StorageActionLmm surf_StorageActionLmm;
*/
typedef surf_Model *surf_model_t;
typedef surf_CpuModel *surf_cpu_model_t;
*/
typedef surf_Model *surf_model_t;
typedef surf_CpuModel *surf_cpu_model_t;
-typedef surf_Cpu* surf_cpu_t;
typedef surf_HostModel *surf_host_model_t;
typedef surf_NetworkModel *surf_network_model_t;
typedef surf_StorageModel *surf_storage_model_t;
typedef surf_HostModel *surf_host_model_t;
typedef surf_NetworkModel *surf_network_model_t;
typedef surf_StorageModel *surf_storage_model_t;
+typedef surf_Storage* surf_storage_t;
typedef xbt_dictelm_t surf_resource_t;
typedef xbt_dictelm_t surf_resource_t;
-typedef surf_Resource *surf_cpp_resource_t;
-typedef surf_Host *surf_host_t;
-typedef surf_Cpu *surf_cpu_t;
/** @ingroup SURF_c_bindings
* \brief Action structure
/** @ingroup SURF_c_bindings
* \brief Action structure
@@
-134,8
+117,9
@@
XBT_PUBLIC(void) model_help(const char *category, s_surf_model_description_t * t
/* Generic model object */
/***************************/
/* Generic model object */
/***************************/
-static inline void *surf_storage_resource_priv(const void *storage){
- return (void*)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL);
+static inline surf_storage_t surf_storage_resource_priv(const void* storage)
+{
+ return (surf_storage_t)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL);
}
static inline void *surf_storage_resource_by_name(const char *name){
}
static inline void *surf_storage_resource_by_name(const char *name){
@@
-269,14
+253,6
@@
XBT_PUBLIC(int) surf_host_file_move(sg_host_t host, surf_file_t fd, const char*
*/
XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host, surf_file_t fd, sg_offset_t offset, int origin);
*/
XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host, surf_file_t fd, sg_offset_t offset, int origin);
-/**
- * @brief Get the content of a storage
- *
- * @param resource The surf storage
- * @return A xbt_dict_t with path as keys and size in bytes as values
- */
-XBT_PUBLIC(xbt_dict_t) surf_storage_get_content(surf_resource_t resource);
-
/**
* @brief Get the size in bytes of a storage
*
/**
* @brief Get the size in bytes of a storage
*
@@
-346,6
+322,7
@@
XBT_PUBLIC(xbt_dict_t) surf_storage_action_get_ls_dict(surf_action_t action);
* may not exist.
*/
XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource);
* may not exist.
*/
XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource);
+XBT_PUBLIC(const char * ) surf_storage_get_name(surf_resource_t resource);
/** @} */
/** @} */
@@
-627,8
+604,6
@@
XBT_PUBLIC(void) surf_exit();
/* Prototypes of the functions that handle the properties */
XBT_PUBLIC_DATA(xbt_dict_t) current_property_set;// the prop set for the currently parsed element (also used in SIMIX)
/* Prototypes of the functions that handle the properties */
XBT_PUBLIC_DATA(xbt_dict_t) current_property_set;// the prop set for the currently parsed element (also used in SIMIX)
-/* The same for model_prop set*/
-XBT_PUBLIC_DATA(xbt_dict_t) current_model_property_set;
/* surf parse file related (public because called from a test suite) */
XBT_PUBLIC(void) parse_platform_file(const char *file);
/* surf parse file related (public because called from a test suite) */
XBT_PUBLIC(void) parse_platform_file(const char *file);
@@
-659,4
+634,5
@@
xbt_graph_t instr_routing_platform_graph ();
void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);
SG_END_DECL()
void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);
SG_END_DECL()
-#endif /* _SURF_SURF_H */
+
+#endif