X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..30f40863fc506c7013dec1902201d4bdffe3a101:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index e57d90b6a8..fb3169c914 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -18,7 +18,7 @@ extern double NOW; void surf_presolve() { double next_event_date = -1.0; - tmgr_trace_iterator_t event = nullptr; + tmgr_trace_event_t event = nullptr; double value = -1.0; simgrid::surf::Resource *resource = nullptr; @@ -28,9 +28,8 @@ void surf_presolve() break; while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) { - if (value >= 0){ + if (value >= 0) resource->apply_event(event, value); - } } } @@ -46,7 +45,7 @@ double surf_solve(double max_date) double model_next_action_end = -1.0; double value = -1.0; simgrid::surf::Resource *resource = nullptr; - tmgr_trace_iterator_t event = nullptr; + tmgr_trace_event_t event = nullptr; if (max_date > 0.0) { xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date); @@ -75,7 +74,7 @@ double surf_solve(double max_date) next_event_date = future_evt_set->next_date(); XBT_DEBUG("Next TRACE event: %f", next_event_date); - if(! surf_network_model->nextOccuringEventIsIdempotent()){ // NS3, I see you + if (not surf_network_model->nextOccuringEventIsIdempotent()) { // NS3, I see you if (next_event_date!=-1.0 && time_delta!=-1.0) { time_delta = MIN(next_event_date - NOW, time_delta); } else { @@ -166,10 +165,6 @@ int surf_model_running_action_set_size(surf_model_t model){ return model->getRunningActionSet()->size(); } -surf_action_t surf_host_open(sg_host_t host, const char* fullpath){ - return host->pimpl_->open(fullpath); -} - surf_action_t surf_host_close(sg_host_t host, surf_file_t fd){ return host->pimpl_->close(fd); } @@ -190,10 +185,6 @@ surf_action_t surf_host_write(sg_host_t host, surf_file_t fd, sg_size_t size){ return host->pimpl_->write(fd, size); } -xbt_dynar_t surf_host_get_info(sg_host_t host, surf_file_t fd){ - return host->pimpl_->getInfo(fd); -} - size_t surf_host_file_tell(sg_host_t host, surf_file_t fd){ return host->pimpl_->fileTell(fd); } @@ -207,24 +198,34 @@ int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){ return host->pimpl_->fileMove(fd, fullpath); } -sg_size_t surf_storage_get_size(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->size_; +sg_size_t surf_storage_get_size(surf_storage_t resource) +{ + return static_cast(resource)->size_; } -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_free_size(surf_storage_t resource) +{ + return static_cast(resource)->getFreeSize(); } -sg_size_t surf_storage_get_used_size(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->getUsedSize(); +sg_size_t surf_storage_get_used_size(surf_storage_t resource) +{ + return static_cast(resource)->getUsedSize(); +} + +xbt_dict_t surf_storage_get_properties(surf_storage_t resource) +{ + return static_cast(resource)->getProperties(); } -xbt_dict_t surf_storage_get_properties(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->getProperties(); +const char* surf_storage_get_host(surf_storage_t resource) +{ + return static_cast(resource)->attach_.c_str(); } -const char* surf_storage_get_host(surf_resource_t resource){ - return static_cast(surf_storage_resource_priv(resource))->attach_; +const char* surf_storage_get_name(surf_storage_t resource) +{ + return static_cast(resource)->cname(); } void surf_cpu_action_set_bound(surf_action_t action, double bound) {