X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ccf766b5786740fe24d500b99b0b60bf5c5d6a2..3715b2a421abd8357f41fb2be3c25a351f1af8cb:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index ded3bb9ad9..c3464409b2 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -4,13 +4,13 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "host_interface.hpp" #include "surf_interface.hpp" -#include "workstation_interface.hpp" -#include "vm_workstation_interface.hpp" #include "network_interface.hpp" #include "surf_routing_cluster.hpp" #include "instr/instr_private.h" #include "plugins/energy.hpp" +#include "vm_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -18,42 +18,27 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); * TOOLS * *********/ -static CpuPtr get_casted_cpu(surf_resource_t resource){ - return static_cast(surf_cpu_resource_priv(resource)); +static Host *get_casted_host(surf_resource_t resource){ + return static_cast(surf_host_resource_priv(resource)); } -static WorkstationPtr get_casted_workstation(surf_resource_t resource){ - return static_cast(surf_workstation_resource_priv(resource)); +static VM *get_casted_vm(surf_resource_t resource){ + return static_cast(surf_host_resource_priv(resource)); } -static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){ - return static_cast(surf_workstation_resource_priv(resource)); -} - -char *surf_routing_edge_name(sg_routing_edge_t edge){ - return edge->getName(); -} - -#ifdef CONTEXT_THREADS -//FIXME:keeporremove static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ -#endif - extern double NOW; -extern double *surf_mins; /* return value of share_resources for each model */ -extern int surf_min_index; /* current index in surf_mins */ -extern double surf_min; /* duration determined by surf_solve */ void surf_presolve(void) { double next_event_date = -1.0; tmgr_trace_event_t event = NULL; double value = -1.0; - ResourcePtr resource = NULL; - ModelPtr model = NULL; + Resource *resource = NULL; + Model *model = NULL; unsigned int iter; - XBT_DEBUG - ("First Run! Let's \"purge\" events and put models in the right state"); + 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) { if (next_event_date > NOW) break; @@ -70,32 +55,14 @@ void surf_presolve(void) model->updateActionsState(NOW, 0.0); } -static void surf_share_resources(surf_model_t model) -{ - double next_action_end = -1.0; - int i = __sync_fetch_and_add(&surf_min_index, 1); - if (strcmp(model->getName(), "network NS3")) { - XBT_DEBUG("Running for Resource [%s]", model->getName()); - next_action_end = model->shareResources(NOW); - XBT_DEBUG("Resource [%s] : next action end = %f", - model->getName(), next_action_end); - } - surf_mins[i] = next_action_end; -} - -static void surf_update_actions_state(surf_model_t model) -{ - model->updateActionsState(NOW, surf_min); -} - double surf_solve(double max_date) { - surf_min = -1.0; /* duration */ + double surf_min = -1.0; /* duration */ double next_event_date = -1.0; double model_next_action_end = -1.0; double value = -1.0; - ResourcePtr resource = NULL; - ModelPtr model = NULL; + Resource *resource = NULL; + Model *model = NULL; tmgr_trace_event_t event = NULL; unsigned int iter; @@ -107,23 +74,18 @@ double surf_solve(double max_date) } XBT_DEBUG("Looking for next action end for all models except NS3"); - - if (surf_mins == NULL) { - surf_mins = xbt_new(double, xbt_dynar_length(model_list_invoke)); - } - surf_min_index = 0; - - /* sequential version */ xbt_dynar_foreach(model_list_invoke, iter, model) { - surf_share_resources(static_cast(model)); - } - - unsigned i; - for (i = 0; i < xbt_dynar_length(model_list_invoke); i++) { - if ((surf_min < 0.0 || surf_mins[i] < surf_min) - && surf_mins[i] >= 0.0) { - surf_min = surf_mins[i]; - } + double next_action_end = -1.0; + if (model->shareResourcesIsIdempotent()) { + XBT_DEBUG("Running for Resource [%s]", typeid(model).name()); + next_action_end = model->shareResources(NOW); + XBT_DEBUG("Resource [%s] : next action end = %f", + typeid(model).name(), next_action_end); + } + if ((surf_min < 0.0 || next_action_end < surf_min) + && next_action_end >= 0.0) { + surf_min = next_action_end; + } } XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min); @@ -135,7 +97,7 @@ double surf_solve(double max_date) next_event_date = tmgr_history_next_date(history); - if(!strcmp(surf_network_model->getName(), "network NS3")){ + if(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you if(next_event_date!=-1.0 && surf_min!=-1.0) { surf_min = MIN(next_event_date - NOW, surf_min); } else{ @@ -171,7 +133,7 @@ double surf_solve(double max_date) } /* update state of model_obj according to 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 %lf", + XBT_DEBUG("Calling update_resource_state for resource %s with min %f", resource->getName(), surf_min); resource->updateState(event, value, next_event_date); } @@ -191,12 +153,10 @@ double surf_solve(double max_date) /* FIXME: model_list or model_list_invoke? revisit here later */ /* sequential version */ xbt_dynar_foreach(model_list, iter, model) { - surf_update_actions_state(model); + model->updateActionsState(NOW, surf_min); } -#ifdef HAVE_TRACING TRACE_paje_dump_buffer (0); -#endif return surf_min; } @@ -211,22 +171,22 @@ void routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst, *********/ surf_model_t surf_resource_model(const void *host, int level) { - /* If level is SURF_WKS_LEVEL, ws is a workstation_CLM03 object. It has + /* If level is SURF_WKS_LEVEL, ws is a host_CLM03 object. It has * surf_resource at the generic_resource field. */ - ResourcePtr ws = static_cast(xbt_lib_get_level((xbt_dictelm_t) host, level)); + Resource *ws = static_cast(xbt_lib_get_level((xbt_dictelm_t) host, level)); return ws->getModel(); } void *surf_as_cluster_get_backbone(AS_t as){ - return static_cast(as)->p_backbone; + return static_cast(as)->p_backbone; } void surf_as_cluster_set_backbone(AS_t as, void* backbone){ - static_cast(as)->p_backbone = static_cast(backbone); + static_cast(as)->p_backbone = static_cast(backbone); } const char *surf_model_name(surf_model_t model){ - return model->getName(); + return typeid(model).name(); } surf_action_t surf_model_extract_done_action_set(surf_model_t model){ @@ -265,26 +225,29 @@ int surf_model_running_action_set_size(surf_model_t model){ return model->getRunningActionSet()->size(); } -surf_action_t surf_workstation_model_execute_parallel_task(surf_workstation_model_t model, - int workstation_nb, - void **workstation_list, - double *computation_amount, - double *communication_amount, +surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model, + int host_nb, + void **host_list, + double *flops_amount, + double *bytes_amount, double rate){ - return static_cast(model->executeParallelTask(workstation_nb, workstation_list, computation_amount, communication_amount, rate)); + return static_cast(model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate)); } -surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model, surf_resource_t src, surf_resource_t dst, double size, double rate){ - return model->communicate(get_casted_workstation(src), get_casted_workstation(dst), size, rate); +surf_action_t surf_host_model_communicate(surf_host_model_t model, surf_resource_t src, surf_resource_t dst, double size, double rate){ + return model->communicate(get_casted_host(src), get_casted_host(dst), size, rate); } -xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t model, - surf_resource_t src, surf_resource_t dst){ - return model->getRoute(get_casted_workstation(src), get_casted_workstation(dst)); +xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/, + surf_resource_t src, surf_resource_t dst){ + xbt_dynar_t route = NULL; + routing_platf->getRouteAndLatency(get_casted_host(src)->p_netElm, + get_casted_host(dst)->p_netElm, &route, NULL); + return route; } -void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host){ - surf_vm_workstation_model->createResource(name, ind_phys_host); +void surf_vm_model_create(const char *name, surf_resource_t ind_phys_host){ + surf_vm_model->createVM(name, ind_phys_host); } surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate){ @@ -307,178 +270,209 @@ void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state resource->setState(state); } -surf_action_t surf_workstation_sleep(surf_resource_t resource, double duration){ - return get_casted_workstation(resource)->sleep(duration); +surf_action_t surf_host_sleep(surf_resource_t resource, double duration){ + return get_casted_host(resource)->sleep(duration); } -double surf_workstation_get_speed(surf_resource_t resource, double load){ - return get_casted_workstation(resource)->getSpeed(load); +double surf_host_get_speed(surf_resource_t resource, double load){ + return get_casted_host(resource)->getSpeed(load); } -double surf_workstation_get_available_speed(surf_resource_t resource){ - return get_casted_workstation(resource)->getAvailableSpeed(); +double surf_host_get_available_speed(surf_resource_t resource){ + return get_casted_host(resource)->getAvailableSpeed(); } -int surf_workstation_get_core(surf_resource_t resource){ - return get_casted_workstation(resource)->getCore(); +int surf_host_get_core(surf_resource_t resource){ + return get_casted_host(resource)->getCore(); } -surf_action_t surf_workstation_execute(surf_resource_t resource, double size){ - return get_casted_workstation(resource)->execute(size); +surf_action_t surf_host_execute(surf_resource_t resource, double size){ + return get_casted_host(resource)->execute(size); } -double surf_workstation_get_current_power_peak(surf_resource_t resource){ - return get_casted_workstation(resource)->getCurrentPowerPeak(); +double surf_host_get_current_power_peak(surf_resource_t resource){ + return get_casted_host(resource)->getCurrentPowerPeak(); } -double surf_workstation_get_power_peak_at(surf_resource_t resource, int pstate_index){ - return get_casted_workstation(resource)->getPowerPeakAt(pstate_index); +double surf_host_get_power_peak_at(surf_resource_t resource, int pstate_index){ + return get_casted_host(resource)->getPowerPeakAt(pstate_index); } -int surf_workstation_get_nb_pstates(surf_resource_t resource){ - return get_casted_workstation(resource)->getNbPstates(); +int surf_host_get_nb_pstates(surf_resource_t resource){ + return get_casted_host(resource)->getNbPstates(); } -void surf_workstation_set_power_peak_at(surf_resource_t resource, int pstate_index){ - return get_casted_workstation(resource)->setPowerPeakAt(pstate_index); +void surf_host_set_pstate(surf_resource_t resource, int pstate_index){ + get_casted_host(resource)->setPstate(pstate_index); +} +int surf_host_get_pstate(surf_resource_t resource){ + return get_casted_host(resource)->getPstate(); +} +double surf_host_get_wattmin_at(surf_resource_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 cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); + return cpuIt->second->getWattMinAt(pstate); +} +double surf_host_get_wattmax_at(surf_resource_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 cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); + return cpuIt->second->getWattMaxAt(pstate); } -double surf_workstation_get_consumed_energy(surf_resource_t resource){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active."); - std::map::iterator cpuIt = surf_energy->find(get_casted_workstation(resource)->p_cpu); +double surf_host_get_consumed_energy(surf_resource_t resource){ + xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); + std::map::iterator cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); return cpuIt->second->getConsumedEnergy(); } -xbt_dict_t surf_workstation_get_storage_list(surf_resource_t workstation){ - return get_casted_workstation(workstation)->getStorageList(); +xbt_dict_t surf_host_get_mounted_storage_list(surf_resource_t host){ + return get_casted_host(host)->getMountedStorageList(); } -surf_action_t surf_workstation_open(surf_resource_t workstation, const char* mount, const char* path){ - return get_casted_workstation(workstation)->open(mount, path); +xbt_dynar_t surf_host_get_attached_storage_list(surf_resource_t host){ + return get_casted_host(host)->getAttachedStorageList(); } -surf_action_t surf_workstation_close(surf_resource_t workstation, surf_file_t fd){ - return get_casted_workstation(workstation)->close(fd); +surf_action_t surf_host_open(surf_resource_t host, const char* fullpath){ + return get_casted_host(host)->open(fullpath); } -int surf_workstation_unlink(surf_resource_t workstation, surf_file_t fd){ - return get_casted_workstation(workstation)->unlink(fd); +surf_action_t surf_host_close(surf_resource_t host, surf_file_t fd){ + return get_casted_host(host)->close(fd); } -surf_action_t surf_workstation_ls(surf_resource_t workstation, const char* mount, const char *path){ - return get_casted_workstation(workstation)->ls(mount, path); +int surf_host_unlink(surf_resource_t host, surf_file_t fd){ + return get_casted_host(host)->unlink(fd); } -size_t surf_workstation_get_size(surf_resource_t workstation, surf_file_t fd){ - return get_casted_workstation(workstation)->getSize(fd); +size_t surf_host_get_size(surf_resource_t host, surf_file_t fd){ + return get_casted_host(host)->getSize(fd); } -surf_action_t surf_workstation_read(surf_resource_t resource, surf_file_t fd, sg_size_t size){ - return get_casted_workstation(resource)->read(fd, size); +surf_action_t surf_host_read(surf_resource_t host, surf_file_t fd, sg_size_t size){ + return get_casted_host(host)->read(fd, size); } -surf_action_t surf_workstation_write(surf_resource_t resource, surf_file_t fd, sg_size_t size){ - return get_casted_workstation(resource)->write(fd, size); +surf_action_t surf_host_write(surf_resource_t host, surf_file_t fd, sg_size_t size){ + return get_casted_host(host)->write(fd, size); } -xbt_dynar_t surf_workstation_get_info(surf_resource_t resource, surf_file_t fd){ - return get_casted_workstation(resource)->getInfo(fd); +xbt_dynar_t surf_host_get_info(surf_resource_t host, surf_file_t fd){ + return get_casted_host(host)->getInfo(fd); } -sg_size_t surf_workstation_get_free_size(surf_resource_t resource, const char* name){ - return get_casted_workstation(resource)->getFreeSize(name); +size_t surf_host_file_tell(surf_resource_t host, surf_file_t fd){ + return get_casted_host(host)->fileTell(fd); } -sg_size_t surf_workstation_get_used_size(surf_resource_t resource, const char* name){ - return get_casted_workstation(resource)->getUsedSize(name); +int surf_host_file_seek(surf_resource_t host, surf_file_t fd, + sg_offset_t offset, int origin){ + return get_casted_host(host)->fileSeek(fd, offset, origin); } -size_t surf_workstation_file_tell(surf_resource_t workstation, surf_file_t fd){ - return get_casted_workstation(workstation)->fileTell(fd); +int surf_host_file_move(surf_resource_t host, surf_file_t fd, const char* fullpath){ + return get_casted_host(host)->fileMove(fd, fullpath); } -int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd, sg_size_t offset, int origin){ - return get_casted_workstation(workstation)->fileSeek(fd, offset, origin); +xbt_dynar_t surf_host_get_vms(surf_resource_t host){ + xbt_dynar_t vms = get_casted_host(host)->getVms(); + xbt_dynar_t vms_ = xbt_dynar_new(sizeof(sg_host_t), NULL); + unsigned int cpt; + VM *vm; + xbt_dynar_foreach(vms, cpt, vm) { + sg_host_t vm_ = xbt_lib_get_elm_or_null(host_lib, vm->getName()); + xbt_dynar_push(vms_, &vm_); + } + xbt_dynar_free(&vms); + return vms_; } -xbt_dynar_t surf_workstation_get_vms(surf_resource_t resource){ - return get_casted_workstation(resource)->getVms(); +void surf_host_get_params(surf_resource_t host, ws_params_t params){ + get_casted_host(host)->getParams(params); } -void surf_workstation_get_params(surf_resource_t resource, ws_params_t params){ - get_casted_workstation(resource)->getParams(params); +void surf_host_set_params(surf_resource_t host, ws_params_t params){ + get_casted_host(host)->setParams(params); } -void surf_workstation_set_params(surf_resource_t resource, ws_params_t params){ - get_casted_workstation(resource)->setParams(params); -} +void surf_vm_destroy(surf_resource_t resource){ + /* Before clearing the entries in host_lib, we have to pick up resources. */ + VM *vm = get_casted_vm(resource); + char* name = xbt_dict_get_elm_key(resource); + /* 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((sg_host_t)resource); + sg_host_edge_destroy((sg_host_t)resource,1); + xbt_lib_unset(host_lib, name, SURF_HOST_LEVEL, 0); -void surf_vm_workstation_destroy(surf_resource_t resource){ - delete get_casted_vm_workstation(resource); -} + /* TODO: comment out when VM storage is implemented. */ + // xbt_lib_unset(host_lib, name, SURF_STORAGE_LEVEL, 0); -void surf_vm_workstation_suspend(surf_resource_t resource){ - get_casted_vm_workstation(resource)->suspend(); + delete vm; } -void surf_vm_workstation_resume(surf_resource_t resource){ - get_casted_vm_workstation(resource)->resume(); +void surf_vm_suspend(surf_resource_t vm){ + get_casted_vm(vm)->suspend(); } -void surf_vm_workstation_save(surf_resource_t resource){ - get_casted_vm_workstation(resource)->save(); +void surf_vm_resume(surf_resource_t vm){ + get_casted_vm(vm)->resume(); } -void surf_vm_workstation_restore(surf_resource_t resource){ - get_casted_vm_workstation(resource)->restore(); +void surf_vm_save(surf_resource_t vm){ + get_casted_vm(vm)->save(); } -void surf_vm_workstation_migrate(surf_resource_t resource, surf_resource_t ind_vm_ws_dest){ - get_casted_vm_workstation(resource)->migrate(ind_vm_ws_dest); +void surf_vm_restore(surf_resource_t vm){ + get_casted_vm(vm)->restore(); } -surf_resource_t surf_vm_workstation_get_pm(surf_resource_t resource){ - return get_casted_vm_workstation(resource)->getPm(); +void surf_vm_migrate(surf_resource_t vm, surf_resource_t ind_vm_ws_dest){ + get_casted_vm(vm)->migrate(ind_vm_ws_dest); } -void surf_vm_workstation_set_bound(surf_resource_t resource, double bound){ - return get_casted_vm_workstation(resource)->setBound(bound); +surf_resource_t surf_vm_get_pm(surf_resource_t vm){ + return get_casted_vm(vm)->getPm(); } -void surf_vm_workstation_set_affinity(surf_resource_t resource, surf_resource_t cpu, unsigned long mask){ - return get_casted_vm_workstation(resource)->setAffinity(get_casted_cpu(cpu), mask); +void surf_vm_set_bound(surf_resource_t vm, double bound){ + return get_casted_vm(vm)->setBound(bound); } -int surf_network_link_is_shared(surf_cpp_resource_t link){ - return static_cast(link)->isShared(); +void surf_vm_set_affinity(surf_resource_t vm, surf_resource_t cpu, unsigned long mask){ + return get_casted_vm(vm)->setAffinity(sg_host_surfcpu(cpu), mask); } -double surf_network_link_get_bandwidth(surf_cpp_resource_t link){ - return static_cast(link)->getBandwidth(); +xbt_dict_t surf_storage_get_content(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getContent(); } -double surf_network_link_get_latency(surf_cpp_resource_t link){ - return static_cast(link)->getLatency(); +sg_size_t surf_storage_get_size(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getSize(); } -xbt_dict_t surf_storage_get_content(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->getContent(); +sg_size_t surf_storage_get_free_size(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getFreeSize(); } -sg_size_t surf_storage_get_size(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->getSize(); +sg_size_t surf_storage_get_used_size(surf_resource_t resource){ + return static_cast(surf_storage_resource_priv(resource))->getUsedSize(); } -void surf_storage_rename(surf_resource_t resource, const char* src, const char* dest){ - static_cast(surf_storage_resource_priv(resource))->rename(src, dest); +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(surf_resource_t cpu, double size){ - return get_casted_cpu(cpu)->execute(size); + return sg_host_surfcpu(cpu)->execute(size); } surf_action_t surf_cpu_sleep(surf_resource_t cpu, double duration){ - return get_casted_cpu(cpu)->sleep(duration); + return sg_host_surfcpu(cpu)->sleep(duration); } double surf_action_get_start_time(surf_action_t action){ @@ -534,11 +528,11 @@ double surf_action_get_cost(surf_action_t action){ } void surf_cpu_action_set_affinity(surf_action_t action, surf_resource_t cpu, unsigned long mask) { - static_cast(action)->setAffinity(get_casted_cpu(cpu), mask); + static_cast(action)->setAffinity(sg_host_surfcpu(cpu), mask); } void surf_cpu_action_set_bound(surf_action_t action, double bound) { - static_cast(action)->setBound(bound); + static_cast(action)->setBound(bound); } #ifdef HAVE_LATENCY_BOUND_TRACKING @@ -548,9 +542,5 @@ double surf_network_action_get_latency_limited(surf_action_t action) { #endif surf_file_t surf_storage_action_get_file(surf_action_t action){ - return static_cast(action)->p_file; -} - -xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){ - return static_cast(action)->p_lsDict; + return static_cast(action)->p_file; }