X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4871b54f42ce85370d6acdbcb7e42bf75a63b389..22434b3c5fb97be63441ce80192a32a1b310c4b7:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index bd1e7fa7fe..ecae88f394 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -12,15 +12,15 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); *********/ static CpuPtr get_casted_cpu(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_cpu_resource_priv(resource))); + return static_cast(surf_cpu_resource_priv(resource)); } static WorkstationPtr get_casted_workstation(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_workstation_resource_priv(resource))); + return static_cast(surf_workstation_resource_priv(resource)); } static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_workstation_resource_priv(resource))); + return static_cast(surf_workstation_resource_priv(resource)); } char *surf_routing_edge_name(sg_routing_edge_t edge){ @@ -67,11 +67,11 @@ 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->m_name.c_str(), "network NS3")) { - XBT_DEBUG("Running for Resource [%s]", model->m_name.c_str()); + 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->m_name.c_str(), next_action_end); + model->getName(), next_action_end); } surf_mins[i] = next_action_end; } @@ -128,7 +128,7 @@ double surf_solve(double max_date) next_event_date = tmgr_history_next_date(history); - if(!strcmp(surf_network_model->m_name.c_str(), "network NS3")){//FIXME: add surf_network_model->m_name && + if(!strcmp(surf_network_model->getName(), "network NS3")){//FIXME: add surf_network_model->m_name && if(next_event_date!=-1.0 && surf_min!=-1.0) { surf_min = MIN(next_event_date - NOW, surf_min); } else{ @@ -156,7 +156,7 @@ double surf_solve(double max_date) tmgr_history_get_next_event_leq(history, next_event_date, &value, (void **) &resource))) { - if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->m_name)) { + 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", @@ -165,7 +165,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", - resource->m_name, surf_min); + resource->getName(), surf_min); resource->updateState(event, value, next_event_date); } } while (1); @@ -194,11 +194,6 @@ double surf_solve(double max_date) return surf_min; } -XBT_INLINE double surf_get_clock(void) -{ - return NOW; -} - 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); @@ -212,7 +207,7 @@ 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 * surf_resource at the generic_resource field. */ ResourcePtr ws = static_cast(xbt_lib_get_level((xbt_dictelm_t) host, level)); - return ws->p_model; + return ws->getModel(); } void *surf_as_cluster_get_backbone(AS_t as){ @@ -220,27 +215,44 @@ void *surf_as_cluster_get_backbone(AS_t as){ } void surf_as_cluster_set_backbone(AS_t as, void* backbone){ - static_cast(as)->p_backbone = dynamic_cast(static_cast(backbone)); + static_cast(as)->p_backbone = static_cast(backbone); } const char *surf_model_name(surf_model_t model){ - return model->m_name.c_str(); + return model->getName(); } -xbt_swag_t surf_model_done_action_set(surf_model_t model){ - return model->p_doneActionSet; +surf_action_t surf_model_extract_done_action_set(surf_model_t model){ + if (model->getDoneActionSet()->empty()) + return NULL; + surf_action_t res = &model->getDoneActionSet()->front(); + model->getDoneActionSet()->pop_front(); + return res; } - -xbt_swag_t surf_model_failed_action_set(surf_model_t model){ - return model->p_failedActionSet; +surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ + if (model->getFailedActionSet()->empty()) + return NULL; + surf_action_t res = &model->getFailedActionSet()->front(); + model->getFailedActionSet()->pop_front(); + return res; } - -xbt_swag_t surf_model_ready_action_set(surf_model_t model){ - return model->p_readyActionSet; +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; } -xbt_swag_t surf_model_running_action_set(surf_model_t model){ - return model->p_runningActionSet; +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, @@ -270,7 +282,7 @@ surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_rout } const char *surf_resource_name(surf_cpp_resource_t resource){ - return resource->m_name; + return resource->getName(); } xbt_dict_t surf_resource_get_properties(surf_cpp_resource_t resource){ @@ -422,31 +434,31 @@ void surf_vm_workstation_set_bound(surf_resource_t resource, double bound){ } void surf_vm_workstation_set_affinity(surf_resource_t resource, surf_resource_t cpu, unsigned long mask){ - return get_casted_vm_workstation(resource)->setAffinity(dynamic_cast(get_casted_cpu(cpu)), mask); + return get_casted_vm_workstation(resource)->setAffinity(get_casted_cpu(cpu), mask); } int surf_network_link_is_shared(surf_cpp_resource_t link){ - return dynamic_cast(link)->isShared(); + return static_cast(link)->isShared(); } double surf_network_link_get_bandwidth(surf_cpp_resource_t link){ - return dynamic_cast(link)->getBandwidth(); + return static_cast(link)->getBandwidth(); } double surf_network_link_get_latency(surf_cpp_resource_t link){ - return dynamic_cast(link)->getLatency(); + return static_cast(link)->getLatency(); } xbt_dict_t surf_storage_get_content(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_storage_resource_priv(resource)))->getContent(); + return static_cast(surf_storage_resource_priv(resource))->getContent(); } sg_size_t surf_storage_get_size(surf_resource_t resource){ - return dynamic_cast(static_cast(surf_storage_resource_priv(resource)))->getSize(); + return static_cast(surf_storage_resource_priv(resource))->getSize(); } void surf_storage_rename(surf_resource_t resource, const char* src, const char* dest){ - dynamic_cast(static_cast(surf_storage_resource_priv(resource)))->rename(src, dest); + static_cast(surf_storage_resource_priv(resource))->rename(src, dest); } surf_action_t surf_cpu_execute(surf_resource_t cpu, double size){ @@ -458,11 +470,11 @@ surf_action_t surf_cpu_sleep(surf_resource_t cpu, double duration){ } double surf_action_get_start_time(surf_action_t action){ - return action->m_start; + return action->getStartTime(); } double surf_action_get_finish_time(surf_action_t action){ - return action->m_finish; + return action->getFinishTime(); } double surf_action_get_remains(surf_action_t action){ @@ -494,11 +506,11 @@ void surf_action_set_category(surf_action_t action, const char *category){ } void *surf_action_get_data(surf_action_t action){ - return action->p_data; + return action->getData(); } void surf_action_set_data(surf_action_t action, void *data){ - action->p_data = data; + action->setData(data); } e_surf_action_state_t surf_action_get_state(surf_action_t action){ @@ -506,23 +518,23 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action){ } int surf_action_get_cost(surf_action_t action){ - return action->m_cost; + return action->getCost(); } void surf_cpu_action_set_affinity(surf_action_t action, surf_resource_t cpu, unsigned long mask) { - dynamic_cast(action)->setAffinity(get_casted_cpu(cpu), mask); + static_cast(action)->setAffinity(get_casted_cpu(cpu), mask); } void surf_cpu_action_set_bound(surf_action_t action, double bound) { - dynamic_cast(action)->setBound(bound); + static_cast(action)->setBound(bound); } surf_file_t surf_storage_action_get_file(surf_action_t action){ - return dynamic_cast(action)->p_file; + return static_cast(action)->p_file; } xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){ - return dynamic_cast(action)->p_lsDict; + return static_cast(action)->p_lsDict; }