Making room for simix.

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

diff --git a/configure.ac b/configure.ac
index 9a696b5..ce13b52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,22 @@ dnl #  direction of stack grow
   AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext)
 fi
 
   AC_CHECK_STACKSETUP(makecontext, pth_skaddr_makecontext, pth_sksize_makecontext)
 fi
 

+
+#########################################
+## Build optional modules (simix)
+##
+SG_CONFIGURE_PART(Optional modules)
+AC_ARG_ENABLE(use-simix,
+  AS_HELP_STRING([--enable-simix], [Use the new SimIX module (default=no)]),
+  enable_simix=$enableval,enable_simix=no)
+if test "x$enable_simix" = "xyes" ; then
+  AC_MSG_RESULT("***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****")
+  AC_DEFINE(USE_SIMIX, 1, [Indicates whether we should use SimIX or not])
+else 
+  AC_MSG_RESULT(Eventually you willl come to SimIX: x$enable_simix)
+fi
+AM_CONDITIONAL(USE_SIMIX,test x$csdp != xno)
+

 #########################################
 ## Check for libraries extra-dependencies
 ##
 #########################################
 ## Check for libraries extra-dependencies
 ##


@@ -184,7 +200,7 @@ AC_CHECK_LIB(sdp,sdp,csdp=yes, csdp=no,-llapack -lblas -lm)
 if test "x$csdp" = xyes; then 
   SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm"
   AC_MSG_RESULT(Found working sdp library.)
 if test "x$csdp" = xyes; then 
   SIMGRID_DEP="$SIMGRID_DEP -lsdp -llapack -lblas -lm"
   AC_MSG_RESULT(Found working sdp library.)

-  AC_DEFINE(HAVE_SDP, 1, [Indicates whether printf("%s",NULL) works])
+  AC_DEFINE(HAVE_SDP, 1, [Indicates whether we have the CSDP library or not])

 else
   AC_MSG_RESULT(Could not find any working sdp library.)
 fi;
 else
   AC_MSG_RESULT(Could not find any working sdp library.)
 fi;


@@ -208,6 +224,7 @@ else
 fi
 AC_SUBST([GRAS_DEP])
 
 fi
 AC_SUBST([GRAS_DEP])
 

+

 ##############################################
 ## Enhance maintainer mode and SUBST variables
 ## (must be placed after any compilation tests since our overprotective flags
 ##############################################
 ## Enhance maintainer mode and SUBST variables
 ## (must be placed after any compilation tests since our overprotective flags

diff --git a/src/Makefile.am b/src/Makefile.am
index b14bdd5..c895516 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,6 +63,10 @@ EXTRA_DIST= \
        amok/Bandwidth/bandwidth_private.h \
        amok/amok_modinter.h
 
        amok/Bandwidth/bandwidth_private.h \
        amok/amok_modinter.h
 

+if USE_SIMIX
+  EXTRA_DIST+=include/simix/simix.h
+endif
+

 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0
 #        gras_private.h
 
 #LIBRARY_VERSION= 0:0:0


@@ -187,6 +191,10 @@ if HAVE_SDP
   SG_SRC+= surf/sdp.c  
 endif
 
   SG_SRC+= surf/sdp.c  
 endif
 

+if USE_SIMIX
+  SG_SRC+=simix/smx_global.c
+endif
+

 AMOK_SRC= \
   amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
 AMOK_SRC= \
   amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
new file mode 100644 (file)
index 0000000..1fd99ba
--- /dev/null
+++ b/src/include/simix/simix.h
@@ -0,0 +1,11 @@
+/*     $Id$     */
+
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+   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 _SIMIX_SIMIX_H
+#define _SIMIX_SIMIX_H
+#endif                          /* _SIMIX_SIMIX_H */

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
new file mode 100644 (file)
index 0000000..7f6c170
--- /dev/null
+++ b/src/simix/smx_global.c
@@ -0,0 +1,9 @@
+/*     $Id$     */
+
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+   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. */
+
+#include "simix/simix.h"