X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id p1SLwYLT160334 for ; Mon, 28 Feb 2011 15:58:34 -0600 X-ASG-Debug-ID: 1298930480-326501110000-S8gJnT X-Barracuda-URL: http://cuda.sgi.com:80/cgi-bin/mark.cgi Received: from ipmail06.adl6.internode.on.net (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id 9B2FA304D1F for ; Mon, 28 Feb 2011 14:01:20 -0800 (PST) Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id RsVaPEbZOQOF9EyD for ; Mon, 28 Feb 2011 14:01:20 -0800 (PST) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApIBAM+na0120VO8/2dsb2JhbAAMhBrOHJBdgSeDRHYEjBw Received: from ppp118-209-83-188.lns20.mel4.internode.on.net (HELO [192.168.1.100]) ([118.209.83.188]) by ipmail06.adl6.internode.on.net with ESMTP; 01 Mar 2011 08:31:19 +1030 X-ASG-Orig-Subj: pcp updates Subject: pcp updates From: Ken McDonell Reply-To: kenj@internode.on.net To: pcp@oss.sgi.com Content-Type: text/plain; charset="UTF-8" Date: Tue, 01 Mar 2011 09:01:19 +1100 Message-ID: <1298930479.20880.2.camel@bozo.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Content-Transfer-Encoding: 7bit X-Barracuda-Connect: ipmail06.adl6.internode.on.net[150.101.137.145] X-Barracuda-Start-Time: 1298930482 X-Barracuda-Bayes: INNOCENT GLOBAL 0.0000 1.0000 -2.0210 X-Barracuda-Virus-Scanned: by cuda.sgi.com at sgi.com X-Barracuda-Spam-Score: -1.02 X-Barracuda-Spam-Status: No, SCORE=-1.02 using per-user scores of TAG_LEVEL=2.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.1 tests=BSF_RULE7568M, BSF_RULE_7582B X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.56680 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M 0.50 BSF_RULE_7582B Custom Rule 7582B X-Virus-Scanned: ClamAV version 0.94.2, clamav-milter version 0.94.2 on oss.sgi.com X-Virus-Status: Clean I've merged in Nathan's latest round of errno changes ... merged cleanly into my dev branch (no mail sent) and minor conflict resolution done in the pcp4 branch. Changes committed to git://oss.sgi.com/kenj/pcp.git pcp4 (note this is the pcp4 branch) man/man1/pmlogextract.1 | 10 + man/man1/pmlogreduce.1 | 10 + src/cpan/MMV/MMV.xs | 4 src/cpan/PMDA/local.c | 53 +++--- src/dbpmda/src/dso.c | 7 src/dbpmda/src/pmda.c | 20 +- src/dbpmda/src/util.c | 26 +- src/genpmda/genpmda | 7 src/include/platform_defs.h.in | 65 +++---- src/libpcp/GNUmakefile | 4 src/libpcp/src/AF.c | 2 src/libpcp/src/GNUmakefile | 4 src/libpcp/src/access.c | 16 - src/libpcp/src/authcookie.c | 4 src/libpcp/src/auxconnect.c | 61 +++--- src/libpcp/src/checksum.c | 8 src/libpcp/src/config.c | 4 src/libpcp/src/connect.c | 12 - src/libpcp/src/connectlocal.c | 14 - src/libpcp/src/context.c | 22 +- src/libpcp/src/derive.c | 8 src/libpcp/src/derive.h | 8 src/libpcp/src/derive_fetch.c | 4 src/libpcp/src/desc.c | 4 src/libpcp/src/endian.c | 4 src/libpcp/src/err.c | 4 src/libpcp/src/events.c | 8 src/libpcp/src/fetch.c | 4 src/libpcp/src/fetchlocal.c | 6 src/libpcp/src/freeresult.c | 4 src/libpcp/src/help.c | 4 src/libpcp/src/instance.c | 39 ++-- src/libpcp/src/interp.c | 14 - src/libpcp/src/ipc.c | 6 src/libpcp/src/logconnect.c | 8 src/libpcp/src/logcontrol.c | 4 src/libpcp/src/logmeta.c | 54 ++---- src/libpcp/src/logportmap.c | 30 +-- src/libpcp/src/logutil.c | 10 - src/libpcp/src/loop.c | 56 ++---- src/libpcp/src/optfetch.c | 4 src/libpcp/src/p_creds.c | 8 src/libpcp/src/p_desc.c | 8 src/libpcp/src/p_error.c | 8 src/libpcp/src/p_fetch.c | 6 src/libpcp/src/p_instance.c | 18 -- src/libpcp/src/p_lcontrol.c | 10 - src/libpcp/src/p_lrequest.c | 6 src/libpcp/src/p_lstatus.c | 6 src/libpcp/src/p_pmns.c | 16 - src/libpcp/src/p_profile.c | 12 - src/libpcp/src/p_result.c | 10 - src/libpcp/src/p_text.c | 10 - src/libpcp/src/pdu.c | 65 ++++--- src/libpcp/src/pdubuf.c | 4 src/libpcp/src/pmns.c | 56 ++---- src/libpcp/src/pool.c | 14 - src/libpcp/src/profile.c | 8 src/libpcp/src/rtime.c | 4 src/libpcp/src/sortinst.c | 4 src/libpcp/src/spec.c | 4 src/libpcp/src/store.c | 4 src/libpcp/src/stuffvalue.c | 6 src/libpcp/src/tv.c | 4 src/libpcp/src/tz.c | 4 src/libpcp/src/units.c | 4 src/libpcp/src/util.c | 38 ++-- src/libpcp_gui/GNUmakefile | 4 src/libpcp_gui/src/GNUmakefile | 4 src/libpcp_gui/src/record.c | 4 src/libpcp_gui/src/timeclient.c | 23 +- src/libpcp_gui/src/timestate.c | 4 src/libpcp_http/src/http_fetcher.c | 24 ++ src/libpcp_import/src/archive.c | 29 ++- src/libpcp_import/src/import.c | 66 +++---- src/libpcp_import/src/stuff.c | 28 ++- src/libpcp_mmv/GNUmakefile | 6 src/libpcp_pmda/GNUmakefile | 6 src/libpcp_pmda/src/cache.c | 8 src/libpcp_pmda/src/callback.c | 24 +- src/libpcp_pmda/src/context.c | 4 src/libpcp_pmda/src/events.c | 4 src/libpcp_pmda/src/help.c | 12 - src/libpcp_pmda/src/mainloop.c | 4 src/libpcp_pmda/src/open.c | 69 ++++--- src/libpcp_pmda/src/tree.c | 14 - src/libpcp_trace/GNUmakefile | 4 src/libpcp_trace/src/GNUmakefile | 4 src/libpcp_trace/src/ftrace.c | 9 - src/libpcp_trace/src/hash.c | 10 - src/libpcp_trace/src/p_ack.c | 4 src/libpcp_trace/src/p_data.c | 4 src/libpcp_trace/src/pdu.c | 28 +-- src/libpcp_trace/src/pdubuf.c | 5 src/libpcp_trace/src/trace.c | 55 ++---- src/newhelp/newhelp.c | 20 -- src/pmcd/src/client.c | 6 src/pmcd/src/config.c | 89 ++++------ src/pmcd/src/dofetch.c | 5 src/pmcd/src/dopdus.c | 10 - src/pmcd/src/dostore.c | 9 - src/pmcd/src/pmcd.c | 65 ++++--- src/pmcdctl/pmcd_wait.c | 13 - src/pmclient/pmclient.c | 17 - src/pmdas/aix/cpu.c | 16 - src/pmdas/aix/cpu_total.c | 8 src/pmdas/aix/data.c | 8 src/pmdas/aix/disk.c | 16 - src/pmdas/aix/disk_total.c | 8 src/pmdas/aix/netif.c | 16 - src/pmdas/cisco/pmda.c | 13 - src/pmdas/cisco/probe.c | 11 - src/pmdas/cisco/telnet.c | 27 +-- src/pmdas/darwin/disk.c | 17 - src/pmdas/darwin/kernel.c | 17 - src/pmdas/darwin/network.c | 9 - src/pmdas/hotproc/src/config.c | 13 - src/pmdas/hotproc/src/gram_node.c | 9 - src/pmdas/hotproc/src/hotproc.c | 64 +++---- src/pmdas/hotproc/src/lex.l | 17 - src/pmdas/hotproc/src/pcpu.c | 10 - src/pmdas/hotproc/src/pglobal.c | 6 src/pmdas/hotproc/src/ppred_values.c | 10 - src/pmdas/linux/cgroups.c | 26 +- src/pmdas/linux/filesys.c | 2 src/pmdas/linux/help | 82 +++++++++ src/pmdas/linux/interrupts.c | 4 src/pmdas/linux/ksym.c | 19 -- src/pmdas/linux/linux_table.c | 1 src/pmdas/linux/msg_limits.c | 18 -- src/pmdas/linux/numa_meminfo.c | 14 - src/pmdas/linux/pmda.c | 306 +++++++++++++++++++++++++++++++++-- src/pmdas/linux/proc_cpuinfo.c | 12 - src/pmdas/linux/proc_fs_xfs.c | 7 src/pmdas/linux/proc_loadavg.c | 16 - src/pmdas/linux/proc_meminfo.c | 3 src/pmdas/linux/proc_net_dev.c | 8 src/pmdas/linux/proc_net_rpc.c | 18 -- src/pmdas/linux/proc_net_snmp.c | 18 -- src/pmdas/linux/proc_net_sockstat.c | 14 - src/pmdas/linux/proc_net_tcp.c | 21 -- src/pmdas/linux/proc_partitions.c | 6 src/pmdas/linux/proc_pid.c | 28 +-- src/pmdas/linux/proc_runq.c | 8 src/pmdas/linux/proc_scsi.c | 6 src/pmdas/linux/proc_slabinfo.c | 8 src/pmdas/linux/proc_stat.c | 2 src/pmdas/linux/proc_sys_fs.c | 15 - src/pmdas/linux/proc_uptime.c | 58 +----- src/pmdas/linux/proc_vmstat.c | 183 +++++++++++++------- src/pmdas/linux/proc_vmstat.h | 67 ++++++- src/pmdas/linux/root_linux | 140 +++++++++++----- src/pmdas/linux/sem_limits.c | 22 -- src/pmdas/linux/shm_limits.c | 24 -- src/pmdas/linux/swapdev.c | 10 - src/pmdas/linux/sysfs_kernel.c | 7 src/pmdas/mailq/mailq.c | 24 +- src/pmdas/mmv/mmv.c | 14 - src/pmdas/pmcd/src/pmcd.c | 62 +++---- src/pmdas/roomtemp/mlan/mlansesu.c | 8 src/pmdas/sample/src/sample.c | 50 ++--- src/pmdas/sendmail/sendmail.c | 12 - src/pmdas/shping/help | 6 src/pmdas/shping/pmda.c | 10 - src/pmdas/shping/shping.c | 18 +- src/pmdas/solaris/data.c | 12 - src/pmdas/solaris/disk.c | 18 -- src/pmdas/solaris/netmib2.c | 24 +- src/pmdas/solaris/sysinfo.c | 12 - src/pmdas/solaris/zpool.c | 8 src/pmdas/solaris/zpool_perdisk.c | 8 src/pmdas/summary/mainloop.c | 1 src/pmdas/summary/pmda.c | 23 -- src/pmdas/summary/summary.c | 10 - src/pmdas/trace/src/client.c | 8 src/pmdas/trace/src/comms.c | 54 ++---- src/pmdas/trace/src/trace.c | 40 ++-- src/pmdas/trace/stub.c | 5 src/pmdas/txmon/txmon.c | 16 - src/pmdas/txmon/txrecord.c | 13 - src/pmdas/weblog/check_match.c | 19 -- src/pmdas/weblog/pmda.c | 19 -- src/pmdas/weblog/weblog.c | 113 +++++------- src/pmdas/windows/GNUmakefile | 2 src/pmdas/windows/pmda.c | 4 src/pmdumplog/pmdumplog.c | 12 - src/pmie/src/dstruct.c | 2 src/pmie/src/pmie.c | 28 +-- src/pmie/src/stomp.c | 30 +-- src/pmieconf/io.c | 28 --- src/pmieconf/pmieconf.c | 9 - src/pmieconf/rate-syscalls.c | 16 - src/pmieconf/rules.c | 20 -- src/pmiestatus/pmiestatus.c | 15 - src/pminfo/pminfo.c | 16 - src/pmlock/pmlock.c | 16 - src/pmlogextract/gram.y | 13 - src/pmlogextract/logio.c | 28 +-- src/pmlogextract/pmlogextract.c | 60 +++--- src/pmlogger/callback.c | 6 src/pmlogger/events.c | 2 src/pmlogger/gram.y | 16 - src/pmlogger/pmlogger.c | 26 +- src/pmlogger/ports.c | 50 ++--- src/pmlogger/preamble.c | 12 - src/pmloglabel/pmloglabel.c | 24 +- src/pmlogreduce/logio.c | 32 +-- src/pmlogreduce/pmlogreduce.c | 26 ++ src/pmns/pmnsdel.c | 24 +- src/pmns/pmnsmerge.c | 8 src/pmnscomp/pmnscomp.c | 18 -- src/pmpost/pmpost.c | 36 +--- src/pmproxy/client.c | 8 src/pmproxy/pmproxy.c | 64 ++++--- src/pmsleep/pmsleep.c | 7 src/pmstat/pmstat.c | 4 src/pmstore/pmstore.c | 8 src/pmtrace/pmtrace.c | 11 - src/procmemstat/procmemstat.c | 17 - src/telnet-probe/telnet-probe.c | 18 +- 220 files changed, 2124 insertions(+), 2334 deletions(-) commit d6ea3ce911fcb1318f96894222cbca7a18f7abeb Merge: 83126a2 f94998e Author: Ken McDonell Date: Tue Mar 1 08:57:36 2011 +1100 Merge branch 'dev' into pcp4 Conflicts: src/libpcp/src/interp.c src/libpcp/src/pool.c interp.c fixed, pool.c has gone. commit f94998efddbe1bc7e5a6716d09cb129850897db7 Merge: 76cd720 5f70d54 Author: Ken McDonell Date: Tue Mar 1 08:45:13 2011 +1100 Merge branch 'dev' of git://oss.sgi.com/nathans/pcp into dev commit 83126a29f8f54ad83fdacd6a5f6944374b60a456 Author: Ken McDonell Date: Tue Mar 1 08:41:48 2011 +1100 pmlogextract, pmlogreduce - auto volume switch Finish off the 2^31 auto volume switch for pmlogextract and add the same facility for pmlogreduce. commit 5f70d54ee01772cef67b0e4c1ba33cc6851205ad Author: Nathan Scott Date: Mon Feb 28 21:45:14 2011 +1100 Reinstate lost fix for Win32 builds. commit 47b28610b636a7ab8015f47bbb6eecdd8fb62a0b Author: Nathan Scott Date: Mon Feb 28 20:42:08 2011 +1100 Keep all mingw configure/platform_defs pieces together. commit 22cadfcd74927f1c9eff12b97fd58913b7e6f2c5 Author: Ken McDonell Date: Mon Feb 28 20:40:43 2011 +1100 pmlogextract - auto volume switching at 2^31 bytes commit d16e3ae986d25968b6b78c5686475bfe142a2b1d Author: Nathan Scott Date: Mon Feb 28 16:43:20 2011 +1100 Rethink the to-string function macro-based errno accessors. In hindsight, these all map to strerror on all platforms, so we're just obfuscating the code. Simplify by making these a shortcut to the expanded out strerror calls, with each type of errno expanded - makes for more readable code. commit 78f003f9ad564186662233ee42ab0278c4fef2f6 Author: Nathan Scott Date: Mon Feb 28 16:11:54 2011 +1100 Convert client tools over to platform independent errno macros. commit 0686dcea1bd109cb4b44ab7041e0ab9bcecf3f33 Author: Nathan Scott Date: Mon Feb 28 16:11:32 2011 +1100 Convert all PMDAs over to platform independent errno macros. commit e2fca7acdfd6fda4ac4e3fa472a1e9a595973f31 Author: Nathan Scott Date: Mon Feb 28 13:07:50 2011 +1100 Convert remaining libraries to errno macros and consistent licenses. commit d75f8fc0f45e4bd472213f8a2696f668a5979839 Author: Nathan Scott Date: Mon Feb 28 12:54:16 2011 +1100 Use consistent license text, since all files changing anyway. commit 8b3280d7ae14a5f8184647651d53d2f8fc86dcf5 Author: Nathan Scott Date: Mon Feb 28 12:48:53 2011 +1100 Convert libpcp to macro-based errno accessors. commit 4f34c6eae6f6e59f349a400fac083e20341fa4de Author: Nathan Scott Date: Sun Feb 27 20:52:26 2011 +1100 Conversion from errno to neterror macro for networking calls. commit 9cc9b0932364be28403ce94a85770f6266caadcb Author: Nathan Scott Date: Sat Feb 26 16:10:11 2011 +1100 Second pass at vmstat metrics added into recent kernels. Covers new NUMA stats and extensions to the dirty page and kswapd tracking counters. commit ca3e5fc755fa08b7d3b329531bae88f1dd1874d9 Author: Nathan Scott Date: Sat Feb 26 14:43:17 2011 +1100 First pass at vmstat metrics added into recent kernels. Covers compaction, hugetlb, unevictable, and transparent huge page support and a scattering of other odds and ends.