X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..6c12a132ca10eefd1d566e489e837e459db4d979:/src/surf/workstation_ptask_L07.cpp diff --git a/src/surf/workstation_ptask_L07.cpp b/src/surf/workstation_ptask_L07.cpp index a2b4ac6607..db86aab305 100644 --- a/src/surf/workstation_ptask_L07.cpp +++ b/src/surf/workstation_ptask_L07.cpp @@ -14,17 +14,49 @@ static int ptask_host_count = 0; static xbt_dict_t ptask_parallel_task_link_set = NULL; lmm_system_t ptask_maxmin_system = NULL; + +/**************************************/ +/*** Resource Creation & Destruction **/ +/**************************************/ + +static void ptask_netlink_parse_init(sg_platf_link_cbarg_t link) +{ + netlink_parse_init(link); + current_property_set = NULL; +} + +static void ptask_define_callbacks() +{ + sg_platf_host_add_cb(cpu_parse_init); + sg_platf_host_add_cb(workstation_parse_init); + sg_platf_link_add_cb(ptask_netlink_parse_init); + sg_platf_postparse_add_cb(workstation_add_traces); +} + +void surf_workstation_model_init_ptask_L07(void) +{ + XBT_INFO("surf_workstation_model_init_ptask_L07"); + xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); + xbt_assert(!surf_network_model, "network model type already defined"); + ptask_define_callbacks(); + surf_workstation_model = new WorkstationL07Model(); + ModelPtr model = surf_workstation_model; + xbt_dynar_push(model_list, &model); + xbt_dynar_push(model_list_invoke, &model); +} + + WorkstationL07Model::WorkstationL07Model() : WorkstationModel("Workstation ptask_L07") { if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(1); surf_workstation_model = NULL; surf_network_model = new NetworkL07Model(); surf_cpu_model_pm = new CpuL07Model(); - routing_model_create(static_cast(surf_network_model->createResource("__loopback__", + routing_model_create(surf_network_model->createNetworkLink("__loopback__", 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL))); + SURF_LINK_FATPIPE, NULL)); p_cpuModel = surf_cpu_model_pm; } @@ -137,10 +169,9 @@ void WorkstationL07Model::updateActionsState(double /*now*/, double delta) ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, void **workstation_list, - double - *computation_amount, double - *communication_amount, - double rate) + double *flops_amount, + double *bytes_amount, + double rate) { WorkstationL07ActionPtr action; int i, j; @@ -159,7 +190,7 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, for (j = 0; j < workstation_nb; j++) { xbt_dynar_t route=NULL; - if (communication_amount[i * workstation_nb + j] > 0) { + if (bytes_amount[i * workstation_nb + j] > 0) { double lat=0.0; unsigned int cpt; void *_link; @@ -183,7 +214,7 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, xbt_dict_reset(ptask_parallel_task_link_set); for (i = 0; i < workstation_nb; i++) - if (computation_amount[i] > 0) + if (flops_amount[i] > 0) nb_host++; action = new WorkstationL07Action(this, 1, 0); @@ -193,8 +224,8 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, calloc but it seems to help valgrind... */ action->m_workstationNb = workstation_nb; action->p_workstationList = (WorkstationPtr *) workstation_list; - action->p_computationAmount = computation_amount; - action->p_communicationAmount = communication_amount; + action->p_computationAmount = flops_amount; + action->p_communicationAmount = bytes_amount; action->m_latency = latency; action->m_rate = rate; @@ -207,8 +238,8 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, for (i = 0; i < workstation_nb; i++) lmm_expand(ptask_maxmin_system, - static_cast(static_cast(workstation_list[i])->p_cpu)->getConstraint(), - action->getVariable(), computation_amount[i]); + static_cast(workstation_list[i])->p_cpu->getConstraint(), + action->getVariable(), flops_amount[i]); for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { @@ -216,7 +247,7 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, LinkL07Ptr link; xbt_dynar_t route=NULL; - if (communication_amount[i * workstation_nb + j] == 0.0) + if (bytes_amount[i * workstation_nb + j] == 0.0) continue; routing_platf->getRouteAndLatency(static_cast(workstation_list[i])->p_netElm, @@ -227,7 +258,7 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, link = static_cast(_link); lmm_expand_add(ptask_maxmin_system, link->getConstraint(), action->getVariable(), - communication_amount[i * workstation_nb + j]); + bytes_amount[i * workstation_nb + j]); } } } @@ -237,15 +268,10 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, action->setRemains(0.0); } - return static_cast(action); + return action; } -ResourcePtr WorkstationL07Model::createResource(const char *name, double /*power_scale*/, - double /*power_initial*/, - tmgr_trace_t /*power_trace*/, - e_surf_resource_state_t /*state_initial*/, - tmgr_trace_t /*state_trace*/, - xbt_dict_t /*cpu_properties*/) +WorkstationPtr WorkstationL07Model::createWorkstation(const char *name) { WorkstationL07Ptr wk = NULL; xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)), @@ -256,7 +282,7 @@ ResourcePtr WorkstationL07Model::createResource(const char *name, double /*power static_cast(xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL)), static_cast(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL))); - xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, static_cast(wk)); + xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, wk); return wk;//FIXME:xbt_lib_get_elm_or_null(host_lib, name); } @@ -265,17 +291,17 @@ ActionPtr WorkstationL07Model::communicate(WorkstationPtr src, WorkstationPtr ds double size, double rate) { void **workstation_list = xbt_new0(void *, 2); - double *computation_amount = xbt_new0(double, 2); - double *communication_amount = xbt_new0(double, 4); + double *flops_amount = xbt_new0(double, 2); + double *bytes_amount = xbt_new0(double, 4); ActionPtr res = NULL; - workstation_list[0] = static_cast(src); - workstation_list[1] = static_cast(dst); - communication_amount[1] = size; + workstation_list[0] = src; + workstation_list[1] = dst; + bytes_amount[1] = size; res = executeParallelTask(2, workstation_list, - computation_amount, - communication_amount, rate); + flops_amount, + bytes_amount, rate); return res; } @@ -287,7 +313,7 @@ xbt_dynar_t WorkstationL07Model::getRoute(WorkstationPtr src, WorkstationPtr dst return route; } -CpuPtr CpuL07Model::createResource(const char *name, xbt_dynar_t powerPeak, +CpuPtr CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak, int pstate, double power_scale, tmgr_trace_t power_trace, int core, e_surf_resource_state_t state_initial, @@ -295,20 +321,22 @@ CpuPtr CpuL07Model::createResource(const char *name, xbt_dynar_t powerPeak, xbt_dict_t cpu_properties) { double power_initial = xbt_dynar_get_as(powerPeak, pstate, double); + xbt_dynar_free(&powerPeak); // kill memory leak xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)), "Host '%s' declared several times in the platform file.", name); CpuL07Ptr cpu = new CpuL07(this, name, cpu_properties, - power_initial, power_scale, power_trace,state_initial, state_trace); + power_initial, power_scale, power_trace, + core, state_initial, state_trace); - xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast(cpu)); + xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); - return cpu;//FIXME:xbt_lib_get_elm_or_null(host_lib, name); + return cpu; } -NetworkLinkPtr NetworkL07Model::createResource(const char *name, +NetworkLinkPtr NetworkL07Model::createNetworkLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -329,7 +357,7 @@ NetworkLinkPtr NetworkL07Model::createResource(const char *name, state_initial, state_trace, policy); - xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, static_cast(nw_link)); + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; } @@ -349,7 +377,7 @@ void WorkstationL07Model::addTraces() xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(host)); + host->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, host); } xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { @@ -359,7 +387,7 @@ void WorkstationL07Model::addTraces() xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->p_powerEvent = tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(host)); + host->p_powerEvent = tmgr_history_add_trace(history, trace, 0.0, 0, host); } /* Connect traces relative to network */ @@ -370,7 +398,7 @@ void WorkstationL07Model::addTraces() xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - link->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(link)); + link->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); } xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { @@ -380,7 +408,7 @@ void WorkstationL07Model::addTraces() xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - link->p_bwEvent = tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(link)); + link->p_bwEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); } xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { @@ -390,7 +418,7 @@ void WorkstationL07Model::addTraces() xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - link->p_latEvent = tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(link)); + link->p_latEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); } } @@ -427,23 +455,21 @@ double WorkstationL07::getConsumedEnergy() } CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props, - double power_initial, - double power_scale, tmgr_trace_t power_trace, - e_surf_resource_state_t state_initial, tmgr_trace_t state_trace) + double power_initial, double power_scale, tmgr_trace_t power_trace, + int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace) : Cpu(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, power_initial * power_scale), - 1, power_initial, power_scale) + core, power_initial, power_scale) { xbt_assert(m_powerScale > 0, "Power has to be >0"); if (power_trace) - p_powerEvent = tmgr_history_add_trace(history, power_trace, 0.0, 0, - static_cast(this)); + p_powerEvent = tmgr_history_add_trace(history, power_trace, 0.0, 0, this); else p_powerEvent = NULL; setState(state_initial); if (state_trace) - p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast(this)); + p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); } LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props, @@ -458,13 +484,13 @@ LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props, { m_bwCurrent = bw_initial; if (bw_trace) - p_bwEvent = tmgr_history_add_trace(history, bw_trace, 0.0, 0, static_cast(this)); + p_bwEvent = tmgr_history_add_trace(history, bw_trace, 0.0, 0, this); setState(state_initial); m_latCurrent = lat_initial; if (lat_trace) - p_latEvent = tmgr_history_add_trace(history, lat_trace, 0.0, 0, static_cast(this)); + p_latEvent = tmgr_history_add_trace(history, lat_trace, 0.0, 0, this); if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(getConstraint()); @@ -531,16 +557,16 @@ e_surf_resource_state_t WorkstationL07::getState() ActionPtr WorkstationL07::execute(double size) { void **workstation_list = xbt_new0(void *, 1); - double *computation_amount = xbt_new0(double, 1); - double *communication_amount = xbt_new0(double, 1); + double *flops_amount = xbt_new0(double, 1); + double *bytes_amount = xbt_new0(double, 1); - workstation_list[0] = static_cast(this); - communication_amount[0] = 0.0; - computation_amount[0] = size; + workstation_list[0] = this; + bytes_amount[0] = 0.0; + flops_amount[0] = size; return static_cast(getModel())->executeParallelTask(1, workstation_list, - computation_amount, - communication_amount, -1); + flops_amount, + bytes_amount, -1); } ActionPtr WorkstationL07::sleep(double duration) @@ -698,113 +724,3 @@ double WorkstationL07Action::getRemains() XBT_OUT(); return m_remains; } - -/*FIXME:remove static void ptask_finalize(void) -{ - xbt_dict_free(&ptask_parallel_task_link_set); - - delete surf_workstation_model; - surf_workstation_model = NULL; - delete surf_network_model; - surf_network_model = NULL; - - ptask_host_count = 0; - - if (ptask_maxmin_system) { - lmm_system_free(ptask_maxmin_system); - ptask_maxmin_system = NULL; - } - }*/ - -/**************************************/ -/******* Resource Private **********/ -/**************************************/ - -/**************************************/ -/*** Resource Creation & Destruction **/ -/**************************************/ - -static void ptask_parse_workstation_init(sg_platf_host_cbarg_t host) -{ - double power_peak = xbt_dynar_get_as(host->power_peak, host->pstate, double); - //cpu->power_peak = power_peak; - xbt_dynar_free(&(host->power_peak)); /* kill memory leak */ - static_cast(surf_workstation_model)->createResource( - host->id, - power_peak, - host->power_scale, - host->power_trace, - host->initial_state, - host->state_trace, - host->properties); -} - -static void ptask_parse_link_init(sg_platf_link_cbarg_t link) -{ - if (link->policy == SURF_LINK_FULLDUPLEX) { - char *link_id; - link_id = bprintf("%s_UP", link->id); - static_cast(surf_network_model)->createResource(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, - link->policy, - link->properties); - xbt_free(link_id); - link_id = bprintf("%s_DOWN", link->id); - static_cast(surf_network_model)->createResource(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, - link->policy, - NULL); /* FIXME: We need to deep copy the - * properties or we won't be able to free - * it */ - xbt_free(link_id); - } else { - static_cast(surf_network_model)->createResource(link->id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, - link->policy, - link->properties); - } - - current_property_set = NULL; -} - -static void ptask_add_traces(){ - static_cast(surf_workstation_model)->addTraces(); -} - -static void ptask_define_callbacks() -{ - sg_platf_host_add_cb(parse_cpu_init); - sg_platf_host_add_cb(ptask_parse_workstation_init); - sg_platf_link_add_cb(ptask_parse_link_init); - sg_platf_postparse_add_cb(ptask_add_traces); -} - -/**************************************/ -/*************** Generic **************/ -/**************************************/ -void surf_workstation_model_init_ptask_L07(void) -{ - XBT_INFO("surf_workstation_model_init_ptask_L07"); - xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); - xbt_assert(!surf_network_model, "network model type already defined"); - ptask_define_callbacks(); - surf_workstation_model = new WorkstationL07Model(); - ModelPtr model = static_cast(surf_workstation_model); - xbt_dynar_push(model_list, &model); - xbt_dynar_push(model_list_invoke, &model); -}