X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6a677eea07bbb917ebf8aef3d281f37049c5254..be433eeb2c53b337a26b3d712f64b408fca53ae9:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index f303ed6e5c..cfd7f33179 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -35,7 +35,7 @@ smx_activity_t SIMIX_file_read(surf_file_t file, sg_size_t size, sg_host_t host) { /* check if the host is active */ if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->getCname()); simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->host = host; @@ -58,7 +58,7 @@ void simcall_HANDLER_file_write(smx_simcall_t simcall, surf_file_t fd, sg_size_t smx_activity_t SIMIX_file_write(surf_file_t file, sg_size_t size, sg_host_t host) { if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->getCname()); simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->host = host; @@ -79,11 +79,11 @@ void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* mount, const c smx_activity_t SIMIX_file_open(const char* mount, const char* path, sg_storage_t st) { - if (st->host()->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", st->host()->cname()); + if (st->getHost()->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot call this function", st->getHost()->getCname()); simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); - synchro->host = st->host(); + synchro->host = st->getHost(); synchro->surf_io = st->pimpl_->open(mount, path); synchro->surf_io->setData(synchro); XBT_DEBUG("Create io synchro %p", synchro); @@ -102,7 +102,7 @@ void simcall_HANDLER_file_close(smx_simcall_t simcall, surf_file_t fd, sg_host_t smx_activity_t SIMIX_file_close(surf_file_t file, sg_host_t host) { if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname()); + THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->getCname()); simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->host = host; @@ -113,17 +113,6 @@ smx_activity_t SIMIX_file_close(surf_file_t file, sg_host_t host) return synchro; } -int simcall_HANDLER_file_move(smx_simcall_t simcall, surf_file_t file, const char* fullpath) -{ - return SIMIX_file_move(simcall->issuer, file, fullpath); -} - -int SIMIX_file_move(smx_actor_t process, surf_file_t file, const char* fullpath) -{ - sg_host_t host = process->host; - return surf_host_file_move(host, file, fullpath); -} - void SIMIX_io_destroy(smx_activity_t synchro) { simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast(synchro);