[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15339 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15339 - gnunet/src/fs |
Date: |
Fri, 27 May 2011 15:32:42 +0200 |
Author: grothoff
Date: 2011-05-27 15:32:42 +0200 (Fri, 27 May 2011)
New Revision: 15339
Modified:
gnunet/src/fs/fs_test_lib_data.conf
gnunet/src/fs/gnunet-service-fs_cp.c
gnunet/src/fs/gnunet-service-fs_push.c
Log:
check return values, cancel timeout task
Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2011-05-27 13:32:13 UTC (rev 15338)
+++ gnunet/src/fs/fs_test_lib_data.conf 2011-05-27 13:32:42 UTC (rev 15339)
@@ -55,8 +55,8 @@
CONTENT_CACHING = NO
CONTENT_PUSHING = NO
#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes --trace-children=yes
-#BINARY = /home/grothoff/bin/gnunet-service-fs
+PREFIX = valgrind --tool=memcheck --leak-check=yes --trace-children=yes
+BINARY = /home/grothoff/bin/gnunet-service-fs
#PREFIX = xterm -e gdb -x cmd --args
[testing]
Modified: gnunet/src/fs/gnunet-service-fs_cp.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cp.c 2011-05-27 13:32:13 UTC (rev
15338)
+++ gnunet/src/fs/gnunet-service-fs_cp.c 2011-05-27 13:32:42 UTC (rev
15339)
@@ -417,6 +417,7 @@
void *buf)
{
struct GSF_PeerTransmitHandle *pth = cls;
+ struct GSF_PeerTransmitHandle *pos;
struct GSF_ConnectedPeer *cp;
size_t ret;
@@ -445,9 +446,13 @@
GNUNET_TIME_absolute_get_duration
(pth->transmission_request_start_time).rel_value);
ret = pth->gmc (pth->gmc_cls,
size, buf);
+ GNUNET_assert (NULL == pth->cth);
+ for (pos = cp->pth_head; pos != NULL; pos = pos->next)
+ {
+ GNUNET_assert (pos != pth);
+ schedule_transmission (pos);
+ }
GNUNET_free (pth);
- for (pth = cp->pth_head; pth != NULL; pth = pth->next)
- schedule_transmission (pth);
return ret;
}
@@ -1497,6 +1502,11 @@
GNUNET_CORE_notify_transmit_ready_cancel (pth->cth);
pth->cth = NULL;
}
+ if (pth->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (pth->timeout_task);
+ pth->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
GNUNET_CONTAINER_DLL_remove (cp->pth_head,
cp->pth_tail,
pth);
Modified: gnunet/src/fs/gnunet-service-fs_push.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_push.c 2011-05-27 13:32:13 UTC (rev
15338)
+++ gnunet/src/fs/gnunet-service-fs_push.c 2011-05-27 13:32:42 UTC (rev
15339)
@@ -594,7 +594,8 @@
0, UINT_MAX,
GNUNET_TIME_UNIT_FOREVER_REL,
&process_migration_content, NULL);
- GNUNET_assert (mig_qe != NULL);
+ if (NULL == mig_qe)
+ consider_gathering ();
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15339 - gnunet/src/fs,
gnunet <=