Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[SMPI] Replay: Move SendAction + RecvAction to the RequestStore
[simgrid.git] / src / simix / smx_synchro.cpp
index 1d78318..96275c3 100644 (file)
@@ -1,18 +1,14 @@
-/* Copyright (c) 2007-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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 "smx_private.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/simix/smx_synchro_private.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
 #include <xbt/ex.hpp>
-#include <xbt/log.h>
-#include <xbt/utility.hpp>
-
-#include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/simix/MutexImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
 
@@ -30,7 +26,7 @@ smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
   simgrid::kernel::activity::RawImplPtr sync =
       simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
   sync->sleep                          = smx_host->pimpl_cpu->sleep(timeout);
-  sync->sleep->setData(sync.get());
+  sync->sleep->set_data(sync.get());
   XBT_OUT();
   return sync;
 }