[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12200 - in gnunet: . contrib src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12200 - in gnunet: . contrib src/fs |
Date: |
Sun, 11 Jul 2010 14:48:34 +0200 |
Author: grothoff
Date: 2010-07-11 14:48:34 +0200 (Sun, 11 Jul 2010)
New Revision: 12200
Modified:
gnunet/TODO
gnunet/contrib/defaults.conf
gnunet/src/fs/gnunet-search.c
gnunet/src/fs/gnunet-service-fs.c
Log:
minor fixmes
Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2010-07-10 14:32:42 UTC (rev 12199)
+++ gnunet/TODO 2010-07-11 12:48:34 UTC (rev 12200)
@@ -18,7 +18,6 @@
- implement performance tests
* FS: [CG]
- trust: do not charge when "idle" / load considerations (migration, routing)
- - listing of learned namespaces
- artificial delays
- active reply route caching design & implementation of service; gap
extension!
- utilize in-line files in meta data always (including in search results or
@@ -52,7 +51,7 @@
+ download resume
+ publish resume
+ publish error
- - implement new-pseudonym dialog
+ - implement new-pseudonym and advertise-pseudonym dialogs
- namespace search
- NS list in search dialog should use colors to offset our own namespaces
from the others
- double-clicking on NS list in search dialog should move 'root' to keyword
line
Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf 2010-07-10 14:32:42 UTC (rev 12199)
+++ gnunet/contrib/defaults.conf 2010-07-11 12:48:34 UTC (rev 12200)
@@ -214,4 +214,6 @@
UNIXPATH = /tmp/gnunet-service-fs.sock
# DISABLE_SOCKET_FORWARDING = NO
# DEBUG = YES
-
+MAX_PENDING_REQUESTS = 65536
+MIN_MIGRATION_DELAY = 1000
+EXPECTED_NEIGHBOUR_COUNT = 128
Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c 2010-07-10 14:32:42 UTC (rev 12199)
+++ gnunet/src/fs/gnunet-search.c 2010-07-11 12:48:34 UTC (rev 12200)
@@ -171,7 +171,7 @@
GNUNET_CONTAINER_meta_data_iterate
(info->value.search.specifics.result.meta,
&item_printer,
NULL);
- printf ("\n");
+ printf ("\n");
fflush(stdout);
GNUNET_free_non_null (filename);
GNUNET_free (uri);
Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c 2010-07-10 14:32:42 UTC (rev 12199)
+++ gnunet/src/fs/gnunet-service-fs.c 2010-07-11 12:48:34 UTC (rev 12200)
@@ -56,7 +56,6 @@
*/
#define TRUST_FLUSH_FREQ GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MINUTES, 5)
-
/**
* Inverse of the probability that we will submit the same query
* to the same peer again. If the same peer already got the query
@@ -75,12 +74,9 @@
*/
#define MAX_TRANSMIT_DELAY GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 45)
-
-
/**
* Maximum number of requests (from other peers) that we're
* willing to have pending at any given point in time.
- * FIXME: set from configuration.
*/
static uint64_t max_pending_requests = (32 * 1024);
@@ -3669,14 +3665,34 @@
0 },
{NULL, NULL, 0, 0}
};
+ unsigned long long enc = 128;
sched = s;
cfg = c;
stats = GNUNET_STATISTICS_create (sched, "fs", cfg);
- min_migration_delay = GNUNET_TIME_UNIT_SECONDS; // FIXME: get from config
- connected_peers = GNUNET_CONTAINER_multihashmap_create (128); // FIXME: get
size from config
- query_request_map = GNUNET_CONTAINER_multihashmap_create (128); // FIXME:
get size from config
- peer_request_map = GNUNET_CONTAINER_multihashmap_create (128); // FIXME: get
size from config
+ min_migration_delay = GNUNET_TIME_UNIT_SECONDS;
+ if ( (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (cfg,
+ "fs",
+ "MAX_PENDING_REQUESTS",
+ &max_pending_requests)) ||
+ (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (cfg,
+ "fs",
+ "EXPECTED_NEIGHBOUR_COUNT",
+ &enc)) ||
+ (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (cfg,
+ "fs",
+ "MIN_MIGRATION_DELAY",
+ &min_migration_delay)) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Configuration fails to specify certain parameters,
assuming default values."));
+ }
+ connected_peers = GNUNET_CONTAINER_multihashmap_create (enc);
+ query_request_map = GNUNET_CONTAINER_multihashmap_create
(max_pending_requests);
+ peer_request_map = GNUNET_CONTAINER_multihashmap_create (enc);
requests_by_expiration_heap = GNUNET_CONTAINER_heap_create
(GNUNET_CONTAINER_HEAP_ORDER_MIN);
core = GNUNET_CORE_connect (sched,
cfg,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12200 - in gnunet: . contrib src/fs,
gnunet <=