#include <xbt/dict.h>
#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Storage.hpp"
+#include "src/surf/FileImpl.hpp"
+#include "src/surf/StorageImpl.hpp"
#include <mc/mc.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
-/**
- * \brief Internal function to create a SIMIX storage.
- * \param name name of the storage to create
- * \param storage the SURF storage to encapsulate
- * \param data some user data (may be nullptr)
- */
-smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data)
-{
- smx_storage_priv_t smx_storage = xbt_new0(s_smx_storage_priv_t, 1);
-
- smx_storage->data = data;
-
- /* Update global variables */
- xbt_lib_set(storage_lib,name,SIMIX_STORAGE_LEVEL,smx_storage);
- return xbt_lib_get_elm_or_null(storage_lib, name);
-}
-
-/**
- * \brief Internal function to destroy a SIMIX storage.
- *
- * \param s the host to destroy (a smx_storage_t)
- */
-void SIMIX_storage_destroy(void *s)
-{
- smx_storage_priv_t storage = static_cast<smx_storage_priv_t>(s);
-
- xbt_assert((storage != nullptr), "Invalid parameters");
- if (storage->data)
- free(storage->data);
-
- /* Clean storage structure */
- free(storage);
-}
-
//SIMIX FILE READ
void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, 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());
- simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
+ simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
synchro->host = host;
synchro->surf_io = surf_host_read(host, fd->surf_file, size);
if (host->isOff())
THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
- simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
+ 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);
}
//SIMIX FILE OPEN
-void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host)
+void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* mount, const char* path, sg_storage_t st)
{
- smx_activity_t synchro = SIMIX_file_open(fullpath, host);
+ smx_activity_t synchro = SIMIX_file_open(mount, path, st);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_activity_t SIMIX_file_open(const char* fullpath, sg_host_t host)
+smx_activity_t SIMIX_file_open(const char* mount, const char* path, sg_storage_t st)
{
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
+ if (st->host()->isOff())
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function", st->host()->cname());
- simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
- synchro->host = host;
- synchro->surf_io = surf_host_open(host, fullpath);
+ simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
+ synchro->host = st->host();
+ synchro->surf_io = st->pimpl_->open(mount, path);
synchro->surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
if (host->isOff())
THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
- simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
+ 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);
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;
+ return surf_host_unlink(host, fd->surf_file);
}
-sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd)
+sg_size_t SIMIX_file_get_size(smx_file_t fd)
{
- return SIMIX_file_get_size(simcall->issuer, fd);
+ return fd->surf_file->size();
}
-sg_size_t SIMIX_file_get_size(smx_actor_t process, smx_file_t fd)
+sg_size_t SIMIX_file_tell(smx_file_t fd)
{
- sg_host_t host = process->host;
- return surf_host_get_size(host, fd->surf_file);
+ return fd->surf_file->tell();
}
-sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd)
+int SIMIX_file_seek(smx_file_t fd, sg_offset_t offset, int origin)
{
- 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);
+ return fd->surf_file->seek(offset, origin);
}
int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
return surf_host_file_move(host, file->surf_file, fullpath);
}
-xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
- return surf_storage_get_properties(storage);
-}
-
-const char* SIMIX_storage_get_name(smx_storage_t storage){
- return sg_storage_name(storage);
-}
-
void SIMIX_io_destroy(smx_activity_t synchro)
{
- simgrid::kernel::activity::Io *io = static_cast<simgrid::kernel::activity::Io*>(synchro);
- XBT_DEBUG("Destroy synchro %p", synchro);
+ simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro);
+ XBT_DEBUG("Destroy synchro %p", synchro.get());
if (io->surf_io)
io->surf_io->unref();
- delete io;
}
void SIMIX_io_finish(smx_activity_t synchro)