cleanup the GRAS+AMOK initialization schema

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

diff --git a/include/Makefile.am b/include/Makefile.am
index e77d47a..744d4b7 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -32,7 +32,6 @@ nobase_include_HEADERS = \
        \
        gras/messages.h gras/timer.h \
        \
        \
        gras/messages.h gras/timer.h \
        \

-       amok/base.h \

        amok/peermanagement.h \
        amok/bandwidth.h
 
        amok/peermanagement.h \
        amok/bandwidth.h
 

diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h
index 129f818..0976f95 100644 (file)
--- a/include/amok/bandwidth.h
+++ b/include/amok/bandwidth.h
@@ -10,8 +10,6 @@
 #ifndef AMOK_BANDWIDTH_H
 #define AMOK_BANDWIDTH_H
 
 #ifndef AMOK_BANDWIDTH_H
 #define AMOK_BANDWIDTH_H
 

-#include "amok/base.h"
-   

 /** \addtogroup AMOK_bw
  *  \brief Test the bandwidth between two nodes
  *
 /** \addtogroup AMOK_bw
  *  \brief Test the bandwidth between two nodes
  *

diff --git a/include/amok/peermanagement.h b/include/amok/peermanagement.h
index fd5727d..e0d7c0d 100644 (file)
--- a/include/amok/peermanagement.h
+++ b/include/amok/peermanagement.h
@@ -11,7 +11,6 @@
 #define AMOK_PEER_MANAGEMENT_H
 
 #include <gras.h>
 #define AMOK_PEER_MANAGEMENT_H
 
 #include <gras.h>

-#include <amok/base.h>

 
 /** \addtogroup AMOK_pm
  *  \brief Managing remote servers
 
 /** \addtogroup AMOK_pm
  *  \brief Managing remote servers

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index 415ba4b..bc56423 100644 (file)
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -25,8 +25,6 @@ static short _amok_bw_initialized = 0;
 /** @brief module initialization; all participating nodes must run this */
 void amok_bw_init(void) {
 
 /** @brief module initialization; all participating nodes must run this */
 void amok_bw_init(void) {
 

-  amok_base_init();
-

   if (! _amok_bw_initialized) {
     amok_bw_bw_init();
     amok_bw_sat_init();
   if (! _amok_bw_initialized) {
     amok_bw_bw_init();
     amok_bw_sat_init();

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 28a5ead..65e2ebb 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -12,6 +12,7 @@
 #include "xbt/module.h" /* xbt_init/exit */
 
 #include "gras_modinter.h"   /* module init/exit */
 #include "xbt/module.h" /* xbt_init/exit */
 
 #include "gras_modinter.h"   /* module init/exit */

+#include "amok/amok_modinter.h"   /* module init/exit */

 #include "xbt_modinter.h"   /* module init/exit */
 
 #include "gras.h"
 #include "xbt_modinter.h"   /* module init/exit */
 
 #include "gras.h"


@@ -73,6 +74,9 @@ void gras_init(int *argc,char **argv) {
     signal(SIGINT,gras_sigint_handler);
 #endif     
   }
     signal(SIGINT,gras_sigint_handler);
 #endif     
   }

+   
+  /* and then init amok */
+  amok_init();

 }
 
 void gras_exit(void) {
 }
 
 void gras_exit(void) {