Add new type of scalar value 'STRING' for const char*

[simgrid.git] / src / simix / smx_smurf_private.h

diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index 7ba6aec..03d330b 100644 (file)
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -9,8 +9,14 @@
 
 /********************************* Simcalls *********************************/
 
-/* we want to build the e_smx_simcall_t enumeration and the table of the
- * corresponding strings automatically, using macros */
+/* we want to build the e_smx_simcall_t enumeration, the table of the
+ * corresponding simcalls string names, and the simcall handlers table
+ * automatically, using macros.
+ * To add a new simcall follow the following syntax:
+ *
+ * SIMCALL_ENUM_ELEMENT(<simcall_enumeration_id>, <simcall_handler_function>)
+ *
+ * */
 
 #define SIMCALL_LIST1 \
 SIMCALL_ENUM_ELEMENT(SIMCALL_NONE),\
@@ -107,14 +113,14 @@ SIMCALL_ENUM_ELEMENT(SIMCALL_NEW_API_INIT)
  * because they are not always present */
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 #define SIMCALL_LIST2 \
-,SIMCALL_ENUM_ELEMENT(SIMCALL_COMM_IS_LATENCY_BOUNDED)
+,SIMCALL_ENUM_ELEMENT(SIMCALL_COMM_IS_LATENCY_BOUNDED, SIMIX_comm_is_latency_bounded)
 #else
 #define SIMCALL_LIST2
 #endif
 
 #ifdef HAVE_TRACING
 #define SIMCALL_LIST3 \
-,SIMCALL_ENUM_ELEMENT(SIMCALL_SET_CATEGORY)
+,SIMCALL_ENUM_ELEMENT(SIMCALL_SET_CATEGORY, SIMIX_set_category)
 #else
 #define SIMCALL_LIST3
 #endif
@@ -132,7 +138,7 @@ SIMCALL_ENUM_ELEMENT(SIMCALL_NEW_API_INIT)
 
 /* you can redefine the following macro differently to generate something else
  * with the list of enumeration values (e.g. a table of strings or a table of function pointers) */
-#define SIMCALL_ENUM_ELEMENT(x) x
+#define SIMCALL_ENUM_ELEMENT(x, y) x
 
 /**
  * \brief All possible simcalls.
@@ -652,6 +658,7 @@ const char *SIMIX_simcall_name(e_smx_simcall_t kind);
 /* Pack all possible scalar types in an union */
 typedef union u_smx_scalar {
   char            c;
+  const char*     cc;
   short           s;
   int             i;
   long            l;
@@ -661,7 +668,7 @@ typedef union u_smx_scalar {
   unsigned long   ul;
   float           f;
   double          d;
-  void            *p;
+  void*           p;
 } u_smx_scalar_t;
 
 /*
@@ -669,6 +676,7 @@ typedef union u_smx_scalar {
  * These are used to wrap the arguments in SIMIX_simcall macro.
  */
 #define CHAR(x) (c,x)
+#define STRING(x) (cc,x)
 #define SHORT(x) (s,x)
 #define INT(x) (i,x)
 #define LONG(x) (l,x)