[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29019 - in gnunet/src: testbed testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29019 - in gnunet/src: testbed testing |
Date: |
Thu, 5 Sep 2013 13:40:07 +0200 |
Author: harsha
Date: 2013-09-05 13:40:07 +0200 (Thu, 05 Sep 2013)
New Revision: 29019
Modified:
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testbed/test_testbed_api_statistics.c
gnunet/src/testbed/test_testbed_api_topology.c
gnunet/src/testbed/test_testbed_api_topology_clique.c
gnunet/src/testbed/test_testbed_logger_api.c
gnunet/src/testing/testing.c
Log:
- fix memleaks
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2013-09-05
11:37:29 UTC (rev 29018)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2013-09-05
11:40:07 UTC (rev 29019)
@@ -181,8 +181,13 @@
SLAVE3_LINK_SUCCESS,
/**
- * Destory master peer and mark test as success
+ * Master peer destoryed. Destory slave 3 peer
*/
+ MASTER_PEER_DESTROY_SUCCESS,
+
+ /**
+ * Slave 3 peer destroyed. Mark test as success
+ */
SUCCESS,
/**
@@ -631,6 +636,11 @@
break;
case SLAVE3_LINK_SUCCESS:
check_operation_success (event);
+ result = MASTER_PEER_DESTROY_SUCCESS;
+ GNUNET_TESTBED_operation_done (op);
+ op = GNUNET_TESTBED_peer_destroy (slave3_peer);
+ break;
+ case MASTER_PEER_DESTROY_SUCCESS:
result = SUCCESS;
GNUNET_TESTBED_operation_done (op);
op = NULL;
Modified: gnunet/src/testbed/test_testbed_api_statistics.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_statistics.c 2013-09-05 11:37:29 UTC
(rev 29018)
+++ gnunet/src/testbed/test_testbed_api_statistics.c 2013-09-05 11:40:07 UTC
(rev 29019)
@@ -59,6 +59,17 @@
static int result;
/**
+ * The peers we have seen in the statistics iterator
+ */
+static struct GNUNET_TESTBED_Peer **seen_peers;
+
+/**
+ * Number of peers in the above array
+ */
+static unsigned int num_seen_peers;
+
+
+/**
* Fail testcase
*/
#define FAIL_TEST(cond, ret) do { \
@@ -109,8 +120,6 @@
const char *subsystem, const char *name, uint64_t value,
int is_persistent)
{
- static struct GNUNET_TESTBED_Peer **seen_peers;
- static unsigned int num_seen_peers;
unsigned int cnt;
FAIL_TEST (cls == dummy_cls, return GNUNET_SYSERR);
@@ -187,6 +196,7 @@
NUM_PEERS,
1LL, NULL, NULL,
&test_master, NULL);
+ GNUNET_free_non_null (seen_peers);
if (GNUNET_OK != result)
return 1;
return 0;
Modified: gnunet/src/testbed/test_testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology.c 2013-09-05 11:37:29 UTC
(rev 29018)
+++ gnunet/src/testbed/test_testbed_api_topology.c 2013-09-05 11:40:07 UTC
(rev 29019)
@@ -94,7 +94,8 @@
if ((NUM_PEERS) == overlay_connects)
{
result = GNUNET_OK;
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
break;
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
Modified: gnunet/src/testbed/test_testbed_api_topology_clique.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology_clique.c 2013-09-05
11:37:29 UTC (rev 29018)
+++ gnunet/src/testbed/test_testbed_api_topology_clique.c 2013-09-05
11:40:07 UTC (rev 29019)
@@ -94,7 +94,8 @@
if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects)
{
result = GNUNET_OK;
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
break;
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
Modified: gnunet/src/testbed/test_testbed_logger_api.c
===================================================================
--- gnunet/src/testbed/test_testbed_logger_api.c 2013-09-05 11:37:29 UTC
(rev 29018)
+++ gnunet/src/testbed/test_testbed_logger_api.c 2013-09-05 11:40:07 UTC
(rev 29019)
@@ -90,6 +90,8 @@
CANCEL_TASK (abort_task);
CANCEL_TASK (write_task);
GNUNET_free_non_null (search_dir);
+ if (NULL != h)
+ GNUNET_TESTBED_LOGGER_disconnect (h);
GNUNET_SCHEDULER_shutdown ();
}
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2013-09-05 11:37:29 UTC (rev 29018)
+++ gnunet/src/testing/testing.c 2013-09-05 11:40:07 UTC (rev 29019)
@@ -1201,10 +1201,12 @@
| GNUNET_DISK_PERM_USER_WRITE);
if (NULL == fd)
{
- GNUNET_asprintf (&emsg_, _("Cannot open hostkey file: %s\n"),
- STRERROR (errno));
+ GNUNET_asprintf (&emsg_, _("Cannot open hostkey file `%s': %s\n"),
+ hostkey_filename, STRERROR (errno));
+ GNUNET_free (hostkey_filename);
goto err_ret;
}
+ GNUNET_free (hostkey_filename);
if (GNUNET_TESTING_HOSTKEYFILESIZE !=
GNUNET_DISK_file_write (fd, system->hostkeys_data
+ (key_number * GNUNET_TESTING_HOSTKEYFILESIZE),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29019 - in gnunet/src: testbed testing,
gnunet <=