aboutsummaryrefslogtreecommitdiff
path: root/src/set
diff options
context:
space:
mode:
Diffstat (limited to 'src/set')
-rw-r--r--src/set/gnunet-service-set.c3
-rw-r--r--src/set/gnunet-service-set.h1
-rw-r--r--src/set/gnunet-service-set_union.c7
-rw-r--r--src/set/gnunet-service-set_union.h2
-rw-r--r--src/set/gnunet-set-profiler.c2
-rw-r--r--src/set/ibf.c1
-rw-r--r--src/set/ibf_sim.c4
-rw-r--r--src/set/plugin_block_set_test.c1
-rw-r--r--src/set/set_api.c1
9 files changed, 10 insertions, 12 deletions
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 6e49599a2..8b46f68de 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -1775,8 +1775,7 @@ handle_client_cancel (void *cls, const struct GNUNET_SET_CancelMessage *msg)
1775 * the other peer disconnecting. The client may not know about this 1775 * the other peer disconnecting. The client may not know about this
1776 * yet and try to cancel the (just barely non-existent) operation. 1776 * yet and try to cancel the (just barely non-existent) operation.
1777 * So this is not a hard error. 1777 * So this is not a hard error.
1778 */ 1778 */GNUNET_log (GNUNET_ERROR_TYPE_INFO,
1779 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
1780 "Client canceled non-existent op %u\n", 1779 "Client canceled non-existent op %u\n",
1781 (uint32_t) ntohl (msg->request_id)); 1780 (uint32_t) ntohl (msg->request_id));
1782 } 1781 }
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index 402281da4..e118828be 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -154,7 +154,6 @@ typedef void
154(*OpChannelDeathImpl) (struct Operation *op); 154(*OpChannelDeathImpl) (struct Operation *op);
155 155
156 156
157
158/** 157/**
159 * Dispatch table for a specific set operation. Every set operation 158 * Dispatch table for a specific set operation. Every set operation
160 * has to implement the callback in this struct. 159 * has to implement the callback in this struct.
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index ca4ef2092..87c6faf98 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -2168,8 +2168,7 @@ handle_union_p2p_done (void *cls,
2168 * We should notify the active peer once 2168 * We should notify the active peer once
2169 * all our demands are satisfied, so that the active 2169 * all our demands are satisfied, so that the active
2170 * peer can quit if we gave it everything. 2170 * peer can quit if we gave it everything.
2171 */ 2171 */GNUNET_CADET_receive_done (op->channel);
2172 GNUNET_CADET_receive_done (op->channel);
2173 maybe_finish (op); 2172 maybe_finish (op);
2174 return; 2173 return;
2175 2174
@@ -2182,8 +2181,7 @@ handle_union_p2p_done (void *cls,
2182 * 2181 *
2183 * We'll close the channel 2182 * We'll close the channel
2184 * to the other peer once our demands are met. 2183 * to the other peer once our demands are met.
2185 */ 2184 */op->state->phase = PHASE_FINISH_CLOSING;
2186 op->state->phase = PHASE_FINISH_CLOSING;
2187 GNUNET_CADET_receive_done (op->channel); 2185 GNUNET_CADET_receive_done (op->channel);
2188 maybe_finish (op); 2186 maybe_finish (op);
2189 return; 2187 return;
@@ -2195,6 +2193,7 @@ handle_union_p2p_done (void *cls,
2195 } 2193 }
2196} 2194}
2197 2195
2196
2198/** 2197/**
2199 * Handle a over message from a remote peer 2198 * Handle a over message from a remote peer
2200 * 2199 *
diff --git a/src/set/gnunet-service-set_union.h b/src/set/gnunet-service-set_union.h
index 5da5b7254..2c0262f07 100644
--- a/src/set/gnunet-service-set_union.h
+++ b/src/set/gnunet-service-set_union.h
@@ -151,7 +151,6 @@ handle_union_p2p_inquiry (void *cls,
151 const struct InquiryMessage *msg); 151 const struct InquiryMessage *msg);
152 152
153 153
154
155/** 154/**
156 * Handle a request for full set transmission. 155 * Handle a request for full set transmission.
157 * 156 *
@@ -163,7 +162,6 @@ handle_union_p2p_request_full (void *cls,
163 const struct GNUNET_MessageHeader *mh); 162 const struct GNUNET_MessageHeader *mh);
164 163
165 164
166
167/** 165/**
168 * Handle a "full done" message. 166 * Handle a "full done" message.
169 * 167 *
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index 81263966a..3014861a6 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -138,7 +138,7 @@ statistics_done (void *cls,
138static void 138static void
139check_all_done (void) 139check_all_done (void)
140{ 140{
141 if ((info1.done == GNUNET_NO)||(info2.done == GNUNET_NO)) 141 if ((info1.done == GNUNET_NO) || (info2.done == GNUNET_NO))
142 return; 142 return;
143 143
144 GNUNET_CONTAINER_multihashmap_iterate (info1.received, map_remove_iterator, 144 GNUNET_CONTAINER_multihashmap_iterate (info1.received, map_remove_iterator,
diff --git a/src/set/ibf.c b/src/set/ibf.c
index 7c7adaa3c..1532afceb 100644
--- a/src/set/ibf.c
+++ b/src/set/ibf.c
@@ -45,6 +45,7 @@ ibf_key_from_hashcode (const struct GNUNET_HashCode *hash)
45 return *(struct IBF_Key *) hash; 45 return *(struct IBF_Key *) hash;
46} 46}
47 47
48
48/** 49/**
49 * Create a hashcode from a key, by replicating the key 50 * Create a hashcode from a key, by replicating the key
50 * until the hascode is filled 51 * until the hascode is filled
diff --git a/src/set/ibf_sim.c b/src/set/ibf_sim.c
index 226a9d751..6415d00e1 100644
--- a/src/set/ibf_sim.c
+++ b/src/set/ibf_sim.c
@@ -93,8 +93,7 @@ main (int argc, char **argv)
93 get 990/1000 elements on average over 1 million runs; key 93 get 990/1000 elements on average over 1 million runs; key
94 idea being to stop short of the 'last' possible IBF as 94 idea being to stop short of the 'last' possible IBF as
95 otherwise a "lowball" per-chance would unduely influence the 95 otherwise a "lowball" per-chance would unduely influence the
96 result */ 96 result */if ((j > 0) &&
97 if ((j > 0) &&
98 (buckets[j - 1] > MAX_IBF_DECODE)) 97 (buckets[j - 1] > MAX_IBF_DECODE))
99 { 98 {
100 ret *= (1 << (j + 1)); 99 ret *= (1 << (j + 1));
@@ -136,6 +135,7 @@ main (int argc, char **argv)
136 return 0; 135 return 0;
137} 136}
138 137
138
139/* TODO: should calculate stddev of the results to also be able to 139/* TODO: should calculate stddev of the results to also be able to
140 say something about the stability of the results, outside of 140 say something about the stability of the results, outside of
141 large-scale averages -- gaining 8% precision at the expense of 141 large-scale averages -- gaining 8% precision at the expense of
diff --git a/src/set/plugin_block_set_test.c b/src/set/plugin_block_set_test.c
index a9da9d549..1de086092 100644
--- a/src/set/plugin_block_set_test.c
+++ b/src/set/plugin_block_set_test.c
@@ -119,4 +119,5 @@ libgnunet_plugin_block_set_test_done (void *cls)
119 return NULL; 119 return NULL;
120} 120}
121 121
122
122/* end of plugin_block_set_test.c */ 123/* end of plugin_block_set_test.c */
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 961bfdba9..ce4b1c965 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -1257,4 +1257,5 @@ GNUNET_SET_element_hash (const struct GNUNET_SET_Element *element,
1257 GNUNET_CRYPTO_hash_context_finish (ctx, ret_hash); 1257 GNUNET_CRYPTO_hash_context_finish (ctx, ret_hash);
1258} 1258}
1259 1259
1260
1260/* end of set_api.c */ 1261/* end of set_api.c */