[ includes merges with kenj and makc dev branches ]
Changes committed to git://oss.sgi.com/nathans/pcp.git
build/sun/.gitignore | 5 +++
configure.in | 68 ++++++++++++++++++++++++++++++++---------
src/cpan/MMV/GNUmakefile | 2 -
src/cpan/PMDA/GNUmakefile | 3 +
src/include/builddefs.in | 7 ++--
src/include/pcp.conf.in | 2 -
src/include/platform_defs.h.in | 9 ++++-
src/libpcp/src/fetchlocal.c | 2 -
src/libpcp/src/logmeta.c | 11 ++++++
src/libpcp/src/win32.c | 12 +++----
src/pmdas/pmcd/src/pmcd.c | 14 +++++++-
src/pmdas/solaris/common.h | 1
src/pmdas/solaris/data.c | 18 +++++++++-
src/pmdas/solaris/pmns.kernel | 1
src/pmdas/solaris/sysinfo.c | 28 +++++++++++++++-
src/pmdas/windows/help.c | 6 +--
src/pmieconf/GNUmakefile | 10 +++---
src/pmieconf/io.c | 17 ++++------
src/pmieconf/pmieconf.c | 4 --
src/pmieconf/rules.c | 2 -
src/pmieconf/rules.h | 1
src/pmlc/gram.y | 2 -
src/pmlc/pmlc.h | 2 -
src/pmlogextract/gram.y | 1
src/pmlogger/callback.c | 12 -------
src/pmlogger/check.c | 2 -
src/pmlogger/dopdu.c | 7 ----
src/pmlogger/error.c | 6 ---
src/pmlogger/fetch.c | 2 -
src/pmlogger/gram.y | 2 -
src/pmlogger/logger.h | 36 ++++++++++++++++++---
src/pmlogger/pmlogger.c | 33 +++++++------------
src/pmlogger/ports.c | 2 -
src/pmlogger/preamble.c | 9 -----
src/pmlogger/rewrite.c | 2 -
src/pmlogger/util.c | 2 -
src/pmlogreduce/GNUmakefile | 6 ---
src/pmstat/pmstat.c | 2 -
38 files changed, 207 insertions(+), 144 deletions(-)
commit 4349e1bca05d67755c60befaca21dc941579f054
Merge: 9465114 4a53818
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue Jun 8 15:18:20 2010 +1000
Merge branch 'lazy' of git://oss.sgi.com/makc/pcp into dev
commit 9465114d38a5b805fe73c5c228853c2e4a548a00
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue Jun 8 15:16:57 2010 +1000
Ensure pmlogger doesn't write extended pmcd host syntax as hostname.
In addition, cleaned up use of "extern" scattered throughout the sources
(moved into the shared header), so all code uses the same definitions.
Also no longer (needlessly) initialises globals explicitly to zero.
commit 4cb55f02f9859ba81ab63d68053789ad8d187275
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue Jun 8 08:14:07 2010 +1000
Fix build on non-Win32 platforms after recent porting changes.
commit aa86d459397213705a08975cd871ac16a11179e5
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 13:23:36 2010 +1000
Fix up compiler warning in Win32 builds.
commit c3a89f954b8d32672f8eeab554d5ab0258148f87
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 13:18:01 2010 +1000
Do not reimport pmProgname by hand, use headers.
commit 8b01eb004ad4c2a618accb704efdde01dc614c3a
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 11:25:21 2010 +1000
Remove another occurrence of errno redefinition - fetchlocal.c
commit de9957898d504681858fe256d172b0a2a75e75b5
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 11:24:33 2010 +1000
Remove errno declaration from pmlogextract yacc file.
commit 0c040ae943a5da172181dedcb7a673d2cbcbbe5b
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 11:23:31 2010 +1000
Add exe suffix to pmlogreduce makefile.
commit f13222de0fbe85db88d4ec13932294e9212e3fef
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 11:09:42 2010 +1000
Couple further minor Windows build fixups.
commit 40af0915488cb6077c494361ea5a2d7c16fe5f41
Merge: aac1717 1cbb7b9
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 10:37:57 2010 +1000
Merge branch 'dev' of git://oss.sgi.com/kenj/pcp into dev
commit aac171711fd9072a58db981ab351eb60f35a4845
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 7 10:37:28 2010 +1000
Port forward to latest Strawberry gcc and system headers for Windows.
In particular:
- We now have a sys/ioctl.h which doesn't define TIOCGWINSZ,
so rework the configure macros there slightly.
- We shouldn't declare errno at all (extern), cos we lose any
platform annotations (like dllimport) from system headers.
- Add EXECSUFFIX to pmieconf makefile to produce a Windows exe
- Fixup a typo in couple of new pmdawindows help text calls
to strncpy.
- Declarations of rindex/index functions for windows used the
const qualifier inconsistently to POSIX, make 'em align.
commit a901f9f53a4fbdd4e884c7025a9938afcf56fee9
Merge: a2f4b9b f28eead
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Sat Jun 5 08:43:15 2010 +1000
Merge branch 'dev' of git://oss.sgi.com/kenj/pcp into dev
commit a2f4b9ba219a01c6bd1a11caf90003956d3616bf
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Fri Jun 4 15:28:21 2010 +1000
Make Win32 build work on more recent versions of gcc.
Latest strawberry perl has moved on to 4.4.3, and with the option of
a native 64 bit compile - but, we've got a conflicting type definition
here, so use the same cpp guard as gcc when defining struct timespec.
commit ce148ed1a55c57cefaddc21a13ee630179557b86
Merge: 840f504 4354deb
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Jun 3 15:47:37 2010 +1000
Merge branch 'dev' of ../kenj into dev
commit 840f504faae241fdf836763cb0955de419567233
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Jun 3 15:43:53 2010 +1000
Make log metadata reading more robust in a specific corruption case.
We switch metric IDs behind the backs of some metric names recently.
This results in archives which have some metric names with two PMIDs
which isn't great but isn't totally fatal either - the archive can
still be used for all other metrics, and even the metric in question
is visible for part of the archive. The current behaviour (which is
to refuse to read the log at all) is not ideal, so now we allow the
archive to still be loaded in this situation.
|