X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c8e75834bbb63acef15c560c3de978ab3cb6fbf..7b02515baed02f4f6b8808eb16b0e0175eb53395:/src/surf/gtnets/gtnets_interface.cc

diff --git a/src/surf/gtnets/gtnets_interface.cc b/src/surf/gtnets/gtnets_interface.cc
index 7f06cf745c..b278ed70b8 100644
--- a/src/surf/gtnets/gtnets_interface.cc
+++ b/src/surf/gtnets/gtnets_interface.cc
@@ -1,14 +1,13 @@
-/* 	$Id$	 */
-/* Copyright (c) 2007 Kayo Fujiwara. All rights reserved.                  */
+/* Copyright (c) 2007-2011, 2014. The SimGrid Team.
+ * 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 "gtnets_simulator.h"
 #include "gtnets_interface.h"
-#ifdef DEBUG0
-	#undef DEBUG0
+#ifdef XBT_DEBUG
+	#undef XBT_DEBUG
 #endif
 #include "xbt/log.h"
 #include "xbt/asserts.h"
@@ -23,11 +22,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets_interface, surf_network_gtne
 
 // initialize the GTNetS interface and environment
 int gtnets_initialize(int wsize){
-  DEBUG0("Using logging.");
-  xbt_assert0(!gtnets_sim, "gtnets already initialized");
+  XBT_DEBUG("Using logging.");
+  xbt_assert(!gtnets_sim, "gtnets already initialized");
 
   if(wsize > 0){
-	INFO1("TCP window maximum size : %d", wsize);
+	XBT_INFO("TCP window maximum size : %d", wsize);
 	gtnets_sim = new GTSim(wsize);
   }else{
 	gtnets_sim = new GTSim(wsize);
@@ -78,9 +77,9 @@ double gtnets_get_time_to_next_flow_completion(){
 	  file.open ("/dev/null");
 	  sbuf = cout.rdbuf();
 	  cout.rdbuf(file.rdbuf());
-	  DEBUG0("Enable GTNetS library quite mode");
+	  XBT_DEBUG("Enable GTNetS library quite mode");
   }else {
-	  DEBUG0("Disable GTNetS library quite mode");
+	  XBT_DEBUG("Disable GTNetS library quite mode");
   }
 
   value = gtnets_sim->get_time_to_next_flow_completion();
@@ -102,9 +101,9 @@ double gtnets_run_until_next_flow_completion(void ***metadata, int *number_of_fl
 	  file.open ("/dev/null");
 	  sbuf = cout.rdbuf();
 	  cout.rdbuf(file.rdbuf());
-	  DEBUG0("Enable GTNetS library quite mode");
+	  XBT_DEBUG("Enable GTNetS library quite mode");
   }else {
-	  DEBUG0("Disable GTNetS library quite mode");
+	  XBT_DEBUG("Disable GTNetS library quite mode");
   }
 
   value = gtnets_sim->run_until_next_flow_completion(metadata, number_of_flows);
@@ -124,7 +123,26 @@ double gtnets_get_flow_rx(void *metadata){
 
 // run for a given time (double)
 int gtnets_run(Time_t deltat){
+  ofstream file;
+  streambuf* sbuf;
+  double value;
+
+  if (!XBT_LOG_ISENABLED(surf_network_gtnets_interface, xbt_log_priority_debug)) {
+          file.open ("/dev/null");
+          sbuf = cout.rdbuf();
+          cout.rdbuf(file.rdbuf());
+          XBT_DEBUG("Enable GTNetS library quite mode");
+  }else {
+          XBT_DEBUG("Disable GTNetS library quite mode");
+  }
+
   gtnets_sim->run(deltat);
+
+
+  if (!XBT_LOG_ISENABLED(surf_network_gtnets_interface, xbt_log_priority_debug)) {
+          cout.rdbuf(sbuf);
+          file.close();
+  }
   return 0;
 }