A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use std::mutex instead of xbt_os_mutex_t in simix
[simgrid.git]
/
src
/
simix
/
smx_io.cpp
diff --git
a/src/simix/smx_io.cpp
b/src/simix/smx_io.cpp
index
9d6ccb2
..
f210733
100644
(file)
--- a/
src/simix/smx_io.cpp
+++ b/
src/simix/smx_io.cpp
@@
-1,65
+1,48
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
8
. 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. */
/* 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 "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Storage.hpp"
-#include "src/surf/FileImpl.hpp"
-#include "src/surf/HostImpl.hpp"
-#include "src/surf/StorageImpl.hpp"
-#include "surf/surf.h"
-
-#include "src/surf/surf_interface.hpp"
-#include "smx_private.h"
+#include "xbt/ex.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
+#include "smx_private.hpp"
+#include "src/kernel/activity/IoImpl.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)");
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, surf_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
);
- synchro->simcalls.push_back(simcall);
+ smx_activity_t synchro = SIMIX_
storage_read(st, size
);
+ synchro->simcalls
_
.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
simcall->issuer->waiting_synchro = synchro;
}
-smx_activity_t SIMIX_
file_read(surf_file_t file, 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->getCname());
-
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->surf_
io = file
->read(size);
+ synchro->surf_
action_ = st
->read(size);
- synchro->surf_
io->setD
ata(synchro);
+ synchro->surf_
action_->set_d
ata(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
}
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
}
-//SIMIX FILE WRITE
-void simcall_HANDLER_file_write(smx_simcall_t simcall, surf_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
);
- synchro->simcalls.push_back(simcall);
+ smx_activity_t synchro = SIMIX_
storage_write(st, size
);
+ synchro->simcalls
_
.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
simcall->issuer->waiting_synchro = synchro;
}
-smx_activity_t SIMIX_
file_write(surf_file_t file, 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->getCname());
-
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
- synchro->surf_
io = file
->write(size);
- synchro->surf_
io->setD
ata(synchro);
+ synchro->surf_
action_ = st
->write(size);
+ synchro->surf_
action_->set_d
ata(synchro);
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
XBT_DEBUG("Create io synchro %p", synchro);
return synchro;
@@
-69,14
+52,14
@@
void SIMIX_io_destroy(smx_activity_t synchro)
{
simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro);
XBT_DEBUG("Destroy synchro %p", synchro.get());
{
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();
+ if (io->surf_
action_
)
+ io->surf_
action_
->unref();
}
void SIMIX_io_finish(smx_activity_t synchro)
{
}
void SIMIX_io_finish(smx_activity_t synchro)
{
- for (smx_simcall_t
simcall : synchro->simcalls
) {
- switch (synchro->state) {
+ for (smx_simcall_t
const& simcall : synchro->simcalls_
) {
+ switch (synchro->state
_
) {
case SIMIX_DONE:
/* do nothing, synchro done */
break;
case SIMIX_DONE:
/* do nothing, synchro done */
break;
@@
-87,11
+70,11
@@
void SIMIX_io_finish(smx_activity_t synchro)
SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
break;
default:
SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
break;
default:
- xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state));
+ xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state
_
));
}
}
- if (simcall->issuer->host
->isO
ff()) {
- simcall->issuer->context->iwannadie = 1;
+ if (simcall->issuer->host
_->is_o
ff()) {
+ simcall->issuer->context
_
->iwannadie = 1;
}
simcall->issuer->waiting_synchro = nullptr;
}
simcall->issuer->waiting_synchro = nullptr;