diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-07 18:19:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-07 18:19:32 +0000 |
commit | a60b958f984d08525b636a2c7eae564ebec54ae6 (patch) | |
tree | 6dcbbf91d734834f804b2fd9ab790244e2d60e6c /src/dv | |
parent | decf459805cdb3f6811f979df4831bc2ce9a2858 (diff) | |
download | gnunet-a60b958f984d08525b636a2c7eae564ebec54ae6.tar.gz gnunet-a60b958f984d08525b636a2c7eae564ebec54ae6.zip |
-chaning multihashmap API to allow option for avoiding key allocation
Diffstat (limited to 'src/dv')
-rw-r--r-- | src/dv/dv_api.c | 2 | ||||
-rw-r--r-- | src/dv/gnunet-service-dv.c | 4 | ||||
-rw-r--r-- | src/dv/test_transport_api_dv.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index 131503e6e..8f866e2e5 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c | |||
@@ -587,7 +587,7 @@ GNUNET_DV_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
587 | GNUNET_YES, &transmit_start, | 587 | GNUNET_YES, &transmit_start, |
588 | start_context); | 588 | start_context); |
589 | 589 | ||
590 | handle->send_callbacks = GNUNET_CONTAINER_multihashmap_create (100); | 590 | handle->send_callbacks = GNUNET_CONTAINER_multihashmap_create (100, GNUNET_NO); |
591 | 591 | ||
592 | return handle; | 592 | return handle; |
593 | } | 593 | } |
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 5c0b6f5fa..ca881aa91 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -3290,9 +3290,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
3290 | neighbor_max_heap = | 3290 | neighbor_max_heap = |
3291 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX); | 3291 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX); |
3292 | 3292 | ||
3293 | direct_neighbors = GNUNET_CONTAINER_multihashmap_create (max_hosts); | 3293 | direct_neighbors = GNUNET_CONTAINER_multihashmap_create (max_hosts, GNUNET_NO); |
3294 | extended_neighbors = | 3294 | extended_neighbors = |
3295 | GNUNET_CONTAINER_multihashmap_create (max_table_size * 3); | 3295 | GNUNET_CONTAINER_multihashmap_create (max_table_size * 3, GNUNET_NO); |
3296 | 3296 | ||
3297 | GNUNET_SERVER_add_handlers (server, plugin_handlers); | 3297 | GNUNET_SERVER_add_handlers (server, plugin_handlers); |
3298 | coreAPI = GNUNET_CORE_connect (cfg, NULL, /* FIXME: anything we want to pass around? */ | 3298 | coreAPI = GNUNET_CORE_connect (cfg, NULL, /* FIXME: anything we want to pass around? */ |
diff --git a/src/dv/test_transport_api_dv.c b/src/dv/test_transport_api_dv.c index 769694f90..c78d5072d 100644 --- a/src/dv/test_transport_api_dv.c +++ b/src/dv/test_transport_api_dv.c | |||
@@ -1180,7 +1180,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1180 | (GNUNET_TIME_UNIT_MINUTES, 5), &end_badly, | 1180 | (GNUNET_TIME_UNIT_MINUTES, 5), &end_badly, |
1181 | "didn't start all daemons in reasonable amount of time!!!"); | 1181 | "didn't start all daemons in reasonable amount of time!!!"); |
1182 | 1182 | ||
1183 | peer_daemon_hash = GNUNET_CONTAINER_multihashmap_create (peers_left); | 1183 | peer_daemon_hash = GNUNET_CONTAINER_multihashmap_create (peers_left, GNUNET_NO); |
1184 | pg = GNUNET_TESTING_daemons_start (cfg, peers_left, /* Total number of peers */ | 1184 | pg = GNUNET_TESTING_daemons_start (cfg, peers_left, /* Total number of peers */ |
1185 | peers_left, /* Number of outstanding connections */ | 1185 | peers_left, /* Number of outstanding connections */ |
1186 | peers_left, /* Number of parallel ssh connections, or peers being started at once */ | 1186 | peers_left, /* Number of parallel ssh connections, or peers being started at once */ |