A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some more MC examples
[simgrid.git]
/
src
/
surf
/
surf_c_bindings.cpp
diff --git
a/src/surf/surf_c_bindings.cpp
b/src/surf/surf_c_bindings.cpp
index
1b00946
..
fb3169c
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-1,10
+1,9
@@
-/* 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. */
/* 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/
e
ngine.hpp"
+#include "simgrid/s4u/
E
ngine.hpp"
#include "src/instr/instr_private.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/instr/instr_private.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
@@
-19,7
+18,7
@@
extern double NOW;
void surf_presolve()
{
double next_event_date = -1.0;
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;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
@@
-29,9
+28,8
@@
void surf_presolve()
break;
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
break;
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
- if (value >= 0)
{
+ if (value >= 0)
resource->apply_event(event, value);
resource->apply_event(event, value);
- }
}
}
}
}
@@
-47,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;
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);
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);
@@
-76,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);
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 {
if (next_event_date!=-1.0 && time_delta!=-1.0) {
time_delta = MIN(next_event_date - NOW, time_delta);
} else {
@@
-167,10
+165,6
@@
int surf_model_running_action_set_size(surf_model_t model){
return model->getRunningActionSet()->size();
}
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);
}
surf_action_t surf_host_close(sg_host_t host, surf_file_t fd){
return host->pimpl_->close(fd);
}
@@
-191,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);
}
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);
}
size_t surf_host_file_tell(sg_host_t host, surf_file_t fd){
return host->pimpl_->fileTell(fd);
}
@@
-208,28
+198,34
@@
int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){
return host->pimpl_->fileMove(fd, 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_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) {
}
void surf_cpu_action_set_bound(surf_action_t action, double bound) {