|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dool.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dool.spec
^
|
|
|
|
[-]
[+]
|
Added |
_service:tar_git:PR22.patch
^
|
| @@ -0,0 +1,27 @@
+diff --git a/plugins/dool_top_mem.py b/plugins/dool_top_mem.py
+index 1fdabca..23e856e 100644
+--- a/plugins/dool_top_mem.py
++++ b/plugins/dool_top_mem.py
+@@ -20,18 +20,18 @@ def extract(self):
+ for pid in proc_pidlist():
+ try:
+ ### Using dopen() will cause too many open files
+- l = proc_splitline('/proc/%s/stat' % pid)
++ l = proc_splitline('/proc/%s/statm' % pid)
+ except IOError:
+ continue
+
+- if len(l) < 23: continue
+- usage = int(l[23]) * pagesize
++ if len(l) < 2: continue
++ usage = int(l[1]) * pagesize
+
+ ### Is it a new topper ?
+ if usage <= self.val['max']: continue
+
+ self.val['max'] = usage
+- self.val['name'] = getnamebypid(pid, l[1][1:-1])
++ self.val['name'] = getnamebypid(pid, proc_splitline('/proc/%s/comm' % pid)[0:-1])
+ self.val['pid'] = pid
+
+ self.output = '%-*s%s' % (self.width-5, self.val['name'][0:self.width-5], cprint(self.val['max'], 'f', 5, 1024))
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://gitlab.com/nephros/harbour-dstat</param>
<param name="branch">obs</param>
- <param name="revision">0.9.10+obs4</param>
+ <param name="revision">1.0.0+obs1</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dool-1.0.0+obs1.tar.gz/upstream/ChangeLog
^
|
| @@ -1,3 +1,6 @@
+* 1.0.0
+- Initial modern release
+
* 0.8.0 - To be released
- Added Python 3 support
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dool-1.0.0+obs1.tar.gz/upstream/dool
^
|
| @@ -37,7 +37,7 @@
except ImportError:
from collections import Sequence # Python 2.x
-VERSION = '0.9.10'
+VERSION = '1.0.0'
theme = { 'default': '' }
@@ -1845,6 +1845,7 @@
'restore_all' : '\0338',
'linewrap' : '\033[7h',
'nolinewrap' : '\033[7l',
+ 'column_zero' : '\033[0G',
'up' : '\033[1A',
'down' : '\033[1B',
@@ -2842,10 +2843,12 @@
### The first step is to show the definitive line if necessary
newline = ''
if op.update:
+ ### If we are starting a whole new line we \n and reset
if step == 1 and update != 0:
- newline = '\n' + ansi['reset'] + ansi['clearline'] + ansi['save']
+ newline = '\n' + ansi['reset'] + ansi['clearline']
+ ### If we're in a delay we just go to column 0 and overwrite what's there
elif loop != 0:
- newline = ansi['restore']
+ newline = ansi['column_zero'];
### Display header
if showheader:
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dool.yaml
^
|
| @@ -1,19 +1,20 @@
Name: harbour-dool
Summary: Pluggable real-time performance monitoring tool
-Version: 0.9.10
+Version: 1.0.0
Release: 2
Group: Applications/System
URL: https://github.com/scottchiefbaker/dool/
License: GPLv2
Macros:
- 'upstream_name;dool'
- - 'upstream_commit;02b1c69' # << BUMP VERSION HERE
+ - 'upstream_commite;e3b8899' # << BUMP VERSION HERE
Sources:
# https://github.com/scottchiefbaker/dool/archive/%{upstream_commit}.tar.gz
- '%{name}-%{version}.tar.gz'
Patches:
- PR1.patch
- PR2.patch
+ - PR22.patch
Description: |
Dool is a Python3 compatible clone of Dstat.
After Dag Wieers ceased development of Dstat scottchiefbaker forked the
|
