-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* 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 "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/simix/smx_private.hpp"
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space implementation");
namespace simgrid {
namespace kernel {
namespace activity {
-MutexImpl::MutexImpl() : mutex_(this)
+MutexImpl::MutexImpl() : piface_(this)
{
XBT_IN("(%p)", this);
XBT_OUT();
{
XBT_IN("(%p; %p)", this, issuer);
/* FIXME: check where to validate the arguments */
- smx_activity_t synchro = nullptr;
+ RawImplPtr synchro = nullptr;
if (this->locked) {
/* FIXME: check if the host is active ? */
/* Somebody using the mutex, use a synchronization to get host failures */
- synchro = SIMIX_synchro_wait(issuer->host, -1);
- synchro->simcalls.push_back(&issuer->simcall);
+ synchro = RawImplPtr(new RawImpl())->start(issuer->get_host(), -1);
+ synchro->simcalls_.push_back(&issuer->simcall);
issuer->waiting_synchro = synchro;
this->sleeping.push_back(*issuer);
} else {
/** Tries to lock the mutex for a process
*
- * \param issuer the process that tries to acquire the mutex
- * \return whether we managed to lock the mutex
+ * @param issuer the process that tries to acquire the mutex
+ * @return whether we managed to lock the mutex
*/
bool MutexImpl::try_lock(smx_actor_t issuer)
{
/* If the mutex is not owned by the issuer, that's not good */
if (issuer != this->owner)
THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%ld), not by you.",
- this->owner->get_cname(), this->owner->pid);
+ this->owner->get_cname(), this->owner->get_pid());
if (not this->sleeping.empty()) {
/*process to wake up */
}
XBT_OUT();
}
-}
-}
-}
-
/** Increase the refcount for this mutex */
-smx_mutex_t SIMIX_mutex_ref(smx_mutex_t mutex)
+MutexImpl* MutexImpl::ref()
{
- if (mutex != nullptr)
- intrusive_ptr_add_ref(mutex);
- return mutex;
+ intrusive_ptr_add_ref(this);
+ return this;
}
/** Decrease the refcount for this mutex */
-void SIMIX_mutex_unref(smx_mutex_t mutex)
+void MutexImpl::unref()
{
- if (mutex != nullptr)
- intrusive_ptr_release(mutex);
+ intrusive_ptr_release(this);
}
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
+
// Simcall handlers:
void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)