/* Classical synchro schema, implemented on top of SimGrid */
-/* Copyright (c) 2007-2016. The SimGrid Team.
+/* 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 "xbt/ex.h"
-#include "xbt/synchro.h"
-
+#include "simgrid/Exception.hpp"
#include "simgrid/simix.h" /* used implementation */
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt, "Synchronization mechanism");
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "xbt/synchro.h"
/****** mutex related functions ******/
xbt_mutex_t xbt_mutex_init(void)
void xbt_mutex_destroy(xbt_mutex_t mutex)
{
- SIMIX_mutex_unref((smx_mutex_t)mutex);
+ if (mutex != nullptr)
+ mutex->unref();
}
/***** condition related functions *****/
simcall_cond_wait((smx_cond_t)cond, (smx_mutex_t)mutex);
}
-void xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay)
+int xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay)
{
- simcall_cond_wait_timeout((smx_cond_t)cond, (smx_mutex_t)mutex, delay);
+ return simcall_cond_wait_timeout((smx_cond_t)cond, (smx_mutex_t)mutex, delay);
}
void xbt_cond_signal(xbt_cond_t cond)
{
- simcall_cond_signal((smx_cond_t)cond);
+ cond->cond_.notify_one();
}
void xbt_cond_broadcast(xbt_cond_t cond)
{
- simcall_cond_broadcast((smx_cond_t)cond);
+ cond->cond_.notify_all();
}
void xbt_cond_destroy(xbt_cond_t cond)
{
- SIMIX_cond_unref((smx_cond_t)cond);
+ delete cond;
}