/* 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 "src/surf/surf_interface.hpp"
#include "smx_private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
smx_synchro_t synchro;
/* check if the host is active */
- if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
+ if (host->is_off()) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host));
}
synchro->io.host = host;
synchro->io.surf_io = surf_host_read(host, fd->surf_file, size);
- surf_action_set_data(synchro->io.surf_io, synchro);
+ synchro->io.surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
smx_synchro_t synchro;
/* check if the host is active */
- if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
+ if (host->is_off()) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host));
}
synchro->io.host = host;
synchro->io.surf_io = surf_host_write(host, fd->surf_file, size);
- surf_action_set_data(synchro->io.surf_io, synchro);
+ synchro->io.surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
smx_synchro_t synchro;
/* check if the host is active */
- if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
+ if (host->is_off()) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host));
}
synchro->io.host = host;
synchro->io.surf_io = surf_host_open(host, fullpath);
- surf_action_set_data(synchro->io.surf_io, synchro);
+ synchro->io.surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
smx_synchro_t synchro;
/* check if the host is active */
- if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
+ if (host->is_off()) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host));
}
synchro->io.host = host;
synchro->io.surf_io = surf_host_close(host, fd->surf_file);
- surf_action_set_data(synchro->io.surf_io, synchro);
+ synchro->io.surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
int SIMIX_file_unlink(smx_file_t fd, sg_host_t host)
{
/* check if the host is active */
- if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
+ if (host->is_off()) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host));
}
}
xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
- xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
- return (xbt_dict_t) surf_resource_get_properties((surf_cpp_resource_t)
- surf_storage_resource_priv(storage));
+ return surf_storage_get_properties(storage);
}
const char* SIMIX_storage_get_name(smx_storage_t storage){
simcall_file_close__set__result(simcall, 0);
break;
case SIMCALL_FILE_WRITE:
- simcall_file_write__set__result(simcall, surf_action_get_cost(synchro->io.surf_io));
+ simcall_file_write__set__result(simcall,
+ synchro->io.surf_io->getCost());
break;
case SIMCALL_FILE_READ:
- simcall_file_read__set__result(simcall, surf_action_get_cost(synchro->io.surf_io));
+ simcall_file_read__set__result(simcall,
+ synchro->io.surf_io->getCost());
break;
default:
}
}
- switch (surf_action_get_state(synchro->io.surf_io)) {
+ switch (synchro->io.surf_io->getState()) {
case SURF_ACTION_FAILED:
synchro->state = SIMIX_FAILED;
{
XBT_DEBUG("Destroy synchro %p", synchro);
if (synchro->io.surf_io)
- surf_action_unref(synchro->io.surf_io);
+ synchro->io.surf_io->unref();
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
(int)synchro->state);
}
- if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
+ if (simcall->issuer->host->is_off()) {
simcall->issuer->context->iwannadie = 1;
}