-/* Copyright (c) 2018-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-2022. 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 "src/msg/msg_private.hpp"
-#include "xbt/log.h"
+#include <simgrid/s4u/Semaphore.hpp>
+#include <simgrid/semaphore.h>
-#include "simgrid/forward.h"
-#include "simgrid/s4u/Semaphore.hpp"
#include "src/kernel/activity/SemaphoreImpl.hpp"
-#include "src/mc/checker/SimcallObserver.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
namespace simgrid {
namespace s4u {
void Semaphore::acquire()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::SemAcquireSimcall observer{issuer, pimpl_};
- kernel::actor::simcall_blocking<void>([&observer] { observer.get_sem()->acquire(observer.get_issuer(), -1.0); },
- &observer);
+ kernel::actor::SemAcquireSimcall observer{issuer, pimpl_};
+ kernel::actor::simcall_blocking([&observer] { observer.get_sem()->acquire(observer.get_issuer(), -1.0); }, &observer);
}
bool Semaphore::acquire_timeout(double timeout)
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::SemAcquireSimcall observer{issuer, pimpl_, timeout};
- kernel::actor::simcall_blocking<void>(
+ kernel::actor::SemAcquireSimcall observer{issuer, pimpl_, timeout};
+ return kernel::actor::simcall_blocking(
[&observer] { observer.get_sem()->acquire(observer.get_issuer(), observer.get_timeout()); }, &observer);
- return simgrid::simix::unmarshal<bool>(issuer->simcall_.result_);
}
void Semaphore::release()