-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. 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"
+#include "src/simix/smx_synchro_private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space implementation");
namespace kernel {
namespace activity {
-MutexImpl::MutexImpl() : mutex_(this)
+MutexImpl::MutexImpl() : piface_(this)
{
XBT_IN("(%p)", this);
XBT_OUT();
/* 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->simcalls_.push_back(&issuer->simcall);
issuer->waiting_synchro = synchro;
this->sleeping.push_back(*issuer);
} else {
/* 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->getCname(), this->owner->pid);
+ this->owner->get_cname(), this->owner->pid);
if (not this->sleeping.empty()) {
/*process to wake up */