converting to GNUNET_LOG_from*

author: Christian Grothoff <christian@grothoff.org> 2011-10-11 09:43:04 +0000
committer: Christian Grothoff <christian@grothoff.org> 2011-10-11 09:43:04 +0000
commit: d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch)
tree: 9080b73624389403a198257fe0547bb4634e64d2 /src/util/test_container_bloomfilter.c
parent: 2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff)
download: gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz
gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip
1 files changed, 104 insertions, 102 deletions
diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c
index c14adb075..04bb34889 100644
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -75,29 +75,30 @@ main (int argc, char *argv[])
  bf = GNUNET_CONTAINER_bloomfilter_load (TESTFILE, SIZE, K);
  for (i = 0; i < 200; i++)
-  {
+    {
-    nextHC (&tmp);
+      nextHC (&tmp);
-    GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);
+      GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);
-  }
+    }
  SRANDOM (1);
  ok1 = 0;
  for (i = 0; i < 200; i++)
-  {
+    {
-    nextHC (&tmp);
+      nextHC (&tmp);
-    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-      ok1++;
+        ok1++;
-  }
+    }
  if (ok1 != 200)
-  {
+    {
-    printf ("Got %d elements out of" "200 expected after insertion.\n", ok1);
+      printf ("Got %d elements out of" "200 expected after insertion.\n",
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+              ok1);
-    return -1;
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-  }
+      return -1;
+    }
  if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_get_raw_data (bf, buf, SIZE))
-  {
+    {
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    return -1;
+      return -1;
-  }
+    }
  GNUNET_CONTAINER_bloomfilter_free (bf);
@@ -110,93 +111,94 @@ main (int argc, char *argv[])
  ok1 = 0;
  ok2 = 0;
  for (i = 0; i < 200; i++)
-  {
+    {
-    nextHC (&tmp);
+      nextHC (&tmp);
-    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-      ok1++;
+        ok1++;
-    if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-      ok2++;
+        ok2++;
-  }
+    }
  if (ok1 != 200)
-  {
+    {
-    printf ("Got %d elements out of 200 " "expected after reloading.\n", ok1);
+      printf ("Got %d elements out of 200 " "expected after reloading.\n",
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+              ok1);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    return -1;
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-  }
+      return -1;
+    }
  if (ok2 != 200)
-  {
+    {
-    printf ("Got %d elements out of 200 " "expected after initialization.\n",
+      printf ("Got %d elements out of 200 "
-            ok2);
+              "expected after initialization.\n", ok2);
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-    return -1;
+      return -1;
-  }
+    }
  SRANDOM (1);
  for (i = 0; i < 100; i++)
-  {
+    {
-    nextHC (&tmp);
+      nextHC (&tmp);
-    GNUNET_CONTAINER_bloomfilter_remove (bf, &tmp);
+      GNUNET_CONTAINER_bloomfilter_remove (bf, &tmp);
-    GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);
+      GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);
-  }
+    }
  SRANDOM (1);
  ok1 = 0;
  ok2 = 0;
  for (i = 0; i < 200; i++)
-  {
+    {
-    nextHC (&tmp);
+      nextHC (&tmp);
-    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-      ok1++;
+        ok1++;
-    if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-      ok2++;
+        ok2++;
-  }
+    }
  if (ok1 != 100)
-  {
+    {
-    printf ("Expected 100 elements in loaded filter"
+      printf ("Expected 100 elements in loaded filter"
-            " after adding 200 and deleting 100, got %d\n", ok1);
+              " after adding 200 and deleting 100, got %d\n", ok1);
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-    return -1;
+      return -1;
-  }
+    }
  if (ok2 != 200)
-  {
+    {
-    printf ("Expected 200 elements in initialized filter"
+      printf ("Expected 200 elements in initialized filter"
-            " after adding 200 and deleting 100 "
+              " after adding 200 and deleting 100 "
-            "(which should do nothing for a filter not backed by a file), got %d\n",
+              "(which should do nothing for a filter not backed by a file), got %d\n",
-            ok2);
+              ok2);
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-    return -1;
+      return -1;
-  }
+    }
  SRANDOM (3);
  GNUNET_CONTAINER_bloomfilter_clear (bf);
  falseok = 0;
  for (i = 0; i < 1000; i++)
-  {
+    {
-    nextHC (&tmp);
+      nextHC (&tmp);
-    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-      falseok++;
+        falseok++;
-  }
+    }
  if (falseok > 0)
-  {
+    {
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-    return -1;
+      return -1;
-  }
+    }
  if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_or (bf, buf, SIZE))
-  {
+    {
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-    return -1;
+      return -1;
-  }
+    }
  SRANDOM (2);
  i = 20;
@@ -210,30 +212,30 @@ main (int argc, char *argv[])
  ok1 = 0;
  ok2 = 0;
  for (i = 0; i < 20; i++)
-  {
+    {
-    nextHC (&tmp);
+      nextHC (&tmp);
-    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-      ok1++;
+        ok1++;
-    if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
+      if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-      ok2++;
+        ok2++;
-  }
+    }
  if (ok1 != 20)
-  {
+    {
-    printf ("Expected 20 elements in resized file-backed filter"
+      printf ("Expected 20 elements in resized file-backed filter"
-            " after adding 20, got %d\n", ok1);
+              " after adding 20, got %d\n", ok1);
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-    return -1;
+      return -1;
-  }
+    }
  if (ok2 != 20)
-  {
+    {
-    printf ("Expected 20 elements in resized filter"
+      printf ("Expected 20 elements in resized filter"
-            " after adding 20, got %d\n", ok2);
+              " after adding 20, got %d\n", ok2);
-    GNUNET_CONTAINER_bloomfilter_free (bf);
+      GNUNET_CONTAINER_bloomfilter_free (bf);
-    GNUNET_CONTAINER_bloomfilter_free (bfi);
+      GNUNET_CONTAINER_bloomfilter_free (bfi);
-    return -1;
+      return -1;
-  }
+    }
  GNUNET_CONTAINER_bloomfilter_free (bf);
author	Christian Grothoff <christian@grothoff.org>	2011-10-11 09:43:04 +0000
committer	Christian Grothoff <christian@grothoff.org>	2011-10-11 09:43:04 +0000
commit	d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch)
tree	9080b73624389403a198257fe0547bb4634e64d2 /src/util/test_container_bloomfilter.c
parent	2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff)
download	gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip

diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c index c14adb075..04bb34889 100644 --- a/src/util/test_container_bloomfilter.c +++ b/src/util/test_container_bloomfilter.c
@@ -75,29 +75,30 @@ main (int argc, char *argv[])
75	bf = GNUNET_CONTAINER_bloomfilter_load (TESTFILE, SIZE, K);	75	bf = GNUNET_CONTAINER_bloomfilter_load (TESTFILE, SIZE, K);
76		76
77	for (i = 0; i < 200; i++)	77	for (i = 0; i < 200; i++)
78	{	78	{
79	nextHC (&tmp);	79	nextHC (&tmp);
80	GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);	80	GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);
81	}	81	}
82	SRANDOM (1);	82	SRANDOM (1);
83	ok1 = 0;	83	ok1 = 0;
84	for (i = 0; i < 200; i++)	84	for (i = 0; i < 200; i++)
85	{	85	{
86	nextHC (&tmp);	86	nextHC (&tmp);
87	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)	87	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
88	ok1++;	88	ok1++;
89	}	89	}
90	if (ok1 != 200)	90	if (ok1 != 200)
91	{	91	{
92	printf ("Got %d elements out of" "200 expected after insertion.\n", ok1);	92	printf ("Got %d elements out of" "200 expected after insertion.\n",
93	GNUNET_CONTAINER_bloomfilter_free (bf);	93	ok1);
94	return -1;	94	GNUNET_CONTAINER_bloomfilter_free (bf);
95	}	95	return -1;
		96	}
96	if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_get_raw_data (bf, buf, SIZE))	97	if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_get_raw_data (bf, buf, SIZE))
97	{	98	{
98	GNUNET_CONTAINER_bloomfilter_free (bf);	99	GNUNET_CONTAINER_bloomfilter_free (bf);
99	return -1;	100	return -1;
100	}	101	}
101		102
102	GNUNET_CONTAINER_bloomfilter_free (bf);	103	GNUNET_CONTAINER_bloomfilter_free (bf);
103		104
@@ -110,93 +111,94 @@ main (int argc, char *argv[])
110	ok1 = 0;	111	ok1 = 0;
111	ok2 = 0;	112	ok2 = 0;
112	for (i = 0; i < 200; i++)	113	for (i = 0; i < 200; i++)
113	{	114	{
114	nextHC (&tmp);	115	nextHC (&tmp);
115	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)	116	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
116	ok1++;	117	ok1++;
117	if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)	118	if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
118	ok2++;	119	ok2++;
119	}	120	}
120	if (ok1 != 200)	121	if (ok1 != 200)
121	{	122	{
122	printf ("Got %d elements out of 200 " "expected after reloading.\n", ok1);	123	printf ("Got %d elements out of 200 " "expected after reloading.\n",
123	GNUNET_CONTAINER_bloomfilter_free (bf);	124	ok1);
124	GNUNET_CONTAINER_bloomfilter_free (bfi);	125	GNUNET_CONTAINER_bloomfilter_free (bf);
125	return -1;	126	GNUNET_CONTAINER_bloomfilter_free (bfi);
126	}	127	return -1;
		128	}
127		129
128	if (ok2 != 200)	130	if (ok2 != 200)
129	{	131	{
130	printf ("Got %d elements out of 200 " "expected after initialization.\n",	132	printf ("Got %d elements out of 200 "
131	ok2);	133	"expected after initialization.\n", ok2);
132	GNUNET_CONTAINER_bloomfilter_free (bf);	134	GNUNET_CONTAINER_bloomfilter_free (bf);
133	GNUNET_CONTAINER_bloomfilter_free (bfi);	135	GNUNET_CONTAINER_bloomfilter_free (bfi);
134	return -1;	136	return -1;
135	}	137	}
136		138
137	SRANDOM (1);	139	SRANDOM (1);
138	for (i = 0; i < 100; i++)	140	for (i = 0; i < 100; i++)
139	{	141	{
140	nextHC (&tmp);	142	nextHC (&tmp);
141	GNUNET_CONTAINER_bloomfilter_remove (bf, &tmp);	143	GNUNET_CONTAINER_bloomfilter_remove (bf, &tmp);
142	GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);	144	GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);
143	}	145	}
144		146
145	SRANDOM (1);	147	SRANDOM (1);
146		148
147	ok1 = 0;	149	ok1 = 0;
148	ok2 = 0;	150	ok2 = 0;
149	for (i = 0; i < 200; i++)	151	for (i = 0; i < 200; i++)
150	{	152	{
151	nextHC (&tmp);	153	nextHC (&tmp);
152	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)	154	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
153	ok1++;	155	ok1++;
154	if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)	156	if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
155	ok2++;	157	ok2++;
156	}	158	}
157		159
158	if (ok1 != 100)	160	if (ok1 != 100)
159	{	161	{
160	printf ("Expected 100 elements in loaded filter"	162	printf ("Expected 100 elements in loaded filter"
161	" after adding 200 and deleting 100, got %d\n", ok1);	163	" after adding 200 and deleting 100, got %d\n", ok1);
162	GNUNET_CONTAINER_bloomfilter_free (bf);	164	GNUNET_CONTAINER_bloomfilter_free (bf);
163	GNUNET_CONTAINER_bloomfilter_free (bfi);	165	GNUNET_CONTAINER_bloomfilter_free (bfi);
164	return -1;	166	return -1;
165	}	167	}
166	if (ok2 != 200)	168	if (ok2 != 200)
167	{	169	{
168	printf ("Expected 200 elements in initialized filter"	170	printf ("Expected 200 elements in initialized filter"
169	" after adding 200 and deleting 100 "	171	" after adding 200 and deleting 100 "
170	"(which should do nothing for a filter not backed by a file), got %d\n",	172	"(which should do nothing for a filter not backed by a file), got %d\n",
171	ok2);	173	ok2);
172	GNUNET_CONTAINER_bloomfilter_free (bf);	174	GNUNET_CONTAINER_bloomfilter_free (bf);
173	GNUNET_CONTAINER_bloomfilter_free (bfi);	175	GNUNET_CONTAINER_bloomfilter_free (bfi);
174	return -1;	176	return -1;
175	}	177	}
176		178
177	SRANDOM (3);	179	SRANDOM (3);
178		180
179	GNUNET_CONTAINER_bloomfilter_clear (bf);	181	GNUNET_CONTAINER_bloomfilter_clear (bf);
180	falseok = 0;	182	falseok = 0;
181	for (i = 0; i < 1000; i++)	183	for (i = 0; i < 1000; i++)
182	{	184	{
183	nextHC (&tmp);	185	nextHC (&tmp);
184	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)	186	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
185	falseok++;	187	falseok++;
186	}	188	}
187	if (falseok > 0)	189	if (falseok > 0)
188	{	190	{
189	GNUNET_CONTAINER_bloomfilter_free (bf);	191	GNUNET_CONTAINER_bloomfilter_free (bf);
190	GNUNET_CONTAINER_bloomfilter_free (bfi);	192	GNUNET_CONTAINER_bloomfilter_free (bfi);
191	return -1;	193	return -1;
192	}	194	}
193		195
194	if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_or (bf, buf, SIZE))	196	if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_or (bf, buf, SIZE))
195	{	197	{
196	GNUNET_CONTAINER_bloomfilter_free (bf);	198	GNUNET_CONTAINER_bloomfilter_free (bf);
197	GNUNET_CONTAINER_bloomfilter_free (bfi);	199	GNUNET_CONTAINER_bloomfilter_free (bfi);
198	return -1;	200	return -1;
199	}	201	}
200		202
201	SRANDOM (2);	203	SRANDOM (2);
202	i = 20;	204	i = 20;
@@ -210,30 +212,30 @@ main (int argc, char *argv[])
210	ok1 = 0;	212	ok1 = 0;
211	ok2 = 0;	213	ok2 = 0;
212	for (i = 0; i < 20; i++)	214	for (i = 0; i < 20; i++)
213	{	215	{
214	nextHC (&tmp);	216	nextHC (&tmp);
215	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)	217	if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
216	ok1++;	218	ok1++;
217	if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)	219	if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
218	ok2++;	220	ok2++;
219	}	221	}
220		222
221	if (ok1 != 20)	223	if (ok1 != 20)
222	{	224	{
223	printf ("Expected 20 elements in resized file-backed filter"	225	printf ("Expected 20 elements in resized file-backed filter"
224	" after adding 20, got %d\n", ok1);	226	" after adding 20, got %d\n", ok1);
225	GNUNET_CONTAINER_bloomfilter_free (bf);	227	GNUNET_CONTAINER_bloomfilter_free (bf);
226	GNUNET_CONTAINER_bloomfilter_free (bfi);	228	GNUNET_CONTAINER_bloomfilter_free (bfi);
227	return -1;	229	return -1;
228	}	230	}
229	if (ok2 != 20)	231	if (ok2 != 20)
230	{	232	{
231	printf ("Expected 20 elements in resized filter"	233	printf ("Expected 20 elements in resized filter"
232	" after adding 20, got %d\n", ok2);	234	" after adding 20, got %d\n", ok2);
233	GNUNET_CONTAINER_bloomfilter_free (bf);	235	GNUNET_CONTAINER_bloomfilter_free (bf);
234	GNUNET_CONTAINER_bloomfilter_free (bfi);	236	GNUNET_CONTAINER_bloomfilter_free (bfi);
235	return -1;	237	return -1;
236	}	238	}
237		239
238		240
239	GNUNET_CONTAINER_bloomfilter_free (bf);	241	GNUNET_CONTAINER_bloomfilter_free (bf);