-/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-2021. 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 <exception>
-#include <mutex>
+#include <simgrid/barrier.h>
+#include <simgrid/s4u/Barrier.hpp>
+#include <xbt/log.h>
-#include "simgrid/Exception.hpp"
-#include "simgrid/barrier.h"
-#include "simgrid/s4u/Barrier.hpp"
-#include "simgrid/simix.h"
-#include "xbt/log.hpp"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_barrier, "S4U barrier");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_barrier, s4u, "S4U barrier");
namespace simgrid {
namespace s4u {
-Barrier::Barrier(unsigned int expected_processes)
- : mutex_(Mutex::create()), cond_(ConditionVariable::create()), expected_actors_(expected_processes)
-{
-}
-
/** @brief Create a new barrier
*
* See @ref s4u_raii.
XBT_DEBUG("waiting %p %u/%u", this, arrived_actors_, expected_actors_);
if (arrived_actors_ == expected_actors_) {
cond_->notify_all();
- mutex_->unlock();
arrived_actors_ = 0;
+ mutex_->unlock();
return SG_BARRIER_SERIAL_THREAD;
}
}
/** @brief Initializes a barrier, with count elements */
-void sg_barrier_destroy(sg_bar_t bar)
+void sg_barrier_destroy(const_sg_bar_t bar)
{
delete bar;
}