-/* Copyright (c) 2012, 2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2012-2017. 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_SYNCHRO_PRIVATE_H
-#define _SIMIX_SYNCHRO_PRIVATE_H
+#ifndef SIMIX_SYNCHRO_PRIVATE_H
+#define SIMIX_SYNCHRO_PRIVATE_H
-#include <atomic>
-
-#include "xbt/base.h"
+#include "simgrid/s4u/ConditionVariable.hpp"
#include "xbt/swag.h"
-#include "xbt/xbt_os_thread.h"
-#include "src/simix/popping_private.h"
namespace simgrid {
namespace simix {
-class XBT_PUBLIC() Mutex {
+class XBT_PUBLIC() MutexImpl {
public:
- Mutex();
- ~Mutex();
- Mutex(Mutex const&) = delete;
- Mutex& operator=(Mutex const&) = delete;
+ MutexImpl();
+ ~MutexImpl();
+ MutexImpl(MutexImpl const&) = delete;
+ MutexImpl& operator=(MutexImpl const&) = delete;
- void lock(smx_process_t issuer);
- bool try_lock(smx_process_t issuer);
- void unlock(smx_process_t issuer);
+ void lock(smx_actor_t issuer);
+ bool try_lock(smx_actor_t issuer);
+ void unlock(smx_actor_t issuer);
bool locked = false;
- smx_process_t owner = nullptr;
+ smx_actor_t owner = nullptr;
// List of sleeping processes:
xbt_swag_t sleeping = nullptr;
// boost::intrusive_ptr<Mutex> support:
- friend void intrusive_ptr_add_ref(Mutex* mutex)
+ friend void intrusive_ptr_add_ref(MutexImpl* mutex)
{
// Atomic operation! Do not split in two instructions!
- auto previous = (mutex->refcount_)++;
+ XBT_ATTRIB_UNUSED auto previous = (mutex->refcount_)++;
xbt_assert(previous != 0);
- (void) previous;
}
- friend void intrusive_ptr_release(Mutex* mutex)
+ friend void intrusive_ptr_release(MutexImpl* mutex)
{
// Atomic operation! Do not split in two instructions!
auto count = --(mutex->refcount_);
if (count == 0)
delete mutex;
}
+
+ simgrid::s4u::Mutex& mutex() { return mutex_; }
+
private:
std::atomic_int_fast32_t refcount_ { 1 };
+ simgrid::s4u::Mutex mutex_;
};
}
}
typedef struct s_smx_cond {
- smx_mutex_t mutex;
- xbt_swag_t sleeping; /* list of sleeping process */
- std::atomic_int_fast32_t refcount_;
+ s_smx_cond() : cond_(this) {}
+
+ std::atomic_int_fast32_t refcount_ { 1 };
+ smx_mutex_t mutex = nullptr;
+ xbt_swag_t sleeping = nullptr; /* list of sleeping process */
+ simgrid::s4u::ConditionVariable cond_;
} s_smx_cond_t;
typedef struct s_smx_sem {
xbt_swag_t sleeping; /* list of sleeping process */
} s_smx_sem_t;
+XBT_PRIVATE void SIMIX_post_synchro(smx_activity_t synchro);
+XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall);
+XBT_PRIVATE void SIMIX_synchro_destroy(smx_activity_t synchro);
+XBT_PRIVATE void SIMIX_synchro_finish(smx_activity_t synchro);
-
-XBT_PRIVATE void SIMIX_post_synchro(smx_synchro_t synchro);
-XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall);
-XBT_PRIVATE void SIMIX_synchro_destroy(smx_synchro_t synchro);
-XBT_PRIVATE void SIMIX_synchro_finish(smx_synchro_t synchro);
-
-XBT_PRIVATE smx_cond_t SIMIX_cond_init(void);
+XBT_PRIVATE smx_cond_t SIMIX_cond_init();
XBT_PRIVATE void SIMIX_cond_broadcast(smx_cond_t cond);
XBT_PRIVATE void SIMIX_cond_signal(smx_cond_t cond);
XBT_PRIVATE void intrusive_ptr_add_ref(s_smx_cond_t *cond);
XBT_PRIVATE void SIMIX_sem_release(smx_sem_t sem);
XBT_PRIVATE int SIMIX_sem_would_block(smx_sem_t sem);
XBT_PRIVATE int SIMIX_sem_get_capacity(smx_sem_t sem);
+
#endif
