-/* 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 "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);
- }
}
}
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);
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 {
/* 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 (time_delta == -1.0) {
+ if (time_delta < 0) {
XBT_DEBUG("No next event at all. Bail out now.");
return -1.0;
}
for (auto model : *all_existing_models) {
model->updateActionsState(NOW, time_delta);
}
+ simgrid::s4u::onTimeAdvance(time_delta);
TRACE_paje_dump_buffer (0);
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);
}
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);
}
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_storage_t resource)
+{
+ return static_cast<simgrid::surf::StorageImpl*>(resource)->size_;
}
-sg_size_t surf_storage_get_size(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getSize();
+sg_size_t surf_storage_get_free_size(surf_storage_t resource)
+{
+ return static_cast<simgrid::surf::StorageImpl*>(resource)->getFreeSize();
}
-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_storage_t resource)
+{
+ return static_cast<simgrid::surf::StorageImpl*>(resource)->getUsedSize();
}
-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_storage_t resource)
+{
+ return static_cast<simgrid::surf::StorageImpl*>(resource)->getProperties();
}
-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_storage_t resource)
+{
+ return static_cast<simgrid::surf::StorageImpl*>(resource)->attach_.c_str();
}
-const char* surf_storage_get_host(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->attach_;
+const char* surf_storage_get_name(surf_storage_t resource)
+{
+ return static_cast<simgrid::surf::StorageImpl*>(resource)->cname();
}
void surf_cpu_action_set_bound(surf_action_t action, double bound) {