[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r11262 - in gnunet/src: datastore fs statistics util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r11262 - in gnunet/src: datastore fs statistics util |
Date: |
Sat, 8 May 2010 01:42:28 +0200 |
Author: grothoff
Date: 2010-05-08 01:42:28 +0200 (Sat, 08 May 2010)
New Revision: 11262
Modified:
gnunet/src/datastore/Makefile.am
gnunet/src/datastore/gnunet-service-datastore.c
gnunet/src/fs/fs.c
gnunet/src/fs/fs_publish.c
gnunet/src/fs/fs_search.c
gnunet/src/fs/test_fs_publish_persistence.c
gnunet/src/fs/test_fs_unindex.c
gnunet/src/fs/test_fs_unindex_persistence.c
gnunet/src/statistics/statistics_api.c
gnunet/src/util/connection.c
Log:
stuff
Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am 2010-05-07 18:44:58 UTC (rev 11261)
+++ gnunet/src/datastore/Makefile.am 2010-05-07 23:42:28 UTC (rev 11262)
@@ -32,7 +32,6 @@
gnunet_service_datastore_SOURCES = \
gnunet-service-datastore.c plugin_datastore.h
gnunet_service_datastore_LDADD = \
- $(top_builddir)/src/arm/libgnunetarm.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
Modified: gnunet/src/datastore/gnunet-service-datastore.c
===================================================================
--- gnunet/src/datastore/gnunet-service-datastore.c 2010-05-07 18:44:58 UTC
(rev 11261)
+++ gnunet/src/datastore/gnunet-service-datastore.c 2010-05-07 23:42:28 UTC
(rev 11262)
@@ -26,7 +26,6 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
#include "gnunet_protocols.h"
#include "gnunet_statistics_service.h"
#include "plugin_datastore.h"
@@ -1304,7 +1303,6 @@
GNUNET_CONTAINER_bloomfilter_free (filter);
filter = NULL;
}
- GNUNET_ARM_stop_services (cfg, tc->sched, "statistics", NULL);
if (stats != NULL)
{
GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
@@ -1453,13 +1451,11 @@
}
return;
}
- GNUNET_ARM_start_services (cfg, sched, "statistics", NULL);
plugin = load_plugin ();
if (NULL == plugin)
{
GNUNET_CONTAINER_bloomfilter_free (filter);
filter = NULL;
- GNUNET_ARM_stop_services (cfg, sched, "statistics", NULL);
if (stats != NULL)
{
GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
Modified: gnunet/src/fs/fs.c
===================================================================
--- gnunet/src/fs/fs.c 2010-05-07 18:44:58 UTC (rev 11261)
+++ gnunet/src/fs/fs.c 2010-05-07 23:42:28 UTC (rev 11262)
@@ -880,6 +880,7 @@
ret->data.file.reader_cls = GNUNET_FS_make_file_reader_context_
(ret->filename);
break;
case 4: /* directory */
+ ret->is_directory = GNUNET_YES;
if ( (GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &dsize)) ||
(NULL == (ret->data.dir.dir_data = GNUNET_malloc_large (dsize))) ||
@@ -892,7 +893,6 @@
goto cleanup;
}
ret->data.dir.dir_size = (uint32_t) dsize;
- ret->is_directory = GNUNET_YES;
if (filename != NULL)
{
ret->data.dir.entries = deserialize_file_information (h, filename);
@@ -1451,6 +1451,8 @@
pc->fi_pos = pc->fi;
}
}
+ GNUNET_free (fi_root);
+ fi_root = NULL;
/* generate RESUME event(s) */
GNUNET_FS_file_information_inspect (pc->fi,
&fip_signal_resume,
Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c 2010-05-07 18:44:58 UTC (rev 11261)
+++ gnunet/src/fs/fs_publish.c 2010-05-07 23:42:28 UTC (rev 11262)
@@ -149,6 +149,7 @@
/* we were aborted in the meantime,
finish shutdown! */
publish_cleanup (pcc->sc);
+ GNUNET_free (pcc);
return;
}
GNUNET_assert (GNUNET_YES == pcc->sc->in_network_wait);
@@ -1587,6 +1588,7 @@
memcpy (dest, update, nidlen);
dest += nidlen;
memcpy (dest, uris, slen);
+ GNUNET_free (uris);
dest += slen;
mdsize = GNUNET_CONTAINER_meta_data_serialize (mmeta,
&dest,
@@ -1596,7 +1598,6 @@
if (mdsize == -1)
{
GNUNET_break (0);
- GNUNET_free (uris);
GNUNET_free (sb);
cont (cont_cls,
NULL,
Modified: gnunet/src/fs/fs_search.c
===================================================================
--- gnunet/src/fs/fs_search.c 2010-05-07 18:44:58 UTC (rev 11261)
+++ gnunet/src/fs/fs_search.c 2010-05-07 23:42:28 UTC (rev 11262)
@@ -529,6 +529,7 @@
sc->options,
NULL,
sr);
+ GNUNET_free (uu.data.sks.identifier);
}
@@ -1308,6 +1309,7 @@
GNUNET_free_non_null (sc->requests);
GNUNET_free_non_null (sc->emsg);
GNUNET_FS_uri_destroy (sc->uri);
+ GNUNET_free_non_null (sc->serialization);
GNUNET_free (sc);
}
@@ -1474,6 +1476,7 @@
? GNUNET_FS_SYNC_PATH_CHILD_SEARCH
: GNUNET_FS_SYNC_PATH_MASTER_SEARCH,
sc->serialization);
+ GNUNET_free (sc->serialization);
}
pi.status = GNUNET_FS_STATUS_SEARCH_STOPPED;
sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
Modified: gnunet/src/fs/test_fs_publish_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_publish_persistence.c 2010-05-07 18:44:58 UTC (rev
11261)
+++ gnunet/src/fs/test_fs_publish_persistence.c 2010-05-07 23:42:28 UTC (rev
11262)
@@ -390,10 +390,16 @@
"nohelp", options, &run, NULL);
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-publish/");
- GNUNET_DISK_directory_remove (fn1);
- GNUNET_free_non_null (fn1);
- GNUNET_DISK_directory_remove (fn2);
- GNUNET_free_non_null (fn2);
+ if (fn1 != NULL)
+ {
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free (fn1);
+ }
+ if (fn2 != NULL)
+ {
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free (fn2);
+ }
return err;
}
Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c 2010-05-07 18:44:58 UTC (rev 11261)
+++ gnunet/src/fs/test_fs_unindex.c 2010-05-07 23:42:28 UTC (rev 11262)
@@ -310,8 +310,11 @@
"nohelp", options, &run, NULL);
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-unindex/");
- GNUNET_DISK_directory_remove (fn);
- GNUNET_free_non_null (fn);
+ if (NULL != fn)
+ {
+ GNUNET_DISK_directory_remove (fn);
+ GNUNET_free (fn);
+ }
return 0;
}
Modified: gnunet/src/fs/test_fs_unindex_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_unindex_persistence.c 2010-05-07 18:44:58 UTC (rev
11261)
+++ gnunet/src/fs/test_fs_unindex_persistence.c 2010-05-07 23:42:28 UTC (rev
11262)
@@ -375,8 +375,11 @@
"nohelp", options, &run, NULL);
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-unindex/");
- GNUNET_DISK_directory_remove (fn);
- GNUNET_free_non_null (fn);
+ if (NULL != fn)
+ {
+ GNUNET_DISK_directory_remove (fn);
+ GNUNET_free (fn);
+ }
return 0;
}
Modified: gnunet/src/statistics/statistics_api.c
===================================================================
--- gnunet/src/statistics/statistics_api.c 2010-05-07 18:44:58 UTC (rev
11261)
+++ gnunet/src/statistics/statistics_api.c 2010-05-07 23:42:28 UTC (rev
11262)
@@ -556,6 +556,7 @@
h->action_tail = NULL;
}
}
+ h->do_destroy = GNUNET_YES;
if ( (h->current != NULL) &&
(h->th == NULL) )
{
@@ -567,8 +568,8 @@
&transmit_action, h);
GNUNET_assert (NULL != h->th);
}
- h->do_destroy = GNUNET_YES;
- return;
+ if (h->th != NULL)
+ return;
}
if (NULL != h->th)
{
Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c 2010-05-07 18:44:58 UTC (rev 11261)
+++ gnunet/src/util/connection.c 2010-05-07 23:42:28 UTC (rev 11262)
@@ -539,9 +539,14 @@
notify (sock->nth.notify_ready_cls, 0, NULL);
}
- if ((sock->sock != NULL) && (sock->persist != GNUNET_YES))
- GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock->sock));
-
+ if (sock->sock != NULL)
+ {
+ if (sock->persist != GNUNET_YES)
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock->sock));
+ else
+ GNUNET_free (sock->sock); /* at least no memory leak (we deliberately
+ leak the socket in this special case) ...
*/
+ }
GNUNET_free_non_null (sock->addr);
GNUNET_free_non_null (sock->hostname);
#if DEBUG_CONNECTION
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r11262 - in gnunet/src: datastore fs statistics util,
gnunet <=