From ffbafef645fd484d3939a35c5bfcb55d80b60898 Mon Sep 17 00:00:00 2001 From: nick black Date: Thu, 15 Jul 2021 20:42:02 -0400 Subject: [PATCH] notcurses_stats: copy only stats, not lock #1914 --- src/lib/notcurses.c | 3 --- src/lib/stats.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/notcurses.c b/src/lib/notcurses.c index 366f5c67d..327f7a76c 100644 --- a/src/lib/notcurses.c +++ b/src/lib/notcurses.c @@ -1066,8 +1066,6 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){ ret->margin_l = opts->margin_l; ret->margin_r = opts->margin_r; ret->cursory = ret->cursorx = -1; - memset(&ret->stats, 0, sizeof(ret->stats)); - memset(&ret->stashed_stats, 0, sizeof(ret->stashed_stats)); reset_stats(&ret->stats.s); reset_stats(&ret->stashed_stats); ret->ttyfp = outfp; @@ -1090,7 +1088,6 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){ free(ret); return NULL; } - memset(&ret->stats.s, 0, sizeof(ret->stats.s)); if(pthread_mutex_init(&ret->stats.lock, NULL)){ pthread_mutex_destroy(&ret->pilelock); free(ret); diff --git a/src/lib/stats.c b/src/lib/stats.c index 4ba521896..4241d263f 100644 --- a/src/lib/stats.c +++ b/src/lib/stats.c @@ -85,7 +85,7 @@ void reset_stats(ncstats* stats){ void notcurses_stats(notcurses* nc, ncstats* stats){ pthread_mutex_lock(&nc->stats.lock); - memcpy(stats, &nc->stats, sizeof(*stats)); + memcpy(stats, &nc->stats.s, sizeof(*stats)); pthread_mutex_unlock(&nc->stats.lock); }