Merge conditional execution and timing macros into emulation module

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1264 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/Makefile.am b/include/Makefile.am
index 15c8635..6b2079d 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -15,9 +15,9 @@ nobase_include_HEADERS = \
        \
        gras/core.h \
        gras/datadesc.h gras/transport.h \
-       gras/virtu.h gras/cond.h gras/process.h \
+       gras/virtu.h gras/emul.h gras/process.h \
        \
-       gras/messages.h gras/timer.h gras/chrono.h\
+       gras/messages.h gras/timer.h \
        \
        amok/base.h \
        amok/bandwidth.h

diff --git a/include/gras.h b/include/gras.h
index fb90597..17dffb2 100644 (file)
--- a/include/gras.h
+++ b/include/gras.h
@@ -15,8 +15,7 @@
 #include <gras/core.h> /* FIXME: killme */
 #include <gras/process.h>
 #include <gras/virtu.h>
-#include <gras/cond.h>
-#include <gras/chrono.h>
+#include <gras/emul.h>
 
 #include <gras/transport.h>
 #include <gras/datadesc.h>

diff --git a/src/Makefile.am b/src/Makefile.am
index 24f1e18..b3a4281 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -127,8 +127,8 @@ COMMON_SRC=\
 RL_SRC= \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c  \
   \
-  gras/Virtu/rl_chrono.c \
-  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c gras/Virtu/rl_conditional.c \
+  gras/Virtu/rl_emul.c \
+  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c \
   gras/Virtu/rl_dns.c
 
 SG_SRC=  \
@@ -148,8 +148,8 @@ SG_SRC=  \
   \
   gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
   \
-  gras/Virtu/sg_chrono.c \
-  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c \
+  gras/Virtu/sg_emul.c \
+  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
   gras/Virtu/sg_dns.c
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l