#define SG_PLATF_H
#include "simgrid/host.h"
+#include "simgrid/s4u/Link.hpp"
#include "src/surf/xml/platf.hpp"
+#include "src/surf/xml/simgrid_dtd.h"
+
#include <map>
#include <string>
#include <vector>
double latency = 0;
tmgr_trace_t latency_trace = nullptr;
tmgr_trace_t state_trace = nullptr;
- e_surf_link_sharing_policy_t policy = SURF_LINK_FATPIPE;
+ simgrid::s4u::Link::SharingPolicy policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
std::map<std::string, std::string>* properties = nullptr;
};
class RouteCreationArgs {
public:
- bool symmetrical = false;
- sg_netpoint_t src = nullptr;
- sg_netpoint_t dst = nullptr;
- sg_netpoint_t gw_src = nullptr;
- sg_netpoint_t gw_dst = nullptr;
- std::vector<simgrid::surf::LinkImpl*> link_list;
+ bool symmetrical = false;
+ NetPoint* src = nullptr;
+ NetPoint* dst = nullptr;
+ NetPoint* gw_src = nullptr;
+ NetPoint* gw_dst = nullptr;
+ std::vector<simgrid::kernel::resource::LinkImpl*> link_list;
};
enum class ClusterTopology { DRAGONFLY = 3, FAT_TREE = 2, FLAT = 1, TORUS = 0 };
std::string topo_parameters;
std::map<std::string, std::string>* properties;
std::string router_id;
- e_surf_link_sharing_policy_t sharing_policy;
- e_surf_link_sharing_policy_t bb_sharing_policy;
+ simgrid::s4u::Link::SharingPolicy sharing_policy;
+ simgrid::s4u::Link::SharingPolicy bb_sharing_policy;
};
class CabinetCreationArgs {
};
}}}
-extern "C" {
-#include "src/surf/xml/simgrid_dtd.h"
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
/********** Routing **********/
-void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb);
+void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb);
/*** END of the parsing cruft ***/
XBT_PUBLIC void sg_platf_begin(); // Start a new platform
XBT_PUBLIC int surf_parse_get_debug();
XBT_PUBLIC void surf_parse_set_debug(int bdebug);
XBT_PUBLIC int surf_parse_lex_destroy();
-}
namespace simgrid {
namespace surf {