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
bypass simix in simcall to surf::Cpu::setPState
[simgrid.git]
/
src
/
simix
/
smx_host.cpp
diff --git
a/src/simix/smx_host.cpp
b/src/simix/smx_host.cpp
index
57f1fac
..
34d253e
100644
(file)
--- a/
src/simix/smx_host.cpp
+++ b/
src/simix/smx_host.cpp
@@
-10,6
+10,7
@@
#include "xbt/dict.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "xbt/dict.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
+#include "src/surf/host_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
@@
-44,7
+45,8
@@
void SIMIX_host_on(sg_host_t h)
xbt_assert((host != NULL), "Invalid parameters");
if (h->isOff()) {
xbt_assert((host != NULL), "Invalid parameters");
if (h->isOff()) {
- surf_host_turn_on(surf_host_resource_priv(h));
+ simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ surf_host->turnOn();
unsigned int cpt;
smx_process_arg_t arg;
unsigned int cpt;
smx_process_arg_t arg;
@@
-97,7
+99,8
@@
void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
xbt_assert((host != NULL), "Invalid parameters");
if (h->isOn()) {
xbt_assert((host != NULL), "Invalid parameters");
if (h->isOn()) {
- surf_host_turn_off(surf_host_resource_priv(h));
+ simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ surf_host->turnOff();
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
@@
-183,9
+186,6
@@
double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) {
return surf_host_get_power_peak_at(host, pstate_index);
}
return surf_host_get_power_peak_at(host, pstate_index);
}
-void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) {
- surf_host_set_pstate(host, pstate_index);
-}
double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) {
return surf_host_get_wattmin_at(host,pstate);
}
double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) {
return surf_host_get_wattmin_at(host,pstate);
}
@@
-321,16
+321,18
@@
smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
if (!MC_is_active() && !MC_record_replay_is_active()) {
synchro->execution.surf_exec = surf_host_execute(issuer->host, flops_amount);
if (!MC_is_active() && !MC_record_replay_is_active()) {
synchro->execution.surf_exec = surf_host_execute(issuer->host, flops_amount);
- s
urf_action_set_data(synchro->execution.surf_exec,
synchro);
- s
urf_action_set_priority(synchro->execution.surf_exec,
priority);
+ s
ynchro->execution.surf_exec->setData(
synchro);
+ s
ynchro->execution.surf_exec->setPriority(
priority);
if (bound != 0)
if (bound != 0)
- surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+ ->setBound(bound);
if (affinity_mask != 0) {
/* just a double check to confirm that this host is the host where this task is running. */
xbt_assert(synchro->execution.host == issuer->host);
if (affinity_mask != 0) {
/* just a double check to confirm that this host is the host where this task is running. */
xbt_assert(synchro->execution.host == issuer->host);
- surf_cpu_action_set_affinity(synchro->execution.surf_exec, issuer->host, affinity_mask);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+ ->setAffinity(issuer->host->p_cpu, affinity_mask);
}
}
}
}
@@
-379,7
+381,7
@@
smx_synchro_t SIMIX_process_parallel_execute(const char *name,
surf_host_model_execute_parallel_task(surf_host_model,
host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
surf_host_model_execute_parallel_task(surf_host_model,
host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
- s
urf_action_set_data(synchro->execution.surf_exec,
synchro);
+ s
ynchro->execution.surf_exec->setData(
synchro);
}
XBT_DEBUG("Create parallel execute synchro %p", synchro);
}
XBT_DEBUG("Create parallel execute synchro %p", synchro);
@@
-390,7
+392,7
@@
void SIMIX_process_execution_destroy(smx_synchro_t synchro){
XBT_DEBUG("Destroy synchro %p", synchro);
if (synchro->execution.surf_exec) {
XBT_DEBUG("Destroy synchro %p", synchro);
if (synchro->execution.surf_exec) {
- s
urf_action_unref(synchro->execution.surf_exec
);
+ s
ynchro->execution.surf_exec->unref(
);
synchro->execution.surf_exec = NULL;
}
xbt_free(synchro->name);
synchro->execution.surf_exec = NULL;
}
xbt_free(synchro->name);
@@
-401,7
+403,7
@@
void SIMIX_process_execution_cancel(smx_synchro_t synchro){
XBT_DEBUG("Cancel synchro %p", synchro);
if (synchro->execution.surf_exec)
XBT_DEBUG("Cancel synchro %p", synchro);
if (synchro->execution.surf_exec)
- s
urf_action_cancel(synchro->execution.surf_exec
);
+ s
ynchro->execution.surf_exec->cancel(
);
}
double SIMIX_process_execution_get_remains(smx_synchro_t synchro){
}
double SIMIX_process_execution_get_remains(smx_synchro_t synchro){
@@
-420,13
+422,14
@@
e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro){
void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority){
if(synchro->execution.surf_exec)
void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority){
if(synchro->execution.surf_exec)
- s
urf_action_set_priority(synchro->execution.surf_exec,
priority);
+ s
ynchro->execution.surf_exec->setPriority(
priority);
}
void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound){
if(synchro->execution.surf_exec)
}
void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound){
if(synchro->execution.surf_exec)
- surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+ ->setBound(bound);
}
void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
}
void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
@@
-435,7
+438,8
@@
void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host,
if (synchro->execution.surf_exec) {
/* just a double check to confirm that this host is the host where this task is running. */
xbt_assert(synchro->execution.host == host);
if (synchro->execution.surf_exec) {
/* just a double check to confirm that this host is the host where this task is running. */
xbt_assert(synchro->execution.host == host);
- surf_cpu_action_set_affinity(synchro->execution.surf_exec, host, mask);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+ ->setAffinity(host->p_cpu, mask);
}
}
}
}
@@
-462,13
+466,13
@@
void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t
void SIMIX_host_execution_suspend(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
void SIMIX_host_execution_suspend(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
- s
urf_action_suspend(synchro->execution.surf_exec
);
+ s
ynchro->execution.surf_exec->suspend(
);
}
void SIMIX_host_execution_resume(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
}
void SIMIX_host_execution_resume(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
- s
urf_action_resume(synchro->execution.surf_exec
);
+ s
ynchro->execution.surf_exec->resume(
);
}
void SIMIX_execution_finish(smx_synchro_t synchro)
}
void SIMIX_execution_finish(smx_synchro_t synchro)
@@
-523,7
+527,7
@@
void SIMIX_post_host_execute(smx_synchro_t synchro)
/* If the host running the synchro failed, notice it so that the asking
* process can be killed if it runs on that host itself */
synchro->state = SIMIX_FAILED;
/* If the host running the synchro failed, notice it so that the asking
* process can be killed if it runs on that host itself */
synchro->state = SIMIX_FAILED;
- } else if (s
urf_action_get_state(synchro->execution.surf_exec
) == SURF_ACTION_FAILED) {
+ } else if (s
ynchro->execution.surf_exec->getState(
) == SURF_ACTION_FAILED) {
/* If the host running the synchro didn't fail, then the synchro was
* canceled */
synchro->state = SIMIX_CANCELED;
/* If the host running the synchro didn't fail, then the synchro was
* canceled */
synchro->state = SIMIX_CANCELED;
@@
-532,7
+536,7
@@
void SIMIX_post_host_execute(smx_synchro_t synchro)
}
if (synchro->execution.surf_exec) {
}
if (synchro->execution.surf_exec) {
- s
urf_action_unref(synchro->execution.surf_exec
);
+ s
ynchro->execution.surf_exec->unref(
);
synchro->execution.surf_exec = NULL;
}
synchro->execution.surf_exec = NULL;
}
@@
-547,9
+551,9
@@
void SIMIX_set_category(smx_synchro_t synchro, const char *category)
{
if (synchro->state != SIMIX_RUNNING) return;
if (synchro->type == SIMIX_SYNC_EXECUTE){
{
if (synchro->state != SIMIX_RUNNING) return;
if (synchro->type == SIMIX_SYNC_EXECUTE){
- s
urf_action_set_category(synchro->execution.surf_exec,
category);
+ s
ynchro->execution.surf_exec->setCategory(
category);
}else if (synchro->type == SIMIX_SYNC_COMMUNICATE){
}else if (synchro->type == SIMIX_SYNC_COMMUNICATE){
- s
urf_action_set_category(synchro->comm.surf_comm,
category);
+ s
ynchro->comm.surf_comm->setCategory(
category);
}
}
}
}
@@
-561,24
+565,22
@@
void SIMIX_set_category(smx_synchro_t synchro, const char *category)
*/
void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params)
{
*/
void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params)
{
- /* jump to ws_get_params(). */
- surf_host_get_params(ind_vm, params);
+ ind_vm->extension<simgrid::surf::Host>()->getParams(params);
}
void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params)
{
}
void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params)
{
- /* jump to ws_set_params(). */
- surf_host_set_params(ind_vm, params);
+ ind_vm->extension<simgrid::surf::Host>()->setParams(params);
}
}
-xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host){
+xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host)
+{
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_host_get_mounted_storage_list(host);
+ return host->extension<simgrid::surf::Host>()->getMountedStorageList();
}
}
-xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host){
+xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host)
+{
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_host_get_attached_storage_list(host);
+ return host->extension<simgrid::surf::Host>()->getAttachedStorageList();
}
}