[simix] Use C++ templates for generating the marshaling/unmashaling code

[simgrid.git] / src / mc / mc_base.h

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index c21a00b..9e74d39 100644 (file)
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -1,30 +1,33 @@
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. 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 MC_BASE_H
-#define MC_BASE_H
+#ifndef SIMGRID_MC_BASE_H
+#define SIMGRID_MC_BASE_H
 
-#include <simgrid/simix.h>
-#include "simgrid_config.h"
-#include "internal_config.h"
-#include "../simix/smx_private.h"
+#ifdef __cplusplus
+#include <vector>
+#endif
 
-SG_BEGIN_DECL()
+#include <xbt/base.h>
 
-/** Check if the given simcall can be resolved
- *
- *  \return `TRUE` or `FALSE`
- */
-int MC_request_is_enabled(smx_simcall_t req);
+typedef struct s_smx_simcall s_smx_simcall_t, *smx_simcall_t;
 
-/** Check if the given simcall is visible
+#ifdef __cplusplus
+
+namespace simgrid {
+namespace mc {
+
+/** Can this requests can be executed?
  *
- *  \return `TRUE` or `FALSE`
+ *  Most requests are always enabled but WAIT and WAITANY
+ *  are not always enabled: a WAIT where the communication does not
+ *  have both a source and a destination yet is not enabled
+ *  (unless timeout is enabled in the wait and enabeld in SimGridMC).
  */
-int MC_request_is_visible(smx_simcall_t req);
+XBT_PRIVATE bool request_is_enabled(smx_simcall_t req);
 
 /** Execute everything which is invisible
  *
@@ -32,10 +35,22 @@ int MC_request_is_visible(smx_simcall_t req);
  *  iteratively until there doesn't remain any. At this point, the function
  *  returns to the caller which can handle the visible (and ready) simcalls.
  */
-void MC_wait_for_requests(void);
+XBT_PRIVATE void wait_for_requests(void);
 
-extern double *mc_time;
+XBT_PRIVATE extern std::vector<double> processes_time;
 
-SG_END_DECL()
+/** Execute a given simcall */
+XBT_PRIVATE void handle_simcall(smx_simcall_t req, int req_num);
+
+/** Check if the given simcall is visible
+ *
+ *  \return `TRUE` or `FALSE`
+ */
+XBT_PRIVATE bool request_is_visible(smx_simcall_t req);
+
+}
+}
+
+#endif
 
 #endif