/* 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 <xbt/ex.hpp>
+#include <xbt/sysdep.h>
+#include <xbt/log.h>
+#include <xbt/dict.h>
+
+#include <simgrid/s4u/host.hpp>
+
+#include <mc/mc.h>
+
#include "src/surf/surf_interface.hpp"
#include "smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
-#include "mc/mc.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix,
- "Logging specific to SIMIX (io)");
+#include "src/simix/SynchroIo.hpp"
+
+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 NULL)
+ * \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 storage = (smx_storage_priv_t) s;
- xbt_assert((storage != NULL), "Invalid parameters");
+ xbt_assert((storage != nullptr), "Invalid parameters");
if (storage->data)
free(storage->data);
void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
smx_synchro_t synchro = SIMIX_file_read(fd, size, host);
- xbt_fifo_push(synchro->simcalls, simcall);
+ synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
{
- smx_synchro_t synchro;
-
/* check if the host is active */
- if (host->isOff()) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- sg_host_get_name(host));
- }
+ if (host->isOff())
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
- synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator);
- synchro->type = SIMIX_SYNC_IO;
- synchro->name = NULL;
- synchro->category = NULL;
- synchro->io.host = host;
- synchro->io.surf_io = surf_host_read(host, fd->surf_file, size);
+ simgrid::simix::Io *synchro = new simgrid::simix::Io();
+ synchro->host = host;
+ synchro->surf_io = surf_host_read(host, fd->surf_file, size);
- synchro->io.surf_io->setData(synchro);
+ synchro->surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
smx_synchro_t synchro = SIMIX_file_write(fd, size, host);
- xbt_fifo_push(synchro->simcalls, simcall);
+ synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
{
- smx_synchro_t synchro;
-
- /* check if the host is active */
- if (host->isOff()) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- sg_host_get_name(host));
- }
+ if (host->isOff())
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
- synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator);
- synchro->type = SIMIX_SYNC_IO;
- synchro->name = NULL;
- synchro->category = NULL;
-
- synchro->io.host = host;
- synchro->io.surf_io = surf_host_write(host, fd->surf_file, size);
-
- synchro->io.surf_io->setData(synchro);
+ simgrid::simix::Io *synchro = new simgrid::simix::Io();
+ 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;
void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host)
{
smx_synchro_t synchro = SIMIX_file_open(fullpath, host);
- xbt_fifo_push(synchro->simcalls, simcall);
+ synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host)
{
- smx_synchro_t synchro;
-
- /* check if the host is active */
- if (host->isOff()) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- sg_host_get_name(host));
- }
-
- synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator);
- synchro->type = SIMIX_SYNC_IO;
- synchro->name = NULL;
- synchro->category = NULL;
+ if (host->isOff())
+ 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);
-
- synchro->io.surf_io->setData(synchro);
+ simgrid::simix::Io *synchro = new simgrid::simix::Io();
+ synchro->host = host;
+ synchro->surf_io = surf_host_open(host, fullpath);
+ synchro->surf_io->setData(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host)
{
smx_synchro_t synchro = SIMIX_file_close(fd, host);
- xbt_fifo_push(synchro->simcalls, simcall);
+ synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host)
{
- smx_synchro_t synchro;
+ if (host->isOff())
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
- /* check if the host is active */
- if (host->isOff()) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- sg_host_get_name(host));
- }
-
- synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator);
- synchro->type = SIMIX_SYNC_IO;
- synchro->name = NULL;
- synchro->category = NULL;
-
- synchro->io.host = host;
- synchro->io.surf_io = surf_host_close(host, fd->surf_file);
-
- synchro->io.surf_io->setData(synchro);
+ simgrid::simix::Io *synchro = new simgrid::simix::Io();
+ 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)
{
- /* check if the host is active */
- if (host->isOff()) {
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
- sg_host_get_name(host));
- }
+ if (host->isOff())
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
int res = surf_host_unlink(host, fd->surf_file);
xbt_free(fd);
}
sg_size_t SIMIX_storage_get_size(smx_storage_t storage){
- xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
return surf_storage_get_size(storage);
}
}
const char* SIMIX_storage_get_name(smx_storage_t storage){
- xbt_assert((storage != NULL), "Invalid parameters");
return sg_storage_name(storage);
}
xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
- xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
return surf_storage_get_content(storage);
}
const char* SIMIX_storage_get_host(smx_storage_t storage){
- xbt_assert((storage != NULL), "Invalid parameters");
return surf_storage_get_host(storage);
}
void SIMIX_post_io(smx_synchro_t synchro)
{
- xbt_fifo_item_t i;
- smx_simcall_t simcall;
-
- xbt_fifo_foreach(synchro->simcalls,i,simcall,smx_simcall_t) {
- switch (simcall->call) {
- case SIMCALL_FILE_OPEN: {
- smx_file_t tmp = xbt_new(s_smx_file_t,1);
- tmp->surf_file = surf_storage_action_get_file(synchro->io.surf_io);
- simcall_file_open__set__result(simcall, tmp);
- break;
- }
- case SIMCALL_FILE_CLOSE:
- xbt_free(simcall_file_close__get__fd(simcall));
- simcall_file_close__set__result(simcall, 0);
- break;
- case SIMCALL_FILE_WRITE:
- simcall_file_write__set__result(simcall,
- synchro->io.surf_io->getCost());
- break;
-
- case SIMCALL_FILE_READ:
- simcall_file_read__set__result(simcall,
- synchro->io.surf_io->getCost());
- break;
-
- default:
- break;
- }
- }
-
- switch (synchro->io.surf_io->getState()) {
-
- case SURF_ACTION_FAILED:
- synchro->state = SIMIX_FAILED;
- break;
-
- case SURF_ACTION_DONE:
- synchro->state = SIMIX_DONE;
- break;
-
- default:
- THROW_IMPOSSIBLE;
- break;
- }
-
- SIMIX_io_finish(synchro);
}
void SIMIX_io_destroy(smx_synchro_t synchro)
{
+ simgrid::simix::Io *io = static_cast<simgrid::simix::Io*>(synchro);
XBT_DEBUG("Destroy synchro %p", synchro);
- if (synchro->io.surf_io)
- synchro->io.surf_io->unref();
- xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
+ if (io->surf_io)
+ io->surf_io->unref();
+ delete io;
}
void SIMIX_io_finish(smx_synchro_t synchro)
{
- xbt_fifo_item_t item;
- smx_simcall_t simcall;
-
- xbt_fifo_foreach(synchro->simcalls, item, simcall, smx_simcall_t) {
+ for (smx_simcall_t simcall : synchro->simcalls) {
switch (synchro->state) {
simcall->issuer->context->iwannadie = 1;
}
- simcall->issuer->waiting_synchro = NULL;
+ simcall->issuer->waiting_synchro = nullptr;
SIMIX_simcall_answer(simcall);
}
