diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2018-02-08 09:24:55 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-12 11:00:06 +0100 |
| commit | 5f83bd6951df0849f884926cfb25122384ad1dee (patch) | |
| tree | 5623f37876434c29d526f8e9f199aacd6198ffa7 /patches | |
| parent | 78e29837c5342b3c9ca35af7fc87478b7c43024e (diff) | |
| download | ptxdist-5f83bd6951df0849f884926cfb25122384ad1dee.tar.gz ptxdist-5f83bd6951df0849f884926cfb25122384ad1dee.tar.xz | |
htop: version bump 2.0.2 -> 2.1.0
Also add a patch to fix "number of read syscalls of process".
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch | 28 | ||||
| -rw-r--r-- | patches/htop-2.1.0/series | 4 |
2 files changed, 32 insertions, 0 deletions
diff --git a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch new file mode 100644 index 000000000..e1267a32a --- /dev/null +++ b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch @@ -0,0 +1,28 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Wed, 7 Feb 2018 23:16:37 +0100 +Subject: [PATCH] linux/LinuxProcessList: fix reading of number of read + syscalls of process + +The "if" tests if the character at index "5" is 'r', as a first quick +check. However at index "5" will always be a colon ":". This patch fixes +the off-by-one error. htop now shows proper values in the RD_SYSC +column. + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + linux/LinuxProcessList.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c +index 6f2631afa12f..230770258084 100644 +--- a/linux/LinuxProcessList.c ++++ b/linux/LinuxProcessList.c +@@ -436,7 +436,7 @@ static void LinuxProcessList_readIoFile(LinuxProcess* process, const char* dirna + } + break; + case 's': +- if (line[5] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) { ++ if (line[4] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) { + process->io_syscr = strtoull(line+7, NULL, 10); + } else if (strncmp(line+1, "yscw: ", 6) == 0) { + process->io_syscw = strtoull(line+7, NULL, 10); diff --git a/patches/htop-2.1.0/series b/patches/htop-2.1.0/series new file mode 100644 index 000000000..81ca0ba6e --- /dev/null +++ b/patches/htop-2.1.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch +# f87a037f960f427f6ab7ebcbb54e5e4e - git-ptx-patches magic |