X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bac7d0f735ac8ba47a46e1db4f6d7a7164fe0f2..0a10d4c0e00009f7ec443c589eabc823fcce02e5:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 9ee5be13f2..8d3fe2c161 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -18,12 +18,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); * TOOLS * *********/ -static simgrid::surf::Host *get_casted_host(sg_host_t resource){ - return static_cast(surf_host_resource_priv(resource)); +static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme + return host->extension(); } -static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t resource){ - return static_cast(surf_host_resource_priv(resource)); +static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){ + return static_cast(host->extension()); } extern double NOW; @@ -31,26 +31,25 @@ extern double NOW; void surf_presolve(void) { double next_event_date = -1.0; - tmgr_trace_event_t event = NULL; + tmgr_trace_iterator_t event = NULL; double value = -1.0; simgrid::surf::Resource *resource = NULL; simgrid::surf::Model *model = NULL; unsigned int iter; - XBT_DEBUG ("First Run! Let's \"purge\" events and put models in the right state"); - - while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { + XBT_DEBUG ("Consume all trace events occurring before the starting time."); + while ((next_event_date = future_evt_set->next_date()) != -1.0) { if (next_event_date > NOW) break; - while ((event = - tmgr_history_get_next_event_leq(history, next_event_date, - &value, - (void **) &resource))) { + + while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { if (value >= 0){ resource->updateState(event, value, NOW); } } } + + XBT_DEBUG ("Set every models in the right state by updating them to 0."); xbt_dynar_foreach(all_existing_models, iter, model) model->updateActionsState(NOW, 0.0); } @@ -63,7 +62,7 @@ double surf_solve(double max_date) double value = -1.0; simgrid::surf::Resource *resource = NULL; simgrid::surf::Model *model = NULL; - tmgr_trace_event_t event = NULL; + tmgr_trace_iterator_t event = NULL; unsigned int iter; if(!host_that_restart) @@ -86,23 +85,22 @@ double surf_solve(double max_date) surf_min = next_event_virt; } - XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min); + XBT_DEBUG("Min for resources (remember that NS3 don't update that value): %f", surf_min); XBT_DEBUG("Looking for next trace event"); - do { - XBT_DEBUG("Next TRACE event : %f", next_event_date); - - next_event_date = tmgr_history_next_date(history); + while (1) { // Handle next occurring events until none remains + next_event_date = future_evt_set->next_date(); + XBT_DEBUG("Next TRACE event: %f", next_event_date); if(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you - if(next_event_date!=-1.0 && surf_min!=-1.0) { + if (next_event_date!=-1.0 && surf_min!=-1.0) { surf_min = MIN(next_event_date - NOW, surf_min); } else{ surf_min = MAX(next_event_date - NOW, surf_min); } - XBT_DEBUG("Run for network at most %f", surf_min); + XBT_DEBUG("Run the NS3 network at most %fs", surf_min); // run until min or next flow model_next_action_end = surf_network_model->shareResources(surf_min); @@ -116,40 +114,37 @@ double surf_solve(double max_date) break; } - if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) break; + if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) + break; // next event occurs after the next resource change, bail out XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", surf_min, NOW, next_event_date); - while ((event = - tmgr_history_get_next_event_leq(history, next_event_date, - &value, - (void **) &resource))) { + + while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->getName())) { surf_min = next_event_date - NOW; - XBT_DEBUG - ("This event will modify model state. Next event set to %f", - surf_min); + XBT_DEBUG("This event will modify model state. Next event set to %f", surf_min); } - /* update state of model_obj according to new value. Does not touch lmm. + /* update state of the corresponding resource to the new value. Does not touch lmm. It will be modified if needed when updating actions */ - XBT_DEBUG("Calling update_resource_state for resource %s with min %f", - resource->getName(), surf_min); + XBT_DEBUG("Calling update_resource_state for resource %s with min %f", resource->getName(), surf_min); resource->updateState(event, value, next_event_date); } - } while (1); + } /* FIXME: Moved this test to here to avoid stopping simulation if there are actions running on cpus and all cpus are with availability = 0. * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0. * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */ if (surf_min == -1.0) { - XBT_DEBUG("No next event at all. Bail out now."); + XBT_DEBUG("No next event at all. Bail out now."); return -1.0; } XBT_DEBUG("Duration set to %f", surf_min); + // Bump the time: jump into the future NOW = NOW + surf_min; - /* FIXME: model_list or model_list_invoke? revisit here later */ - /* sequential version */ + + // Inform the models of the date change xbt_dynar_foreach(all_existing_models, iter, model) { model->updateActionsState(NOW, surf_min); } @@ -159,22 +154,10 @@ double surf_solve(double max_date) return surf_min; } -void routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst, - xbt_dynar_t * route, double *latency){ - routing_platf->getRouteAndLatency(src, dst, route, latency); -} - /********* * MODEL * *********/ -surf_host_model_t surf_host_get_model(sg_host_t host) -{ - simgrid::surf::Host* surf_host = - (simgrid::surf::Host*) host->facet(SURF_HOST_LEVEL); - return (surf_host_model_t) surf_host->getModel(); -} - surf_action_t surf_model_extract_done_action_set(surf_model_t model){ if (model->getDoneActionSet()->empty()) return NULL; @@ -191,42 +174,14 @@ surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ return res; } -surf_action_t surf_model_extract_ready_action_set(surf_model_t model){ - if (model->getReadyActionSet()->empty()) - return NULL; - surf_action_t res = &model->getReadyActionSet()->front(); - model->getReadyActionSet()->pop_front(); - return res; -} - -surf_action_t surf_model_extract_running_action_set(surf_model_t model){ - if (model->getRunningActionSet()->empty()) - return NULL; - surf_action_t res = &model->getRunningActionSet()->front(); - model->getRunningActionSet()->pop_front(); - return res; -} - int surf_model_running_action_set_size(surf_model_t model){ return model->getRunningActionSet()->size(); } -surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model, - int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate){ - return static_cast( - model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate)); -} - xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/, sg_host_t src, sg_host_t dst){ xbt_dynar_t route = NULL; - routing_platf->getRouteAndLatency( - get_casted_host(src)->p_netElm, - get_casted_host(dst)->p_netElm, &route, NULL); + routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, NULL); return route; } @@ -235,86 +190,20 @@ void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){ } surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate){ - return model->communicate(sg_host_edge(src), sg_host_edge(dst), size, rate); + return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate); } const char *surf_resource_name(surf_cpp_resource_t resource){ return resource->getName(); } -xbt_dict_t surf_resource_get_properties(surf_cpp_resource_t resource){ - return resource->getProperties(); -} - -e_surf_resource_state_t surf_resource_get_state(surf_cpp_resource_t resource){ - return resource->getState(); -} - -void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state){ - resource->setState(state); -} - surf_action_t surf_host_sleep(sg_host_t host, double duration){ - return get_casted_host(host)->sleep(duration); + return host->pimpl_cpu->sleep(duration); } -double surf_host_get_speed(sg_host_t host, double load){ - return sg_host_surfcpu(host)->getSpeed(load); -} double surf_host_get_available_speed(sg_host_t host){ - return sg_host_surfcpu(host)->getAvailableSpeed(); -} - -int surf_host_get_core(sg_host_t host){ - return sg_host_surfcpu(host)->getCore(); -} - -surf_action_t surf_host_execute(sg_host_t host, double size){ - return get_casted_host(host)->execute(size); -} - -double surf_host_get_current_power_peak(sg_host_t host){ - return sg_host_surfcpu(host)->getCurrentPowerPeak(); -} - -double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){ - return sg_host_surfcpu(host)->getPowerPeakAt(pstate_index); -} - -int surf_host_get_nb_pstates(sg_host_t host){ - return sg_host_surfcpu(host)->getNbPstates(); -} - -void surf_host_set_pstate(sg_host_t host, int pstate_index){ - sg_host_surfcpu(host)->setPstate(pstate_index); -} -int surf_host_get_pstate(sg_host_t host){ - return sg_host_surfcpu(host)->getPstate(); -} - -using simgrid::energy::HostEnergy; -using simgrid::energy::surf_energy; - -double surf_host_get_wattmin_at(sg_host_t resource, int pstate){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getWattMinAt(pstate); -} -double surf_host_get_wattmax_at(sg_host_t resource, int pstate){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getWattMaxAt(pstate); -} - -double surf_host_get_consumed_energy(sg_host_t resource){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getConsumedEnergy(); -} - -xbt_dict_t surf_host_get_mounted_storage_list(sg_host_t host){ - return get_casted_host(host)->getMountedStorageList(); + return host->pimpl_cpu->getAvailableSpeed(); } xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){ @@ -368,7 +257,7 @@ xbt_dynar_t surf_host_get_vms(sg_host_t host){ unsigned int cpt; simgrid::surf::VirtualMachine *vm; xbt_dynar_foreach(vms, cpt, vm) { - // TODO, use a backlink from simgrid::surf::Host to simgrid::Host + // TODO, use a backlink from simgrid::surf::Host to simgrid::s4u::Host sg_host_t vm_ = (sg_host_t) xbt_dict_get_elm_or_null(host_list, vm->getName()); xbt_dynar_push(vms_, &vm_); } @@ -384,23 +273,9 @@ void surf_host_set_params(sg_host_t host, vm_params_t params){ get_casted_host(host)->setParams(params); } -void surf_vm_destroy(sg_host_t resource){ - /* Before clearing the entries in host_lib, we have to pick up resources. */ - const char* name = resource->id().c_str(); - /* We deregister objects from host_lib, without invoking the freeing callback - * of each level. - * - * Do not call xbt_lib_remove() here. It deletes all levels of the key, - * including MSG_HOST_LEVEL and others. We should unregister only what we know. - */ - sg_host_surfcpu_destroy(resource); - sg_host_edge_destroy(resource,1); - // TODO, use backlink from simgrid::surf::Host to simgrid::Host - simgrid::Host* host = (simgrid::Host*) xbt_dict_get_or_null(host_list, name); - host->set_facet(SURF_HOST_LEVEL, nullptr); - - /* TODO: comment out when VM storage is implemented. */ - // host->set_facet(SURF_STORAGE_LEVEL, nullptr); +void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE + vm->pimpl_cpu = nullptr; + vm->pimpl_netcard = nullptr; } void surf_vm_suspend(sg_host_t vm){ @@ -431,8 +306,8 @@ void surf_vm_set_bound(sg_host_t vm, double bound){ return get_casted_vm(vm)->setBound(bound); } -void surf_vm_set_affinity(sg_host_t vm, sg_host_t cpu, unsigned long mask){ - return get_casted_vm(vm)->setAffinity(sg_host_surfcpu(cpu), mask); +void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){ + return get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask); } xbt_dict_t surf_storage_get_content(surf_resource_t resource){ @@ -451,16 +326,12 @@ sg_size_t surf_storage_get_used_size(surf_resource_t resource){ return static_cast(surf_storage_resource_priv(resource))->getUsedSize(); } -const char* surf_storage_get_host(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->p_attach; -} - -surf_action_t surf_cpu_execute(sg_host_t cpu, double size){ - return sg_host_surfcpu(cpu)->execute(size); +xbt_dict_t surf_storage_get_properties(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getProperties(); } -surf_action_t surf_cpu_sleep(sg_host_t cpu, double duration){ - return sg_host_surfcpu(cpu)->sleep(duration); +const char* surf_storage_get_host(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->p_attach; } double surf_action_get_start_time(surf_action_t action){ @@ -475,26 +346,6 @@ double surf_action_get_remains(surf_action_t action){ return action->getRemains(); } -void surf_action_unref(surf_action_t action){ - action->unref(); -} - -void surf_action_suspend(surf_action_t action){ - action->suspend(); -} - -void surf_action_resume(surf_action_t action){ - action->resume(); -} - -void surf_action_cancel(surf_action_t action){ - action->cancel(); -} - -void surf_action_set_priority(surf_action_t action, double priority){ - action->setPriority(priority); -} - void surf_action_set_category(surf_action_t action, const char *category){ action->setCategory(category); } @@ -515,8 +366,8 @@ double surf_action_get_cost(surf_action_t action){ return action->getCost(); } -void surf_cpu_action_set_affinity(surf_action_t action, sg_host_t cpu, unsigned long mask) { - static_cast(action)->setAffinity(sg_host_surfcpu(cpu), mask); +void surf_cpu_action_set_affinity(surf_action_t action, sg_host_t host, unsigned long mask) { + static_cast(action)->setAffinity(host->pimpl_cpu, mask); } void surf_cpu_action_set_bound(surf_action_t action, double bound) { @@ -525,7 +376,7 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) { #ifdef HAVE_LATENCY_BOUND_TRACKING double surf_network_action_get_latency_limited(surf_action_t action) { - return static_cast(action)->getLatencyLimited(); + return static_cast(action)->getLatencyLimited(); } #endif