X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a7c50103eca28c3ae0260ae8917c4e37def6c90..f3f75bc2f18724100ab01ced9891742ea48b7a08:/src/simix/smx_synchro_private.h

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index f312483329..c4c5371502 100644
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -1,21 +1,13 @@
-/* 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 <simgrid/s4u/mutex.hpp>
-#include <simgrid/s4u/conditionVariable.hpp>
-
-#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 {
@@ -27,12 +19,12 @@ public:
   Mutex(Mutex const&) = delete;
   Mutex& operator=(Mutex 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;
 
@@ -76,12 +68,12 @@ typedef struct s_smx_sem {
   xbt_swag_t sleeping;          /* list of sleeping process */
 } s_smx_sem_t;
 
-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 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 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);
@@ -91,4 +83,5 @@ XBT_PRIVATE XBT_PRIVATE smx_sem_t SIMIX_sem_init(unsigned int value);
 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