Changes committed to git://oss.sgi.com/pcp/pcp.git dev
man/man1/GNUmakefile | 7 +
src/libpcp/src/auxconnect.c | 2
src/pmatop/pmatop.py | 167 +++++++++++++++++++++++++++++++------------
src/pmcollectl/pmcollectl.py | 14 +--
src/python/pcp/pmapi.py | 7 +
src/python/pcp/pmsubsys.py | 91 +++++++++++++----------
6 files changed, 192 insertions(+), 96 deletions(-)
commit 75cd11e3c819f75aceb739fd6f5449dbe4ac29e2
Merge: 5e5c85a 102faa8
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed May 1 13:29:33 2013 +1000
Merge branch 'scox/dev' of ../pcpfans into dev
Conflicts:
src/pmatop/pmatop.py
(resolved by taking Franks "pass" change everywhere, with manual conflict
merging into Stans changes)
commit 5e5c85a77fe8e9a2d0f01d808bd7f19ef3626f6e
Merge: ddd92eb ea54a86
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed May 1 13:21:44 2013 +1000
Merge branch 'fche/dev' of ../pcpfans into dev
commit 102faa813ce8b1be85bd15025cf7620636fe07ae
Author: Stan Cox <scox@xxxxxxxxxx>
Date: Tue Apr 30 22:02:33 2013 -0400
Add curses/stdout dual output mode.
* pmatop.py: Rename: Cpu->Processor, Net->Network, Proc->Processor,
Subsys->Subsystem .
(_StandardOutput): New. For curses/stdout dual use.
(_ProcPrint): Add type_write.
(_MiscMetrics): New.
(main): Use window.timeout to wait and get command.
Setup either curses or stdout.
* pmcollectl.py: Rename: Cpu->Processor, Net->Network,
Proc->Processor, Subsys->Subsystem .
* pmapi.py: Add pmDescPtr.{sem,type} getter properties.
* pmsubsys.py (get_atom_value): Use getters. Use want_diff
Handle IndexError. Allow for diff_metrics.
commit ddd92ebb756e9c24b5cbec20701535712dac0902
Merge: d8d9a07 a74f841
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed May 1 06:08:18 2013 +1000
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
commit d8d9a0797092c38ee08571281368eff04e65f2e3
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed May 1 06:04:40 2013 +1000
man - only include pmwebd man page if binary is included
Repeat GNUmakefile conditional from source in man1 directory
for better package consistency when libmicrohttpd is not available
and pmwebd is not built.
commit ea54a86693041c21183463b6fc9520c52c10f63c
Author: Frank Ch. Eigler <fche@xxxxxxxxxx>
Date: Tue Apr 30 12:26:16 2013 -0400
pmatop: use 'pass' rather than 'True ... # pylint: disable-msg=W0104'
throughout
commit df752ba6181dfe318844b2b6c80f774f14056b31
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Apr 30 17:21:00 2013 +1000
libpcp/auxconnect.c - fix small compilation warning
Cast (size_t) and (ssize_t) to (int) for printf in __pmRecv().
|