From 919ab48d8e7041b42919ea05deb129ded774bc30 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2020 18:30:42 +0000 Subject: import memstrack-0.1.8-2.el8 --- diff --git a/SOURCES/0001-Fix-TUI-not-responding-on-quit.patch b/SOURCES/0001-Fix-TUI-not-responding-on-quit.patch new file mode 100644 index 0000000..69d720f --- /dev/null +++ b/SOURCES/0001-Fix-TUI-not-responding-on-quit.patch @@ -0,0 +1,25 @@ +From 94423edf9662e15af7e6b1e146bc3e688c7cd538 Mon Sep 17 00:00:00 2001 +From: Kairui Song +Date: Mon, 13 Jul 2020 18:50:28 +0800 +Subject: [PATCH] Fix TUI not responding on quit + +--- + src/tui.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tui.c b/src/tui.c +index a84fe74..726e729 100644 +--- a/src/tui.c ++++ b/src/tui.c +@@ -340,7 +340,7 @@ void tui_loop(void) { + case 'q': + case 'Q': + endwin(); +- /// m_exit(0); ++ m_exit(0); + return; + + case 'm': +-- +2.26.2 + diff --git a/SOURCES/0002-Fix-unittest-failure.patch b/SOURCES/0002-Fix-unittest-failure.patch new file mode 100644 index 0000000..cf17e7c --- /dev/null +++ b/SOURCES/0002-Fix-unittest-failure.patch @@ -0,0 +1,27 @@ +From 41058049dd777f09872c822402913c40edee8e39 Mon Sep 17 00:00:00 2001 +From: Kairui Song +Date: Tue, 14 Jul 2020 01:35:36 +0800 +Subject: [PATCH] Fix unittest failure + +--- + src/tests/unittesdt.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tests/unittesdt.h b/src/tests/unittesdt.h +index b6a4269..2199d9e 100644 +--- a/src/tests/unittesdt.h ++++ b/src/tests/unittesdt.h +@@ -29,6 +29,10 @@ int m_log(int level, const char *__restrict fmt, ...){ + return ret; + } + ++void m_exit(int ret){ ++ return; ++} ++ + void dump_task(struct Task *task) { + printf("Task %s: page_alloc: %ld, peak_alloc_peak: %ld\n", + task->task_name, +-- +2.26.2 + diff --git a/SPECS/memstrack.spec b/SPECS/memstrack.spec index fe788d6..180376d 100644 --- a/SPECS/memstrack.spec +++ b/SPECS/memstrack.spec @@ -5,7 +5,7 @@ Name: memstrack Version: 0.1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A memory allocation tracer, like a hot spot analyzer for memory allocation License: GPLv3 URL: https://github.com/ryncsn/memstrack @@ -14,6 +14,8 @@ BuildRequires: gcc BuildRequires: ncurses-devel Source: https://github.com/ryncsn/memstrack/archive/%{gitcommit}/memstrack-%{gitshortcommit}.tar.gz +Patch0: 0001-Fix-TUI-not-responding-on-quit.patch +Patch1: 0002-Fix-unittest-failure.patch %description A memory allocation tracer, like a hot spot analyzer for memory allocation @@ -21,6 +23,9 @@ A memory allocation tracer, like a hot spot analyzer for memory allocation %prep %setup -q -n memstrack-%{gitcommit} +%patch0 -p1 +%patch1 -p1 + %build %{set_build_flags} make %{?_smp_mflags} @@ -35,6 +40,9 @@ install -p -m 755 memstrack %{buildroot}/%{_bindir} %{_bindir}/memstrack %changelog +* Tue Jul 14 2020 Kairui Song - 0.1.8-2 +- Fix TUI not quiting issue + * Sun Jun 28 2020 Kairui Song - 0.1.8-1 - Bump to latest upstream version, fix some issues and introduce unit test