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
[windows] pexport is a dead project anyway
[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
6ea7968
..
8d26f4b
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-76,11
+76,11
@@
double surf_solve(double max_date)
XBT_DEBUG("Looking for next action end for all models except NS3");
xbt_dynar_foreach(model_list_invoke, iter, model) {
double next_action_end = -1.0;
XBT_DEBUG("Looking for next action end for all models except NS3");
xbt_dynar_foreach(model_list_invoke, iter, model) {
double next_action_end = -1.0;
- if (
strcmp(model->getName(), "network NS3"
)) {
- XBT_DEBUG("Running for Resource [%s]",
model->getN
ame());
+ if (
model->shareResourcesIsIdempotent(
)) {
+ XBT_DEBUG("Running for Resource [%s]",
typeid(model).n
ame());
next_action_end = model->shareResources(NOW);
XBT_DEBUG("Resource [%s] : next action end = %f",
next_action_end = model->shareResources(NOW);
XBT_DEBUG("Resource [%s] : next action end = %f",
-
model->getN
ame(), next_action_end);
+
typeid(model).n
ame(), next_action_end);
}
if ((surf_min < 0.0 || next_action_end < surf_min)
&& next_action_end >= 0.0) {
}
if ((surf_min < 0.0 || next_action_end < surf_min)
&& next_action_end >= 0.0) {
@@
-97,7
+97,7
@@
double surf_solve(double max_date)
next_event_date = tmgr_history_next_date(history);
next_event_date = tmgr_history_next_date(history);
- if(!
strcmp(surf_network_model->getName(), "network NS3")){
+ if(!
surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you
if(next_event_date!=-1.0 && surf_min!=-1.0) {
surf_min = MIN(next_event_date - NOW, surf_min);
} else{
if(next_event_date!=-1.0 && surf_min!=-1.0) {
surf_min = MIN(next_event_date - NOW, surf_min);
} else{
@@
-186,7
+186,7
@@
void surf_as_cluster_set_backbone(AS_t as, void* backbone){
}
const char *surf_model_name(surf_model_t model){
}
const char *surf_model_name(surf_model_t model){
- return
model->getN
ame();
+ return
typeid(model).n
ame();
}
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
}
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
@@
-227,17
+227,13
@@
int surf_model_running_action_set_size(surf_model_t model){
surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model,
int host_nb,
surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model,
int host_nb,
-
void *
*host_list,
+
sg_host_t
*host_list,
double *flops_amount,
double *bytes_amount,
double rate){
return static_cast<Action*>(model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate));
}
double *flops_amount,
double *bytes_amount,
double rate){
return static_cast<Action*>(model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate));
}
-surf_action_t surf_host_model_communicate(surf_host_model_t model, surf_resource_t src, surf_resource_t dst, double size, double rate){
- return model->communicate(get_casted_host(src), get_casted_host(dst), size, rate);
-}
-
xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/,
surf_resource_t src, surf_resource_t dst){
xbt_dynar_t route = NULL;
xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/,
surf_resource_t src, surf_resource_t dst){
xbt_dynar_t route = NULL;
@@
-250,8
+246,8
@@
void surf_vm_model_create(const char *name, surf_resource_t ind_phys_host){
surf_vm_model->createVM(name, ind_phys_host);
}
surf_vm_model->createVM(name, ind_phys_host);
}
-surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_
routing_edge_t src, sg_routing_edge
_t dst, double size, double rate){
- return model->communicate(s
rc, dst
, size, rate);
+surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_
host_t src, sg_host
_t dst, double size, double rate){
+ return model->communicate(s
g_host_edge(src), sg_host_edge(dst)
, size, rate);
}
const char *surf_resource_name(surf_cpp_resource_t resource){
}
const char *surf_resource_name(surf_cpp_resource_t resource){
@@
-270,43
+266,43
@@
void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state
resource->setState(state);
}
resource->setState(state);
}
-surf_action_t surf_host_sleep(surf_resource_t
resource
, double duration){
- return get_casted_host(
resource
)->sleep(duration);
+surf_action_t surf_host_sleep(surf_resource_t
host
, double duration){
+ return get_casted_host(
host
)->sleep(duration);
}
}
-double surf_host_get_speed(surf_resource_t
resource
, double load){
- return
get_casted_host(resource
)->getSpeed(load);
+double surf_host_get_speed(surf_resource_t
host
, double load){
+ return
sg_host_surfcpu(host
)->getSpeed(load);
}
}
-double surf_host_get_available_speed(surf_resource_t
resource
){
- return
get_casted_host(resource
)->getAvailableSpeed();
+double surf_host_get_available_speed(surf_resource_t
host
){
+ return
sg_host_surfcpu(host
)->getAvailableSpeed();
}
}
-int surf_host_get_core(surf_resource_t
resource
){
- return
get_casted_host(resource
)->getCore();
+int surf_host_get_core(surf_resource_t
host
){
+ return
sg_host_surfcpu(host
)->getCore();
}
}
-surf_action_t surf_host_execute(surf_resource_t
resource
, double size){
- return get_casted_host(
resource
)->execute(size);
+surf_action_t surf_host_execute(surf_resource_t
host
, double size){
+ return get_casted_host(
host
)->execute(size);
}
}
-double surf_host_get_current_power_peak(surf_resource_t
resource
){
- return
get_casted_host(resource
)->getCurrentPowerPeak();
+double surf_host_get_current_power_peak(surf_resource_t
host
){
+ return
sg_host_surfcpu(host
)->getCurrentPowerPeak();
}
}
-double surf_host_get_power_peak_at(surf_resource_t
resource
, int pstate_index){
- return
get_casted_host(resource
)->getPowerPeakAt(pstate_index);
+double surf_host_get_power_peak_at(surf_resource_t
host
, int pstate_index){
+ return
sg_host_surfcpu(host
)->getPowerPeakAt(pstate_index);
}
}
-int surf_host_get_nb_pstates(surf_resource_t
resource
){
- return
get_casted_host(resource
)->getNbPstates();
+int surf_host_get_nb_pstates(surf_resource_t
host
){
+ return
sg_host_surfcpu(host
)->getNbPstates();
}
}
-void surf_host_set_pstate(surf_resource_t
resource
, int pstate_index){
-
get_casted_host(resource
)->setPstate(pstate_index);
+void surf_host_set_pstate(surf_resource_t
host
, int pstate_index){
+
sg_host_surfcpu(host
)->setPstate(pstate_index);
}
}
-int surf_host_get_pstate(surf_resource_t
resource
){
- return
get_casted_host(resource
)->getPstate();
+int surf_host_get_pstate(surf_resource_t
host
){
+ return
sg_host_surfcpu(host
)->getPstate();
}
double surf_host_get_wattmin_at(surf_resource_t resource, int pstate){
xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
}
double surf_host_get_wattmin_at(surf_resource_t resource, int pstate){
xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
@@
-387,11
+383,11
@@
xbt_dynar_t surf_host_get_vms(surf_resource_t host){
return vms_;
}
return vms_;
}
-void surf_host_get_params(surf_resource_t host,
ws
_params_t params){
+void surf_host_get_params(surf_resource_t host,
vm
_params_t params){
get_casted_host(host)->getParams(params);
}
get_casted_host(host)->getParams(params);
}
-void surf_host_set_params(surf_resource_t host,
ws
_params_t params){
+void surf_host_set_params(surf_resource_t host,
vm
_params_t params){
get_casted_host(host)->setParams(params);
}
get_casted_host(host)->setParams(params);
}