#include <xbt/ex.hpp>
#include <xbt/sysdep.h>
#include <xbt/log.h>
-#include <xbt/dict.h>
#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Storage.hpp"
+#include "src/surf/HostImpl.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "surf/surf.hpp"
-#include <mc/mc.h>
-
+#include "smx_private.hpp"
#include "src/surf/surf_interface.hpp"
-#include "smx_private.h"
#include "src/kernel/activity/SynchroIo.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
-//SIMIX FILE READ
-void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
+void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
{
- smx_activity_t synchro = SIMIX_file_read(fd, size, host);
+ smx_activity_t synchro = SIMIX_storage_read(st, size);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_activity_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
+smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size)
{
- /* check if the host is active */
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
-
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->host = host;
- synchro->surf_io = surf_host_read(host, fd->surf_file, size);
+ synchro->surf_io = st->read(size);
synchro->surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
}
-//SIMIX FILE WRITE
-void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
+void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
{
- smx_activity_t synchro = SIMIX_file_write(fd, size, host);
+ smx_activity_t synchro = SIMIX_storage_write(st, size);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_activity_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
+smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size)
{
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
-
- simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->host = host;
- synchro->surf_io = surf_host_write(host, fd->surf_file, size);
- synchro->surf_io->setData(synchro);
- XBT_DEBUG("Create io synchro %p", synchro);
-
- return synchro;
-}
-
-//SIMIX FILE OPEN
-void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host)
-{
- smx_activity_t synchro = SIMIX_file_open(fullpath, host);
- synchro->simcalls.push_back(simcall);
- simcall->issuer->waiting_synchro = synchro;
-}
-
-smx_activity_t SIMIX_file_open(const char* fullpath, sg_host_t host)
-{
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
-
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->host = host;
- synchro->surf_io = surf_host_open(host, fullpath);
+ synchro->surf_io = st->write(size);
synchro->surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
}
-//SIMIX FILE CLOSE
-void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host)
-{
- smx_activity_t synchro = SIMIX_file_close(fd, host);
- synchro->simcalls.push_back(simcall);
- simcall->issuer->waiting_synchro = synchro;
-}
-
-smx_activity_t SIMIX_file_close(smx_file_t fd, sg_host_t host)
-{
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
-
- simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->host = host;
- synchro->surf_io = surf_host_close(host, fd->surf_file);
- synchro->surf_io->setData(synchro);
- XBT_DEBUG("Create io synchro %p", synchro);
-
- return synchro;
-}
-
-//SIMIX FILE UNLINK
-int SIMIX_file_unlink(smx_file_t fd, sg_host_t host)
-{
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
-
- int res = surf_host_unlink(host, fd->surf_file);
- xbt_free(fd);
- return res;
-}
-
-sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd)
-{
- return SIMIX_file_get_size(simcall->issuer, fd);
-}
-
-sg_size_t SIMIX_file_get_size(smx_actor_t process, smx_file_t fd)
-{
- sg_host_t host = process->host;
- return surf_host_get_size(host, fd->surf_file);
-}
-
-sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd)
-{
- return SIMIX_file_tell(simcall->issuer, fd);
-}
-
-sg_size_t SIMIX_file_tell(smx_actor_t process, smx_file_t fd)
-{
- sg_host_t host = process->host;
- return surf_host_file_tell(host, fd->surf_file);
-}
-
-
-xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd)
-{
- return SIMIX_file_get_info(simcall->issuer, fd);
-}
-
-xbt_dynar_t SIMIX_file_get_info(smx_actor_t process, smx_file_t fd)
-{
- sg_host_t host = process->host;
- return surf_host_get_info(host, fd->surf_file);
-}
-
-int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin)
-{
- return SIMIX_file_seek(simcall->issuer, fd, offset, origin);
-}
-
-int SIMIX_file_seek(smx_actor_t process, smx_file_t fd, sg_offset_t offset, int origin)
-{
- sg_host_t host = process->host;
- return surf_host_file_seek(host, fd->surf_file, offset, origin);
-}
-
-int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
-{
- return SIMIX_file_move(simcall->issuer, file, fullpath);
-}
-
-int SIMIX_file_move(smx_actor_t process, smx_file_t file, const char* fullpath)
-{
- sg_host_t host = process->host;
- return surf_host_file_move(host, file->surf_file, fullpath);
-}
-
void SIMIX_io_destroy(smx_activity_t synchro)
{
simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro);
void SIMIX_io_finish(smx_activity_t synchro)
{
- for (smx_simcall_t simcall : synchro->simcalls) {
+ for (smx_simcall_t const& simcall : synchro->simcalls) {
switch (synchro->state) {
case SIMIX_DONE:
/* do nothing, synchro done */
