From d6e66ab9522f626eeb0feea9d9c9c14f06b8d5dd Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Sat, 2 Jun 2018 11:38:54 +0200 Subject: [PATCH] Also correct the task-plot and threadpool-plot outputs for the new updates variable length. --- examples/main.c | 11 ++++++----- src/version.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/main.c b/examples/main.c index 51a340a07a..f47483b1dd 100644 --- a/examples/main.c +++ b/examples/main.c @@ -968,9 +968,10 @@ int main(int argc, char *argv[]) { /* Open file and position at end. */ file_thread = fopen(dumpfile, "a"); - fprintf(file_thread, " %03i 0 0 0 0 %lli %lli %zi %zi %zi 0 0 %lli\n", - myrank, e.tic_step, e.toc_step, e.updates, e.g_updates, - e.s_updates, cpufreq); + fprintf(file_thread, + " %03d 0 0 0 0 %lld %lld %lld %lld %lld 0 0 %lld\n", myrank, + e.tic_step, e.toc_step, e.updates, e.g_updates, e.s_updates, + cpufreq); int count = 0; for (int l = 0; l < e.sched.nr_tasks; l++) { if (!e.sched.tasks[l].implicit && e.sched.tasks[l].toc != 0) { @@ -1006,8 +1007,8 @@ int main(int argc, char *argv[]) { FILE *file_thread; file_thread = fopen(dumpfile, "w"); /* Add some information to help with the plots */ - fprintf(file_thread, " %i %i %i %i %lli %lli %zi %zi %zi %i %lli\n", -2, - -1, -1, 1, e.tic_step, e.toc_step, e.updates, e.g_updates, + fprintf(file_thread, " %d %d %d %d %lld %lld %lld %lld %lld %d %lld\n", + -2, -1, -1, 1, e.tic_step, e.toc_step, e.updates, e.g_updates, e.s_updates, 0, cpufreq); for (int l = 0; l < e.sched.nr_tasks; l++) { if (!e.sched.tasks[l].implicit && e.sched.tasks[l].toc != 0) { diff --git a/src/version.c b/src/version.c index fc0a8653a4..69f70b9aec 100644 --- a/src/version.c +++ b/src/version.c @@ -146,7 +146,7 @@ const char *configuration_options(void) { static int initialised = 0; static const char *config = SWIFT_CONFIG_FLAGS; if (!initialised) { - snprintf(buf, 1024, "'%.1022s'", config); + snprintf(buf, 1024, "'%.1021s'", config); initialised = 1; } return buf; @@ -162,7 +162,7 @@ const char *compilation_cflags(void) { static int initialised = 0; static const char *cflags = SWIFT_CFLAGS; if (!initialised) { - snprintf(buf, 1024, "'%.1022s'", cflags); + snprintf(buf, 1024, "'%.1021s'", cflags); initialised = 1; } return buf; -- GitLab