[mc] Move things in the MC namespace

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

diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h
index c70ad34..1f9fc0d 100644 (file)
--- a/src/mc/mc_request.h
+++ b/src/mc/mc_request.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,41 +7,43 @@
 #ifndef SIMGRID_MC_REQUEST_H
 #define SIMGRID_MC_REQUEST_H
 
-#include <simgrid_config.h>
+#include <xbt/base.h>
 
-#include "../simix/smx_private.h"
+#include "src/simix/smx_private.h"
 
 SG_BEGIN_DECL()
 
-typedef enum e_mc_request_type {
-  MC_REQUEST_SIMIX,
-  MC_REQUEST_EXECUTED,
-  MC_REQUEST_INTERNAL,
-} e_mc_request_type_t;
+namespace simgrid {
+namespace mc {
 
-XBT_INTERNAL int MC_request_depend(smx_simcall_t req1, smx_simcall_t req2);
-XBT_INTERNAL char* MC_request_to_string(smx_simcall_t req, int value, e_mc_request_type_t type);
-XBT_INTERNAL unsigned int MC_request_testany_fail(smx_simcall_t req);
-/*int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);*/
-XBT_INTERNAL int MC_request_is_visible(smx_simcall_t req);
+enum class RequestType {
+  simix,
+  executed,
+  internal,
+};
 
-/** Can this requests can be executed.
+XBT_PRIVATE bool request_depend(smx_simcall_t req1, smx_simcall_t req2);
+
+XBT_PRIVATE char* request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType type);
+
+/** Check if the given simcall is visible
  *
- *  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).
+ *  \return `TRUE` or `FALSE`
  */
-XBT_INTERNAL int MC_request_is_enabled(smx_simcall_t req);
-XBT_INTERNAL int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx);
+XBT_PRIVATE bool request_is_visible(smx_simcall_t req);
+
+XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx);
 
 /** Is the process ready to execute its simcall?
  *
  *  This is true if the request associated with the process is ready.
  */
-XBT_INTERNAL int MC_process_is_enabled(smx_process_t process);
+XBT_PRIVATE bool process_is_enabled(smx_process_t process);
+
+XBT_PRIVATE char *request_get_dot_output(smx_simcall_t req, int value);
 
-XBT_INTERNAL char *MC_request_get_dot_output(smx_simcall_t req, int value);
+}
+}
 
 SG_END_DECL()