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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[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
25e73e8
..
2dbe05f
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;
@@
-181,13
+180,6
@@
int surf_model_running_action_set_size(surf_model_t model){
return model->getRunningActionSet()->size();
}
return model->getRunningActionSet()->size();
}
-xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/,
- sg_host_t src, sg_host_t dst){
- xbt_dynar_t route = NULL;
- routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, NULL);
- return route;
-}
-
void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){
surf_vm_model->createVM(name, ind_phys_host);
}
void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){
surf_vm_model->createVM(name, ind_phys_host);
}
@@
-315,12
+307,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;
}