diff options
author | xrs <xrs@mail36.net> | 2020-06-17 22:07:39 +0200 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2020-06-17 22:07:39 +0200 |
commit | 49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d (patch) | |
tree | 71830c1751e291e45795958cad15e9dfa8239e1a /src/testbed | |
parent | b9333fef25b57bdd7f556f5fb73f9abaef9bc5ef (diff) | |
parent | e500e9ec3678dfbb666d173854c134ac3858f8b1 (diff) | |
download | gnunet-49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d.tar.gz gnunet-49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d.zip |
Merge branch 'master' into rewrite_of_cadet_test
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/gnunet-service-testbed_cpustatus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index e96449def..2d490ba8c 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c | |||
@@ -568,7 +568,7 @@ sample_load_task (void *cls) | |||
568 | ld_cpu, ld_disk, mem_usage, nproc); | 568 | ld_cpu, ld_disk, mem_usage, nproc); |
569 | if (0 < nbs) | 569 | if (0 < nbs) |
570 | { | 570 | { |
571 | GNUNET_BIO_write (bw, str, nbs); | 571 | GNUNET_BIO_write (bw, "sample load task", str, nbs); |
572 | } | 572 | } |
573 | else | 573 | else |
574 | GNUNET_break (0); | 574 | GNUNET_break (0); |
@@ -612,7 +612,7 @@ GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
612 | hostname, (intmax_t) getpid ()); | 612 | hostname, (intmax_t) getpid ()); |
613 | GNUNET_free (stats_dir); | 613 | GNUNET_free (stats_dir); |
614 | GNUNET_free (hostname); | 614 | GNUNET_free (hostname); |
615 | if (NULL == (bw = GNUNET_BIO_write_open (fn))) | 615 | if (NULL == (bw = GNUNET_BIO_write_open_file (fn))) |
616 | { | 616 | { |
617 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 617 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
618 | _ ("Cannot open %s for writing load statistics. " | 618 | _ ("Cannot open %s for writing load statistics. " |
@@ -656,7 +656,7 @@ GST_stats_destroy () | |||
656 | GNUNET_SCHEDULER_cancel (sample_load_task_id); | 656 | GNUNET_SCHEDULER_cancel (sample_load_task_id); |
657 | sample_load_task_id = NULL; | 657 | sample_load_task_id = NULL; |
658 | } | 658 | } |
659 | GNUNET_break (GNUNET_OK == GNUNET_BIO_write_close (bw)); | 659 | GNUNET_break (GNUNET_OK == GNUNET_BIO_write_close (bw, NULL)); |
660 | bw = NULL; | 660 | bw = NULL; |
661 | } | 661 | } |
662 | 662 | ||