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
track all the useless void
[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
..
f3262ae
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,23
+17,23
@@
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;
-void surf_presolve(
void
)
+void surf_presolve()
{
double next_event_date = -1.0;
{
double next_event_date = -1.0;
- tmgr_trace_iterator_t event =
NULL
;
+ tmgr_trace_iterator_t event =
nullptr
;
double value = -1.0;
double value = -1.0;
- simgrid::surf::Resource *resource =
NULL
;
- simgrid::surf::Model *model =
NULL
;
+ simgrid::surf::Resource *resource =
nullptr
;
+ simgrid::surf::Model *model =
nullptr
;
unsigned int iter;
XBT_DEBUG ("Consume all trace events occurring before the starting time.");
unsigned int iter;
XBT_DEBUG ("Consume all trace events occurring before the starting time.");
@@
-60,9
+59,9
@@
double surf_solve(double max_date)
double next_event_date = -1.0;
double model_next_action_end = -1.0;
double value = -1.0;
double next_event_date = -1.0;
double model_next_action_end = -1.0;
double value = -1.0;
- simgrid::surf::Resource *resource =
NULL
;
- simgrid::surf::Model *model =
NULL
;
- tmgr_trace_iterator_t event =
NULL
;
+ simgrid::surf::Resource *resource =
nullptr
;
+ simgrid::surf::Model *model =
nullptr
;
+ tmgr_trace_iterator_t event =
nullptr
;
unsigned int iter;
if (max_date > 0.0) {
unsigned int iter;
if (max_date > 0.0) {
@@
-77,7
+76,7
@@
double surf_solve(double max_date)
if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) {
time_delta = next_event_phy;
}
if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) {
time_delta = next_event_phy;
}
- if (surf_vm_model !=
NULL
) {
+ if (surf_vm_model !=
nullptr
) {
XBT_DEBUG("Looking for next event in virtual models");
double next_event_virt = surf_vm_model->next_occuring_event(NOW);
if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0)
XBT_DEBUG("Looking for next event in virtual models");
double next_event_virt = surf_vm_model->next_occuring_event(NOW);
if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0)
@@
-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 nullptr
;
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 nullptr
;
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;
@@
-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);
}
@@
-196,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);
}
@@
-280,11
+263,11
@@
sg_host_t surf_vm_get_pm(sg_host_t vm){
}
void surf_vm_set_bound(sg_host_t vm, double bound){
}
void surf_vm_set_bound(sg_host_t vm, double bound){
-
return
get_casted_vm(vm)->setBound(bound);
+ get_casted_vm(vm)->setBound(bound);
}
void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){
}
void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){
-
return
get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
+ get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
@@
-315,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;
}