sync generated files

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

diff --git a/configure b/configure
index a5e2e91..a90532b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.143 .
+# From configure.ac Revision: 1.144 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for simgrid 3.1.1-cvs.
+# Generated by GNU Autoconf 2.59 for simgrid 3.2-cvs.
 #
 # Report bugs to <simgrid-devel@lists.gforge.inria.fr>.
 #
@@ -424,8 +424,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='simgrid'
 PACKAGE_TARNAME='simgrid'
-PACKAGE_VERSION='3.1.1-cvs'
-PACKAGE_STRING='simgrid 3.1.1-cvs'
+PACKAGE_VERSION='3.2-cvs'
+PACKAGE_STRING='simgrid 3.2-cvs'
 PACKAGE_BUGREPORT='simgrid-devel@lists.gforge.inria.fr'
 
 ac_unique_file="include/gras.h"
@@ -955,7 +955,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simgrid 3.1.1-cvs to adapt to many kinds of systems.
+\`configure' configures simgrid 3.2-cvs to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1022,7 +1022,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simgrid 3.1.1-cvs:";;
+     short | recursive ) echo "Configuration of simgrid 3.2-cvs:";;
    esac
   cat <<\_ACEOF
 
@@ -1172,7 +1172,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-simgrid configure 3.1.1-cvs
+simgrid configure 3.2-cvs
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1186,7 +1186,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by simgrid $as_me 3.1.1-cvs, which was
+It was created by simgrid $as_me 3.2-cvs, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1924,7 +1924,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simgrid'
- VERSION='3.1.1-cvs'
+ VERSION='3.2-cvs'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23977,7 +23977,7 @@ if test "x$with_context" = "xucontext" ; then
 echo "${ECHO_T}found working ucontext. Great!" >&6
 
 cat >>confdefs.h <<\_ACEOF
-#define USE_UCONTEXT 1
+#define CONTEXT_UCONTEXT 1
 _ACEOF
 
   else
@@ -24222,7 +24222,7 @@ fi
 
 
 cat >>confdefs.h <<\_ACEOF
-#define USE_PTHREADS 1
+#define CONTEXT_THREADS 1
 _ACEOF
 
   echo "$as_me:$LINENO: result: You have pthreads. Let's use them." >&5
@@ -24989,6 +24989,10 @@ echo $ECHO_N "checking for extra dependencies of libgras... $ECHO_C" >&6
 case $host_os in
   *mingw* ) GRAS_DEP="$GRAS_DEP -lws2_32" ; SIMGRID_DEP="$SIMGRID_DEP -lws2_32";
             AM_CFLAGS=-DDLL_EXPORT
+
+            cat >>confdefs.h <<\_ACEOF
+#define CONTEXT_THREADS 1
+_ACEOF
 ;;
 esac
 
@@ -26204,7 +26208,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by simgrid $as_me 3.1.1-cvs, which was
+This file was extended by simgrid $as_me 3.2-cvs, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26267,7 +26271,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-simgrid config.status 3.1.1-cvs
+simgrid config.status 3.2-cvs
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/src/Makefile.in b/src/Makefile.in
index fdf8ab2..0ba3ffb 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -93,7 +93,7 @@ am__objects_1 = snprintf.lo getline.lo ex.lo xbt_thread.lo sysdep.lo \
        ddt_exchange.lo cbps.lo datadesc.lo ddt_parse.lo \
        ddt_parse.yy.lo msg.lo rpc.lo timer.lo process.lo \
        gras_module.lo
-am__objects_2 = rl_transport.lo transport_plugin_file.lo \
+am__objects_2 = rl_gras.lo rl_transport.lo transport_plugin_file.lo \
        transport_plugin_tcp.lo rl_emul.lo rl_process.lo rl_time.lo \
        rl_dns.lo rl_msg.lo
 am__objects_3 = amok_base.lo bandwidth.lo saturate.lo \
@@ -344,7 +344,8 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
        surf/workstation_KCCFLN05_private.h include/surf/maxmin.h \
        include/surf/trace_mgr.h include/surf/surf.h \
        include/surf/surfxml_parse_private.h \
-       include/xbt/xbt_portability.h include/xbt/context.h \
+       include/xbt/xbt_portability.h \
+       include/xbt/xbt_internal_thread.h include/xbt/context.h \
        msg/private.h simdag/private.h \
        gras/Transport/transport_interface.h \
        gras/Virtu/virtu_interface.h gras/Virtu/virtu_private.h \
@@ -434,6 +435,7 @@ COMMON_SRC = \
   gras/Virtu/process.c gras/Virtu/gras_module.c
 
 RL_SRC = \
+  gras/rl_gras.c                         \
   gras/Transport/rl_transport.c          \
   gras/Transport/transport_plugin_file.c   gras/Transport/transport_plugin_tcp.c  \
   \
@@ -635,6 +637,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_dns.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_emul.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_gras.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_msg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_time.Plo@am__quote@
@@ -978,6 +981,13 @@ gras_module.lo: gras/Virtu/gras_module.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gras_module.lo `test -f 'gras/Virtu/gras_module.c' || echo '$(srcdir)/'`gras/Virtu/gras_module.c
 
+rl_gras.lo: gras/rl_gras.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rl_gras.lo -MD -MP -MF "$(DEPDIR)/rl_gras.Tpo" -c -o rl_gras.lo `test -f 'gras/rl_gras.c' || echo '$(srcdir)/'`gras/rl_gras.c; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/rl_gras.Tpo" "$(DEPDIR)/rl_gras.Plo"; else rm -f "$(DEPDIR)/rl_gras.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/rl_gras.c' object='rl_gras.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rl_gras.lo `test -f 'gras/rl_gras.c' || echo '$(srcdir)/'`gras/rl_gras.c
+
 rl_transport.lo: gras/Transport/rl_transport.c
 @am__fastdepCC_TRUE@   if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rl_transport.lo -MD -MP -MF "$(DEPDIR)/rl_transport.Tpo" -c -o rl_transport.lo `test -f 'gras/Transport/rl_transport.c' || echo '$(srcdir)/'`gras/Transport/rl_transport.c; \
 @am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/rl_transport.Tpo" "$(DEPDIR)/rl_transport.Plo"; else rm -f "$(DEPDIR)/rl_transport.Tpo"; exit 1; fi

diff --git a/src/gras_config.h.in b/src/gras_config.h.in
index 8e70e5d..952dd3b 100644 (file)
--- a/src/gras_config.h.in
+++ b/src/gras_config.h.in
@@ -12,6 +12,12 @@
 /* Predefined possible va_copy() implementation (id: C99) */
 #define __VA_COPY_USE_C99(d, s) va_copy((d), (s))
 
+/* Define if xbt contexts are based on our threads implementation or not */
+#undef CONTEXT_THREADS
+
+/* Define if xbt contexts are based on ucontext or not */
+#undef CONTEXT_UCONTEXT
+
 /* Predefined possible va_copy() implementation (id: CPP) */
 #define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s)), sizeof(*(s))
 
@@ -189,15 +195,9 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* Define if we use pthreads or not */
-#undef USE_PTHREADS
-
 /* Indicates whether we should use SimIX or not */
 #undef USE_SIMIX
 
-/* Define if we use ucontext or not */
-#undef USE_UCONTEXT
-
 /* Version number of package */
 #undef VERSION