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
doc: fix broken references
[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
20e209b
..
e536732
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-4,10
+4,9
@@
/* 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 "
host_interface
.hpp"
+#include "
src/surf/HostImpl
.hpp"
#include "surf_interface.hpp"
#include "network_interface.hpp"
#include "surf_interface.hpp"
#include "network_interface.hpp"
-#include "surf_routing_cluster.hpp"
#include "src/instr/instr_private.h"
#include "plugins/energy.hpp"
#include "virtual_machine.hpp"
#include "src/instr/instr_private.h"
#include "plugins/energy.hpp"
#include "virtual_machine.hpp"
@@
-18,12
+17,12
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
* TOOLS *
*********/
* TOOLS *
*********/
-static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme
- return host->extension<simgrid::surf::Host>();
+static simgrid::surf::Host
Impl
*get_casted_host(sg_host_t host){ //FIXME: killme
+ return host->extension<simgrid::surf::Host
Impl
>();
}
static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
}
static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
- return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host>());
+ return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host
Impl
>());
}
extern double NOW;
}
extern double NOW;
@@
-163,7
+162,7
@@
double surf_solve(double max_date)
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
if (model->getDoneActionSet()->empty())
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
if (model->getDoneActionSet()->empty())
- return NULL;
+
return NULL;
surf_action_t res = &model->getDoneActionSet()->front();
model->getDoneActionSet()->pop_front();
return res;
surf_action_t res = &model->getDoneActionSet()->front();
model->getDoneActionSet()->pop_front();
return res;
@@
-171,7
+170,7
@@
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
if (model->getFailedActionSet()->empty())
surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
if (model->getFailedActionSet()->empty())
- return NULL;
+
return NULL;
surf_action_t res = &model->getFailedActionSet()->front();
model->getFailedActionSet()->pop_front();
return res;
surf_action_t res = &model->getFailedActionSet()->front();
model->getFailedActionSet()->pop_front();
return res;
@@
-189,19
+188,10
@@
surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_host
return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate);
}
return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate);
}
-const char *surf_resource_name(surf_cpp_resource_t resource){
- return resource->getName();
-}
-
surf_action_t surf_host_sleep(sg_host_t host, double duration){
return host->pimpl_cpu->sleep(duration);
}
surf_action_t surf_host_sleep(sg_host_t host, double duration){
return host->pimpl_cpu->sleep(duration);
}
-
-double surf_host_get_available_speed(sg_host_t host){
- return host->pimpl_cpu->getAvailableSpeed();
-}
-
surf_action_t surf_host_open(sg_host_t host, const char* fullpath){
return get_casted_host(host)->open(fullpath);
}
surf_action_t surf_host_open(sg_host_t host, const char* fullpath){
return get_casted_host(host)->open(fullpath);
}
@@
-308,12
+298,6
@@
void surf_cpu_action_set_bound(surf_action_t action, double bound) {
static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
}
static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
}
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-double surf_network_action_get_latency_limited(surf_action_t action) {
- return static_cast<simgrid::surf::NetworkAction*>(action)->getLatencyLimited();
-}
-#endif
-
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<simgrid::surf::StorageAction*>(action)->p_file;
}
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<simgrid::surf::StorageAction*>(action)->p_file;
}