fixed bugs.

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

diff --git a/src/surf/gtnets/gtnets_interface.cc b/src/surf/gtnets/gtnets_interface.cc
index c3626a4..c7df7d2 100644 (file)
--- a/src/surf/gtnets/gtnets_interface.cc
+++ b/src/surf/gtnets/gtnets_interface.cc
@@ -11,12 +11,13 @@ int gtnets_initialize(){
     return -1;
   }
   gtnets_sim = new GTSim();
     return -1;
   }
   gtnets_sim = new GTSim();

-  return 1;
+  return 0;

 }
 
 // adds a link (argument link is just an index starting at 0... 
 // add link 0, add link 1, etc.)
 int gtnets_add_link(int id, double bandwidth, double latency){
 }
 
 // adds a link (argument link is just an index starting at 0... 
 // add link 0, add link 1, etc.)
 int gtnets_add_link(int id, double bandwidth, double latency){

+  printf("gtnets_add_link: %d, %f, %f\n", id, bandwidth, latency);

   return gtnets_sim->add_link(id, bandwidth, latency);
 }
 
   return gtnets_sim->add_link(id, bandwidth, latency);
 }
 


@@ -24,12 +25,18 @@ int gtnets_add_link(int id, double bandwidth, double latency){
 // (note that there is no gtnets_add_network_card(), as we discover them
 // on the fly via calls to gtnets_add_route()
 int gtnets_add_route(int src, int dst, int* links, int nlink){
 // (note that there is no gtnets_add_network_card(), as we discover them
 // on the fly via calls to gtnets_add_route()
 int gtnets_add_route(int src, int dst, int* links, int nlink){

+  int i;
+  printf("gtnets_add_route: %d, %d\n", src, dst);
+  for (i = 0; i < nlink; i++){
+    printf("%d: %d\n", i, *links++);
+  }

   return gtnets_sim->add_route(src, dst, links, nlink);
 }
 
 // create a new flow on a route
 // one can attach arbitrary metadata to a flow
 int gtnets_create_flow(int src, int dst, long datasize, void* metadata){
   return gtnets_sim->add_route(src, dst, links, nlink);
 }
 
 // create a new flow on a route
 // one can attach arbitrary metadata to a flow
 int gtnets_create_flow(int src, int dst, long datasize, void* metadata){

+  printf("gtnets_create_flow: %d, %d, %d\n", src, dst, datasize);

   return gtnets_sim->create_flow(src, dst, datasize, metadata);
 }
 
   return gtnets_sim->create_flow(src, dst, datasize, metadata);
 }
 


@@ -47,13 +54,15 @@ int gtnets_run_until_next_flow_completion(void ***metadata, int *number_of_flows
 // run for a given time (double)
 int gtnets_run(Time_t deltat){
   gtnets_sim->run(deltat);
 // run for a given time (double)
 int gtnets_run(Time_t deltat){
   gtnets_sim->run(deltat);

+  return 0;

 }
 
 // clean up
 }
 
 // clean up

-void gtnets_finalize(){
-  if (!gtnets_sim) return;
+int gtnets_finalize(){
+  if (!gtnets_sim) return -1;

   gtnets_sim->finalize();
   delete gtnets_sim;
   gtnets_sim = 0;
   gtnets_sim->finalize();
   delete gtnets_sim;
   gtnets_sim = 0;

+  return 0;

 }
 
 }
 

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 0d18534..bb50e63 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -536,9 +536,7 @@ static void surf_network_resource_init_internal(void)
   }
 }
 
   }
 }
 

-/* HC: I put this prototype here for now but it will have to go in 
-   src/include/surf.h when it is functionnal. */
-void surf_network_resource_init_GTNETS(const char *filename);
+

 
 void surf_network_resource_init_GTNETS(const char *filename)
 {
 
 void surf_network_resource_init_GTNETS(const char *filename)
 {

diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h
index bf1ecfd..0a20d4c 100644 (file)
--- a/src/surf/network_gtnets_private.h
+++ b/src/surf/network_gtnets_private.h
@@ -41,6 +41,11 @@ typedef struct surf_action_network_GTNETS {
 
 extern xbt_dict_t network_card_set;
 
 
 extern xbt_dict_t network_card_set;
 

+/* HC: I put this prototype here for now but it will have to go in 
+   src/include/surf.h when it is functionnal. */
+void surf_network_resource_init_GTNETS(const char *filename);
+
+

 #endif                         /* _SURF_NETWORK_PRIVATE_H */
 
 
 #endif                         /* _SURF_NETWORK_PRIVATE_H */