Attachment 166359 Details for Bug 194738 – patch-v2

[patch] patch-v2

htop.diff (text/plain), 6.63 KB, created by Kurt Jaeger on 2016-01-31 17:04:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2016-01-31 17:04:39 UTC

Size: 6.63 KB

patch

obsolete

>diff -r -u -N sysutils/htop/Makefile ../../home/pi/myp/sysutils/htop/Makefile
>--- sysutils/htop/Makefile	2015-08-01 00:46:43.424008000 +0200
>+++ ../../home/pi/myp/sysutils/htop/Makefile	2016-01-31 17:54:42.919407000 +0100
>@@ -3,8 +3,8 @@
> 
> PORTNAME=	htop
> PORTVERSION=	1.0.3
>+DISTVERSIONPREFIX=v
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://hisham.hm/htop/releases/${PORTVERSION}/
> 
> MAINTAINER=	gaod@hychen.org
> COMMENT=	Better top(1) - interactive process viewer
>@@ -22,6 +22,10 @@
> 
> CONFIGURE_ARGS=	--with-proc=/compat/linux/proc --enable-unicode
> USES=		autoreconf ncurses libtool execinfo python:2,build
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	hishamhm
>+GH_PROJECT=	htop
>+GH_TAGNAME=	21da044
> 
> LSOF_RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
> 
>diff -r -u -N sysutils/htop/distinfo ../../home/pi/myp/sysutils/htop/distinfo
>--- sysutils/htop/distinfo	2015-08-01 00:46:43.424708000 +0200
>+++ ../../home/pi/myp/sysutils/htop/distinfo	2016-01-31 17:54:47.134984000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (htop-1.0.3.tar.gz) = 055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829
>-SIZE (htop-1.0.3.tar.gz) = 399306
>+SHA256 (hishamhm-htop-v1.0.3-21da044_GH0.tar.gz) = f00e3b22fb657fa8f84fab9970ad6e3d9a29d716dfc953e0927bdf8335f711fb
>+SIZE (hishamhm-htop-v1.0.3-21da044_GH0.tar.gz) = 142676
>diff -r -u -N sysutils/htop/files/patch-Process.c ../../home/pi/myp/sysutils/htop/files/patch-Process.c
>--- sysutils/htop/files/patch-Process.c	2015-08-01 00:46:43.428025000 +0200
>+++ ../../home/pi/myp/sysutils/htop/files/patch-Process.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- Process.c.orig	2013-04-21 03:33:42.000000000 +0800
>-+++ Process.c	2013-04-21 03:34:27.000000000 +0800
>-@@ -602,7 +602,7 @@
>- bool Process_changePriorityBy(Process* this, size_t delta) {
>-    return Process_setPriority(this, this->nice + delta);
>- }
>--
>-+/*
>- IOPriority Process_updateIOPriority(Process* this) {
>-    IOPriority ioprio = syscall(SYS_ioprio_get, IOPRIO_WHO_PROCESS, this->pid);
>-    this->ioPriority = ioprio;
>-@@ -613,7 +613,7 @@
>-    syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, this->pid, ioprio);
>-    return (Process_updateIOPriority(this) == ioprio);
>- }
>--
>-+*/
>- /*
>- [1] Note that before kernel 2.6.26 a process that has not asked for
>- an io priority formally uses "none" as scheduling class, but the
>diff -r -u -N sysutils/htop/files/patch-Process.h ../../home/pi/myp/sysutils/htop/files/patch-Process.h
>--- sysutils/htop/files/patch-Process.h	2015-08-01 00:46:43.426023000 +0200
>+++ ../../home/pi/myp/sysutils/htop/files/patch-Process.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,16 +0,0 @@
>---- Process.h.orig	2014-10-19 02:06:35.000000000 +0800
>-+++ Process.h	2014-10-19 02:06:49.000000000 +0800
>-@@ -201,11 +201,11 @@
>- bool Process_setPriority(Process* this, int priority);
>- 
>- bool Process_changePriorityBy(Process* this, size_t delta);
>--
>-+/*
>- IOPriority Process_updateIOPriority(Process* this);
>- 
>- bool Process_setIOPriority(Process* this, IOPriority ioprio);
>--
>-+*/
>- /*
>- [1] Note that before kernel 2.6.26 a process that has not asked for
>- an io priority formally uses "none" as scheduling class, but the
>diff -r -u -N sysutils/htop/files/patch-ProcessList.c ../../home/pi/myp/sysutils/htop/files/patch-ProcessList.c
>--- sysutils/htop/files/patch-ProcessList.c	2015-08-01 00:46:43.426689000 +0200
>+++ ../../home/pi/myp/sysutils/htop/files/patch-ProcessList.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- ProcessList.c.orig	2014-10-19 02:09:17.000000000 +0800
>-+++ ProcessList.c	2014-10-19 02:11:07.000000000 +0800
>-@@ -804,8 +804,6 @@
>-       unsigned long long int lasttimes = (process->utime + process->stime);
>-       if (! ProcessList_readStatFile(process, dirname, name, command))
>-          goto errorReadingProcess;
>--      if (this->flags & PROCESS_FLAG_IOPRIO)
>--         Process_updateIOPriority(process);
>-       float percent_cpu = (process->utime + process->stime - lasttimes) / period * 100.0;
>-       process->percent_cpu = MAX(MIN(percent_cpu, cpus*100.0), 0.0);
>-       if (isnan(process->percent_cpu)) process->percent_cpu = 0.0;
>diff -r -u -N sysutils/htop/files/patch-configure.ac ../../home/pi/myp/sysutils/htop/files/patch-configure.ac
>--- sysutils/htop/files/patch-configure.ac	2015-08-01 00:46:43.428687000 +0200
>+++ ../../home/pi/myp/sysutils/htop/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>@@ -1,16 +0,0 @@
>---- configure.ac.orig	2014-10-19 02:12:28.000000000 +0800
>-+++ configure.ac	2014-10-19 02:14:19.000000000 +0800
>-@@ -23,11 +23,12 @@
>- 
>- # Checks for libraries.
>- AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
>-+AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
>- 
>- # Checks for header files.
>- AC_HEADER_DIRENT
>- AC_HEADER_STDC
>--AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[:],[
>-+AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h kvm.h paths.h fcntl.h sys/sysctl.h],[:],[
>-   missing_headers="$missing_headers $ac_header"
>- ])
>- AC_CHECK_HEADERS([execinfo.h],[:],[:])
>diff -r -u -N sysutils/htop/files/patch-htop.c ../../home/pi/myp/sysutils/htop/files/patch-htop.c
>--- sysutils/htop/files/patch-htop.c	2015-08-01 00:46:43.427356000 +0200
>+++ ../../home/pi/myp/sysutils/htop/files/patch-htop.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,36 +0,0 @@
>---- htop.c.orig	2014-10-19 02:15:19.000000000 +0800
>-+++ htop.c	2014-10-19 02:17:10.000000000 +0800
>-@@ -96,7 +96,6 @@
>- #if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY)
>-    { .key = "      a: ", .info = "set CPU affinity" },
>- #endif
>--   { .key = "      i: ", .info = "set IO prority" },
>-    { .key = "      l: ", .info = "list open files with lsof" },
>-    { .key = "      s: ", .info = "trace syscalls with strace" },
>-    { .key = "         ", .info = "" },
>-@@ -856,25 +855,6 @@
>-          }
>-          break;
>-       }
>--      case 'i':
>--      {
>--         Process* p = (Process*) Panel_getSelected(panel);
>--         if (!p) break;
>--         IOPriority ioprio = p->ioPriority;
>--         Panel* ioprioPanel = IOPriorityPanel_new(ioprio);
>--         const char* fuFunctions[] = {"Set    ", "Cancel ", NULL};
>--         void* set = pickFromVector(panel, ioprioPanel, 21, headerHeight, fuFunctions, defaultBar, header);
>--         if (set) {
>--            IOPriority ioprio = IOPriorityPanel_getIOPriority(ioprioPanel);
>--            bool ok = foreachProcess(panel, (ForeachProcessFn) Process_setIOPriority, (size_t) ioprio, NULL);
>--            if (!ok)
>--               beep();
>--         }
>--         Panel_delete((Object*)ioprioPanel);
>--         ProcessList_printHeader(pl, Panel_getHeader(panel));
>--         refreshTimeout = 0;
>--         break;
>--      }
>-       case 'I':
>-       {
>-          refreshTimeout = 0;

Actions: View | Diff

Attachments on bug 194738: 162539 | 166359