xbt_dynar_free(&p_energy->power_range_watts_list);
xbt_dynar_free(&p_powerPeakList);
xbt_free(p_energy);
- return;
}
bool CpuCas01Lmm::isUsed()
if (!p_maxminSystem)
p_maxminSystem = lmm_system_new(m_selectiveUpdate);
- routing_model_create(static_cast<ResourcePtr>(createResource("__loopback__",
+ const char* lb_name = "__loopback__";
+ routing_model_create(static_cast<ResourcePtr>(createResource(lb_name,
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL)));
NetworkCm02Model() : Model("network") {
this->initialize();
}
+ ~NetworkCm02Model() {
+ lmm_system_free(p_maxminSystem);
+ if (p_actionHeap)
+ xbt_heap_free(p_actionHeap);
+ if (p_modifiedSet)
+ xbt_swag_free(p_modifiedSet);
+ }
//FIXME:NetworkCm02LinkPtr createResource(string name);
NetworkCm02LinkLmmPtr createResource(const char *name,
double bw_initial,
{}
Resource::Resource(){
- //FIXME:free(m_name);
- //FIXME:xbt_dict_free(&m_properties);
}
const char *Resource::getName()
public:
Resource();
Resource(ModelPtr model, const char *name, xbt_dict_t properties);
- virtual ~Resource() {};
+ virtual ~Resource() {
+ xbt_free((void*)m_name);
+ xbt_dict_free(&m_properties);
+ };
virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0;
info->p_rcComponent = new_as->p_routingFather;
info->p_rcType = SURF_NETWORK_ELEMENT_AS;
- info->p_name = new_as->p_name;
+ info->p_name = xbt_strdup(new_as->p_name);
xbt_lib_set(as_router_lib, info->p_name, ROUTING_ASR_LEVEL,
(void *) info);
xbt_dynar_t p_linkUpDownList;
As(){};
- virtual ~As(){};
+ virtual ~As(){
+ xbt_free(p_name);
+ };
virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency)=0;
virtual xbt_dynar_t getOneLinkRoutes()=0;
struct RoutingEdge {
public:
+ ~RoutingEdge() { xbt_free(p_name);};
AsPtr p_rcComponent;
e_surf_network_element_type_t p_rcType;
int m_id;
int i, j;
/* Delete routing table */
for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++)
+ for (j = 0; j < table_size; j++) {
+ xbt_dynar_free(&TO_ROUTE_FULL(i,j)->link_list);
xbt_free(TO_ROUTE_FULL(i,j));
+ }
xbt_free(p_routingTable);
}