#include "surf/surf.h"
#include "surf/surf_private.h"
-//FIXME:#include "surf/network_private.h"
-
typedef enum {
INSTR_US_DECLARE,
INSTR_US_SET,
#ifdef HAVE_TRACING
#include "surf/surf_private.h"
-//FIXME:#include "surf/network_private.h"
#include "xbt/graph.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy");
: m_name(xbt_strdup(name)), m_properties(props), p_model(model), m_running(true)
{}
-Resource::Resource(){
-}
+Resource::Resource()
+: m_name(NULL), m_properties(NULL), p_model(NULL)
+{}
const char *Resource::getName()
{
Resource(ModelPtr model, const char *name, xbt_dict_t properties);
virtual ~Resource() {
xbt_free((void*)m_name);
- xbt_dict_free(&m_properties);
+ xbt_dict_free(&m_properties);
};
virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0;
/* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */
if (e_route_bypass) {
xbt_dynar_merge(links, &e_route_bypass->link_list);
- //FIXME:generic_free_route(e_route_bypass);
+ generic_free_route(e_route_bypass);
return;
}
class RoutingPlatf;
typedef RoutingPlatf *RoutingPlatfPtr;
-
-/*FIXME:class RoutingModelDescription {
- const char *p_name;
- const char *p_desc;
- AsPtr create();
- void end(AsPtr as);
-};*/
-
struct As {
public:
xbt_dynar_t p_indexNetworkElm;
WorkstationModelPtr surf_workstation_model = NULL;
-//FIXME:Faire hériter ou composer de cup et network
-
/*************
* CallBacks *
*************/
class WorkstationAction;
typedef WorkstationAction *WorkstationActionPtr;
-/*FIXME:class WorkstationActionLmm;
-typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
+class WorkstationActionLmm;
+typedef WorkstationActionLmm *WorkstationActionLmmPtr;
/*********
* Tools *
"Host '%s' declared several times in the platform file.",
name);
- wk = new WorkstationL07(this, name, cpu_properties,
+ wk = new WorkstationL07(this, name, NULL,
static_cast<RoutingEdgePtr>(xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL)),
dynamic_cast<CpuPtr>(static_cast<ResourcePtr>(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL))));
class WorkstationL07ActionLmm;
typedef WorkstationL07ActionLmm *WorkstationL07ActionLmmPtr;
-/*FIXME:class WorkstationActionLmm;
-typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
-
/*********
* Tools *
*********/