[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8971 - in gnunet/src: datastore fs include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8971 - in gnunet/src: datastore fs include |
Date: |
Wed, 9 Sep 2009 07:21:01 -0600 |
Author: grothoff
Date: 2009-09-09 07:21:00 -0600 (Wed, 09 Sep 2009)
New Revision: 8971
Modified:
gnunet/src/datastore/perf_plugin_datastore.c
gnunet/src/datastore/test_datastore_api_management.c
gnunet/src/fs/
gnunet/src/fs/Makefile.am
gnunet/src/fs/fs_directory.c
gnunet/src/fs/test_fs_directory.c
gnunet/src/fs/test_fs_uri.c
gnunet/src/include/gnunet_fs_service.h
Log:
more testing
Modified: gnunet/src/datastore/perf_plugin_datastore.c
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore.c 2009-09-08 23:45:51 UTC
(rev 8970)
+++ gnunet/src/datastore/perf_plugin_datastore.c 2009-09-09 13:21:00 UTC
(rev 8971)
@@ -399,6 +399,7 @@
{
int ret;
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
GNUNET_log_setup ("perf-plugin-datastore",
#if VERBOSE
"DEBUG",
@@ -407,6 +408,7 @@
#endif
NULL);
ret = check ();
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
return ret;
}
Modified: gnunet/src/datastore/test_datastore_api_management.c
===================================================================
--- gnunet/src/datastore/test_datastore_api_management.c 2009-09-08
23:45:51 UTC (rev 8970)
+++ gnunet/src/datastore/test_datastore_api_management.c 2009-09-09
13:21:00 UTC (rev 8971)
@@ -369,7 +369,7 @@
#endif
NULL);
ret = check ();
-
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
return ret;
}
Property changes on: gnunet/src/fs
___________________________________________________________________
Modified: svn:ignore
- gnunet-service-fs
gnunet-pseudonym
gnunet-directory
gnunet-unindex
gnunet-search
gnunet-download
gnunet-publish
Makefile.in
Makefile
.deps
+ test_fs_uri
test_fs_getopt
test_fs_directory
test_fs_collection
gnunet-service-fs
gnunet-pseudonym
gnunet-directory
gnunet-unindex
gnunet-search
gnunet-download
gnunet-publish
Makefile.in
Makefile
.deps
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2009-09-08 23:45:51 UTC (rev 8970)
+++ gnunet/src/fs/Makefile.am 2009-09-09 13:21:00 UTC (rev 8971)
@@ -107,7 +107,7 @@
test_fs_getopt \
test_fs_uri
-TESTS = test_fs_uri
+TESTS = test_fs_directory test_fs_uri
# $(check_PROGRAMS)
Modified: gnunet/src/fs/fs_directory.c
===================================================================
--- gnunet/src/fs/fs_directory.c 2009-09-08 23:45:51 UTC (rev 8970)
+++ gnunet/src/fs/fs_directory.c 2009-09-09 13:21:00 UTC (rev 8971)
@@ -490,8 +490,9 @@
* @param bld directory to finish
* @param rsize set to the number of bytes needed
* @param rdata set to the encoded directory
+ * @return GNUNET_OK on success
*/
-void
+int
GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
size_t *rsize,
void **rdata)
@@ -541,7 +542,15 @@
}
}
*rsize = size;
- data = GNUNET_malloc (size);
+ data = GNUNET_malloc_large (size);
+ if (data == NULL)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+ "malloc");
+ *rsize = 0;
+ *rdata = NULL;
+ return GNUNET_SYSERR;
+ }
*rdata = data;
memcpy (data, GNUNET_DIRECTORY_MAGIC, 8);
off = 8;
@@ -572,6 +581,7 @@
GNUNET_assert (off == size);
GNUNET_CONTAINER_meta_data_destroy (bld->meta);
GNUNET_free (bld);
+ return GNUNET_OK;
}
Modified: gnunet/src/fs/test_fs_directory.c
===================================================================
--- gnunet/src/fs/test_fs_directory.c 2009-09-08 23:45:51 UTC (rev 8970)
+++ gnunet/src/fs/test_fs_directory.c 2009-09-09 13:21:00 UTC (rev 8971)
@@ -51,6 +51,8 @@
struct PCLS *p = cls;
int i;
+ if (NULL == uri)
+ return; /* ignore directory's meta data */
for (i = 0; i < p->max; i++)
{
if (GNUNET_CONTAINER_meta_data_test_equal (p->md[i],
@@ -80,10 +82,16 @@
char uri[512];
char txt[128];
int ret = 0;
+ struct GNUNET_TIME_Absolute start;
+ char *s;
cls.max = i;
uris = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri*) * i);
mds = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_MetaData*) * i);
+ meta = GNUNET_CONTAINER_meta_data_create ();
+ GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_TITLE, "A title");
+ GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_AUTHOR, "An author");
+ db = GNUNET_FS_directory_builder_create (meta);
for (p = 0; p < i; p++)
{
mds[p] = GNUNET_CONTAINER_meta_data_create ();
@@ -112,22 +120,27 @@
GNUNET_free (uris);
ABORT (); /* error in testcase */
}
+ GNUNET_FS_directory_builder_add (db, uris[p], mds[p], NULL);
}
- meta = GNUNET_CONTAINER_meta_data_create ();
- GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_TITLE, "A title");
- GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_AUTHOR, "An author");
- db = GNUNET_FS_directory_builder_create (meta);
- for (p=0;p<i;p++)
- GNUNET_FS_directory_builder_add (db, uris[i], mds[i], NULL);
+ start = GNUNET_TIME_absolute_get ();
GNUNET_FS_directory_builder_finish (db,
&dlen,
(void**) &data);
- cls.pos = 0;
- cls.uri = uris;
- cls.md = mds;
- GNUNET_FS_directory_list_contents (dlen, data, 0,
- &processor, &cls);
- GNUNET_assert (cls.pos == i);
+ s = GNUNET_STRINGS_relative_time_to_string
(GNUNET_TIME_absolute_get_duration (start));
+ fprintf (stdout,
+ "Creating directory with %u entires took %s\n",
+ i,
+ s);
+ GNUNET_free (s);
+ if (i < 1000)
+ {
+ cls.pos = 0;
+ cls.uri = uris;
+ cls.md = mds;
+ GNUNET_FS_directory_list_contents (dlen, data, 0,
+ &processor, &cls);
+ GNUNET_assert (cls.pos == i);
+ }
GNUNET_free (data);
GNUNET_CONTAINER_meta_data_destroy (meta);
for (p = 0; p < i; p++)
@@ -140,6 +153,7 @@
return ret;
}
+
int
main (int argc, char *argv[])
{
@@ -153,11 +167,8 @@
"WARNING",
#endif
NULL);
- for (i = 17; i < 2000; i *= 2)
- {
- fprintf (stderr, ".");
- failureCount += testDirectory (i);
- }
+ for (i = 17; i < 10000; i *= 2)
+ failureCount += testDirectory (i);
fprintf (stderr, "\n");
if (failureCount != 0)
Modified: gnunet/src/fs/test_fs_uri.c
===================================================================
--- gnunet/src/fs/test_fs_uri.c 2009-09-08 23:45:51 UTC (rev 8970)
+++ gnunet/src/fs/test_fs_uri.c 2009-09-09 13:21:00 UTC (rev 8971)
@@ -269,6 +269,7 @@
failureCount += testFile (i);
}
/* fprintf (stderr, "\n"); */
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
if (failureCount != 0)
return 1;
return 0;
Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h 2009-09-08 23:45:51 UTC (rev
8970)
+++ gnunet/src/include/gnunet_fs_service.h 2009-09-09 13:21:00 UTC (rev
8971)
@@ -2429,8 +2429,9 @@
* @param bld directory to finish
* @param size set to the number of bytes needed
* @param data set to the encoded directory
+ * @return GNUNET_OK on success
*/
-void
+int
GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
size_t *size,
void **data);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8971 - in gnunet/src: datastore fs include,
gnunet <=