diff options
author | LRN <lrn1986@gmail.com> | 2013-12-19 06:00:23 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-12-19 06:00:23 +0000 |
commit | e0ca7357cd0bfedc5c29cb731b56279fef8da059 (patch) | |
tree | ecfd47cf59bc00e656b53fd59c58f5038e342d65 /src/testbed/testbed_api_testbed.c | |
parent | 92fd84dc7ef98452f848a62677c61a2b80b5835e (diff) | |
download | gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.tar.gz gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.zip |
malloc -> new
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 0bad02a7f..cbfc4812d 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -592,7 +592,7 @@ wait_op_completion (void *cls) | |||
592 | if (NULL == rc->peers) | 592 | if (NULL == rc->peers) |
593 | goto cleanup_; | 593 | goto cleanup_; |
594 | rc->shutdown = GNUNET_YES; | 594 | rc->shutdown = GNUNET_YES; |
595 | rcop = GNUNET_malloc (sizeof (struct RunContextOperation)); | 595 | rcop = GNUNET_new (struct RunContextOperation); |
596 | rcop->rc = rc; | 596 | rcop->rc = rc; |
597 | rcop->op = GNUNET_TESTBED_shutdown_peers (rc->c, rcop, NULL, NULL); | 597 | rcop->op = GNUNET_TESTBED_shutdown_peers (rc->c, rcop, NULL, NULL); |
598 | GNUNET_assert (NULL != rcop->op); | 598 | GNUNET_assert (NULL != rcop->op); |
@@ -673,7 +673,7 @@ start_peers_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
673 | rc->pstart_time = GNUNET_TIME_absolute_get (); | 673 | rc->pstart_time = GNUNET_TIME_absolute_get (); |
674 | for (peer = 0; peer < rc->num_peers; peer++) | 674 | for (peer = 0; peer < rc->num_peers; peer++) |
675 | { | 675 | { |
676 | rcop = GNUNET_malloc (sizeof (struct RunContextOperation)); | 676 | rcop = GNUNET_new (struct RunContextOperation); |
677 | rcop->rc = rc; | 677 | rcop->rc = rc; |
678 | rcop->op = GNUNET_TESTBED_peer_start (NULL, rc->peers[peer], NULL, NULL); | 678 | rcop->op = GNUNET_TESTBED_peer_start (NULL, rc->peers[peer], NULL, NULL); |
679 | GNUNET_assert (NULL != rcop->op); | 679 | GNUNET_assert (NULL != rcop->op); |
@@ -782,7 +782,7 @@ create_peers (struct GNUNET_TESTBED_RunHandle *rc) | |||
782 | rc->peer_count = 0; | 782 | rc->peer_count = 0; |
783 | for (peer = 0; peer < rc->num_peers; peer++) | 783 | for (peer = 0; peer < rc->num_peers; peer++) |
784 | { | 784 | { |
785 | rcop = GNUNET_malloc (sizeof (struct RunContextOperation)); | 785 | rcop = GNUNET_new (struct RunContextOperation); |
786 | rcop->rc = rc; | 786 | rcop->rc = rc; |
787 | rcop->op = | 787 | rcop->op = |
788 | GNUNET_TESTBED_peer_create (rc->c, | 788 | GNUNET_TESTBED_peer_create (rc->c, |
@@ -1014,7 +1014,7 @@ register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1014 | /* Start slaves */ | 1014 | /* Start slaves */ |
1015 | for (slave = 0; slave < rc->num_hosts; slave++) | 1015 | for (slave = 0; slave < rc->num_hosts; slave++) |
1016 | { | 1016 | { |
1017 | rcop = GNUNET_malloc (sizeof (struct RunContextOperation)); | 1017 | rcop = GNUNET_new (struct RunContextOperation); |
1018 | rcop->rc = rc; | 1018 | rcop->rc = rc; |
1019 | rcop->op = | 1019 | rcop->op = |
1020 | GNUNET_TESTBED_controller_link (rcop, rc->c, rc->hosts[slave], | 1020 | GNUNET_TESTBED_controller_link (rcop, rc->c, rc->hosts[slave], |
@@ -1253,7 +1253,7 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1253 | unsigned int nhost; | 1253 | unsigned int nhost; |
1254 | 1254 | ||
1255 | GNUNET_assert (num_peers > 0); | 1255 | GNUNET_assert (num_peers > 0); |
1256 | rc = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_RunHandle)); | 1256 | rc = GNUNET_new (struct GNUNET_TESTBED_RunHandle); |
1257 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); | 1257 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); |
1258 | #if ENABLE_SUPERMUC | 1258 | #if ENABLE_SUPERMUC |
1259 | rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg, | 1259 | rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg, |