/* platf_private.h - Interface to the SimGrid platforms which visibility should be limited to this directory */
-/* Copyright (c) 2004-2018. The SimGrid Team.
+/* Copyright (c) 2004-2019. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
std::vector<double> speed_per_pstate;
int pstate = 0;
int core_amount = 0;
- tmgr_trace_t speed_trace = nullptr;
- tmgr_trace_t state_trace = nullptr;
- const char* coord = nullptr;
- std::map<std::string, std::string>* properties = nullptr;
+ profile::Profile* speed_trace = nullptr;
+ profile::Profile* state_trace = nullptr;
+ std::string coord = "";
+ std::unordered_map<std::string, std::string>* properties = nullptr;
+ std::vector<simgrid::kernel::resource::DiskImpl*> disks;
};
class HostLinkCreationArgs {
class LinkCreationArgs {
public:
std::string id;
- double bandwidth = 0;
- tmgr_trace_t bandwidth_trace = nullptr;
+ std::vector<double> bandwidths;
+ profile::Profile* bandwidth_trace = nullptr;
double latency = 0;
- tmgr_trace_t latency_trace = nullptr;
- tmgr_trace_t state_trace = nullptr;
+ profile::Profile* latency_trace = nullptr;
+ profile::Profile* state_trace = nullptr;
simgrid::s4u::Link::SharingPolicy policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
- std::map<std::string, std::string>* properties = nullptr;
+ std::unordered_map<std::string, std::string>* properties = nullptr;
};
class PeerCreationArgs {
double bw_in;
double bw_out;
std::string coord;
- tmgr_trace_t speed_trace;
- tmgr_trace_t state_trace;
+ profile::Profile* speed_trace;
+ profile::Profile* state_trace;
};
class RouteCreationArgs {
double limiter_link = 0;
ClusterTopology topology;
std::string topo_parameters;
- std::map<std::string, std::string>* properties;
+ std::unordered_map<std::string, std::string>* properties;
std::string router_id;
simgrid::s4u::Link::SharingPolicy sharing_policy;
simgrid::s4u::Link::SharingPolicy bb_sharing_policy;
std::string id;
std::string type_id;
std::string content;
- std::map<std::string, std::string>* properties;
+ std::unordered_map<std::string, std::string>* properties;
std::string attach;
};
std::string id;
std::string model;
std::string content;
- std::map<std::string, std::string>* properties;
- std::map<std::string, std::string>* model_properties;
+ std::unordered_map<std::string, std::string>* properties;
+ std::unordered_map<std::string, std::string>* model_properties;
sg_size_t size;
};
+class DiskCreationArgs {
+public:
+ std::string id;
+ std::unordered_map<std::string, std::string>* properties;
+ double read_bw;
+ double write_bw;
+};
+
class MountCreationArgs {
public:
std::string storageId;
std::string name;
};
-class TraceCreationArgs {
+class ProfileCreationArgs {
public:
std::string id;
std::string file;
class ActorCreationArgs {
public:
std::vector<std::string> args;
- std::map<std::string, std::string>* properties = nullptr;
+ std::unordered_map<std::string, std::string>* properties = nullptr;
const char* host = nullptr;
const char* function = nullptr;
double start_time = 0.0;
};
}}}
-extern "C" {
-
/********** Routing **********/
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 void sg_platf_end(); // Finish the creation of the platform
-
-XBT_PUBLIC simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new Zone
+XBT_PUBLIC simgrid::kernel::routing::NetZoneImpl*
+sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new Zone
+XBT_PUBLIC void sg_platf_new_Zone_set_properties(std::unordered_map<std::string, std::string>* props);
XBT_PUBLIC void sg_platf_new_Zone_seal(); // That Zone is fully described
XBT_PUBLIC void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* host); // Add a host to the current Zone
XBT_PUBLIC void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer); // Add a peer to the current Zone
XBT_PUBLIC void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* clust); // Add a cluster to the current Zone
XBT_PUBLIC void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet); // Add a cabinet to the current Zone
-XBT_PUBLIC simgrid::kernel::routing::NetPoint* // Add a router to the current Zone
- sg_platf_new_router(std::string, const char* coords);
+XBT_PUBLIC simgrid::kernel::routing::NetPoint* // Add a router to the current Zone
+ sg_platf_new_router(const std::string&, const char* coords);
XBT_PUBLIC void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a route
XBT_PUBLIC void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassroute); // Add a bypassRoute
-XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace);
+XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* trace);
+
+XBT_PUBLIC simgrid::kernel::resource::DiskImpl*
+sg_platf_new_disk(simgrid::kernel::routing::DiskCreationArgs* disk); // Add a disk to the current host
XBT_PUBLIC void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage); // Add a storage to the current Zone
XBT_PUBLIC void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type);
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 {
-extern XBT_PRIVATE simgrid::xbt::signal<void(kernel::routing::ClusterCreationArgs*)> on_cluster;
+extern XBT_PRIVATE simgrid::xbt::signal<void(kernel::routing::ClusterCreationArgs const&)> on_cluster;
}
}