Changes committed to git://git.pcp.io/kenj/pcp master
Ken McDonell (9):
man/man1/pminfo.1: tidy up wording around -n and -N
libpcp/pmns.c: small duplicate names fix
pmnsmerge: small duplicates in PMNS changes
qa/772: (new) exercise duplicate options of pmnsmerge
qa/771: oops, add missing 771.out
qa/235: new .out after recent pmnsmerge changes
pmdaproc.sh: rework
man/pmda.3: document the hidden variables in pmdaproc.sh
qa/pmdas/slow and slow_python: replace deprecated variables
man/man1/pminfo.1 | 4
man/man1/pmnsmerge.1 | 32 ++
man/man3/pmda.3 | 428 ++++++++++++++++++++++++++++++++++------
qa/235.out | 4
qa/771.out | 6
qa/772 | 171 ++++++++++++++++
qa/772.out | 45 ++++
qa/group | 1
qa/pmdas/slow/Install | 2
qa/pmdas/slow_python/Install | 2
src/libpcp/src/pmns.c | 3
src/pmcd/pmdaproc.sh | 459 ++++++++++++++++++++++---------------------
src/pmns/pmnsmerge.c | 36 ++-
13 files changed, 895 insertions(+), 298 deletions(-)
Details ...
commit b6a94262cb6f51b64b3083e70ba10078afab97cb
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed May 13 13:09:02 2015 +1000
qa/pmdas/slow and slow_python: replace deprecated variables
Last pmdaproc.sh change dropped $python_args and $perl_args ...
use $args instead.
$python_args and $perl_args are only used in these two places in
the QA suite and nowhere else that I can find.
commit 560ce35f28643368ca3255ad12dca195f6ca4d5f
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed May 13 13:07:30 2015 +1000
man/pmda.3: document the hidden variables in pmdaproc.sh
Define what the various shell variables for Install and Remove
scripts do and how to use them.
commit 6e5a30c3bf76a2b9551fbd8b96bd08b1504ec5ba
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed May 13 13:05:08 2015 +1000
pmdaproc.sh: rework
Most of the changes here are cosmetic, except ...
- retire perl_args and python_args ($args does the same job)
- fix the initializations so that most assignments are safe
before or after calling pmdaSetup
- make the implementation match the (expanded) man page
commit 87cda3ca355eeb37fe83bbcb080e9a9b02d18f1f
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon May 11 08:44:29 2015 +1000
qa/235: new .out after recent pmnsmerge changes
commit 96ee386b3e111791540fe57dc6c480d82f7e544d
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon May 11 08:43:16 2015 +1000
qa/771: oops, add missing 771.out
commit 67925543959de7e244912c0a279531ee2cdcdc9a
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun May 10 17:39:48 2015 +1000
qa/772: (new) exercise duplicate options of pmnsmerge
As a by-product also tests the "duplicates are dynamic metrics"
case that was recently fixed in libpcp.
commit d152e732d082adcaea3e39412cb99e040a7834b9
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun May 10 17:35:17 2015 +1000
pmnsmerge: small duplicates in PMNS changes
1. re-instate -d (--dupok, duplicates are OK) (this is the default
and deprecated)
2. add -x (--nodups, duplicates are not allowed)
3. fix -f so implementation matches documentation (will really
overwrite the output file)
Note -x is applied to each input PMNS file _and_ the output PMNS file.
commit 0c651f5ef78fed921419116fc999d9a5b5821631
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun May 10 17:32:23 2015 +1000
libpcp/pmns.c: small duplicate names fix
Missed in the previous round of changes ... when duplicates are
NOT allowed, we were missing the comparison of dynamic names, so
in the PMNS
foo 123:*:*
and
bar 123:*:*
were not identified as duplicates. This commit fixes that.
commit 9f9cfed471b09491a8c08bfffea21759f55a1d60
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun May 10 07:25:51 2015 +1000
man/man1/pminfo.1: tidy up wording around -n and -N
|