[GNUnet-SVN] r17972 - in gnunet/src: datacache datastore dht fs mesh vpn

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17972 - in gnunet/src: datacache datastore dht fs mesh vpn

From:	gnunet
Subject:	[GNUnet-SVN] r17972 - in gnunet/src: datacache datastore dht fs mesh vpn
Date:	Thu, 3 Nov 2011 22:20:08 +0100
Author: grothoff
Date: 2011-11-03 22:20:07 +0100 (Thu, 03 Nov 2011)
New Revision: 17972

Modified:
   gnunet/src/datacache/datacache.c
   gnunet/src/datacache/perf_datacache_data_mysql.conf
   gnunet/src/datacache/perf_datacache_data_postgres.conf
   gnunet/src/datacache/perf_datacache_data_sqlite.conf
   gnunet/src/datacache/test_datacache_data_mysql.conf
   gnunet/src/datacache/test_datacache_data_postgres.conf
   gnunet/src/datacache/test_datacache_data_sqlite.conf
   gnunet/src/datastore/datastore.conf
   gnunet/src/datastore/gnunet-service-datastore.c
   gnunet/src/datastore/test_datastore_api_data_mysql.conf
   gnunet/src/datastore/test_datastore_api_data_postgres.conf
   gnunet/src/datastore/test_datastore_api_data_sqlite.conf
   gnunet/src/datastore/test_defaults.conf
   gnunet/src/dht/dht.conf
   gnunet/src/dht/test_dht_api_peer1.conf
   gnunet/src/dht/test_dht_multipeer_data.conf
   gnunet/src/dht/test_dht_twopeer_data.conf
   gnunet/src/fs/fs_test_lib_data.conf
   gnunet/src/fs/test_fs_defaults.conf
   gnunet/src/mesh/test_mesh.conf
   gnunet/src/mesh/test_mesh_path.conf
   gnunet/src/vpn/test-conf.conf
Log:
use new quota parsing capabilities -- SVN 1875

Modified: gnunet/src/datacache/datacache.c
===================================================================
--- gnunet/src/datacache/datacache.c    2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/datacache/datacache.c    2011-11-03 21:20:07 UTC (rev 17972)
@@ -139,7 +139,7 @@
   char *name;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, section, "QUOTA", &quota))
+      GNUNET_CONFIGURATION_get_value_size (cfg, section, "QUOTA", &quota))
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
          _("No `%s' specified for `%s' in configuration!\n"), "QUOTA", 
section);

Modified: gnunet/src/datacache/perf_datacache_data_mysql.conf
===================================================================
--- gnunet/src/datacache/perf_datacache_data_mysql.conf 2011-11-03 21:10:27 UTC 
(rev 17971)
+++ gnunet/src/datacache/perf_datacache_data_mysql.conf 2011-11-03 21:20:07 UTC 
(rev 17972)
@@ -1,5 +1,5 @@
 [perfcache]
-QUOTA = 500000
+QUOTA = 500 KB
 DATABASE = mysql
 
 [datacache-mysql]

Modified: gnunet/src/datacache/perf_datacache_data_postgres.conf
===================================================================
--- gnunet/src/datacache/perf_datacache_data_postgres.conf      2011-11-03 
21:10:27 UTC (rev 17971)
+++ gnunet/src/datacache/perf_datacache_data_postgres.conf      2011-11-03 
21:20:07 UTC (rev 17972)
@@ -1,5 +1,5 @@
 [perfcache]
-QUOTA = 500000
+QUOTA = 500 KB
 DATABASE = postgres
 
 [datacache-postgres]

Modified: gnunet/src/datacache/perf_datacache_data_sqlite.conf
===================================================================
--- gnunet/src/datacache/perf_datacache_data_sqlite.conf        2011-11-03 
21:10:27 UTC (rev 17971)
+++ gnunet/src/datacache/perf_datacache_data_sqlite.conf        2011-11-03 
21:20:07 UTC (rev 17972)
@@ -1,4 +1,4 @@
 [perfcache]
-QUOTA = 500000
+QUOTA = 500 KB
 DATABASE = sqlite
 

Modified: gnunet/src/datacache/test_datacache_data_mysql.conf
===================================================================
--- gnunet/src/datacache/test_datacache_data_mysql.conf 2011-11-03 21:10:27 UTC 
(rev 17971)
+++ gnunet/src/datacache/test_datacache_data_mysql.conf 2011-11-03 21:20:07 UTC 
(rev 17972)
@@ -1,5 +1,5 @@
 [testcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = mysql
 
 [datacache-mysql]

Modified: gnunet/src/datacache/test_datacache_data_postgres.conf
===================================================================
--- gnunet/src/datacache/test_datacache_data_postgres.conf      2011-11-03 
21:10:27 UTC (rev 17971)
+++ gnunet/src/datacache/test_datacache_data_postgres.conf      2011-11-03 
21:20:07 UTC (rev 17972)
@@ -1,6 +1,6 @@
 
 [testcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = postgres
 
 [datacache-postgres]

Modified: gnunet/src/datacache/test_datacache_data_sqlite.conf
===================================================================
--- gnunet/src/datacache/test_datacache_data_sqlite.conf        2011-11-03 
21:10:27 UTC (rev 17971)
+++ gnunet/src/datacache/test_datacache_data_sqlite.conf        2011-11-03 
21:20:07 UTC (rev 17972)
@@ -1,5 +1,5 @@
 [testcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 

Modified: gnunet/src/datastore/datastore.conf
===================================================================
--- gnunet/src/datastore/datastore.conf 2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/datastore/datastore.conf 2011-11-03 21:20:07 UTC (rev 17972)
@@ -10,7 +10,7 @@
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-QUOTA = 100000000
+QUOTA = 100 MB
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = sqlite
 # DISABLE_SOCKET_FORWARDING = NO

Modified: gnunet/src/datastore/gnunet-service-datastore.c
===================================================================
--- gnunet/src/datastore/gnunet-service-datastore.c     2011-11-03 21:10:27 UTC 
(rev 17971)
+++ gnunet/src/datastore/gnunet-service-datastore.c     2011-11-03 21:20:07 UTC 
(rev 17972)
@@ -1480,7 +1480,7 @@
 
   cfg = c;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, "DATASTORE", "QUOTA", 
&quota))
+      GNUNET_CONFIGURATION_get_value_size (cfg, "DATASTORE", "QUOTA", &quota))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("No `%s' specified for `%s' in configuration!\n"), "QUOTA",

Modified: gnunet/src/datastore/test_datastore_api_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_mysql.conf     2011-11-03 
21:10:27 UTC (rev 17971)
+++ gnunet/src/datastore/test_datastore_api_data_mysql.conf     2011-11-03 
21:20:07 UTC (rev 17972)
@@ -17,7 +17,7 @@
 PORT = 42464
 
 [datastore]
-QUOTA = 10000000
+QUOTA = 10 MB
 DATABASE = mysql
 
 [datastore-mysql]

Modified: gnunet/src/datastore/test_datastore_api_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_postgres.conf  2011-11-03 
21:10:27 UTC (rev 17971)
+++ gnunet/src/datastore/test_datastore_api_data_postgres.conf  2011-11-03 
21:20:07 UTC (rev 17972)
@@ -17,7 +17,7 @@
 PORT = 42464
 
 [datastore]
-QUOTA = 10000000
+QUOTA = 10 MB
 DATABASE = postgres
 
 [datastore-postgres]

Modified: gnunet/src/datastore/test_datastore_api_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_sqlite.conf    2011-11-03 
21:10:27 UTC (rev 17971)
+++ gnunet/src/datastore/test_datastore_api_data_sqlite.conf    2011-11-03 
21:20:07 UTC (rev 17972)
@@ -17,7 +17,7 @@
 PORT = 42464
 
 [datastore]
-QUOTA = 10000000
+QUOTA = 10 MB
 
 [fs]
 AUTOSTART = NO

Modified: gnunet/src/datastore/test_defaults.conf
===================================================================
--- gnunet/src/datastore/test_defaults.conf     2011-11-03 21:10:27 UTC (rev 
17971)
+++ gnunet/src/datastore/test_defaults.conf     2011-11-03 21:20:07 UTC (rev 
17972)
@@ -1,6 +1,6 @@
 [datastore]
 PORT = 22654
-QUOTA = 1000000
+QUOTA = 1 MB
 
 [dht]
 AUTOSTART = NO

Modified: gnunet/src/dht/dht.conf
===================================================================
--- gnunet/src/dht/dht.conf     2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/dht/dht.conf     2011-11-03 21:20:07 UTC (rev 17972)
@@ -34,5 +34,5 @@
 
 [dhtcache]
 DATABASE = sqlite
-QUOTA = 1024000
+QUOTA = 1 MB
 

Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf      2011-11-03 21:10:27 UTC (rev 
17971)
+++ gnunet/src/dht/test_dht_api_peer1.conf      2011-11-03 21:20:07 UTC (rev 
17972)
@@ -17,7 +17,7 @@
 plugins = dht test
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

Modified: gnunet/src/dht/test_dht_multipeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer_data.conf 2011-11-03 21:10:27 UTC (rev 
17971)
+++ gnunet/src/dht/test_dht_multipeer_data.conf 2011-11-03 21:20:07 UTC (rev 
17972)
@@ -27,7 +27,7 @@
 plugins = test dht
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf   2011-11-03 21:10:27 UTC (rev 
17971)
+++ gnunet/src/dht/test_dht_twopeer_data.conf   2011-11-03 21:20:07 UTC (rev 
17972)
@@ -16,7 +16,7 @@
 plugins = test dht dns
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/fs/fs_test_lib_data.conf 2011-11-03 21:20:07 UTC (rev 17972)
@@ -7,5 +7,5 @@
 TOTAL_QUOTA_OUT = 3932160
 
 [datastore]
-QUOTA = 2000000000
+QUOTA = 2 GB
 

Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/fs/test_fs_defaults.conf 2011-11-03 21:20:07 UTC (rev 17972)
@@ -28,7 +28,7 @@
 DEFAULTSERVICES = fs
 
 [datastore]
-QUOTA = 100000000
+QUOTA = 100 MB
 
 [statistics]
 PORT = 43467

Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf      2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/mesh/test_mesh.conf      2011-11-03 21:20:07 UTC (rev 17972)
@@ -25,7 +25,7 @@
 plugins = dht test
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

Modified: gnunet/src/mesh/test_mesh_path.conf
===================================================================
--- gnunet/src/mesh/test_mesh_path.conf 2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/mesh/test_mesh_path.conf 2011-11-03 21:20:07 UTC (rev 17972)
@@ -25,7 +25,7 @@
 plugins = dht test
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [transport]

Modified: gnunet/src/vpn/test-conf.conf
===================================================================
--- gnunet/src/vpn/test-conf.conf       2011-11-03 21:10:27 UTC (rev 17971)
+++ gnunet/src/vpn/test-conf.conf       2011-11-03 21:20:07 UTC (rev 17972)
@@ -49,7 +49,7 @@
 # PREFIX =
 
 [dhtcache]
-QUOTA = 1000000
+QUOTA = 1 MB
 DATABASE = sqlite
 
 [arm]
@@ -217,7 +217,7 @@
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-QUOTA = 100000000
+QUOTA = 100 MB
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = sqlite
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r17972 - in gnunet/src: datacache datastore dht fs mesh vpn, gnunet <=
Prev by Date: [GNUnet-SVN] r17971 - in gnunet/src: include util
Next by Date: [GNUnet-SVN] r17974 - gnunet/src/testing
Previous by thread: [GNUnet-SVN] r17971 - in gnunet/src: include util
Next by thread: [GNUnet-SVN] r17974 - gnunet/src/testing
Index(es):
- Date
- Thread