[GNUnet-SVN] r17510 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2011-10-16 15:58:36 +0200 (Sun, 16 Oct 2011)
New Revision: 17510

Modified:
   gnunet/src/ats/gnunet-service-ats.c
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses.h
   gnunet/src/ats/gnunet-service-ats_scheduling.c
   gnunet/src/ats/gnunet-service-ats_scheduling.h
Log:
move get quota config to addrs

Modified: gnunet/src/ats/gnunet-service-ats.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats.c 2011-10-16 13:56:18 UTC (rev 17509)
+++ gnunet/src/ats/gnunet-service-ats.c 2011-10-16 13:58:36 UTC (rev 17510)
@@ -131,8 +131,8 @@
   };
   GAS_reservations_init ();
   GAS_performance_init (server);
-  GAS_scheduling_init (server, cfg);
-  GAS_addresses_init ();
+  GAS_scheduling_init (server);
+  GAS_addresses_init (cfg);
   GNUNET_SERVER_disconnect_notify (server, 
                                   &client_disconnect_handler,
                                    NULL);

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2011-10-16 13:56:18 UTC 
(rev 17509)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2011-10-16 13:58:36 UTC 
(rev 17510)
@@ -55,6 +55,11 @@
 static struct GNUNET_CONTAINER_MultiHashMap * addresses;
 
 
+static unsigned long long total_quota_in;
+
+static unsigned long long total_quota_out;
+
+
 struct CompareAddressContext
 {
   struct ATS_Address * search;
@@ -252,10 +257,22 @@
 
 /**
  * Initialize address subsystem.
+ *
+ * @param cfg configuration to use
  */
 void
-GAS_addresses_init ()
+GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  GNUNET_assert (GNUNET_OK ==
+                GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                       "core",
+                                                       "TOTAL_QUOTA_IN",
+                                                       &total_quota_in));
+  GNUNET_assert (GNUNET_OK ==
+                GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                       "core",
+                                                       "TOTAL_QUOTA_OUT",
+                                                       &total_quota_out));
   addresses = GNUNET_CONTAINER_multihashmap_create(128);
 }
 

Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h       2011-10-16 13:56:18 UTC 
(rev 17509)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h       2011-10-16 13:58:36 UTC 
(rev 17510)
@@ -32,9 +32,10 @@
 
 /**
  * Initialize address subsystem.
+ * @param cfg configuration to use
  */
 void
-GAS_addresses_init (void);
+GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**

Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-10-16 13:56:18 UTC 
(rev 17509)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-10-16 13:58:36 UTC 
(rev 17510)
@@ -73,11 +73,7 @@
  */
 static struct GNUNET_SERVER_NotificationContext *nc;
 
-static unsigned long long total_quota_in;
 
-static unsigned long long total_quota_out;
-
-
 /**
  * Find the scheduling client associated with the given
  * handle.
@@ -359,22 +355,10 @@
  * Initialize scheduling subsystem.
  *
  * @param server handle to our server
- * @param cfg configuration to use
  */
 void
-GAS_scheduling_init (struct GNUNET_SERVER_Handle *server,
-                    const struct GNUNET_CONFIGURATION_Handle *cfg)
+GAS_scheduling_init (struct GNUNET_SERVER_Handle *server)                   
 {
-  GNUNET_assert (GNUNET_OK ==
-                GNUNET_CONFIGURATION_get_value_number (cfg,
-                                                       "core",
-                                                       "TOTAL_QUOTA_IN",
-                                                       &total_quota_in));
-  GNUNET_assert (GNUNET_OK ==
-                GNUNET_CONFIGURATION_get_value_number (cfg,
-                                                       "core",
-                                                       "TOTAL_QUOTA_OUT",
-                                                       &total_quota_out));
   nc = GNUNET_SERVER_notification_context_create (server, 128);
 }
 

Modified: gnunet/src/ats/gnunet-service-ats_scheduling.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.h      2011-10-16 13:56:18 UTC 
(rev 17509)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.h      2011-10-16 13:58:36 UTC 
(rev 17510)
@@ -117,11 +117,9 @@
  * Initialize scheduling subsystem.
  *
  * @param server handle to our server
- * @param cfg configuration to use
  */
 void
-GAS_scheduling_init (struct GNUNET_SERVER_Handle *server,
-                    const struct GNUNET_CONFIGURATION_Handle *cfg);
+GAS_scheduling_init (struct GNUNET_SERVER_Handle *server);
 
 
 /**