-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-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 "msg_private.hpp"
#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
#include "xbt/synchro.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
/** @brief locks on a semaphore object up until the provided timeout expires */
msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
- msg_error_t res = MSG_OK;
- try {
- simcall_sem_acquire_timeout(sem,timeout);
- } catch(xbt_ex& e) {
- if (e.category == timeout_error)
- return MSG_TIMEOUT;
- throw;
- }
- return res;
+ return simcall_sem_acquire_timeout(sem, timeout) ? MSG_TIMEOUT : MSG_OK;
}
/** @brief releases the semaphore object */
/** @brief Initializes a barrier, with count elements */
msg_bar_t MSG_barrier_init(unsigned int count) {
- msg_bar_t bar = xbt_new0(s_msg_bar_t, 1);
+ msg_bar_t bar = new s_msg_bar_t;
bar->expected_processes = count;
bar->arrived_processes = 0;
bar->mutex = xbt_mutex_init();
void MSG_barrier_destroy(msg_bar_t bar) {
xbt_mutex_destroy(bar->mutex);
xbt_cond_destroy(bar->cond);
- xbt_free(bar);
+ delete bar;
}
/** @brief Performs a barrier already initialized */