Changes - SailfishOS Open Build Service

Changes of Revision 5

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:harbour-dool.spec
@@ -9,7 +9,7 @@ # << macros Summary: Pluggable real-time performance monitoring tool -Version: 1.0.0+obs3 +Version: 1.1.0+obs1 Release: 3 Group: Applications/System License: GPLv2
[-] [+]	Changed	_service ^
@@ -1,8 +1,8 @@ <services> <service name="tar_git"> <param name="url">https://github.com/sailfishos-chum/dool</param> - <param name="branch"></param> - <param name="revision">1.0.0+obs3</param> + <param name="branch">master</param> + <param name="revision">1.1.0+obs1</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/.travis.yml ^
@@ -1,14 +0,0 @@ -sudo: false -language: python -python: -- "2.6" -- "2.7" -- "3.5" -- "3.6" -#install: -# - pip install dbus-python -# - pip install python-utmp -script: - - python ./dstat --version - - python ./dstat -taf 1 5 - - python ./dstat -t --all-plugins 1 5
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/LINKS ^
@@ -1,12 +0,0 @@ -Terminal emulation -http://www.termsys.demon.co.uk/vtansi.htm -http://vt100.net/docs/vt100-ug/chapter3.html#DECSC - -NFS -http://www.hn.edu.cn/book/NetWork/NetworkingBookshelf_2ndEd/nfs/ch14_02.htm - -MySQL performance counters -http://www.mysql.com/news-and-events/newsletter/2004-01/a0000000301.html - -Kernel schedstat -http://eaglet.rain.com/rick/linux/schedstat/v10/format-10.html
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/TODO ^
@@ -1,90 +0,0 @@ -### Disclaimer -This is my TODO list. If you're interested in one of these features, there -are 2 options. Either wait for someone to implement it or sponsor someone -to implement it. - -If you want to implement something, please contact me first so that we can -discuss acceptable implementations. In some cases I haven't thought about -it too deeply, but for others I know exactly what I require. - -If you have other nice ideas that you think would be an improvement, please -contact me as well. :) Send an email to: Dag Wieers <dag@wieers.com> - -### Usability -+ Add --config option and use /etc/dstat.conf and ~/.dstat to influence output (see example dstat.conf) -+ Allow to force to given magnitude (--unit=kilo) -+ Look at possibilities to show deviation (on second line ? not practical) -+ Check for dark/light background color and change colors accordingly (option --bw/--blackonwhite) -+ Show parts of counters in other colors (eg. color the 6 in 6134B in yellow to indicate it's kilobyte) -+ Look into adding sched_setscheduler() calls for improved priority - -### General improvements -+ Implement better (?) protection against counter rollovers - (see mail from Sebastien Prud'homme/Ross Brattain, already improved in meantime) - -### Documentation (help welcome!) -+ Document every plugin as part of python comments (explain unit, what it means etc...) -+ Create document on general system performance tuning - (explaining the different values in /proc, especially the concerning ones) -+ Create document on general system performance tools - (explaining the different uses of tools like dstat, iostat, pmap, strace, tcpdump) -+ Comply to PEP8: http://www.python.org/dev/peps/pep-0008/ - -### Export/Graph -+ Interface with rrdtool (python-rrd ?) -+ Allow for different types of export modules (only CSV now) - - ODS could include graphs for plugins ! - - HTML output plugin helps for people sharing output on websites -+ Allow to write out to syslog (or remote syslog) -+ Allow to write buffered to disk (optional ?) -+ Write out user input to CSV - -### Plugin improvements -+ Don't calculate counters twice when a plugin is loaded twice - -### Extending statistics (help welcome!) -+ Add %steal, %guest to --cpu-adv plugin -+ Add slab plugin (see /proc/slabinfo and slabtop) -+ Add xorg plugin (xdpyinfo, xrestop) - - Add 'most expensive X app' (look at xrestop) - - Add number of (active) X sessions and X clients -+ Add icmp plugin ? -+ Add application plugin (-a or -A pid,cmd) -+ Add user plugin (number of users logged on, utmp is not that useful, /proc/key-users) -+ Look into interfacing with apps - - amavisd, apache, bind, cifs, dhcpd, dnsmasq, gfs, samba, squid -+ Look into interfacing with specific HW counters in /proc - - qla2300 -+ Look at /proc/meminfo, /proc/mdstat, /proc/net/netstat, /proc/net/snmp, /proc/vmstat, /proc/drbd -+ Look at /proc/fs/cifs/stats -+ Add i2c plugin (see /sys/class/i2c-adapter/i2c-/////) -+ Allow for SNMP counters to be added -+ Add LVM stats -+ Allow to have multiple '1st expensive ... app' and '2nd expensive ... app' -+ Add 'most iowaiting app' plugin -+ Add systemtap/perf integration -+ Add dropwatch statistics - -### Plugin issues -+ plugins that use /proc/pid/stats are reasonably slow (implement in C might help) -+ disk plugin: /proc/partitions can have negative numbers, seen on systems with long uptime. dstat handles this except for calculating the very first stat, no work-around possible? -+ proc plugin: (run and blk) does not work on 2.4.24+ (to be confirmed ?) -+ tcp plugin: is very slow and generates lots of softirqs (on busy systems), to be confirmed - -### Redesign (v1.0) -+ Create a nicer interface for plugins (with meaningful names, eg. not nick) - -### Redesign (v2.0) -+ Create modules that can contain samples of different units - - CPU: (see mpstat) - sys, usr, idl, iow, hiq, siq (percentage) - intr/sec (int) - - IO: (see iostat -x) - tps (int) - blk_read/sec, blk_wrtn/sec (kB/sec) - -+ Design proper object model and namespace for _all_ possible stats -+ Create a seperate curses-based tool, much like nmon (dstat stays line-based) -+ Create client/server monitoring tool
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/dool.conf ^
@@ -1,64 +0,0 @@ -### Dstat configuration file - -### BEWARE: This file is not yet functional, it's a prototype -### to experiment and find the best syntax for a future dstat - -[main] -interval = 5 -diff = 1 -colors = true -abs = false -noheader = true -noupdate = true -default-options = -cdns -unit = k -background = light -update-method = interval-average # snapshot total-average last-n-average - -[colors] -default = red yellow green blue magenta cyan white darkred darkgreen -dark = darkred darkyellow darkgreen darkblue darkmagenta darkcyan silver red green -percentage = red yellow green - -[cpu] -show = user sys idle wait - -[ints] -show = 5 9 10 14 15 - -[disk] -show = hda hdc lores hires total - -[diskset] -lores = sd[b-t] -hires = sd[u-z] sda[a-d] -total = sd[b-z] sda[a-d] - -[load] -show = 1 5 15 - -[mem] -show = used buffers cache free - -[net] -show = bond0 eth0 eth1 -#show = bond? eth? - -[proc] -show = run blocked - -[swap] -show = in out - -[sys] -show = int int - -[custom] -load1 = file:///proc/loadavg, line 1, column 1, format %4f -load5 = file:///proc/loadavg, line 1, column 2, format %4f -load15 = file:///proc/loadavg, line 1, column 3, format %4f -int11 = file:///proc/stat, re "^intr ", column 5, format %4d -lo-in = file:///proc/net/dev, re "^lo: ", column 3, format %4d -lo-out = file:///proc/net/dev, re "^lo: ", column 10, format %4d -eth1 = file:///proc/net/dev, re "^eth1: \d+ (\d+) \d+ \d+ \d+ \d+ \d+ \d+ (\d+)", format %4d -switch = snmp://127.0.0.1/net.tcp, format %4d
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/proc/diskstats-2.6.11 ^
@@ -1,92 +0,0 @@ - 1 0 ram0 0 0 0 0 0 0 0 0 0 0 0 - 1 1 ram1 0 0 0 0 0 0 0 0 0 0 0 - 1 2 ram2 0 0 0 0 0 0 0 0 0 0 0 - 1 3 ram3 0 0 0 0 0 0 0 0 0 0 0 - 1 4 ram4 0 0 0 0 0 0 0 0 0 0 0 - 1 5 ram5 0 0 0 0 0 0 0 0 0 0 0 - 1 6 ram6 0 0 0 0 0 0 0 0 0 0 0 - 1 7 ram7 0 0 0 0 0 0 0 0 0 0 0 - 1 8 ram8 0 0 0 0 0 0 0 0 0 0 0 - 1 9 ram9 0 0 0 0 0 0 0 0 0 0 0 - 1 10 ram10 0 0 0 0 0 0 0 0 0 0 0 - 1 11 ram11 0 0 0 0 0 0 0 0 0 0 0 - 1 12 ram12 0 0 0 0 0 0 0 0 0 0 0 - 1 13 ram13 0 0 0 0 0 0 0 0 0 0 0 - 1 14 ram14 0 0 0 0 0 0 0 0 0 0 0 - 1 15 ram15 0 0 0 0 0 0 0 0 0 0 0 - 3 0 hda 701516 942900 12172907 6225444 284041 770510 6545342 14685351 0 3033115 20954254 - 3 1 hda1 51 73 0 0 - 3 2 hda2 970571 970620 265871 265871 - 3 3 hda3 3 6 0 0 - 3 5 hda5 633013 10305474 647709 5181672 - 3 6 hda6 22653 181209 51758 414064 - 3 7 hda7 4505 538299 1 8 - 3 8 hda8 1075 32107 1 8 - 3 9 hda9 4685 80135 90117 683719 - 22 0 hdc 3699 183366 748408 154422 0 0 0 0 0 153383 154422 - 9 0 md0 0 0 0 0 0 0 0 0 0 0 0 - 253 0 dm-0 0 0 0 0 0 0 0 0 0 0 0 - 7 0 loop0 0 0 0 0 0 0 0 0 0 0 0 - 7 1 loop1 0 0 0 0 0 0 0 0 0 0 0 - 7 2 loop2 0 0 0 0 0 0 0 0 0 0 0 - 7 3 loop3 0 0 0 0 0 0 0 0 0 0 0 - 7 4 loop4 0 0 0 0 0 0 0 0 0 0 0 - 7 5 loop5 0 0 0 0 0 0 0 0 0 0 0 - 7 6 loop6 0 0 0 0 0 0 0 0 0 0 0 - 7 7 loop7 0 0 0 0 0 0 0 0 0 0 0 - 7 8 loop8 0 0 0 0 0 0 0 0 0 0 0 - 7 9 loop9 0 0 0 0 0 0 0 0 0 0 0 - 7 10 loop10 0 0 0 0 0 0 0 0 0 0 0 - 7 11 loop11 0 0 0 0 0 0 0 0 0 0 0 - 7 12 loop12 0 0 0 0 0 0 0 0 0 0 0 - 7 13 loop13 0 0 0 0 0 0 0 0 0 0 0 - 7 14 loop14 0 0 0 0 0 0 0 0 0 0 0 - 7 15 loop15 0 0 0 0 0 0 0 0 0 0 0 - 7 16 loop16 0 0 0 0 0 0 0 0 0 0 0 - 7 17 loop17 0 0 0 0 0 0 0 0 0 0 0 - 7 18 loop18 0 0 0 0 0 0 0 0 0 0 0 - 7 19 loop19 0 0 0 0 0 0 0 0 0 0 0 - 7 20 loop20 0 0 0 0 0 0 0 0 0 0 0 - 7 21 loop21 0 0 0 0 0 0 0 0 0 0 0 - 7 22 loop22 0 0 0 0 0 0 0 0 0 0 0 - 7 23 loop23 0 0 0 0 0 0 0 0 0 0 0 - 7 24 loop24 0 0 0 0 0 0 0 0 0 0 0 - 7 25 loop25 0 0 0 0 0 0 0 0 0 0 0 - 7 26 loop26 0 0 0 0 0 0 0 0 0 0 0 - 7 27 loop27 0 0 0 0 0 0 0 0 0 0 0 - 7 28 loop28 0 0 0 0 0 0 0 0 0 0 0 - 7 29 loop29 0 0 0 0 0 0 0 0 0 0 0 - 7 30 loop30 0 0 0 0 0 0 0 0 0 0 0 - 7 31 loop31 0 0 0 0 0 0 0 0 0 0 0 - 7 32 loop32 0 0 0 0 0 0 0 0 0 0 0 - 7 33 loop33 0 0 0 0 0 0 0 0 0 0 0 - 7 34 loop34 0 0 0 0 0 0 0 0 0 0 0 - 7 35 loop35 0 0 0 0 0 0 0 0 0 0 0 - 7 36 loop36 0 0 0 0 0 0 0 0 0 0 0 - 7 37 loop37 0 0 0 0 0 0 0 0 0 0 0 - 7 38 loop38 0 0 0 0 0 0 0 0 0 0 0 - 7 39 loop39 0 0 0 0 0 0 0 0 0 0 0 - 7 40 loop40 0 0 0 0 0 0 0 0 0 0 0 - 7 41 loop41 0 0 0 0 0 0 0 0 0 0 0 - 7 42 loop42 0 0 0 0 0 0 0 0 0 0 0 - 7 43 loop43 0 0 0 0 0 0 0 0 0 0 0 - 7 44 loop44 0 0 0 0 0 0 0 0 0 0 0 - 7 45 loop45 0 0 0 0 0 0 0 0 0 0 0 - 7 46 loop46 0 0 0 0 0 0 0 0 0 0 0 - 7 47 loop47 0 0 0 0 0 0 0 0 0 0 0 - 7 48 loop48 0 0 0 0 0 0 0 0 0 0 0 - 7 49 loop49 0 0 0 0 0 0 0 0 0 0 0 - 7 50 loop50 0 0 0 0 0 0 0 0 0 0 0 - 7 51 loop51 0 0 0 0 0 0 0 0 0 0 0 - 7 52 loop52 0 0 0 0 0 0 0 0 0 0 0 - 7 53 loop53 0 0 0 0 0 0 0 0 0 0 0 - 7 54 loop54 0 0 0 0 0 0 0 0 0 0 0 - 7 55 loop55 0 0 0 0 0 0 0 0 0 0 0 - 7 56 loop56 0 0 0 0 0 0 0 0 0 0 0 - 7 57 loop57 0 0 0 0 0 0 0 0 0 0 0 - 7 58 loop58 0 0 0 0 0 0 0 0 0 0 0 - 7 59 loop59 0 0 0 0 0 0 0 0 0 0 0 - 7 60 loop60 0 0 0 0 0 0 0 0 0 0 0 - 7 61 loop61 0 0 0 0 0 0 0 0 0 0 0 - 7 62 loop62 0 0 0 0 0 0 0 0 0 0 0 - 7 63 loop63 0 0 0 0 0 0 0 0 0 0 0
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/proc/partitions-2.4.21 ^
@@ -1,21 +0,0 @@ -major minor #blocks name rio rmerge rsect ruse wio wmerge wsect wuse running use aveq - - 22 0 20094480 hdc 18502 68378 614922 575620 63 16 632 660 -9 28571324 42702177 - 22 1 48163 hdc1 46 70 232 620 0 0 0 0 0 310 620 - 22 2 5116702 hdc2 15272 58372 588450 543550 63 16 632 660 0 31290 544240 - 22 3 5116702 hdc3 46 70 232 620 0 0 0 0 0 310 620 - 22 4 1 hdc4 0 0 0 0 0 0 0 0 0 0 0 - 22 5 5116671 hdc5 46 70 232 540 0 0 0 0 0 280 540 - 22 6 2562336 hdc6 46 70 232 610 0 0 0 0 0 310 610 - 22 7 514048 hdc7 46 70 232 580 0 0 0 0 0 290 580 - 22 8 265041 hdc8 58 98 312 360 0 0 0 0 0 180 360 - 22 9 1349428 hdc9 46 70 232 320 0 0 0 0 0 160 320 - 3 0 80043264 hda 165456390 118310028 -2026323812 11081595 319064897 471719179 2045961426 3973385 -6386 23654554 26608111 - 3 1 1020096 hda1 1022946 359030 11055850 13886300 18524433 42441169 487840520 19795761 0 15952587 33844701 - 3 2 33792727 hda2 16867355 41487758 466839562 3680943 49279950 136588121 1489574368 3787 0 7851978 6830330 - 3 3 20482875 hda3 21222823 25575094 374388250 40543161 47823459 36322836 675746654 7388934 0 15848238 6467323 - 3 4 1 hda4 0 0 0 0 0 0 0 0 0 0 0 - 3 5 19968763 hda5 12553421 16972432 236204218 36866208 132089301 133660978 2128837078 24946643 0 4783292 19031628 - 3 6 3068383 hda6 2219407 1764003 31864346 28167600 15941594 29654857 365639372 10253628 0 18729247 38579828 - 3 7 1020096 hda7 39200 370913 3278858 960450 939530 2371952 26950130 41566540 0 10284610 42535080 - 3 8 522081 hda8 111525236 31538692 1144516184 15779080 54466614 90679266 1166340568 28867099 0 7075683 3835907
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/proc/partitions-2.4.24 ^
@@ -1,12 +0,0 @@ -major minor #blocks name rio rmerge rsect ruse wio wmerge wsect wuse running use aveq - - 22 0 4224150 ide/host0/bus1/target0/lun0/disc 24958 39400 473150 343900 53587 23309 500312 5447730 0 380490 5795870 - 22 1 1023876 ide/host0/bus1/target0/lun0/part1 3592 4076 61498 43970 27109 5490 261392 546010 0 110060 590040 - 22 2 130882 ide/host0/bus1/target0/lun0/part2 1 0 8 10 0 0 0 0 0 10 10 - 22 3 2047815 ide/host0/bus1/target0/lun0/part3 16859 32873 397730 253060 21988 2699 199512 3131240 0 277340 3388480 - 22 4 1021545 ide/host0/bus1/target0/lun0/part4 4505 2448 13906 46850 4490 15120 39408 1770480 0 73390 1817330 - 3 0 8257032 ide/host0/bus0/target0/lun0/disc 1 3 8 10 0 0 0 0 0 10 10 - 3 1 2048256 ide/host0/bus0/target0/lun0/part1 0 0 0 0 0 0 0 0 0 0 0 - 3 2 3068415 ide/host0/bus0/target0/lun0/part2 0 0 0 0 0 0 0 0 0 0 0 - 3 3 1534207 ide/host0/bus0/target0/lun0/part3 0 0 0 0 0 0 0 0 0 0 0 - 3 4 1598467 ide/host0/bus0/target0/lun0/part4 0 0 0 0 0 0 0 0 0 0 0
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/proc/partitions-2.6.11 ^
@@ -1,56 +0,0 @@ -major minor #blocks name - - 3 0 78150744 hda - 3 1 4611568 hda1 - 3 2 3591000 hda2 - 3 3 1 hda3 - 3 5 11801128 hda5 - 3 6 536728 hda6 - 3 7 6168928 hda7 - 3 8 6191608 hda8 - 3 9 45249592 hda9 - 253 0 4587520 dm-0 - 7 0 652862 loop0 - 7 1 653886 loop1 - 7 2 506174 loop2 - 7 3 631824 loop3 - 7 4 652852 loop4 - 7 5 651854 loop5 - 7 6 395278 loop6 - 7 7 652478 loop7 - 7 8 653444 loop8 - 7 9 652756 loop9 - 7 10 619972 loop10 - 7 11 137586 loop11 - 7 12 666538 loop12 - 7 13 659278 loop13 - 7 14 152052 loop14 - 7 15 157376 loop15 - 7 16 636162 loop16 - 7 17 649870 loop17 - 7 18 201976 loop18 - 7 19 102298 loop19 - 7 20 596550 loop20 - 7 21 250010 loop21 - 7 22 4332 loop22 - 7 23 47104 loop23 - 7 24 145808 loop24 - 7 25 640022 loop25 - 7 26 653232 loop26 - 7 27 208950 loop27 - 7 28 164716 loop28 - 7 29 641798 loop29 - 7 30 645894 loop30 - 7 31 614270 loop31 - 7 32 177882 loop32 - 7 33 594366 loop33 - 7 34 649578 loop34 - 7 35 641730 loop35 - 7 36 242246 loop36 - 7 37 205478 loop37 - 7 38 631000 loop38 - 7 39 653880 loop39 - 7 40 653894 loop40 - 7 41 183950 loop41 - 7 42 63614 loop42 - 7 43 157376 loop43
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/proc/stat-2.4.21 ^
@@ -1,11 +0,0 @@ -cpu 83497797 33759 24080131 1872241329 58643672 2895401 1573921 -cpu0 83497797 33759 24080131 1872241329 58643672 2895401 1573921 -page 1138148875 1022982406 -swap 143064392 145792094 -intr 696424900 2042966010 2 0 0 0 0 0 0 1 0 0 2463880312 0 0 484527294 18577 -disk_io: (3,0):(486355229,165458063,2268642596,320897166,2045955946) -ctxt 3597668172 -btime 1096375576 -processes 31542089 -procs_running 1 -procs_blocked 1
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/proc/stat-2.4.24 ^
@@ -1,9 +0,0 @@ -cpu 421667 648 73528 27329820 -cpu0 421667 648 73528 27329820 -page 582900 3939237 -swap 46 142 -intr 29160226 27825663 2 0 0 0 0 2 0 0 0 897241 0 0 0 437314 4 -disk_io: (3,0):(440938,35718,1165792,405220,7878474) -ctxt 2787728 -btime 1116449546 -processes 49298
[-] [+]	Deleted	_service:tar_git:harbour-dool-1.0.0+obs3.tar.gz/upstream/proc/stat-2.6.11 ^
@@ -1,8 +0,0 @@ -cpu 2185800 2819 824286 21360661 305445 13332 0 0 -cpu0 2185800 2819 824286 21360661 305445 13332 0 0 -intr 274063051 246960995 390491 0 4 4 21162475 0 2 7 2135609 1 677108 1623104 0 985826 127425 -ctxt 327578142 -btime 1116552999 -processes 76650 -procs_running 1 -procs_blocked 0
[-] [+]	Changed	_service:tar_git:harbour-dool-1.1.0+obs1.tar.gz/upstream/README.md ^
@@ -1,15 +1,62 @@ # Dool -Dool is a Python3 compatible clone of [Dstat](https://github.com/dagwieers/dstat). +Dool is a Python3 compatible fork of [Dstat](https://github.com/dagwieers/dstat). -After Dag Wieers ceased development of Dstat I forked the project to continue development. Dool is a Python 2.x and 3.x compatible version of Dstat with a couple minor bug fixes. +After Dag Wieers ceased development of Dstat I forked the project to continue +development. -### Usage +## What is Dool? -Show the default monitoring modules every second +Dool is a command line tool to monitor many aspects of your system: CPU, +Memory, Network, Load Average, etc. It also includes a robust plug-in +architecture to allow monitoring other system metrics. - dool +### Installation: -Show more detailed statistics every fifteen seconds +1. Download the [latest release](https://github.com/scottchiefbaker/dool/releases) archive file or clone the Git repo +2. Extract the archive to an appropriate temporary directory on your system +3. Run the `install.py` script + +### Usage: + + dool [--preset] [--plugin] [delay] + +My most common usage of Dool is: + + dool --more 15 + +which uses the `--more` preset and outputs data every 15 seconds. Available +presets are `--defaults`, `--more`, or `--all`. If no delay is specified, +Dool will default to outputting every second. + +### Screenshots: + +Dark mode (default) +![Dool Light](https://user-images.githubusercontent.com/3429760/192394845-bb4790b9-0a67-4137-90a2-87efcfc1014e.png) + +Light mode +![Dool Light](https://user-images.githubusercontent.com/3429760/192389235-9cf5e4a5-cec2-42d9-a116-bcd9dd4e688d.png) + +### Plugins: + +Dool ships with many plug-ins to configure the output to your taste. + + dool --cpu --net --time --full 15 # Show CPU usage, and each network interface + dool --disk --memory 5 # Show disk totals, and memory consumption + dool --cpu --load --swap --time 60 # Show CPU, load, and swap + +A list of available plug-ins are available if you run `dool --version` + +### Note: + +Dool requires a 256 color compatible terminal. Most modern terminal emulators +support this automatically. + +### See also: + +Other tools similar to Dool + +* [htop](https://htop.dev/) +* [btop](https://github.com/aristocratos/btop) +* [iotop](https://github.com/Tomas-M/iotop) - dool --all 15
[-] [+]	Changed	_service:tar_git:harbour-dool-1.1.0+obs1.tar.gz/upstream/docs/dool.1 ^
@@ -1,5 +1,6 @@ '\" t .\" Title: dool +.\" Author: Scott Baker <scott@perturb.org> .\" Author: Dag Wieers <dag@wieers.com> .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: August 2014 @@ -7,7 +8,7 @@ .\" Source: \ \& 0.7.3 .\" Language: English .\" -.TH "DOOL" "1" "August 2014" "\ \& 0\&.7\&.3" "\ \&" +.TH "DOOL" "1" "August 2014" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -261,7 +262,12 @@ .PP \-\-bits .RS 4 -force bits for values expressed in bytes +force output values in bits (default) +.RE +.PP +\-\-bytes +.RS 4 +force output values in bytes .RE .PP \-\-float @@ -305,6 +311,11 @@ .RS 4 show profiling statistics when exiting dool .RE +.PP +\-\-ascii +.RS 4 +output using only ASCII characters +.RE .SH "PLUGINS" .sp While anyone can create their own dool plugins (and contribute them) dool ships with a number of plugins already that extend its capabilities greatly\&. Here is an overview of the plugins dool ships with: @@ -807,7 +818,7 @@ .\} .SH "BUGS" .sp -Since it is practically impossible to test dool on every possible permutation of kernel, python or distribution version, I need your help and your feedback to fix the remaining problems\&. If you have improvements or bugreports, please send them to: \m[blue]\fBdag@wieers\&.com\fR\m[]\&\s-2\u[1]\d\s+2 +Since it is practically impossible to test dool on every possible permutation of kernel, Python or distribution version, I need your help and your feedback to fix the remaining problems\&. If you have improvements or bugreports, please report them on GitHub: https://github.com/scottchiefbaker/dool .if n \{\ .sp .\} @@ -817,13 +828,6 @@ .nr an-break-flag 1 .br .ps +1 -\fBNote\fR -.ps -1 -.br -.sp -Please see the TODO file for known bugs and future plans\&. -.sp .5v -.RE .SH "FILES" .sp Paths that may contain external dool_*\&.py plugins: @@ -1011,27 +1015,9 @@ .if n \{\ .RE .\} -.SH "AUTHOR" -.sp -Written by Dag Wieers \m[blue]\fBdag@wieers\&.com\fR\m[]\&\s-2\u[1]\d\s+2 +.SH "URL" .sp -Homepage at \m[blue]\fBhttp://dag\&.wieers\&.com/home\-made/dool/\fR\m[] +https://github.com/scottchiefbaker/dool/ .sp -This manpage was initially written by Andrew Pollock \m[blue]\fBapollock@debian\&.org\fR\m[]\&\s-2\u[2]\d\s+2 for the Debian GNU/Linux system\&. -.SH "AUTHOR" -.PP -\fBDag Wieers\fR <\&dag@wieers\&.com\&> -.RS 4 -Author. -.RE .SH "NOTES" -.IP " 1." 4 -dag@wieers.com -.RS 4 -\%mailto:dag@wieers.com -.RE -.IP " 2." 4 -apollock@debian.org -.RS 4 -\%mailto:apollock@debian.org -.RE +This manpage was originally written by Andrew Pollock apollock@debian\&.org for the Debian GNU/Linux system\&.
[-] [+]	Changed	_service:tar_git:harbour-dool-1.1.0+obs1.tar.gz/upstream/dool ^
@@ -37,7 +37,7 @@ except ImportError: from collections import Sequence # Python 2.x -VERSION = '1.0.0' +VERSION = '1.1.0' theme = { 'default': '' } @@ -81,6 +81,7 @@ self.output = False self.pidfile = False self.profile = '' + self.use_ascii = False ### List of available plugins allplugins = listplugins() @@ -106,12 +107,13 @@ ['all', 'all-plugins', 'bits', 'bw', 'bytes', 'black-on-white', 'color', 'defaults', 'debug', 'filesystem', 'float', 'full', 'help', 'integer', 'list', 'mods', 'modules', 'more', 'nocolor', 'noheaders', 'noupdate', - 'output=', 'pidfile=', 'profile', 'version', 'vmstat'] + allplugins) + 'output=', 'pidfile=', 'profile', 'version', 'vmstat', 'ascii'] + allplugins) except getopt.error as exc: print('dool: %s, try dool -h for a list of all the options' % exc) sys.exit(1) default_plugins = [ 'cpu', 'disk', 'net', 'load' ] + plugin_defaults = 0 for opt, arg in opts: @@ -176,6 +178,8 @@ self.bits = False elif opt in ['--bits']: self.bits = True + elif opt in ['--ascii']: + self.use_ascii = True elif opt in ['--bw', '--black-on-white', '--blackonwhite']: self.blackonwhite = True elif opt in ['--color']: @@ -279,10 +283,10 @@ showplugins() def usage(self): - print('Usage: dool [-afv] [options..] [delay [count]]') + print('Usage: dool [options] [delay] [count]') def help(self): - print('''Versatile tool for generating system resource statistics) + print('''\nVersatile tool for generating system resource statistics Dool options: -c, --cpu enable cpu stats @@ -327,6 +331,7 @@ -v, --vmstat equals -pmgdsc -D total --bits force bits for values expressed in bytes + --bytes force bytes for output measurements --float force float values on screen --integer force integer values on screen @@ -337,6 +342,7 @@ --noupdate disable intermediate updates --output file write CSV output to file --profile show profiling statistics when exiting dool + --ascii output table in ascii not unicode box drawing delay is the delay in seconds between each update (default: 1) count is the number of updates to display before exiting (default: unlimited) @@ -462,17 +468,19 @@ def title(self): ret = theme['title'] + if isinstance(self.name, string_types): width = self.statwidth() - return ret + self.name[0:width].center(width).replace(' ', '-') + theme['default'] + return ret + self.name[0:width].center(width).replace(' ', char['dash']) + theme['default'] for i, name in enumerate(self.name): width = self.colwidth() - ret = ret + name[0:width].center(width).replace(' ', '-') + ret = ret + name[0:width].center(width).replace(' ', char['dash']) if i + 1 != len(self.vars): if op.color: ret = ret + theme['frame'] + char['dash'] + theme['title'] else: ret = ret + char['space'] + return ret def subtitle(self): @@ -502,7 +510,7 @@ # If it's not the last one if i + 1 != len(self.name): - ret += theme['frame'] + char['colon'] + ansi['reset'] + ret += theme['subtitle'] + char['space'] + ansi['reset'] else: ret += ansi['reset'] @@ -572,7 +580,7 @@ if isinstance(self.val[name], Sequence) and not isinstance(self.val[name], string_types): line = line + cprintlist(self.val[name], ctype, self.width, scale) - sep = theme['frame'] + char['colon'] + sep = theme['subtitle'] + char['colon'] + ansi['reset'] if i + 1 != len(self.vars): line = line + sep @@ -1352,8 +1360,8 @@ class dool_mem(dstat): def __init__(self): self.name = 'memory usage' - self.nick = ('used', 'free', 'buff', 'cach') - self.vars = ('MemUsed', 'MemFree', 'Buffers', 'Cached') + self.nick = ('used', 'free', 'cach', 'avai') + self.vars = ('MemUsed', 'MemFree', 'Cached', 'MemAvailable') self.open('/proc/meminfo') def extract(self): @@ -1367,7 +1375,11 @@ if name in adv_extract_vars: adv_val[name] = int(l[1]) * 1024.0 - self.val['MemUsed'] = adv_val['MemTotal'] - self.val['MemFree'] - self.val['Buffers'] - self.val['Cached'] - adv_val['SReclaimable'] + adv_val['Shmem'] + # Original math + #self.val['MemUsed'] = adv_val['MemTotal'] - self.val['MemFree'] - self.val['Buffers'] - self.val['Cached'] - adv_val['SReclaimable'] + adv_val['Shmem'] + + # New math that is closer to the `free` output + self.val['MemUsed'] = adv_val['MemTotal'] - self.val['MemFree'] - self.val['Cached'] - adv_val['SReclaimable'] class dool_mem_adv(dool_mem): """ @@ -1864,6 +1876,14 @@ 'plus' : '+', 'underscore' : '_', 'sep' : ',', + 'title_sep' : '\|', +} + +char_box_draw = { + 'pipe' : u'\u2502', + 'dash' : u'\u2504', + 'title_sep' : u'\u252c', + 'colon' : u'\u250a', } def set_theme(): @@ -2257,7 +2277,7 @@ for o in vislist: line += o.title() if o is not vislist[-1]: - line += theme['frame'] + char['space'] + line += theme['frame'] + char['title_sep'] elif totlist != vislist: line += theme['title'] + char['gt'] line += '\n' @@ -2635,6 +2655,10 @@ if op.color == None: op.color = gettermcolor() + if not op.use_ascii: + for key in char_box_draw: + char[key] = char_box_draw[key] + ### Prepare CSV output file (unbuffered) if op.output: if not os.path.exists(op.output): @@ -2696,28 +2720,16 @@ pluginfile = 'dool_' + mod.replace('-', '_') try: if pluginfile not in globals(): - import imp - fp, pathname, description = imp.find_module(pluginfile, pluginpath) - fp.close() + xpath = find_plugin_file(pluginfile, pluginpath) - ### TODO: Would using .pyc help with anything ? ### Try loading python plugin - if description[0] in ('.py', ): - exec(open(pathname).read()) - #execfile(pathname) + if xpath: + exec(open(xpath).read()) exec('global plug; plug = dstat_plugin(); del(dstat_plugin)') plug.filename = pluginfile plug.check() plug.prepare() - ### Try loading C plugin (not functional yet) - elif description[0] == '.so': - exec('import %s; global plug; plug = %s.new()' % (pluginfile, pluginfile)) - plug.check() - plug.prepare() -# print(dir(plug)) -# print(plug.__module__) -# print(plug.name) else: print('Module %s is of unknown type.' % pluginfile, file=sys.stderr)
[-] [+]	Added	_service:tar_git:harbour-dool-1.1.0+obs1.tar.gz/upstream/install.py ^
@@ -0,0 +1,115 @@ +#!/usr/bin/python3 + +############################################################################### +# Simple install script that copies files to various paths and sets +# permissions on files. Nothing fancy here, just copying files around +# +# 2022-09-28 - Scott Baker +############################################################################### + +import sys +import glob +import os +import shutil +import pathlib + +base_dir = os.path.dirname(__file__) +base_dir = base_dir or "." + +# Are you running as root? +am_root = os.getuid() == 0 + +# Pull out the ARGV so we can check for somethings +argv = sys.argv[1:] +args = " ".join(argv) + +# Set some global variables +force_root_install = args.__contains__("--root") +force_user_install = args.__contains__("--user") +verbose = args.__contains__("--verbose") + +# --user overrides --root +if (force_user_install): + force_root_install = False + am_root = False + +# Glob the files we need to install +binaries = glob.glob(base_dir + "/dool") +plugins = glob.glob(base_dir + "/plugins/*.py") +manpages = glob.glob(base_dir + "/docs/dool.1") +homedir = os.path.expanduser("~/") + +############################################################ + +def main(): + if (force_root_install or am_root): + print("You are %s, doing a local install\n" % color(9, "root")) + + bin_dir = "/usr/bin/" + plugin_dir = "/usr/share/dool/" + manpage_dir = "/usr/share/man/man1/" + + print("Installing binaries to %s" % color(15, bin_dir)) + copy_files(binaries, bin_dir, 0o755) + + print("Installing plugins to %s" % color(15, plugin_dir)) + copy_files(plugins , plugin_dir, 0o644) + + print("Installing manpages to %s" % color(15, manpage_dir)) + copy_files(manpages, manpage_dir, 0o644) + else: + print("You are a %s user, doing a local install\n" % color(227, "normal")) + + bin_dir = (homedir + "/bin/").replace("//", "/") + plugin_dir = (homedir + "/.dool/").replace("//", "/") + manpage_dir = "" + + print("Installing binaries to %s" % color(15, bin_dir)) + copy_files(binaries, bin_dir, 0o755) + + print("Installing plugins to %s" % color(15, plugin_dir)) + copy_files(plugins , plugin_dir, 0o644) + + dool_path = (bin_dir + "/dool").replace("//", "/") + + #print(os.path.exists(dool_path)) + + print("") + print("Install complete. Dool installed to %s" % (color(84, dool_path))) + +############################################################ + +# Print a string wrapped in an ANSI color and RESET +def color(num, mystr): + reset = '\033[0;0m' + ret = "\033[38;5;" + str(num) + "m" + mystr + reset + + return ret + +# Copy an array of files to a destination dir and chmod each file to mode +def copy_files(files, dest_dir, mode): + ok = os.makedirs(dest_dir, exist_ok=True) + + count = 0 + for x in files: + basename = os.path.basename(x) + dest_file = dest_dir + "/" + basename + dest_file = dest_file.replace("//", "/") + + # Copy file + ok = shutil.copyfile(x, dest_file) + # Chmod the file after it's copied + os.chmod(dest_file, mode) + + if verbose: + print("%40s => %s" % (x, dest_file)) + + if (ok): + count += 1 + + return ok + +################################################################ + +if __name__ == "__main__": + main()
[-] [+]	Changed	_service:tar_git:harbour-dool.yaml ^
@@ -1,6 +1,6 @@ Name: harbour-dool Summary: Pluggable real-time performance monitoring tool -Version: 1.0.0 +Version: 1.1.0 Release: 3 Group: Applications/System URL: https://github.com/scottchiefbaker/dool/