Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge
Makepkgs | 9
build/rpm/GNUmakefile | 3
build/rpm/pcp.spec.in | 4
configure |13775 +++++++++-------------------------
configure.in | 230
qa/063 | 6
qa/067 | 4
qa/src/chkacc1.c | 27
qa/src/chkacc2.c | 23
qa/src/chkacc3.c | 35
qa/src/pducheck.c | 4
qa/src/pmcdgone.c | 5
src/include/builddefs.in | 23
src/include/pcp.conf.in | 8
src/include/pcp/impl.h | 77
src/include/pcp/platform_header.h.in | 9
src/libpcp/src/GNUmakefile | 10
src/libpcp/src/access.c | 43
src/libpcp/src/auxconnect.c | 1336 ++-
src/libpcp/src/check-statics | 3
src/libpcp/src/ipc.c | 109
src/libpcp/src/logconnect.c | 55
src/libpcp_gui/src/timeclient.c | 16
src/libpcp_pmcd/src/client.c | 23
src/libpcp_pmda/src/open.c | 20
src/libpcp_trace/src/pdu.c | 13
src/perl/LogImport/Makefile.PL | 2
src/perl/PMDA/Makefile.PL | 2
src/perl/PMDA/local.c | 43
src/pmcd/src/agent.c | 10
src/pmcd/src/client.c | 30
src/pmcd/src/client.h | 17
src/pmcd/src/config.c | 36
src/pmcd/src/pmcd.c | 28
src/pmdas/linux/pmda.c | 1
src/pmdas/simple/GNUmakefile | 3
src/pmdas/simple/GNUmakefile.install | 7
src/pmdas/trace/Makefile.proto | 4
src/pmdas/trivial/GNUmakefile | 3
src/pmdas/trivial/GNUmakefile.install | 1
src/pmdas/txmon/GNUmakefile | 3
src/pmdas/txmon/GNUmakefile.install | 2
src/pmlogger/dopdu.c | 8
src/pmlogger/pmlogger.c | 38
src/pmlogger/ports.c | 71
src/pmproxy/client.c | 34
src/pmproxy/pmproxy.c | 20
src/pmproxy/pmproxy.h | 10
48 files changed, 5421 insertions(+), 10822 deletions(-)
commit 4de7b814d529523662e22fe5e06ababf5cc3fa70
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Nov 8 17:48:07 2012 +1100
Rejig the mechanism by which NSS/NSPR headers are included
In particular, this removes any/all direct references to these
headers from publicly visible headers so that back-compatibility
story remains intact after the merge. Also, will avoid shooting
ourselves in the foot with existing pcp-gui builds.
One recently introduced little memleak plugged in a pmcd error
path (related to a dynamic net address buffer allocation), and
also some day1(?) QA test bugs fixed in the qa/src/chkacc*.c -
some cases of error code checking were incorrect.
commit b84afcd97fc9c2eb70e0c45f92f8813dd7a03367
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Nov 8 17:40:54 2012 +1100
Allow long-option variants for Makepkgs options too
commit 4531566940b919e07bae51532dbc82c5866d9799
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Nov 8 10:55:03 2012 +1100
Make Daves configure-opt-capture-for-build-system-use slightly more generic
commit 192639be06b856ba86cfa5334285bf011939c781
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Nov 8 10:18:44 2012 +1100
Remove qa/067 debugging leftover which seems accidentally committed.
commit c11c43fcedb843686b50092dcb228cefcd21a1c8
Merge: c22791c bda030e
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Nov 8 10:13:02 2012 +1100
Merge branch 'brolley/nssmerge' of git://sourceware.org/git/pcpfans into
nssmerge
Conflicts:
Makepkgs
configure
qa/063
src/pmdas/trace/Makefile.proto
Conflict resolution involved: fixing overlaps on Makepkgs configury
changes (mingw vs nss changes), rebuilding configure, and reverting
NSS related include (-I) changes to the other two since thats where
they need to end up anyway (for backward compatibility) as part of
coming changes.
commit bda030ed6ee4c6fd410bb4ef7d23137ba9ac59bc
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Nov 6 17:52:53 2012 -0500
Respect --without-nss in Makepkgs
- Pass the option to configure in Makepkgs script
- Propagate --without-nss as NSS_CONFIG_FLAGS to builddefs and ot
pcp.spec.in
- Use it in build/rpm/GNUmakefile
commit 313d3ab66b5fd6ba27db9ae7d09d74351ae0dd3f
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Mon Nov 5 14:29:26 2012 -0500
Fix qa test case 367 for NSS/NSPR.
Use the __pm* socket I/O API consistently
Implement __pmRead()
commit ffc2aa32bc704c7b2e2b22cccf3dbf6a7e46d76c
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Thu Nov 1 17:28:23 2012 -0400
Fix qa test 601 for NSS/NSPR.
Provide nss/nspr search paths.
commit e56cd187b7d914b3c3dd026268735337984f4ab9
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 30 17:26:17 2012 -0400
Fix qa test case 324 for NSS/NSPR.
Pass nss/nspr search paths via CFLAGS.
commit 65d3e91e84d2acb51e58c3d8c50388936a75c82c
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 30 17:03:51 2012 -0400
Fix qa test case 199 for NSS/NSPR
- Pass nss/nspr include search paths in CFLAGS.
commit 166cd347d977d0bf1ab2417c1f7f911c3dd4619c
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 30 16:01:27 2012 -0400
pcp/qa test case 067
Specify no timeout on PR_Accept.
Accept fd numbers of more than 3 digits in length.
commit 055342149275744d71ef6d4ce299ceced845fd6f
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 30 12:51:31 2012 -0400
Fix qa test case 063 for NSS/NSPR
Generate, propagate and use PCP_NSS_INC_DIR and PCP_NSPR_INC_DIR.
commit e8eea2bda0e9c4699ce302d00e6aa2012ce8d5c1
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 23 17:13:36 2012 -0400
Use the abstracted __pm* socket I/O interface consistently throughout.
commit 37debb698c35fe4b5fbb9b044763955d36e18a0d
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 23 17:12:42 2012 -0400
Do not call __pmResetIPC on the client fd until we're finished using it.
commit a8f60225bbdc6aa55dc823e420ee653cab73785a
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 23 17:10:52 2012 -0400
Preserve the port setting of the address in __pmSetSockAddr()
commit cc856d2d5969db4ee6c4a6b356ce9241c16a7998
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Tue Oct 23 17:10:04 2012 -0400
Add missing copyright.
commit fe326535e18155e5c1bbe3a779f106fb6db07fd6
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Thu Oct 18 17:02:47 2012 -0400
Return IP addresses in network byte order.
commit b2ea9f0f70d752b716aa8b214904ad6e8da875ad
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Wed Oct 17 15:24:14 2012 -0400
Use the new __pm* socket API consistently throughout pmlogger.
commit 8e7101266197410af0a6e01d4dbb6991d3f9628f
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Wed Oct 17 15:22:26 2012 -0400
Add #include search paths for NSS and NSPR when building the 'simple' pmda.
commit 6e87dbaeac565c9e4316df2d6455b78ad7cd9d1a
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Fri Oct 12 11:35:27 2012 -0400
Use select(3) instead of PR_Poll, even for NSPR sockets.
- Could not poll native and NSPR sockets separately since one blocks
the other.
- PR_Poll does not seem to respond to SIGINT, making it impossible
to stop the pmcd using SIGINT.
- Translate NSPR file descriptors to native ones and use select to
poll both the native and NSPR sockts at the same time.
commit 56a3d62186dfa3f87ec66b0de5875e600753f99b
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Thu Oct 11 13:12:39 2012 -0400
Don't process an empty nspr_set in nsprSelect.
commit c07e042b821f1f1f6e0d1453408d45f4b024fcd9
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Thu Oct 11 13:10:43 2012 -0400
Mark nsprFds as an optional symbol.
commit a195efdaee08fdba7aa62005a89b4fde83e6b557
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Wed Oct 10 11:13:51 2012 -0400
Remove comment from ipc.c which had been moved to auxconnect.c.
commit b45f16b6071bf43a5739e1bb4c5fbb222d650206
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Wed Oct 10 11:10:59 2012 -0400
Merge NSS/NSPR implementation of the socket I/O abstraction from
brolley/nss.
- Merges changes into the new organization where separate copies of each
function exist, as opposed to separate implementations within each
function.
- Moves NSPR file descriptor information into the IPC table.
|