Oooups !

>  void
>   xbt_init(int *argc, char **argv) {

and

> Update of /home/mquinson/cvsroot/gras/src/surf
>  void surf_init(void)
>  {
> +  xbt_init();

I did not even notice he'd been crying...

surf/surf.c: In function surf_init':
surf/surf.c:57: warning: implicit declaration of function xbt_init'

... and he did not really looked angry btw.

surf:~/Work/GRAS/heap $ ./surf_usage
xbt/module.c:57: [module/INFO] Initialize GRAS

Nevermind. It is fixed now.

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 5ae0807..3e0c099 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -121,7 +121,7 @@ void surf_network_resource_init(const char *filename);
 /*** SURF Globals **************************/
 /*******************************************/
 
 /*** SURF Globals **************************/
 /*******************************************/
 

-void surf_init(void);          /* initialize common structures */
+void surf_init(int *argc, char **argv);        /* initialize common structures */

 xbt_heap_float_t surf_solve(void);     /*  update all states and returns
                                           the time elapsed since last
                                           event */
 xbt_heap_float_t surf_solve(void);     /*  update all states and returns
                                           the time elapsed since last
                                           event */

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 02e1d96..ecca44c 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -4,6 +4,7 @@
    under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf_private.h"
    under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf_private.h"

+#include "xbt/module.h"

 
 static xbt_heap_float_t NOW=0;
 
 
 static xbt_heap_float_t NOW=0;
 


@@ -52,9 +53,9 @@ void surf_action_change_state(surf_action_t action, e_surf_action_state_t state)
   if(action->state_set) xbt_swag_insert(action, action->state_set);
 }
 
   if(action->state_set) xbt_swag_insert(action, action->state_set);
 }
 

-void surf_init(void)
+void surf_init(int *argc, char **argv)

 {
 {

-  xbt_init();
+  xbt_init(argc, argv);

   if(!resource_list) resource_list = xbt_dynar_new(sizeof(surf_resource_private_t), NULL);
   if(!history) history = tmgr_history_new();
   if(!maxmin_system) maxmin_system = lmm_system_new();
   if(!resource_list) resource_list = xbt_dynar_new(sizeof(surf_resource_private_t), NULL);
   if(!history) history = tmgr_history_new();
   if(!maxmin_system) maxmin_system = lmm_system_new();

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index f7eda0e..15c6b0f 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -42,7 +42,6 @@ void test(void)
   e_surf_action_state_t stateActionB;
   xbt_maxmin_float_t now = -1.0;
 
   e_surf_action_state_t stateActionB;
   xbt_maxmin_float_t now = -1.0;
 

-  surf_init(); /* Initialize some common structures */

   surf_cpu_resource_init("platform.txt"); /* Now it is possible to use CPUs */
   surf_network_resource_init("platform.txt"); /* Now it is possible to use eth0 */
 
   surf_cpu_resource_init("platform.txt"); /* Now it is possible to use CPUs */
   surf_network_resource_init("platform.txt"); /* Now it is possible to use eth0 */
 


@@ -77,7 +76,7 @@ void test(void)
   printf("%s : %p\n", surf_network_resource->common_public->get_resource_name(cardB), cardB);
 
   /* Let's do something on it */
   printf("%s : %p\n", surf_network_resource->common_public->get_resource_name(cardB), cardB);
 
   /* Let's do something on it */

-  commAB = surf_network_rescpource->extension_public->communicate(cardA, cardB, 132.0);
+  commAB = surf_network_resource->extension_public->communicate(cardA, cardB, 132.0);

 
   surf_solve(); /* Takes traces into account. Returns 0.0 */
   do {
 
   surf_solve(); /* Takes traces into account. Returns 0.0 */
   do {


@@ -113,6 +112,7 @@ void test(void)
 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

+  surf_init(&argc, argv); /* Initialize some common structures */

   test();
   return 0;
 }
   test();
   return 0;
 }