-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
/* 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 "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "src/instr/instr_private.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
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;
break;
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
- if (value >= 0){
+ if (value >= 0)
resource->apply_event(event, value);
- }
}
}
XBT_DEBUG ("Set every models in the right state by updating them to 0.");
- for (auto model : *all_existing_models)
- model->updateActionsState(NOW, 0.0);
+ for (auto const& model : *all_existing_models)
+ model->updateActionsState(NOW, 0.0);
}
double surf_solve(double max_date)
{
double time_delta = -1.0; /* duration */
- double next_event_date = -1.0;
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);
XBT_DEBUG("Looking for next trace event");
while (1) { // Handle next occurring events until none remains
- next_event_date = future_evt_set->next_date();
+ double 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 {
XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date);
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
- if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->cname())) {
+ if (resource->isUsed() || (watched_hosts.find(resource->cname()) != watched_hosts.end())) {
time_delta = next_event_date - NOW;
XBT_DEBUG("This event invalidates the next_occuring_event() computation of models. Next event set to %f", time_delta);
}
NOW = NOW + time_delta;
// Inform the models of the date change
- for (auto model : *all_existing_models) {
+ for (auto const& model : *all_existing_models) {
model->updateActionsState(NOW, time_delta);
}
simgrid::s4u::onTimeAdvance(time_delta);
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);
-}
-
-int surf_host_unlink(sg_host_t host, surf_file_t fd){
- return host->pimpl_->unlink(fd);
-}
-
-size_t surf_host_get_size(sg_host_t host, surf_file_t fd){
- return host->pimpl_->getSize(fd);
-}
-
-surf_action_t surf_host_read(sg_host_t host, surf_file_t fd, sg_size_t size){
- return host->pimpl_->read(fd, size);
-}
-
-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);
-}
-
-int surf_host_file_seek(sg_host_t host, surf_file_t fd,
- sg_offset_t offset, int origin){
- return host->pimpl_->fileSeek(fd, offset, origin);
-}
-
-int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){
- return host->pimpl_->fileMove(fd, fullpath);
-}
-
-xbt_dict_t surf_storage_get_content(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getContent();
-}
-
-sg_size_t surf_storage_get_size(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->size_;
-}
-
-sg_size_t surf_storage_get_free_size(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getFreeSize();
-}
-
-sg_size_t surf_storage_get_used_size(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getUsedSize();
-}
-
-xbt_dict_t surf_storage_get_properties(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getProperties();
-}
-
-const char* surf_storage_get_host(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->attach_;
-}
-
void surf_cpu_action_set_bound(surf_action_t action, double bound) {
static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
}
-
-surf_file_t surf_storage_action_get_file(surf_action_t action){
- return static_cast<simgrid::surf::StorageAction*>(action)->file_;
-}
