/* 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/kernel/activity/IoImpl.hpp"
+#include "mc/mc.h"
+#include "simgrid/Exception.hpp"
#include "simgrid/kernel/resource/Action.hpp"
-#include "src/simix/smx_io_private.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_private.hpp"
#include "src/surf/StorageImpl.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_io);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
+
+void simcall_HANDLER_io_wait(smx_simcall_t simcall, smx_activity_t synchro)
+{
+ XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state_);
+
+ /* Associate this simcall to the synchro */
+ synchro->simcalls_.push_back(simcall);
+ simcall->issuer->waiting_synchro = synchro;
+
+ /* set surf's synchro */
+ if (MC_is_active() || MC_record_replay_is_active()) {
+ synchro->state_ = SIMIX_DONE;
+ boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro)->finish();
+ return;
+ }
+
+ /* If the synchro is already finished then perform the error handling */
+ if (synchro->state_ != SIMIX_RUNNING)
+ boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro)->finish();
+}
+
namespace simgrid {
namespace kernel {
namespace activity {
}
on_completion(this);
- SIMIX_io_finish(this);
+ finish();
}
+
+void IoImpl::finish()
+{
+ for (smx_simcall_t const& simcall : simcalls_) {
+ switch (state_) {
+ case SIMIX_DONE:
+ /* do nothing, synchro done */
+ break;
+ case SIMIX_FAILED:
+ simcall->issuer->exception_ =
+ std::make_exception_ptr(simgrid::StorageFailureException(XBT_THROW_POINT, "Storage failed"));
+ break;
+ case SIMIX_CANCELED:
+ simcall->issuer->exception_ =
+ std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "I/O Canceled"));
+ break;
+ default:
+ xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(state_));
+ }
+
+ simcall->issuer->waiting_synchro = nullptr;
+ if (simcall->issuer->get_host()->is_on())
+ SIMIX_simcall_answer(simcall);
+ else
+ simcall->issuer->context_->iwannadie = true;
+ }
+}
+
/*************
* Callbacks *
*************/
IoImpl* start(sg_size_t size, simgrid::s4u::Io::OpType type);
void post() override;
+ void finish();
void cancel();
double get_remaining();
sg_size_t get_performed_ioops() { return performed_ioops_; }
#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "src/kernel/activity/IoImpl.hpp"
-#include "src/simix/smx_io_private.hpp"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.hpp"
#include "src/simix/smx_host_private.hpp"
-#include "src/simix/smx_io_private.hpp"
#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/simix/smx_host_private.hpp"
-#include "src/simix/smx_io_private.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
+++ /dev/null
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
-
-/* 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 "mc/mc.h"
-#include "simgrid/Exception.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Io.hpp"
-
-#include "smx_private.hpp"
-#include "src/kernel/activity/IoImpl.hpp"
-#include "src/mc/mc_replay.hpp"
-#include "src/simix/smx_io_private.hpp"
-#include "src/surf/StorageImpl.hpp"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
-
-void simcall_HANDLER_io_wait(smx_simcall_t simcall, smx_activity_t synchro)
-{
- XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state_);
-
- /* Associate this simcall to the synchro */
- synchro->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = synchro;
-
- /* set surf's synchro */
- if (MC_is_active() || MC_record_replay_is_active()) {
- synchro->state_ = SIMIX_DONE;
- SIMIX_io_finish(synchro);
- return;
- }
-
- /* If the synchro is already finished then perform the error handling */
- if (synchro->state_ != SIMIX_RUNNING)
- SIMIX_io_finish(synchro);
-}
-
-void SIMIX_io_finish(smx_activity_t synchro)
-{
- for (smx_simcall_t const& simcall : synchro->simcalls_) {
- switch (synchro->state_) {
- case SIMIX_DONE:
- /* do nothing, synchro done */
- break;
- case SIMIX_FAILED:
- simcall->issuer->exception_ =
- std::make_exception_ptr(simgrid::StorageFailureException(XBT_THROW_POINT, "Storage failed"));
- break;
- case SIMIX_CANCELED:
- simcall->issuer->exception_ =
- std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "I/O Canceled"));
- break;
- default:
- xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state_));
- }
-
- simcall->issuer->waiting_synchro = nullptr;
- if (simcall->issuer->get_host()->is_on())
- SIMIX_simcall_answer(simcall);
- else
- simcall->issuer->context_->iwannadie = true;
- }
-}
+++ /dev/null
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
-
-/* 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. */
-
-#ifndef SIMIX_IO_PRIVATE_HPP
-#define SIMIX_IO_PRIVATE_HPP
-
-#include <xbt/base.h>
-#include "simgrid/s4u/Io.hpp"
-
-XBT_PRIVATE void SIMIX_io_finish(smx_activity_t synchro);
-
-#endif
src/simix/popping_enum.h
src/simix/popping_accessors.hpp
src/simix/smx_host_private.hpp
- src/simix/smx_io_private.hpp
src/simix/smx_private.hpp
src/simix/smx_synchro_private.hpp
src/smpi/colls/coll_tuned_topo.hpp
src/simix/smx_environment.cpp
src/simix/smx_global.cpp
src/simix/smx_host.cpp
- src/simix/smx_io.cpp
src/simix/smx_network.cpp
src/simix/ActorImpl.cpp
src/simix/ActorImpl.hpp