From fche@redhat.com Tue Oct 1 20:42:54 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 1B82229DFB for ; Tue, 1 Oct 2013 20:42:54 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 0B2CF8F804C for ; Tue, 1 Oct 2013 18:42:50 -0700 (PDT) X-ASG-Debug-ID: 1380678169-04cbb02c3e164dfa0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id FBDKFTOinur09DlX for ; Tue, 01 Oct 2013 18:42:50 -0700 (PDT) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r921gnWH005230 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 1 Oct 2013 21:42:49 -0400 Received: from fche.csb (vpn-48-118.rdu2.redhat.com [10.10.48.118]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r921gm37026878; Tue, 1 Oct 2013 21:42:49 -0400 Received: by fche.csb (Postfix, from userid 2569) id E2CEA58134; Tue, 1 Oct 2013 21:42:47 -0400 (EDT) To: Nathan Scott Cc: PCP Mailing List Subject: Re: RFC: filtered metrics References: <1717961238.2089908.1380100281235.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: RFC: filtered metrics From: fche@redhat.com (Frank Ch. Eigler) Date: Tue, 01 Oct 2013 21:42:47 -0400 In-Reply-To: <1717961238.2089908.1380100281235.JavaMail.root@redhat.com> (Nathan Scott's message of "Wed, 25 Sep 2013 05:11:21 -0400 (EDT)") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1380678170 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 nathans wrote: > Goal: Transparent mechanism for client tools to perform a metric > modification operation (likely a pmStore(3)) before starting to > fetch values for metrics. This is to provide a per-user or per- > monitor-host customisation (filtering) of the values returned. [...] Just want to highlight the fact that as this would be additional state stored at pmcd for the clients, it needs to be restored upon a pmReconnectContext(). > Approach: > Perhaps we could introduce known directories (/etc/pcp/filtered/ and > $HOME/.pcp/filtered?) with files containing metric name:value mappings > to store [...] It seems likely that this filtering would be for ad-hoc purposes, with possibly different filters in action for different clients. Thus, hoping to make them persist in user- or especially system-wide default files is probably not that helpful. Maybe they could be left in files. Or maybe the pcp clients can earn an additional option like pmevent, '-x [metric:]filter'. pmlogger could grow some syntax to do the equivalent pmStores for each batch. (It could make sense to filter the same metrics in multiple different ways and log them at different rates.) > [...] Should we mandate use of string metrics always for these > things? (the one case we have that used integers could be done as a > string instead, and its not yet released). [...] Substring match? Regular expression? Arithmetic expression? General PMIE predicate? - FChE From nscott@redhat.com Wed Oct 2 05:07:23 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id EE3C47F91 for ; Wed, 2 Oct 2013 05:07:22 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 7E140AC01C for ; Wed, 2 Oct 2013 03:07:22 -0700 (PDT) X-ASG-Debug-ID: 1380708437-04cbb02c3e16699c0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id BHiJJUuhh3f1fdHE for ; Wed, 02 Oct 2013 03:07:17 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r92A7HJv010506 for ; Wed, 2 Oct 2013 06:07:17 -0400 Date: Wed, 2 Oct 2013 06:07:17 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: PCP Mailing List Message-ID: <2030912650.225203.1380708437277.JavaMail.root@redhat.com> In-Reply-To: <1550623513.225042.1380708382560.JavaMail.root@redhat.com> Subject: pcp updates: qa, linux network metrics MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa, linux network metrics Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: qa, linux network metrics Thread-Index: iadh0wrZ8924rl/kLhEIhrwDJmBOzA== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1380708437 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141110 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/322 | 22 +++ qa/366.out | 2 qa/374 | 22 +++ src/pmdas/linux/clusters.h | 2 src/pmdas/linux/help | 2 src/pmdas/linux/indom.h | 2 src/pmdas/linux/pmda.c | 41 +++++-- src/pmdas/linux/proc_net_dev.c | 229 +++++++++++++++++++++++++++++++++-------- src/pmdas/linux/proc_net_dev.h | 27 +++- src/pmdas/linux/root_linux | 2 10 files changed, 282 insertions(+), 69 deletions(-) commit ee7903c0fbd89d0ab20232d51e27dea1c13e80df Author: Nathan Scott Date: Wed Oct 2 18:03:16 2013 +1000 Functional network.interface speed/duplex metrics on older kernels Permissions issues on the SIOCETHTOOL ioctl have been causing the Linux kernel PMDA to see EPERM for older (e.g. pre-3 kernels), as a result of overly restrictive controls on this read-only ioctl. This was later rectified, but is still a problem for us since we do not run pmdalinux as root. It turns out the information we're after is available through the sysfs filesystem, so this change adds a fallback to using sysfs if that ETHTOOL ioctl fails. Turns out its easier than I thought to find the information we're after in sysfs - symlinks exist to help point us the right way, below /sys/class/net. The prospect of an entire /sys/devices tree scan was giving me a headache, so pretty pleased to have stumbled across that method! commit 1d3a5caf13c8c1d399cf31be503753c3aa3d9087 Author: Nathan Scott Date: Wed Oct 2 16:23:30 2013 +1000 Add support for IPv6 address and scope metrics (ifconfig-style) Alongside the IPv4 network interface address metrics, add Linux support for IPv6, calculated and presented just like ifconfig(1). commit 9825f2d5d5c7e9ce20d623580accf109dc1abe6c Author: Nathan Scott Date: Wed Oct 2 09:12:03 2013 +1000 Fix filtering of shping logconf rule in qa 366 commit f7a15a07353cf83e9da7ebdbcc7fab3c8a7a433a Author: Nathan Scott Date: Wed Oct 2 09:08:32 2013 +1000 Fix remote pmlogger termination for tests 322 and 374 From wwwrun@oss.sgi.com Wed Oct 2 22:52:29 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=HTML_MESSAGE,NO_RELAYS autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: by oss.sgi.com (Postfix, from userid 30) id A82E37F56; Wed, 2 Oct 2013 22:52:29 -0500 (CDT) From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 1018] New: Check Date: Thu, 03 Oct 2013 03:52:29 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp-glider X-Bugzilla-Keywords: X-Bugzilla-Severity: blocker X-Bugzilla-Who: mahahari777@gmail.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: nathans@debian.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter cc classification Message-ID: Content-Type: multipart/alternative; boundary="1380772349.BDaD1.27248"; charset="us-ascii" X-Bugzilla-URL: http://oss.sgi.com/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 --1380772349.BDaD1.27248 Date: Wed, 2 Oct 2013 22:52:29 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" http://oss.sgi.com/bugzilla/show_bug.cgi?id=1018 Bug ID: 1018 Summary: Check Product: pcp Version: unspecified Hardware: PC OS: All Status: NEW Severity: blocker Priority: P5 Component: pcp-glider Assignee: nathans@debian.org Reporter: mahahari777@gmail.com CC: pcp@oss.sgi.com Classification: Unclassified -- You are receiving this mail because: You are on the CC list for the bug. --1380772349.BDaD1.27248 Date: Wed, 2 Oct 2013 22:52:29 -0500 MIME-Version: 1.0 Content-Type: text/html; charset="UTF-8"
Bug ID 1018
Summary Check
Product pcp
Version unspecified
Hardware PC
OS All
Status NEW
Severity blocker
Priority P5
Component pcp-glider
Assignee nathans@debian.org
Reporter mahahari777@gmail.com
CC pcp@oss.sgi.com
Classification Unclassified

You are receiving this mail because:
  • You are on the CC list for the bug.
--1380772349.BDaD1.27248-- From wwwrun@oss.sgi.com Wed Oct 2 23:17:02 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=HTML_MESSAGE,NO_RELAYS autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: by oss.sgi.com (Postfix, from userid 30) id 4C8147F56; Wed, 2 Oct 2013 23:17:02 -0500 (CDT) From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 1018] Check Date: Thu, 03 Oct 2013 04:17:02 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp-glider X-Bugzilla-Keywords: X-Bugzilla-Severity: blocker X-Bugzilla-Who: nathans@debian.org X-Bugzilla-Status: RESOLVED X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: nathans@debian.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: bug_status cc resolution Message-ID: In-Reply-To: References: Content-Type: multipart/alternative; boundary="1380773822.fe57cFd1.29608"; charset="us-ascii" X-Bugzilla-URL: http://oss.sgi.com/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 --1380773822.fe57cFd1.29608 Date: Wed, 2 Oct 2013 23:17:02 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" http://oss.sgi.com/bugzilla/show_bug.cgi?id=1018 Nathan Scott changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC|pcp@oss.sgi.com | Resolution|--- |INVALID -- You are receiving this mail because: You are on the CC list for the bug. --1380773822.fe57cFd1.29608 Date: Wed, 2 Oct 2013 23:17:02 -0500 MIME-Version: 1.0 Content-Type: text/html; charset="UTF-8" changed bug 1018
What Removed Added
Status NEW RESOLVED
CC pcp@oss.sgi.com  
Resolution --- INVALID

You are receiving this mail because:
  • You are on the CC list for the bug.
--1380773822.fe57cFd1.29608-- From nscott@redhat.com Thu Oct 3 20:15:52 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 07CA97F5A for ; Thu, 3 Oct 2013 20:15:52 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id 7AF0BAC009 for ; Thu, 3 Oct 2013 18:15:51 -0700 (PDT) X-ASG-Debug-ID: 1380849346-04cb6c153d17124b0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id PCtILBeRFSE9rTIP for ; Thu, 03 Oct 2013 18:15:46 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r941FkDE020554 for ; Thu, 3 Oct 2013 21:15:46 -0400 Date: Thu, 3 Oct 2013 21:15:46 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <631399755.1560717.1380849346102.JavaMail.root@redhat.com> In-Reply-To: <1610460221.1560685.1380849333857.JavaMail.root@redhat.com> Subject: pcp updates: fche merge MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: fche merge Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: fche merge Thread-Index: 1YRwv6orAM2l8mudayEQrwTqZwyC4w== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1380849346 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141155 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev src/libpcp/src/context.c | 1 src/pmdas/systemd/Install | 2 src/pmdas/systemd/systemd.c | 322 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 274 insertions(+), 51 deletions(-) commit cce2d1034d1c8866f52810675d0e6c976e6fd09c Author: Frank Ch. Eigler Date: Thu Oct 3 18:11:49 2013 -0400 systemd pmda: add uid/gid-filtering mode As a confidentiality matter, we should not expose system log information to any Tom, Dick, and Harry. journalctl has an filesystem-ACL mechanism for restricting visibility of logs to certain users/groups, but short of running root & setuid'ing back & forth for clients, we can't rely on that. So, we implement a baby ACL ourselves, using the event-queue filtering logic for each client (authenticated), passing to each client only those journal entries that match _UID=$uid -or- _GID=$gid -or- have $gid as one journalctl groups adm/wheel/systemd-journal. The effect is not quite the same (since we disregard auxiliary group memberships), but c'est la view. We err on the side of restricting info (to non-root users). Unauthenticated contexts, by default, get no soup. A new non-default command line option -f is available to signify that there does exist such a thing as free lunch, and thereby to serve journal entries to anyone who asks. commit 82688b9c0cfb501e9e5f2f548fa0aee8f4b140ae Author: Frank Ch. Eigler Date: Wed Oct 2 21:39:07 2013 -0400 pmda systemd: tweak meta-cleanup: restore dp->sts error storage This reworks commit fe3e502c19f0fb44064e68a3117152039876a00e. commit c21738e50e9bb4ac80f90548934b551188d46785 Author: Frank Ch. Eigler Date: Wed Oct 2 21:23:04 2013 -0400 pmNewContext: plug memory leak on failed connections The __pmContext struct that's malloc'd anew early on during pmNewContext needs to be fred within the FAILED: path, lest we seek to sink the good ship HMS Server with a memory leak. The problem was initially found when "pmie -h NOSUCHHOST" goes into a frenzy, retrying context creation every few seconds. (Why pmie was started with -h NOSUCHHOST is left to another surprising and delightful tale.) commit fe3e502c19f0fb44064e68a3117152039876a00e Author: Frank Ch. Eigler Date: Wed Oct 2 21:14:52 2013 -0400 pmda systemd: meta-cleanup: drop dispatch->sts error storage From MAILER-DAEMON Sat Oct 5 05:44:49 2013 Return-Path: <> X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: *** X-Spam-Status: No, score=3.3 required=5.0 tests=LOTS_OF_MONEY, LOTTERY_PH_004470 autolearn=no version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id ED71E7F4E for ; Sat, 5 Oct 2013 05:44:48 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id 89600AC005 for ; Sat, 5 Oct 2013 03:44:45 -0700 (PDT) X-ASG-Debug-ID: 1380969879-04cb6c3501400290001-S8gJnT Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1hn0121.outbound.protection.outlook.com [157.56.110.121]) by cuda.sgi.com with ESMTP id e9W2ghGAsiFbqF6o (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sat, 05 Oct 2013 03:44:39 -0700 (PDT) X-Barracuda-Envelope-From: X-Barracuda-Apparent-Source-IP: 157.56.110.121 Received: from [101.58.204.221] (101.58.204.221) by BN1PR05MB075.namprd05.prod.outlook.com (10.255.199.21) with Microsoft SMTP Server (TLS) id 15.0.775.9; Sat, 5 Oct 2013 10:44:38 +0000 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Description: Mail message body Subject: Re To: Recipients X-ASG-Orig-Subj: Re From: Nokia 2013 Award Date: Sat, 5 Oct 2013 16:14:12 +0530 Reply-To: Message-ID: X-Originating-IP: [101.58.204.221] X-ClientProxiedBy: HKNPR04CA005.apcprd04.prod.outlook.com (10.242.116.35) To BN1PR05MB075.namprd05.prod.outlook.com (10.255.199.21) X-Forefront-PRVS: 0990C54589 X-Forefront-Antispam-Report: SFV:SPM;SFS:(189002)(199002)(76796001)(76786001)(56776001)(47976001)(50986001)(221173001)(74876001)(19580405001)(47736001)(49866001)(80022001)(81342001)(221843001)(66066001)(221733001)(54316002)(81686001)(69226001)(31686002)(56816003)(81542001)(50466002)(83072001)(80976001)(74706001)(76176001)(74366001)(53256004)(54356001)(77982001)(46102001)(59766001)(76482001)(77096001)(76576001)(79102001)(42186004)(65816001)(74662001)(74502001)(47446002)(23676002)(47776003)(33646001)(81816001)(19580395003)(63696002)(43066001)(85306002)(74316001)(4396001)(51856001)(83322001)(62346009)(474034002);DIR:OUT;SFP:1501;SCL:5;SRVR:BN1PR05MB075;H:[101.58.204.221];CLIP:101.58.204.221;FPR:;RD:InfoNoRecords;MX:3;A:0;LANG:en; X-OriginatorOrg: mainea.onmicrosoft.com X-Barracuda-Connect: mail-bn1hn0121.outbound.protection.outlook.com[157.56.110.121] X-Barracuda-Start-Time: 1380969879 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_ADDR_MATCH, EMPTY_ENV_FROM X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141195 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 EMPTY_ENV_FROM Empty Envelope From Address 0.50 BSF_SC0_SA_TO_FROM_ADDR_MATCH Sender Address Matches Recipient Address This E-mail is to officially inform you that your E-mail Address have been verified and pronounced as the lucky Winner Of =C2=A3 500,000.00 GBP Send Info below to info@onlinenokia.net 1 NAME: 2 ADDRESS: 3 MOBILE NUMBER: 4 SEX: 5 AGE: 6 OCCUPATION: 7 NATIONALITY: 8 STATE: 9 COUNTRY: Note you have to send your information=E2=80=99s to this email info@onlinen= okia.net or your winnings will not be processed. Your sincerely, Dr. Charles D. Layman Tel: ( +44 701 008 6302 info@onlinenokia.net (c) Nokia 2013 Award Promotion, All rights reserved. From brolley@redhat.com Sun Oct 6 17:08:02 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 3F3717F52 for ; Sun, 6 Oct 2013 17:08:02 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 1D1A6304059 for ; Sun, 6 Oct 2013 15:08:01 -0700 (PDT) X-ASG-Debug-ID: 1381097277-04cbb02c3b17e3f30001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id KQfGTwVwHH3A2M3Q for ; Sun, 06 Oct 2013 15:07:57 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r96M7vQQ020591 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Oct 2013 18:07:57 -0400 Received: from [10.10.56.55] (vpn-56-55.rdu2.redhat.com [10.10.56.55]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r96M7u23016512 for ; Sun, 6 Oct 2013 18:07:56 -0400 Message-ID: <5251DF3C.7040805@redhat.com> Date: Sun, 06 Oct 2013 18:07:56 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: PCP Subject: First Cut at Avahi Support for PCP Servers Content-Type: multipart/mixed; boundary="------------050303020109030905040103" X-ASG-Orig-Subj: First Cut at Avahi Support for PCP Servers X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381097277 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 This is a multi-part message in MIME format. --------------050303020109030905040103 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi All, I wanted to run this past you all for comments before committing or pushing anything. It's code that enables PCP server's to announce themselves over the local network using Avahi, if available. o Most of the new code is in the file avahi.c which would be part of libpcp (src/libpcp/src/avahi.c). o This code is accessed via the new API functions __pmServerAdvertisePresence() and __pmServerUnadvertisePresence(). o The Avhahi code is compiled out if the necessary Avahi headers/libraries are not available. o As en example, in the patch, the new API functions are called from PMCD. As it stands, this code is a working prototype. Let me know if this is headed in the right direction. Also any help with the autoconf/spec stuff is always appreciated. Thanks, Dave --------------050303020109030905040103 Content-Type: text/plain; charset=UTF-8; name="pcp-avahi.patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pcp-avahi.patch.txt" diff --git a/build/rpm/pcp.spec.in b/build/rpm/pcp.spec.in index 99c8644..e8e6183 100644 --- a/build/rpm/pcp.spec.in +++ b/build/rpm/pcp.spec.in @@ -13,6 +13,9 @@ BuildRequires: python-devel BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: perl(ExtUtils::MakeMaker) +%if "@enable_dns_sd@" == "true" +BuildRequires: avahi-devel +%endif %if "@enable_secure@" == "true" BuildRequires: nss-devel BuildRequires: cyrus-sasl-devel diff --git a/configure.in b/configure.in index ebecdbf..f88b5fa 100644 --- a/configure.in +++ b/configure.in @@ -78,6 +78,12 @@ AC_ARG_WITH( [pcp_group=pcp]) AC_SUBST(pcp_group) +AC_ARG_WITH([dns-sd], + [AC_HELP_STRING([--with-dns-sd], + [enable support for pmcd dns-sd announcements (default is on)])] + [do_dns_sd=$withval; PACKAGE_CONFIGURE="$PACKAGE_CONFIGURE --with-dns-sd=$withval"], + [do_dns_sd=no]) + # # Note: the following environment variables may be # set to override the defaults. @@ -242,6 +248,28 @@ then AC_SUBST(DTRACE) fi +dnl Check for DNS-SD +AS_IF([test "x$do_dns_sd" != "xno"], [ + # on linux, avahi + PKG_CHECK_MODULES([avahi], [avahi-client], + [enable_dns_sd=true + AC_CHECK_LIB(avahi-client, avahi_client_new, + [lib_for_avahi="-lavahi-common -lavahi-client"], + [enable_dns_sd=false]) + AC_DEFINE([HAVE_AVAHI],[1],[Define to 1 if you have the avahi libraries.]) + ], + [enable_dns_sd=false]) + AC_CHECK_HEADERS([avahi-client/publish.h], [], [enable_dns_sd=false]) + AC_CHECK_HEADERS([avahi-common/alternative.h], [], [enable_dns_sd=false]) + if test "$enable_dns_sd" != "true" + then + AC_MSG_ERROR(cannot enable DNS-SD. Avahi not found) + fi +]) +AC_SUBST(enable_dns_sd) +AC_SUBST(lib_for_avahi) +AC_SUBST(avahi_CFLAGS) + # setup additional platform-specific binary search PATH components pcp_platform_paths="" case $target_os diff --git a/src/include/builddefs.in b/src/include/builddefs.in index 61047ee..30a7c7c 100644 --- a/src/include/builddefs.in +++ b/src/include/builddefs.in @@ -125,6 +125,7 @@ PIELDFLAGS = @PIELDFLAGS@ NSSCFLAGS = @NSSCFLAGS@ NSPRCFLAGS = @NSPRCFLAGS@ SASLCFLAGS = @SASLCFLAGS@ +AVAHICFLAGS = @avahi_CFLAGS@ LDFLAGS += $(CFLAGS_ABI) $(PLDFLAGS) $(WARN_OFF) $(PCP_LIBS) $(LLDFLAGS) @@ -213,6 +214,7 @@ LIB_FOR_NSS = @lib_for_nss@ LIB_FOR_NSPR = @lib_for_nspr@ LIB_FOR_SASL = @lib_for_sasl@ LIB_FOR_SSL = @lib_for_ssl@ +LIB_FOR_AVAHI = @lib_for_avahi@ HAVE_LIBMICROHTTPD = @HAVE_LIBMICROHTTPD@ diff --git a/src/include/pcp/config.h.in b/src/include/pcp/config.h.in index c65dd7c..d0b3e79 100644 --- a/src/include/pcp/config.h.in +++ b/src/include/pcp/config.h.in @@ -193,6 +193,7 @@ extern "C" { /* define which libraries are available */ #undef HAVE_SECURE_SOCKETS +#undef HAVE_AVAHI #undef HAVE_STATIC_PROBES #undef HAVE_LIBREGEX #undef HAVE_READLINE diff --git a/src/include/pcp/impl.h b/src/include/pcp/impl.h index aa2c992..bc3a33d 100644 --- a/src/include/pcp/impl.h +++ b/src/include/pcp/impl.h @@ -80,6 +80,8 @@ extern int __pmGetInternalState(void); * environment */ #define SERVER_PORT 44321 +#define SERVER_SERVICE_NAME "PCP PMCD daemon" +#define SERVER_SERVICE_TAG "_pmcd._tcp" /* * port that clients connect to pmproxy(1) on by default, over-ride with @@ -645,6 +647,8 @@ typedef enum { PM_SERVER_FEATURES } __pmServerFeature; +typedef struct __pmServerPresence __pmServerPresence; + extern int __pmServerHasFeature(__pmServerFeature); extern int __pmServerSetFeature(__pmServerFeature); extern int __pmServerAddPorts(const char *); @@ -658,6 +662,8 @@ extern int __pmServerOpenRequestPorts(__pmFdSet *, int); extern void __pmServerCloseRequestPorts(void); extern void __pmServerDumpRequestPorts(FILE *); extern char *__pmServerRequestPortString(int, char *, size_t); +extern __pmServerPresence *__pmServerAdvertisePresence(const char *, const char *, int); +extern void __pmServerUnadvertisePresence(__pmServerPresence *); /* * Per-context controls for archives and logs diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile index f6dc1a4..547e2ca 100644 --- a/src/libpcp/src/GNUmakefile +++ b/src/libpcp/src/GNUmakefile @@ -27,15 +27,15 @@ CFILES = connect.c context.c desc.c err.c fetch.c freeresult.c \ stuffvalue.c endian.c config.c auxconnect.c auxserver.c \ p_lcontrol.c p_lrequest.c p_lstatus.c logconnect.c logcontrol.c \ connectlocal.c derive.c derive_fetch.c events.c lock.c hash.c \ - fault.c access.c + fault.c access.c avahi.c HFILES = derive.h internal.h LSRCFILES = check-statics ifeq "$(ENABLE_SECURE)" "true" -LLDLIBS += $(LIB_FOR_SSL) $(LIB_FOR_NSS) $(LIB_FOR_NSPR) $(LIB_FOR_SASL) -LCFLAGS += $(NSSCFLAGS) $(NSPRCFLAGS) $(SASLCFLAGS) +LLDLIBS += $(LIB_FOR_SSL) $(LIB_FOR_NSS) $(LIB_FOR_NSPR) $(LIB_FOR_SASL) $(LIB_FOR_AVAHI) +LCFLAGS += $(NSSCFLAGS) $(NSPRCFLAGS) $(SASLCFLAGS) $(AVAHICFLAGS) CFILES += secureserver.c secureconnect.c else LSRCFILES += secureserver.c secureconnect.c diff --git a/src/libpcp/src/check-statics b/src/libpcp/src/check-statics index 5ed1567..6a7e6c6 100755 --- a/src/libpcp/src/check-statics +++ b/src/libpcp/src/check-statics @@ -99,6 +99,7 @@ auxserver.o b localSocketPath # single-threaded server scope d localSocketFd # single-threaded server scope b ?server_features # single-threaded server scope +avahi.o checksum.o config.o [SDR] ?__pmNativeConfig # const diff --git a/src/pmcd/src/pmcd.c b/src/pmcd/src/pmcd.c index 686cafc..2386181 100644 --- a/src/pmcd/src/pmcd.c +++ b/src/pmcd/src/pmcd.c @@ -49,6 +49,7 @@ static pid_t killer_pid; static uid_t killer_uid; #endif static int killer_sig; +static __pmServerPresence *serverPresence; static void DontStart(void) @@ -413,6 +414,9 @@ Shutdown(void) { int i; + /* No longer advertise our presence on the network. */ + __pmServerUnadvertisePresence(serverPresence); + for (i = 0; i < nAgents; i++) { AgentInfo *ap = &agent[i]; if (!ap->status.connected) @@ -961,6 +965,11 @@ main(int argc, char *argv[]) __pmServerDumpRequestPorts(stderr); fflush(stderr); + /* Advertise our presence on the network. */ + serverPresence = __pmServerAdvertisePresence(SERVER_SERVICE_NAME, + SERVER_SERVICE_TAG, + SERVER_PORT); + /* all the work is done here */ ClientLoop(); --------------050303020109030905040103 Content-Type: text/x-csrc; name="avahi.c" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="avahi.c" /* * Copyright (c) 2013 Red Hat. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ #include #include "pmapi.h" #include "impl.h" #if HAVE_AVAHI #include #include #include #include #include struct __pmServerPresence { char *avahi_service_name; const char *avahi_service_tag; int port; AvahiThreadedPoll *avahi_threaded_poll; AvahiClient *avahi_client; AvahiEntryGroup *avahi_group; }; static void entryGroupCallback( AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata ); static void createServices(AvahiClient *c, __pmServerPresence *s) { char *n; int ret; assert (c); /* * If this is the first time we're called, create a new * entry group if necessary. */ if (! s->avahi_group) { if (! (s->avahi_group = avahi_entry_group_new(c, entryGroupCallback, s))) { __pmNotifyErr(LOG_ERR, "avahi_entry_group_new () failed: %s", avahi_strerror (avahi_client_errno(c))); goto fail; } } /* * If the group is empty (either because it was just created, or * because it was reset previously, add our entries. */ if (avahi_entry_group_is_empty(s->avahi_group)) { __pmNotifyErr(LOG_INFO, "Adding Avahi service '%s'", s->avahi_service_name); /* * We will now add our service to the entry group. Only services with the * same name should be put in the same entry group. */ if ((ret = avahi_entry_group_add_service(s->avahi_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, (AvahiPublishFlags)0, s->avahi_service_name, s->avahi_service_tag, NULL, NULL, s->port, NULL)) < 0) { if (ret == AVAHI_ERR_COLLISION) goto collision; __pmNotifyErr(LOG_ERR, "Failed to add %s service: %s", s->avahi_service_tag, avahi_strerror(ret)); goto fail; } /* Tell the server to register the service. */ if ((ret = avahi_entry_group_commit(s->avahi_group)) < 0) { __pmNotifyErr(LOG_ERR, "Failed to commit avahi entry group: %s", avahi_strerror(ret)); goto fail; } } return; collision: /* * A service name collision with a local service happened. * pick a new name. */ n = avahi_alternative_service_name(s->avahi_service_name); avahi_free(s->avahi_service_name); s->avahi_service_name = n; __pmNotifyErr(LOG_WARNING, "Avahi service name collision, renaming service to '%s'", s->avahi_service_name); avahi_entry_group_reset(s->avahi_group); createServices (c, s); return; fail: avahi_entry_group_reset(s->avahi_group); } static void entryGroupCallback( AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata ) { __pmServerPresence *s = (__pmServerPresence *)userdata; assert(g == s->avahi_group || s->avahi_group == NULL); s->avahi_group = g; /* Called whenever the entry group state changes. */ switch (state) { case AVAHI_ENTRY_GROUP_ESTABLISHED: /* The entry group has been established successfully. */ __pmNotifyErr(LOG_INFO, "Avahi service '%s' successfully established.", s->avahi_service_name); break; case AVAHI_ENTRY_GROUP_COLLISION: { char *n; /* A service name collision with a remote service happened. * Let's pick a new name ... */ n = avahi_alternative_service_name(s->avahi_service_name); avahi_free(s->avahi_service_name); s->avahi_service_name = n; __pmNotifyErr(LOG_WARNING, "Avahi service name collision, renaming service to '%s'", s->avahi_service_name); /* ... and recreate the services. */ createServices(avahi_entry_group_get_client(g), s); break; } case AVAHI_ENTRY_GROUP_FAILURE: /* Some kind of failure happened. */ __pmNotifyErr(LOG_ERR, "Avahi entry group failure: %s", avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g)))); break; case AVAHI_ENTRY_GROUP_UNCOMMITED: case AVAHI_ENTRY_GROUP_REGISTERING: break; } } static void cleanupClient(__pmServerPresence *s) { /* This also frees the entry group, if any. */ if (s->avahi_client) { avahi_client_free(s->avahi_client); s->avahi_client = 0; s->avahi_group = 0; } } static void clientCallback(AvahiClient *c, AvahiClientState state, void *userdata) { assert(c); __pmServerPresence *s = (__pmServerPresence *)userdata; /* Called whenever the client or server state changes. */ switch (state) { case AVAHI_CLIENT_S_RUNNING: /* * The server has started successfully and registered its host * name on the network, so it's time to create our services. */ createServices(c, s); break; case AVAHI_CLIENT_FAILURE: __pmNotifyErr(LOG_ERR, "Avahi client failure: %s", avahi_strerror(avahi_client_errno(c))); if (avahi_client_errno (c) == AVAHI_ERR_DISCONNECTED) { int error; /* * The client has been disconnected; probably because the avahi daemon has been * restarted. We can free the client here and try to reconnect using a new one. * Passing AVAHI_CLIENT_NO_FAIL allows the new client to be * created, even if the avahi daemon is not running. Our service will be advertised * if/when the daemon is started. */ cleanupClient(s); s->avahi_client = avahi_client_new(avahi_threaded_poll_get(s->avahi_threaded_poll), (AvahiClientFlags)AVAHI_CLIENT_NO_FAIL, clientCallback, s, & error); } break; case AVAHI_CLIENT_S_COLLISION: /* * Drop our registered services. When the server is back * in AVAHI_SERVER_RUNNING state we will register them * again with the new host name. * Fall through ... */ case AVAHI_CLIENT_S_REGISTERING: /* * The server records are now being established. This * might be caused by a host name change. We need to wait * for our own records to register until the host name is * properly esatblished. */ if (s->avahi_group) avahi_entry_group_reset (s->avahi_group); break; case AVAHI_CLIENT_CONNECTING: /* * The avahi-daemon is not currently running. Our service will be advertised * if/when the deamon is started. */ __pmNotifyErr(LOG_WARNING, "The Avahi daemon is not running. Avahi service '%s' will be established when the deamon is started", s->avahi_service_name); break; } } static void cleanup(__pmServerPresence *s) { if (s == NULL) return; if (s->avahi_service_name) __pmNotifyErr(LOG_INFO, "Removing Avahi service '%s'", s->avahi_service_name); /* Stop the avahi client, if it's running. */ if (s->avahi_threaded_poll) avahi_threaded_poll_stop(s->avahi_threaded_poll); /* Clean up the avahi objects. The order of freeing these is significant. */ cleanupClient(s); if (s->avahi_threaded_poll) { avahi_threaded_poll_free(s->avahi_threaded_poll); s->avahi_threaded_poll = 0; } if (s->avahi_service_name) { avahi_free(s->avahi_service_name); s->avahi_service_name = 0; } } /* The entry point for the avahi client thread. */ static __pmServerPresence * publishService(const char *serviceName, const char *serviceTag, int port) { int error; __pmServerPresence *s = calloc(1, sizeof(*s)); if (s) { /* Save the given parameters. */ s->avahi_service_name = avahi_strdup(serviceName); /* may get reallocated */ s->avahi_service_tag = serviceTag; s->port = port; /* Allocate main loop object. */ if (! (s->avahi_threaded_poll = avahi_threaded_poll_new())) { __pmNotifyErr(LOG_ERR, "Failed to create avahi threaded poll object."); goto fail; } /* * Always allocate a new client. Passing AVAHI_CLIENT_NO_FAIL allows the client to be * created, even if the avahi daemon is not running. Our service will be advertised * if/when the daemon is started. */ s->avahi_client = avahi_client_new(avahi_threaded_poll_get(s->avahi_threaded_poll), (AvahiClientFlags)AVAHI_CLIENT_NO_FAIL, clientCallback, s, &error); /* Check whether creating the client object succeeded. */ if (! s->avahi_client) { __pmNotifyErr(LOG_ERR, "Failed to create avahi client: %s", avahi_strerror(error)); goto fail; } /* Run the main loop. */ avahi_threaded_poll_start(s->avahi_threaded_poll); } return s; fail: cleanup(s); free(s); return NULL; } #endif // HAVE_AVAHI __pmServerPresence * __pmServerAdvertisePresence(const char *serviceName, const char *serviceTag, int port) { #if HAVE_AVAHI return publishService (serviceName, serviceTag, port); #else __pmNotifyErr(LOG_ERR, "Unable to advertise presence on the network. Avahi is not available"); return NULL; #endif } void __pmServerUnadvertisePresence(__pmServerPresence *s) { #if HAVE_AVAHI cleanup(s); #endif } --------------050303020109030905040103-- From debbugs@buxtehude.debian.org Sun Oct 6 17:09:14 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 9D5577F52 for ; Sun, 6 Oct 2013 17:09:14 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id 1FD89AC002 for ; Sun, 6 Oct 2013 15:09:10 -0700 (PDT) X-ASG-Debug-ID: 1381097349-04cb6c3777984700001-S8gJnT Received: from buxtehude.debian.org (buxtehude.debian.org [140.211.166.26]) by cuda.sgi.com with ESMTP id Sz49jgaOJDhumvJE (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sun, 06 Oct 2013 15:09:09 -0700 (PDT) X-Barracuda-Envelope-From: debbugs@buxtehude.debian.org X-Barracuda-Apparent-Source-IP: 140.211.166.26 Received: from debbugs by buxtehude.debian.org with local (Exim 4.80) (envelope-from ) id 1VSwVe-0008SO-33; Sun, 06 Oct 2013 22:09:06 +0000 X-Loop: owner@bugs.debian.org Subject: Bug#725627: pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory Reply-To: Cyril Brulebois , 725627@bugs.debian.org X-ASG-Orig-Subj: Bug#725627: pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory Resent-From: Cyril Brulebois Resent-To: debian-bugs-dist@lists.debian.org Resent-Cc: kibi@debian.org, debian-bsd@lists.debian.org, PCP Development Team X-Loop: owner@bugs.debian.org Resent-Date: Sun, 06 Oct 2013 22:09:01 +0000 Resent-Message-ID: X-Debian-PR-Message: report 725627 X-Debian-PR-Package: src:pcp X-Debian-PR-Keywords: X-Debian-PR-Source: pcp Received: via spool by submit@bugs.debian.org id=B.138109714230784 (code B); Sun, 06 Oct 2013 22:09:01 +0000 Received: (at submit) by bugs.debian.org; 6 Oct 2013 22:05:42 +0000 Received: from home.mraw.org ([82.236.137.215] helo=bowmore.home.mraw.org) by buxtehude.debian.org with esmtp (Exim 4.80) (envelope-from ) id 1VSwSM-0007zX-6l for submit@bugs.debian.org; Sun, 06 Oct 2013 22:05:42 +0000 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Cyril Brulebois To: Debian Bug Tracking System Message-ID: <20131006220536.3962.18425.reportbug@bowmore.home.mraw.org> X-Mailer: reportbug 6.4.4 Date: Mon, 07 Oct 2013 00:05:36 +0200 Delivered-To: submit@bugs.debian.org Resent-Sender: Debian BTS X-Barracuda-Connect: buxtehude.debian.org[140.211.166.26] X-Barracuda-Start-Time: 1381097349 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141244 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain Source: pcp Version: 3.8.4 Severity: serious Justification: FTBFS Hi, your package no longer builds on kfreebsd-*: | gcc -fPIC -fno-strict-aliasing -D_GNU_SOURCE -fstack-protector-all -D_FORTIFY_SOURCE=2 -I../../../src/pmcd/src -I../../../src/libpcp/src -DPMCD_INTERNAL -I/usr/include/nss -I/usr/include/nspr -Wall -O2 -g -DPCP_DEBUG -DPCP_VERSION=\"3.8.4\" -I../../../src/include -I../../../src/include/pcp -c -o trace.o trace.c | trace.c:19:20: fatal error: probes.h: No such file or directory | #include "probes.h" | ^ | compilation terminated. Full build logs: https://buildd.debian.org/status/package.php?p=pcp&suite=sid Feel free to contact debian-bsd@ (cc'd) if you need help. Mraw, KiBi. From debbugs@buxtehude.debian.org Sun Oct 6 18:51:11 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id E46887F52 for ; Sun, 6 Oct 2013 18:51:10 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 669EDAC001 for ; Sun, 6 Oct 2013 16:51:07 -0700 (PDT) X-ASG-Debug-ID: 1381103465-04cbb02c3b17e7e50001-S8gJnT Received: from buxtehude.debian.org (buxtehude.debian.org [140.211.166.26]) by cuda.sgi.com with ESMTP id WEGRJQAk5EYHfwV4 (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sun, 06 Oct 2013 16:51:06 -0700 (PDT) X-Barracuda-Envelope-From: debbugs@buxtehude.debian.org X-Barracuda-Apparent-Source-IP: 140.211.166.26 Received: from debbugs by buxtehude.debian.org with local (Exim 4.80) (envelope-from ) id 1VSy6K-0001nc-RP; Sun, 06 Oct 2013 23:51:04 +0000 X-Loop: owner@bugs.debian.org Subject: Bug#725627: [pcp] Bug#725627: pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory Reply-To: Nathan Scott , 725627@bugs.debian.org X-ASG-Orig-Subj: Bug#725627: [pcp] Bug#725627: pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory Resent-From: Nathan Scott Resent-To: debian-bugs-dist@lists.debian.org Resent-Cc: PCP Development Team X-Loop: owner@bugs.debian.org Resent-Date: Sun, 06 Oct 2013 23:51:02 +0000 Resent-Message-ID: X-Debian-PR-Message: followup 725627 X-Debian-PR-Package: src:pcp X-Debian-PR-Keywords: X-Debian-PR-Source: pcp Received: via spool by 725627-submit@bugs.debian.org id=B725627.13811033545903 (code B ref 725627); Sun, 06 Oct 2013 23:51:02 +0000 Received: (at 725627) by bugs.debian.org; 6 Oct 2013 23:49:14 +0000 Received: from mx4-phx2.redhat.com ([209.132.183.25]) by buxtehude.debian.org with esmtp (Exim 4.80) (envelope-from ) id 1VSy4N-0001Wi-2T for 725627@bugs.debian.org; Sun, 06 Oct 2013 23:49:14 +0000 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r96Nn1bN028853; Sun, 6 Oct 2013 19:49:01 -0400 Date: Sun, 6 Oct 2013 19:49:01 -0400 (EDT) From: Nathan Scott To: Cyril Brulebois , 725627@bugs.debian.org Message-ID: <1972007271.2517962.1381103341104.JavaMail.root@redhat.com> In-Reply-To: <20131006220536.3962.18425.reportbug@bowmore.home.mraw.org> References: <20131006220536.3962.18425.reportbug@bowmore.home.mraw.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: Bug#725627: pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory Thread-Index: OtCLWMAq2sxMzRu0PiHW2oUmVD/xpQ== Resent-Sender: Debian BTS X-Barracuda-Connect: buxtehude.debian.org[140.211.166.26] X-Barracuda-Start-Time: 1381103466 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141249 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > ... > Full build logs: > https://buildd.debian.org/status/package.php?p=pcp&suite=sid > > Feel free to contact debian-bsd@ (cc'd) if you need help. > Thanks - this is fixed upstream, expected to arrive in pcp-3.8.5 (later this week, hopefully). cheers. -- Nathan From nscott@redhat.com Sun Oct 6 22:29:17 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id E5D1E7F52 for ; Sun, 6 Oct 2013 22:29:17 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id BA42A8F8040 for ; Sun, 6 Oct 2013 20:29:17 -0700 (PDT) X-ASG-Debug-ID: 1381116553-04bdf053878e86d0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id wqmpMb0cWHVWfhUu for ; Sun, 06 Oct 2013 20:29:13 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r973TCxl029108; Sun, 6 Oct 2013 23:29:12 -0400 Date: Sun, 6 Oct 2013 23:29:12 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: "Frank Ch. Eigler" Cc: PCP Mailing List Message-ID: <1551478303.2549744.1381116552518.JavaMail.root@redhat.com> In-Reply-To: References: <1717961238.2089908.1380100281235.JavaMail.root@redhat.com> Subject: Re: RFC: filtered metrics MIME-Version: 1.0 X-ASG-Orig-Subj: Re: RFC: filtered metrics Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: filtered metrics Thread-Index: +t0RGUB4kjIBFHsSxe3awsvD362OQQ== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1381116553 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141255 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > > nathans wrote: > > > Goal: Transparent mechanism for client tools to perform a metric > > modification operation (likely a pmStore(3)) before starting to > > fetch values for metrics. This is to provide a per-user or per- > > monitor-host customisation (filtering) of the values returned. [...] > > Just want to highlight the fact that as this would be additional state > stored at pmcd for the clients, it needs to be restored upon a > pmReconnectContext(). > *nod* > > > Approach: > > Perhaps we could introduce known directories (/etc/pcp/filtered/ and > > $HOME/.pcp/filtered?) with files containing metric name:value mappings > > to store [...] > > It seems likely that this filtering would be for ad-hoc purposes, with > possibly different filters in action for different clients. Thus, > hoping to make them persist in user- or especially system-wide default > files is probably not that helpful. > > Maybe they could be left in files. Or maybe the pcp clients can earn > an additional option like pmevent, '-x [metric:]filter'. pmlogger I'm trying to avoid that, as it means new code needed for each client. Also, good chance some PMDAs will need filters that are quite complex to specify on the command line (like scripts). Or with syntax that is conflicting/awkward to use with shell syntax (back-quoting painful and error-prone, so good to avoid that IMO). > could grow some syntax to do the equivalent pmStores for each batch. > (It could make sense to filter the same metrics in multiple different > ways and log them at different rates.) Having to deal with multiple stores for one metric would ratchet up the complexity considerably, on both client and server sides of the fence (actually, I can't see a way to implement that at all, without having to do a store before every fetch? - the server side doesn't know anything about clustering/grouping on the client side, currently). This seems like a pretty unusual corner case, I'm punting it'll suffice to mandate separate contexts for such cases (which'll Just Work, as-is). > > [...] Should we mandate use of string metrics always for these > > things? (the one case we have that used integers could be done as a > > string instead, and its not yet released). [...] > > Substring match? > Regular expression? > Arithmetic expression? > General PMIE predicate? *nod* wireshark filter?, on/off?, sql? - infinite other options. We should ensure all of the above are readily achievable & allow people using them to be creative in coming up with their own filter concepts. I think the advantages of not having to worry about different types for these metrics far outweighs the overheads (complexity, error handling, round-trips to pmcd) of mandating strings only. So, I'm more and more convinced we should opt for string-only filter metrics for this general case. The option is always there to not use this mechanism, and have a custom client/pmda interaction like we can today. But for a general purpose mechanism, strings seem like the way to go to me. cheers. -- Nathan From fche@redhat.com Mon Oct 7 09:00:41 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 3F3BA7F52 for ; Mon, 7 Oct 2013 09:00:41 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id D255AAC009 for ; Mon, 7 Oct 2013 07:00:37 -0700 (PDT) X-ASG-Debug-ID: 1381154433-04cbb02c3c1817ce0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id Xg0xnyUBxmnjrn0N for ; Mon, 07 Oct 2013 07:00:33 -0700 (PDT) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r97E0W6e027250 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Oct 2013 10:00:33 -0400 Received: from fche.csb (vpn-48-118.rdu2.redhat.com [10.10.48.118]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r97E0Fwm002707; Mon, 7 Oct 2013 10:00:15 -0400 Received: by fche.csb (Postfix, from userid 2569) id 9913B580FB; Mon, 7 Oct 2013 10:00:14 -0400 (EDT) To: Dave Brolley Cc: PCP Subject: Re: First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> X-ASG-Orig-Subj: Re: First Cut at Avahi Support for PCP Servers From: fche@redhat.com (Frank Ch. Eigler) Date: Mon, 07 Oct 2013 10:00:14 -0400 In-Reply-To: <5251DF3C.7040805@redhat.com> (Dave Brolley's message of "Sun, 06 Oct 2013 18:07:56 -0400") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381154433 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Hi, Dave - > I wanted to run this past you all for comments before committing or > pushing anything. It's code that enables PCP server's to announce > themselves over the local network using Avahi, if available. Great start! I have only a whitespace nit (a lot of the lines seem unnecessarily wide) and this observatioN > @@ -961,6 +965,11 @@ main(int argc, char *argv[]) > __pmServerDumpRequestPorts(stderr); > fflush(stderr); > > + /* Advertise our presence on the network. */ > + serverPresence = __pmServerAdvertisePresence(SERVER_SERVICE_NAME, > + SERVER_SERVICE_TAG, > + SERVER_PORT); > + Doing this in pmcd's main() is not ideal. $SERVER_PORT can be easily overridden by this time. We'd want the actual port numbers used for ipv4 (and separately, ipv6!) listening announced. - FChE From fche@redhat.com Mon Oct 7 09:29:40 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 70D877F52 for ; Mon, 7 Oct 2013 09:29:40 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 4F0B1304075 for ; Mon, 7 Oct 2013 07:29:37 -0700 (PDT) X-ASG-Debug-ID: 1381156176-04cbb02c3c1819a00001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id 0jhBnRSW0bXbExfj for ; Mon, 07 Oct 2013 07:29:36 -0700 (PDT) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r97ETasD005812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Oct 2013 10:29:36 -0400 Received: from fche.csb (vpn-48-118.rdu2.redhat.com [10.10.48.118]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r97ETZDG015616; Mon, 7 Oct 2013 10:29:35 -0400 Received: by fche.csb (Postfix, from userid 2569) id 01092580FB; Mon, 7 Oct 2013 10:29:34 -0400 (EDT) To: Nathan Scott Cc: pcp@oss.sgi.com Subject: Re: RFC: filtered metrics References: <1717961238.2089908.1380100281235.JavaMail.root@redhat.com> <1551478303.2549744.1381116552518.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: RFC: filtered metrics From: fche@redhat.com (Frank Ch. Eigler) Date: Mon, 07 Oct 2013 10:29:34 -0400 In-Reply-To: <1551478303.2549744.1381116552518.JavaMail.root@redhat.com> (Nathan Scott's message of "Sun, 6 Oct 2013 23:29:12 -0400 (EDT)") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381156176 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 nathans wrote: >> [...] >> Maybe they could be left in files. Or maybe the pcp clients can earn >> an additional option like pmevent, '-x [metric:]filter'. pmlogger > > I'm trying to avoid that, as it means new code needed for each client. To some extent, OTOH we already have some common command line argument parsing/handling in libpcp. > Also, good chance some PMDAs will need filters that are quite complex > to specify on the command line (like scripts). So instead of passing arguments on the command line, you'd imagine passing arguments in a temporary file? That's not unheard of (like DOS's @FILE), but usually thought of as a last resort. >> (It could make sense to filter the same metrics in multiple different >> ways and log them at different rates.) > > Having to deal with multiple stores [...] > This seems like a pretty unusual corner case, I'm punting it'll suffice > to mandate separate contexts for such cases (which'll Just Work, as-is). Yes, I was thinking of multiple contexts for them, but that wouldn't help if libpcp automagically pulled in the same default filter files for them all. >> > [...] Should we mandate use of string metrics always for these >> > things? (the one case we have that used integers could be done as a >> > string instead, and its not yet released). [...] >> >> Substring match? >> Regular expression? >> Arithmetic expression? >> General PMIE predicate? > > *nod* wireshark filter?, on/off?, sql? - infinite other options. We > should ensure all of the above are readily achievable & allow people > using them to be creative in coming up with their own filter concepts. Back up a bit. It would help to give a worked-out example or three about what these could look like. Obviously, the more specialize the filtering, the more it has to be pushed toward the PMDAs and/or clients, but OTOH that makes the PMAPI / pmcd contribution rather slim or even zero. - FChE From brolley@redhat.com Mon Oct 7 10:27:43 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 9DB6B7F52 for ; Mon, 7 Oct 2013 10:27:43 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 49535AC004 for ; Mon, 7 Oct 2013 08:27:40 -0700 (PDT) X-ASG-Debug-ID: 1381159659-04bdf053879136a0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id Vbl145jIkbLwIvL1 for ; Mon, 07 Oct 2013 08:27:39 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r97FRdxo032699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Oct 2013 11:27:39 -0400 Received: from [10.10.54.185] (vpn-54-185.rdu2.redhat.com [10.10.54.185]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r97FRcnv010955; Mon, 7 Oct 2013 11:27:38 -0400 Message-ID: <5252D2E9.20200@redhat.com> Date: Mon, 07 Oct 2013 11:27:37 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: "Frank Ch. Eigler" CC: PCP Subject: Re: First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> X-ASG-Orig-Subj: Re: First Cut at Avahi Support for PCP Servers In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381159659 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 On 10/07/2013 10:00 AM, Frank Ch. Eigler wrote: > Hi, Dave - > >> I wanted to run this past you all for comments before committing or >> pushing anything. It's code that enables PCP server's to announce >> themselves over the local network using Avahi, if available. > Great start! > > I have only a whitespace nit (a lot of the lines seem unnecessarily > wide) and this observatioN Understood. I think my editor window comes up with 100 columns where some probably still stick to the (now) historically irrelevant 80 columns. > > >> @@ -961,6 +965,11 @@ main(int argc, char *argv[]) >> __pmServerDumpRequestPorts(stderr); >> fflush(stderr); >> >> + /* Advertise our presence on the network. */ >> + serverPresence = __pmServerAdvertisePresence(SERVER_SERVICE_NAME, >> + SERVER_SERVICE_TAG, >> + SERVER_PORT); >> + > Doing this in pmcd's main() is not ideal. $SERVER_PORT can be easily > overridden by this time. We'd want the actual port numbers used for > ipv4 (and separately, ipv6!) listening announced. OK. Good catch. re not using using the default port number. Of course it can be overridden. IPv4 and IPv6 do both listen on the same port, however. In PMCD, this call can only be made from main, after the port has been established or at the top of ClientLoop() and I thought that the latter hid it unnecessarily. Dave From brolley@redhat.com Mon Oct 7 15:49:29 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id C36987F37 for ; Mon, 7 Oct 2013 15:49:29 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 5FB05AC002 for ; Mon, 7 Oct 2013 13:49:26 -0700 (PDT) X-ASG-Debug-ID: 1381178962-04bdf02f211897da0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id jt4fGC4B2egICUPS for ; Mon, 07 Oct 2013 13:49:22 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r97KnLlZ010510 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Oct 2013 16:49:21 -0400 Received: from [10.10.55.74] (vpn-55-74.rdu2.redhat.com [10.10.55.74]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r97KnKWV020028 for ; Mon, 7 Oct 2013 16:49:21 -0400 Message-ID: <52531E50.70602@redhat.com> Date: Mon, 07 Oct 2013 16:49:20 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: PCP Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers In-Reply-To: <5251DF3C.7040805@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381178962 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Based on Frank's feedback, I have pushed this commit to the brolley/dev branch on pcpfans. The updated code supports auto-advertising of all request ports during __pmServerOpenRequestPorts() and auto-unadvertising during __pmServerCloseRequestPorts(). With pmcd, there is currently a small issue in that it opens its log after calling __pmServerOpenRequestPorts(), so the informational log messages indicating that the service is being advertised end up on stderr. Is there any reason not to open the log first? Dave --------------------------- commit 5cdeaa18b367a16d80a1a6066116d74749281929 Author: Dave Brolley Date: Mon Oct 7 16:21:55 2013 -0400 libpcp support for servers to advertise on the local network. - Support is provided by Avahi, where available and otherwise disabled. - Servers indicate that they want to advertise their presence by calling __pmServerSetServiceName() and/or __pmServerSetServiceTag(). When one or both of these functions has been called before __pmServerOpenRequestPorts(), then __pmServerOpenRequestPorts() will advertise the server once for each port it is listening on. The service for each port will be unadvertised when __pmCloseRequestPorts() is called or when the server shuts down. - Servers may also advertise themselves directly by calling __pmServerAdvertisePresence()/__pmServerUnadvertisePresence() From nscott@redhat.com Mon Oct 7 22:36:18 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 4752D7F69 for ; Mon, 7 Oct 2013 22:36:18 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 348AF304039 for ; Mon, 7 Oct 2013 20:36:15 -0700 (PDT) X-ASG-Debug-ID: 1381203369-04cb6c37779e96d0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 3cnFrlovThZ7fFZe for ; Mon, 07 Oct 2013 20:36:10 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r983a9Wm002180; Mon, 7 Oct 2013 23:36:09 -0400 Date: Mon, 7 Oct 2013 23:36:09 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Message-ID: <74418989.3249646.1381203369233.JavaMail.root@redhat.com> In-Reply-To: <1285989644.16216362.1378636215997.JavaMail.root@redhat.com> References: <1428186571.5255560.1377416000569.JavaMail.root@redhat.com> <21889907.5255563.1377416062936.JavaMail.root@redhat.com> <1285989644.16216362.1378636215997.JavaMail.root@redhat.com> Subject: Re: pcp-doc updates: PG draft, UAG review feedback MIME-Version: 1.0 X-ASG-Orig-Subj: Re: pcp-doc updates: PG draft, UAG review feedback Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp-doc updates: PG draft, UAG review feedback Thread-Index: ZE8D2aj1PXhzTpX1wnZCdkbnP80V1iDKYdMa X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1381203370 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141289 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > ----- Original Message ----- > > > > Some notes from the PG draft: > > > > ... > > As always, quality review - thanks Frank! I've tackled the big > item of Chapter 4 - adding several new sections about pmdammv - > and a small number of the other low-hanging fruit here. I also > added in new sections describing event metrics in a fair bit of > detail - a new version of the PG is on oss now. > > Alot of work remains to get through updates from the rest of > this review ... will get there over time, thanks. If there's Finally, we're over the line with a vastly improved Programmers Guide ... followup review comment notes below. There's other areas where we can add more text (perl/python APIs come to mind, PMIMPORT APIs, and one or two others) - but this gets us a good initial stake in the ground. Revised version is online on oss.sgi.com now. Thanks!! > > Some notes from the PG draft: > > - page ix, "Reader Comments", should include the email address Done. > - page 1, "several ways to extend PCP", the MMV stuff should also > end up being documented in as much detail as the trace stuff > Done (new sections, pictures-n-all, in Chapter 4), as mentioned earlier. > - page 6, "warning" how about a "note" or suggestion instead? Done. > > - page 6, "calls to exit(1) ... have grave implications" is too > vague. Instead, mention that the pmcd process would exit. > (It's elaborated well on page 12, maybe xref?) Done and done. > > - page 9, step 5, add "assign unique domain numbers, xref section > 2.3.2 (page 14). Done. > - page 10, step 11, pmgadgets doesn't exist in OSS pcp yet Working on that now, so will leave as-is in optimistic expectation of something arriving on that front in the not-too-distant future. > - page 16, metrictab[] trivial PMDA, the PMID sentence (cluster 0 item 1) > should spell out that this is not a complete PMID, in that the pmda's > own number will be inserted at some point. (This bit me once or twice > earlier.) *nod*, done. > - page 17, the example 2.6 counter/instantaneous rows suggests > rate-conversion is being done (at the pmda end) for the "counter" > value. No - perhaps the "at the pmda end" bit is a clue to confusion here. My understanding of the section is that its trying to explain the differences between the three metric semantics - so, for a given hypothetical metric, if we modify the metric semantics but keep everything else the same (i.e. export the same value for each of the three semantics), the table shows what the effects of this would be. The effects of rate conversion (which is done on the client side for counter type metrics) are that the difference in value between samples is calculated, divided by the difference in time (two time units). If that same value was of "instantaneous" semantics, no rate conversion is performed and the value is reported "as-is", as long as *some* value was available. In the case of "discrete" semantics, this last condition need not hold. > Is this conversion to be done per-client-context, so that > the rate is well-defined ("average rate since the last time this > same client asked") as opposed to "average rate since ... when?". > In the former case, each client can accumulate the instantaneous > values from the rate deltas. In the latter, then it seems like many > rate-"counter" metrics should also be exported as instantaneous > values. The explanation is not sufficiently clear it would seem, but I'm not doing a better job here either I suspect! Perhaps a new statement to the effect that all interpretations of semantics are performed on the client side, within the monitor tools? (have added that) > - page 19, pmda instances, need names be unique, or only numbers? There is a note on page 17 stating they need to be unique and that its the responsibility of the PMDA to ensure this. There are other subtle rules too, hmm, not covered AFAICS. (have added a new sub- section on "Instance Identification" near the start here). > - page 20, "dp->version.two ..." that .two. bit should be introduced, > and choice of .two. vs. others be outlined. Bullet dodged by using .any. and defered further discussion of the version stuff until the following sections (as we're discussing the simple PMDA, we probably want to avoid getting bogged down in this detail at this point of the story, methinks). > - page 21, the caveat under the warning relates to the page 17 issue > above, maybe xref? Done. (/me notes that refers only to "caching" PMDAs, which is not most PMDAs) > - page 25, was expecting something about the version.* bits early on > here; I think deep discussion here may muddy the water and distract from the simple aspect of pmdasimple. Added a one-liner and an xref to the detailed versioning discussion later. > why use pmdaSet*CallBack here instead of changing the > ->version.*.* variables? Yeah, they're subtely different concepts (confusingly, both are "callbacks" just of different kinds) - the version.*.* functions are each handling one specific PDU. The pmdaSet*CallBack calls are optional helpers for those PDU handlers. Its confusing because they are both "callbacks", really. Added a sentence attempting to explain. > - page 26, for the cluster/item conditions, might want to note that > we're not also checking the idp->domain number, because it's not > necessary; or perhaps add an assertion instead of a wordy > explanation Good point, done. (words added, couldn't assert as we don't have the pmdaDispatch structure here to compare its domain number to the one stamped in the pmdaMetric) > - page 26, should expand on the choice of "appropriate field in > the pmAtomValue", ie., tabulate the fields as a function of the TYPE *nod* - that mapping is covered later, added xrefs. > - page 28, store, should note implications of security, reliable-logging, > credentials Following from IRC discussion, taking "reliable-logging" to be related to pmlogger - good points, all - added several sentences here. > - page 28, simple.color store example; should explain the meaning of the > loop over j (vsp->numval) at the for loop as a teaser for the info > on page 29, like for (j=...) /* loop over instances */ Done. > - page 30, PMDA_INTERFACE_* are mentioned here for the first time; > earlier & more details please; but maybe we don't need to > document older interfaces at all Its worth doing I think - different versions used throughout PCP, and people might find any individual PMDA as a suitable starting point. Its easy to cover this anyway, since the interfaces all need to be covered and are additive. > - page 30 PMDA structures, aha, here is where the .one/.two, > PMDA_INTERFACE_* bits are described. Perhaps move this section way > ahead, ahead of 2.4 perhaps Didn't move it forward, but added earlier xrefs, as mentioned earlier. > - page 32 ... maybe move the whole PMDA setup section up ahead too; it > just makes a little more sense to me to cover the PMDA operation > from initialization onward (in a temporal sequence) I think the original author(s) structured it as they did so that it follows more or less the procedure outlined in section 2.1 - focus is first and foremost on "how to extract from target domain" (which maps to pmFetch, as the most critical thing, hence they tackled that first I suspect), and that then drives the need for further coverage of instances, descriptors, data structures, etc. And initialisation is a trivial thing at the end then, which ties it all together. That seems OK to me, if we start explaining initialisation, we need to introduce lots of topics all at once that might seem irrelevent to someone who just wants to get stuck into extracting their data. So, in the end, left that ordering as is. > - page 34, mind a small elaboration about why the pmda might want to > handle both simple_fetch and simple_fetchCallBack? Covered that earlier (simple_fetch -> PDU level, simple_fetchCallBack -> individual metric/instance within a PDU) - but its non-obvious, so added another clarification here too. > - page 35, should mention when pmdaMain might return -> exit Done. > - page 36, pmstore pmcd.control.debug, is that credential-controlled? Nope. Should be done, now that we default to local: in pmstore. May be non-trivial though cos pmdapmcd predates libpcp_pmda. > - page 37, looking forward to scox's sys/sdt.h macros being mentioned > before too long, as an additional pmda debugging technique, with > some systemtap samples; *nod*, that'd be good. Python API coverage in general is lacking also. > maybe in general, stub placeholders for > sections we know are needed/coming (like the python/etc. bindings, > pmwebapi, etc.) would be helpful *shakes head*, not a fan of doing that, since these things may never arrive and its then distracting/annoying to the reader IMO. > - page 39, .pmchart files; I didn't realize we did that. Is there > analogous handling for pmieconf / pmlogconf fragments? Not sure off the top of my head, that could be handy though. /me checks - nope, we don't do those other things (PMDA Install can of course do it itself too, but none do - for logconf, we just install the files directly & use the logconf probe function to test for the metrics needed). > - page 45, Current PMAPI Context, should mention pmUseContext to switch > (and maybe pmReconnectContext, since we haven't automated that yet) Done. > - page 46, typo "unpackaing" Done. > - page 50, programming style topics should include memory management, > specifically the styles of handing over ownership of this or that > snippet of data structure to libpcp vs. the app; this is particularly > tricky for those AGGREGATE / EVENT / _STATIC values; Events need lotsa special decode action/help from libpcp - this is now documented in a section of its own, recently added (post-review). I need to get my head around the AGGREGATE / _STATIC differences, TBH I'm not sure exactly how they affect PMAPI users. > the error handling > section should mention general policies involving partial failures > (like pmLookupNames that partly fail, partly succeed; or other cases) Done. > - page 51.., general re. section 3.8, dunno how much value a direct > man-page-extract type reference dump for all these functions has; > for a tutorial, one might want to see these functions being used, > (like the pmda/simple examples were) rather than simply enumerated I wouldn't have thought so either, but some people seem to like it - the guy who hacked the initial python bindings seemed to have a large preference for these over the man pages... *shrug*. Agreed re examples being better still. > - page 54, if the PMNS operations are rarely required in modern PCP > code, consider dropping their details from these docs; maybe just > mention and refer to the man pages Done. > - page 56, PMAPI context services, now we're talking ... this kind of > tabular overview is totally apropos for the manual > > - page 57, 3.8.1 ... back to man-page-extracts, hmm. > > - page 60, sample code, yummy > > - page 61, pmGetContextHostName ... I guess thread-unsafe? Ayup. Note added. > - page 65, record-mode is newly introduced here; maybe elaborate before > (or instead of) lunging into the API Done. > - page 69, the ...InDomArchive functions, it'd be good to get a motivation > for using these functions *nod* - one for Ken perhaps, I don't really follow what the exact circumstances are for which one would need these special variants. > - page 70, "pmview" mystery superhero Exits, stage left. Vows to return someday. > - page 76..77, some sample code, yummy > > - page 78, programming issues & examples, now we're talking! Yippee, nearly there; there's light at the end of the tunnel... > - page 83, it'd be good to get a sense as to why the trace library is > considered heavyweight, some relative-to-printf costs or something? > can't some of our own code use them? [... hah, its a train!] Weeell, on every event it allocates memory & makes blocking system calls. Also isn't thread safe. Since coding it, the world moved on and many alternative, efficient, SMP-aware tracers arrived that make alot more sense for people (and even PCP) to use than this. I think there's a strong case for a PCP static tracing API which operates at a higher level (end-to-end, distributed tracing), but this isn't the right API. So, I'd not advocate use of it within PCP either - someday I hope we can delete this code and replace it with something better (preferably with a small core that isn't in PCP, like UST?) that we can build on. cheers. -- Nathan From nscott@redhat.com Tue Oct 8 03:38:25 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 331FB7F69 for ; Tue, 8 Oct 2013 03:38:25 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id B2B8FAC001 for ; Tue, 8 Oct 2013 01:38:21 -0700 (PDT) X-ASG-Debug-ID: 1381221496-04cbb02c3a18583e0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id FnuHsVrARHnkelAC for ; Tue, 08 Oct 2013 01:38:17 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r988cGNY019772; Tue, 8 Oct 2013 04:38:16 -0400 Date: Tue, 8 Oct 2013 04:38:16 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: PCP Message-ID: <153661427.3446331.1381221496304.JavaMail.root@redhat.com> In-Reply-To: <5251DF3C.7040805@redhat.com> References: <5251DF3C.7040805@redhat.com> Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: First Cut at Avahi Support for PCP Servers Thread-Index: 3sNxQRXVwdc5zJ+RFEjGdTHOsMsSWw== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1381221496 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141294 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain Hey Dave, ----- Original Message ----- > Hi All, > > I wanted to run this past you all for comments before committing or > pushing anything. It's code that enables PCP server's to announce > themselves over the local network using Avahi, if available. > > o Most of the new code is in the file avahi.c which would be part of > libpcp (src/libpcp/src/avahi.c). > o This code is accessed via the new API functions > __pmServerAdvertisePresence() and __pmServerUnadvertisePresence(). > o The Avhahi code is compiled out if the necessary Avahi > headers/libraries are not available. > o As en example, in the patch, the new API functions are called from PMCD. Initial thoughts are - does this belong in libpcp? Thinking maybe not; given Avahi is unlikely to be the only auto-discovery model, perhaps we need a libpcp_discover with an API hiding alternate discovery models (and perhaps a SASL-like config model for configuring the discovery mechanisms to be used). Other folks tend to have lotsa different ways to do host discovery - https://www.zabbix.com/documentation/2.0/manual/discovery/network_discovery/rule - and the one sysadmin I've chatted to about this stuff :) points out that in his clouded environment, Avahi is a non-starter (apparently thats likely to be the case in all/most clouds). This hypothetical new library might also contain discovery-mechanism- specific code for catching the advertisement events and responding to them, in a mechanism-independent way? (so that this doesn't leak out into other areas of the code base). cheers. -- Nathan From fche@redhat.com Tue Oct 8 10:28:39 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 640B37F6F for ; Tue, 8 Oct 2013 10:28:39 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id 31D6D304032 for ; Tue, 8 Oct 2013 08:28:36 -0700 (PDT) X-ASG-Debug-ID: 1381246115-04bdf02f2318dcb60001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id zC2BEq19puM9WEQ0 for ; Tue, 08 Oct 2013 08:28:35 -0700 (PDT) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r98FSYlg025995 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 8 Oct 2013 11:28:35 -0400 Received: from fche.csb (vpn-48-118.rdu2.redhat.com [10.10.48.118]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r98FSYx5006032; Tue, 8 Oct 2013 11:28:34 -0400 Received: by fche.csb (Postfix, from userid 2569) id 044A7581BA; Tue, 8 Oct 2013 11:28:33 -0400 (EDT) To: Nathan Scott Cc: Dave Brolley , pcp@oss.sgi.com Subject: Re: First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> <153661427.3446331.1381221496304.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: First Cut at Avahi Support for PCP Servers From: fche@redhat.com (Frank Ch. Eigler) Date: Tue, 08 Oct 2013 11:28:33 -0400 In-Reply-To: <153661427.3446331.1381221496304.JavaMail.root@redhat.com> (Nathan Scott's message of "Tue, 8 Oct 2013 04:38:16 -0400 (EDT)") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381246115 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 nathans wrote: > [...] > Initial thoughts are - does this belong in libpcp? Thinking maybe not; > given Avahi is unlikely to be the only auto-discovery model, perhaps we > need a libpcp_discover with an API hiding alternate discovery models [...] Announcement and discovery are complementary (and asymmetric) operations, and done by different tools - they need not be together in the same library at all. But it's convenient if the code were in -some- library, since chances are multiple tools will deal with sending announcements (pmcd; future archive-server proxies at least) and performing discovery (pmlogger or its future manager; archive-server-capable clients). As to whether it should be in libpcp or libpcp_foobar, I wonder what practical consequences exist for either choice. We don't ship/version them separately. > [...] This hypothetical new library might also contain > discovery-mechanism- specific code for catching the advertisement > events and responding to them, in a mechanism-independent way? (so > that this doesn't leak out into other areas of the code base). At this point, the API consists of a single announce/unannounce pair only, and it's not really specific to avahi. (Though the _pmcd.tcp parameter string could be represented or computed internally instead of being passed.) - FChE From brolley@redhat.com Tue Oct 8 11:50:03 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 3D4D67F6F for ; Tue, 8 Oct 2013 11:50:03 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id C02BEAC002 for ; Tue, 8 Oct 2013 09:49:59 -0700 (PDT) X-ASG-Debug-ID: 1381250995-04cb6c153d1881830001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id 81nHCGVg2IkAVQ1o for ; Tue, 08 Oct 2013 09:49:55 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r98Gnt8v007909 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 8 Oct 2013 12:49:55 -0400 Received: from [10.15.16.226] ([10.15.16.226]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r98Gnsrg015978; Tue, 8 Oct 2013 12:49:54 -0400 Message-ID: <525437B2.2060802@redhat.com> Date: Tue, 08 Oct 2013 12:49:54 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: "Frank Ch. Eigler" CC: Nathan Scott , pcp@oss.sgi.com Subject: Re: First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> <153661427.3446331.1381221496304.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: First Cut at Avahi Support for PCP Servers In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381250995 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 As usual, Frank has beat me to it. In general, he said what I was going to. On 10/08/2013 11:28 AM, Frank Ch. Eigler wrote: > nathans wrote: > >> [...] >> Initial thoughts are - does this belong in libpcp? Thinking maybe not; >> given Avahi is unlikely to be the only auto-discovery model, perhaps we >> need a libpcp_discover with an API hiding alternate discovery models [...] > Announcement and discovery are complementary (and asymmetric) > operations, and done by different tools - they need not be together in > the same library at all. But it's convenient if the code were in > -some- library, since chances are multiple tools will deal with > sending announcements (pmcd; future archive-server proxies at least) > and performing discovery (pmlogger or its future manager; > archive-server-capable clients). > > As to whether it should be in libpcp or libpcp_foobar, I wonder what > practical consequences exist for either choice. We don't ship/version > them separately. This is why I put it in libpcp. My initial, initial prototype had it in pmcd only, but I thought that other PCP servers might want to announce themselves in the future. > > >> [...] This hypothetical new library might also contain >> discovery-mechanism- specific code for catching the advertisement >> events and responding to them, in a mechanism-independent way? (so >> that this doesn't leak out into other areas of the code base). > At this point, the API consists of a single announce/unannounce pair > only, and it's not really specific to avahi. (Though the _pmcd.tcp > parameter string could be represented or computed internally instead > of being passed.) Right. The service tag is currently the only avahi-specific thing that is leaking out. It could be internalized by having the server identify itself in some other way to the API (perhaps using an enum or something similar). If/when multiple discovery mechanisms are in play, each client/server would not need to know which one(s) are being used. Dave From nscott@redhat.com Tue Oct 8 21:36:59 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id B57767FF9 for ; Tue, 8 Oct 2013 21:36:59 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 31F56AC002 for ; Tue, 8 Oct 2013 19:36:58 -0700 (PDT) X-ASG-Debug-ID: 1381286215-04cbb02c3c18a2f70001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id w5jWrYR0bWpDQim4 for ; Tue, 08 Oct 2013 19:36:55 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r992assX029727 for ; Tue, 8 Oct 2013 22:36:54 -0400 Date: Tue, 8 Oct 2013 22:36:54 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: PCP Message-ID: <190564618.4040428.1381286214872.JavaMail.root@redhat.com> In-Reply-To: <197903.4040301.1381286096255.JavaMail.root@redhat.com> Subject: pcp updates: misc fixes, qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: misc fixes, qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: misc fixes, qa Thread-Index: itYEqJuJu357TFOkqfI2nUBtqvg+dg== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381286215 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141313 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev build/rpm/fedora.spec | 65 +++++++++++++++++++++------------- debian/changelog | 7 ++- man/man1/pmie_check.1 | 7 +++ man/man1/pmlogger_check.1 | 7 +++ qa/366 | 1 qa/531 | 1 qa/533 | 1 src/libpcp/src/context.c | 11 ++++- src/pmcd/rc-proc.sh | 12 ++++++ src/pmdas/linux_proc/GNUmakefile | 8 ++-- src/pmdas/linux_proc/pmlogconf.memory | 14 +++---- src/pmdas/simple/simple.c | 9 ++-- src/pmdas/systemd/systemd.c | 12 +++--- src/pmie/crontab.in | 2 - src/pmie/pmie_check.sh | 27 ++++++++++++-- src/pmlogconf/memory/localdefs | 2 - src/pmlogconf/memory/proc-linux | 7 +++ src/pmlogger/crontab.in | 2 - src/pmlogger/pmlogger_check.sh | 27 ++++++++++++-- 19 files changed, 162 insertions(+), 60 deletions(-) commit e03ac8b184aac4f1e757054cbca7d59c9ed2c406 Author: Nathan Scott Date: Wed Oct 9 12:57:43 2013 +1100 Move and make per-process auto-mem-logging not default for now We need to know a few more things first - what the impact on daily logs for logging all processes every 5min for 3 metrics is in particular. Updated test qa/366 to handle the new config state. commit 911985791697ceed19be4a47aeddd978275d865e Merge: 1220d24 6dc0c2e Author: Nathan Scott Date: Wed Oct 9 11:54:32 2013 +1100 Merge branch 'fche/dev' of ../pcpfans into dev commit 1220d24840502cfe56997ff24237b98d6225d1cd Author: Nathan Scott Date: Wed Oct 9 11:40:03 2013 +1100 Updates to the Fedora/EPEL rpm spec file (pmdaib, libs) Change the Fedora/EPEL spec file to further restrict the places that infiniband sources will be built. Further, internal tools suggest exact versioned dependencies on pcp-libs for sub-packages - make it so (previously some deps were on pcp incorrectly, some were less restrictive for subsequent package versions). commit dbce01d64e69f62b04c62490bb49498eef69f4f1 Author: Nathan Scott Date: Wed Oct 9 11:34:07 2013 +1100 Trivial sync-ups for pmdasimple with Programmers Guide commit 7ae7957d6e940ec34e9409d75ae1e6d87e4ffbeb Author: Nathan Scott Date: Wed Oct 9 11:33:12 2013 +1100 Add notes about closed bugs to deb changelog commit 7f5461c05babd32aa561e8d12b8b8ba3be2301e5 Author: Nathan Scott Date: Wed Oct 9 11:31:44 2013 +1100 Tackle a race in pmda socket setup in dbpmda tests commit 6dc0c2eac7faf886e58794d8efe78f6d9b03a876 Author: Frank Ch. Eigler Date: Fri Oct 4 18:57:24 2013 -0400 linux pmda: add a pmlogconf.memory ditty These proc.* metrics log process/memory/fault history. commit 13660354c4897f18fe4e90011d6ee0c259e12ae5 Author: Frank Ch. Eigler Date: Fri Oct 4 13:42:29 2013 -0400 systemd pmda: correct handling multiple concurrent clients We were using return values of pmdaEventNewClient (which BTW are undocumented!) as though it were a queue number, whereas we actually had a good number already as a global variable. While at it, reduce the systemd poll fallback timeout from 2 to 60 seconds, with the RHBZ979487 workaround in effect, plus prior changes that preclude us from being flooded with pent-up journal entries. commit 2942bd8220e3fb3ed321858462926299b5bd81ef Author: Nathan Scott Date: Fri Oct 4 18:24:11 2013 +1000 Correctly fix memory leak in pmie newContext failure path Earlier fix overlooked the complication that contexts might be reused, so unilaterally free'ing here is not viable. commit a7aac03ce2e66d8f107174f64a298ed4f9301ecf Author: Nathan Scott Date: Fri Oct 4 16:36:52 2013 +1000 Revert "pmNewContext: plug memory leak on failed connections" This reverts commit c21738e50e9bb4ac80f90548934b551188d46785. Test qa/281 is failing as a result, and on closer inspection we don't understand the problem properly yet. The fix is not this though, as PM_CONTEXT_FREE should be guarding us on subsequent pmNewContext calls. commit 9444d88acb77153908d866a02c64b550399a1817 Author: Nathan Scott Date: Fri Oct 4 14:45:04 2013 +1000 Make default crontab install cooperate with runlevel settings We found local pmie and pmlogger processes enabled everywhere, now that the check crontab scripts are always installed. Bit of an oversight, it resulted from service state always being ignored. This change adds an option to the check scripts such that they ensure the system runlevel state is honoured when we run the check scripts (either stopping or starting processes). commit 766b2be4af503c84f4e2b753a238efb5b8b5033f Author: Frank Ch. Eigler Date: Thu Oct 3 22:03:34 2013 -0400 systemd pmda cleanup Drop a debugging error-report, and fix getopt for -f flag. From nscott@redhat.com Tue Oct 8 21:37:34 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 831867FF9 for ; Tue, 8 Oct 2013 21:37:34 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 0F018AC002 for ; Tue, 8 Oct 2013 19:37:33 -0700 (PDT) X-ASG-Debug-ID: 1381286252-04cbb02c3c18a2ff0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id XA8jY26C4hpPzZ3G for ; Tue, 08 Oct 2013 19:37:32 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r992bWJl029768 for ; Tue, 8 Oct 2013 22:37:32 -0400 Date: Tue, 8 Oct 2013 22:37:32 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: PCP Message-ID: <405885136.4040458.1381286252004.JavaMail.root@redhat.com> Subject: pcp-gui updates: PG book updates MIME-Version: 1.0 X-ASG-Orig-Subj: pcp-gui updates: PG book updates Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp-gui updates: PG book updates Thread-Index: 3qtawFCb2bEkg7GgfDF34puvr3K6Eg== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381286252 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141313 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp-gui.git dev books/PCP_PG/pcp-programmers-guide.pdf |binary books/PCP_PG/pcp-programmers-guide.xml | 112 ++++++++++--------- books/PCP_TCS/pcp-tutorials-and-case-studies.pdf |binary books/PCP_TCS/pcp-tutorials-and-case-studies.xml | 3 books/PCP_UAG/pcp-users-and-administrators-guide.pdf |binary books/PCP_UAG/pcp-users-and-administrators-guide.xml | 3 6 files changed, 66 insertions(+), 52 deletions(-) commit 8936e831180a96f55263cf9ba197cb28bf24ca74 Author: Nathan Scott Date: Tue Oct 8 14:21:39 2013 +1100 Update known-good copies of the various guides commit 5fddf73405d03fe4e5e4503246ea8315009ce92d Author: Nathan Scott Date: Tue Oct 8 14:19:15 2013 +1100 Complete second half of Franks review comments for the Programmers Guide commit c74bad11c5909234e8137516637f5f4d3eabd818 Author: Nathan Scott Date: Mon Oct 7 18:42:37 2013 +1100 Incorporate first half of Franks review comments for the Programmers Guide From nscott@redhat.com Tue Oct 8 22:07:09 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id D5F3F7FF8 for ; Tue, 8 Oct 2013 22:07:09 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id B6F078F8074 for ; Tue, 8 Oct 2013 20:07:06 -0700 (PDT) X-ASG-Debug-ID: 1381288021-04cbb02c3a18a46a0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id T7TJxktipdMOHLJF for ; Tue, 08 Oct 2013 20:07:02 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r993711r022341; Tue, 8 Oct 2013 23:07:01 -0400 Date: Tue, 8 Oct 2013 23:07:01 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Message-ID: <1405249421.4047171.1381288021302.JavaMail.root@redhat.com> In-Reply-To: References: <1717961238.2089908.1380100281235.JavaMail.root@redhat.com> <1551478303.2549744.1381116552518.JavaMail.root@redhat.com> Subject: Re: RFC: filtered metrics MIME-Version: 1.0 X-ASG-Orig-Subj: Re: RFC: filtered metrics Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: filtered metrics Thread-Index: wZ79Gs5pPRrisEXJs8uv5/0SHtP+xg== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1381288022 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141313 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > > nathans wrote: > > >> [...] > >> Maybe they could be left in files. Or maybe the pcp clients can earn > >> an additional option like pmevent, '-x [metric:]filter'. pmlogger > > > > I'm trying to avoid that, as it means new code needed for each client. > > To some extent, OTOH we already have some common command line argument > parsing/handling in libpcp. > In the pmda library we do, but not libpcp (parsing, anyway) - but, we should tackle that (other planned little projects need it too). > > > Also, good chance some PMDAs will need filters that are quite complex > > to specify on the command line (like scripts). > > So instead of passing arguments on the command line, you'd imagine > passing arguments in a temporary file? That's not unheard of (like > DOS's @FILE), but usually thought of as a last resort. > Not sure why temporary? Thinking system wide filters like "when looking at per-process metrics, this system is expected to have N million insts, so force a system wide filter for all access to per-process metrics via a specified cgroup". FWIW, derived metrics use config file via environment variable ... which may be a just-fine model here too. I like standard, permanent location options as well for cases where one knows, really, really knows that they *always* want some filter (or derived metric, or...) to exist. If I step away from my earlier "don't want to change individual clients" comment, as I should, then command line options make alot of sense for specifying filters too. > >> > [...] Should we mandate use of string metrics always for these > >> > things? (the one case we have that used integers could be done as a > >> > string instead, and its not yet released). [...] > >> > >> Substring match? > >> Regular expression? > >> Arithmetic expression? > >> General PMIE predicate? > > > > *nod* wireshark filter?, on/off?, sql? - infinite other options. We > > should ensure all of the above are readily achievable & allow people > > using them to be creative in coming up with their own filter concepts. > > Back up a bit. It would help to give a worked-out example or three > about what these could look like. Obviously, the more specialize the > filtering, the more it has to be pushed toward the PMDAs and/or > clients, but OTOH that makes the PMAPI / pmcd contribution rather > slim or even zero. I think it should be (has to be?) up to the PMDA as to how filters will be applied, and to interpret what makes sense for its domain. All the examples I had were specific to the domains they were in (e.g. logfile filter -> regex) - so I think in terms of interpreting the filters, PMAPI/pmcd has no contribution to make other than providing transport and sending the filter string through at the appropriate time(s). Will ponder more deeply & send out some worked examples down the track. cheers. -- Nathan From fche@redhat.com Wed Oct 9 11:48:02 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 0308D7F78 for ; Wed, 9 Oct 2013 11:48:02 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id E718E8F804C for ; Wed, 9 Oct 2013 09:47:58 -0700 (PDT) X-ASG-Debug-ID: 1381337274-04cbb02c3e18db370001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id vQUfHRVoFhDth3tE for ; Wed, 09 Oct 2013 09:47:54 -0700 (PDT) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r99GliWf023550 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Oct 2013 12:47:45 -0400 Received: from fche.csb (vpn-48-118.rdu2.redhat.com [10.10.48.118]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r99Glh9Z016963; Wed, 9 Oct 2013 12:47:43 -0400 Received: by fche.csb (Postfix, from userid 2569) id 8FEEC58106; Wed, 9 Oct 2013 12:47:42 -0400 (EDT) To: Nathan Scott Cc: pcp@oss.sgi.com Subject: Re: RFC: filtered metrics References: <1717961238.2089908.1380100281235.JavaMail.root@redhat.com> <1551478303.2549744.1381116552518.JavaMail.root@redhat.com> <1405249421.4047171.1381288021302.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: RFC: filtered metrics From: fche@redhat.com (Frank Ch. Eigler) Date: Wed, 09 Oct 2013 12:47:42 -0400 In-Reply-To: <1405249421.4047171.1381288021302.JavaMail.root@redhat.com> (Nathan Scott's message of "Tue, 8 Oct 2013 23:07:01 -0400 (EDT)") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381337274 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 nathans wrote: > [...] Thinking system wide filters like "when looking at > per-process metrics, this system is expected to have N million > insts, so force a system wide filter for all access to per-process > metrics via a specified cgroup". [...] Would this be a administrative preference for security/load-limiting? If so, it's bound to be ineffective. Is it for a user's convenience, to automagically limit system view to her own context (if she's stuck within a cgroup)? That could be done by extending our use of the unix-socket SO_PEERCRED system to also pass the incoming pid to the pmdas, which could then (if desired - ie. in some PMNS subhierarchy) govern themselves accordingly. - FChE From pevans@redhat.com Wed Oct 9 12:22:42 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 73BE97F78 for ; Wed, 9 Oct 2013 12:22:42 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 63C338F8094 for ; Wed, 9 Oct 2013 10:22:39 -0700 (PDT) X-ASG-Debug-ID: 1381339358-04cbb02c3c18dda50001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id DV2xoovwuN1LTP88 for ; Wed, 09 Oct 2013 10:22:38 -0700 (PDT) X-Barracuda-Envelope-From: pevans@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r99HMb4a002119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Oct 2013 13:22:37 -0400 Received: from [10.36.4.94] (vpn1-4-94.ams2.redhat.com [10.36.4.94]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r99HMaFR012855; Wed, 9 Oct 2013 13:22:36 -0400 Message-ID: <525590DB.3080007@redhat.com> Date: Wed, 09 Oct 2013 18:22:35 +0100 From: Paul Evans User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Nathan Scott CC: PCP Mailing List Subject: pmdagfs2: Updates from continued testing and changes for future updates Content-Type: text/plain; charset=ISO-8859-1; format=flowed X-ASG-Orig-Subj: pmdagfs2: Updates from continued testing and changes for future updates Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381339358 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Hi, It's been a while since my last update to pmdagfs2, I've been on PTO for the last couple of weeks around Western Europe camping, but in-between been continuing testing on our side with the sas-calibration workloads. I plan on following up with a quick succession additional metric updates with the rest of the trace_pipe based gfs2 tracepoints as well as starting work on a client side tool to bring information for each node in the cluster to one central place. Please let me know of any issues and feedback is welcome :). Changes committed to git://github.com/pauljevans/pcp.git dev qa/654.out | 2 +- qa/655.out | 2 +- src/pmdas/gfs2/GNUmakefile | 5 +- src/pmdas/gfs2/control.c | 4 +- src/pmdas/gfs2/control.h | 1 + src/pmdas/gfs2/gfs2_ftrace.c | 156 ++++++++++++++++++++++++++++++++++++++++++ src/pmdas/gfs2/gfs2_ftrace.h | 36 ++++++++++ src/pmdas/gfs2/help | 5 ++ src/pmdas/gfs2/lock_time.c | 158 +++++++++++++++---------------------------- src/pmdas/gfs2/lock_time.h | 8 ++- src/pmdas/gfs2/pmda.c | 16 ++++- src/pmdas/gfs2/pmdagfs2.h | 2 +- src/pmdas/gfs2/pmns | 1 + 13 files changed, 278 insertions(+), 118 deletions(-) commit 3163ff6a3c55f83da9b40bf83d089c5d80466468 Author: Paul Evans Date: Wed Oct 9 18:01:06 2013 +0100 pmdagfs2: Updates from continued testing and changes for future updates. From continued testing with the gfs2 sas-calibration workload there have been a couple of changes made to increase the stability of the PMDA along with performance improvement with regards to glock throughput when reading glock data on trace_pipe based metrics. These improvements are the result of two main changes, the first involving changing how the glocks are temporary stored after being read from the trace_pipe and the second from controlling the maximum number of glocks that are read through each refresh of the metrics. During testing it because increasingly obviously that due to the number of updates that occur for each glock in the event of inode contention on a node (resulting in locks being passed around and updated) that hash collisions when reading data into the pmdaCache structure was a major bottleneck in throughput before time-outs under load. To combat this the lock data taken from the trace_pipe is now stored in an array. The duplication issues is rectified by checking that the latest update for a given glock is placed towards the front of the array during comparison. This has resulted in a total throughput for glocks from the trace_pipe to 1 million glocks from 120 thousand using pmdaCache as the temp storage method. It has also become obvious that because we need to compute the worst glock on each refresh and in order to minimise the chances of time-out of the PMDA by PMCD during calculation a new control metric has been introduced. This metric gfs2.control.glock_threshold controls the max number of accepted glock entries that are taken from the trace_pipe each refresh call. This can be either increased or decreased by the user in the event that a machine is experiencing time-outs. (Future improvement ideas involve having this value computed and changed either reducing or increase with regards to the load of the system/time it is taking to process the lock data). Limiting the number of locks that can be read out on in refresh call comes with the potential issue of us not reading all of the locks from the trace_pipe and a queue of old lock data collecting. To combat this gfs2_trace_clear_buffer() has been introduced to allow the trace_pipe buffer to be completely cleared at the end of a metric refresh clearing any unread glocks from trace_pipe. The final change involves the introduction of gfs2_ftrace.c this file is a split of the trace_pipe reading functions from lock_time.c I felt that with future improvements being the introduction of the rest of the trace_pipe based metrics it was best to split the trace_pipe reading functions from lock_time.c and have it contain the specific information regarding the glock_lock_time based metrics thus allowing the smoother introduction of the additional metrics in the following weeks. - control.c, control.h Contains the code to handle the new gfs2.glock_threshold metric allowing the user to set a new max threshold value with pmstore. - gfs2_ftrace.c, gfs2_ftrace.h Newly created files to separate the trace_pipe handling code. Also includes new code to flush the trace_pipe after each refresh. Handling of the glock threshold to control the maximum number of glocks processed in each refresh cycle. - lock_time.c, lock_time.h Updated to remove the trace_pipe open/close and reading code which has be relocated into gfs2_trace.c. Updates to the method used to temporary store the glock data before processing to a dynamic array instead of a pmdaCache use to increased performance (not having to worry about hash collision). Any issues with duplication are handled during the comparison of the locks before assigning a worst glock for the filesystem. - pmda.c, pmdagfs2.h Contains changes made reflecting the additional control metric and the splitting of the trace_pipe reading code to it's own files. - qa/654, qa/655, help, pmns Updated to reflect the additional metric for controlling the processing threshold regarding trace_pipe based metrics. - GNUmakefile Updates to reflect the additional trace files which need to be compiled. Cheers, Paul From nscott@redhat.com Wed Oct 9 18:29:48 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 76E027F3F for ; Wed, 9 Oct 2013 18:29:48 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 64D18304032 for ; Wed, 9 Oct 2013 16:29:48 -0700 (PDT) X-ASG-Debug-ID: 1381361384-04cb6c2e9f18fbad0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id oVWjFcOGdM79Mp7p for ; Wed, 09 Oct 2013 16:29:44 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r99NThRU008160; Wed, 9 Oct 2013 19:29:43 -0400 Date: Wed, 9 Oct 2013 19:29:43 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Paul Evans Cc: PCP Mailing List Message-ID: <803653382.4750679.1381361383830.JavaMail.root@redhat.com> In-Reply-To: <525590DB.3080007@redhat.com> References: <525590DB.3080007@redhat.com> Subject: Re: pmdagfs2: Updates from continued testing and changes for future updates MIME-Version: 1.0 X-ASG-Orig-Subj: Re: pmdagfs2: Updates from continued testing and changes for future updates Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pmdagfs2: Updates from continued testing and changes for future updates Thread-Index: UaW4QpfP5Jf/OEyT4tp2Id+dms+3gw== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1381361384 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141333 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain Hey Paul, ----- Original Message ----- > Hi, > > It's been a while since my last update to pmdagfs2, I've been on PTO for > the last couple of weeks around Western Europe camping, but in-between Sounds awesome, where do I sign up? ;) > been continuing testing on our side with the sas-calibration workloads. > I plan on following up with a quick succession additional metric updates > with the rest of the trace_pipe based gfs2 tracepoints as well as > starting work on a client side tool to bring information for each node > in the cluster to one central place. FYI - 3.8.5 is pending, a day or two more if you're keen for it in this release, else there's always next time. Also, there's a handful of Coverity-scan-reported issues in pmdagfs2 code if you want to take a look, else I'll pick 'em up on my way through the rest of the code base. > Please let me know of any issues and feedback is welcome :). Couple of small things on review: - GLOCK_ARRAY_CAPACITY setting seems a little coarse. From some quick calcs, I think thats going to allocate an ~7-8MB array and then bump it up by that same amount each time its consumed. Is 100000 glocks expected to be average/normal? Seems alot ... an alternative scheme (which is still nice 'n simple & that we use elsewhere too) would be to start smaller (say 256 glocks), and double the buffer alloc size on each increment - this tries to balance quickly reaching the point where the buffer is well-sized for steady state, with consuming less memory at small glock counts. - gfs2_ftrace.[ch] - I woulda just named em ftrace.[ch] since we're in the gfs2 directory here. *shrug* cheers. ps: please let me know if there's more planned for within a day or two, so I can ensure everything gets merged in time ... thanks! -- Nathan From nscott@redhat.com Wed Oct 9 21:42:19 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id D24B17F3F for ; Wed, 9 Oct 2013 21:42:19 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id C3138304039 for ; Wed, 9 Oct 2013 19:42:16 -0700 (PDT) X-ASG-Debug-ID: 1381372932-04cb6c3501583040001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id dEDuVdUSMWGW1vBQ for ; Wed, 09 Oct 2013 19:42:12 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9A2gC2I022747; Wed, 9 Oct 2013 22:42:12 -0400 Date: Wed, 9 Oct 2013 22:42:12 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Paul Evans Cc: PCP Mailing List Message-ID: <521019765.4918875.1381372932295.JavaMail.root@redhat.com> In-Reply-To: <803653382.4750679.1381361383830.JavaMail.root@redhat.com> References: <525590DB.3080007@redhat.com> <803653382.4750679.1381361383830.JavaMail.root@redhat.com> Subject: Re: pmdagfs2: Updates from continued testing and changes for future updates MIME-Version: 1.0 X-ASG-Orig-Subj: Re: pmdagfs2: Updates from continued testing and changes for future updates Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pmdagfs2: Updates from continued testing and changes for future updates Thread-Index: UaW4QpfP5Jf/OEyT4tp2Id+dms+3g7kxwywI X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381372932 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141337 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain > ... > ps: please let me know if there's more planned for within a day or two, > so I can ensure everything gets merged in time ... thanks! > Also, could you review & merge this if OK? (Coverity scanning found it) We should really be checking the return code from calloc here too, BTW. diff --git a/src/pmdas/gfs2/pmda.c b/src/pmdas/gfs2/pmda.c index d57cfbd..4b42fb7 100644 --- a/src/pmdas/gfs2/pmda.c +++ b/src/pmdas/gfs2/pmda.c @@ -252,8 +252,10 @@ gfs2_instance_refresh(void) fs = calloc(1, sizeof(struct gfs2_fs)); fs->dev_id = gfs2_device_identifier(name); - if ((major(fs->dev_id) == 0) && (minor(fs->dev_id) == 0)) + if ((major(fs->dev_id) == 0) && (minor(fs->dev_id) == 0)) { + free(fs); return PM_ERR_AGAIN; + } } else if (sts < 0) cheers. -- Nathan From nscott@redhat.com Thu Oct 10 04:10:04 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 6FD297F6F for ; Thu, 10 Oct 2013 04:10:04 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 5CC46304032 for ; Thu, 10 Oct 2013 02:10:01 -0700 (PDT) X-ASG-Debug-ID: 1381396195-04cbb02c3c1915bc0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id wpvTDASXzunevXIM for ; Thu, 10 Oct 2013 02:09:56 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9A99tIf029298 for ; Thu, 10 Oct 2013 05:09:55 -0400 Date: Thu, 10 Oct 2013 05:09:55 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1861146105.5069698.1381396195399.JavaMail.root@redhat.com> In-Reply-To: <153254078.5069190.1381396117568.JavaMail.root@redhat.com> Subject: pcp updates: qa, coverity MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa, coverity Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: qa, coverity Thread-Index: 0rK3o19FVNuYv1mpyvvs67VwBljrSw== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381396195 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141344 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev build/.gitignore | 1 build/GNUlocaldefs.in | 5 ++ build/GNUmakefile | 2 build/rpm/GNUmakefile | 2 build/sun/GNUmakefile | 5 -- configure | 25 ------------ configure.in | 27 +----------- qa/069 | 28 +------------ qa/069.out.1 | 71 ---------------------------------- qa/069.out.2 | 71 ---------------------------------- qa/069.out.3 | 71 ---------------------------------- qa/069.out.4 | 72 ---------------------------------- qa/069.out.5 | 73 ----------------------------------- qa/069.out.6 | 71 ---------------------------------- qa/069.out.7 | 77 ------------------------------------- qa/069.out.8 | 73 ----------------------------------- qa/069.out.ipv4 | 71 ++++++++++++++++++++++++++++++++++ qa/069.out.ipv6 | 75 ++++++++++++++++++++++++++++++++++++ qa/common.filter | 2 qa/src/pducrash.c | 3 + src/dbpmda/src/pmda.c | 2 src/include/builddefs.in | 13 ------ src/include/buildrules | 1 src/libpcp/src/access.c | 17 ++++---- src/libpcp/src/auxconnect.c | 5 -- src/libpcp/src/fault.c | 1 src/libpcp/src/fetchlocal.c | 7 ++- src/libpcp/src/instance.c | 1 src/libpcp/src/logutil.c | 8 +++ src/libpcp/src/pdubuf.c | 5 +- src/libpcp/src/pmns.c | 4 - src/libpcp/src/secureconnect.c | 6 +- src/libpcp/src/spec.c | 4 - src/libpcp/src/util.c | 16 ++++++- src/libpcp_gui/src/record.c | 13 +++++- src/libpcp_mmv/src/mmv_stats.c | 8 +++ src/libpcp_pmcd/src/trace.c | 2 src/libpcp_pmda/src/cache.c | 1 src/perl/MMV/MMV.xs | 2 src/pmcd/src/config.c | 2 src/pmcd/src/dopdus.c | 5 -- src/pmdas/freebsd/netif.c | 2 src/pmdas/linux/filesys.c | 1 src/pmdas/linux/proc_net_dev.c | 1 src/pmdas/linux/proc_net_rpc.c | 4 - src/pmdas/linux/proc_net_snmp.c | 8 +-- src/pmdas/linux/proc_uptime.c | 4 + src/pmdas/linux/swapdev.c | 3 - src/pmdas/linux_proc/cgroups.c | 1 src/pmdas/linux_proc/filesys.c | 1 src/pmdas/linux_proc/ksym.c | 33 +++++++++++---- src/pmdas/linux_xfs/filesys.c | 1 src/pmdas/logger/event.c | 2 src/pmdas/lustrecomm/file_single.c | 2 src/pmdas/mmv/mmvdump.c | 1 src/pmdas/systemd/systemd.c | 4 - src/pmdas/windows/instance.c | 8 +++ src/pmie/examples/GNUmakefile | 24 ++++------- src/pmie/examples/cpu.00 | 15 ------- src/pmie/examples/cpu.01 | 15 ------- src/pmie/examples/cpu.02 | 15 ------- src/pmie/examples/cpu.head | 15 ------- src/pmie/examples/disk.00 | 15 ------- src/pmie/examples/disk.10 | 15 ------- src/pmie/examples/disk.20 | 15 ------- src/pmie/examples/disk.head | 15 ------- src/pmie/examples/environ.00 | 16 ------- src/pmie/examples/environ.head | 15 ------- src/pmie/examples/filesys.00 | 15 ------- src/pmie/examples/filesys.10 | 15 ------- src/pmie/examples/filesys.20 | 15 ------- src/pmie/examples/filesys.head | 15 ------- src/pmie/examples/network.00 | 16 ------- src/pmie/examples/network.head | 15 ------- src/pmie/examples/ras.00 | 15 ------- src/pmie/examples/ras.head | 15 ------- src/pmie/examples/swap.00 | 16 ------- src/pmie/examples/swap.head | 17 -------- src/pmie/examples/uag.00 | 15 ------- src/pmie/examples/uag.01 | 15 ------- src/pmie/examples/uag.02 | 15 ------- src/pmie/examples/uag.03 | 15 ------- src/pmie/examples/uag.04 | 15 ------- src/pmie/examples/uag.10 | 15 ------- src/pmie/examples/uag.11 | 15 ------- src/pmie/examples/uag.12 | 15 ------- src/pmie/examples/uag.13 | 15 ------- src/pmie/examples/uag.20 | 15 ------- src/pmie/examples/uag.21 | 15 ------- src/pmie/examples/uag.30 | 15 ------- src/pmie/examples/uag.head | 15 ------- src/pmie/examples/upm.00 | 15 ------- src/pmie/examples/upm.01 | 16 ------- src/pmie/examples/upm.02 | 16 ------- src/pmie/examples/upm.03 | 15 ------- src/pmie/examples/upm.04 | 15 ------- src/pmie/examples/upm.05 | 15 ------- src/pmie/examples/upm.06 | 16 ------- src/pmie/examples/upm.07 | 15 ------- src/pmie/examples/upm.08 | 15 ------- src/pmie/examples/upm.09 | 16 ------- src/pmie/examples/upm.head | 15 ------- src/pmie/examples/webreport.00 | 15 ------- src/pmie/examples/webreport.01 | 15 ------- src/pmie/examples/webreport.head | 15 ------- src/pmlogextract/pmlogextract.c | 1 src/pmlogger/src/dopdu.c | 8 ++- src/pmlogreduce/logio.c | 4 + src/pmlogrewrite/pmlogrewrite.c | 22 ++++++++++ src/pmlogrewrite/util.c | 4 + src/pmwebapi/pmwebapi.c | 1 111 files changed, 352 insertions(+), 1450 deletions(-) commit 39e0eea431dfbca60570f672d06784444c495b86 Author: Nathan Scott Date: Thu Oct 10 18:15:40 2013 +1100 Fix uninitialised sts variable use in FreeBSD PMDA commit e056bf370b8270ffd04a314901236ba9be4fa9e4 Author: Nathan Scott Date: Thu Oct 10 18:15:17 2013 +1100 Fix memleaks on error paths in windows PMDA commit 697881ece84f5a79a38dcba9f0da12d26129654d Author: Nathan Scott Date: Thu Oct 10 18:15:01 2013 +1100 Clarify some code so static checkers have better luck commit 5fe5c1e1e006e0288240eb53f85648534c2a34f1 Author: Nathan Scott Date: Thu Oct 10 18:14:30 2013 +1100 Remove some unnecessary variable assignments in linux PMDA commit 6ff1bf25975f30a5ab14091a290009d30e858a49 Author: Nathan Scott Date: Thu Oct 10 18:13:29 2013 +1100 Remove some unnecessary variable assignments in libpcp commit 5276118c09d4eb7ecb9239a2746fbdbb0862cea7 Author: Nathan Scott Date: Thu Oct 10 18:12:37 2013 +1100 Fix resource leak on error path in scanddir commit 26936bdc16f954b0bdfff0b1d572f14fd6d3512d Author: Nathan Scott Date: Thu Oct 10 18:12:12 2013 +1100 Fix open file descriptor leak in fault injection code commit efd556e8c1c379bd801b8dc7741da7a9be8b874e Author: Nathan Scott Date: Thu Oct 10 17:48:32 2013 +1100 Enforce the umask setting around calls to mkstemp commit 52dd393e13a7496657080685ea92ffc001bbc157 Author: Nathan Scott Date: Thu Oct 10 17:33:12 2013 +1100 Split the packaging configure macros out of source build This is to further protect multi-lib builds primarily, and as a general rule we do not need build platform information below the src directory (nor should we). commit 9c47e38cb677ce28c2ce03c69190aaa4cc2cc0d5 Author: Nathan Scott Date: Thu Oct 10 16:37:32 2013 +1100 Make the installed pmie example files consistently built Indeterminism in the build (and/or build hosts) was causing different pmie examples files to be generated depending on the phase of the moon. Clamp down on this, and ensure that consistent example pmie files are produced across builds. In the process, noticed the copyright-checker script from eons ago went crazy on these (partial) files, resulting in the built configs having copyright notices repeated many times throughout the final generated file - fixed! commit a175084c92b53d6e14f9e54e27b22e87d18449c2 Author: Nathan Scott Date: Thu Oct 10 16:33:27 2013 +1100 Make the installed builddefs file multi-arch consistent We had a handful of macros that were different in the case of 32/64 bit builds for the same platform family, namely package_builder, target_cpu and build_cpu. None of these are actually used anymore, so these have been removed for the sake of consistent packaging. commit 991ca261227ce23439a099739597c8d94c0b7b9d Author: Nathan Scott Date: Thu Oct 10 15:57:31 2013 +1100 Fix a memleak in pmwebd on host attr parsing error path commit 81a1c2cafc48318e0274df721fc8b0564dabe40a Author: Nathan Scott Date: Thu Oct 10 15:57:01 2013 +1100 Fix memleak path in pmlogger indom handling commit 21ea2d422ff2a7c2e84204684284879bcea7aa18 Author: Nathan Scott Date: Thu Oct 10 15:56:08 2013 +1100 Fix fd leaks on lustre PMDA error paths commit f488d8e0a0e8bcc73464b52d71dcdfbdedf14c55 Author: Nathan Scott Date: Thu Oct 10 15:55:45 2013 +1100 Fix fd/memleaks in proc PMDA ksym handling code commit 19da6519891fc9d24b22fecfa88e87aa197d4c3c Author: Nathan Scott Date: Thu Oct 10 15:55:11 2013 +1100 Remove unnecessary null check on a pmcd instance struct free path commit ce0c602b3334dea911d4cd6811efd7d002d5f26f Author: Nathan Scott Date: Thu Oct 10 15:54:43 2013 +1100 Remove unnecessary null check on a pmns libpcp unlock path commit 6c73e14f5335c3887805f8026854a6ea3b92f05d Author: Nathan Scott Date: Thu Oct 10 15:54:10 2013 +1100 Fix memleaks on a couple of libpcp error paths commit b101b2dcfc60f5f693bdde3b467db0d11339a96d Author: Nathan Scott Date: Thu Oct 10 15:53:05 2013 +1100 Fix fd leak on a pmda cache routines error path commit cff37bb5e27a21556bb96e666a8a276374d84ddc Author: Nathan Scott Date: Thu Oct 10 15:52:29 2013 +1100 Fix memleak in dbpmda handling of names PDU commit acf673cbea50b26e9d385934e2e4315e7736938f Author: Nathan Scott Date: Thu Oct 10 15:51:58 2013 +1100 Fix memleak in pducrash QA test for text PDUs commit 32a90ad496aa0babdb293ac7f3f52f775ffa3e62 Author: Nathan Scott Date: Thu Oct 10 11:30:06 2013 +1100 Resolve several missed unlocks on libpcp error paths commit 817519a016c507f71e95f7846ee1d42c4765c0c7 Author: Nathan Scott Date: Thu Oct 10 11:28:59 2013 +1100 Add missed break statements into pmcd tracer markers commit 7837dfa3f16ce0670ef02dc782a0140be9e39bae Author: Nathan Scott Date: Thu Oct 10 11:26:25 2013 +1100 Rework test 069 output production, variants getting out of hand commit 41162e0fadb01cd464666c3fc01170138072e20c Author: Nathan Scott Date: Thu Oct 10 09:43:46 2013 +1100 Resolve coverity complaints about systemd pointer checks commit 9e6f60df6c704c1f544c6e8cc7767f0ad2c1f304 Author: Nathan Scott Date: Thu Oct 10 09:42:09 2013 +1100 Ensure strncpy null termination in logrewrite sources commit afaf492a3cfe838b4235ce90afc0449a71d021d6 Author: Nathan Scott Date: Thu Oct 10 09:40:55 2013 +1100 Ensure strncpy null termination in misc pmda sources commit 673af69381255a9c19c520f26f30845017a815c2 Author: Nathan Scott Date: Thu Oct 10 09:39:26 2013 +1100 Ensure strncpy null termination in misc libpcp sources commit 025ccf488a571906600093cb888a12da66ce53c2 Author: Nathan Scott Date: Thu Oct 10 09:07:42 2013 +1100 Ensure strncpy null termination in MMV sources commit f46871337923a96b4ef3784bddc0e0e65d46cdb4 Author: Nathan Scott Date: Thu Oct 10 08:59:57 2013 +1100 Ensure strncpy null termination in pmlogextract (harmless) commit 27fbd05bc812008bfa7b2c449f1223ad41ef593e Author: Nathan Scott Date: Wed Oct 9 19:36:28 2013 +1100 Fix QA run filtering with pmcd desperate tracing on commit 966aa5790d7428e9295828b9b579adab90c16bce Author: Nathan Scott Date: Wed Oct 9 19:35:58 2013 +1100 Fix corner case off-by-one in uptime metrics commit 3ce279e109c638a80f27b94b042604a10dff79f2 Author: Nathan Scott Date: Wed Oct 9 17:34:12 2013 +1100 Reinstate commit 69d1330242, lost at sea^Wmerge Somehow, inexplicably, a pmcd fix was dropped during a tree merge and intermittent sigsegvs started cropping up again in QA. /me smacks back of own head From pevans@redhat.com Thu Oct 10 04:12:13 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id A662E7F75 for ; Thu, 10 Oct 2013 04:12:13 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 416AFAC004 for ; Thu, 10 Oct 2013 02:12:10 -0700 (PDT) X-ASG-Debug-ID: 1381396326-04bdf02f21197fdc0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id VIcDfotkqUGrnX3E for ; Thu, 10 Oct 2013 02:12:06 -0700 (PDT) X-Barracuda-Envelope-From: pevans@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9A9C5kR018096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 10 Oct 2013 05:12:06 -0400 Received: from [10.36.7.109] (vpn1-7-109.ams2.redhat.com [10.36.7.109]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9A9C4ZU018480; Thu, 10 Oct 2013 05:12:04 -0400 Message-ID: <52566F64.4000800@redhat.com> Date: Thu, 10 Oct 2013 10:12:04 +0100 From: Paul Evans User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Nathan Scott CC: PCP Mailing List Subject: Re: pmdagfs2: Updates from continued testing and changes for future updates References: <525590DB.3080007@redhat.com> <803653382.4750679.1381361383830.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: pmdagfs2: Updates from continued testing and changes for future updates In-Reply-To: <803653382.4750679.1381361383830.JavaMail.root@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381396326 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Hi Nathan, On 10/10/2013 12:29 AM, Nathan Scott wrote: > FYI - 3.8.5 is pending, a day or two more if you're keen for it in this > release, else there's always next time. Also, there's a handful of > Coverity-scan-reported issues in pmdagfs2 code if you want to take a > look, else I'll pick 'em up on my way through the rest of the code base. I'll take a look see through these this morning and sort through them. >> Please let me know of any issues and feedback is welcome :). > Couple of small things on review: > > - GLOCK_ARRAY_CAPACITY setting seems a little coarse. From some quick > calcs, I think thats going to allocate an ~7-8MB array and then bump > it up by that same amount each time its consumed. Is 100000 glocks > expected to be average/normal? Seems alot ... an alternative scheme > (which is still nice 'n simple & that we use elsewhere too) would be > to start smaller (say 256 glocks), and double the buffer alloc size > on each increment - this tries to balance quickly reaching the point > where the buffer is well-sized for steady state, with consuming less > memory at small glock counts. > > - gfs2_ftrace.[ch] - I woulda just named em ftrace.[ch] since we're in > the gfs2 directory here. *shrug* On a cluster under high load it is not uncommon for there to be over a million glocks at one time, understandably not all of them will be looked at during one refresh pass but I agree 100,000 is a little excessive and shall lower the value to a more acceptable range. Will also go about changing the name of gfs2_ftrace.[ch]. > > cheers. > > ps: please let me know if there's more planned for within a day or two, > so I can ensure everything gets merged in time ... thanks! > > -- > Nathan Cheers, Paul From pevans@redhat.com Thu Oct 10 04:13:32 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 485A17F75 for ; Thu, 10 Oct 2013 04:13:32 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id 14A5B304032 for ; Thu, 10 Oct 2013 02:13:32 -0700 (PDT) X-ASG-Debug-ID: 1381396411-04bdf05387a116f0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id MfLheqEp2JaUDehR for ; Thu, 10 Oct 2013 02:13:31 -0700 (PDT) X-Barracuda-Envelope-From: pevans@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9A9DUcS031611 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 10 Oct 2013 05:13:30 -0400 Received: from [10.36.7.109] (vpn1-7-109.ams2.redhat.com [10.36.7.109]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9A9DTVZ015147; Thu, 10 Oct 2013 05:13:29 -0400 Message-ID: <52566FB8.5070200@redhat.com> Date: Thu, 10 Oct 2013 10:13:28 +0100 From: Paul Evans User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Nathan Scott CC: PCP Mailing List Subject: pmdagfs2: Minor update and coverity defect fixes Content-Type: text/plain; charset=ISO-8859-1; format=flowed X-ASG-Orig-Subj: pmdagfs2: Minor update and coverity defect fixes Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1381396411 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Changes committed to git://github.com/pauljevans/pcp.git dev src/pmdas/gfs2/GNUmakefile | 6 +- src/pmdas/gfs2/ftrace.c | 159 +++++++++++++++++++++++++++++++++++++++++++ src/pmdas/gfs2/ftrace.h | 36 ++++++++++ src/pmdas/gfs2/gfs2_ftrace.c | 156 ------------------------------------------ src/pmdas/gfs2/gfs2_ftrace.h | 36 ---------- src/pmdas/gfs2/lock_time.c | 3 +- src/pmdas/gfs2/lock_time.h | 2 +- src/pmdas/gfs2/pmda.c | 12 ++-- src/pmdas/gfs2/pmdagfs2.h | 2 +- 9 files changed, 210 insertions(+), 202 deletions(-) commit d4ce171501348c7854d6911179870a3e70ed0437 Author: Paul Evans Date: Thu Oct 10 10:02:05 2013 +0100 pmdagfs2: Minor update and coverity defect fixes As suggested by Nathan have reduced the value of GLOCK_ARRAY_CAPACITY to 2048 (from 100000), this should reduce the chance of malloc failing whilst keeping the number of malloc's performed on a system under heavy load to an acceptable level. Renamed gfs2_ftrace(ch) to ftrace(ch) and re-factored the change throughout the rest of the code. Fixed outstanding CHECKED_RETURN and RESOURCE_LEAK coverity defects for pmdagfs2 in ftrace.c and pmda.c respectively and rechecked. Left NO_EFFECT defect (the only defect left showing for pmdagfs2 on my runs) in pmda.c because it is intentional. Cheers, Paul From nscott@redhat.com Thu Oct 10 04:26:12 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 852907F7E for ; Thu, 10 Oct 2013 04:26:12 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 6C76D304032 for ; Thu, 10 Oct 2013 02:26:12 -0700 (PDT) X-ASG-Debug-ID: 1381397170-04cbb02c3e1916a70001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id 3ZFf4X3qwTXQoEaW for ; Thu, 10 Oct 2013 02:26:10 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9A9Q9tj032207 for ; Thu, 10 Oct 2013 05:26:10 -0400 Date: Thu, 10 Oct 2013 05:26:09 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1526914632.5078384.1381397169872.JavaMail.root@redhat.com> In-Reply-To: <132024049.5075953.1381397063458.JavaMail.root@redhat.com> Subject: pcp updates: pevans merge MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: pevans merge Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: pevans merge Thread-Index: iEmHmnS2msk9mMOx/nOiqblQUEqgAw== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381397170 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141344 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/654.out | 2 qa/655.out | 2 src/pmdas/gfs2/GNUmakefile | 11 - src/pmdas/gfs2/control.c | 4 src/pmdas/gfs2/control.h | 1 src/pmdas/gfs2/ftrace.c | 159 +++++++++++++++++++++ src/pmdas/gfs2/ftrace.h | 36 ++++ src/pmdas/gfs2/gfs2_ftrace.c | 312 +++++++++++++++++++++---------------------- src/pmdas/gfs2/gfs2_ftrace.h | 72 ++++----- src/pmdas/gfs2/help | 5 src/pmdas/gfs2/lock_time.c | 161 +++++++--------------- src/pmdas/gfs2/lock_time.h | 10 - src/pmdas/gfs2/pmda.c | 28 ++- src/pmdas/gfs2/pmdagfs2.h | 4 src/pmdas/gfs2/pmns | 1 15 files changed, 488 insertions(+), 320 deletions(-) commit dcf2be6c70af53398d0a5e940395c66ed1a351b0 Author: Nathan Scott Date: Thu Oct 10 20:21:33 2013 +1100 Remove some no-longer-used gfs2 pmda sources commit 831ae7176c0ee42e92fba46f5046ba69b07515eb Merge: 39e0eea d4ce171 Author: Nathan Scott Date: Thu Oct 10 20:19:38 2013 +1100 Merge branch 'dev' of git://github.com/pauljevans/pcp into dev commit d4ce171501348c7854d6911179870a3e70ed0437 Author: Paul Evans Date: Thu Oct 10 10:02:05 2013 +0100 pmdagfs2: Minor update and coverity defect fixes As suggested by Nathan have reduced the value of GLOCK_ARRAY_CAPACITY to 2048 (from 100000), this should reduce the chance of malloc failing whilst keeping the number of malloc's performed on a system under heavy load to an acceptable level. Renamed gfs2_ftrace(ch) to ftrace(ch) and re-factored the change throughout the rest of the code. Fixed outstanding CHECKED_RETURN and RESOURCE_LEAK coverity defects for pmdagfs2 in ftrace.c and pmda.c respectively and rechecked. Left NO_EFFECT defect (the only defect left showing for pmdagfs2 on my runs) in pmda.c because it is intentional. commit 3163ff6a3c55f83da9b40bf83d089c5d80466468 Author: Paul Evans Date: Wed Oct 9 18:01:06 2013 +0100 pmdagfs2: Updates from continued testing and changes for future updates. From continued testing with the gfs2 sas-calibration workload there have been a couple of changes made to increase the stability of the PMDA along with performance improvement with regards to glock throughput when reading glock data on trace_pipe based metrics. These improvements are the result of two main changes, the first involving changing how the glocks are temporary stored after being read from the trace_pipe and the second from controlling the maximum number of glocks that are read through each refresh of the metrics. During testing it because increasingly obviously that due to the number of updates that occur for each glock in the event of inode contention on a node (resulting in locks being passed around and updated) that hash collisions when reading data into the pmdaCache structure was a major bottleneck in throughput before time-outs under load. To combat this the lock data taken from the trace_pipe is now stored in an array. The duplication issues is rectified by checking that the latest update for a given glock is placed towards the front of the array during comparison. This has resulted in a total throughput for glocks from the trace_pipe to 1 million glocks from 120 thousand using pmdaCache as the temp storage method. It has also become obvious that because we need to compute the worst glock on each refresh and in order to minimise the chances of time-out of the PMDA by PMCD during calculation a new control metric has been introduced. This metric gfs2.control.glock_threshold controls the max number of accepted glock entries that are taken from the trace_pipe each refresh call. This can be either increased or decreased by the user in the event that a machine is experiencing time-outs. (Future improvement ideas involve having this value computed and changed either reducing or increase with regards to the load of the system/time it is taking to process the lock data). Limiting the number of locks that can be read out on in refresh call comes with the potential issue of us not reading all of the locks from the trace_pipe and a queue of old lock data collecting. To combat this gfs2_trace_clear_buffer() has been introduced to allow the trace_pipe buffer to be completely cleared at the end of a metric refresh clearing any unread glocks from trace_pipe. The final change involves the introduction of gfs2_ftrace.c this file is a split of the trace_pipe reading functions from lock_time.c I felt that with future improvements being the introduction of the rest of the trace_pipe based metrics it was best to split the trace_pipe reading functions from lock_time.c and have it contain the specific information regarding the glock_lock_time based metrics thus allowing the smoother introduction of the additional metrics in the following weeks. - control.c, control.h Contains the code to handle the new gfs2.glock_threshold metric allowing the user to set a new max threshold value with pmstore. - gfs2_ftrace.c, gfs2_ftrace.h Newly created files to separate the trace_pipe handling code. Also includes new code to flush the trace_pipe after each refresh. Handling of the glock threshold to control the maximum number of glocks processed in each refresh cycle. - lock_time.c, lock_time.h Updated to remove the trace_pipe open/close and reading code which has be relocated into gfs2_trace.c. Updates to the method used to temporary store the glock data before processing to a dynamic array instead of a pmdaCache use to increased performance (not having to worry about hash collision). Any issues with duplication are handled during the comparison of the locks before assigning a worst glock for the filesystem. - pmda.c, pmdagfs2.h Contains changes made reflecting the additional control metric and the splitting of the trace_pipe reading code to it's own files. - qa/654, qa/655, help, pmns Updated to reflect the additional metric for controlling the processing threshold regarding trace_pipe based metrics. - GNUmakefile Updates to reflect the additional trace files which need to be compiled. From nscott@redhat.com Thu Oct 10 05:34:36 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 311967F92 for ; Thu, 10 Oct 2013 05:34:36 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id B0748AC002 for ; Thu, 10 Oct 2013 03:34:32 -0700 (PDT) X-ASG-Debug-ID: 1381401267-04cb6c350159d9a0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id d8GcDCPHaViDqzAB for ; Thu, 10 Oct 2013 03:34:28 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9AAYRTG012250; Thu, 10 Oct 2013 06:34:27 -0400 Date: Thu, 10 Oct 2013 06:34:27 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Message-ID: <1028463567.5111352.1381401267304.JavaMail.root@redhat.com> In-Reply-To: References: <1717961238.2089908.1380100281235.JavaMail.root@redhat.com> <1551478303.2549744.1381116552518.JavaMail.root@redhat.com> <1405249421.4047171.1381288021302.JavaMail.root@redhat.com> Subject: Re: RFC: filtered metrics MIME-Version: 1.0 X-ASG-Orig-Subj: Re: RFC: filtered metrics Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: filtered metrics Thread-Index: AnzpB707R4KUf8JrInEpJflXuR/bNg== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381401267 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141345 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > > nathans wrote: > > > [...] Thinking system wide filters like "when looking at > > per-process metrics, this system is expected to have N million > > insts, so force a system wide filter for all access to per-process > > metrics via a specified cgroup". [...] > > Would this be a administrative preference for security/load-limiting? Hmm, more like "for all processes that should appear in daily pcp logs or appear in a pmatop listing, they need to belong to cgroup X" - and, mechanisms for getting arbitrary processes in/out of said cgroup X are made readily accessible for people doing analysis. > If so, it's bound to be ineffective. For some people it will be ineffective, for others they wont care (but sure will when their root disk fills because we auto-logged too much), and for yet others it will be highly effective. This is the same sort of approach the existing perf_event cgroup uses, FWIW, & I imagine for some its highly useful, others wont care and yet others are happy with system-wide perf events. Its better to have the option than no way to deal with this class of problem though. cheers. -- Nathan From nscott@redhat.com Fri Oct 11 03:16:09 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 9D6EC7F58 for ; Fri, 11 Oct 2013 03:16:09 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 3A17FAC004 for ; Fri, 11 Oct 2013 01:16:09 -0700 (PDT) X-ASG-Debug-ID: 1381479364-04bdf02f2219d7080001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id pcpsVeBC69oW9WVH for ; Fri, 11 Oct 2013 01:16:04 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9B8G4EV009195 for ; Fri, 11 Oct 2013 04:16:04 -0400 Date: Fri, 11 Oct 2013 04:16:04 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1305714212.5818953.1381479364281.JavaMail.root@redhat.com> In-Reply-To: <1865245646.5818778.1381479337377.JavaMail.root@redhat.com> Subject: pcp updates: mostly qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: mostly qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: mostly qa Thread-Index: YUtrJy1wLmZjjv297K7MKkfPb1FiNg== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381479364 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141370 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/.gitignore | 1 qa/200 | 9 +++--- qa/652 | 8 +---- qa/652.out | 37 +++++++++++++++++++++++++- qa/652.out.1 | 33 ----------------------- qa/652.out.2 | 35 ------------------------ qa/740 | 59 ++++++++++++++++++++++++++++++++++++++++++ qa/740.out | 7 ++++ qa/831 | 11 ------- qa/common.filter | 1 qa/common.secure | 1 qa/group | 1 src/include/pcp/impl.h | 1 src/libpcp/src/auxserver.c | 19 +++++++++---- src/libpcp/src/connectlocal.c | 5 +++ src/libpcp/src/spec.c | 8 +++++ src/pmdas/linux_proc/pmda.c | 11 +++++++ src/pmdas/systemd/systemd.c | 9 ------ src/pmevent/doargs.c | 36 +++++++++++++------------ src/pmevent/pmevent.c | 10 ++----- src/pmevent/pmevent.h | 2 - 21 files changed, 174 insertions(+), 130 deletions(-) commit cebb77cedf88d7cc076a0487a2a527d58f268e2a Author: Nathan Scott Date: Fri Oct 11 19:10:36 2013 +1100 Add support for extracting client PID for unix sockets There's been some discussion about using this for figuring out the process group or control group to monitor specifically, so may as well make it available to PMDAs as well. commit 7ee715dece01f496ec218a8b484de3d68c24a233 Author: Nathan Scott Date: Fri Oct 11 16:04:55 2013 +1100 Alloc proc DSO PMDA builds - local context is fine commit 2a87da1b1cd426ab49e322d205043724aa7533ad Author: Nathan Scott Date: Fri Oct 11 16:04:23 2013 +1100 Remove indeterminism from test 200 for initial connect commit 7be3881e8c6149167d477a53108ee87e59988336 Author: Nathan Scott Date: Fri Oct 11 14:14:20 2013 +1100 Update test 652 output to match expected commit decfd7eb04578d4f5bc4899ed338da5e09a53c03 Author: Frank Ch. Eigler Date: Thu Oct 10 21:10:53 2013 -0400 pmevent: use local: as default connection Change the global "host" to be the result of pmGetContextHostName after connection. commit 65a00c6125b1c97793e57a75c53e8a83fb7078f1 Author: Nathan Scott Date: Fri Oct 11 14:08:21 2013 +1100 Start a new seq.full file between each run of test 652 commit 126444909b887a2bdde4bfddedb80b89bc84355f Author: Nathan Scott Date: Fri Oct 11 13:44:30 2013 +1100 Update the systemd test to match current source commit 697b52a2dea4f374f0343185f2953ab4d59cb80a Author: Nathan Scott Date: Fri Oct 11 13:40:14 2013 +1100 Revert "systemd pmda: consume only limited number of journald entries per poll" This reverts commit dd22d311c01c42f0f18e5c0b8c61ea682fa7430e. Found to be the cause of QA regressions. Conspiracy theories abound as to why this is, but for now (and possibly for always, as other systemd fixes are apparently now in place) we go back to the original plan of not attempting to limit the entries returned. commit 21181457eec9233907dc474d5b5cdbd229e7d421 Author: Nathan Scott Date: Fri Oct 11 11:17:46 2013 +1100 QA filter for case where pmdasystemd is pre-installed From nscott@redhat.com Mon Oct 14 19:00:50 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 945907F37 for ; Mon, 14 Oct 2013 19:00:50 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 76683304048 for ; Mon, 14 Oct 2013 17:00:47 -0700 (PDT) X-ASG-Debug-ID: 1381795245-04cb6c2e9f1a76350001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id swHU9akAEsLvX82Y for ; Mon, 14 Oct 2013 17:00:45 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9F00ivT012189 for ; Mon, 14 Oct 2013 20:00:44 -0400 Date: Mon, 14 Oct 2013 20:00:44 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1202433461.1571338.1381795244524.JavaMail.root@redhat.com> Subject: pcp updates: misc qa, small fixes MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: misc qa, small fixes Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: misc qa, small fixes Thread-Index: GnRiNYkksoi2JR+o8dBjxyzghEWl/g== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1381795245 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141468 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/.gitignore | 1 qa/177 | 6 qa/177.out | 6 qa/359 | 1 qa/364 | 71 +++++- qa/364.darwin.1 | 19 - qa/364.darwin.2 | 17 - qa/364.linux.1 | 6 qa/364.linux.2 | 4 qa/364.out | 2 qa/364.solaris.1 | 38 --- qa/364.solaris.2 | 36 --- qa/366 | 1 qa/438 | 1 qa/443 | 10 qa/443.out | 8 qa/444 | 21 - qa/444.out.2 | 1 qa/444.out.3 | 425 ++++++++++++++++++++++++++++++++++++++++ qa/527 | 4 qa/527.out | 2 qa/749 | 4 qa/823 | 2 src/pmdas/linux/help | 151 ++------------ src/pmdas/linux/pmda.c | 14 + src/pmdas/linux/root_linux | 1 src/pmdas/linux_proc/pmda.c | 6 src/pmdas/mmv/GNUmakefile | 13 + src/pmdas/mmv/src/GNUmakefile | 4 src/pmevent/doargs.c | 8 src/pmlogconf/disk/localdefs | 2 src/pmlogconf/disk/perdisk | 6 src/pmlogconf/disk/perpartition | 7 33 files changed, 589 insertions(+), 309 deletions(-) commit a58b421072181ac07ff40351b1c2dce29c46f348 Author: Nathan Scott Date: Tue Oct 15 10:57:53 2013 +1100 Fix up a recent pmevent argument parsing regression commit c1f0351442889b998aa6a70516094c3bb9c99bb6 Author: Nathan Scott Date: Tue Oct 15 10:16:46 2013 +1100 Make pmdammv pmcd.conf updater makefile rules now match pmdapmcd commit e565b959119061dbed34ea3c2abd4651062414e2 Author: Nathan Scott Date: Tue Oct 15 10:06:07 2013 +1100 Tighten notrun check on auth test 823, needs plain mech commit 556f078dcba81768b2606e86ada5c15118b969c4 Author: Nathan Scott Date: Tue Oct 15 10:05:38 2013 +1100 Give stap more time in test 749, 1 sec for startup proved racey commit f1ec54eda8b27a71f7dd6e697e87140e95611eab Author: Nathan Scott Date: Tue Oct 15 10:04:31 2013 +1100 Resolve daylight-savings related failure in test 527 commit f5d521a456c00808d9db68b1a8b5113bd328b749 Author: Nathan Scott Date: Tue Oct 15 10:03:37 2013 +1100 Improve test 444 handling of different hostname len commit e48c86c254ef2decbc05dcfb39623404f237e446 Author: Nathan Scott Date: Tue Oct 15 10:02:36 2013 +1100 Make test 438 deterministic on s390, where an extra I/O happens commit fb6465099251255eab4ba450f5a984a156fb59c0 Author: Nathan Scott Date: Tue Oct 15 10:01:48 2013 +1100 Tweak qa/177 log read filter, s390 platform makes one more commit e46f237b8d989cea6febd1666396583e16222669 Author: Nathan Scott Date: Tue Oct 15 10:00:24 2013 +1100 Add Linux disk.partitions metrics to the default logged set commit 3335c451203ddc452b4472364971c14f3e40985a Author: Nathan Scott Date: Tue Oct 15 09:57:27 2013 +1100 Add Linux hinv.nlv DM metric, improve disk metrics help text commit 51c1d6c254f5734f261c58aabe159526190ed143 Author: Nathan Scott Date: Tue Oct 15 09:53:05 2013 +1100 Simplify test qa/364 to one output form. commit def1948a942680940b513f8587c4aa8fc91e1222 Author: Nathan Scott Date: Mon Oct 14 13:46:37 2013 +1100 Tighten test 359 filter for kernels built without schedstats commit 9e4e82eb7b2048f08d80d64081e895d350592113 Author: Nathan Scott Date: Mon Oct 14 08:02:17 2013 +1100 Allow default pmdaproc cgroup setting from the command line From nscott@redhat.com Tue Oct 15 00:10:05 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 644F47F37 for ; Tue, 15 Oct 2013 00:10:05 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 0B838AC003 for ; Mon, 14 Oct 2013 22:10:01 -0700 (PDT) X-ASG-Debug-ID: 1381813797-04bdf02f231af7cb0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id IxaSBwPlCjS4kxs5 for ; Mon, 14 Oct 2013 22:09:57 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9F59uMC020627 for ; Tue, 15 Oct 2013 01:09:56 -0400 Date: Tue, 15 Oct 2013 01:09:56 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: PCP Mailing List Message-ID: <461776061.1700996.1381813796633.JavaMail.root@redhat.com> Subject: pcp-gui updates: pmchart selection label fix MIME-Version: 1.0 X-ASG-Orig-Subj: pcp-gui updates: pmchart selection label fix Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp-gui updates: pmchart selection label fix Thread-Index: 5t0Gui4Wn52HELwn2AaJfFnrBRoCBQ== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1381813797 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141474 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp-gui.git dev qa/029 | 4 ++-- src/chart/chart.cpp | 6 ++++++ src/chart/chart.h | 3 ++- src/chart/sampling.cpp | 15 +++++++++++---- 4 files changed, 21 insertions(+), 7 deletions(-) commit 08d74ba7aafd980c33c94ea07e78b34e3977f737 Author: Nathan Scott Date: Tue Oct 15 16:07:32 2013 +1100 Fix the pmchart info label units for selection on sampled plots commit 97b0c35f2229d42906bd37a834cbb63d35aa123b Author: Nathan Scott Date: Mon Oct 14 13:16:10 2013 +1100 Relax the check for 1sec range, fails on slow QA hosts From nscott@redhat.com Tue Oct 15 21:43:09 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 9A4E07F3F for ; Tue, 15 Oct 2013 21:43:09 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay1.corp.sgi.com (Postfix) with ESMTP id 822A38F8040 for ; Tue, 15 Oct 2013 19:43:09 -0700 (PDT) X-ASG-Debug-ID: 1381891385-04cb6c2e9f1afa920001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id sl7OlCd1GPKxopVI for ; Tue, 15 Oct 2013 19:43:05 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9G2h4rX027432 for ; Tue, 15 Oct 2013 22:43:04 -0400 Date: Tue, 15 Oct 2013 22:43:04 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1711845759.2654544.1381891384239.JavaMail.root@redhat.com> In-Reply-To: <62317057.2654480.1381891349629.JavaMail.root@redhat.com> Subject: pcp updates: qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: qa Thread-Index: p+f2cxFc2ZIi6w2MJHrV6vfGWrzvMQ== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1381891385 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141501 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/067 | 9 +++++---- qa/067.out.1 | 2 +- qa/067.out.2 | 2 +- qa/067.out.3 | 2 +- qa/067.out.4 | 2 +- qa/749 | 23 +++++++++-------------- src/libpcp/src/auxserver.c | 6 ++++-- src/libpcp/src/derive.c | 17 +++++++++++++++++ 8 files changed, 39 insertions(+), 24 deletions(-) commit 8da1d1a68902b3ee27110143c3fd4b7daf741676 Author: Nathan Scott Date: Wed Oct 16 13:39:47 2013 +1100 Fix a race condition in test qa/749 (pmcd probes) Using advice from fche, rework the stap script in this test to run the PDU-generators (probe hitters) within a begin{} probe, to remove races around ensuring the pmcd probe handler is successfully activated. Before, we were sometimes running the PDU-generators before we had stap fully setup, and hence events were missed and ultimately the test failed. As an added bonus, the test runs more quickly and is a fair bit simpler (no backgrounding of stap needed). commit b41ff31b3f1bbd424ec7e130cc4da0b3b49c022a Author: Nathan Scott Date: Wed Oct 16 13:34:26 2013 +1100 Handle absense of server unix domain socket file gracefully No point warning that we couldn't remove the file during the server process shutdown if something has already removed it. Also, switch to using thread safe message reporting routines and platform-agnostic errno manipulation. commit c69d62dcb2efd5adf1a320f45656c25e768c8678 Author: Ken McDonell Date: Tue Oct 15 14:46:47 2013 +1100 Address potential lock inversion issues in libpcp derived metrics Fix Coverity-reported lock inversions in derived metrics. However, these all look benign ... they result from calling __pmNoMem which means the game is all over (we might deadlock before exiting in the worst case). commit 21be6171df53b59ccf4bfd70e204b675e290be34 Author: Nathan Scott Date: Tue Oct 15 14:35:22 2013 +1100 Resolve recent failures observed in test qa/067 A combination of factors has resulted in 067 beginning to fail recently - (re)introduction of a proc PMDA with domain number 3 (used by "test" PMDA in 067), and logging pmdaproc metrics like proc.nprocs, proc.runq and friends. Address this through use of a more appropriate domain number for "test" (using "lab" from old tutorials) which prevents pmcd from sending client requests through to the fake PMDA. From MAILER-DAEMON Wed Oct 16 06:25:50 2013 Return-Path: <> X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=LOTS_OF_MONEY autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 1E6427F3F for ; Wed, 16 Oct 2013 06:25:50 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 0DDB08F8059 for ; Wed, 16 Oct 2013 04:25:47 -0700 (PDT) X-ASG-Debug-ID: 1381922742-04cbb02c3c1b13770001-S8gJnT Received: from emea01-db3-obe.outbound.protection.outlook.com (emea01-db3-ndr.ptr.protection.outlook.com [157.56.120.101]) by cuda.sgi.com with ESMTP id 7DGbgZr59HuAsH1i (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Wed, 16 Oct 2013 04:25:43 -0700 (PDT) X-Barracuda-Envelope-From: X-Barracuda-Apparent-Source-IP: 157.56.120.101 Received: from [180.215.138.45] (180.215.138.45) by DB3PR05MB137.eurprd05.prod.outlook.com (10.242.131.140) with Microsoft SMTP Server (TLS) id 15.0.785.10; Wed, 16 Oct 2013 11:25:41 +0000 Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Description: Mail message body Subject: Personal Donation Offer To: Recipients X-ASG-Orig-Subj: Personal Donation Offer From: Date: Wed, 16 Oct 2013 04:25:50 -0700 Reply-To: X-Antivirus: avast! (VPS 131015-1, 10/15/2013), Outbound message X-Antivirus-Status: Clean Message-ID: X-Originating-IP: [180.215.138.45] X-ClientProxiedBy: CO1PR07CA011.namprd07.prod.outlook.com (10.141.49.41) To DB3PR05MB137.eurprd05.prod.outlook.com (10.242.131.140) X-Forefront-PRVS: 0001227049 X-Forefront-Antispam-Report: SFV:SPM;SFS:(199002)(189002)(558084003)(23756003)(74706001)(77982001)(46102001)(59766001)(42186004)(81542001)(76482001)(81342001)(74316001)(51856001)(33646001)(74876001)(83322001)(85306002)(54316002)(56776001)(19580405001)(56816003)(65816001)(47776003)(63696002)(4396001)(66066001)(50466002)(80022001)(77096001)(81816001)(76576001)(17643785005)(76786001)(76796001)(76176001)(74502001)(73186002)(69226001)(47446002)(54356001)(53256004)(74366001)(74662001)(47976001)(50986001)(79102001)(80976001)(19580395003)(31686002)(43066001)(83072001)(81686001)(47736001)(49866001)(62346009)(536464002);DIR:OUT;SFP:1501;SCL:5;SRVR:DB3PR05MB137;H:[180.215.138.45];CLIP:180.215.138.45;FPR:;RD:InfoNoRecords;A:0;MX:1;LANG:en; X-OriginatorOrg: odas634.onmicrosoft.com X-Barracuda-Connect: emea01-db3-ndr.ptr.protection.outlook.com[157.56.120.101] X-Barracuda-Start-Time: 1381922742 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 1.80 X-Barracuda-Spam-Status: No, SCORE=1.80 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA609_NRN, BSF_SC0_SA_TO_FROM_ADDR_MATCH, BSF_SC7_SA298e, EMPTY_ENV_FROM, NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141509 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 EMPTY_ENV_FROM Empty Envelope From Address 0.00 NO_REAL_NAME From: does not include a real name 0.50 BSF_SC0_SA_TO_FROM_ADDR_MATCH Sender Address Matches Recipient Address 0.20 BSF_SC7_SA298e Custom Rule SA298e 1.10 BSF_SC0_SA609_NRN Custom Rule SA609_NRN My wife and i adrian won Jackpot Lottery and Decided to donate 2million dol= lars to you, Contact Mr Adrian on (bayfordga@qq.com) For More Info From nscott@redhat.com Thu Oct 17 04:25:24 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 52B6B7F3F for ; Thu, 17 Oct 2013 04:25:24 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 9BE1DAC001 for ; Thu, 17 Oct 2013 02:25:23 -0700 (PDT) X-ASG-Debug-ID: 1382001916-04cbb02c3e1b42600001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id Des7IKG5MzlTKwdh for ; Thu, 17 Oct 2013 02:25:16 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9H9PDce009280 for ; Thu, 17 Oct 2013 05:25:13 -0400 Date: Thu, 17 Oct 2013 05:25:13 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1708438234.4130151.1382001913064.JavaMail.root@redhat.com> In-Reply-To: <6028652.4129927.1382001852617.JavaMail.root@redhat.com> Subject: pcp updates: towards a release MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: towards a release Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: towards a release Thread-Index: jHsGiDMxmF707gPVgq0JZQ7EIOle+Q== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1382001916 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141534 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev CHANGELOG | 38 build/rpm/fedora.spec | 12 debian/changelog | 4 dev/null |binary src/pmie/pmie_check.sh | 13 src/pmie/pmie_daily.sh | 10 src/pmlogger/pmlogger_check.sh | 29 src/pmlogger/pmlogger_daily.sh | 20 src/pmwebapi/GNUmakefile | 11 src/pmwebapi/jsdemos/.gitignore | 4 src/pmwebapi/jsdemos/GNUmakefile | 39 src/pmwebapi/jsdemos/blinkenlights/GNUmakefile | 33 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2.tar.gz |binary src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/AUTHORS.txt | 242 -- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/MANIFEST | 440 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/MIT-LICENSE.txt | 26 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/package.json | 70 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/black-tie/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/black-tie/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/black-tie/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/blitzer/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/blitzer/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/blitzer/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/cupertino/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/cupertino/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/cupertino/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/dark-hive/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/dark-hive/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/dark-hive/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/dot-luv/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/dot-luv/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/dot-luv/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/eggplant/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/eggplant/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/eggplant/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/excite-bike/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/excite-bike/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/excite-bike/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/flick/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/flick/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/flick/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/hot-sneaks/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/hot-sneaks/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/hot-sneaks/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/humanity/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/humanity/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/humanity/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/le-frog/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/le-frog/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/le-frog/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/mint-choc/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/mint-choc/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/mint-choc/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/overcast/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/overcast/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/overcast/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/pepper-grinder/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/pepper-grinder/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/pepper-grinder/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/redmond/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/redmond/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/redmond/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/smoothness/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/smoothness/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/smoothness/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/south-street/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/south-street/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/south-street/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/start/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/start/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/start/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/sunny/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/sunny/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/sunny/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/swanky-purse/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/swanky-purse/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/swanky-purse/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/trontastic/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/trontastic/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/trontastic/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/ui-darkness/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/ui-darkness/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/ui-darkness/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/ui-lightness/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/ui-lightness/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/ui-lightness/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/vader/jquery-ui.css | 1175 ---------- src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/vader/jquery-ui.min.css | 5 src/pmwebapi/jsdemos/jquery-ui-themes-1.10.2/themes/vader/jquery.ui.theme.css | 406 --- src/pmwebapi/jsdemos/jsbrowser/GNUmakefile | 27 src/pmwebapi/pmwebd.options | 18 91 files changed, 186 insertions(+), 38914 deletions(-) commit 6670d80b8974327e3ead210a3af22a995c063358 Author: Nathan Scott Date: Thu Oct 17 18:04:41 2013 +1100 Add tarball for jquery-ui-themes commit abdd30bed395312fe45712817c682ccb81e14b87 Author: Nathan Scott Date: Thu Oct 17 18:03:15 2013 +1100 Update changelog, version datestamp details - release preparations commit 16f01ebc2dcbc03a9e35b73a3c186306c4aa47ad Author: Nathan Scott Date: Thu Oct 17 17:52:33 2013 +1100 Add sample -R use into pmwebd config, helps with the demos commit 1e1151813d51afd4b6e5413b713102e95e8391ae Author: Nathan Scott Date: Thu Oct 17 17:51:14 2013 +1100 Add the jsdemos into the source tarball Andy on IRC pointed out the jsdemos were not in the source tgz. Since we've not tackled better build/git integration yet, this is still a bit painful (esp. for deep directory trees). Make a checked-in tarball of the jquery-ui-themes, and expand it in the build, rather than having to deal with such a deep tree. commit 3a781a20ee27b3545922ad3f75710cec01f639d1 Author: Nathan Scott Date: Thu Oct 17 15:28:11 2013 +1100 Remove hostname checks in pmie/pmlogger script PID search After yet another problem in this area being reported by Marko with pmie scripts, its time to step back and say "whhhy?". We have a perfectly good mechanism to uniquely identify both pmie and pmlogger process (for matching up to control file lines). For pmie, the log file must be unique and for pmlogger the log directory must be unique - there is never any sane reason that these constraints will not uniquely identify a process (AFAIK). Since the hostname a/ does not have to have anything to do with networking at all and b/ resolving any mix of short names, long names, curly names, dotty names, ... to some canonical name has proven nigh on impossible - we do not do it anymore. For this release, a minimal intervention has been performed on these scripts to solve this immediate problem without risking unanticipated failures. In following releases, we expect more work in terms of supporting arbitrary hostnames (that cannot be resolved for networking connection, for example). commit 67241d3d0e9dc4008fa9800f1d59bc85fc336114 Author: Nathan Scott Date: Thu Oct 17 15:26:14 2013 +1100 Fix pmwebd default log path, env vars not expanded by init scripts commit ba34424e9cf650a755f2a4e55ebd27c460f6e780 Author: Nathan Scott Date: Thu Oct 17 13:47:44 2013 +1100 Tweak spec file allowing infiniband on RHEL6.3 again commit 2c5431f97e5d2f822b031ebc8928afceb2998b0e Author: Nathan Scott Date: Thu Oct 17 09:59:56 2013 +1100 Use mode 775 for /var/log/pcp for consistency commit a097c991651c4066519f428eedcef403ddc805fb Author: Frank Ch. Eigler Date: Sun Oct 13 11:02:30 2013 -0400 fedora.spec: make /var/log/pcp also pcp:pcp owned, for NOTICES go there From scox@redhat.com Thu Oct 17 20:33:05 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id A57037F3F for ; Thu, 17 Oct 2013 20:33:05 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 50B39AC001 for ; Thu, 17 Oct 2013 18:33:02 -0700 (PDT) X-ASG-Debug-ID: 1382059978-04bdf02f231bd4d50001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id GMtEVl6BfLZYWcFE for ; Thu, 17 Oct 2013 18:32:58 -0700 (PDT) X-Barracuda-Envelope-From: scox@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9I1WwZJ024437 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 17 Oct 2013 21:32:58 -0400 Received: from [10.13.129.153] (dhcp129-153.rdu.redhat.com [10.13.129.153]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9I1WvP7022458 for ; Thu, 17 Oct 2013 21:32:57 -0400 Message-ID: <52608FC9.2050103@redhat.com> Date: Thu, 17 Oct 2013 21:32:57 -0400 From: Stan Cox User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: PCP Subject: rpm pmda Content-Type: multipart/mixed; boundary="------------000001090608050001070300" X-ASG-Orig-Subj: rpm pmda X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1382059978 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 This is a multi-part message in MIME format. --------------000001090608050001070300 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit This is a first cut, not committed, to add an pmda for rpm. It uses the python pmda bindings and the rpm python module. It keeps a list of active packages in the pmda and each metric request is serviced by querying using the rpm python module. --------------000001090608050001070300 Content-Type: text/plain; charset=UTF-8; name="pmdarpm.python" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pmdarpm.python" ''' Python implementation of the "rpm" Performance Metrics Domain Agent. ''' # # Copyright (c) 2013 Red Hat. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; either version 2 of the License, or (at your # option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # from subprocess import Popen, PIPE, STDOUT from threading import Thread from posixpath import getmtime import rpm from ctypes import c_int, POINTER, cast import cpmapi as c_api from pcp.pmda import PMDA, pmdaMetric, pmdaIndom from pcp.pmapi import pmUnits, pmContext as PCP class setup_indom(Thread): ''' Thread to create an indom whose components are the current rpm package list ''' def __init__(self, pmda, name): Thread.__init__(self) self.pmda = pmda self.name = name def run(self): self.pmda.log("setup_indom") package_list = self.pmda.rpm_handle.dbMatch() rpms = {} i = 0 replace_indom = False # Get current package list for package in package_list: self.pmda.log(package['name'] + " " + str(i)) if replace_indom == False and package not in rpms: replace_indom = True rpms[package['name']] = c_int(i) i += 1 # Rebuild if a package was added or a package was removed if replace_indom == True or len(rpms) != len(self.pmda.rpms_by_n): self.pmda.replace_indom(self.pmda.source_indom, rpms) for (k, v) in rpms.iteritems(): nv = int (v.value) self.pmda.rpms_by_n[nv] = k class RpmPMDA(PMDA): ''' A Performance Metrics Domain Agent for rpm metrics. ''' source = {} state = {} # rpm.numfetch properties numfetch = 0 oldfetch = -1 rpm_metrics = ( ['.name', 0, 1, "RPMTAG_NAME"], \ ['.source', 0, 2, "RPMTAG_SOURCERPM"], \ ['.size', 0, 3, "RPMTAG_SIZE"], \ ['.description', 0, 4, "RPMTAG_DESCRIPTION"], \ ['.arch', 0, 5, "RPMTAG_ARCH"], \ ['.version', 0, 6, "RPMTAG_VERSION"], \ ['.dirnames', 0, 7, "RPMTAG_DIRNAMES"], \ ['.group', 0, 8, "RPMTAG_GROUP"], \ ['.list', 0, 9, "RPMTAG_FILENAMES"], \ ['.obsoletes', 0, 10, "RPMTAG_OBSOLETES"], \ ['.provides', 0, 11, "RPMTAG_PROVIDES"], \ ['.requires', 0, 12, "RPMTAG_REQUIRES"], \ ['.basenames', 0, 13, "RPMTAG_BASENAMES"], \ ['.buildtime', 0, 14, "RPMTAG_BUILDTIME"], \ ['.file.class', 9, 1, "RPMTAG_FILECLASS"], \ ['.file.linktos', 9, 2, "RPMTAG_FILELINKTOS"], \ ['.file.names', 9, 3, "RPMTAG_FILENAMES"], \ ['.file.sizes', 9, 4, "RPMTAG_FILESIZES"] \ ) def rpm_instance(self, serial): ''' Called once per instance request; to check if package list has changed. ''' self.log("instance update for %d" % serial) # Wait on setup_indom thread if it is actively updating the indom if self.updating_indom == True: self.indom_thread.join() self.updating_indom = False # If the rpm database has changed then reload the package list rpmdb_mtime = getmtime("/var/lib/rpm/Packages") if (self.rpmdb_mtime != rpmdb_mtime): self.rpmdb_mtime = rpmdb_mtime self.updating_indom = True self.indom_thread.start() def rpm_fetch(self): ''' Called once per fetch PDU, before callbacks ''' self.log("rpm_fetch") self.numfetch += 1 def rpm_fetch_callback(self, cluster, item, inst): ''' Main fetch callback Get metric rpm.cluster.item for instance inst; e.g. get the filename list (.list) for the python instance ''' self.log("rpm_fetch_callback for %d/%d/%d" % (cluster, item, inst)) qtype = "" # Get the metric rpm.cluster.item for m in self.rpm_metrics: if (cluster == m[1] and item == m[2]): qtype = m[3] if len(qtype) == 0: return [c_api.PM_ERR_PMID, 0] voidp = self.inst_lookup(self.source_indom, inst) if (voidp == None): return [c_api.PM_ERR_INST, 0] valuep = cast(voidp, POINTER(c_int)) rpm_name = self.rpms_by_n[valuep.contents.value] # Get the metric for this inst package_list = self.rpm_handle.dbMatch('name', rpm_name) for package in package_list: metric_value = str(package[eval("rpm." + qtype)]) return [metric_value, 1] def __init__(self, name, domain): PMDA.__init__(self, name, domain) self.configfile = PCP.pmGetConfig('PCP_PMDAS_DIR') self.configfile += '/' + name + '/' + name + '.conf' self.source_indom = self.indom(0) self.add_indom(pmdaIndom(self.source_indom, self.source)) self.rpm_handle = rpm.TransactionSet() self.rpmdb_mtime = getmtime("/var/lib/rpm/Packages") self.rpms_by_n = {} self.indom_thread = setup_indom(self, name) self.indom_thread.start() self.updating_indom = True self.log(str(len(self.rpms_by_n))) for m in self.rpm_metrics: self.add_metric(name + m[0], pmdaMetric(self.pmid(m[1], m[2]), \ c_api.PM_TYPE_STRING, self.source_indom, \ c_api.PM_SEM_INSTANT, pmUnits(0, 0, 0, 0, 0, 0))) self.set_fetch(self.rpm_fetch) self.set_instance(self.rpm_instance) self.set_fetch_callback(self.rpm_fetch_callback) self.set_user(PCP.pmGetConfig('PCP_USER')) if __name__ == '__main__': RpmPMDA('rpm', 255).run() --------------000001090608050001070300-- From scox@redhat.com Thu Oct 17 20:43:12 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 161EB7F3F for ; Thu, 17 Oct 2013 20:43:12 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 03F85304043 for ; Thu, 17 Oct 2013 18:43:08 -0700 (PDT) X-ASG-Debug-ID: 1382060587-04cbb02c3b1b66350001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id AlSgGxLauZFCCVFy for ; Thu, 17 Oct 2013 18:43:08 -0700 (PDT) X-Barracuda-Envelope-From: scox@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9I1h73O027228 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 17 Oct 2013 21:43:07 -0400 Received: from [10.13.129.153] (dhcp129-153.rdu.redhat.com [10.13.129.153]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9I1h7XH025903 for ; Thu, 17 Oct 2013 21:43:07 -0400 Message-ID: <5260922B.2040001@redhat.com> Date: Thu, 17 Oct 2013 21:43:07 -0400 From: Stan Cox User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: PCP Subject: Re: rpm pmda References: <52608FC9.2050103@redhat.com> X-ASG-Orig-Subj: Re: rpm pmda In-Reply-To: <52608FC9.2050103@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1382060588 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 A couple of simple examples: pmval -s 1 rpm.list -i python metric: rpm.list host: dieyong semantics: instantaneous value units: none samples: 1 python "['/usr/bin/pydoc', '/usr/bin/python', '/usr/bin/python2', '/usr/bin/python2.7', '/usr/share/doc/python-2.7.5', '/usr/share/doc/python-2.7.5/LICENSE', '/usr/share/doc/python-2.7.5/README', '/usr/share/man/man1/python.1.gz', '/usr/share/man/man1/python2.1.gz', '/usr/share/man/man1/python2.7.1.gz']" pmval -s 1 rpm.version -i python metric: rpm.version host: dieyong semantics: instantaneous value units: none samples: 1 python "2.7.5" From kenj@internode.on.net Fri Oct 18 00:24:34 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: * X-Spam-Status: No, score=1.9 required=5.0 tests=STOX_REPLY_TYPE autolearn=no version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 8DFE87F5A for ; Fri, 18 Oct 2013 00:24:34 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 3822CAC003 for ; Thu, 17 Oct 2013 22:24:31 -0700 (PDT) X-ASG-Debug-ID: 1382073866-04bdf02f221bdc170001-S8gJnT Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by cuda.sgi.com with ESMTP id 284VqMW8hOLDOeqP for ; Thu, 17 Oct 2013 22:24:26 -0700 (PDT) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.129 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AnIQAM/EYFJujSDi/2dsb2JhbABXA4MHOIJvgQy6aAEDAQGBKhZ0giUBAQ0bFTMJBQsBAgcDAw0EBAEBAwIjAwIdKwcCDgESCAEIh3QNrh6SNASBJYxfGhsjSwQSEA0Lglk1gQoDjxmKH4UzA4NuhzSBZoFSKIE0 Received: from unknown (HELO bozohorize) ([110.141.32.226]) by ipmail06.adl2.internode.on.net with ESMTP; 18 Oct 2013 15:54:21 +1030 Message-ID: <4B650F778FDF4877A6B7E6A8E05B3138@bozohorize> From: "Ken McDonell" To: "Frank Ch. Eigler" , "Nathan Scott" Cc: "PCP Mailing List" Subject: Fw: [IANA #679880] Application for a Port Number and/or Service Name "pmwebapi" (Completed) Date: Fri, 18 Oct 2013 16:24:12 +1100 X-ASG-Orig-Subj: Fw: [IANA #679880] Application for a Port Number and/or Service Name "pmwebapi" (Completed) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="UTF-8"; reply-type=original Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal Importance: Normal X-Mailer: Microsoft Windows Live Mail 16.4.3508.205 X-MimeOLE: Produced By Microsoft MimeOLE V16.4.3508.205 X-Barracuda-Connect: ipmail06.adl2.internode.on.net[150.101.137.129] X-Barracuda-Start-Time: 1382073866 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, STOX_REPLY_TYPE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141560 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 STOX_REPLY_TYPE STOX_REPLY_TYPE 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header This was like giving birth to an elephant (not from first hand experience but as related events have been described to me). [off stage left] A small hooray. -----Original Message----- From: Pearl Liang via RT Sent: Thursday, October 10, 2013 4:16 AM Cc: kenj@internode.on.net Subject: [IANA #679880] Application for a Port Number and/or Service Name "pmwebapi" (Completed) Dear Ken McDonell: Your request has been processed. We have assigned the following TCP port to Performance Co-Pilot (PCP) Project with you as the point of contact: pmwebapi 44323 tcp HTTP binding for Performance Co-Pilot client API [Performance_Co-Pilot_PCP_Project] mailto:kenj&internode.on.net [Ken_McDonell_2] Ken_McDonell mailto:kenj&internode.on.net 2013-10-09 NOTE: The port will be used for both no-security and later developed secure version of the pmwebapi application. The expert review for this request was completed by: Allison Mankin See: http://www.iana.org/assignments/service-names-port-numbers Please notify IANA if there is any change in contact information by completing the following template: http://www.iana.org/cgi-bin/mod_portno.pl Your tickets IANA #679880 and #679881 are being resolved. Regards, Pearl Liang ICANN/IANA *************************************************************** 12025 Waterfront Drive, Suite 300 Los Angeles, CA 90094-2536 USA Phone: +1 310 301 5800 FAX: +1 310 823 8649 email: iana-ports@iana.org *************************************************************** From gocha@itcom.pl Fri Oct 18 16:17:54 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=HTML_MESSAGE autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id E13037F3F for ; Fri, 18 Oct 2013 16:17:54 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id C05E1304077 for ; Fri, 18 Oct 2013 14:17:51 -0700 (PDT) X-ASG-Debug-ID: 1382131061-04bdf07897036d0001-S8gJnT Received: from poczta.itcom.pl (poczta.itcom.pl [212.244.23.1]) by cuda.sgi.com with ESMTP id 1Fl3GA5NoPcw9GYO for ; Fri, 18 Oct 2013 14:17:42 -0700 (PDT) X-Barracuda-Envelope-From: gocha@itcom.pl X-Barracuda-Apparent-Source-IP: 212.244.23.1 Received: from localhost (localhost [127.0.0.1]) by poczta.itcom.pl (Postfix) with ESMTP id 9B88B1ABAE3A; Fri, 18 Oct 2013 23:18:08 +0200 (CEST) Received: from poczta.itcom.pl ([127.0.0.1]) by localhost (poczta.itcom.pl [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id b0sSX1HEihHM; Fri, 18 Oct 2013 23:18:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by poczta.itcom.pl (Postfix) with ESMTP id 82F4F1ABAE3B; Fri, 18 Oct 2013 23:18:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at itcom.pl Received: from poczta.itcom.pl ([127.0.0.1]) by localhost (poczta.itcom.pl [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id qxZ2Yw4MT4Bn; Fri, 18 Oct 2013 23:18:02 +0200 (CEST) Received: from Unknown (unknown [175.196.65.153]) by poczta.itcom.pl (Postfix) with ESMTPSA id 0F24F1ABAE3A; Fri, 18 Oct 2013 23:17:56 +0200 (CEST) Message-ID: <67A983F073FF4AC8AA73F21B37318DC0@svnbeq> Reply-To: "itnelly" From: "itnelly" To: , , , , Subject: =?koi8-r?Q?=DA=C1=D3=D4=D2=C1=C8=CF=D7=C1=D4=D8=D3=D1_=CF?= =?koi8-r?Q?=D4_=C8=D5=C4=CF=C7=CF_=DA=D2=C5=CE=C9=D1_=D3?= =?koi8-r?Q?=C2=D9=D4=CF=DE=CE=CF?= Date: Fri, 18 Oct 2013 23:16:34 +0200 X-ASG-Orig-Subj: =?koi8-r?Q?=DA=C1=D3=D4=D2=C1=C8=CF=D7=C1=D4=D8=D3=D1_=CF?= =?koi8-r?Q?=D4_=C8=D5=C4=CF=C7=CF_=DA=D2=C5=CE=C9=D1_=D3?= =?koi8-r?Q?=C2=D9=D4=CF=DE=CE=CF?= MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_NextPart_000_1347_01CECC58.1668FA50" X-Priority: 3 X-Barracuda-Connect: poczta.itcom.pl[212.244.23.1] X-Barracuda-Start-Time: 1382131062 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=HTML_MESSAGE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141576 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 HTML_MESSAGE BODY: HTML included in message This is a multi-part message in MIME format. ------=_NextPart_000_1347_01CECC58.1668FA50 Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: quoted-printable =FA=C1=CE=C9=CD=C1=D1=D3=D8 =CC=C9=DB=D8 10-15 =CD=C9=CE=D5=D4 =D7 =CD=CF= =CD=C5=CE=D4, =F7=D9 =D7=CF=DA=D7=D2=C1=D4=C9=D4=C5 =D3=C5=C2=C5 100-=D0=D2= =CF=C3=C5=CE=D4=CE=CF=C5 =DA=D2=C5=CE=C9=C5 http://www.konalink.ru/tmp/nh= iei.htm=20 ------=_NextPart_000_1347_01CECC58.1668FA50 Content-Type: text/html; charset="koi8-r" Content-Transfer-Encoding: quoted-printable
=FA=C1=CE=C9= =CD=C1=D1=D3=D8 =CC=C9=DB=D8 10-15 =CD=C9=CE=D5=D4 =D7 =CD=CF=CD=C5=CE=D4= , =F7=D9 =D7=CF=DA=D7=D2=C1=D4=C9=D4=C5 =D3=C5=C2=C5 100-=D0=D2=CF=C3=C5=CE= =D4=CE=CF=C5 =DA=D2=C5=CE=C9=C5 http://www.konalink.ru/tmp/nhiei.htm
= ------=_NextPart_000_1347_01CECC58.1668FA50-- From flightcase59@flightcase.oicp.net Sat Oct 19 17:18:08 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: ** X-Spam-Status: No, score=2.2 required=5.0 tests=DATE_IN_PAST_12_24, HTML_FONT_SIZE_LARGE,HTML_MESSAGE,MIME_HTML_ONLY autolearn=no version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 3D97E7F3F for ; Sat, 19 Oct 2013 17:18:08 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id EDA77AC001 for ; Sat, 19 Oct 2013 15:17:52 -0700 (PDT) X-ASG-Debug-ID: 1382221065-04bdf0789a2a100001-S8gJnT Received: from flightcase.oicp.net ([163.142.232.15]) by cuda.sgi.com with SMTP id DRNXB7A7FkwmQGex for ; Sat, 19 Oct 2013 15:17:46 -0700 (PDT) X-Barracuda-Envelope-From: flightcase59@flightcase.oicp.net X-Barracuda-Apparent-Source-IP: 163.142.232.15 Received: from 5Z9JKNC794GIFJH[127.0.0.1] by 5Z9JKNC794GIFJH[127.0.0.1] (SMTPD32); Sat, 19 Oct 2013 09:22:56 +0800 From: "flightcase factory" Subject: re:see invoice 3 To: "pcp" X-ASG-Orig-Subj: re:see invoice 3 MIME-Version: 1.0 Sender: flightcase59@flightcase.oicp.net Reply-To: sales@mz-flightcase.com Date: Sat, 19 Oct 2013 09:22:56 +0800 X-Priority: 3 X-DNSRBL: X-MAIL: PS-MAM01.PSheng.com q9QDEkb8018968 X-Mailer: Foxmail 7.0.1.91[cn] Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Barracuda-Connect: UNKNOWN[163.142.232.15] X-Barracuda-Start-Time: 1382221066 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 1.06 X-Barracuda-Spam-Status: No, SCORE=1.06 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=DATE_IN_PAST_12_24, DATE_IN_PAST_12_24_2, HTML_FONT_SIZE_LARGE, HTML_MESSAGE, MIME_HTML_ONLY, MISSING_MID, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141607 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.14 MISSING_MID Missing Message-Id: header 0.01 DATE_IN_PAST_12_24 Date: is 12 to 24 hours before Received: date 0.00 HTML_FONT_SIZE_LARGE BODY: HTML font size is large 0.00 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.00 HTML_MESSAGE BODY: HTML included in message 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.80 DATE_IN_PAST_12_24_2 DATE_IN_PAST_12_24_2 Message-Id: <20131019221752.3A1AFA4217F@cuda.sgi.com>

 

Hello, sir

sorry take your time.

we are MinZhi flight case manufactory, we provide high quality flight case and cheap cost for stage lighting equipment and AUDIO EQUIPMENT, if you buy the audio and lighting equipment from china, we can send the flight case to your chinese supplier, will help you save much fee!

we also customize flight case for your equipment if you are interest?

 

Linda

MINZHI FLIGHT CASE MANUFACTORY

From dak-unpriv@franck.debian.org Sat Oct 19 21:39:09 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 7E3047F50 for ; Sat, 19 Oct 2013 21:39:09 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 5D6F6304066 for ; Sat, 19 Oct 2013 19:39:06 -0700 (PDT) X-ASG-Debug-ID: 1382236741-04cbb031d32a750001-S8gJnT Received: from franck.debian.org (franck.debian.org [138.16.160.12]) by cuda.sgi.com with ESMTP id inTAmchcdoKD3moo (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sat, 19 Oct 2013 19:39:02 -0700 (PDT) X-Barracuda-Envelope-From: dak-unpriv@franck.debian.org X-Barracuda-Apparent-Source-IP: 138.16.160.12 Received: from dak-unpriv by franck.debian.org with local (Exim 4.80) (envelope-from ) id 1VXiuz-0004tw-5j for pcp@oss.sgi.com; Sun, 20 Oct 2013 02:39:01 +0000 To: pcp@oss.sgi.com From: Debian FTP Masters Subject: Processing of pcp_3.8.5_i386.changes Date: Sun, 20 Oct 2013 02:39:01 +0000 X-ASG-Orig-Subj: Processing of pcp_3.8.5_i386.changes X-Debian: DAK X-DAK: DAK Precedence: bulk Auto-Submitted: auto-generated X-Debian-Package: pcp Message-Id: Sender: unprivileged ftp-master role account X-Barracuda-Connect: franck.debian.org[138.16.160.12] X-Barracuda-Start-Time: 1382236742 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141613 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- pcp_3.8.5_i386.changes uploaded successfully to localhost along with the files: pcp_3.8.5.dsc pcp_3.8.5.tar.gz pcp_3.8.5_i386.deb libpcp3-dev_3.8.5_i386.deb libpcp3_3.8.5_i386.deb libpcp-gui2-dev_3.8.5_i386.deb libpcp-gui2_3.8.5_i386.deb libpcp-mmv1-dev_3.8.5_i386.deb libpcp-mmv1_3.8.5_i386.deb libpcp-pmda3-dev_3.8.5_i386.deb libpcp-pmda3_3.8.5_i386.deb libpcp-trace2-dev_3.8.5_i386.deb libpcp-trace2_3.8.5_i386.deb libpcp-import1-dev_3.8.5_i386.deb libpcp-import1_3.8.5_i386.deb python-pcp_3.8.5_i386.deb libpcp-pmda-perl_3.8.5_i386.deb libpcp-import-perl_3.8.5_i386.deb libpcp-logsummary-perl_3.8.5_i386.deb libpcp-mmv-perl_3.8.5_i386.deb pcp-import-sar2pcp_3.8.5_all.deb pcp-import-mrtg2pcp_3.8.5_all.deb pcp-import-sheet2pcp_3.8.5_all.deb pcp-import-iostat2pcp_3.8.5_all.deb pcp-import-collectl2pcp_3.8.5_i386.deb pcp-testsuite_3.8.5_i386.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) From envelope@ftp-master.debian.org Sat Oct 19 22:06:40 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 6809B7F4E for ; Sat, 19 Oct 2013 22:06:40 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id 35ECD30406B for ; Sat, 19 Oct 2013 20:06:37 -0700 (PDT) X-ASG-Debug-ID: 1382238391-04bdf078992fae0001-S8gJnT Received: from franck.debian.org (franck.debian.org [138.16.160.12]) by cuda.sgi.com with ESMTP id 0NuvGtW5fOHrx55W (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sat, 19 Oct 2013 20:06:32 -0700 (PDT) X-Barracuda-Envelope-From: envelope@ftp-master.debian.org X-Barracuda-Apparent-Source-IP: 138.16.160.12 Received: from dak by franck.debian.org with local (Exim 4.80) (envelope-from ) id 1VXjLa-0003KF-GO; Sun, 20 Oct 2013 03:06:30 +0000 From: Debian FTP Masters To: PCP Development Team , Nathan Scott X-DAK: dak process-upload X-Debian: DAK X-Debian-Package: pcp Precedence: bulk Auto-Submitted: auto-generated MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: pcp_3.8.5_i386.changes ACCEPTED into unstable Message-Id: X-ASG-Orig-Subj: pcp_3.8.5_i386.changes ACCEPTED into unstable Sender: Archive Administrator Date: Sun, 20 Oct 2013 03:06:30 +0000 X-Barracuda-Connect: franck.debian.org[138.16.160.12] X-Barracuda-Start-Time: 1382238392 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141614 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Accepted: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Fri, 18 Oct 2013 08:49:26 +1100 Source: pcp Binary: pcp libpcp3-dev libpcp3 libpcp-gui2-dev libpcp-gui2 libpcp-mmv1-dev libpcp-mmv1 libpcp-pmda3-dev libpcp-pmda3 libpcp-trace2-dev libpcp-trace2 libpcp-import1-dev libpcp-import1 python-pcp libpcp-pmda-perl libpcp-import-perl libpcp-logsummary-perl libpcp-mmv-perl pcp-import-sar2pcp pcp-import-mrtg2pcp pcp-import-sheet2pcp pcp-import-iostat2pcp pcp-import-collectl2pcp pcp-testsuite Architecture: source i386 all Version: 3.8.5 Distribution: unstable Urgency: low Maintainer: PCP Development Team Changed-By: Nathan Scott Description: libpcp-gui2 - Performance Co-Pilot graphical client tools library libpcp-gui2-dev - Performance Co-Pilot graphical client tools library and headers libpcp-import-perl - Performance Co-Pilot log import Perl module libpcp-import1 - Performance Co-Pilot data import library libpcp-import1-dev - Performance Co-Pilot data import library and headers libpcp-logsummary-perl - Performance Co-Pilot historical log summary module libpcp-mmv-perl - Performance Co-Pilot Memory Mapped Value Perl module libpcp-mmv1 - Performance Co-Pilot Memory Mapped Value client library libpcp-mmv1-dev - Performance Co-Pilot Memory Mapped Value library and headers libpcp-pmda-perl - Performance Co-Pilot Domain Agent Perl module libpcp-pmda3 - Performance Co-Pilot Domain Agent library libpcp-pmda3-dev - Performance Co-Pilot Domain Agent library and headers libpcp-trace2 - Performance Co-Pilot application tracing library libpcp-trace2-dev - Performance Co-Pilot application tracing library and headers libpcp3 - Performance Co-Pilot library libpcp3-dev - Performance Co-Pilot library and headers pcp - System level performance monitoring and performance management pcp-import-collectl2pcp - Tool for importing data from collectl into PCP archive logs pcp-import-iostat2pcp - Tool for importing data from iostat into PCP archive logs pcp-import-mrtg2pcp - Tool for importing data from MRTG into PCP archive logs pcp-import-sar2pcp - Tool for importing data from sar into PCP archive logs pcp-import-sheet2pcp - Tool for importing data from a spreadsheet into PCP archive logs pcp-testsuite - Performance Co-Pilot (PCP) Test Suite python-pcp - Performance Co-Pilot Python PMAPI module Closes: 725627 Changes: pcp (3.8.5) unstable; urgency=low . * New release (full details in CHANGELOG). * Resolve FTBFS for kfreebsd probes.h (closes: #725627) Checksums-Sha1: f5f18967f53380755febce792821d10aec7d7ed3 2297 pcp_3.8.5.dsc e10e815ae2bdb32cbcbcc00481a9e499e1d5f760 7192320 pcp_3.8.5.tar.gz 3ddf428d9a648fdca0760e1cdc38e3f407e756dc 1112994 pcp_3.8.5_i386.deb 32af0dbdd99570efc18b94db3c65ae0aea067991 369816 libpcp3-dev_3.8.5_i386.deb ca130c537919d9919234bd8722dbba4a06dcf901 175100 libpcp3_3.8.5_i386.deb fae837a23060121ee8ca582d8361e064ab826c7b 15410 libpcp-gui2-dev_3.8.5_i386.deb 8ce8b19fa388235f25a0bcb5baaf1913938bf280 14040 libpcp-gui2_3.8.5_i386.deb 049047f50e7beb44ed43e4e690984023b8e7af3d 17908 libpcp-mmv1-dev_3.8.5_i386.deb 3690062981ca558a1af9ad9543c002b72511dfb3 11162 libpcp-mmv1_3.8.5_i386.deb 0b8120335a823a0722ff3c58fe3033947711c5fb 90850 libpcp-pmda3-dev_3.8.5_i386.deb 6f81a64a5d27404846cf4e7a3cfd534f5fdecfa6 33968 libpcp-pmda3_3.8.5_i386.deb 949e79c2e772f306371748fd1a6bbf44f96ac550 25954 libpcp-trace2-dev_3.8.5_i386.deb 516d25ee8408493eb66e1f2cbd7ebd05ec1282bb 18126 libpcp-trace2_3.8.5_i386.deb 1b41a02e2e61b15f44ce757aad3c3a8fbd2640ae 15028 libpcp-import1-dev_3.8.5_i386.deb e3b7dcadf73932a00e1a7a110e3330f67eb756b7 14546 libpcp-import1_3.8.5_i386.deb f932424288cf7675ed2cfbb46ac78c7160d40f57 39394 python-pcp_3.8.5_i386.deb ba7a603b2fff63d9f5d5f0719bb619fdccb01df1 31002 libpcp-pmda-perl_3.8.5_i386.deb 8bcb1d58e0c4eec428b25f8ead874d72e9419028 15856 libpcp-import-perl_3.8.5_i386.deb e719cef97ebb1059fc3d5bbdcc38a693f55464d7 10524 libpcp-logsummary-perl_3.8.5_i386.deb 1d80c7f78631baf8c5cf30da479c01a765401a36 17036 libpcp-mmv-perl_3.8.5_i386.deb 47d5a1b5b479b86d656d1a16dfaf33776978c518 15832 pcp-import-sar2pcp_3.8.5_all.deb aedee8669ddb158c7bcb0c523570100dfd3414cc 9684 pcp-import-mrtg2pcp_3.8.5_all.deb a5b46775faefc7d6c5fceaf5e2e572a43fb44099 18680 pcp-import-sheet2pcp_3.8.5_all.deb 55c52a861cbb411907b7f6731a6bdda7507d011d 17350 pcp-import-iostat2pcp_3.8.5_all.deb bd2ef01fc353261678ac5d494aeef96fa263cab4 22458 pcp-import-collectl2pcp_3.8.5_i386.deb 0f05b4133795000af0b9096329ac2fd660a387cf 2128572 pcp-testsuite_3.8.5_i386.deb Checksums-Sha256: bc38643932116d908d9946eeebc46514511a62d5acdb4838a4c67786a117bd47 2297 pcp_3.8.5.dsc 14539a8d2bfab08e89b554ed9eac114acbc4f430a61ee456dbb9b9c4059b5ccd 7192320 pcp_3.8.5.tar.gz 1016552407f1afbd01c17cd9549f316e53e0e6171dc4ed0183c73a4dba8da415 1112994 pcp_3.8.5_i386.deb 36232a6af00d75870d9f59f3d6d63cac113daae77de38d7932659affc093267c 369816 libpcp3-dev_3.8.5_i386.deb 2d8236f3bbad496bd37fd5f545b525478bc41a1fc29f180009aa170259a05a30 175100 libpcp3_3.8.5_i386.deb 07827aa50583f8057f819cd928b6081857d0705a8c5d8ca1d008485f0bdb73a5 15410 libpcp-gui2-dev_3.8.5_i386.deb 184185e7925ce8520835ba89d1f3703b0ed13bb3540d5af62d7b55a0069e3b09 14040 libpcp-gui2_3.8.5_i386.deb e717830c6da20cbded7461e071d75713d020b31a4cddb070e4039248ed13dffc 17908 libpcp-mmv1-dev_3.8.5_i386.deb bf0c8402392f13de47973a718f9c2765fdc4e50599daf8b4ec40bd470f6e99fc 11162 libpcp-mmv1_3.8.5_i386.deb 2845a8047c6d6c2eee41afec39d9406dcadd86b5f40836741165555c6e20f02b 90850 libpcp-pmda3-dev_3.8.5_i386.deb 191c3c99548656bbfdfccb4968561e282e860faf37f04ab2107005e34a865813 33968 libpcp-pmda3_3.8.5_i386.deb 58c2d6bf18db9378a56f0ba14648691b74bf1ca7cc7fe05965b46c515506637a 25954 libpcp-trace2-dev_3.8.5_i386.deb 16991500cac2217219fb09789c8f3a490d2cae0fa2e0d4002bb47c2af21817b0 18126 libpcp-trace2_3.8.5_i386.deb dd22ac949826b3e0e45e0e98b5399ea9c4a120310a80b0a0ec01f0f96a7517ca 15028 libpcp-import1-dev_3.8.5_i386.deb 416d8203658aa99cc18b640a76ab02ed325e85cbdafd1ee702e79367ec08497d 14546 libpcp-import1_3.8.5_i386.deb 247b69a7ed420862ebf408514d28fd678721d91718626d81ebe45b0db6e0a74f 39394 python-pcp_3.8.5_i386.deb b1e9a04e95cd0f2293c5402f583d4aa3a67d8272963740c86dc1483e2833c4b7 31002 libpcp-pmda-perl_3.8.5_i386.deb 8d562da933090fe68c37634161458fcb14a98b362d2e49233b38bb795707ea2f 15856 libpcp-import-perl_3.8.5_i386.deb b1929ec5dea518cd4801bd1601cc6fca7c12b9230040587d5f329d3f6528d005 10524 libpcp-logsummary-perl_3.8.5_i386.deb 0ccccb9fecc0f31c7162cbc1e38d5b3af2234da297fca5f9b2be93c63ac0b419 17036 libpcp-mmv-perl_3.8.5_i386.deb 16211396465181e8c3abcd45fdcfd4895454ddd292b919b24f86db0a30b1fdf4 15832 pcp-import-sar2pcp_3.8.5_all.deb 121514da871b45d7e46ae9983496c9f419703f0915f9825bd5e6adfc532715ff 9684 pcp-import-mrtg2pcp_3.8.5_all.deb be4e0755f38bbe30e2a93bcb5087ca799257d6ead83fa68693c24ce6bf6f7f41 18680 pcp-import-sheet2pcp_3.8.5_all.deb 82132fcc3830f188ec4874cbf40de8140114b7808e21e100ba0c7b0fe510ad62 17350 pcp-import-iostat2pcp_3.8.5_all.deb a8176989182957275e3ad6b911a77104adc3051206c8180eeff9f59dc8ec9b72 22458 pcp-import-collectl2pcp_3.8.5_i386.deb 10fa045a9925d5cced57a41caebef0accd3f9a7740841d3a10336ddfcf6768dc 2128572 pcp-testsuite_3.8.5_i386.deb Files: 19b380b96ae04eebea81a74429697e36 2297 utils extra pcp_3.8.5.dsc 8e1646ed8470cc04662c8b6e5edb4d65 7192320 utils extra pcp_3.8.5.tar.gz 958d112c9f7fb52bfdc6f60118afb9ac 1112994 utils extra pcp_3.8.5_i386.deb b900dcb41bdd6030d88158bc140e4e9f 369816 libdevel extra libpcp3-dev_3.8.5_i386.deb ce6864f6edd0c011e0fc86a9f77e851e 175100 libs extra libpcp3_3.8.5_i386.deb 75af2c031d38ebcc3cdf7f0515d04039 15410 libdevel extra libpcp-gui2-dev_3.8.5_i386.deb b09d77457da40f4fe245bd12f9d931cd 14040 libs extra libpcp-gui2_3.8.5_i386.deb 67084f3455528f462d5daf69780e0d1d 17908 libdevel extra libpcp-mmv1-dev_3.8.5_i386.deb 8c0526e70ded5433b11d98467bd0937f 11162 libs extra libpcp-mmv1_3.8.5_i386.deb 31d82d231a63f2587d389dbad49f3547 90850 libdevel extra libpcp-pmda3-dev_3.8.5_i386.deb c5e1301d065ebe51182b2a28f63f43d9 33968 libs extra libpcp-pmda3_3.8.5_i386.deb 53e11ea7fb56866c209fa59bab799913 25954 libdevel extra libpcp-trace2-dev_3.8.5_i386.deb e63c7de9527ef6c630ce158cd4e02c96 18126 libs extra libpcp-trace2_3.8.5_i386.deb a68b3988daf67d2fc10784bc1338f87d 15028 libdevel extra libpcp-import1-dev_3.8.5_i386.deb fbd74fd257b96078b570544a871ef804 14546 libs extra libpcp-import1_3.8.5_i386.deb 8fc37673d4920d400cfb5496531d6a32 39394 python extra python-pcp_3.8.5_i386.deb 7354a50d98f77473ccc714b83ccf37fc 31002 perl extra libpcp-pmda-perl_3.8.5_i386.deb fc16eb0856a1d50efa7bfe2e9e993a8d 15856 perl extra libpcp-import-perl_3.8.5_i386.deb 965e59e7c55d4991ed4f3f2d81150f8c 10524 perl extra libpcp-logsummary-perl_3.8.5_i386.deb efb9192df30f3a7669e66900318472e1 17036 perl extra libpcp-mmv-perl_3.8.5_i386.deb 6aea28a1b03defa4266f35e76ef44792 15832 utils extra pcp-import-sar2pcp_3.8.5_all.deb a8252be953b1056f3841a242e08978c0 9684 utils extra pcp-import-mrtg2pcp_3.8.5_all.deb 42ac7fbf917c0b20a8cd8523d532a13c 18680 utils extra pcp-import-sheet2pcp_3.8.5_all.deb 38c3031b2e8b4dacffb4d104c696ecff 17350 utils extra pcp-import-iostat2pcp_3.8.5_all.deb 54d5f6356bd1dc8cb60497d7a2400b13 22458 utils extra pcp-import-collectl2pcp_3.8.5_i386.deb 2353e9db712f3953e90b43b3ab62eb90 2128572 utils extra pcp-testsuite_3.8.5_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iEYEARECAAYFAlJgYkIACgkQm8fl3HSIa2P4dgCdEbgTtS0lrHmCZeOWucOFiyPV +U8AnAkYFzBkWIS884aJzbr4S5sneNvS =NG11 -----END PGP SIGNATURE----- Thank you for your contribution to Debian. From debbugs@buxtehude.debian.org Sat Oct 19 22:09:12 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id CC1C47F50 for ; Sat, 19 Oct 2013 22:09:12 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id 6D7928F8035 for ; Sat, 19 Oct 2013 20:09:12 -0700 (PDT) X-ASG-Debug-ID: 1382238550-04bdf0789a2fbd0001-S8gJnT Received: from buxtehude.debian.org (buxtehude.debian.org [140.211.166.26]) by cuda.sgi.com with ESMTP id pgjdDpCIefu99k4Q (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sat, 19 Oct 2013 20:09:10 -0700 (PDT) X-Barracuda-Envelope-From: debbugs@buxtehude.debian.org X-Barracuda-Apparent-Source-IP: 140.211.166.26 Received: from debbugs by buxtehude.debian.org with local (Exim 4.80) (envelope-from ) id 1VXjO8-0002m9-V8; Sun, 20 Oct 2013 03:09:08 +0000 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: owner@bugs.debian.org From: owner@bugs.debian.org (Debian Bug Tracking System) To: Nathan Scott Subject: Bug#725627: marked as done (pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory) Message-ID: X-ASG-Orig-Subj: Bug#725627: marked as done (pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory) References: <20131006220536.3962.18425.reportbug@bowmore.home.mraw.org> X-Debian-PR-Message: closed 725627 X-Debian-PR-Package: src:pcp X-Debian-PR-Source: pcp Date: Sun, 20 Oct 2013 03:09:08 +0000 Content-Type: multipart/mixed; boundary="----------=_1382238548-10666-0" Sender: Debian BTS X-Barracuda-Connect: buxtehude.debian.org[140.211.166.26] X-Barracuda-Start-Time: 1382238550 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141614 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- This is a multi-part message in MIME format... ------------=_1382238548-10666-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Your message dated Sun, 20 Oct 2013 03:06:30 +0000 with message-id and subject line Bug#725627: fixed in pcp 3.8.5 has caused the Debian Bug report #725627, regarding pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: N= o such file or directory to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) --=20 725627: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D725627 Debian Bug Tracking System Contact owner@bugs.debian.org with problems ------------=_1382238548-10666-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by bugs.debian.org; 6 Oct 2013 22:05:42 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2-bugs.debian.org_2005_01_02 (2011-06-06) on buxtehude.debian.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=4.0 tests=BAYES_00,FROMDEVELOPER, RCVD_IN_PBL,T_RCVD_IN_SEMBLACK,XMAILER_REPORTBUG,X_DEBBUGS_CC autolearn=ham version=3.3.2-bugs.debian.org_2005_01_02 X-Spam-Bayes: score:0.0000 Tokens: new, 7; hammy, 130; neutral, 34; spammy, 1. spammytokens:0.959-+--H*r:bugs.debian.org hammytokens:0.000-+--H*x:6.4.4, 0.000-+--H*UA:6.4.4, 0.000-+--H*M:reportbug, 0.000-+--H*MI:reportbug, 0.000-+--HX-Debbugs-Cc:sk:debian- Return-path: Received: from home.mraw.org ([82.236.137.215] helo=bowmore.home.mraw.org) by buxtehude.debian.org with esmtp (Exim 4.80) (envelope-from ) id 1VSwSM-0007zX-6l for submit@bugs.debian.org; Sun, 06 Oct 2013 22:05:42 +0000 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Cyril Brulebois To: Debian Bug Tracking System Subject: pcp: FTBFS on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or directory Message-ID: <20131006220536.3962.18425.reportbug@bowmore.home.mraw.org> X-Mailer: reportbug 6.4.4 Date: Mon, 07 Oct 2013 00:05:36 +0200 X-Debbugs-Cc: kibi@debian.org, debian-bsd@lists.debian.org Delivered-To: submit@bugs.debian.org Source: pcp Version: 3.8.4 Severity: serious Justification: FTBFS Hi, your package no longer builds on kfreebsd-*: | gcc -fPIC -fno-strict-aliasing -D_GNU_SOURCE -fstack-protector-all -D_FORTIFY_SOURCE=2 -I../../../src/pmcd/src -I../../../src/libpcp/src -DPMCD_INTERNAL -I/usr/include/nss -I/usr/include/nspr -Wall -O2 -g -DPCP_DEBUG -DPCP_VERSION=\"3.8.4\" -I../../../src/include -I../../../src/include/pcp -c -o trace.o trace.c | trace.c:19:20: fatal error: probes.h: No such file or directory | #include "probes.h" | ^ | compilation terminated. Full build logs: https://buildd.debian.org/status/package.php?p=pcp&suite=sid Feel free to contact debian-bsd@ (cc'd) if you need help. Mraw, KiBi. ------------=_1382238548-10666-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 725627-close) by bugs.debian.org; 20 Oct 2013 03:06:35 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2-bugs.debian.org_2005_01_02 (2011-06-06) on buxtehude.debian.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=4.0 tests=BAYES_00,DIGITS_LETTERS, FOURLA,FROMDEVELOPER,FVGT_m_MULTI_ODD,HAS_BUG_NUMBER,PGPSIGNATURE, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2-bugs.debian.org_2005_01_02 X-Spam-Bayes: score:0.0000 Tokens: new, 127; hammy, 151; neutral, 214; spammy, 0. spammytokens: hammytokens:0.000-+--HX-Debian:DAK, 0.000-+--H*rp:D*ftp-master.debian.org, 0.000-+--HX-DAK:process-upload, 0.000-+--H*MI:franck, 0.000-+--H*m:franck Return-path: Received: from franck.debian.org ([138.16.160.12]) from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=franck.debian.org,EMAIL=hostmaster@franck.debian.org (verified) by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1VXjLf-0002gV-4A for 725627-close@bugs.debian.org; Sun, 20 Oct 2013 03:06:35 +0000 Received: from dak by franck.debian.org with local (Exim 4.80) (envelope-from ) id 1VXjLa-0003Kd-PF; Sun, 20 Oct 2013 03:06:30 +0000 From: Nathan Scott To: 725627-close@bugs.debian.org X-DAK: dak process-upload X-Debian: DAK X-Debian-Package: pcp MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: Bug#725627: fixed in pcp 3.8.5 Message-Id: Sender: Archive Administrator Date: Sun, 20 Oct 2013 03:06:30 +0000 Source: pcp Source-Version: 3.8.5 We believe that the bug you reported is fixed in the latest version of pcp, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 725627@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Nathan Scott (supplier of updated pcp package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmaster@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Fri, 18 Oct 2013 08:49:26 +1100 Source: pcp Binary: pcp libpcp3-dev libpcp3 libpcp-gui2-dev libpcp-gui2 libpcp-mmv1-dev libpcp-mmv1 libpcp-pmda3-dev libpcp-pmda3 libpcp-trace2-dev libpcp-trace2 libpcp-import1-dev libpcp-import1 python-pcp libpcp-pmda-perl libpcp-import-perl libpcp-logsummary-perl libpcp-mmv-perl pcp-import-sar2pcp pcp-import-mrtg2pcp pcp-import-sheet2pcp pcp-import-iostat2pcp pcp-import-collectl2pcp pcp-testsuite Architecture: source i386 all Version: 3.8.5 Distribution: unstable Urgency: low Maintainer: PCP Development Team Changed-By: Nathan Scott Description: libpcp-gui2 - Performance Co-Pilot graphical client tools library libpcp-gui2-dev - Performance Co-Pilot graphical client tools library and headers libpcp-import-perl - Performance Co-Pilot log import Perl module libpcp-import1 - Performance Co-Pilot data import library libpcp-import1-dev - Performance Co-Pilot data import library and headers libpcp-logsummary-perl - Performance Co-Pilot historical log summary module libpcp-mmv-perl - Performance Co-Pilot Memory Mapped Value Perl module libpcp-mmv1 - Performance Co-Pilot Memory Mapped Value client library libpcp-mmv1-dev - Performance Co-Pilot Memory Mapped Value library and headers libpcp-pmda-perl - Performance Co-Pilot Domain Agent Perl module libpcp-pmda3 - Performance Co-Pilot Domain Agent library libpcp-pmda3-dev - Performance Co-Pilot Domain Agent library and headers libpcp-trace2 - Performance Co-Pilot application tracing library libpcp-trace2-dev - Performance Co-Pilot application tracing library and headers libpcp3 - Performance Co-Pilot library libpcp3-dev - Performance Co-Pilot library and headers pcp - System level performance monitoring and performance management pcp-import-collectl2pcp - Tool for importing data from collectl into PCP archive logs pcp-import-iostat2pcp - Tool for importing data from iostat into PCP archive logs pcp-import-mrtg2pcp - Tool for importing data from MRTG into PCP archive logs pcp-import-sar2pcp - Tool for importing data from sar into PCP archive logs pcp-import-sheet2pcp - Tool for importing data from a spreadsheet into PCP archive logs pcp-testsuite - Performance Co-Pilot (PCP) Test Suite python-pcp - Performance Co-Pilot Python PMAPI module Closes: 725627 Changes: pcp (3.8.5) unstable; urgency=low . * New release (full details in CHANGELOG). * Resolve FTBFS for kfreebsd probes.h (closes: #725627) Checksums-Sha1: f5f18967f53380755febce792821d10aec7d7ed3 2297 pcp_3.8.5.dsc e10e815ae2bdb32cbcbcc00481a9e499e1d5f760 7192320 pcp_3.8.5.tar.gz 3ddf428d9a648fdca0760e1cdc38e3f407e756dc 1112994 pcp_3.8.5_i386.deb 32af0dbdd99570efc18b94db3c65ae0aea067991 369816 libpcp3-dev_3.8.5_i386.deb ca130c537919d9919234bd8722dbba4a06dcf901 175100 libpcp3_3.8.5_i386.deb fae837a23060121ee8ca582d8361e064ab826c7b 15410 libpcp-gui2-dev_3.8.5_i386.deb 8ce8b19fa388235f25a0bcb5baaf1913938bf280 14040 libpcp-gui2_3.8.5_i386.deb 049047f50e7beb44ed43e4e690984023b8e7af3d 17908 libpcp-mmv1-dev_3.8.5_i386.deb 3690062981ca558a1af9ad9543c002b72511dfb3 11162 libpcp-mmv1_3.8.5_i386.deb 0b8120335a823a0722ff3c58fe3033947711c5fb 90850 libpcp-pmda3-dev_3.8.5_i386.deb 6f81a64a5d27404846cf4e7a3cfd534f5fdecfa6 33968 libpcp-pmda3_3.8.5_i386.deb 949e79c2e772f306371748fd1a6bbf44f96ac550 25954 libpcp-trace2-dev_3.8.5_i386.deb 516d25ee8408493eb66e1f2cbd7ebd05ec1282bb 18126 libpcp-trace2_3.8.5_i386.deb 1b41a02e2e61b15f44ce757aad3c3a8fbd2640ae 15028 libpcp-import1-dev_3.8.5_i386.deb e3b7dcadf73932a00e1a7a110e3330f67eb756b7 14546 libpcp-import1_3.8.5_i386.deb f932424288cf7675ed2cfbb46ac78c7160d40f57 39394 python-pcp_3.8.5_i386.deb ba7a603b2fff63d9f5d5f0719bb619fdccb01df1 31002 libpcp-pmda-perl_3.8.5_i386.deb 8bcb1d58e0c4eec428b25f8ead874d72e9419028 15856 libpcp-import-perl_3.8.5_i386.deb e719cef97ebb1059fc3d5bbdcc38a693f55464d7 10524 libpcp-logsummary-perl_3.8.5_i386.deb 1d80c7f78631baf8c5cf30da479c01a765401a36 17036 libpcp-mmv-perl_3.8.5_i386.deb 47d5a1b5b479b86d656d1a16dfaf33776978c518 15832 pcp-import-sar2pcp_3.8.5_all.deb aedee8669ddb158c7bcb0c523570100dfd3414cc 9684 pcp-import-mrtg2pcp_3.8.5_all.deb a5b46775faefc7d6c5fceaf5e2e572a43fb44099 18680 pcp-import-sheet2pcp_3.8.5_all.deb 55c52a861cbb411907b7f6731a6bdda7507d011d 17350 pcp-import-iostat2pcp_3.8.5_all.deb bd2ef01fc353261678ac5d494aeef96fa263cab4 22458 pcp-import-collectl2pcp_3.8.5_i386.deb 0f05b4133795000af0b9096329ac2fd660a387cf 2128572 pcp-testsuite_3.8.5_i386.deb Checksums-Sha256: bc38643932116d908d9946eeebc46514511a62d5acdb4838a4c67786a117bd47 2297 pcp_3.8.5.dsc 14539a8d2bfab08e89b554ed9eac114acbc4f430a61ee456dbb9b9c4059b5ccd 7192320 pcp_3.8.5.tar.gz 1016552407f1afbd01c17cd9549f316e53e0e6171dc4ed0183c73a4dba8da415 1112994 pcp_3.8.5_i386.deb 36232a6af00d75870d9f59f3d6d63cac113daae77de38d7932659affc093267c 369816 libpcp3-dev_3.8.5_i386.deb 2d8236f3bbad496bd37fd5f545b525478bc41a1fc29f180009aa170259a05a30 175100 libpcp3_3.8.5_i386.deb 07827aa50583f8057f819cd928b6081857d0705a8c5d8ca1d008485f0bdb73a5 15410 libpcp-gui2-dev_3.8.5_i386.deb 184185e7925ce8520835ba89d1f3703b0ed13bb3540d5af62d7b55a0069e3b09 14040 libpcp-gui2_3.8.5_i386.deb e717830c6da20cbded7461e071d75713d020b31a4cddb070e4039248ed13dffc 17908 libpcp-mmv1-dev_3.8.5_i386.deb bf0c8402392f13de47973a718f9c2765fdc4e50599daf8b4ec40bd470f6e99fc 11162 libpcp-mmv1_3.8.5_i386.deb 2845a8047c6d6c2eee41afec39d9406dcadd86b5f40836741165555c6e20f02b 90850 libpcp-pmda3-dev_3.8.5_i386.deb 191c3c99548656bbfdfccb4968561e282e860faf37f04ab2107005e34a865813 33968 libpcp-pmda3_3.8.5_i386.deb 58c2d6bf18db9378a56f0ba14648691b74bf1ca7cc7fe05965b46c515506637a 25954 libpcp-trace2-dev_3.8.5_i386.deb 16991500cac2217219fb09789c8f3a490d2cae0fa2e0d4002bb47c2af21817b0 18126 libpcp-trace2_3.8.5_i386.deb dd22ac949826b3e0e45e0e98b5399ea9c4a120310a80b0a0ec01f0f96a7517ca 15028 libpcp-import1-dev_3.8.5_i386.deb 416d8203658aa99cc18b640a76ab02ed325e85cbdafd1ee702e79367ec08497d 14546 libpcp-import1_3.8.5_i386.deb 247b69a7ed420862ebf408514d28fd678721d91718626d81ebe45b0db6e0a74f 39394 python-pcp_3.8.5_i386.deb b1e9a04e95cd0f2293c5402f583d4aa3a67d8272963740c86dc1483e2833c4b7 31002 libpcp-pmda-perl_3.8.5_i386.deb 8d562da933090fe68c37634161458fcb14a98b362d2e49233b38bb795707ea2f 15856 libpcp-import-perl_3.8.5_i386.deb b1929ec5dea518cd4801bd1601cc6fca7c12b9230040587d5f329d3f6528d005 10524 libpcp-logsummary-perl_3.8.5_i386.deb 0ccccb9fecc0f31c7162cbc1e38d5b3af2234da297fca5f9b2be93c63ac0b419 17036 libpcp-mmv-perl_3.8.5_i386.deb 16211396465181e8c3abcd45fdcfd4895454ddd292b919b24f86db0a30b1fdf4 15832 pcp-import-sar2pcp_3.8.5_all.deb 121514da871b45d7e46ae9983496c9f419703f0915f9825bd5e6adfc532715ff 9684 pcp-import-mrtg2pcp_3.8.5_all.deb be4e0755f38bbe30e2a93bcb5087ca799257d6ead83fa68693c24ce6bf6f7f41 18680 pcp-import-sheet2pcp_3.8.5_all.deb 82132fcc3830f188ec4874cbf40de8140114b7808e21e100ba0c7b0fe510ad62 17350 pcp-import-iostat2pcp_3.8.5_all.deb a8176989182957275e3ad6b911a77104adc3051206c8180eeff9f59dc8ec9b72 22458 pcp-import-collectl2pcp_3.8.5_i386.deb 10fa045a9925d5cced57a41caebef0accd3f9a7740841d3a10336ddfcf6768dc 2128572 pcp-testsuite_3.8.5_i386.deb Files: 19b380b96ae04eebea81a74429697e36 2297 utils extra pcp_3.8.5.dsc 8e1646ed8470cc04662c8b6e5edb4d65 7192320 utils extra pcp_3.8.5.tar.gz 958d112c9f7fb52bfdc6f60118afb9ac 1112994 utils extra pcp_3.8.5_i386.deb b900dcb41bdd6030d88158bc140e4e9f 369816 libdevel extra libpcp3-dev_3.8.5_i386.deb ce6864f6edd0c011e0fc86a9f77e851e 175100 libs extra libpcp3_3.8.5_i386.deb 75af2c031d38ebcc3cdf7f0515d04039 15410 libdevel extra libpcp-gui2-dev_3.8.5_i386.deb b09d77457da40f4fe245bd12f9d931cd 14040 libs extra libpcp-gui2_3.8.5_i386.deb 67084f3455528f462d5daf69780e0d1d 17908 libdevel extra libpcp-mmv1-dev_3.8.5_i386.deb 8c0526e70ded5433b11d98467bd0937f 11162 libs extra libpcp-mmv1_3.8.5_i386.deb 31d82d231a63f2587d389dbad49f3547 90850 libdevel extra libpcp-pmda3-dev_3.8.5_i386.deb c5e1301d065ebe51182b2a28f63f43d9 33968 libs extra libpcp-pmda3_3.8.5_i386.deb 53e11ea7fb56866c209fa59bab799913 25954 libdevel extra libpcp-trace2-dev_3.8.5_i386.deb e63c7de9527ef6c630ce158cd4e02c96 18126 libs extra libpcp-trace2_3.8.5_i386.deb a68b3988daf67d2fc10784bc1338f87d 15028 libdevel extra libpcp-import1-dev_3.8.5_i386.deb fbd74fd257b96078b570544a871ef804 14546 libs extra libpcp-import1_3.8.5_i386.deb 8fc37673d4920d400cfb5496531d6a32 39394 python extra python-pcp_3.8.5_i386.deb 7354a50d98f77473ccc714b83ccf37fc 31002 perl extra libpcp-pmda-perl_3.8.5_i386.deb fc16eb0856a1d50efa7bfe2e9e993a8d 15856 perl extra libpcp-import-perl_3.8.5_i386.deb 965e59e7c55d4991ed4f3f2d81150f8c 10524 perl extra libpcp-logsummary-perl_3.8.5_i386.deb efb9192df30f3a7669e66900318472e1 17036 perl extra libpcp-mmv-perl_3.8.5_i386.deb 6aea28a1b03defa4266f35e76ef44792 15832 utils extra pcp-import-sar2pcp_3.8.5_all.deb a8252be953b1056f3841a242e08978c0 9684 utils extra pcp-import-mrtg2pcp_3.8.5_all.deb 42ac7fbf917c0b20a8cd8523d532a13c 18680 utils extra pcp-import-sheet2pcp_3.8.5_all.deb 38c3031b2e8b4dacffb4d104c696ecff 17350 utils extra pcp-import-iostat2pcp_3.8.5_all.deb 54d5f6356bd1dc8cb60497d7a2400b13 22458 utils extra pcp-import-collectl2pcp_3.8.5_i386.deb 2353e9db712f3953e90b43b3ab62eb90 2128572 utils extra pcp-testsuite_3.8.5_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iEYEARECAAYFAlJgYkIACgkQm8fl3HSIa2P4dgCdEbgTtS0lrHmCZeOWucOFiyPV +U8AnAkYFzBkWIS884aJzbr4S5sneNvS =NG11 -----END PGP SIGNATURE----- ------------=_1382238548-10666-0-- From pcp-announce-bounces@oss.sgi.com Sun Oct 20 04:47:54 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id EF5417F52; Sun, 20 Oct 2013 04:47:54 -0500 (CDT) X-Original-To: pcp-announce@oss.sgi.com Delivered-To: pcp-announce@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id B83DB7F50 for ; Sun, 20 Oct 2013 04:47:53 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id A740E304048 for ; Sun, 20 Oct 2013 02:47:50 -0700 (PDT) X-ASG-Debug-ID: 1382262465-04cb6c40d2371f0001-87ZIJf Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id O4NHn1WrwvVWCNBs for ; Sun, 20 Oct 2013 02:47:46 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9K9lj8c028296 for ; Sun, 20 Oct 2013 05:47:45 -0400 Date: Sun, 20 Oct 2013 05:47:45 -0400 (EDT) From: Nathan Scott To: pcp-announce@oss.sgi.com Message-ID: <747351461.5815862.1382262465151.JavaMail.root@redhat.com> In-Reply-To: <1922430625.5814306.1382261989434.JavaMail.root@redhat.com> MIME-Version: 1.0 X-ASG-Orig-Subj: Stable bugfix release - pcp-3.8.5 X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: Stable bugfix release - pcp-3.8.5 Thread-Index: DPAjTKDW9tIpCuD4nWkfK0hleAs6Cg== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1382262466 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141623 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Subject: [pcp-announce] Stable bugfix release - pcp-3.8.5 X-BeenThere: pcp-announce@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Nathan Scott List-Id: pcp announcements List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pcp-announce-bounces@oss.sgi.com Sender: pcp-announce-bounces@oss.sgi.com Hi all, A largely-bugfix release of PCP has been tagged and uploaded over the weekend. Lots of QA effort in this release and only relatively minor feature work this time around. An excellent production system update candidate. Enjoy! pcp-3.8.5 (18 October 2013) - Add jsdemos for the web API into the source tarball. - Resolve Fedora/EPEL build issue for Infiniband PMDA. - Resolve Debian build issue for kfreebsd probes.h - Remove hostname checks in pmie/pmlogger script PID search. - Much work on QA. Zero test failures on release for RHEL6, and there was much rejoicing. - Many Coverity scan issues resolved, nothing major though. - Ensure MMV PMDA entry exists in default pmcd.conf once more. - Add Linux disk.partitions metrics to the default logged set. - New hinv.nlv (logical volume count) metric into Linux PMDA. - Update pmevent to use local: as the default mechanism. - Numerous updates to the GFS2 PMDA. - Reinstate a pmcd sigsegv fix, lost in an earlier merge. - Fix handling multiple concurrent clients in pmdasystemd. - Fix memory leak in pmNewContext failure path seen via pmie. - Make default crontab install cooperate with runlevel settings. - Add a privacy-protecting pmdasystemd uid/gid-filtering mode. - Functional network.interface speed/duplex metrics on older kernels (2.6.32 vintage and earlier, for example). - Support for IPv6 address and scope metrics (ifconfig-style) - Numerous updates to the pmatop utility. - Updates to the PCPIntro(1) manual page. - Improvements to the Linux per-process metrics values for any threads being reported. - Options for restricting Linux pmdaproc to a named cgroup. - Update pmlogger to default to local: connection mode. - Allow opt-out with the default-enabled xfs and proc PMDAs. - Resolve a pmcollectl divide-by-zero (python stack trace). - Fix recursive expansion of child cgroups in Linux pmdaproc. - Fix a pmie core dump with archives, interp and mark records. - Reduce memory footprint of Linux per-process metrics. - Add proc.psinfo metrics for cgroups and security labels. - Use local: connection by default in pmatop and pmcollectl. - Update the python API wrapper to default to local: connection. - Improvements to pmcollectl host name handling. - pmGetContextHostName return to static char[] return value. -- Nathan _______________________________________________ pcp-announce mailing list pcp-announce@oss.sgi.com http://oss.sgi.com/mailman/listinfo/pcp-announce From nscott@redhat.com Sun Oct 20 22:10:26 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 96C477F50 for ; Sun, 20 Oct 2013 22:10:26 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 34366AC002 for ; Sun, 20 Oct 2013 20:10:26 -0700 (PDT) X-ASG-Debug-ID: 1382325021-04bdf0789a50dd0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id EOfwUxZM94dYwtwc for ; Sun, 20 Oct 2013 20:10:21 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9L3ALqp017936; Sun, 20 Oct 2013 23:10:21 -0400 Date: Sun, 20 Oct 2013 23:10:18 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Stan Cox Cc: PCP Message-ID: <2052845457.6426836.1382325018005.JavaMail.root@redhat.com> In-Reply-To: <52608FC9.2050103@redhat.com> References: <52608FC9.2050103@redhat.com> Subject: Re: [pcp] rpm pmda MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] rpm pmda Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: rpm pmda Thread-Index: /DgRU7cVmBAy2g47OcaG84D7SHlYKA== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1382325021 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141653 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain Hi Stan, ----- Original Message ----- > This is a first cut, not committed, to add an pmda for rpm. It uses the > python pmda bindings and the rpm python module. It keeps a list of > active packages in the pmda and each metric request is serviced by > querying using the rpm python module. > A few things spring to mind on review ... - I don't think the instance handling is right - there appears to be no protection between the helper thread and the main pmda for updates to the instance domain? Both of which are reading/writing self._indoms[] from the python class MetricDispatch. - At the end of instance() the indom needs to be refreshed. The next thing the libpcp_pmda code will do after the python instance() method is called, is to respond to the client with the list of instances ... so, just kicking the thread to go and gather the data (which'll finish at some arbitrary-but-hopefully-soon-but-maybe-not-soon-enough point later) doesn't quite satisfy the requirements of the instance PDU code in libpcp_pmda. - The above 2 points make me think the thread should instead take some kind of inotify/dnotify/whatever-its-called-nowadays approach, where it gets async notification of changes to /var/lib/rpm/Packages and updates the instance domain in the background, independent to instance(). - How big does this instance domain get btw? Is it "rpm -qa | wc" sized? (on my system atm - sample size of 1 :) - 1818 1818 62086) Not terrible I guess, but is that normal? Wondering what the memory requirements of this PMDA might be in steady state. Something to keep in mind anyway. - This information is potentially highly sensitive - it'd be useful to know when attempting to penetrate a system exactly what versions of all packages are installed, as this will tell us which vulnerabilities are not patched... :) At the very least, this needs to be protected by the credentials attributes. But again, we should take a long hard look at ourselves and feel comfortable that the risks of exposing this data do not outweigh the benefits - it'll make pmcd a higher value target. - The above point means we need to tackle attributes in python (there is a stub in src/python/pmda.c which will need more love, especially around line 595). - When the time comes for packaging it, lets consider tackling this via the route the Infiniband PMDA takes -> new sub-package (pcp-pmda-rpm?). This helps keep the package dependencies on the core pcp package to as small a set as possible, and the optional-extra rpms carry those extra python deps (rpm-python, & whatever the *notify API comes from). cheers. -- Nathan From nscott@redhat.com Wed Oct 23 00:38:11 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 52AA87F3F for ; Wed, 23 Oct 2013 00:38:11 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay1.corp.sgi.com (Postfix) with ESMTP id 30E258F8040 for ; Tue, 22 Oct 2013 22:38:08 -0700 (PDT) X-ASG-Debug-ID: 1382506686-04cb6c40d41006e0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id Iq6cmo4IPUDJoNB2 for ; Tue, 22 Oct 2013 22:38:06 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9N5c5nT029941; Wed, 23 Oct 2013 01:38:05 -0400 Date: Wed, 23 Oct 2013 01:38:05 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: PCP Cc: Eric Sandeen Message-ID: <1698686437.8459808.1382506685572.JavaMail.root@redhat.com> In-Reply-To: <927367897.8459068.1382506567472.JavaMail.root@redhat.com> Subject: pcp updates: pmdajbd2, qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: pmdajbd2, qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: pmdajbd2, qa Thread-Index: NxUQiyPsqYr4ewDZaeG9R9qqM2nggA== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1382506686 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141718 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev CHANGELOG | 3 VERSION.pcp | 2 build/rpm/fedora.spec | 5 debian/changelog | 6 qa/.gitignore | 1 qa/003 | 1 qa/024 | 5 qa/273 | 42 qa/273.out | 1709 +++++++++++++++++++++++++++++++++++++++ qa/273.out.1 | 1716 --------------------------------------- qa/273.out.2 | 1715 --------------------------------------- qa/273.out.3 | 1717 ---------------------------------------- qa/273.out.4 | 1715 --------------------------------------- qa/438 | 2 qa/527 | 4 qa/527.out | 4 qa/725 | 171 +++ qa/725.out | 571 +++++++++++++ qa/common.filter | 2 qa/group | 3 src/pmdas/GNUmakefile | 2 src/pmdas/jbd2/.gitignore | 5 src/pmdas/jbd2/GNUmakefile | 65 + src/pmdas/jbd2/Install | 31 src/pmdas/jbd2/Remove | 23 src/pmdas/jbd2/convert.h | 30 src/pmdas/jbd2/help | 115 ++ src/pmdas/jbd2/pmda.c | 322 +++++++ src/pmdas/jbd2/proc_jbd2.c | 144 +++ src/pmdas/jbd2/proc_jbd2.h | 38 src/pmdas/jbd2/root | 6 src/pmdas/jbd2/root_jbd2 | 63 + src/pmdas/linux/help | 1 src/pmdas/linux/pmda.c | 10 src/pmdas/linux/proc_meminfo.c | 2 src/pmdas/linux/proc_meminfo.h | 2 src/pmdas/linux/root_linux | 1 src/pmlogconf/memory/proc-linux | 1 src/pmns/stdpmid.pcp | 1 39 files changed, 3341 insertions(+), 6915 deletions(-) commit 65ee677e7df94f98acc1cb6e3bc163433cca52c4 Author: Nathan Scott Date: Wed Oct 23 16:33:15 2013 +1100 Mark test 652 as flakey for now, systemd APIs regressing further commit b4cb2d06780a39816de4f5b2c7dfe390243757a3 Author: Nathan Scott Date: Wed Oct 23 16:30:44 2013 +1100 Make test 527 really use a fixed timezone (utc) this time commit 6ed91bf2a50e4d3755c97d1074cdd3e96236df6e Author: Nathan Scott Date: Wed Oct 23 16:29:45 2013 +1100 Fix warning on proc-linux logconf file, no probe line commit 824a252ef195d870a962eef78127ce89eb46b8c2 Author: Nathan Scott Date: Wed Oct 23 16:29:10 2013 +1100 Fix filter for test 438 for ppc64 and s390 hosts commit ca33d3b591dea51f5b485119dff458637b3c7fc7 Author: Nathan Scott Date: Wed Oct 23 16:28:41 2013 +1100 Update docs/versions re next (dev in-progress) release commit 09e26a636c4ee2480b57df2cb0623d44e621560c Author: Nathan Scott Date: Wed Oct 23 16:22:35 2013 +1100 Implement a Journal Block Device v2 PMDA (ext3,ext4,ocfs2 journal) A new PMDA exporting the journal statistics from JDB2 procfs entries. The kernel interface exports a series of mostly-averaged statistics, which is unfortunate - over time, this becomes smoothed such that new spikes are difficult to discern. An unrolling of the averages is also provided (jdb2.transaction.total.*) which uses the tr_tid to attempt conversion back to the original counter values. This is likely to be affected by loss of precision, so some discussion with the filesystem folks who originally showed interest here has been had, suggesting those values be exported directly from the kernel with no averaging. For now, we'll just have to make do. Test 725 is added to exercise the new functionality. Test 273 was not deterministic when new DSO PMDAs are present in pmcd.conf; this commit resolves that as well. commit ad06a7ff68488ad462bc9c06baffe184ddbf7291 Author: Nathan Scott Date: Tue Oct 22 10:13:25 2013 +1100 Add Linux kernel PMDA mem.util.directMap1G metric From info@nokia.com Fri Oct 25 14:08:43 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: *** X-Spam-Status: No, score=3.3 required=5.0 tests=LOTS_OF_MONEY, LOTTERY_PH_004470 autolearn=no version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 8B3BA7F3F for ; Fri, 25 Oct 2013 14:08:43 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 16035AC038 for ; Fri, 25 Oct 2013 12:08:26 -0700 (PDT) X-ASG-Debug-ID: 1382728099-04cbb00ddfd05a0001-S8gJnT Received: from hemominas.mg.gov.br (mail.hemominas.mg.gov.br [200.198.4.36]) by cuda.sgi.com with ESMTP id lenWUGGvdnEyHXcz (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Fri, 25 Oct 2013 12:08:21 -0700 (PDT) X-Barracuda-Envelope-From: info@nokia.com X-Barracuda-Apparent-Source-IP: 200.198.4.36 Received: by hemominas.mg.gov.br (Postfix, from userid 105) id 62A695BD544; Fri, 25 Oct 2013 17:08:02 -0200 (BRST) Received: from [101.59.161.144] (unknown [101.59.161.144]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by hemominas.mg.gov.br (Postfix) with ESMTP id E0F435BD54D; Fri, 25 Oct 2013 17:07:37 -0200 (BRST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Description: Mail message body Subject: Re To: Recipients X-ASG-Orig-Subj: Re From: "Nokia Online" Date: Sat, 26 Oct 2013 00:37:16 +0530 Reply-To: info@onlinenokia.net Message-Id: <20131025190737.E0F435BD54D@hemominas.mg.gov.br> X-Barracuda-Connect: mail.hemominas.mg.gov.br[200.198.4.36] X-Barracuda-Start-Time: 1382728100 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_ADDR_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141787 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_SC0_SA_TO_FROM_ADDR_MATCH Sender Address Matches Recipient Address This E-mail is to officially inform you that your E-mail Address have been verified and pronounced as the lucky Winner Of =C2=A3 500,000.00 GBP Send Info below to info@onlinenokia.net 1 NAME: 2 ADDRESS: 3 MOBILE NUMBER: 4 SEX: 5 AGE: 6 OCCUPATION: 7 NATIONALITY: 8 STATE: 9 COUNTRY: Note you have to send your information=E2=80=99s to this email info@onlinen= okia.net or your winnings will not be processed. Your sincerely, Dr. Charles D. Layman Tel: ( +44 701 008 6302 info@onlinenokia.net (c) Nokia 2013 Award Promotion, All rights reserved. From debbugs@buxtehude.debian.org Sun Oct 27 08:15:19 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM,T_DKIM_INVALID autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 1B2367F3F for ; Sun, 27 Oct 2013 08:15:19 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id D1F00304043 for ; Sun, 27 Oct 2013 06:15:15 -0700 (PDT) X-ASG-Debug-ID: 1382879710-04bdf078972ce880001-S8gJnT Received: from buxtehude.debian.org (buxtehude.debian.org [140.211.166.26]) by cuda.sgi.com with ESMTP id vlVBJwGlIyPATz94 (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sun, 27 Oct 2013 06:15:11 -0700 (PDT) X-Barracuda-Envelope-From: debbugs@buxtehude.debian.org X-Barracuda-Apparent-Source-IP: 140.211.166.26 Received: from debbugs by buxtehude.debian.org with local (Exim 4.80) (envelope-from ) id 1VaQBR-00036T-HG; Sun, 27 Oct 2013 13:15:09 +0000 X-Loop: owner@bugs.debian.org Subject: Bug#725627: Still FTBFS Reply-To: Mathieu Parent , 725627@bugs.debian.org X-ASG-Orig-Subj: Bug#725627: Still FTBFS Resent-From: Mathieu Parent Resent-To: debian-bugs-dist@lists.debian.org Resent-Cc: PCP Development Team X-Loop: owner@bugs.debian.org Resent-Date: Sun, 27 Oct 2013 13:15:07 +0000 Resent-Message-ID: X-Debian-PR-Message: followup 725627 X-Debian-PR-Package: src:pcp X-Debian-PR-Keywords: X-Debian-PR-Source: pcp Received: via spool by 725627-submit@bugs.debian.org id=B725627.138287949911195 (code B ref 725627); Sun, 27 Oct 2013 13:15:07 +0000 Received: (at 725627) by bugs.debian.org; 27 Oct 2013 13:11:39 +0000 Received: from mail-ie0-f170.google.com ([209.85.223.170]) by buxtehude.debian.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:128) (Exim 4.80) (envelope-from ) id 1VaQ82-0002tg-PN for 725627@bugs.debian.org; Sun, 27 Oct 2013 13:11:38 +0000 Received: by mail-ie0-f170.google.com with SMTP id at1so9650088iec.15 for <725627@bugs.debian.org>; Sun, 27 Oct 2013 06:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=bDwUBBpqFO42hppRr+ntUc57YLU3vPl3UDbUaz7eN2Q=; b=XsU/Q9pBoz7TuSxw2Sz5f7xtfA4VEM3JDX1JUq6hg1O90jrt1Cau8OVXo+9Yj746t2 sWqpfm7Px8gQDFFvFAVv2ExKxbCBlHBizA8ZUphOB8buzUvyfjNQcMcW6VQM490W8wBZ L6Wj38bfd3vciiViYE16Z2Ny6n4/5kyPNvRhQs8GkMasb+0XT+2N6K+i0n+bzZ5TXSV0 FgiArkwLO8Yx8dTKYu5M5A8mbj8jx+p1YbKS4RDF69Nw9P7LtxkqZNcSZ/V0+rBcVSAJ lxorCmlBgAiAYIpIYQui84wC4HSuxUfwY5Jf4pn0m87hWRROj3kR4rmM0XspzEwcDzzJ MlyQ== MIME-Version: 1.0 X-Received: by 10.50.62.211 with SMTP id a19mr5222098igs.18.1382879491968; Sun, 27 Oct 2013 06:11:31 -0700 (PDT) Received: by 10.50.207.66 with HTTP; Sun, 27 Oct 2013 06:11:31 -0700 (PDT) Date: Sun, 27 Oct 2013 14:11:31 +0100 Message-ID: From: Mathieu Parent To: 725627@bugs.debian.org Content-Type: text/plain; charset=UTF-8 Resent-Sender: Debian BTS X-Barracuda-Connect: buxtehude.debian.org[140.211.166.26] X-Barracuda-Start-Time: 1382879711 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, DKIM_SIGNED X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141829 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.00 DKIM_SIGNED Domain Keys Identified Mail: message has a signature Control: found -1 3.8.5 Hi, pcp still FTBFS on kfreebsd-*: === src === gcc -fPIC -fno-strict-aliasing -D_GNU_SOURCE -fstack-protector-all -D_FORTIFY_SOURCE=2 -I../../../src/pmcd/src -I../../../src/libpcp/src -DPMCD_INTERNAL -I/usr/include/nss -I/usr/include/nspr -Wall -O2 -g -DPCP_DEBUG -DPCP_VERSION=\"3.8.5\" -I../../../src/include -I../../../src/include/pcp -c -o data.o data.c /bin/sed -e 's;@path@;'/usr/lib/pcp/bin/pmcd';' pmcd.stp.in > pmcd.stp h -s probes.d -o probes.h make[4]: h: Command not found make[4]: [probes.h] Error 127 (ignored) gcc -fPIC -fno-strict-aliasing -D_GNU_SOURCE -fstack-protector-all -D_FORTIFY_SOURCE=2 -I../../../src/pmcd/src -I../../../src/libpcp/src -DPMCD_INTERNAL -I/usr/include/nss -I/usr/include/nspr -Wall -O2 -g -DPCP_DEBUG -DPCP_VERSION=\"3.8.5\" -I../../../src/include -I../../../src/include/pcp -c -o trace.o trace.c trace.c:19:20: fatal error: probes.h: No such file or directory #include "probes.h" ^ compilation terminated. Please fix this soon as this is preventing ctdb migration in testing. Regards -- Mathieu From debbugs@buxtehude.debian.org Sun Oct 27 08:15:20 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id AB5407F3F for ; Sun, 27 Oct 2013 08:15:20 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 9917F304039 for ; Sun, 27 Oct 2013 06:15:20 -0700 (PDT) X-ASG-Debug-ID: 1382879711-04cb6c40d32bf220001-S8gJnT Received: from buxtehude.debian.org (buxtehude.debian.org [140.211.166.26]) by cuda.sgi.com with ESMTP id NDFysHQP83YRmdwW (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sun, 27 Oct 2013 06:15:12 -0700 (PDT) X-Barracuda-Envelope-From: debbugs@buxtehude.debian.org X-Barracuda-Apparent-Source-IP: 140.211.166.26 Received: from debbugs by buxtehude.debian.org with local (Exim 4.80) (envelope-from ) id 1VaQBS-00036i-Fv; Sun, 27 Oct 2013 13:15:10 +0000 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) Content-Type: text/plain; charset=utf-8 From: owner@bugs.debian.org (Debian Bug Tracking System) To: Mathieu Parent CC: pcp@oss.sgi.com Subject: Processed: Still FTBFS Message-ID: X-ASG-Orig-Subj: Processed: Still FTBFS References: <20131006220536.3962.18425.reportbug@bowmore.home.mraw.org> X-Debian-PR-Package: src:pcp X-Debian-PR-Source: pcp X-Debian-PR-Message: transcript X-Loop: owner@bugs.debian.org Date: Sun, 27 Oct 2013 13:15:10 +0000 Sender: Debian BTS X-Barracuda-Connect: buxtehude.debian.org[140.211.166.26] X-Barracuda-Start-Time: 1382879712 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141829 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Processing control commands: > found -1 3.8.5 Bug #725627 {Done: Nathan Scott } [src:pcp] pcp: FTBFS = on kfreebsd-*: trace.c:19:20: fatal error: probes.h: No such file or direct= ory Marked as found in versions pcp/3.8.5; no longer marked as fixed in version= s pcp/3.8.5 and reopened. --=20 725627: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D725627 Debian Bug Tracking System Contact owner@bugs.debian.org with problems From debbugs@buxtehude.debian.org Sun Oct 27 16:28:22 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id B63A37F3F for ; Sun, 27 Oct 2013 16:28:22 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id A257F8F804C for ; Sun, 27 Oct 2013 14:28:22 -0700 (PDT) X-ASG-Debug-ID: 1382909297-04cbb00ddd18f490001-S8gJnT Received: from buxtehude.debian.org (buxtehude.debian.org [140.211.166.26]) by cuda.sgi.com with ESMTP id uAipjxCh7Cp7bBB1 (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Sun, 27 Oct 2013 14:28:18 -0700 (PDT) X-Barracuda-Envelope-From: debbugs@buxtehude.debian.org X-Barracuda-Apparent-Source-IP: 140.211.166.26 Received: from debbugs by buxtehude.debian.org with local (Exim 4.80) (envelope-from ) id 1VaXse-0000QI-Kt; Sun, 27 Oct 2013 21:28:16 +0000 X-Loop: owner@bugs.debian.org Subject: Bug#725627: [pcp] Bug#725627: Still FTBFS Reply-To: Nathan Scott , 725627@bugs.debian.org X-ASG-Orig-Subj: Bug#725627: [pcp] Bug#725627: Still FTBFS Resent-From: Nathan Scott Resent-To: debian-bugs-dist@lists.debian.org Resent-Cc: PCP Development Team X-Loop: owner@bugs.debian.org Resent-Date: Sun, 27 Oct 2013 21:28:13 +0000 Resent-Message-ID: X-Debian-PR-Message: followup 725627 X-Debian-PR-Package: src:pcp X-Debian-PR-Keywords: X-Debian-PR-Source: pcp Received: via spool by 725627-submit@bugs.debian.org id=B725627.1382909178734 (code B ref 725627); Sun, 27 Oct 2013 21:28:13 +0000 Received: (at 725627) by bugs.debian.org; 27 Oct 2013 21:26:18 +0000 Received: from mx3-phx2.redhat.com ([209.132.183.24]) by buxtehude.debian.org with esmtp (Exim 4.80) (envelope-from ) id 1VaXqj-0000BH-P4 for 725627@bugs.debian.org; Sun, 27 Oct 2013 21:26:18 +0000 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9RLQFYv004431; Sun, 27 Oct 2013 17:26:15 -0400 Date: Sun, 27 Oct 2013 17:26:14 -0400 (EDT) From: Nathan Scott To: Mathieu Parent , 725627@bugs.debian.org Message-ID: <118528389.12065911.1382909174815.JavaMail.root@redhat.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: Bug#725627: Still FTBFS Thread-Index: GOvr6+KBc6zMBfrloLfmnsbexTJMig== Resent-Sender: Debian BTS X-Barracuda-Connect: buxtehude.debian.org[140.211.166.26] X-Barracuda-Start-Time: 1382909298 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141840 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Hi Mathieu, ----- Original Message ----- > ... > -I../../../src/include/pcp -c -o trace.o trace.c > trace.c:19:20: fatal error: probes.h: No such file or directory > #include "probes.h" > ^ > compilation terminated. > > Please fix this soon as this is preventing ctdb migration in testing. > Sorry about that, I had thought it resolved. I have a complete fix & a bug-fix update will be uploaded this week after further testing. cheers. -- Nathan From nscott@redhat.com Mon Oct 28 04:30:29 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id A76DF7F3F for ; Mon, 28 Oct 2013 04:30:29 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id 7E2F6304053 for ; Mon, 28 Oct 2013 02:30:29 -0700 (PDT) X-ASG-Debug-ID: 1382952623-04cbb00de01ac050001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id AErtBRh3LKFSvN4K for ; Mon, 28 Oct 2013 02:30:23 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9S9UJUC025161; Mon, 28 Oct 2013 05:30:19 -0400 Date: Mon, 28 Oct 2013 05:30:19 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: PCP Message-ID: <160325845.12260251.1382952619499.JavaMail.root@redhat.com> In-Reply-To: <5251DF3C.7040805@redhat.com> References: <5251DF3C.7040805@redhat.com> Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers Content-Type: multipart/mixed; boundary="----=_Part_12260249_1602409645.1382952619492" X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: First Cut at Avahi Support for PCP Servers Thread-Index: Kkf8St8KA5u9XsZgT+ehTOvIoOfUDA== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1382952623 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141852 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ------=_Part_12260249_1602409645.1382952619492 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Hi Dave, ----- Original Message ----- > ... > As it stands, this code is a working prototype. Let me know if this is > headed in the right direction. Also any help with the autoconf/spec > stuff is always appreciated. Here's a few smallish updates to the autoconf stuff you've already done. This defaults to checking for support (was off by default, but usage was claiming on by default?), goes back to using autoconf 2.69 (needed for aarch64) generated configure, provides a way to do Avahi alongside other implementations (like the one on Mac OS X if anyone wants to tackle that someday), adds the .deb dependency, and similar - all small stuff. Still to do is the __pmServerFeature support, but I need to refactor a bit of code there - bit too tied to the security features atm. Please review attached patch & commit it if ya like it. BTW, for reference & future-proofing of APIs, this is the Mac OS X API: https://developer.apple.com/library/mac/documentation/Networking/Reference/DNSServiceDiscovery_CRef/Reference/reference.html cheers. ps: pmwebd (http://jmdns.sourceforge.net/ - java clients) and pmproxy could probably get the same treatment as pmcd at some point. -- Nathan ------=_Part_12260249_1602409645.1382952619492 Content-Type: text/x-patch; name=avahi.patch Content-Disposition: attachment; filename=avahi.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2J1aWxkL3JwbS9HTlVtYWtlZmlsZSBiL2J1aWxkL3JwbS9HTlVtYWtlZmls ZQppbmRleCBkZTY1M2NmLi4wZGNhZjQ5IDEwMDY0NAotLS0gYS9idWlsZC9ycG0vR05VbWFrZWZp bGUKKysrIGIvYnVpbGQvcnBtL0dOVW1ha2VmaWxlCkBAIC02NCw2ICs2NCw3IEBAIHBjcC5zcGVj OiBwY3Auc3BlYy5pbgogCSAgICAtZSdzfEBwbWRhX2luZmluaWJhbmRAfCQoUE1EQV9JTkZJTklC QU5EKXxnJyBcCiAJICAgIC1lJ3N8QGVuYWJsZV9zZWN1cmVAfCQoRU5BQkxFX1NFQ1VSRSl8Zycg XAogCSAgICAtZSdzfEBlbmFibGVfcHJvYmVzQHwkKEVOQUJMRV9QUk9CRVMpfGcnIFwKKwkgICAg LWUnc3xAZW5hYmxlX2Ruc19zZEB8JChFTkFCTEVfRE5TX1NEKXxnJyBcCiAJICAgIC1lInN8QGJ1 aWxkX3Jvb3RAfCQke0RJU1RfUk9PVH18ZyIgXAogCSAgICAtZSdzfEBwY3Bfc3lzY29uZl9kaXJA fCQoUENQX1NZU0NPTkZfRElSKXxnJyBcCiAJICAgIC1lJ3N8QHBjcF9sb2dfZGlyQHwkKFBDUF9M T0dfRElSKXxnJyBcCmRpZmYgLS1naXQgYS9jb25maWd1cmUgYi9jb25maWd1cmUKaW5kZXggNDIz YzJmNy4uODY2NDg5MCAxMDA3NTUKLS0tIGEvY29uZmlndXJlCisrKyBiL2NvbmZpZ3VyZQpAQCAt MSwxMSArMSw5IEBACiAjISAvYmluL3NoCiAjIEd1ZXNzIHZhbHVlcyBmb3Igc3lzdGVtLWRlcGVu ZGVudCB2YXJpYWJsZXMgYW5kIGNyZWF0ZSBNYWtlZmlsZXMuCi0jIEdlbmVyYXRlZCBieSBHTlUg QXV0b2NvbmYgMi42OC4KKyMgR2VuZXJhdGVkIGJ5IEdOVSBBdXRvY29uZiAyLjY5LgogIwogIwot IyBDb3B5cmlnaHQgKEMpIDE5OTIsIDE5OTMsIDE5OTQsIDE5OTUsIDE5OTYsIDE5OTgsIDE5OTks IDIwMDAsIDIwMDEsCi0jIDIwMDIsIDIwMDMsIDIwMDQsIDIwMDUsIDIwMDYsIDIwMDcsIDIwMDgs IDIwMDksIDIwMTAgRnJlZSBTb2Z0d2FyZQotIyBGb3VuZGF0aW9uLCBJbmMuCisjIENvcHlyaWdo dCAoQykgMTk5Mi0xOTk2LCAxOTk4LTIwMTIgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMu CiAjCiAjCiAjIFRoaXMgY29uZmlndXJlIHNjcmlwdCBpcyBmcmVlIHNvZnR3YXJlOyB0aGUgRnJl ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uCkBAIC0xMzQsNiArMTMyLDMxIEBAIGV4cG9ydCBMQU5HVUFH RQogIyBDRFBBVEguCiAodW5zZXQgQ0RQQVRIKSA+L2Rldi9udWxsIDI+JjEgJiYgdW5zZXQgQ0RQ QVRICiAKKyMgVXNlIGEgcHJvcGVyIGludGVybmFsIGVudmlyb25tZW50IHZhcmlhYmxlIHRvIGVu c3VyZSB3ZSBkb24ndCBmYWxsCisgICMgaW50byBhbiBpbmZpbml0ZSBsb29wLCBjb250aW51b3Vz bHkgcmUtZXhlY3V0aW5nIG91cnNlbHZlcy4KKyAgaWYgdGVzdCB4IiR7X2FzX2Nhbl9yZWV4ZWN9 IiAhPSB4bm8gJiYgdGVzdCAieCRDT05GSUdfU0hFTEwiICE9IHg7IHRoZW4KKyAgICBfYXNfY2Fu X3JlZXhlYz1ubzsgZXhwb3J0IF9hc19jYW5fcmVleGVjOworICAgICMgV2UgY2Fubm90IHlldCBh c3N1bWUgYSBkZWNlbnQgc2hlbGwsIHNvIHdlIGhhdmUgdG8gcHJvdmlkZSBhCisjIG5ldXRyYWxp emF0aW9uIHZhbHVlIGZvciBzaGVsbHMgd2l0aG91dCB1bnNldDsgYW5kIHRoaXMgYWxzbworIyB3 b3JrcyBhcm91bmQgc2hlbGxzIHRoYXQgY2Fubm90IHVuc2V0IG5vbmV4aXN0ZW50IHZhcmlhYmxl cy4KKyMgUHJlc2VydmUgLXYgYW5kIC14IHRvIHRoZSByZXBsYWNlbWVudCBzaGVsbC4KK0JBU0hf RU5WPS9kZXYvbnVsbAorRU5WPS9kZXYvbnVsbAorKHVuc2V0IEJBU0hfRU5WKSA+L2Rldi9udWxs IDI+JjEgJiYgdW5zZXQgQkFTSF9FTlYgRU5WCitjYXNlICQtIGluICMgKCgoKAorICAqdip4KiB8 ICp4KnYqICkgYXNfb3B0cz0tdnggOzsKKyAgKnYqICkgYXNfb3B0cz0tdiA7OworICAqeCogKSBh c19vcHRzPS14IDs7CisgICogKSBhc19vcHRzPSA7OworZXNhYworZXhlYyAkQ09ORklHX1NIRUxM ICRhc19vcHRzICIkYXNfbXlzZWxmIiAkezErIiRAIn0KKyMgQWRtaXR0ZWRseSwgdGhpcyBpcyBx dWl0ZSBwYXJhbm9pZCwgc2luY2UgYWxsIHRoZSBrbm93biBzaGVsbHMgYmFpbAorIyBvdXQgYWZ0 ZXIgYSBmYWlsZWQgYGV4ZWMnLgorJGFzX2VjaG8gIiQwOiBjb3VsZCBub3QgcmUtZXhlY3V0ZSB3 aXRoICRDT05GSUdfU0hFTEwiID4mMgorYXNfZm5fZXhpdCAyNTUKKyAgZmkKKyAgIyBXZSBkb24n dCB3YW50IHRoaXMgdG8gcHJvcGFnYXRlIHRvIG90aGVyIHN1YnByb2Nlc3Nlcy4KKyAgICAgICAg ICB7IF9hc19jYW5fcmVleGVjPTsgdW5zZXQgX2FzX2Nhbl9yZWV4ZWM7fQogaWYgdGVzdCAieCRD T05GSUdfU0hFTEwiID0geDsgdGhlbgogICBhc19ib3VybmVfY29tcGF0aWJsZT0iaWYgdGVzdCAt biBcIlwke1pTSF9WRVJTSU9OK3NldH1cIiAmJiAoZW11bGF0ZSBzaCkgPi9kZXYvbnVsbCAyPiYx OyB0aGVuIDoKICAgZW11bGF0ZSBzaApAQCAtMTY3LDcgKzE5MCw4IEBAIGlmICggc2V0IHg7IGFz X2ZuX3JldF9zdWNjZXNzIHkgJiYgdGVzdCB4ID0gXCJcJDFcIiApOyB0aGVuIDoKIGVsc2UKICAg ZXhpdGNvZGU9MTsgZWNobyBwb3NpdGlvbmFsIHBhcmFtZXRlcnMgd2VyZSBub3Qgc2F2ZWQuCiBm aQotdGVzdCB4XCRleGl0Y29kZSA9IHgwIHx8IGV4aXQgMSIKK3Rlc3QgeFwkZXhpdGNvZGUgPSB4 MCB8fCBleGl0IDEKK3Rlc3QgLXggLyB8fCBleGl0IDEiCiAgIGFzX3N1Z2dlc3RlZD0iICBhc19s aW5lbm9fMT0iO2FzX3N1Z2dlc3RlZD0kYXNfc3VnZ2VzdGVkJExJTkVOTzthc19zdWdnZXN0ZWQ9 JGFzX3N1Z2dlc3RlZCIgYXNfbGluZW5vXzFhPVwkTElORU5PCiAgIGFzX2xpbmVub18yPSI7YXNf c3VnZ2VzdGVkPSRhc19zdWdnZXN0ZWQkTElORU5PO2FzX3N1Z2dlc3RlZD0kYXNfc3VnZ2VzdGVk IiBhc19saW5lbm9fMmE9XCRMSU5FTk8KICAgZXZhbCAndGVzdCBcInhcJGFzX2xpbmVub18xJ1wk YXNfcnVuJ1wiICE9IFwieFwkYXNfbGluZW5vXzInXCRhc19ydW4nXCIgJiYKQEAgLTIxMiwyMSAr MjM2LDI1IEBAIElGUz0kYXNfc2F2ZV9JRlMKIAogCiAgICAgICBpZiB0ZXN0ICJ4JENPTkZJR19T SEVMTCIgIT0geDsgdGhlbiA6Ci0gICMgV2UgY2Fubm90IHlldCBhc3N1bWUgYSBkZWNlbnQgc2hl bGwsIHNvIHdlIGhhdmUgdG8gcHJvdmlkZSBhCi0JIyBuZXV0cmFsaXphdGlvbiB2YWx1ZSBmb3Ig c2hlbGxzIHdpdGhvdXQgdW5zZXQ7IGFuZCB0aGlzIGFsc28KLQkjIHdvcmtzIGFyb3VuZCBzaGVs bHMgdGhhdCBjYW5ub3QgdW5zZXQgbm9uZXhpc3RlbnQgdmFyaWFibGVzLgotCSMgUHJlc2VydmUg LXYgYW5kIC14IHRvIHRoZSByZXBsYWNlbWVudCBzaGVsbC4KLQlCQVNIX0VOVj0vZGV2L251bGwK LQlFTlY9L2Rldi9udWxsCi0JKHVuc2V0IEJBU0hfRU5WKSA+L2Rldi9udWxsIDI+JjEgJiYgdW5z ZXQgQkFTSF9FTlYgRU5WCi0JZXhwb3J0IENPTkZJR19TSEVMTAotCWNhc2UgJC0gaW4gIyAoKCgo Ci0JICAqdip4KiB8ICp4KnYqICkgYXNfb3B0cz0tdnggOzsKLQkgICp2KiApIGFzX29wdHM9LXYg OzsKLQkgICp4KiApIGFzX29wdHM9LXggOzsKLQkgICogKSBhc19vcHRzPSA7OwotCWVzYWMKLQll eGVjICIkQ09ORklHX1NIRUxMIiAkYXNfb3B0cyAiJGFzX215c2VsZiIgJHsxKyIkQCJ9CisgIGV4 cG9ydCBDT05GSUdfU0hFTEwKKyAgICAgICAgICAgICAjIFdlIGNhbm5vdCB5ZXQgYXNzdW1lIGEg ZGVjZW50IHNoZWxsLCBzbyB3ZSBoYXZlIHRvIHByb3ZpZGUgYQorIyBuZXV0cmFsaXphdGlvbiB2 YWx1ZSBmb3Igc2hlbGxzIHdpdGhvdXQgdW5zZXQ7IGFuZCB0aGlzIGFsc28KKyMgd29ya3MgYXJv dW5kIHNoZWxscyB0aGF0IGNhbm5vdCB1bnNldCBub25leGlzdGVudCB2YXJpYWJsZXMuCisjIFBy ZXNlcnZlIC12IGFuZCAteCB0byB0aGUgcmVwbGFjZW1lbnQgc2hlbGwuCitCQVNIX0VOVj0vZGV2 L251bGwKK0VOVj0vZGV2L251bGwKKyh1bnNldCBCQVNIX0VOVikgPi9kZXYvbnVsbCAyPiYxICYm IHVuc2V0IEJBU0hfRU5WIEVOVgorY2FzZSAkLSBpbiAjICgoKCgKKyAgKnYqeCogfCAqeCp2KiAp IGFzX29wdHM9LXZ4IDs7CisgICp2KiApIGFzX29wdHM9LXYgOzsKKyAgKngqICkgYXNfb3B0cz0t eCA7OworICAqICkgYXNfb3B0cz0gOzsKK2VzYWMKK2V4ZWMgJENPTkZJR19TSEVMTCAkYXNfb3B0 cyAiJGFzX215c2VsZiIgJHsxKyIkQCJ9CisjIEFkbWl0dGVkbHksIHRoaXMgaXMgcXVpdGUgcGFy YW5vaWQsIHNpbmNlIGFsbCB0aGUga25vd24gc2hlbGxzIGJhaWwKKyMgb3V0IGFmdGVyIGEgZmFp bGVkIGBleGVjJy4KKyRhc19lY2hvICIkMDogY291bGQgbm90IHJlLWV4ZWN1dGUgd2l0aCAkQ09O RklHX1NIRUxMIiA+JjIKK2V4aXQgMjU1CiBmaQogCiAgICAgaWYgdGVzdCB4JGFzX2hhdmVfcmVx dWlyZWQgPSB4bm87IHRoZW4gOgpAQCAtMzI4LDYgKzM1NiwxNCBAQCAkYXNfZWNobyBYIiRhc19k aXIiIHwKIAogCiB9ICMgYXNfZm5fbWtkaXJfcAorCisjIGFzX2ZuX2V4ZWN1dGFibGVfcCBGSUxF CisjIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisjIFRlc3QgaWYgRklMRSBpcyBhbiBleGVjdXRh YmxlIHJlZ3VsYXIgZmlsZS4KK2FzX2ZuX2V4ZWN1dGFibGVfcCAoKQoreworICB0ZXN0IC1mICIk MSIgJiYgdGVzdCAteCAiJDEiCit9ICMgYXNfZm5fZXhlY3V0YWJsZV9wCiAjIGFzX2ZuX2FwcGVu ZCBWQVIgVkFMVUUKICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogIyBBcHBlbmQgdGhlIHRleHQg aW4gVkFMVUUgdG8gdGhlIGVuZCBvZiB0aGUgZGVmaW5pdGlvbiBjb250YWluZWQgaW4gVkFSLiBU YWtlCkBAIC00NDksNiArNDg1LDEwIEBAIGFzX2NyX2FsbnVtPSRhc19jcl9MZXR0ZXJzJGFzX2Ny X2RpZ2l0cwogICBjaG1vZCAreCAiJGFzX21lLmxpbmVubyIgfHwKICAgICB7ICRhc19lY2hvICIk YXNfbWU6IGVycm9yOiBjYW5ub3QgY3JlYXRlICRhc19tZS5saW5lbm87IHJlcnVuIHdpdGggYSBQ T1NJWCBzaGVsbCIgPiYyOyBhc19mbl9leGl0IDE7IH0KIAorICAjIElmIHdlIGhhZCB0byByZS1l eGVjdXRlIHdpdGggJENPTkZJR19TSEVMTCwgd2UncmUgZW5zdXJlZCB0byBoYXZlCisgICMgYWxy ZWFkeSBkb25lIHRoYXQsIHNvIGVuc3VyZSB3ZSBkb24ndCB0cnkgdG8gZG8gc28gYWdhaW4gYW5k IGZhbGwKKyAgIyBpbiBhbiBpbmZpbml0ZSBsb29wLiAgVGhpcyBoYXMgYWxyZWFkeSBoYXBwZW5l ZCBpbiBwcmFjdGljZS4KKyAgX2FzX2Nhbl9yZWV4ZWM9bm87IGV4cG9ydCBfYXNfY2FuX3JlZXhl YwogICAjIERvbid0IHRyeSB0byBleGVjIGFzIGl0IGNoYW5nZXMgJFswXSwgY2F1c2luZyBhbGwg c29ydCBvZiBwcm9ibGVtcwogICAjICh0aGUgZGlybmFtZSBvZiAkWzBdIGlzIG5vdCB0aGUgcGxh Y2Ugd2hlcmUgd2UgbWlnaHQgZmluZCB0aGUKICAgIyBvcmlnaW5hbCBhbmQgc28gb24uICBBdXRv Y29uZiBpcyBlc3BlY2lhbGx5IHNlbnNpdGl2ZSB0byB0aGlzKS4KQEAgLTQ4MywxNiArNTIzLDE2 IEBAIGlmIChlY2hvID5jb25mJCQuZmlsZSkgMj4vZGV2L251bGw7IHRoZW4KICAgICAjIC4uLiBi dXQgdGhlcmUgYXJlIHR3byBnb3RjaGFzOgogICAgICMgMSkgT24gTVNZUywgYm90aCBgbG4gLXMg ZmlsZSBkaXInIGFuZCBgbG4gZmlsZSBkaXInIGZhaWwuCiAgICAgIyAyKSBESkdQUCA8IDIuMDQg aGFzIG5vIHN5bWxpbmtzOyBgbG4gLXMnIGNyZWF0ZXMgYSB3cmFwcGVyIGV4ZWN1dGFibGUuCi0g ICAgIyBJbiBib3RoIGNhc2VzLCB3ZSBoYXZlIHRvIGRlZmF1bHQgdG8gYGNwIC1wJy4KKyAgICAj IEluIGJvdGggY2FzZXMsIHdlIGhhdmUgdG8gZGVmYXVsdCB0byBgY3AgLXBSJy4KICAgICBsbiAt cyBjb25mJCQuZmlsZSBjb25mJCQuZGlyIDI+L2Rldi9udWxsICYmIHRlc3QgISAtZiBjb25mJCQu ZXhlIHx8Ci0gICAgICBhc19sbl9zPSdjcCAtcCcKKyAgICAgIGFzX2xuX3M9J2NwIC1wUicKICAg ZWxpZiBsbiBjb25mJCQuZmlsZSBjb25mJCQgMj4vZGV2L251bGw7IHRoZW4KICAgICBhc19sbl9z PWxuCiAgIGVsc2UKLSAgICBhc19sbl9zPSdjcCAtcCcKKyAgICBhc19sbl9zPSdjcCAtcFInCiAg IGZpCiBlbHNlCi0gIGFzX2xuX3M9J2NwIC1wJworICBhc19sbl9zPSdjcCAtcFInCiBmaQogcm0g LWYgY29uZiQkIGNvbmYkJC5leGUgY29uZiQkLmRpci9jb25mJCQuZmlsZSBjb25mJCQuZmlsZQog cm1kaXIgY29uZiQkLmRpciAyPi9kZXYvbnVsbApAQCAtNTA0LDI4ICs1NDQsOCBAQCBlbHNlCiAg IGFzX21rZGlyX3A9ZmFsc2UKIGZpCiAKLWlmIHRlc3QgLXggLyA+L2Rldi9udWxsIDI+JjE7IHRo ZW4KLSAgYXNfdGVzdF94PSd0ZXN0IC14JwotZWxzZQotICBpZiBscyAtZEwgLyA+L2Rldi9udWxs IDI+JjE7IHRoZW4KLSAgICBhc19sc19MX29wdGlvbj1MCi0gIGVsc2UKLSAgICBhc19sc19MX29w dGlvbj0KLSAgZmkKLSAgYXNfdGVzdF94PScKLSAgICBldmFsIHNoIC1jICdcJycKLSAgICAgIGlm IHRlc3QgLWQgIiQxIjsgdGhlbgotCXRlc3QgLWQgIiQxLy4iOwotICAgICAgZWxzZQotCWNhc2Ug JDEgaW4gIygKLQktKilzZXQgIi4vJDEiOzsKLQllc2FjOwotCWNhc2UgYGxzIC1sZCckYXNfbHNf TF9vcHRpb24nICIkMSIgMj4vZGV2L251bGxgIGluICMoKAotCT8/P1tzeF0qKTo7OyopZmFsc2U7 O2VzYWM7ZmkKLSAgICAnXCcnIHNoCi0gICcKLWZpCi1hc19leGVjdXRhYmxlX3A9JGFzX3Rlc3Rf eAorYXNfdGVzdF94PSd0ZXN0IC14JworYXNfZXhlY3V0YWJsZV9wPWFzX2ZuX2V4ZWN1dGFibGVf cAogCiAjIFNlZCBleHByZXNzaW9uIHRvIG1hcCBhIHN0cmluZyBvbnRvIGEgdmFsaWQgQ1BQIG5h bWUuCiBhc190cl9jcHA9ImV2YWwgc2VkICd5JSokYXNfY3JfbGV0dGVycyVQJGFzX2NyX0xFVFRF UlMlO3MlW15fJGFzX2NyX2FsbnVtXSVfJWcnIgpAQCAtNzUzLDggKzc3Myw5IEBAIFBBQ0tBR0Vf UkVWSVNJT04KIFBBQ0tBR0VfTUlOT1IKIFBBQ0tBR0VfTUFKT1IKIHBjcF9wbGF0Zm9ybV9wYXRo cwotbGliX2Zvcl9hdmFoaQorZW5hYmxlX2F2YWhpCiBlbmFibGVfZG5zX3NkCitsaWJfZm9yX2F2 YWhpCiBhdmFoaV9MSUJTCiBhdmFoaV9DRkxBR1MKIFBLR19DT05GSUdfTElCRElSCkBAIC0xMzI4 LDggKzEzNDksNiBAQCB0YXJnZXQ9JHRhcmdldF9hbGlhcwogaWYgdGVzdCAieCRob3N0X2FsaWFz IiAhPSB4OyB0aGVuCiAgIGlmIHRlc3QgIngkYnVpbGRfYWxpYXMiID0geDsgdGhlbgogICAgIGNy b3NzX2NvbXBpbGluZz1tYXliZQotICAgICRhc19lY2hvICIkYXNfbWU6IFdBUk5JTkc6IGlmIHlv dSB3YW50ZWQgdG8gc2V0IHRoZSAtLWJ1aWxkIHR5cGUsIGRvbid0IHVzZSAtLWhvc3QuCi0gICAg SWYgYSBjcm9zcyBjb21waWxlciBpcyBkZXRlY3RlZCB0aGVuIGNyb3NzIGNvbXBpbGUgbW9kZSB3 aWxsIGJlIHVzZWQiID4mMgogICBlbGlmIHRlc3QgIngkYnVpbGRfYWxpYXMiICE9ICJ4JGhvc3Rf YWxpYXMiOyB0aGVuCiAgICAgY3Jvc3NfY29tcGlsaW5nPXllcwogICBmaQpAQCAtMTUwOSw5ICsx NTI4LDggQEAgT3B0aW9uYWwgUGFja2FnZXM6CiAgIC0td2l0aC11c2VyICAgICAgICAgICAgIHVz ZXIgYWNjb3VudCB1bmRlciB3aGljaCBkYWVtb25zIHJ1biAoZGVmYXVsdCBpcwogICAgICAgICAg ICAgICAgICAgICAgICAgICBwY3ApCiAgIC0td2l0aC1ncm91cCAgICAgICAgICAgIHVzZXIgZ3Jv dXAgdW5kZXIgd2hpY2ggZGFlbW9ucyBydW4gKGRlZmF1bHQgaXMgcGNwKQotICAtLXdpdGgtZG5z LXNkICAgICAgICAgICBlbmFibGUgc3VwcG9ydCBmb3IgcG1jZCBkbnMtc2QgYW5ub3VuY2VtZW50 cwotICAgICAgICAgICAgICAgICAgICAgICAgICAoZGVmYXVsdCBpcyBvbikKLSAgICBkb19kbnNf c2Q9JHdpdGh2YWw7IFBBQ0tBR0VfQ09ORklHVVJFPSIkUEFDS0FHRV9DT05GSUdVUkUgLS13aXRo LWRucy1zZD0kd2l0aHZhbCIKKyAgLS13aXRoLWRucy1zZCAgICAgICAgICAgZW5hYmxlIHN1cHBv cnQgZm9yIEROUyBTZXJ2aWNlIERpc2NvdmVyeSAoZGVmYXVsdCBpcworICAgICAgICAgICAgICAg ICAgICAgICAgICBvbikKICAgLS13aXRoLWNvbmZpZ2RpciAgICAgICAgY29uZmlndXJhdGlvbiBk aXJlY3RvcnkgW0xPQ0FMU1RBVEVESVIvcGNwL2NvbmZpZ10KICAgLS13aXRoLXBlcmxfaW5zdGFs bGRpcnMgcGVybCBpbnN0YWxsZGlycyBbdmVuZG9yXQogICAtLXdpdGgtcGVybF9pbnN0YWxsX2Jh c2UKQEAgLTE2MjEsOSArMTYzOSw5IEBAIHRlc3QgLW4gIiRhY19pbml0X2hlbHAiICYmIGV4aXQg JGFjX3N0YXR1cwogaWYgJGFjX2luaXRfdmVyc2lvbjsgdGhlbgogICBjYXQgPDxcX0FDRU9GCiBj b25maWd1cmUKLWdlbmVyYXRlZCBieSBHTlUgQXV0b2NvbmYgMi42OAorZ2VuZXJhdGVkIGJ5IEdO VSBBdXRvY29uZiAyLjY5CiAKLUNvcHlyaWdodCAoQykgMjAxMCBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb24sIEluYy4KK0NvcHlyaWdodCAoQykgMjAxMiBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24s IEluYy4KIFRoaXMgY29uZmlndXJlIHNjcmlwdCBpcyBmcmVlIHNvZnR3YXJlOyB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uCiBnaXZlcyB1bmxpbWl0ZWQgcGVybWlzc2lvbiB0byBjb3B5LCBk aXN0cmlidXRlIGFuZCBtb2RpZnkgaXQuCiBfQUNFT0YKQEAgLTE2OTksNyArMTcxNyw3IEBAICRh c19lY2hvICIkYWNfdHJ5X2VjaG8iOyB9ID4mNQogCSB0ZXN0ICEgLXMgY29uZnRlc3QuZXJyCiAg ICAgICAgfSAmJiB0ZXN0IC1zIGNvbmZ0ZXN0JGFjX2V4ZWV4dCAmJiB7CiAJIHRlc3QgIiRjcm9z c19jb21waWxpbmciID0geWVzIHx8Ci0JICRhc190ZXN0X3ggY29uZnRlc3QkYWNfZXhlZXh0CisJ IHRlc3QgLXggY29uZnRlc3QkYWNfZXhlZXh0CiAgICAgICAgfTsgdGhlbiA6CiAgIGFjX3JldHZh bD0wCiBlbHNlCkBAIC0yMDQwLDcgKzIwNTgsNyBAQCBUaGlzIGZpbGUgY29udGFpbnMgYW55IG1l c3NhZ2VzIHByb2R1Y2VkIGJ5IGNvbXBpbGVycyB3aGlsZQogcnVubmluZyBjb25maWd1cmUsIHRv IGFpZCBkZWJ1Z2dpbmcgaWYgY29uZmlndXJlIG1ha2VzIGEgbWlzdGFrZS4KIAogSXQgd2FzIGNy ZWF0ZWQgYnkgJGFzX21lLCB3aGljaCB3YXMKLWdlbmVyYXRlZCBieSBHTlUgQXV0b2NvbmYgMi42 OC4gIEludm9jYXRpb24gY29tbWFuZCBsaW5lIHdhcworZ2VuZXJhdGVkIGJ5IEdOVSBBdXRvY29u ZiAyLjY5LiAgSW52b2NhdGlvbiBjb21tYW5kIGxpbmUgd2FzCiAKICAgJCAkMCAkQAogCkBAIC0y NDY1LDcgKzI0ODMsOSBAQCBmaQogCiAjIENoZWNrIHdoZXRoZXIgLS13aXRoLWRucy1zZCB3YXMg Z2l2ZW4uCiBpZiB0ZXN0ICIke3dpdGhfZG5zX3NkK3NldH0iID0gc2V0OyB0aGVuIDoKLSAgd2l0 aHZhbD0kd2l0aF9kbnNfc2Q7IGRvX2Ruc19zZD1ubworICB3aXRodmFsPSR3aXRoX2Ruc19zZDsg ZG9fZG5zX3NkPSR3aXRodmFsOyBQQUNLQUdFX0NPTkZJR1VSRT0iJFBBQ0tBR0VfQ09ORklHVVJF IC0td2l0aC1kbnMtc2Q9JHdpdGh2YWwiCitlbHNlCisgIGRvX2Ruc19zZD1jaGVjawogZmkKIAog CkBAIC0yNzM1LDcgKzI3NTUsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXog IiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVj dXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRh Y19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7 IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4 ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3Byb2dfQ0M9IiR7YWNfdG9vbF9wcmVmaXh9Z2NjIgog ICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGZvdW5kICRhc19kaXIv JGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAgLTI3NzUsNyArMjc5NSw3 IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFzX2RpciIgJiYgYXNfZGly PS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFibGVfZXh0ZW5zaW9uczsg ZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiAmJiAkYXNf dGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsgdGhlbgorICBpZiBhc19m bl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB0aGVuCiAgICAg YWNfY3ZfcHJvZ19hY19jdF9DQz0iZ2NjIgogICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5l bm8tJExJTkVOT306IGZvdW5kICRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAg IGJyZWFrIDIKQEAgLTI4MjgsNyArMjg0OCw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAg dGVzdCAteiAiJGFzX2RpciIgJiYgYXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycg JGFjX2V4ZWN1dGFibGVfZXh0ZW5zaW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRh Y193b3JkJGFjX2V4ZWNfZXh0IiAmJiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4 ZWNfZXh0IjsgfTsgdGhlbgorICBpZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dv cmQkYWNfZXhlY19leHQiOyB0aGVuCiAgICAgYWNfY3ZfcHJvZ19DQz0iJHthY190b29sX3ByZWZp eH1jYyIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAk YXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC0yODY5LDcg KzI4ODksNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYm IGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVu c2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIg JiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAg aWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhl bgogICAgIGlmIHRlc3QgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID0gIi91c3IvdWNi L2NjIjsgdGhlbgogICAgICAgIGFjX3Byb2dfcmVqZWN0ZWQ9eWVzCiAgICAgICAgY29udGludWUK QEAgLTI5MjcsNyArMjk0Nyw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAi JGFzX2RpciIgJiYgYXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1 dGFibGVfZXh0ZW5zaW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFj X2V4ZWNfZXh0IiAmJiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0Ijsg fTsgdGhlbgorICBpZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhl Y19leHQiOyB0aGVuCiAgICAgYWNfY3ZfcHJvZ19DQz0iJGFjX3Rvb2xfcHJlZml4JGFjX3Byb2ci CiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogZm91bmQgJGFzX2Rp ci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAgYnJlYWsgMgpAQCAtMjk3MSw3ICsyOTkx LDcgQEAgZG8KICAgSUZTPSRhc19zYXZlX0lGUwogICB0ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19k aXI9LgogICAgIGZvciBhY19leGVjX2V4dCBpbiAnJyAkYWNfZXhlY3V0YWJsZV9leHRlbnNpb25z OyBkbwotICBpZiB7IHRlc3QgLWYgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiICYmICRh c190ZXN0X3ggIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB9OyB0aGVuCisgIGlmIGFz X2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IHRoZW4KICAg ICBhY19jdl9wcm9nX2FjX2N0X0NDPSIkYWNfcHJvZyIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7 YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+ JjUKICAgICBicmVhayAyCkBAIC0zNDE3LDggKzM0MzcsNyBAQCBjYXQgY29uZmRlZnMuaCAtIDw8 X0FDRU9GID5jb25mdGVzdC4kYWNfZXh0CiAvKiBlbmQgY29uZmRlZnMuaC4gICovCiAjaW5jbHVk ZSA8c3RkYXJnLmg+CiAjaW5jbHVkZSA8c3RkaW8uaD4KLSNpbmNsdWRlIDxzeXMvdHlwZXMuaD4K LSNpbmNsdWRlIDxzeXMvc3RhdC5oPgorc3RydWN0IHN0YXQ7CiAvKiBNb3N0IG9mIHRoZSBmb2xs b3dpbmcgdGVzdHMgYXJlIHN0b2xlbiBmcm9tIFJDUyA1LjcncyBzcmMvY29uZi5zaC4gICovCiBz dHJ1Y3QgYnVmIHsgaW50IHg7IH07CiBGSUxFICogKCpyY3NvcGVuKSAoc3RydWN0IGJ1ZiAqLCBz dHJ1Y3Qgc3RhdCAqLCBpbnQpOwpAQCAtMzU5Nyw3ICszNjE2LDcgQEAgZG8KICAgSUZTPSRhc19z YXZlX0lGUwogICB0ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVj X2V4dCBpbiAnJyAkYWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYg IiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFj X3dvcmQkYWNfZXhlY19leHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFz X2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wcm9nX0RUUkFDRT0i JGFjX3Byb2ciCiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogZm91 bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAgYnJlYWsgMgpAQCAtMzc4 MSw3ICszODAwLDcgQEAgZG8KICAgICBmb3IgYWNfcHJvZyBpbiBncmVwIGdncmVwOyBkbwogICAg IGZvciBhY19leGVjX2V4dCBpbiAnJyAkYWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwogICAg ICAgYWNfcGF0aF9HUkVQPSIkYXNfZGlyLyRhY19wcm9nJGFjX2V4ZWNfZXh0IgotICAgICAgeyB0 ZXN0IC1mICIkYWNfcGF0aF9HUkVQIiAmJiAkYXNfdGVzdF94ICIkYWNfcGF0aF9HUkVQIjsgfSB8 fCBjb250aW51ZQorICAgICAgYXNfZm5fZXhlY3V0YWJsZV9wICIkYWNfcGF0aF9HUkVQIiB8fCBj b250aW51ZQogIyBDaGVjayBmb3IgR05VIGFjX3BhdGhfR1JFUCBhbmQgc2VsZWN0IGl0IGlmIGl0 IGlzIGZvdW5kLgogICAjIENoZWNrIGZvciBHTlUgJGFjX3BhdGhfR1JFUAogY2FzZSBgIiRhY19w YXRoX0dSRVAiIC0tdmVyc2lvbiAyPiYxYCBpbgpAQCAtMzg0Nyw3ICszODY2LDcgQEAgZG8KICAg ICBmb3IgYWNfcHJvZyBpbiBlZ3JlcDsgZG8KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFj X2V4ZWN1dGFibGVfZXh0ZW5zaW9uczsgZG8KICAgICAgIGFjX3BhdGhfRUdSRVA9IiRhc19kaXIv JGFjX3Byb2ckYWNfZXhlY19leHQiCi0gICAgICB7IHRlc3QgLWYgIiRhY19wYXRoX0VHUkVQIiAm JiAkYXNfdGVzdF94ICIkYWNfcGF0aF9FR1JFUCI7IH0gfHwgY29udGludWUKKyAgICAgIGFzX2Zu X2V4ZWN1dGFibGVfcCAiJGFjX3BhdGhfRUdSRVAiIHx8IGNvbnRpbnVlCiAjIENoZWNrIGZvciBH TlUgYWNfcGF0aF9FR1JFUCBhbmQgc2VsZWN0IGl0IGlmIGl0IGlzIGZvdW5kLgogICAjIENoZWNr IGZvciBHTlUgJGFjX3BhdGhfRUdSRVAKIGNhc2UgYCIkYWNfcGF0aF9FR1JFUCIgLS12ZXJzaW9u IDI+JjFgIGluCkBAIC00MDc4LDcgKzQwOTcsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAg IHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcn ICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8k YWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19l eGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193 b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3BhdGhfUEtHX0NPTkZJRz0iJGFzX2Rp ci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5v LSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBi cmVhayAyCkBAIC00MTIxLDcgKzQxNDAsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRl c3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRh Y19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNf d29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVj X2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3Jk JGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3BhdGhfYWNfcHRfUEtHX0NPTkZJRz0iJGFz X2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGlu ZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAg ICBicmVhayAyCkBAIC00MTczLDcgKzQxOTIsMTAgQEAgJGFzX2VjaG8gIm5vIiA+JjY7IH0KIGZp CiBpZiB0ZXN0ICJ4JGRvX2Ruc19zZCIgIT0gInhubyI7IHRoZW4gOgogCi0gICAgIyBvbiBsaW51 eCwgYXZhaGkKKyAgICAjIG9uIE1hYyBPUyBYLCBkbnNfc2QuaAorCisgICAgIyBvbiBMaW51eCwg YWxvaGEgQXZhaGkKKyAgICBlbmFibGVfYXZhaGk9dHJ1ZQogCiBwa2dfZmFpbGVkPW5vCiB7ICRh c19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGNoZWNraW5nIGZvciBhdmFoaSIg PiY1CkBAIC00MjMxLDE4ICs0MjUzLDM5IEBAIGZpCiAJIyBQdXQgdGhlIG5hc3R5IGVycm9yIG1l c3NhZ2UgaW4gY29uZmlnLmxvZyB3aGVyZSBpdCBiZWxvbmdzCiAJZWNobyAiJGF2YWhpX1BLR19F UlJPUlMiID4mNQogCi0JZW5hYmxlX2Ruc19zZD1mYWxzZQorCWFzX2ZuX2Vycm9yICQ/ICJQYWNr YWdlIHJlcXVpcmVtZW50cyAoYXZhaGktY2xpZW50KSB3ZXJlIG5vdCBtZXQ6CisKKyRhdmFoaV9Q S0dfRVJST1JTCisKK0NvbnNpZGVyIGFkanVzdGluZyB0aGUgUEtHX0NPTkZJR19QQVRIIGVudmly b25tZW50IHZhcmlhYmxlIGlmIHlvdQoraW5zdGFsbGVkIHNvZnR3YXJlIGluIGEgbm9uLXN0YW5k YXJkIHByZWZpeC4KKworQWx0ZXJuYXRpdmVseSwgeW91IG1heSBzZXQgdGhlIGVudmlyb25tZW50 IHZhcmlhYmxlcyBhdmFoaV9DRkxBR1MKK2FuZCBhdmFoaV9MSUJTIHRvIGF2b2lkIHRoZSBuZWVk IHRvIGNhbGwgcGtnLWNvbmZpZy4KK1NlZSB0aGUgcGtnLWNvbmZpZyBtYW4gcGFnZSBmb3IgbW9y ZSBkZXRhaWxzLiIgIiRMSU5FTk8iIDUKKwogZWxpZiB0ZXN0ICRwa2dfZmFpbGVkID0gdW50cmll ZDsgdGhlbgogICAgICAJeyAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBy ZXN1bHQ6IG5vIiA+JjUKICRhc19lY2hvICJubyIgPiY2OyB9Ci0JZW5hYmxlX2Ruc19zZD1mYWxz ZQorCXsgeyAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBlcnJvcjogaW4g XGAkYWNfcHdkJzoiID4mNQorJGFzX2VjaG8gIiRhc19tZTogZXJyb3I6IGluIFxgJGFjX3B3ZCc6 IiA+JjI7fQorYXNfZm5fZXJyb3IgJD8gIlRoZSBwa2ctY29uZmlnIHNjcmlwdCBjb3VsZCBub3Qg YmUgZm91bmQgb3IgaXMgdG9vIG9sZC4gIE1ha2Ugc3VyZSBpdAoraXMgaW4geW91ciBQQVRIIG9y IHNldCB0aGUgUEtHX0NPTkZJRyBlbnZpcm9ubWVudCB2YXJpYWJsZSB0byB0aGUgZnVsbAorcGF0 aCB0byBwa2ctY29uZmlnLgorCitBbHRlcm5hdGl2ZWx5LCB5b3UgbWF5IHNldCB0aGUgZW52aXJv bm1lbnQgdmFyaWFibGVzIGF2YWhpX0NGTEFHUworYW5kIGF2YWhpX0xJQlMgdG8gYXZvaWQgdGhl IG5lZWQgdG8gY2FsbCBwa2ctY29uZmlnLgorU2VlIHRoZSBwa2ctY29uZmlnIG1hbiBwYWdlIGZv ciBtb3JlIGRldGFpbHMuCisKK1RvIGdldCBwa2ctY29uZmlnLCBzZWUgPGh0dHA6Ly9wa2ctY29u ZmlnLmZyZWVkZXNrdG9wLm9yZy8+LgorU2VlIFxgY29uZmlnLmxvZycgZm9yIG1vcmUgZGV0YWls cyIgIiRMSU5FTk8iIDU7IH0KKwogZWxzZQogCWF2YWhpX0NGTEFHUz0kcGtnX2N2X2F2YWhpX0NG TEFHUwogCWF2YWhpX0xJQlM9JHBrZ19jdl9hdmFoaV9MSUJTCiAgICAgICAgIHsgJGFzX2VjaG8g IiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogcmVzdWx0OiB5ZXMiID4mNQogJGFzX2VjaG8g InllcyIgPiY2OyB9Ci0JZW5hYmxlX2Ruc19zZD10cnVlCi0gICAgICAgICB7ICRhc19lY2hvICIk YXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGNoZWNraW5nIGZvciBhdmFoaV9jbGllbnRfbmV3 IGluIC1sYXZhaGktY2xpZW50IiA+JjUKKwl7ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8t JExJTkVOT306IGNoZWNraW5nIGZvciBhdmFoaV9jbGllbnRfbmV3IGluIC1sYXZhaGktY2xpZW50 IiA+JjUKICRhc19lY2hvX24gImNoZWNraW5nIGZvciBhdmFoaV9jbGllbnRfbmV3IGluIC1sYXZh aGktY2xpZW50Li4uICIgPiY2OyB9CiBpZiAke2FjX2N2X2xpYl9hdmFoaV9jbGllbnRfYXZhaGlf Y2xpZW50X25ldys6fSBmYWxzZTsgdGhlbiA6CiAgICRhc19lY2hvX24gIihjYWNoZWQpICIgPiY2 CkBAIC00MjgxLDEzICs0MzI0LDEwIEBAICRhc19lY2hvICIkYWNfY3ZfbGliX2F2YWhpX2NsaWVu dF9hdmFoaV9jbGllbnRfbmV3IiA+JjY7IH0KIGlmIHRlc3QgIngkYWNfY3ZfbGliX2F2YWhpX2Ns aWVudF9hdmFoaV9jbGllbnRfbmV3IiA9IHh5ZXM7IHRoZW4gOgogICBsaWJfZm9yX2F2YWhpPSIt bGF2YWhpLWNvbW1vbiAtbGF2YWhpLWNsaWVudCIKIGVsc2UKLSAgZW5hYmxlX2Ruc19zZD1mYWxz ZQorICBlbmFibGVfYXZhaGk9ZmFsc2UKIGZpCiAKIAotJGFzX2VjaG8gIiNkZWZpbmUgSEFWRV9B VkFISSAxIiA+PmNvbmZkZWZzLmgKLQotCiBmaQogICAgIGZvciBhY19oZWFkZXIgaW4gYXZhaGkt Y2xpZW50L3B1Ymxpc2guaAogZG8gOgpAQCAtNDI5OCw3ICs0MzM4LDcgQEAgaWYgdGVzdCAieCRh Y19jdl9oZWFkZXJfYXZhaGlfY2xpZW50X3B1Ymxpc2hfaCIgPSB4eWVzOyB0aGVuIDoKIF9BQ0VP RgogCiBlbHNlCi0gIGVuYWJsZV9kbnNfc2Q9ZmFsc2UKKyAgZW5hYmxlX2F2YWhpPWZhbHNlCiBm aQogCiBkb25lCkBAIC00MzEyLDE4ICs0MzUyLDI3IEBAIGlmIHRlc3QgIngkYWNfY3ZfaGVhZGVy X2F2YWhpX2NvbW1vbl9hbHRlcm5hdGl2ZV9oIiA9IHh5ZXM7IHRoZW4gOgogX0FDRU9GCiAKIGVs c2UKLSAgZW5hYmxlX2Ruc19zZD1mYWxzZQorICBlbmFibGVfYXZhaGk9ZmFsc2UKIGZpCiAKIGRv bmUKIAotICAgIGlmIHRlc3QgIiRlbmFibGVfZG5zX3NkIiAhPSAidHJ1ZSIKKworICAgIGlmIHRl c3QgIiRlbmFibGVfYXZhaGkiID0gInRydWUiCiAgICAgdGhlbgotICAgICAgICBhc19mbl9lcnJv ciAkPyAiY2Fubm90IGVuYWJsZSBETlMtU0QuIEF2YWhpIG5vdCBmb3VuZCIgIiRMSU5FTk8iIDUK KworCisJJGFzX2VjaG8gIiNkZWZpbmUgSEFWRV9BVkFISSAxIiA+PmNvbmZkZWZzLmgKKworCWVu YWJsZV9kbnNfc2Q9dHJ1ZQogICAgIGZpCiAKLWZpCisgICAgaWYgdGVzdCAiJGRvX2Ruc19zZCIg IT0gImNoZWNrIiAtYSAiJGVuYWJsZV9kbnNfc2QiICE9ICJ0cnVlIgorICAgIHRoZW4KKyAgICAg ICAgYXNfZm5fZXJyb3IgJD8gImNhbm5vdCBlbmFibGUgRE5TLVNEIC0gbm8gcGxhdGZvcm0gc3Vw cG9ydCIgIiRMSU5FTk8iIDUKKyAgICBmaQogCitmaQogCiAKIApAQCAtNDc4OSwxNiArNDgzOCwx NiBAQCBpZiAoZWNobyA+Y29uZiQkLmZpbGUpIDI+L2Rldi9udWxsOyB0aGVuCiAgICAgIyAuLi4g YnV0IHRoZXJlIGFyZSB0d28gZ290Y2hhczoKICAgICAjIDEpIE9uIE1TWVMsIGJvdGggYGxuIC1z IGZpbGUgZGlyJyBhbmQgYGxuIGZpbGUgZGlyJyBmYWlsLgogICAgICMgMikgREpHUFAgPCAyLjA0 IGhhcyBubyBzeW1saW5rczsgYGxuIC1zJyBjcmVhdGVzIGEgd3JhcHBlciBleGVjdXRhYmxlLgot ICAgICMgSW4gYm90aCBjYXNlcywgd2UgaGF2ZSB0byBkZWZhdWx0IHRvIGBjcCAtcCcuCisgICAg IyBJbiBib3RoIGNhc2VzLCB3ZSBoYXZlIHRvIGRlZmF1bHQgdG8gYGNwIC1wUicuCiAgICAgbG4g LXMgY29uZiQkLmZpbGUgY29uZiQkLmRpciAyPi9kZXYvbnVsbCAmJiB0ZXN0ICEgLWYgY29uZiQk LmV4ZSB8fAotICAgICAgYXNfbG5fcz0nY3AgLXAnCisgICAgICBhc19sbl9zPSdjcCAtcFInCiAg IGVsaWYgbG4gY29uZiQkLmZpbGUgY29uZiQkIDI+L2Rldi9udWxsOyB0aGVuCiAgICAgYXNfbG5f cz1sbgogICBlbHNlCi0gICAgYXNfbG5fcz0nY3AgLXAnCisgICAgYXNfbG5fcz0nY3AgLXBSJwog ICBmaQogZWxzZQotICBhc19sbl9zPSdjcCAtcCcKKyAgYXNfbG5fcz0nY3AgLXBSJwogZmkKIHJt IC1mIGNvbmYkJCBjb25mJCQuZXhlIGNvbmYkJC5kaXIvY29uZiQkLmZpbGUgY29uZiQkLmZpbGUK IHJtZGlyIGNvbmYkJC5kaXIgMj4vZGV2L251bGwKQEAgLTQ4NTgsMjggKzQ5MDcsMTYgQEAgZWxz ZQogICBhc19ta2Rpcl9wPWZhbHNlCiBmaQogCi1pZiB0ZXN0IC14IC8gPi9kZXYvbnVsbCAyPiYx OyB0aGVuCi0gIGFzX3Rlc3RfeD0ndGVzdCAteCcKLWVsc2UKLSAgaWYgbHMgLWRMIC8gPi9kZXYv bnVsbCAyPiYxOyB0aGVuCi0gICAgYXNfbHNfTF9vcHRpb249TAotICBlbHNlCi0gICAgYXNfbHNf TF9vcHRpb249Ci0gIGZpCi0gIGFzX3Rlc3RfeD0nCi0gICAgZXZhbCBzaCAtYyAnXCcnCi0gICAg ICBpZiB0ZXN0IC1kICIkMSI7IHRoZW4KLQl0ZXN0IC1kICIkMS8uIjsKLSAgICAgIGVsc2UKLQlj YXNlICQxIGluICMoCi0JLSopc2V0ICIuLyQxIjs7Ci0JZXNhYzsKLQljYXNlIGBscyAtbGQnJGFz X2xzX0xfb3B0aW9uJyAiJDEiIDI+L2Rldi9udWxsYCBpbiAjKCgKLQk/Pz9bc3hdKik6OzsqKWZh bHNlOztlc2FjO2ZpCi0gICAgJ1wnJyBzaAotICAnCi1maQotYXNfZXhlY3V0YWJsZV9wPSRhc190 ZXN0X3gKKworIyBhc19mbl9leGVjdXRhYmxlX3AgRklMRQorIyAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQorIyBUZXN0IGlmIEZJTEUgaXMgYW4gZXhlY3V0YWJsZSByZWd1bGFyIGZpbGUuCithc19m bl9leGVjdXRhYmxlX3AgKCkKK3sKKyAgdGVzdCAtZiAiJDEiICYmIHRlc3QgLXggIiQxIgorfSAj IGFzX2ZuX2V4ZWN1dGFibGVfcAorYXNfdGVzdF94PSd0ZXN0IC14JworYXNfZXhlY3V0YWJsZV9w PWFzX2ZuX2V4ZWN1dGFibGVfcAogCiAjIFNlZCBleHByZXNzaW9uIHRvIG1hcCBhIHN0cmluZyBv bnRvIGEgdmFsaWQgQ1BQIG5hbWUuCiBhc190cl9jcHA9ImV2YWwgc2VkICd5JSokYXNfY3JfbGV0 dGVycyVQJGFzX2NyX0xFVFRFUlMlO3MlW15fJGFzX2NyX2FsbnVtXSVfJWcnIgpAQCAtNDkwMSw3 ICs0OTM4LDcgQEAgY2F0ID4+JENPTkZJR19TVEFUVVMgPDxcX0FDRU9GIHx8IGFjX3dyaXRlX2Zh aWw9MQogIyB2YWx1ZXMgYWZ0ZXIgb3B0aW9ucyBoYW5kbGluZy4KIGFjX2xvZz0iCiBUaGlzIGZp bGUgd2FzIGV4dGVuZGVkIGJ5ICRhc19tZSwgd2hpY2ggd2FzCi1nZW5lcmF0ZWQgYnkgR05VIEF1 dG9jb25mIDIuNjguICBJbnZvY2F0aW9uIGNvbW1hbmQgbGluZSB3YXMKK2dlbmVyYXRlZCBieSBH TlUgQXV0b2NvbmYgMi42OS4gIEludm9jYXRpb24gY29tbWFuZCBsaW5lIHdhcwogCiAgIENPTkZJ R19GSUxFUyAgICA9ICRDT05GSUdfRklMRVMKICAgQ09ORklHX0hFQURFUlMgID0gJENPTkZJR19I RUFERVJTCkBAIC00OTYzLDEwICs1MDAwLDEwIEBAIGNhdCA+PiRDT05GSUdfU1RBVFVTIDw8X0FD RU9GIHx8IGFjX3dyaXRlX2ZhaWw9MQogYWNfY3NfY29uZmlnPSJgJGFzX2VjaG8gIiRhY19jb25m aWd1cmVfYXJncyIgfCBzZWQgJ3MvXiAvLzsgcy9bXFwiIlxgXCRdL1xcXFwmL2cnYCIKIGFjX2Nz X3ZlcnNpb249IlxcCiBjb25maWcuc3RhdHVzCi1jb25maWd1cmVkIGJ5ICQwLCBnZW5lcmF0ZWQg YnkgR05VIEF1dG9jb25mIDIuNjgsCitjb25maWd1cmVkIGJ5ICQwLCBnZW5lcmF0ZWQgYnkgR05V IEF1dG9jb25mIDIuNjksCiAgIHdpdGggb3B0aW9ucyBcXCJcJGFjX2NzX2NvbmZpZ1xcIgogCi1D b3B5cmlnaHQgKEMpIDIwMTAgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCitDb3B5cmln aHQgKEMpIDIwMTIgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCiBUaGlzIGNvbmZpZy5z dGF0dXMgc2NyaXB0IGlzIGZyZWUgc29mdHdhcmU7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp b24KIGdpdmVzIHVubGltaXRlZCBwZXJtaXNzaW9uIHRvIGNvcHksIGRpc3RyaWJ1dGUgYW5kIG1v ZGlmeSBpdC4iCiAKQEAgLTUwNTQsNyArNTA5MSw3IEBAIGZpCiBfQUNFT0YKIGNhdCA+PiRDT05G SUdfU1RBVFVTIDw8X0FDRU9GIHx8IGFjX3dyaXRlX2ZhaWw9MQogaWYgXCRhY19jc19yZWNoZWNr OyB0aGVuCi0gIHNldCBYICckU0hFTEwnICckMCcgJGFjX2NvbmZpZ3VyZV9hcmdzIFwkYWNfY29u ZmlndXJlX2V4dHJhX2FyZ3MgLS1uby1jcmVhdGUgLS1uby1yZWN1cnNpb24KKyAgc2V0IFggJFNI RUxMICckMCcgJGFjX2NvbmZpZ3VyZV9hcmdzIFwkYWNfY29uZmlndXJlX2V4dHJhX2FyZ3MgLS1u by1jcmVhdGUgLS1uby1yZWN1cnNpb24KICAgc2hpZnQKICAgXCRhc19lY2hvICJydW5uaW5nIENP TkZJR19TSEVMTD0kU0hFTEwgXCQqIiA+JjYKICAgQ09ORklHX1NIRUxMPSckU0hFTEwnCkBAIC01 Njg1LDcgKzU3MjIsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19k aXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxl X2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVj X2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRo ZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0 IjsgdGhlbgogICAgIGFjX2N2X3Byb2dfR0lUPSIkYWNfcHJvZyIKICAgICAkYXNfZWNobyAiJGFz X21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNf ZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC01NzI5LDcgKzU3NjYsNyBAQCBkbwogICBJRlM9JGFz X3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4 ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAt ZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8k YWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIk YXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3Byb2dfUFlUSE9O PSIkYWNfcHJvZyIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBm b3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC01 NzgwLDcgKzU4MTcsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19k aXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxl X2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVj X2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRo ZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0 IjsgdGhlbgogICAgIGFjX2N2X3Byb2dfQ0M9IiRhY190b29sX3ByZWZpeCRhY19wcm9nIgogICAg ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGZvdW5kICRhc19kaXIvJGFj X3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAgLTU4MjQsNyArNTg2MSw3IEBA IGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFzX2RpciIgJiYgYXNfZGlyPS4K ICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFibGVfZXh0ZW5zaW9uczsgZG8K LSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiAmJiAkYXNfdGVz dF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsgdGhlbgorICBpZiBhc19mbl9l eGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB0aGVuCiAgICAgYWNf Y3ZfcHJvZ19hY19jdF9DQz0iJGFjX3Byb2ciCiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xp bmVuby0kTElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAg ICAgYnJlYWsgMgpAQCAtNjAxOCw4ICs2MDU1LDcgQEAgY2F0IGNvbmZkZWZzLmggLSA8PF9BQ0VP RiA+Y29uZnRlc3QuJGFjX2V4dAogLyogZW5kIGNvbmZkZWZzLmguICAqLwogI2luY2x1ZGUgPHN0 ZGFyZy5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+Ci0jaW5jbHVkZSA8c3lzL3R5cGVzLmg+Ci0jaW5j bHVkZSA8c3lzL3N0YXQuaD4KK3N0cnVjdCBzdGF0OwogLyogTW9zdCBvZiB0aGUgZm9sbG93aW5n IHRlc3RzIGFyZSBzdG9sZW4gZnJvbSBSQ1MgNS43J3Mgc3JjL2NvbmYuc2guICAqLwogc3RydWN0 IGJ1ZiB7IGludCB4OyB9OwogRklMRSAqICgqcmNzb3BlbikgKHN0cnVjdCBidWYgKiwgc3RydWN0 IHN0YXQgKiwgaW50KTsKQEAgLTYxMjQsNyArNjE2MCw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9J RlMKICAgdGVzdCAteiAiJGFzX2RpciIgJiYgYXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQg aW4gJycgJGFjX2V4ZWN1dGFibGVfZXh0ZW5zaW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNf ZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiAmJiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3Jk JGFjX2V4ZWNfZXh0IjsgfTsgdGhlbgorICBpZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIv JGFjX3dvcmQkYWNfZXhlY19leHQiOyB0aGVuCiAgICAgYWNfY3ZfcGF0aF9DQ1BBVEg9IiRhc19k aXIvJGFjX3dvcmQkYWNfZXhlY19leHQiCiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVu by0kTElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAg YnJlYWsgMgpAQCAtNjIwNyw3ICs2MjQzLDcgQEAgZG8KICAgSUZTPSRhc19zYXZlX0lGUwogICB0 ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVjX2V4dCBpbiAnJyAk YWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYgIiRhc19kaXIvJGFj X3dvcmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhl Y19leHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rpci8kYWNfd29y ZCRhY19leGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX01BS0U9IiRhc19kaXIvJGFjX3dv cmQkYWNfZXhlY19leHQiCiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5P fTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAgYnJlYWsgMgpA QCAtNjQyNiw3ICs2NDYyLDcgQEAgZG8KICAgSUZTPSRhc19zYXZlX0lGUwogICB0ZXN0IC16ICIk YXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVjX2V4dCBpbiAnJyAkYWNfZXhlY3V0 YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYgIiRhc19kaXIvJGFjX3dvcmQkYWNf ZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB9 OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVj X2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX0xEPSIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNf ZXh0IgogICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGZvdW5kICRh c19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAgLTY0OTUsNyAr NjUzMSw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFzX2RpciIgJiYg YXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFibGVfZXh0ZW5z aW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiAm JiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsgdGhlbgorICBp ZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB0aGVu CiAgICAgYWNfY3ZfcGF0aF9UQVI9IiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiCiAgICAg JGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNf d29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAgYnJlYWsgMgpAQCAtNjU0OCw3ICs2NTg0LDcgQEAg ZG8KICAgSUZTPSRhc19zYXZlX0lGUwogICB0ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9Lgog ICAgIGZvciBhY19leGVjX2V4dCBpbiAnJyAkYWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwot ICBpZiB7IHRlc3QgLWYgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0 X3ggIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4 ZWN1dGFibGVfcCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IHRoZW4KICAgICBhY19j dl9wYXRoX1pJUD0iJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAgICAkYXNfZWNobyAi JGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4 ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC02NTk4LDcgKzY2MzQsNyBAQCBkbwogICBJRlM9 JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFj X2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVz dCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rp ci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9w ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3BhdGhfQlpJ UDI9IiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiCiAgICAgJGFzX2VjaG8gIiRhc19tZTok e2FzX2xpbmVuby0kTElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIg PiY1CiAgICAgYnJlYWsgMgpAQCAtNjY0OCw3ICs2Njg0LDcgQEAgZG8KICAgSUZTPSRhc19zYXZl X0lGUwogICB0ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVjX2V4 dCBpbiAnJyAkYWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYgIiRh c19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFjX3dv cmQkYWNfZXhlY19leHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rp ci8kYWNfd29yZCRhY19leGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX0xaTUE9IiRhc19k aXIvJGFjX3dvcmQkYWNfZXhlY19leHQiCiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVu by0kTElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAg YnJlYWsgMgpAQCAtNjY5OCw3ICs2NzM0LDcgQEAgZG8KICAgSUZTPSRhc19zYXZlX0lGUwogICB0 ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVjX2V4dCBpbiAnJyAk YWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYgIiRhc19kaXIvJGFj X3dvcmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhl Y19leHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rpci8kYWNfd29y ZCRhY19leGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX1haPSIkYXNfZGlyLyRhY193b3Jk JGFjX2V4ZWNfZXh0IgogICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306 IGZvdW5kICRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAg LTY3NzksNyArNjgxNSw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFz X2RpciIgJiYgYXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFi bGVfZXh0ZW5zaW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4 ZWNfZXh0IiAmJiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsg dGhlbgorICBpZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19l eHQiOyB0aGVuCiAgICAgYWNfY3ZfcGF0aF9IRElVVElMPSIkYXNfZGlyLyRhY193b3JkJGFjX2V4 ZWNfZXh0IgogICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGZvdW5k ICRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAgLTY4MjQs NyArNjg2MCw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFzX2RpciIg JiYgYXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFibGVfZXh0 ZW5zaW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0 IiAmJiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsgdGhlbgor ICBpZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB0 aGVuCiAgICAgYWNfY3ZfcGF0aF9NS0lOU1RBTExQPSIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNf ZXh0IgogICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGZvdW5kICRh c19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAgLTY4NjksNyAr NjkwNSw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFzX2RpciIgJiYg YXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFibGVfZXh0ZW5z aW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiAm JiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsgdGhlbgorICBp ZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB0aGVu CiAgICAgYWNfY3ZfcGF0aF9QS0dNSz0iJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAg ICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRh Y193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC02OTE0LDcgKzY5NTAsNyBA QCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0u CiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRv Ci0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rl c3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5f ZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFj X2N2X3BhdGhfRExMVE9PTD0iJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAgICAkYXNf ZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3Jk JGFjX2V4ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC02OTU5LDcgKzY5OTUsNyBAQCBkbwog ICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAg Zm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlm IHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAi JGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0 YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3Bh dGhfUlBNQlVJTEQ9IiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiCiAgICAgJGFzX2VjaG8g IiRhc19tZToke2FzX2xpbmVuby0kTElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19l eGVjX2V4dCIgPiY1CiAgICAgYnJlYWsgMgpAQCAtNzAwNSw3ICs3MDQxLDcgQEAgZG8KICAgSUZT PSRhc19zYXZlX0lGUwogICB0ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBh Y19leGVjX2V4dCBpbiAnJyAkYWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRl c3QgLWYgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19k aXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVf cCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX1JQ TT0iJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7 YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+ JjUKICAgICBicmVhayAyCkBAIC03MDU5LDcgKzcwOTUsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVf SUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0 IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFz X2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29y ZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGly LyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3BhdGhfUE9EMk1BTj0iJGFz X2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGlu ZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAg ICBicmVhayAyCkBAIC03MTIxLDcgKzcxNTcsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAg IHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcn ICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8k YWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19l eGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193 b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3BhdGhfVFJVRVBST0c9IiRhc19kaXIv JGFjX3dvcmQkYWNfZXhlY19leHQiCiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0k TElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAgYnJl YWsgMgpAQCAtNzE2Myw3ICs3MTk5LDcgQEAgZG8KICAgSUZTPSRhc19zYXZlX0lGUwogICB0ZXN0 IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVjX2V4dCBpbiAnJyAkYWNf ZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYgIiRhc19kaXIvJGFjX3dv cmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19l eHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rpci8kYWNfd29yZCRh Y19leGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX01BS0VERVBFTkQ9IiRhc19kaXIvJGFj X3dvcmQkYWNfZXhlY19leHQiCiAgICAgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElO RU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgPiY1CiAgICAgYnJlYWsg MgpAQCAtNzIwOSw3ICs3MjQ1LDcgQEAgZG8KICAgSUZTPSRhc19zYXZlX0lGUwogICB0ZXN0IC16 ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVjX2V4dCBpbiAnJyAkYWNfZXhl Y3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYgIiRhc19kaXIvJGFjX3dvcmQk YWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQi OyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rpci8kYWNfd29yZCRhY19l eGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX01ENVNVTT0iJGFzX2Rpci8kYWNfd29yZCRh Y19leGVjX2V4dCIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBm b3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC03 MjU1LDcgKzcyOTEsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19k aXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxl X2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVj X2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRo ZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0 IjsgdGhlbgogICAgIGFjX2N2X3BhdGhfRFBLRz0iJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4 dCIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNf ZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC03MzAwLDcgKzcz MzYsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYmIGFz X2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVuc2lv bnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgJiYg JGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAgaWYg YXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgog ICAgIGFjX2N2X3BhdGhfTUFLRVBLRz0iJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAg ICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5vLSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRh Y193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBicmVhayAyCkBAIC03MzU5LDcgKzczOTUsNyBA QCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0u CiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRv Ci0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rl c3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5f ZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFj X2N2X3Byb2dfTEVYPSIkYWNfcHJvZyIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5v LSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBi cmVhayAyCkBAIC03MzkxLDcgKzc0MjcsOCBAQCBhIHsgRUNITzsgfQogYiB7IFJFSkVDVDsgfQog YyB7IHl5bW9yZSAoKTsgfQogZCB7IHl5bGVzcyAoMSk7IH0KLWUgeyB5eWxlc3MgKGlucHV0ICgp ICE9IDApOyB9CitlIHsgLyogSVJJWCA2LjUgZmxleCAyLjUuNCB1bmRlcnF1b3RlcyBpdHMgeXls ZXNzIGFyZ3VtZW50LiAgKi8KKyAgICB5eWxlc3MgKChpbnB1dCAoKSAhPSAwKSk7IH0KIGYgeyB1 bnB1dCAoeXl0ZXh0WzBdKTsgfQogLiB7IEJFR0lOIElOSVRJQUw7IH0KICUlCkBAIC03NTE5LDcg Kzc1NTYsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRlc3QgLXogIiRhc19kaXIiICYm IGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRhY19leGVjdXRhYmxlX2V4dGVu c2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIg JiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCI7IH07IHRoZW4KKyAg aWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgdGhl bgogICAgIGFjX2N2X3Byb2dfWUFDQz0iJGFjX3Byb2ciCiAgICAgJGFzX2VjaG8gIiRhc19tZTok e2FzX2xpbmVuby0kTElORU5PfTogZm91bmQgJGFzX2Rpci8kYWNfd29yZCRhY19leGVjX2V4dCIg PiY1CiAgICAgYnJlYWsgMgpAQCAtNzYwNSw3ICs3NjQyLDcgQEAgZG8KICAgSUZTPSRhc19zYXZl X0lGUwogICB0ZXN0IC16ICIkYXNfZGlyIiAmJiBhc19kaXI9LgogICAgIGZvciBhY19leGVjX2V4 dCBpbiAnJyAkYWNfZXhlY3V0YWJsZV9leHRlbnNpb25zOyBkbwotICBpZiB7IHRlc3QgLWYgIiRh c19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiICYmICRhc190ZXN0X3ggIiRhc19kaXIvJGFjX3dv cmQkYWNfZXhlY19leHQiOyB9OyB0aGVuCisgIGlmIGFzX2ZuX2V4ZWN1dGFibGVfcCAiJGFzX2Rp ci8kYWNfd29yZCRhY19leGVjX2V4dCI7IHRoZW4KICAgICBhY19jdl9wYXRoX0FXSz0iJGFzX2Rp ci8kYWNfd29yZCRhY19leGVjX2V4dCIKICAgICAkYXNfZWNobyAiJGFzX21lOiR7YXNfbGluZW5v LSRMSU5FTk99OiBmb3VuZCAkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiA+JjUKICAgICBi cmVhayAyCkBAIC03NjYxLDcgKzc2OTgsNyBAQCBkbwogICBJRlM9JGFzX3NhdmVfSUZTCiAgIHRl c3QgLXogIiRhc19kaXIiICYmIGFzX2Rpcj0uCiAgICAgZm9yIGFjX2V4ZWNfZXh0IGluICcnICRh Y19leGVjdXRhYmxlX2V4dGVuc2lvbnM7IGRvCi0gIGlmIHsgdGVzdCAtZiAiJGFzX2Rpci8kYWNf d29yZCRhY19leGVjX2V4dCIgJiYgJGFzX3Rlc3RfeCAiJGFzX2Rpci8kYWNfd29yZCRhY19leGVj X2V4dCI7IH07IHRoZW4KKyAgaWYgYXNfZm5fZXhlY3V0YWJsZV9wICIkYXNfZGlyLyRhY193b3Jk JGFjX2V4ZWNfZXh0IjsgdGhlbgogICAgIGFjX2N2X3BhdGhfU0VEPSIkYXNfZGlyLyRhY193b3Jk JGFjX2V4ZWNfZXh0IgogICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306 IGZvdW5kICRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAg LTc3MDYsNyArNzc0Myw3IEBAIGRvCiAgIElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFz X2RpciIgJiYgYXNfZGlyPS4KICAgICBmb3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFi bGVfZXh0ZW5zaW9uczsgZG8KLSAgaWYgeyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4 ZWNfZXh0IiAmJiAkYXNfdGVzdF94ICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsg dGhlbgorICBpZiBhc19mbl9leGVjdXRhYmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19l eHQiOyB0aGVuCiAgICAgYWNfY3ZfcGF0aF9FQ0hPPSIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNf ZXh0IgogICAgICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGZvdW5kICRh c19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAgLTg0NzUsMTEg Kzg1MTIsMTEgQEAgZWxzZQogaW50CiBtYWluICgpCiB7Ci0vKiBGSVhNRTogSW5jbHVkZSB0aGUg Y29tbWVudHMgc3VnZ2VzdGVkIGJ5IFBhdWwuICovCisKICNpZm5kZWYgX19jcGx1c3BsdXMKLSAg LyogVWx0cml4IG1pcHMgY2MgcmVqZWN0cyB0aGlzLiAgKi8KKyAgLyogVWx0cml4IG1pcHMgY2Mg cmVqZWN0cyB0aGlzIHNvcnQgb2YgdGhpbmcuICAqLwogICB0eXBlZGVmIGludCBjaGFyc2V0WzJd OwotICBjb25zdCBjaGFyc2V0IGNzOworICBjb25zdCBjaGFyc2V0IGNzID0geyAwLCAwIH07CiAg IC8qIFN1bk9TIDQuMS4xIGNjIHJlamVjdHMgdGhpcy4gICovCiAgIGNoYXIgY29uc3QgKmNvbnN0 ICpwY3BjYzsKICAgY2hhciAqKnBwYzsKQEAgLTg0OTYsOCArODUzMyw5IEBAIG1haW4gKCkKICAg KytwY3BjYzsKICAgcHBjID0gKGNoYXIqKikgcGNwY2M7CiAgIHBjcGNjID0gKGNoYXIgY29uc3Qg KmNvbnN0ICopIHBwYzsKLSAgeyAvKiBTQ08gMy4ydjQgY2MgcmVqZWN0cyB0aGlzLiAgKi8KLSAg ICBjaGFyICp0OworICB7IC8qIFNDTyAzLjJ2NCBjYyByZWplY3RzIHRoaXMgc29ydCBvZiB0aGlu Zy4gICovCisgICAgY2hhciB0eDsKKyAgICBjaGFyICp0ID0gJnR4OwogICAgIGNoYXIgY29uc3Qg KnMgPSAwID8gKGNoYXIgKikgMCA6IChjaGFyIGNvbnN0ICopIDA7CiAKICAgICAqdCsrID0gMDsK QEAgLTg1MTMsMTAgKzg1NTEsMTAgQEAgbWFpbiAoKQogICAgIGlwdHIgcCA9IDA7CiAgICAgKytw OwogICB9Ci0gIHsgLyogQUlYIFhMIEMgMS4wMi4wLjAgcmVqZWN0cyB0aGlzIHNheWluZworICB7 IC8qIEFJWCBYTCBDIDEuMDIuMC4wIHJlamVjdHMgdGhpcyBzb3J0IG9mIHRoaW5nLCBzYXlpbmcK ICAgICAgICAiay5jIiwgbGluZSAyLjI3OiAxNTA2LTAyNSAoUykgT3BlcmFuZCBtdXN0IGJlIGEg bW9kaWZpYWJsZSBsdmFsdWUuICovCi0gICAgc3RydWN0IHMgeyBpbnQgajsgY29uc3QgaW50ICph cFszXTsgfTsKLSAgICBzdHJ1Y3QgcyAqYjsgYi0+aiA9IDU7CisgICAgc3RydWN0IHMgeyBpbnQg ajsgY29uc3QgaW50ICphcFszXTsgfSBieDsKKyAgICBzdHJ1Y3QgcyAqYiA9ICZieDsgYi0+aiA9 IDU7CiAgIH0KICAgeyAvKiBVTFRSSVgtMzIgVjMuMSAoUmV2IDkpIHZjYyByZWplY3RzIHRoaXMg Ki8KICAgICBjb25zdCBpbnQgZm9vID0gMTA7CkBAIC0xMTk0NSw3ICsxMTk4Myw3IEBAIGRvCiAg IElGUz0kYXNfc2F2ZV9JRlMKICAgdGVzdCAteiAiJGFzX2RpciIgJiYgYXNfZGlyPS4KICAgICBm b3IgYWNfZXhlY19leHQgaW4gJycgJGFjX2V4ZWN1dGFibGVfZXh0ZW5zaW9uczsgZG8KLSAgaWYg eyB0ZXN0IC1mICIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IiAmJiAkYXNfdGVzdF94ICIk YXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IjsgfTsgdGhlbgorICBpZiBhc19mbl9leGVjdXRh YmxlX3AgIiRhc19kaXIvJGFjX3dvcmQkYWNfZXhlY19leHQiOyB0aGVuCiAgICAgYWNfY3ZfcGF0 aF9hY194Y29uZmlybV9wcm9nPSIkYXNfZGlyLyRhY193b3JkJGFjX2V4ZWNfZXh0IgogICAgICRh c19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IGZvdW5kICRhc19kaXIvJGFjX3dv cmQkYWNfZXhlY19leHQiID4mNQogICAgIGJyZWFrIDIKQEAgLTEzMjczLDE2ICsxMzMxMSwxNiBA QCBpZiAoZWNobyA+Y29uZiQkLmZpbGUpIDI+L2Rldi9udWxsOyB0aGVuCiAgICAgIyAuLi4gYnV0 IHRoZXJlIGFyZSB0d28gZ290Y2hhczoKICAgICAjIDEpIE9uIE1TWVMsIGJvdGggYGxuIC1zIGZp bGUgZGlyJyBhbmQgYGxuIGZpbGUgZGlyJyBmYWlsLgogICAgICMgMikgREpHUFAgPCAyLjA0IGhh cyBubyBzeW1saW5rczsgYGxuIC1zJyBjcmVhdGVzIGEgd3JhcHBlciBleGVjdXRhYmxlLgotICAg ICMgSW4gYm90aCBjYXNlcywgd2UgaGF2ZSB0byBkZWZhdWx0IHRvIGBjcCAtcCcuCisgICAgIyBJ biBib3RoIGNhc2VzLCB3ZSBoYXZlIHRvIGRlZmF1bHQgdG8gYGNwIC1wUicuCiAgICAgbG4gLXMg Y29uZiQkLmZpbGUgY29uZiQkLmRpciAyPi9kZXYvbnVsbCAmJiB0ZXN0ICEgLWYgY29uZiQkLmV4 ZSB8fAotICAgICAgYXNfbG5fcz0nY3AgLXAnCisgICAgICBhc19sbl9zPSdjcCAtcFInCiAgIGVs aWYgbG4gY29uZiQkLmZpbGUgY29uZiQkIDI+L2Rldi9udWxsOyB0aGVuCiAgICAgYXNfbG5fcz1s bgogICBlbHNlCi0gICAgYXNfbG5fcz0nY3AgLXAnCisgICAgYXNfbG5fcz0nY3AgLXBSJwogICBm aQogZWxzZQotICBhc19sbl9zPSdjcCAtcCcKKyAgYXNfbG5fcz0nY3AgLXBSJwogZmkKIHJtIC1m IGNvbmYkJCBjb25mJCQuZXhlIGNvbmYkJC5kaXIvY29uZiQkLmZpbGUgY29uZiQkLmZpbGUKIHJt ZGlyIGNvbmYkJC5kaXIgMj4vZGV2L251bGwKQEAgLTEzMzQyLDI4ICsxMzM4MCwxNiBAQCBlbHNl CiAgIGFzX21rZGlyX3A9ZmFsc2UKIGZpCiAKLWlmIHRlc3QgLXggLyA+L2Rldi9udWxsIDI+JjE7 IHRoZW4KLSAgYXNfdGVzdF94PSd0ZXN0IC14JwotZWxzZQotICBpZiBscyAtZEwgLyA+L2Rldi9u dWxsIDI+JjE7IHRoZW4KLSAgICBhc19sc19MX29wdGlvbj1MCi0gIGVsc2UKLSAgICBhc19sc19M X29wdGlvbj0KLSAgZmkKLSAgYXNfdGVzdF94PScKLSAgICBldmFsIHNoIC1jICdcJycKLSAgICAg IGlmIHRlc3QgLWQgIiQxIjsgdGhlbgotCXRlc3QgLWQgIiQxLy4iOwotICAgICAgZWxzZQotCWNh c2UgJDEgaW4gIygKLQktKilzZXQgIi4vJDEiOzsKLQllc2FjOwotCWNhc2UgYGxzIC1sZCckYXNf bHNfTF9vcHRpb24nICIkMSIgMj4vZGV2L251bGxgIGluICMoKAotCT8/P1tzeF0qKTo7OyopZmFs c2U7O2VzYWM7ZmkKLSAgICAnXCcnIHNoCi0gICcKLWZpCi1hc19leGVjdXRhYmxlX3A9JGFzX3Rl c3RfeAorCisjIGFzX2ZuX2V4ZWN1dGFibGVfcCBGSUxFCisjIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCisjIFRlc3QgaWYgRklMRSBpcyBhbiBleGVjdXRhYmxlIHJlZ3VsYXIgZmlsZS4KK2FzX2Zu X2V4ZWN1dGFibGVfcCAoKQoreworICB0ZXN0IC1mICIkMSIgJiYgdGVzdCAteCAiJDEiCit9ICMg YXNfZm5fZXhlY3V0YWJsZV9wCithc190ZXN0X3g9J3Rlc3QgLXgnCithc19leGVjdXRhYmxlX3A9 YXNfZm5fZXhlY3V0YWJsZV9wCiAKICMgU2VkIGV4cHJlc3Npb24gdG8gbWFwIGEgc3RyaW5nIG9u dG8gYSB2YWxpZCBDUFAgbmFtZS4KIGFzX3RyX2NwcD0iZXZhbCBzZWQgJ3klKiRhc19jcl9sZXR0 ZXJzJVAkYXNfY3JfTEVUVEVSUyU7cyVbXl8kYXNfY3JfYWxudW1dJV8lZyciCkBAIC0xMzM4NSw3 ICsxMzQxMSw3IEBAIGNhdCA+PiRDT05GSUdfU1RBVFVTIDw8XF9BQ0VPRiB8fCBhY193cml0ZV9m YWlsPTEKICMgdmFsdWVzIGFmdGVyIG9wdGlvbnMgaGFuZGxpbmcuCiBhY19sb2c9IgogVGhpcyBm aWxlIHdhcyBleHRlbmRlZCBieSAkYXNfbWUsIHdoaWNoIHdhcwotZ2VuZXJhdGVkIGJ5IEdOVSBB dXRvY29uZiAyLjY4LiAgSW52b2NhdGlvbiBjb21tYW5kIGxpbmUgd2FzCitnZW5lcmF0ZWQgYnkg R05VIEF1dG9jb25mIDIuNjkuICBJbnZvY2F0aW9uIGNvbW1hbmQgbGluZSB3YXMKIAogICBDT05G SUdfRklMRVMgICAgPSAkQ09ORklHX0ZJTEVTCiAgIENPTkZJR19IRUFERVJTICA9ICRDT05GSUdf SEVBREVSUwpAQCAtMTM0NDcsMTAgKzEzNDczLDEwIEBAIGNhdCA+PiRDT05GSUdfU1RBVFVTIDw8 X0FDRU9GIHx8IGFjX3dyaXRlX2ZhaWw9MQogYWNfY3NfY29uZmlnPSJgJGFzX2VjaG8gIiRhY19j b25maWd1cmVfYXJncyIgfCBzZWQgJ3MvXiAvLzsgcy9bXFwiIlxgXCRdL1xcXFwmL2cnYCIKIGFj X2NzX3ZlcnNpb249IlxcCiBjb25maWcuc3RhdHVzCi1jb25maWd1cmVkIGJ5ICQwLCBnZW5lcmF0 ZWQgYnkgR05VIEF1dG9jb25mIDIuNjgsCitjb25maWd1cmVkIGJ5ICQwLCBnZW5lcmF0ZWQgYnkg R05VIEF1dG9jb25mIDIuNjksCiAgIHdpdGggb3B0aW9ucyBcXCJcJGFjX2NzX2NvbmZpZ1xcIgog Ci1Db3B5cmlnaHQgKEMpIDIwMTAgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCitDb3B5 cmlnaHQgKEMpIDIwMTIgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCiBUaGlzIGNvbmZp Zy5zdGF0dXMgc2NyaXB0IGlzIGZyZWUgc29mdHdhcmU7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb24KIGdpdmVzIHVubGltaXRlZCBwZXJtaXNzaW9uIHRvIGNvcHksIGRpc3RyaWJ1dGUgYW5k IG1vZGlmeSBpdC4iCiAKQEAgLTEzNTM4LDcgKzEzNTY0LDcgQEAgZmkKIF9BQ0VPRgogY2F0ID4+ JENPTkZJR19TVEFUVVMgPDxfQUNFT0YgfHwgYWNfd3JpdGVfZmFpbD0xCiBpZiBcJGFjX2NzX3Jl Y2hlY2s7IHRoZW4KLSAgc2V0IFggJyRTSEVMTCcgJyQwJyAkYWNfY29uZmlndXJlX2FyZ3MgXCRh Y19jb25maWd1cmVfZXh0cmFfYXJncyAtLW5vLWNyZWF0ZSAtLW5vLXJlY3Vyc2lvbgorICBzZXQg WCAkU0hFTEwgJyQwJyAkYWNfY29uZmlndXJlX2FyZ3MgXCRhY19jb25maWd1cmVfZXh0cmFfYXJn cyAtLW5vLWNyZWF0ZSAtLW5vLXJlY3Vyc2lvbgogICBzaGlmdAogICBcJGFzX2VjaG8gInJ1bm5p bmcgQ09ORklHX1NIRUxMPSRTSEVMTCBcJCoiID4mNgogICBDT05GSUdfU0hFTEw9JyRTSEVMTCcK ZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5pbiBiL2NvbmZpZ3VyZS5pbgppbmRleCA2ZTI0NzYzLi44 NDdkNjlhIDEwMDY0NAotLS0gYS9jb25maWd1cmUuaW4KKysrIGIvY29uZmlndXJlLmluCkBAIC04 MCw5ICs4MCw5IEBAIEFDX1NVQlNUKHBjcF9ncm91cCkKIAogQUNfQVJHX1dJVEgoW2Rucy1zZF0s CiAgICAgW0FDX0hFTFBfU1RSSU5HKFstLXdpdGgtZG5zLXNkXSwKLSAgICAgICAgICAgICAgICAg ICBbZW5hYmxlIHN1cHBvcnQgZm9yIHBtY2QgZG5zLXNkIGFubm91bmNlbWVudHMgKGRlZmF1bHQg aXMgb24pXSldCisgICAgICAgICAgICAgICAgICAgW2VuYWJsZSBzdXBwb3J0IGZvciBETlMgU2Vy dmljZSBEaXNjb3ZlcnkgKGRlZmF1bHQgaXMgb24pXSldLAogICAgIFtkb19kbnNfc2Q9JHdpdGh2 YWw7IFBBQ0tBR0VfQ09ORklHVVJFPSIkUEFDS0FHRV9DT05GSUdVUkUgLS13aXRoLWRucy1zZD0k d2l0aHZhbCJdLAotICAgIFtkb19kbnNfc2Q9bm9dKQorICAgIFtkb19kbnNfc2Q9Y2hlY2tdKQog CiAjCiAjIE5vdGU6IHRoZSBmb2xsb3dpbmcgZW52aXJvbm1lbnQgdmFyaWFibGVzIG1heSBiZQpA QCAtMjQ4LDI3ICsyNDgsMzUgQEAgdGhlbgogICAgIEFDX1NVQlNUKERUUkFDRSkKIGZpCiAKLWRu bCBDaGVjayBmb3IgRE5TLVNECitkbmwgQ2hlY2sgZm9yIEROUy1TRCAoU2VydmljZSBEaXNjb3Zl cnkpCiBBU19JRihbdGVzdCAieCRkb19kbnNfc2QiICE9ICJ4bm8iXSwgWwotICAgICMgb24gbGlu dXgsIGF2YWhpCisgICAgIyBvbiBNYWMgT1MgWCwgZG5zX3NkLmgKKworICAgICMgb24gTGludXgs IGFsb2hhIEF2YWhpCisgICAgZW5hYmxlX2F2YWhpPXRydWUKICAgICBQS0dfQ0hFQ0tfTU9EVUxF UyhbYXZhaGldLCBbYXZhaGktY2xpZW50XSwKLSAgICAgICAgW2VuYWJsZV9kbnNfc2Q9dHJ1ZQot ICAgICAgICAgQUNfQ0hFQ0tfTElCKGF2YWhpLWNsaWVudCwgYXZhaGlfY2xpZW50X25ldywKKyAg ICAgICAgW0FDX0NIRUNLX0xJQihhdmFoaS1jbGllbnQsIGF2YWhpX2NsaWVudF9uZXcsCiAgICAg CQkgICAgICBbbGliX2Zvcl9hdmFoaT0iLWxhdmFoaS1jb21tb24gLWxhdmFoaS1jbGllbnQiXSwK LQkgICAgICAgICAgICAgIFtlbmFibGVfZG5zX3NkPWZhbHNlXSkKLSAgICAgICAgIEFDX0RFRklO RShbSEFWRV9BVkFISV0sWzFdLFtEZWZpbmUgdG8gMSBpZiB5b3UgaGF2ZSB0aGUgYXZhaGkgbGli cmFyaWVzLl0pCi0gICAgICAgIF0sCi0gICAgICAgIFtlbmFibGVfZG5zX3NkPWZhbHNlXSkKLSAg ICBBQ19DSEVDS19IRUFERVJTKFthdmFoaS1jbGllbnQvcHVibGlzaC5oXSwgW10sIFtlbmFibGVf ZG5zX3NkPWZhbHNlXSkKLSAgICBBQ19DSEVDS19IRUFERVJTKFthdmFoaS1jb21tb24vYWx0ZXJu YXRpdmUuaF0sIFtdLCBbZW5hYmxlX2Ruc19zZD1mYWxzZV0pCi0gICAgaWYgdGVzdCAiJGVuYWJs ZV9kbnNfc2QiICE9ICJ0cnVlIgorICAgICAgICAgICAgICAgICAgICAgIFtlbmFibGVfYXZhaGk9 ZmFsc2VdKQorICAgICAgICBdKQorICAgIEFDX0NIRUNLX0hFQURFUlMoW2F2YWhpLWNsaWVudC9w dWJsaXNoLmhdLCwgW2VuYWJsZV9hdmFoaT1mYWxzZV0pCisgICAgQUNfQ0hFQ0tfSEVBREVSUyhb YXZhaGktY29tbW9uL2FsdGVybmF0aXZlLmhdLCwgW2VuYWJsZV9hdmFoaT1mYWxzZV0pCisKKyAg ICBpZiB0ZXN0ICIkZW5hYmxlX2F2YWhpIiA9ICJ0cnVlIgorICAgIHRoZW4KKwlBQ19TVUJTVChs aWJfZm9yX2F2YWhpKQorCUFDX1NVQlNUKGF2YWhpX0NGTEFHUykKKwlBQ19ERUZJTkUoSEFWRV9B VkFISSkKKwllbmFibGVfZG5zX3NkPXRydWUKKyAgICBmaQorCisgICAgaWYgdGVzdCAiJGRvX2Ru c19zZCIgIT0gImNoZWNrIiAtYSAiJGVuYWJsZV9kbnNfc2QiICE9ICJ0cnVlIgogICAgIHRoZW4K LSAgICAgICAgQUNfTVNHX0VSUk9SKGNhbm5vdCBlbmFibGUgRE5TLVNELiBBdmFoaSBub3QgZm91 bmQpCisgICAgICAgIEFDX01TR19FUlJPUihjYW5ub3QgZW5hYmxlIEROUy1TRCAtIG5vIHBsYXRm b3JtIHN1cHBvcnQpCiAgICAgZmkKIF0pCiBBQ19TVUJTVChlbmFibGVfZG5zX3NkKQotQUNfU1VC U1QobGliX2Zvcl9hdmFoaSkKLUFDX1NVQlNUKGF2YWhpX0NGTEFHUykKK0FDX1NVQlNUKGVuYWJs ZV9hdmFoaSkKIAogIyBzZXR1cCBhZGRpdGlvbmFsIHBsYXRmb3JtLXNwZWNpZmljIGJpbmFyeSBz ZWFyY2ggUEFUSCBjb21wb25lbnRzCiBwY3BfcGxhdGZvcm1fcGF0aHM9IiIKZGlmZiAtLWdpdCBh L2RlYmlhbi9jb250cm9sIGIvZGViaWFuL2NvbnRyb2wKaW5kZXggNmMyMjJlMi4uOTUwOTYyNiAx MDA2NDQKLS0tIGEvZGViaWFuL2NvbnRyb2wKKysrIGIvZGViaWFuL2NvbnRyb2wKQEAgLTQsNyAr NCw3IEBAIFByaW9yaXR5OiBleHRyYQogSG9tZXBhZ2U6IGh0dHA6Ly9vc3Muc2dpLmNvbS9wcm9q ZWN0cy9wY3AKIE1haW50YWluZXI6IFBDUCBEZXZlbG9wbWVudCBUZWFtIDxwY3BAb3NzLnNnaS5j b20+CiBVcGxvYWRlcnM6IE5hdGhhbiBTY290dCA8bmF0aGFuc0BkZWJpYW4ub3JnPiwgQW5pYmFs IE1vbnNhbHZlIFNhbGF6YXIgPGFuaWJhbEBkZWJpYW4ub3JnPgotQnVpbGQtRGVwZW5kczogYmlz b24sIGZsZXgsIGdhd2ssIHByb2NwcywgZGViaGVscGVyICg+PSA1KSwgcGVybCAoPj0gNS42KSwg bGlicmVhZGxpbmUtZGV2IHwgbGlicmVhZGxpbmU1LWRldiB8IGxpYnJlYWRsaW5lLWdwbHYyLWRl diwgY2hycGF0aCwgbGliYnNkLWRldiBba2ZyZWVic2QtYW55XSwgbGlia3ZtLWRldiBba2ZyZWVi c2QtYW55XSwgcHl0aG9uLWFsbCwgcHl0aG9uLWFsbC1kZXYsIGxpYm5zcHI0LWRldiwgbGlibnNz My1kZXYsIGxpYnNhc2wyLWRldiwgbGlibWljcm9odHRwZC1kZXYKK0J1aWxkLURlcGVuZHM6IGJp c29uLCBmbGV4LCBnYXdrLCBwcm9jcHMsIGRlYmhlbHBlciAoPj0gNSksIHBlcmwgKD49IDUuNiks IGxpYnJlYWRsaW5lLWRldiB8IGxpYnJlYWRsaW5lNS1kZXYgfCBsaWJyZWFkbGluZS1ncGx2Mi1k ZXYsIGNocnBhdGgsIGxpYmJzZC1kZXYgW2tmcmVlYnNkLWFueV0sIGxpYmt2bS1kZXYgW2tmcmVl YnNkLWFueV0sIHB5dGhvbi1hbGwsIHB5dGhvbi1hbGwtZGV2LCBsaWJuc3ByNC1kZXYsIGxpYm5z czMtZGV2LCBsaWJzYXNsMi1kZXYsIGxpYm1pY3JvaHR0cGQtZGV2LCBsaWJhdmFoaS1jb21tb24t ZGV2CiAjQXJjaGl0ZWN0dXJlLWRlcGVuZGVudCAtLSBCdWlsZC1EZXBlbmRzOiBsaWJpYnVtYWQt ZGV2LCBsaWJpYm1hZC1kZXYKIFN0YW5kYXJkcy1WZXJzaW9uOiAzLjkuMwogWC1QeXRob24tVmVy c2lvbjogPj0gMi42CmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9idWlsZGRlZnMuaW4gYi9zcmMv aW5jbHVkZS9idWlsZGRlZnMuaW4KaW5kZXggYzVhYjMxMS4uZTcyMDExMiAxMDA2NDQKLS0tIGEv c3JjL2luY2x1ZGUvYnVpbGRkZWZzLmluCisrKyBiL3NyYy9pbmNsdWRlL2J1aWxkZGVmcy5pbgpA QCAtMTkxLDYgKzE5MSw4IEBAIFJEWU5BTUlDX0ZMQUcgPSBAcmR5bmFtaWNfZmxhZ0AKIEVOQUJM RV9TSEFSRUQgPSBAZW5hYmxlX3NoYXJlZEAKIEVOQUJMRV9TRUNVUkUgPSBAZW5hYmxlX3NlY3Vy ZUAKIEVOQUJMRV9QUk9CRVMgPSBAZW5hYmxlX3Byb2Jlc0AKK0VOQUJMRV9ETlNfU0QgPSBAZW5h YmxlX2Ruc19zZEAKK0VOQUJMRV9BVkFISSAgPSBAZW5hYmxlX2F2YWhpQAogCiAjIGFkZGl0aW9u YWwgbGlicmFyaWVzIG5lZWRlZCBmb3IgcGFydGljdWxhciBmdW5jdGlvbnMKIExJQl9GT1JfQkFT RU5BTUUgPSBAbGliX2Zvcl9iYXNlbmFtZUAKZGlmZiAtLWdpdCBhL3NyYy9saWJwY3Avc3JjL0dO VW1ha2VmaWxlIGIvc3JjL2xpYnBjcC9zcmMvR05VbWFrZWZpbGUKaW5kZXggNTQ3ZTJjYS4uZmNk ZmRhNyAxMDA2NDQKLS0tIGEvc3JjL2xpYnBjcC9zcmMvR05VbWFrZWZpbGUKKysrIGIvc3JjL2xp YnBjcC9zcmMvR05VbWFrZWZpbGUKQEAgLTI3LDIwICsyNywyOCBAQCBDRklMRVMgPSBjb25uZWN0 LmMgY29udGV4dC5jIGRlc2MuYyBlcnIuYyBmZXRjaC5jIGZyZWVyZXN1bHQuYyBcCiAJc3R1ZmZ2 YWx1ZS5jIGVuZGlhbi5jIGNvbmZpZy5jIGF1eGNvbm5lY3QuYyBhdXhzZXJ2ZXIuYyBcCiAJcF9s Y29udHJvbC5jIHBfbHJlcXVlc3QuYyBwX2xzdGF0dXMuYyBsb2djb25uZWN0LmMgbG9nY29udHJv bC5jIFwKIAljb25uZWN0bG9jYWwuYyBkZXJpdmUuYyBkZXJpdmVfZmV0Y2guYyBldmVudHMuYyBs b2NrLmMgaGFzaC5jIFwKLQlmYXVsdC5jIGFjY2Vzcy5jIGF2YWhpLmMKKwlmYXVsdC5jIGFjY2Vz cy5jCiAKIEhGSUxFUyA9IGRlcml2ZS5oIGludGVybmFsLmgKIAogTFNSQ0ZJTEVTID0gY2hlY2st c3RhdGljcwogCiBpZmVxICIkKEVOQUJMRV9TRUNVUkUpIiAidHJ1ZSIKLUxMRExJQlMgKz0gJChM SUJfRk9SX1NTTCkgJChMSUJfRk9SX05TUykgJChMSUJfRk9SX05TUFIpICQoTElCX0ZPUl9TQVNM KSAkKExJQl9GT1JfQVZBSEkpCi1MQ0ZMQUdTICs9ICQoTlNTQ0ZMQUdTKSAkKE5TUFJDRkxBR1Mp ICQoU0FTTENGTEFHUykgJChBVkFISUNGTEFHUykKK0xMRExJQlMgKz0gJChMSUJfRk9SX1NTTCkg JChMSUJfRk9SX05TUykgJChMSUJfRk9SX05TUFIpICQoTElCX0ZPUl9TQVNMKQorTENGTEFHUyAr PSAkKE5TU0NGTEFHUykgJChOU1BSQ0ZMQUdTKSAkKFNBU0xDRkxBR1MpCiBDRklMRVMgKz0gc2Vj dXJlc2VydmVyLmMgc2VjdXJlY29ubmVjdC5jCiBlbHNlCiBMU1JDRklMRVMgKz0gc2VjdXJlc2Vy dmVyLmMgc2VjdXJlY29ubmVjdC5jCiBlbmRpZgogCitpZmVxICIkKEVOQUJMRV9BVkFISSkiICJ0 cnVlIgorTExETElCUyArPSAkKExJQl9GT1JfQVZBSEkpCitMQ0ZMQUdTICs9ICQoQVZBSElDRkxB R1MpCitDRklMRVMgKz0gYXZhaGkuYworZWxzZQorTFNSQ0ZJTEVTICs9IGF2YWhpLmMKK2VuZGlm CisKIGlmbmVxICIkKFRBUkdFVF9PUykiICJtaW5ndyIKIENGSUxFUyArPSBhY2NvdW50cy5jCiBM U1JDRklMRVMgKz0gd2luMzIuYwpkaWZmIC0tZ2l0IGEvc3JjL2xpYnBjcC9zcmMvYXV4c2VydmVy LmMgYi9zcmMvbGlicGNwL3NyYy9hdXhzZXJ2ZXIuYwppbmRleCA5N2IwN2NkLi4zYzJlMmI0IDEw MDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy9hdXhzZXJ2ZXIuYworKysgYi9zcmMvbGlicGNwL3Ny Yy9hdXhzZXJ2ZXIuYwpAQCAtNzUxLDMgKzc1MSwyMyBAQCBfX3BtU2VydmVySGFzRmVhdHVyZShf X3BtU2VydmVyRmVhdHVyZSBxdWVyeSkKIH0KIAogI2VuZGlmIC8qICFIQVZFX1NFQ1VSRV9TT0NL RVRTICovCisKKworI2lmICFkZWZpbmVkKEhBVkVfU0VSVklDRV9ESVNDT1ZFUlkpCisKK19fcG1T ZXJ2ZXJQcmVzZW5jZSAqCitfX3BtU2VydmVyQWR2ZXJ0aXNlUHJlc2VuY2UoY29uc3QgY2hhciAq bmFtZSwgY29uc3QgY2hhciAqdGFnLCBpbnQgcG9ydCkKK3sKKyAgICAodm9pZCluYW1lOworICAg ICh2b2lkKXRhZzsKKyAgICAodm9pZClwb3J0OworICAgIHJldHVybiBOVUxMOworfQorCit2b2lk CitfX3BtU2VydmVyVW5hZHZlcnRpc2VQcmVzZW5jZShfX3BtU2VydmVyUHJlc2VuY2UgKnMpCit7 CisgICAgKHZvaWQpczsKK30KKworI2VuZGlmIC8qICFIQVZFX1NFUlZJQ0VfRElTQ09WRVJZICov CmRpZmYgLS1naXQgYS9zcmMvbGlicGNwL3NyYy9hdmFoaS5jIGIvc3JjL2xpYnBjcC9zcmMvYXZh aGkuYwppbmRleCBkZGI1MWNkLi41ODQ3MThjIDEwMDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy9h dmFoaS5jCisrKyBiL3NyYy9saWJwY3Avc3JjL2F2YWhpLmMKQEAgLTE3LDcgKzE3LDYgQEAKICNp bmNsdWRlICJwbWFwaS5oIgogI2luY2x1ZGUgImltcGwuaCIKIAotI2lmIEhBVkVfQVZBSEkKICNp bmNsdWRlIDxhdmFoaS1jbGllbnQvcHVibGlzaC5oPgogI2luY2x1ZGUgPGF2YWhpLWNvbW1vbi9h bHRlcm5hdGl2ZS5oPgogI2luY2x1ZGUgPGF2YWhpLWNvbW1vbi90aHJlYWQtd2F0Y2guaD4KQEAg LTMwNiwyNSArMzA1LDMgQEAgcHVibGlzaFNlcnZpY2UoY29uc3QgY2hhciAqc2VydmljZU5hbWUs IGNvbnN0IGNoYXIgKnNlcnZpY2VUYWcsIGludCBwb3J0KQogICBmcmVlKHMpOwogICByZXR1cm4g TlVMTDsKIH0KLSNlbmRpZiAvLyBIQVZFX0FWQUhJCi0KLV9fcG1TZXJ2ZXJQcmVzZW5jZSAqCi1f X3BtU2VydmVyQWR2ZXJ0aXNlUHJlc2VuY2UoCi0gICAgY29uc3QgY2hhciAqc2VydmljZU5hbWUg X19hdHRyaWJ1dGVfXyAoKHVudXNlZCkpLAotICAgIGNvbnN0IGNoYXIgKnNlcnZpY2VUYWcgX19h dHRyaWJ1dGVfXyAoKHVudXNlZCkpLAotICAgIGludCBwb3J0IF9fYXR0cmlidXRlX18gKCh1bnVz ZWQpKQotKSB7Ci0jaWYgSEFWRV9BVkFISQotICAgIHJldHVybiBwdWJsaXNoU2VydmljZSAoc2Vy dmljZU5hbWUsIHNlcnZpY2VUYWcsIHBvcnQpOwotI2Vsc2UKLSAgICBfX3BtTm90aWZ5RXJyKExP R19FUlIsICJVbmFibGUgdG8gYWR2ZXJ0aXNlIHByZXNlbmNlIG9uIHRoZSBuZXR3b3JrLiBBdmFo aSBpcyBub3QgYXZhaWxhYmxlIik7Ci0gICAgcmV0dXJuIE5VTEw7Ci0jZW5kaWYKLX0KLQotdm9p ZAotX19wbVNlcnZlclVuYWR2ZXJ0aXNlUHJlc2VuY2UoX19wbVNlcnZlclByZXNlbmNlICpzIF9f YXR0cmlidXRlX18gKCh1bnVzZWQpKSkgewotI2lmIEhBVkVfQVZBSEkKLSAgICBjbGVhbnVwKHMp OwotI2VuZGlmCi19Cg== ------=_Part_12260249_1602409645.1382952619492-- From brolley@redhat.com Mon Oct 28 13:29:57 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 3F8DA7F3F for ; Mon, 28 Oct 2013 13:29:57 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 9806E8F8070 for ; Mon, 28 Oct 2013 11:29:40 -0700 (PDT) X-ASG-Debug-ID: 1382984979-04cbb00ddd1e1050001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id dJO1iDYiPsRyefHG for ; Mon, 28 Oct 2013 11:29:39 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9SITd48005712 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 28 Oct 2013 14:29:39 -0400 Received: from [10.10.63.94] (vpn-63-94.rdu2.redhat.com [10.10.63.94]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9SITccb016070 for ; Mon, 28 Oct 2013 14:29:39 -0400 Message-ID: <526EAD12.3090904@redhat.com> Date: Mon, 28 Oct 2013 14:29:38 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers In-Reply-To: <5251DF3C.7040805@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1382984979 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Hi, Based on feedback received by email I have reworked the code. The work has been pushed to the brolley/dev branch of pcpfans. As of now, these are the relevant, unmerged commits, although the entire branch should be merge-able. Dave ----------------------------------------------------- commit 97b1d9e75832624b0d1250b9d23513125fbdbf90 Author: Dave Brolley Date: Mon Oct 28 12:46:24 2013 -0400 Configuration enhancements for dns-sd from nathans. Also a few tweaks to make it merge cleanly with the current code. commit c554195887ace7d3c5007be893ffe8d0c539db92 Author: Dave Brolley Date: Mon Oct 28 11:10:44 2013 -0400 Rework libpcp support for servers to announce their presence on the network. - Plug the leak of avahi-ness in the API: - abstracted __pmServerPresence to be an opaque struct which can contain information about multiple broadcast methods. Currently only avahi is represented. The server need not be aware of which one(s) are available/active. - Replaced __pmServerSetServiceName() and __pmServerSetServiceTag() with __pmServerSetServiceSpec(const char *). The argument is a string which identifies the service to be advertised. Currently, it is simply the name of the server (e.g. "pmcd"). - __pmServerAdvertisePresence() can now use multiple methods (currently only avahi) to advertise the server. Similarly, __pmServerUnadvertisePresence() can clean up all of the active announcements. commit 2c2bb7e60f8229076ac1ca5b43435d412e55168e Author: Dave Brolley Date: Mon Oct 21 10:38:28 2013 -0400 Reformat code to eliminate long source lines. commit 5cdeaa18b367a16d80a1a6066116d74749281929 Author: Dave Brolley Date: Mon Oct 7 16:21:55 2013 -0400 libpcp support for servers to advertise on the local network. - Support is provided by Avahi, where available and otherwise disabled. - Servers indicate that they want to advertise their presence by calling __pmServerSetServiceName() and/or __pmServerSetServiceTag(). When one or both of these functions has been called before __pmServerOpenRequestPorts(), then __pmServerOpenRequestPorts() will advertise the server once for each port it is listening on. The service for each port will be unadvertised when __pmCloseRequestPorts() is called or when the server shuts down. - Servers may also advertise themselves directly by calling __pmServerAdvertisePresence()/__pmServerUnadvertisePresence() This code is accessed via the new API functions __pmServerAdvertisePresence() and __pmServerUnadvertisePresence() From brolley@redhat.com Mon Oct 28 13:55:00 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id D62A87F3F for ; Mon, 28 Oct 2013 13:55:00 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id BD1DD304062 for ; Mon, 28 Oct 2013 11:55:00 -0700 (PDT) X-ASG-Debug-ID: 1382986499-04cb6c40d5329730001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id ym6QoglrKP1H2iu8 for ; Mon, 28 Oct 2013 11:54:59 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9SIswr5025439 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 28 Oct 2013 14:54:59 -0400 Received: from [10.10.63.94] (vpn-63-94.rdu2.redhat.com [10.10.63.94]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9SIswhZ027426 for ; Mon, 28 Oct 2013 14:54:58 -0400 Message-ID: <526EB301.5090501@redhat.com> Date: Mon, 28 Oct 2013 14:54:57 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> <526EAD12.3090904@redhat.com> X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers In-Reply-To: <526EAD12.3090904@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1382986499 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 I forgot to mention that there is some qa fallout associated with new messages in the pmcd log that I still need to address. Dave On 10/28/2013 02:29 PM, Dave Brolley wrote: > Hi, > > Based on feedback received by email I have reworked the code. The work > has been pushed to the brolley/dev branch of pcpfans. As of now, these > are the relevant, unmerged commits, although the entire branch should > be merge-able. > > Dave > > ----------------------------------------------------- > > commit 97b1d9e75832624b0d1250b9d23513125fbdbf90 > Author: Dave Brolley > Date: Mon Oct 28 12:46:24 2013 -0400 > > Configuration enhancements for dns-sd from nathans. > > Also a few tweaks to make it merge cleanly with the current > code. > > commit c554195887ace7d3c5007be893ffe8d0c539db92 > Author: Dave Brolley > Date: Mon Oct 28 11:10:44 2013 -0400 > > Rework libpcp support for servers to announce their presence on > the network. > > - Plug the leak of avahi-ness in the API: > - abstracted __pmServerPresence to be an opaque struct which > can contain information about multiple broadcast methods. > Currently only avahi is represented. The server need not be > aware of which one(s) are available/active. > - Replaced __pmServerSetServiceName() and __pmServerSetServiceTag() > with __pmServerSetServiceSpec(const char *). The argument is > a string which identifies the service to be advertised. > Currently, > it is simply the name of the server (e.g. "pmcd"). > > - __pmServerAdvertisePresence() can now use multiple methods > (currently only avahi) to advertise the server. Similarly, > __pmServerUnadvertisePresence() can clean up all of the > active announcements. > > commit 2c2bb7e60f8229076ac1ca5b43435d412e55168e > Author: Dave Brolley > Date: Mon Oct 21 10:38:28 2013 -0400 > > Reformat code to eliminate long source lines. > > commit 5cdeaa18b367a16d80a1a6066116d74749281929 > Author: Dave Brolley > Date: Mon Oct 7 16:21:55 2013 -0400 > > libpcp support for servers to advertise on the local network. > > - Support is provided by Avahi, where available and otherwise > disabled. > - Servers indicate that they want to advertise their presence by > calling __pmServerSetServiceName() and/or > __pmServerSetServiceTag(). > When one or both of these functions has been called before > __pmServerOpenRequestPorts(), then __pmServerOpenRequestPorts() > will > advertise the server once for each port it is listening on. The > service > for each port will be unadvertised when __pmCloseRequestPorts() is > called or when the server shuts down. > - Servers may also advertise themselves directly by calling > __pmServerAdvertisePresence()/__pmServerUnadvertisePresence() > > This code is accessed via the new API functions > __pmServerAdvertisePresence() and __pmServerUnadvertisePresence() > > _______________________________________________ > pcp mailing list > pcp@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/pcp From MAILER-DAEMON Tue Oct 29 00:02:44 2013 Return-Path: <> X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.5 required=5.0 tests=LOTS_OF_MONEY,SUBJ_ALL_CAPS, T_FRT_CONTACT autolearn=no version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 1482F7F3F for ; Tue, 29 Oct 2013 00:02:44 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id CB57A8F8052 for ; Mon, 28 Oct 2013 22:02:40 -0700 (PDT) X-ASG-Debug-ID: 1383022955-04bdf0789a35f8c0001-S8gJnT Received: from na01-bl2-obe.outbound.protection.outlook.com (na01-bl2-ndr.ptr.protection.outlook.com [157.55.133.105]) by cuda.sgi.com with ESMTP id ZrxUlxIyJLd57FHq (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO) for ; Mon, 28 Oct 2013 22:02:35 -0700 (PDT) X-Barracuda-Envelope-From: X-Barracuda-Apparent-Source-IP: 157.55.133.105 Received: from [116.203.104.253] (116.203.104.253) by BN1PR02MB118.namprd02.prod.outlook.com (10.255.204.19) with Microsoft SMTP Server (TLS) id 15.0.800.7; Tue, 29 Oct 2013 05:02:28 +0000 Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Description: Mail message body Subject: KANN ICH DEPONIEREN 18.000.000,00 GBP IN IHREM KONTO ? To: Recipients X-ASG-Orig-Subj: KANN ICH DEPONIEREN 18.000.000,00 GBP IN IHREM KONTO ? From: jacqueline murchie Date: Tue, 29 Oct 2013 10:32:11 +0530 Reply-To: Message-ID: <619193b8-ef85-4ade-b3b6-306351c3e5fe@BN1PR02MB118.namprd02.prod.outlook.com> X-Originating-IP: [116.203.104.253] X-ClientProxiedBy: DM2PR07CA001.namprd07.prod.outlook.com (10.141.96.47) To BN1PR02MB118.namprd02.prod.outlook.com (10.255.204.19) X-Forefront-PRVS: 0014E2CF50 X-Forefront-Antispam-Report: SFV:SPM;SFS:(199002)(189002)(43066001)(66066001)(79102001)(561924002)(74366001)(54356001)(42186004)(15202345003)(80022001)(65816001)(74502001)(63696002)(47776003)(23756003)(74316001)(74662001)(223593001)(47446002)(47736001)(49866001)(47976001)(76176001)(50986001)(81686001)(81816001)(54316002)(76796001)(76576001)(76786001)(56816003)(56776001)(77096001)(76482001)(4396001)(69226001)(19580395003)(19580405001)(83322001)(81542001)(33646001)(81342001)(325944007)(15975445006)(77982001)(80976001)(46102001)(53256004)(85306002)(59766001)(74706001)(50466002)(74876001)(51856001)(83072001)(31686002)(87266001)(62346009)(42262001)(84742001);DIR:OUT;SFP:1501;SCL:5;SRVR:BN1PR02MB118;H:[116.203.104.253];CLIP:116.203.104.253;FPR:;RD:InfoNoRecords;A:0;MX:1;LANG:de; X-OriginatorOrg: taa264.onmicrosoft.com X-Barracuda-Connect: na01-bl2-ndr.ptr.protection.outlook.com[157.55.133.105] X-Barracuda-Start-Time: 1383022955 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 2.32 X-Barracuda-Spam-Status: No, SCORE=2.32 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_ADDR_MATCH, BSF_SC5_SA210e, EMPTY_ENV_FROM, SUBJ_ALL_CAPS, SUBJ_ALL_CAPS_2 X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141873 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 EMPTY_ENV_FROM Empty Envelope From Address 0.01 SUBJ_ALL_CAPS Subject is all capitals 1.81 SUBJ_ALL_CAPS_2 SUBJ_ALL_CAPS_2 0.00 BSF_SC5_SA210e Custom Rule SA210e 0.50 BSF_SC0_SA_TO_FROM_ADDR_MATCH Sender Address Matches Recipient Address Guten Tag , Bitte nehmen Sie meine aufrichtigen Entschuldigungen an, wenn meine E-mail = Ihre pers=F6nliche Ethik nicht trifft. F=FCr ich wei=DF, dass dies wie ein vollst=E4ndiges Eindringen zu Ihrer Ruh= e scheinen kann, aber zurzeit ,dies ist meine Option f=FCr Kommunikation zu= Ihnen. Dies k=F6nnte fremd oder wahrscheinlich unwahr scheinen,wegen der Hoehe von= Ausschuss E-mail,die wir t=E4glich empfangen, aber ich glaube, dass dies n= och der echteste Weg ist, einen wahren Charakter zu kontaktieren.Ich heisse= Frau Jacqueline Benett-Baggs Murchie {Eine Vereinigten Staaten von amerika= nischer Frau},eine Witwe zu Sp=E4tem Herrn Benett-Baggs Murchie {Mein Ehema= nn hat mit einem =F6l refinary Lukoil in Russland f=FCr 31 Jahre gearbeitet= } Vor seinem tragischen Tod in Japan 11. M=E4rz. 2011. Mein Ehemann war auf einer Gesch=E4ftsreise nach Japan Wenn der h=E4ssliche= Vorfall, der ihn von mir weggenommen hat, gestreikt hat. Hier ist eine Ver= bindung f=FCr Fotos der Katastrophe {http://www.boston.com/bigpicture/2011/= 03/massive_earthquake_hits_japan.html}Ich bin 74years alt und leide an lang= e Zeit Krebs von der Speiser=F6hre. Ich bin jetzt im Krankenhaus {NCI Hospi= tal PT 13717, Jalan BBN 2/1, Putra Nilai, Negeri Sembilan, 71800], Malaysia. Von allen Anzeigen verschlechtert sich meine Bedingung wirklich und es ist = ziemlich offensichtlich, dass ich mehr als zwei Monate {gem=E4=DF medizinis= chen Berichten von einem Arzt}nicht leben werde.Dies ist, weil die Krebspha= se zu einer sehr schlechten Phase erreichen hat.Mein sp=E4ter Ehemann war s= ehr wohlhabend und reich und nach seinem Tod,ich habe alle sein Gesch=E4ft = und Reichtum geerbt. Mein Ehemann hat die Summe von =A318.000.000,00 GBP mit einer Bank in Schot= tland deponiert, Mein Ehemann und ich haben geplant, dieses Geld Zu Benutze= n, Und =D6ffnungs-h=F6he Eine Gewebefirma Vor Dem Japan Tsunami Krise. Mein= Ehemann hat mich der Nutznie=DFer des Treuhandverm=F6gens genannt, weil wi= r keine Kinder gehabt haben. Da ich nichts habe, f=FCr mehr zu leben.Der Arzt hat mir geraten,dass ich f= =FCr mehr als zwei Monate nicht leben kann,so habe ich mich jetzt entschied= en, Teil von diesem Reichtum zu teilen,zur Entwicklung von dem wenigen priv= ilegierten Leute in Europa beizutragen,da dies die Wunsch von meinem Eheman= n Herrn Benett-Baggs Murchie bevor seinem Tod ist. Ich habe Behandlung f=FCr meinen =F6sophagealen Krebs erlebt. Ich habe, da = meine F=E4higkeit verloren hat, zu reden, und meine =C4rzte haben mir erz= =E4hlt, dass ich nur ein paar Wochen habe, zu leben.Des meines Ehemanns Fam= ilienwunsch mich Verstorbene Um diesen Reichtum zu erlangen. Ich kann mit d= er Qual nicht leben, von dieser riesigen Verantwortung zu welchem des meine= s sp=E4ten Ehemanns Familienmitglieds anzuvertrauen Weil sie Ungl=E4ubigen = sind. Ich will diesen Fonds, zu WOHLT=C4TIGKEITEN ORGANISATIONEN verteilt z= u werden. Bitte, Ich will Sie, mir Vertreter zu helfen, als der Nutznie=DFe= r, die Fonds von der Bank zu sammeln und verteilen Sie zu Wohlt=E4tigkeit. Ich bete ehrlich,dass dieses Geld,wenn es zu Ihnen =FCberweist ist,sollen S= ie versichern,dass es f=FCr den gesagten Zweck benutzt werden muss.Weil ich= darauf gekommen bin,dass jene Reichtumerwerbung ohne Christus zu erfahren,= ist Eitelkeit auf Eitelkeit.F=FCr Ihre Hilfe,habe ich 30% von diesem gesam= ten Geld {=A318.000.000,00}f=FCr Sie gelegt, auf Grund Ihrer pers=F6nlichen= Bem=FChung, die Sie f=FCr Ihren pers=F6nlichen Gebrauch sofort das Geld au= f Sie =FCberweist ist, abziehenwerden.Zuletzt,ich bete und hoffe, dass wenn= das Geld schlie=DFlich auf Sie =FCberweisen ist, werden Sie es umsichtig g= em=E4=DF meinem Willen und Gott benutzen {der 70% vom Geld zum wenigen priv= ilegierten in Europa zu spenden}. Ihres in Christus. Frau Jacqueline Benett-Baggs Murchie E-MAIL : jacquelinemurchie@gmail.com From nscott@redhat.com Tue Oct 29 02:42:15 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 52A697F3F for ; Tue, 29 Oct 2013 02:42:15 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id E24B0AC05E for ; Tue, 29 Oct 2013 00:42:11 -0700 (PDT) X-ASG-Debug-ID: 1383032523-04bdf07898367df0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id 129vEMtRawrFcX60 for ; Tue, 29 Oct 2013 00:42:03 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9T7g27c019036; Tue, 29 Oct 2013 03:42:02 -0400 Date: Tue, 29 Oct 2013 03:42:02 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <1159676587.13325334.1383032522252.JavaMail.root@redhat.com> In-Reply-To: <526EB301.5090501@redhat.com> References: <5251DF3C.7040805@redhat.com> <526EAD12.3090904@redhat.com> <526EB301.5090501@redhat.com> Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers Content-Type: multipart/mixed; boundary="----=_Part_13325332_1782278418.1383032522248" X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: First Cut at Avahi Support for PCP Servers Thread-Index: Cmqz5xq1GVy1jZ/wssd01jjnDyPpAg== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1383032523 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141875 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ------=_Part_13325332_1782278418.1383032522248 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Hi Dave, ----- Original Message ----- > On 10/28/2013 02:29 PM, Dave Brolley wrote: > > Hi, > > > > Based on feedback received by email I have reworked the code. The work > > has been pushed to the brolley/dev branch of pcpfans. As of now, these > > are the relevant, unmerged commits, although the entire branch should > > be merge-able. > > I forgot to mention that there is some qa fallout associated with new > messages in the pmcd log that I still need to address. > Attached patch tackles the build-configuration detection issue - as discussed on IRC, be good to use this in that new QA test ... $ pmconfig -L pcp_version=3.8.6 pmapi_version=2 nss_version=3.13.6.0 nspr_version=4.9.2 sasl_version=2.1.23 multi_threaded=true fault_injection=false secure_sockets=true ipv6=true authentication=true unix_domain_sockets=true static_probes=true service_discovery=true Please review & merge as you see fit. Oh, had some build failures on your dev branch wrt multiple definitions of some typedefs, fixed here as well. Also, be good to give the new Avahi code a quick read over from a code consistency POV, its a bit all over the place (even relative to itself, but also the rest of libpcp). cheers. -- Nathan ------=_Part_13325332_1782278418.1383032522248 Content-Type: text/x-patch; name=discovery.patch Content-Disposition: attachment; filename=discovery.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2J1aWxkL3JwbS9HTlVtYWtlZmlsZSBiL2J1aWxkL3JwbS9HTlVtYWtlZmls ZQppbmRleCAwZGNhZjQ5Li41MjJiNmEwIDEwMDY0NAotLS0gYS9idWlsZC9ycG0vR05VbWFrZWZp bGUKKysrIGIvYnVpbGQvcnBtL0dOVW1ha2VmaWxlCkBAIC02NCw3ICs2NCw3IEBAIHBjcC5zcGVj OiBwY3Auc3BlYy5pbgogCSAgICAtZSdzfEBwbWRhX2luZmluaWJhbmRAfCQoUE1EQV9JTkZJTklC QU5EKXxnJyBcCiAJICAgIC1lJ3N8QGVuYWJsZV9zZWN1cmVAfCQoRU5BQkxFX1NFQ1VSRSl8Zycg XAogCSAgICAtZSdzfEBlbmFibGVfcHJvYmVzQHwkKEVOQUJMRV9QUk9CRVMpfGcnIFwKLQkgICAg LWUnc3xAZW5hYmxlX2Ruc19zZEB8JChFTkFCTEVfRE5TX1NEKXxnJyBcCisJICAgIC1lJ3N8QGVu YWJsZV9hdmFoaUB8JChFTkFCTEVfQVZBSEkpfGcnIFwKIAkgICAgLWUic3xAYnVpbGRfcm9vdEB8 JCR7RElTVF9ST09UfXxnIiBcCiAJICAgIC1lJ3N8QHBjcF9zeXNjb25mX2RpckB8JChQQ1BfU1lT Q09ORl9ESVIpfGcnIFwKIAkgICAgLWUnc3xAcGNwX2xvZ19kaXJAfCQoUENQX0xPR19ESVIpfGcn IFwKZGlmZiAtLWdpdCBhL2J1aWxkL3JwbS9wY3Auc3BlYy5pbiBiL2J1aWxkL3JwbS9wY3Auc3Bl Yy5pbgppbmRleCBlOGU2MTgzLi4zYzViMGI2IDEwMDY0NAotLS0gYS9idWlsZC9ycG0vcGNwLnNw ZWMuaW4KKysrIGIvYnVpbGQvcnBtL3BjcC5zcGVjLmluCkBAIC0xMyw3ICsxMyw3IEBAIEJ1aWxk UmVxdWlyZXM6IHB5dGhvbi1kZXZlbAogQnVpbGRSZXF1aXJlczogbmN1cnNlcy1kZXZlbAogQnVp bGRSZXF1aXJlczogcmVhZGxpbmUtZGV2ZWwKIEJ1aWxkUmVxdWlyZXM6IHBlcmwoRXh0VXRpbHM6 Ok1ha2VNYWtlcikKLSVpZiAiQGVuYWJsZV9kbnNfc2RAIiA9PSAidHJ1ZSIKKyVpZiAiQGVuYWJs ZV9hdmFoaUAiID09ICJ0cnVlIgogQnVpbGRSZXF1aXJlczogYXZhaGktZGV2ZWwKICVlbmRpZgog JWlmICJAZW5hYmxlX3NlY3VyZUAiID09ICJ0cnVlIgpkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIv Y29uZmlndXJlCmluZGV4IDg2NjQ4OTAuLjBkYzFiYjIgMTAwNzU1Ci0tLSBhL2NvbmZpZ3VyZQor KysgYi9jb25maWd1cmUKQEAgLTc3NCw3ICs3NzQsNyBAQCBQQUNLQUdFX01JTk9SCiBQQUNLQUdF X01BSk9SCiBwY3BfcGxhdGZvcm1fcGF0aHMKIGVuYWJsZV9hdmFoaQotZW5hYmxlX2Ruc19zZAor ZW5hYmxlX2Rpc2NvdmVyeQogbGliX2Zvcl9hdmFoaQogYXZhaGlfTElCUwogYXZhaGlfQ0ZMQUdT CkBAIC04NTksNyArODU5LDcgQEAgd2l0aF9zdGF0aWNfcHJvYmVzCiB3aXRoX2luZmluaWJhbmQK IHdpdGhfdXNlcgogd2l0aF9ncm91cAotd2l0aF9kbnNfc2QKK3dpdGhfZGlzY292ZXJ5CiBlbmFi bGVfc3NwCiBlbmFibGVfcGllCiBlbmFibGVfc2hhcmVkCkBAIC0xNTI4LDggKzE1MjgsNyBAQCBP cHRpb25hbCBQYWNrYWdlczoKICAgLS13aXRoLXVzZXIgICAgICAgICAgICAgdXNlciBhY2NvdW50 IHVuZGVyIHdoaWNoIGRhZW1vbnMgcnVuIChkZWZhdWx0IGlzCiAgICAgICAgICAgICAgICAgICAg ICAgICAgIHBjcCkKICAgLS13aXRoLWdyb3VwICAgICAgICAgICAgdXNlciBncm91cCB1bmRlciB3 aGljaCBkYWVtb25zIHJ1biAoZGVmYXVsdCBpcyBwY3ApCi0gIC0td2l0aC1kbnMtc2QgICAgICAg ICAgIGVuYWJsZSBzdXBwb3J0IGZvciBETlMgU2VydmljZSBEaXNjb3ZlcnkgKGRlZmF1bHQgaXMK LSAgICAgICAgICAgICAgICAgICAgICAgICAgb24pCisgIC0td2l0aC1kaXNjb3ZlcnkgICAgICAg IGVuYWJsZSBzdXBwb3J0IGZvciBzZXJ2aWNlIGRpc2NvdmVyeSAoZGVmYXVsdCBpcyBvbikKICAg LS13aXRoLWNvbmZpZ2RpciAgICAgICAgY29uZmlndXJhdGlvbiBkaXJlY3RvcnkgW0xPQ0FMU1RB VEVESVIvcGNwL2NvbmZpZ10KICAgLS13aXRoLXBlcmxfaW5zdGFsbGRpcnMgcGVybCBpbnN0YWxs ZGlycyBbdmVuZG9yXQogICAtLXdpdGgtcGVybF9pbnN0YWxsX2Jhc2UKQEAgLTI0ODEsMTEgKzI0 ODAsMTEgQEAgZmkKIAogCiAKLSMgQ2hlY2sgd2hldGhlciAtLXdpdGgtZG5zLXNkIHdhcyBnaXZl bi4KLWlmIHRlc3QgIiR7d2l0aF9kbnNfc2Qrc2V0fSIgPSBzZXQ7IHRoZW4gOgotICB3aXRodmFs PSR3aXRoX2Ruc19zZDsgZG9fZG5zX3NkPSR3aXRodmFsOyBQQUNLQUdFX0NPTkZJR1VSRT0iJFBB Q0tBR0VfQ09ORklHVVJFIC0td2l0aC1kbnMtc2Q9JHdpdGh2YWwiCisjIENoZWNrIHdoZXRoZXIg LS13aXRoLWRpc2NvdmVyeSB3YXMgZ2l2ZW4uCitpZiB0ZXN0ICIke3dpdGhfZGlzY292ZXJ5K3Nl dH0iID0gc2V0OyB0aGVuIDoKKyAgd2l0aHZhbD0kd2l0aF9kaXNjb3Zlcnk7IGRvX2Rpc2NvdmVy eT0kd2l0aHZhbDsgUEFDS0FHRV9DT05GSUdVUkU9IiRQQUNLQUdFX0NPTkZJR1VSRSAtLXdpdGgt ZGlzY292ZXJ5PSR3aXRodmFsIgogZWxzZQotICBkb19kbnNfc2Q9Y2hlY2sKKyAgZG9fZGlzY292 ZXJ5PWNoZWNrCiBmaQogCiAKQEAgLTQxOTAsNyArNDE4OSw3IEBAICRhc19lY2hvICJubyIgPiY2 OyB9CiAJCVBLR19DT05GSUc9IiIKIAlmaQogZmkKLWlmIHRlc3QgIngkZG9fZG5zX3NkIiAhPSAi eG5vIjsgdGhlbiA6CitpZiB0ZXN0ICJ4JGRvX2Rpc2NvdmVyeSIgIT0gInhubyI7IHRoZW4gOgog CiAgICAgIyBvbiBNYWMgT1MgWCwgZG5zX3NkLmgKIApAQCAtNDM2NCwxMyArNDM2MywxOCBAQCBk b25lCiAKIAkkYXNfZWNobyAiI2RlZmluZSBIQVZFX0FWQUhJIDEiID4+Y29uZmRlZnMuaAogCi0J ZW5hYmxlX2Ruc19zZD10cnVlCisJZW5hYmxlX2Rpc2NvdmVyeT10cnVlCiAgICAgZmkKIAotICAg IGlmIHRlc3QgIiRkb19kbnNfc2QiICE9ICJjaGVjayIgLWEgIiRlbmFibGVfZG5zX3NkIiAhPSAi dHJ1ZSIKKyAgICBpZiB0ZXN0ICIkZG9fZGlzY292ZXJ5IiAhPSAiY2hlY2siIC1hICIkZW5hYmxl X2Rpc2NvdmVyeSIgIT0gInRydWUiCiAgICAgdGhlbgogICAgICAgICBhc19mbl9lcnJvciAkPyAi Y2Fubm90IGVuYWJsZSBETlMtU0QgLSBubyBwbGF0Zm9ybSBzdXBwb3J0IiAiJExJTkVOTyIgNQog ICAgIGZpCisgICAgaWYgdGVzdCAiJGVuYWJsZV9kaXNjb3ZlcnkiID0gInRydWUiCisgICAgdGhl bgorICAgICAgICAkYXNfZWNobyAiI2RlZmluZSBIQVZFX1NFUlZJQ0VfRElTQ09WRVJZIDEiID4+ Y29uZmRlZnMuaAorCisgICAgZmkKIAogZmkKIApkaWZmIC0tZ2l0IGEvY29uZmlndXJlLmluIGIv Y29uZmlndXJlLmluCmluZGV4IDg0N2Q2OWEuLjc3NTkyMjAgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3Vy ZS5pbgorKysgYi9jb25maWd1cmUuaW4KQEAgLTc4LDExICs3OCwxMSBAQCBBQ19BUkdfV0lUSCgK ICAgICBbcGNwX2dyb3VwPXBjcF0pCiBBQ19TVUJTVChwY3BfZ3JvdXApCiAKLUFDX0FSR19XSVRI KFtkbnMtc2RdLAotICAgIFtBQ19IRUxQX1NUUklORyhbLS13aXRoLWRucy1zZF0sCi0gICAgICAg ICAgICAgICAgICAgW2VuYWJsZSBzdXBwb3J0IGZvciBETlMgU2VydmljZSBEaXNjb3ZlcnkgKGRl ZmF1bHQgaXMgb24pXSldLAotICAgIFtkb19kbnNfc2Q9JHdpdGh2YWw7IFBBQ0tBR0VfQ09ORklH VVJFPSIkUEFDS0FHRV9DT05GSUdVUkUgLS13aXRoLWRucy1zZD0kd2l0aHZhbCJdLAotICAgIFtk b19kbnNfc2Q9Y2hlY2tdKQorQUNfQVJHX1dJVEgoW2Rpc2NvdmVyeV0sCisgICAgW0FDX0hFTFBf U1RSSU5HKFstLXdpdGgtZGlzY292ZXJ5XSwKKyAgICAgICAgICAgICAgICAgICBbZW5hYmxlIHN1 cHBvcnQgZm9yIHNlcnZpY2UgZGlzY292ZXJ5IChkZWZhdWx0IGlzIG9uKV0pXSwKKyAgICBbZG9f ZGlzY292ZXJ5PSR3aXRodmFsOyBQQUNLQUdFX0NPTkZJR1VSRT0iJFBBQ0tBR0VfQ09ORklHVVJF IC0td2l0aC1kaXNjb3Zlcnk9JHdpdGh2YWwiXSwKKyAgICBbZG9fZGlzY292ZXJ5PWNoZWNrXSkK IAogIwogIyBOb3RlOiB0aGUgZm9sbG93aW5nIGVudmlyb25tZW50IHZhcmlhYmxlcyBtYXkgYmUK QEAgLTI0OCw4ICsyNDgsOCBAQCB0aGVuCiAgICAgQUNfU1VCU1QoRFRSQUNFKQogZmkKIAotZG5s IENoZWNrIGZvciBETlMtU0QgKFNlcnZpY2UgRGlzY292ZXJ5KQotQVNfSUYoW3Rlc3QgIngkZG9f ZG5zX3NkIiAhPSAieG5vIl0sIFsKK2RubCBDaGVjayBmb3Igc2VydmljZSBkaXNjb3ZlcnkgbWVj aGFuaXNtcyAoRE5TLVNELCBBdmFoaSkKK0FTX0lGKFt0ZXN0ICJ4JGRvX2Rpc2NvdmVyeSIgIT0g InhubyJdLCBbCiAgICAgIyBvbiBNYWMgT1MgWCwgZG5zX3NkLmgKIAogICAgICMgb24gTGludXgs IGFsb2hhIEF2YWhpCkBAIC0yNjcsMTUgKzI2NywxOSBAQCBBU19JRihbdGVzdCAieCRkb19kbnNf c2QiICE9ICJ4bm8iXSwgWwogCUFDX1NVQlNUKGxpYl9mb3JfYXZhaGkpCiAJQUNfU1VCU1QoYXZh aGlfQ0ZMQUdTKQogCUFDX0RFRklORShIQVZFX0FWQUhJKQotCWVuYWJsZV9kbnNfc2Q9dHJ1ZQor CWVuYWJsZV9kaXNjb3Zlcnk9dHJ1ZQogICAgIGZpCiAKLSAgICBpZiB0ZXN0ICIkZG9fZG5zX3Nk IiAhPSAiY2hlY2siIC1hICIkZW5hYmxlX2Ruc19zZCIgIT0gInRydWUiCisgICAgaWYgdGVzdCAi JGRvX2Rpc2NvdmVyeSIgIT0gImNoZWNrIiAtYSAiJGVuYWJsZV9kaXNjb3ZlcnkiICE9ICJ0cnVl IgogICAgIHRoZW4KLSAgICAgICAgQUNfTVNHX0VSUk9SKGNhbm5vdCBlbmFibGUgRE5TLVNEIC0g bm8gcGxhdGZvcm0gc3VwcG9ydCkKKwlBQ19NU0dfRVJST1IoY2Fubm90IGVuYWJsZSBzZXJ2aWNl IGRpc2NvdmVyeSAtIG5vIHN1cHBvcnRlZCBtZWNoYW5pc21zKQorICAgIGZpCisgICAgaWYgdGVz dCAiJGVuYWJsZV9kaXNjb3ZlcnkiID0gInRydWUiCisgICAgdGhlbgorCUFDX0RFRklORShIQVZF X1NFUlZJQ0VfRElTQ09WRVJZKQogICAgIGZpCiBdKQotQUNfU1VCU1QoZW5hYmxlX2Ruc19zZCkK K0FDX1NVQlNUKGVuYWJsZV9kaXNjb3ZlcnkpCiBBQ19TVUJTVChlbmFibGVfYXZhaGkpCiAKICMg c2V0dXAgYWRkaXRpb25hbCBwbGF0Zm9ybS1zcGVjaWZpYyBiaW5hcnkgc2VhcmNoIFBBVEggY29t cG9uZW50cwpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvYnVpbGRkZWZzLmluIGIvc3JjL2luY2x1 ZGUvYnVpbGRkZWZzLmluCmluZGV4IGU3MjAxMTIuLmI1YTNjOGEgMTAwNjQ0Ci0tLSBhL3NyYy9p bmNsdWRlL2J1aWxkZGVmcy5pbgorKysgYi9zcmMvaW5jbHVkZS9idWlsZGRlZnMuaW4KQEAgLTE5 MSw3ICsxOTEsNiBAQCBSRFlOQU1JQ19GTEFHID0gQHJkeW5hbWljX2ZsYWdACiBFTkFCTEVfU0hB UkVEID0gQGVuYWJsZV9zaGFyZWRACiBFTkFCTEVfU0VDVVJFID0gQGVuYWJsZV9zZWN1cmVACiBF TkFCTEVfUFJPQkVTID0gQGVuYWJsZV9wcm9iZXNACi1FTkFCTEVfRE5TX1NEID0gQGVuYWJsZV9k bnNfc2RACiBFTkFCTEVfQVZBSEkgID0gQGVuYWJsZV9hdmFoaUAKIAogIyBhZGRpdGlvbmFsIGxp YnJhcmllcyBuZWVkZWQgZm9yIHBhcnRpY3VsYXIgZnVuY3Rpb25zCmRpZmYgLS1naXQgYS9zcmMv aW5jbHVkZS9wY3AvY29uZmlnLmguaW4gYi9zcmMvaW5jbHVkZS9wY3AvY29uZmlnLmguaW4KaW5k ZXggZDBiM2U3OS4uOWY2OWZmNSAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvcGNwL2NvbmZpZy5o LmluCisrKyBiL3NyYy9pbmNsdWRlL3BjcC9jb25maWcuaC5pbgpAQCAtMTkzLDggKzE5Myw5IEBA IGV4dGVybiAiQyIgewogCiAvKiBkZWZpbmUgd2hpY2ggbGlicmFyaWVzIGFyZSBhdmFpbGFibGUg Ki8KICN1bmRlZiBIQVZFX1NFQ1VSRV9TT0NLRVRTCi0jdW5kZWYgSEFWRV9BVkFISQogI3VuZGVm IEhBVkVfU1RBVElDX1BST0JFUworI3VuZGVmIEhBVkVfU0VSVklDRV9ESVNDT1ZFUlkKKyN1bmRl ZiBIQVZFX0FWQUhJCiAjdW5kZWYgSEFWRV9MSUJSRUdFWAogI3VuZGVmIEhBVkVfUkVBRExJTkUK IApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvcGNwL2ltcGwuaCBiL3NyYy9pbmNsdWRlL3BjcC9p bXBsLmgKaW5kZXggZjdhYTFjYy4uNzE0ZTg3MyAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvcGNw L2ltcGwuaAorKysgYi9zcmMvaW5jbHVkZS9wY3AvaW1wbC5oCkBAIC02NDQsMTEgKzY0NCwxMCBA QCB0eXBlZGVmIGVudW0gewogICAgIFBNX1NFUlZFUl9GRUFUVVJFX0FVVEgsCiAgICAgUE1fU0VS VkVSX0ZFQVRVUkVfQ1JFRFNfUkVRRCwKICAgICBQTV9TRVJWRVJfRkVBVFVSRV9VTklYX0RPTUFJ TiwKKyAgICBQTV9TRVJWRVJfRkVBVFVSRV9ESVNDT1ZFUlksCiAgICAgUE1fU0VSVkVSX0ZFQVRV UkVTCiB9IF9fcG1TZXJ2ZXJGZWF0dXJlOwogCi10eXBlZGVmIHN0cnVjdCBfX3BtU2VydmVyUHJl c2VuY2UgX19wbVNlcnZlclByZXNlbmNlOwotCiBleHRlcm4gaW50IF9fcG1TZXJ2ZXJIYXNGZWF0 dXJlKF9fcG1TZXJ2ZXJGZWF0dXJlKTsKIGV4dGVybiBpbnQgX19wbVNlcnZlclNldEZlYXR1cmUo X19wbVNlcnZlckZlYXR1cmUpOwogZXh0ZXJuIGludCBfX3BtU2VydmVyQWRkUG9ydHMoY29uc3Qg Y2hhciAqKTsKQEAgLTY2Myw2ICs2NjIsOCBAQCBleHRlcm4gaW50IF9fcG1TZXJ2ZXJPcGVuUmVx dWVzdFBvcnRzKF9fcG1GZFNldCAqLCBpbnQpOwogZXh0ZXJuIHZvaWQgX19wbVNlcnZlckNsb3Nl UmVxdWVzdFBvcnRzKHZvaWQpOwogZXh0ZXJuIHZvaWQgX19wbVNlcnZlckR1bXBSZXF1ZXN0UG9y dHMoRklMRSAqKTsKIGV4dGVybiBjaGFyICpfX3BtU2VydmVyUmVxdWVzdFBvcnRTdHJpbmcoaW50 LCBjaGFyICosIHNpemVfdCk7CisKK3R5cGVkZWYgc3RydWN0IF9fcG1TZXJ2ZXJQcmVzZW5jZSBf X3BtU2VydmVyUHJlc2VuY2U7CiBleHRlcm4gX19wbVNlcnZlclByZXNlbmNlICpfX3BtU2VydmVy QWR2ZXJ0aXNlUHJlc2VuY2UoY29uc3QgY2hhciAqLCBpbnQpOwogZXh0ZXJuIHZvaWQgX19wbVNl cnZlclVuYWR2ZXJ0aXNlUHJlc2VuY2UoX19wbVNlcnZlclByZXNlbmNlICopOwogCmRpZmYgLS1n aXQgYS9zcmMvbGlicGNwL3NyYy9hdXhzZXJ2ZXIuYyBiL3NyYy9saWJwY3Avc3JjL2F1eHNlcnZl ci5jCmluZGV4IDU1NmNiMmIuLmM3Zjk2MzUgMTAwNjQ0Ci0tLSBhL3NyYy9saWJwY3Avc3JjL2F1 eHNlcnZlci5jCisrKyBiL3NyYy9saWJwY3Avc3JjL2F1eHNlcnZlci5jCkBAIC02OTcsNiArNjk3 LDIyIEBAIF9fcG1TZWN1cmVTZXJ2ZXJIYW5kc2hha2UoaW50IGZkLCBpbnQgZmxhZ3MsIF9fcG1I YXNoQ3RsICphdHRycykKICAgICByZXR1cm4gLUVPUE5PVFNVUFA7CiB9CiAKK2ludAorX19wbVNl Y3VyZVNlcnZlckhhc0ZlYXR1cmUoX19wbVNlcnZlckZlYXR1cmUgcXVlcnkpCit7CisgICAgKHZv aWQpcXVlcnk7CisgICAgcmV0dXJuIDA7Cit9CisKK2ludAorX19wbVNlY3VyZVNlcnZlclNldEZl YXR1cmUoX19wbVNlcnZlckZlYXR1cmUgd2FudGVkKQoreworICAgICh2b2lkKXdhbnRlZDsKKyAg ICByZXR1cm4gMDsKK30KKworI2VuZGlmIC8qICFIQVZFX1NFQ1VSRV9TT0NLRVRTICovCisKIHN0 YXRpYyB1bnNpZ25lZCBpbnQgc2VydmVyX2ZlYXR1cmVzOwogCiBpbnQKQEAgLTcwNyw3ICs3MjMs NyBAQCBfX3BtU2VydmVyU2V0RmVhdHVyZShfX3BtU2VydmVyRmVhdHVyZSB3YW50ZWQpCiAJc2Vy dmVyX2ZlYXR1cmVzIHw9ICgxIDw8IHdhbnRlZCk7CiAJcmV0dXJuIDE7CiAgICAgfQotICAgIHJl dHVybiAwOworICAgIHJldHVybiBfX3BtU2VjdXJlU2VydmVyU2V0RmVhdHVyZSh3YW50ZWQpOwog fQogCiBpbnQKQEAgLTcxOSwyOCArNzM1LDI2IEBAIF9fcG1TZXJ2ZXJIYXNGZWF0dXJlKF9fcG1T ZXJ2ZXJGZWF0dXJlIHF1ZXJ5KQogICAgIGNhc2UgUE1fU0VSVkVSX0ZFQVRVUkVfSVBWNjoKIAlz dHMgPSAoc3RyY21wKF9fcG1HZXRBUElDb25maWcoImlwdjYiKSwgInRydWUiKSA9PSAwKTsKIAli cmVhazsKKyAgICBjYXNlIFBNX1NFUlZFUl9GRUFUVVJFX0RJU0NPVkVSWToKICAgICBjYXNlIFBN X1NFUlZFUl9GRUFUVVJFX0NSRURTX1JFUUQ6CiAgICAgY2FzZSBQTV9TRVJWRVJfRkVBVFVSRV9V TklYX0RPTUFJTjoKIAlpZiAoc2VydmVyX2ZlYXR1cmVzICYgKDEgPDwgcXVlcnkpKQogCSAgICBz dHMgPSAxOwogCWJyZWFrOwogICAgIGRlZmF1bHQ6CisJc3RzID0gX19wbVNlY3VyZVNlcnZlckhh c0ZlYXR1cmUocXVlcnkpOwogCWJyZWFrOwogICAgIH0KICAgICByZXR1cm4gc3RzOwogfQogCi0j ZW5kaWYgLyogIUhBVkVfU0VDVVJFX1NPQ0tFVFMgKi8KLQotLyogWFhYIFRPRE86IEhBVkVfU0VS VklDRV9ESVNDT1ZFUlkgbm90IGRlZmluZWQgeWV0LiBXYWl0aW5nIG9uIE5hdGhhbi4KLSAqIEZv ciBub3csIGVuYWJsZSB0aGlzIGNvZGUgaWYgd2UgaGF2ZSBBdmFoaS4gKi8KLSNpZiBIQVZFX0FW QUhJIC8qIGRlZmluZWQoSEFWRV9TRVJWSUNFX0RJU0NPVkVSWSkgKi8KKyNpZiBkZWZpbmVkKEhB VkVfU0VSVklDRV9ESVNDT1ZFUlkpCiAKIF9fcG1TZXJ2ZXJQcmVzZW5jZSAqCiBfX3BtU2VydmVy QWR2ZXJ0aXNlUHJlc2VuY2UoY29uc3QgY2hhciAqc2VydmljZVNwZWMsIGludCBwb3J0KQogewot ICAgIC8qIEFsbG9jYXRlIHRoZSBzZXJ2ZXIgcHJlc2VuY2UgZGF0YSBzdHJ1Y3R1cmUuICovCiAg ICAgX19wbVNlcnZlclByZXNlbmNlICpzOworCiAgICAgaWYgKChzID0gbWFsbG9jKHNpemVvZigq cykpKSA9PSBOVUxMKSB7CiAJX19wbU5vTWVtKCJfX3BtU2VydmVyQWR2ZXJ0aXNlUHJlc2VuY2U6 IGNhbid0IGFsbG9jYXRlIF9fcG1TZXJ2ZXJQcmVzZW5jZSIsCiAJCSAgc2l6ZW9mKCpzKSwgUE1f RkFUQUxfRVJSKTsKQEAgLTc0OSwyNCArNzYzLDIwIEBAIF9fcG1TZXJ2ZXJBZHZlcnRpc2VQcmVz ZW5jZShjb25zdCBjaGFyICpzZXJ2aWNlU3BlYywgaW50IHBvcnQpCiAgICAgLyogTm93IGFkdmVy dGlzZSBvdXIgcHJlc2VuY2UgdXNpbmcgYWxsIGF2YWlsYWJsZSBtZWFucy4gSWYgYSBwYXJ0aWN1 bGFyCiAgICAgICogbWV0aG9kIGlzIG5vdCBhdmFpbGFibGUgb3Igbm90IGNvbmZpZ3VyZWQsIHRo ZW4gdGhlIHJlc3BlY3RpdmUgY2FsbAogICAgICAqIHdpbGwgaGF2ZSBubyBlZmZlY3QuCi0gICAg ICogQ3VycmVudGx5LCBvbmx5IGF2YWhpIGlzIHN1cHBvcnRlZC4KICAgICAgKi8KLSAgICBzLT5h dmFoaSA9IF9fcG1TZXJ2ZXJBdmFoaUFkdmVydGlzZVByZXNlbmNlKHNlcnZpY2VTcGVjLCBwb3J0 KTsKLQorICAgIF9fcG1TZXJ2ZXJBdmFoaUFkdmVydGlzZVByZXNlbmNlKHMsIHNlcnZpY2VTcGVj LCBwb3J0KTsKKyAgICBzZXJ2ZXJfZmVhdHVyZXMgfD0gUE1fU0VSVkVSX0ZFQVRVUkVfRElTQ09W RVJZOwogICAgIHJldHVybiBzOwogfQogCiB2b2lkCi1fX3BtU2VydmVyVW5hZHZlcnRpc2VQcmVz ZW5jZShfX3BtU2VydmVyUHJlc2VuY2UgKnMpIHsKK19fcG1TZXJ2ZXJVbmFkdmVydGlzZVByZXNl bmNlKF9fcG1TZXJ2ZXJQcmVzZW5jZSAqcykKK3sKICAgICAvKiBVbmFkdmVydGlzZSBvdXIgcHJl c2VuY2UgZm9yIGFsbCBhdmFpbGFibGUgbWVhbnMuIElmIGEgcGFydGljdWxhcgogICAgICAqIG1l dGhvZCBpcyBub3QgYWN0aXZlLCB0aGVuIHRoZSByZXNwZWN0aXZlIGNhbGwgd2lsbCBoYXZlIG5v IGVmZmVjdC4KLSAgICAgKiBDdXJyZW50bHksIG9ubHkgYXZhaGkgaXMgc3VwcG9ydGVkLgogICAg ICAqLwotICAgIGlmIChzLT5hdmFoaSAhPSBOVUxMKSB7Ci0JX19wbVNlcnZlckF2YWhpVW5hZHZl cnRpc2VQcmVzZW5jZShzLT5hdmFoaSk7Ci0JZnJlZShzLT5hdmFoaSk7Ci0Jcy0+YXZhaGkgPSBO VUxMOwotICAgIH0KKyAgICBfX3BtU2VydmVyQXZhaGlVbmFkdmVydGlzZVByZXNlbmNlKHMpOwor ICAgIGZyZWUocyk7CiB9CiAKICNlbHNlIC8qICFIQVZFX1NFUlZJQ0VfRElTQ09WRVJZICovCmRp ZmYgLS1naXQgYS9zcmMvbGlicGNwL3NyYy9hdmFoaS5jIGIvc3JjL2xpYnBjcC9zcmMvYXZhaGku YwppbmRleCBkMTRhNTc3Li5jZTM2MjBhIDEwMDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy9hdmFo aS5jCisrKyBiL3NyYy9saWJwY3Avc3JjL2F2YWhpLmMKQEAgLTE2LDE2ICsxNiwxNyBAQAogCiAj aW5jbHVkZSAicG1hcGkuaCIKICNpbmNsdWRlICJpbXBsLmgiCisjaW5jbHVkZSAiaW50ZXJuYWwu aCIKICNpbmNsdWRlICJhdmFoaS5oIgogCi10eXBlZGVmIHN0cnVjdCBfX3BtU2VydmVyQXZhaGlQ cmVzZW5jZSB7CitzdHJ1Y3QgX19wbVNlcnZlckF2YWhpUHJlc2VuY2UgewogICAgIGNoYXIJCSph dmFoaV9zZXJ2aWNlX25hbWU7CiAgICAgY29uc3QgY2hhcgkJKmF2YWhpX3NlcnZpY2VfdGFnOwog ICAgIGludAkJCXBvcnQ7CiAgICAgQXZhaGlUaHJlYWRlZFBvbGwJKmF2YWhpX3RocmVhZGVkX3Bv bGw7CiAgICAgQXZhaGlDbGllbnQJCSphdmFoaV9jbGllbnQ7CiAgICAgQXZhaGlFbnRyeUdyb3Vw CSphdmFoaV9ncm91cDsKLX0gX19wbVNlcnZlckF2YWhpUHJlc2VuY2U7Cit9OwogCiBzdGF0aWMg dm9pZCBlbnRyeUdyb3VwQ2FsbGJhY2soCiAgICAgQXZhaGlFbnRyeUdyb3VwICpnLApAQCAtMzAx LDEzICszMDIsMTIgQEAgcHVibGlzaFNlcnZpY2UoY29uc3QgY2hhciAqc2VydmljZU5hbWUsIGNv bnN0IGNoYXIgKnNlcnZpY2VUYWcsIGludCBwb3J0KQogICByZXR1cm4gTlVMTDsKIH0KIAotX19w bVNlcnZlckF2YWhpUHJlc2VuY2UgKgotX19wbVNlcnZlckF2YWhpQWR2ZXJ0aXNlUHJlc2VuY2Uo Y29uc3QgY2hhciAqc2VydmljZVNwZWMsIGludCBwb3J0KQordm9pZAorX19wbVNlcnZlckF2YWhp QWR2ZXJ0aXNlUHJlc2VuY2UoX19wbVNlcnZlclByZXNlbmNlICpzLCBjb25zdCBjaGFyICpzZXJ2 aWNlU3BlYywgaW50IHBvcnQpCiB7CiAgICAgc2l6ZV90IHNpemU7CiAgICAgY2hhciAqc2Vydmlj ZU5hbWU7CiAgICAgY2hhciAqc2VydmljZVRhZzsKLSAgICBfX3BtU2VydmVyQXZhaGlQcmVzZW5j ZSAqcDsKIAogICAgIC8qIFRoZSBzZXJ2aWNlIHNwZWMgaXMgc2ltcGx5IHRoZSBuYW1lIG9mIHRo ZSBzZXJ2ZXIuIFVzZSBpdCB0bwogICAgICAqIGNvbnN0cnVjdCB0aGUgYXZhaGkgc2VydmljZSBu YW1lIGFuZCBzZXJ2aWNlIHRhZy4KQEAgLTMyNywxNSArMzI3LDE5IEBAIF9fcG1TZXJ2ZXJBdmFo aUFkdmVydGlzZVByZXNlbmNlKGNvbnN0IGNoYXIgKnNlcnZpY2VTcGVjLCBpbnQgcG9ydCkKICAg ICBzcHJpbnRmKHNlcnZpY2VUYWcsICJfJXMuX3RjcCIsIHNlcnZpY2VTcGVjKTsKICAgICAKICAg ICAvKiBOb3cgcHVibGlzaCB0aGUgYXZhaGkgc2VydmljZS4gKi8KLSAgICBwID0gcHVibGlzaFNl cnZpY2UgKHNlcnZpY2VOYW1lLCBzZXJ2aWNlVGFnLCBwb3J0KTsKKyAgICBzLT5hdmFoaSA9IHB1 Ymxpc2hTZXJ2aWNlKHNlcnZpY2VOYW1lLCBzZXJ2aWNlVGFnLCBwb3J0KTsKIAogICAgIC8qIENs ZWFuIHVwLiAqLwogICAgIGZyZWUoc2VydmljZU5hbWUpOwogICAgIGZyZWUoc2VydmljZVRhZyk7 Ci0gICAgcmV0dXJuIHA7CiB9CiAKIHZvaWQKLV9fcG1TZXJ2ZXJBdmFoaVVuYWR2ZXJ0aXNlUHJl c2VuY2UoX19wbVNlcnZlckF2YWhpUHJlc2VuY2UgKnMpIHsKLSAgICBjbGVhbnVwKHMpOworX19w bVNlcnZlckF2YWhpVW5hZHZlcnRpc2VQcmVzZW5jZShfX3BtU2VydmVyUHJlc2VuY2UgKnMpCit7 CisgICAgaWYgKHMtPmF2YWhpICE9IE5VTEwpIHsKKwljbGVhbnVwKHMtPmF2YWhpKTsKKwlmcmVl KHMtPmF2YWhpKTsKKwlzLT5hdmFoaSA9IE5VTEw7CisgICAgfQogfQpkaWZmIC0tZ2l0IGEvc3Jj L2xpYnBjcC9zcmMvYXZhaGkuaCBiL3NyYy9saWJwY3Avc3JjL2F2YWhpLmgKaW5kZXggYmI1NDhi NC4uNzhkNDM3MiAxMDA2NDQKLS0tIGEvc3JjL2xpYnBjcC9zcmMvYXZhaGkuaAorKysgYi9zcmMv bGlicGNwL3NyYy9hdmFoaS5oCkBAIC0xOSw5ICsxOSw3IEBACiAjaW5jbHVkZSA8YXZhaGktY29t bW9uL21hbGxvYy5oPgogI2luY2x1ZGUgPGF2YWhpLWNvbW1vbi9lcnJvci5oPgogCi10eXBlZGVm IHN0cnVjdCBfX3BtU2VydmVyQXZhaGlQcmVzZW5jZSBfX3BtU2VydmVyQXZhaGlQcmVzZW5jZTsK LQotX19wbVNlcnZlckF2YWhpUHJlc2VuY2UgKl9fcG1TZXJ2ZXJBdmFoaUFkdmVydGlzZVByZXNl bmNlKGNvbnN0IGNoYXIgKiwgaW50KTsKLXZvaWQgX19wbVNlcnZlckF2YWhpVW5hZHZlcnRpc2VQ cmVzZW5jZShfX3BtU2VydmVyQXZhaGlQcmVzZW5jZSAqKTsKK3ZvaWQgX19wbVNlcnZlckF2YWhp QWR2ZXJ0aXNlUHJlc2VuY2UoX19wbVNlcnZlclByZXNlbmNlICosIGNvbnN0IGNoYXIgKiwgaW50 KTsKK3ZvaWQgX19wbVNlcnZlckF2YWhpVW5hZHZlcnRpc2VQcmVzZW5jZShfX3BtU2VydmVyUHJl c2VuY2UgKik7CiAKICNlbmRpZiAvKiBBVkFISV9IICovCmRpZmYgLS1naXQgYS9zcmMvbGlicGNw L3NyYy9jaGVjay1zdGF0aWNzIGIvc3JjL2xpYnBjcC9zcmMvY2hlY2stc3RhdGljcwppbmRleCBm ODAzMGEzLi4zNWYzZjI0IDEwMDc1NQotLS0gYS9zcmMvbGlicGNwL3NyYy9jaGVjay1zdGF0aWNz CisrKyBiL3NyYy9saWJwY3Avc3JjL2NoZWNrLXN0YXRpY3MKQEAgLTk5LDcgKzk5LDcgQEAgYXV4 c2VydmVyLm8KICAgICBiIGxvY2FsU29ja2V0UGF0aAkJIyBzaW5nbGUtdGhyZWFkZWQgc2VydmVy IHNjb3BlCiAgICAgYiBzZXJ2aWNlU3BlYwkJIyBzaW5nbGUtdGhyZWFkZWQgc2VydmVyIHNjb3Bl CiAgICAgZCBsb2NhbFNvY2tldEZkCQkjIHNpbmdsZS10aHJlYWRlZCBzZXJ2ZXIgc2NvcGUKLSAg ICBiID9zZXJ2ZXJfZmVhdHVyZXMJCSMgc2luZ2xlLXRocmVhZGVkIHNlcnZlciBzY29wZQorICAg IGIgc2VydmVyX2ZlYXR1cmVzCQkjIHNpbmdsZS10aHJlYWRlZCBzZXJ2ZXIgc2NvcGUKID9hdmFo aS5vCiBjaGVja3N1bS5vCiBjb25maWcubwpkaWZmIC0tZ2l0IGEvc3JjL2xpYnBjcC9zcmMvY29u ZmlnLmMgYi9zcmMvbGlicGNwL3NyYy9jb25maWcuYwppbmRleCBhMmI1ZTNkLi4zNGQ3OGI4IDEw MDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy9jb25maWcuYworKysgYi9zcmMvbGlicGNwL3NyYy9j b25maWcuYwpAQCAtMzIzLDYgKzMyMywxMSBAQCBpcHY2X2VuYWJsZWQodm9pZCkKICNlbHNlCiAj ZGVmaW5lIFNUQVRJQ19QUk9CRVNfRU5BQkxFRAlkaXNhYmxlZAogI2VuZGlmCisjaWYgZGVmaW5l ZChIQVZFX1NFUlZJQ0VfRElTQ09WRVJZKQorI2RlZmluZSBTRVJWSUNFX0RJU0NPVkVSWV9FTkFC TEVECWVuYWJsZWQKKyNlbHNlCisjZGVmaW5lIFNFUlZJQ0VfRElTQ09WRVJZX0VOQUJMRUQJZGlz YWJsZWQKKyNlbmRpZgogCiB0eXBlZGVmIGNvbnN0IGNoYXIgKigqZmVhdHVyZV9kZXRlY3Rvciko dm9pZCk7CiBzdGF0aWMgc3RydWN0IHsKQEAgLTM0Myw2ICszNDgsNyBAQCBzdGF0aWMgc3RydWN0 IHsKIAl7ICJhdXRoZW50aWNhdGlvbiIsCUFVVEhFTlRJQ0FUSU9OX0VOQUJMRUQgfSwJLyogZnJv bSBwY3AtMy44LnggKi8KIAl7ICJ1bml4X2RvbWFpbl9zb2NrZXRzIixVTklYX0RPTUFJTl9TT0NL RVRTX0VOQUJMRUQgfSwJLyogZnJvbSBwY3AtMy44LjIgKi8KIAl7ICJzdGF0aWNfcHJvYmVzIiwJ U1RBVElDX1BST0JFU19FTkFCTEVEIH0sCS8qIGZyb20gcGNwLTMuOC4zICovCisJeyAic2Vydmlj ZV9kaXNjb3ZlcnkiLAlTRVJWSUNFX0RJU0NPVkVSWV9FTkFCTEVEIH0sCS8qIGZyb20gcGNwLTMu OC42ICovCiB9OwogCiB2b2lkCmRpZmYgLS1naXQgYS9zcmMvbGlicGNwL3NyYy9pbnRlcm5hbC5o IGIvc3JjL2xpYnBjcC9zcmMvaW50ZXJuYWwuaAppbmRleCBhYjc2MTQ1Li5kMDM5MmI4IDEwMDY0 NAotLS0gYS9zcmMvbGlicGNwL3NyYy9pbnRlcm5hbC5oCisrKyBiL3NyYy9saWJwY3Avc3JjL2lu dGVybmFsLmgKQEAgLTEyMCw2ICsxMjAsOCBAQCBleHRlcm4gaW50IF9fcG1Db25uZWN0Q2hlY2tF cnJvcihpbnQpOwogZXh0ZXJuIHZvaWQgKl9fcG1HZXRTZWN1cmVTb2NrZXQoaW50KTsKIGV4dGVy biB2b2lkICpfX3BtR2V0VXNlckF1dGhEYXRhKGludCk7CiBleHRlcm4gaW50IF9fcG1TZWN1cmVT ZXJ2ZXJJUENGbGFncyhpbnQsIGludCk7CitleHRlcm4gaW50IF9fcG1TZWN1cmVTZXJ2ZXJIYXNG ZWF0dXJlKF9fcG1TZXJ2ZXJGZWF0dXJlKTsKK2V4dGVybiBpbnQgX19wbVNlY3VyZVNlcnZlclNl dEZlYXR1cmUoX19wbVNlcnZlckZlYXR1cmUpOwogCiAjZGVmaW5lIFNFQ1VSRV9TRVJWRVJfU0FT TF9TRVJWSUNFICJQQ1AgQ29sbGVjdG9yIgogI2RlZmluZSBMSU1JVF9BVVRIX1BEVQkyMDQ4CS8q IG1heGltdW0gc2l6ZSBvZiBhIFNBU0wgdHJhbnNmZXIgKGluIGJ5dGVzKSAqLwpAQCAtMTUyLDkg KzE1NCw5IEBAIGV4dGVybiBpbnQgX19wbUdldFVzZXJJZGVudGl0eShjb25zdCBjaGFyICosIF9f cG1Vc2VySUQgKiwgX19wbUdyb3VwSUQgKiwgaW50KTsKICAqLwogdHlwZWRlZiBzdHJ1Y3QgX19w bVNlcnZlckF2YWhpUHJlc2VuY2UgX19wbVNlcnZlckF2YWhpUHJlc2VuY2U7CiAKLXR5cGVkZWYg c3RydWN0IF9fcG1TZXJ2ZXJQcmVzZW5jZSB7CitzdHJ1Y3QgX19wbVNlcnZlclByZXNlbmNlIHsK ICAgICBfX3BtU2VydmVyQXZhaGlQcmVzZW5jZQkqYXZhaGk7Ci19IF9fcG1TZXJ2ZXJQcmVzZW5j ZTsKK307CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvc3JjL2xpYnBjcC9z cmMvc2VjdXJlc2VydmVyLmMgYi9zcmMvbGlicGNwL3NyYy9zZWN1cmVzZXJ2ZXIuYwppbmRleCBj MzM2MzQxLi4yMjNmNjhhIDEwMDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy9zZWN1cmVzZXJ2ZXIu YworKysgYi9zcmMvbGlicGNwL3NyYy9zZWN1cmVzZXJ2ZXIuYwpAQCAtMzcsNTggKzM3LDI4IEBA IHN0YXRpYyBzdHJ1Y3QgewogICAgIC8qIHN0YXR1cyBmbGFncyAoYml0ZmllbGRzKSAqLwogICAg IHVuc2lnbmVkIGludAljZXJ0aWZpY2F0ZV92ZXJpZmllZCA6IDE7CS8qIE5TUyAqLwogICAgIHVu c2lnbmVkIGludAlzc2xfc2Vzc2lvbl9jYWNoZV9zZXR1cCA6IDE7CS8qIE5TUyAqLwotICAgIHVu c2lnbmVkIGludAljcmVkZW50aWFsc19yZXF1aXJlZCA6IDE7CS8qIFNBU0wvQUZfVU5JWCAqLwot ICAgIHVuc2lnbmVkIGludAl1bml4X2RvbWFpbl9zb2NrZXQgOiAxOwkJLyogQUZfVU5JWCAqLwog fSBzZWN1cmVfc2VydmVyOwogCiBpbnQKLV9fcG1TZXJ2ZXJTZXRGZWF0dXJlKF9fcG1TZXJ2ZXJG ZWF0dXJlIHdhbnRlZCkKK19fcG1TZWN1cmVTZXJ2ZXJTZXRGZWF0dXJlKF9fcG1TZXJ2ZXJGZWF0 dXJlIHdhbnRlZCkKIHsKLSAgICBzd2l0Y2ggKHdhbnRlZCkgewotICAgIGNhc2UgUE1fU0VSVkVS X0ZFQVRVUkVfQ1JFRFNfUkVRRDoKLQlQTV9JTklUX0xPQ0tTKCk7Ci0JUE1fTE9DSyhfX3BtTG9j a19saWJwY3ApOwotCXNlY3VyZV9zZXJ2ZXIuY3JlZGVudGlhbHNfcmVxdWlyZWQgPSAxOwotCVBN X1VOTE9DSyhfX3BtTG9ja19saWJwY3ApOwotCXJldHVybiAxOwotICAgIGNhc2UgUE1fU0VSVkVS X0ZFQVRVUkVfVU5JWF9ET01BSU46Ci0JUE1fSU5JVF9MT0NLUygpOwotCVBNX0xPQ0soX19wbUxv Y2tfbGlicGNwKTsKLQlzZWN1cmVfc2VydmVyLnVuaXhfZG9tYWluX3NvY2tldCA9IDE7Ci0JUE1f VU5MT0NLKF9fcG1Mb2NrX2xpYnBjcCk7Ci0JcmV0dXJuIDE7Ci0gICAgZGVmYXVsdDoKLQlicmVh azsKLSAgICB9Ci0gICAgcmV0dXJuIDA7CisgICAgKHZvaWQpd2FudGVkOworICAgIHJldHVybiAw OwkvKiBub3RoaW5nIGR5bmFtaWNhbGx5IGVuYWJsZWQgYXQgdGhpcyBzdGFnZSAqLwogfQogCiBp bnQKLV9fcG1TZXJ2ZXJIYXNGZWF0dXJlKF9fcG1TZXJ2ZXJGZWF0dXJlIHF1ZXJ5KQorX19wbVNl Y3VyZVNlcnZlckhhc0ZlYXR1cmUoX19wbVNlcnZlckZlYXR1cmUgcXVlcnkpCiB7CiAgICAgaW50 IHN0cyA9IDA7CiAKICAgICBzd2l0Y2ggKHF1ZXJ5KSB7Ci0gICAgY2FzZSBQTV9TRVJWRVJfRkVB VFVSRV9VTklYX0RPTUFJTjoKLSAgICBjYXNlIFBNX1NFUlZFUl9GRUFUVVJFX0NSRURTX1JFUUQ6 CiAgICAgY2FzZSBQTV9TRVJWRVJfRkVBVFVSRV9TRUNVUkU6Ci0JUE1fSU5JVF9MT0NLUygpOwot CVBNX0xPQ0soX19wbUxvY2tfbGlicGNwKTsKLQlpZiAocXVlcnkgPT0gUE1fU0VSVkVSX0ZFQVRV UkVfU0VDVVJFKQotCSAgICBzdHMgPSBzZWN1cmVfc2VydmVyLmNlcnRpZmljYXRlX3ZlcmlmaWVk OwotCWlmIChxdWVyeSA9PSBQTV9TRVJWRVJfRkVBVFVSRV9DUkVEU19SRVFEKQotCSAgICBzdHMg PSBzZWN1cmVfc2VydmVyLmNyZWRlbnRpYWxzX3JlcXVpcmVkOwotCWlmIChxdWVyeSA9PSBQTV9T RVJWRVJfRkVBVFVSRV9VTklYX0RPTUFJTikKLQkgICAgc3RzID0gc2VjdXJlX3NlcnZlci51bml4 X2RvbWFpbl9zb2NrZXQ7Ci0JUE1fVU5MT0NLKF9fcG1Mb2NrX2xpYnBjcCk7CisJc3RzID0gc2Vj dXJlX3NlcnZlci5jZXJ0aWZpY2F0ZV92ZXJpZmllZDsKIAlicmVhazsKICAgICBjYXNlIFBNX1NF UlZFUl9GRUFUVVJFX0NPTVBSRVNTOgogICAgIGNhc2UgUE1fU0VSVkVSX0ZFQVRVUkVfQVVUSDoK IAlzdHMgPSAxOwogCWJyZWFrOwotICAgIGNhc2UgUE1fU0VSVkVSX0ZFQVRVUkVfSVBWNjoKLQlz dHMgPSAoc3RyY21wKF9fcG1HZXRBUElDb25maWcoImlwdjYiKSwgInRydWUiKSA9PSAwKTsKLQli cmVhazsKICAgICBkZWZhdWx0OgogCWJyZWFrOwogICAgIH0K ------=_Part_13325332_1782278418.1383032522248-- From nscott@redhat.com Tue Oct 29 03:01:50 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id B5A137F3F for ; Tue, 29 Oct 2013 03:01:50 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id 6994B8F806F for ; Tue, 29 Oct 2013 01:01:47 -0700 (PDT) X-ASG-Debug-ID: 1383033704-04bdf0789a368b20001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id 1gIgXloCZUjdJcIm for ; Tue, 29 Oct 2013 01:01:44 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9T81hOV021951 for ; Tue, 29 Oct 2013 04:01:43 -0400 Date: Tue, 29 Oct 2013 04:01:43 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <973431162.13334034.1383033703798.JavaMail.root@redhat.com> Subject: pcp updates: hostnames, qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: hostnames, qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.12] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: hostnames, qa Thread-Index: 1jXn7Rgiw1+gWOmr/oswA8sGPlGlPw== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1383033704 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141876 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev build/GNUmakefile | 6 + build/rpm/fedora.spec | 4 build/rpm/pcp.spec.in | 8 - man/man1/pcp.1 | 2 man/man1/pcpintro.1 | 2 man/man1/pmcd.1 | 7 - man/man1/pmhostname.1 | 8 + man/man1/pmlogconf.1 | 2 man/man1/pmtop.1 | 2 man/man1/pmwebd.1 | 25 +++--- qa/.gitignore | 1 qa/044 | 4 qa/115 | 2 qa/151 | 2 qa/204 | 7 - qa/230 | 2 qa/230.out | 2 qa/280 | 2 qa/294 | 17 ++-- qa/294.out.1 | 14 +-- qa/294.out.2 | 49 ++++++----- qa/294.out.3 | 10 +- qa/294.out.4 | 33 +++++-- qa/295 | 11 +- qa/295.out | 17 ---- qa/295.out.1 | 17 ++++ qa/295.out.2 | 17 ++++ qa/297 | 5 - qa/297.out | 6 - qa/338 | 2 qa/365 | 24 ++++- qa/430 | 1 qa/456 | 10 -- qa/503 | 6 + qa/504 | 4 qa/529 | 2 qa/530 | 2 qa/532 | 2 qa/581 | 3 qa/645 | 1 qa/651 | 1 src/pcp/pcp.sh | 2 src/pmdas/pmcd/src/pmcd.c | 8 + src/pmevent/doargs.c | 36 ++++---- src/pmevent/pmevent.c | 10 -- src/pmevent/pmevent.h | 2 src/pmie/pmie_check.sh | 98 ++++++++++------------- src/pmie/pmie_daily.sh | 76 ++++++------------ src/pmie/rc_pmie | 9 -- src/pmie/src/dstruct.c | 8 - src/pmie/src/dstruct.h | 4 src/pmie/src/pmie.c | 88 +++++++++++++-------- src/pmie/src/pragmatics.c | 27 ++---- src/pmie/src/pragmatics.h | 3 src/pmie/src/syntax.c | 3 src/pmlc/actions.c | 2 src/pmlogger/control | 4 src/pmlogger/pmlogger_check.sh | 170 ++++++++++++----------------------------- src/pmlogger/pmlogger_daily.sh | 131 ++++++------------------------- src/pmlogger/rc_pmlogger | 4 src/pmlogger/src/dopdu.c | 19 ++-- src/pmlogger/src/logger.h | 1 src/pmlogger/src/pmlogger.c | 18 ++-- 63 files changed, 492 insertions(+), 573 deletions(-) commit d7bb8c1abbe6dead2b94db083d1078dfdbd45b5e Author: Nathan Scott Date: Tue Oct 29 16:10:24 2013 +1100 Resolve hostname issues and non-determinism in test qa/365 The advent of commands being run as part of startup using the unix: specifier can cause this test to spuriously log messages due to the pmcd access control specification, after pmcd is up (which is what the test is really exercising - that pmcd comes up despite dodgey-ness in the access section). commit aee9d444dac9dca572878d1527a7fb22ba1f65dc Author: Nathan Scott Date: Tue Oct 29 15:39:54 2013 +1100 Try harder in pmie to come up with a hostname for local connections In the default startup case (i.e. no host/archive options) should pmie startup with no pmcd running, its handling of hostname lookup has been improved so that it falls back to using a local-context. This is important because pmie can be very long-lived and we would really like it to get a more sensible host name than "?" if at all possible. Once it establishes a context when pmcd eventually comes up, it may run for a very long time and cannot nonsense forever - not such an unusual scenario. Possibly pmie should really be doing the pmcd.hostname check whenever it reconnects. While there, remove an unused variable in pmie initArchive() code, and make dfltConn local to the argument parsing code instead of a global. commit 53df655c0d41511a467e669f3b1999187fb32f03 Author: Nathan Scott Date: Tue Oct 29 15:29:33 2013 +1100 Update several QA test filters to deal with local: host default commit b76e063964122238f788312c64f067f7f6248de8 Author: Nathan Scott Date: Tue Oct 29 15:27:41 2013 +1100 Update pmhostname man page, describe it as a command instead of a script commit 1dfcbcdffcf06e9738b61d4b963da534d340d119 Author: Nathan Scott Date: Tue Oct 29 15:26:32 2013 +1100 Clarify pmcd man page section that discusses it running as root commit e901fcb9a0ab06243bc5d79f03e7cc7b18815245 Author: Nathan Scott Date: Tue Oct 29 15:26:04 2013 +1100 Use PCP_VAR_DIR in place of hard coded path in pcp.spec.in commit 720b989f360effb7b750e64e744479155d73214e Author: Nathan Scott Date: Tue Oct 29 15:22:18 2013 +1100 Ensure build cleans up a temp file properly after a failure I observed a QA failure because an earlier build had left a temporary file around, named with a PID prefix, which just so happened to match a subsequent QA test PID. Failure to unlink that file in QA cleanup caused the test to fail. commit d2271f51782842250b0619fa72ac2920c5ce3d03 Author: Nathan Scott Date: Tue Oct 29 15:19:58 2013 +1100 Update tests qa/29[45] to cope with changed pmie hostname handling We recently changed pmie to use pmGetContextHostName in order that it can better grok the remote hostname. For hosts, we establish a temporary context early on to extract the correct hostname for log file reporting, the stats file, and so on. This causes QA tests to fail if they are counting the number of pmcd connects/disconnects, as they are now off-by-one. Further, in the default case (i.e. no host/archive options) should pmie startup with no pmcd running, its handling of hostname lookup has been improved so that it falls back to using a local-context. This is important because pmie can be very long-lived and we would really like it to get a more sensible host name than "?" if at all possible. Once its (re)connects a context when pmcd finally comes up, it may run for a very long time - not such an unusual scenario. commit 16fdca8c54784fad8869e374f6f70b544753f731 Merge: 648fe74 49a7ce7 Author: Nathan Scott Date: Tue Oct 29 15:05:06 2013 +1100 Merge branch 'fche/dev' of ../pcpfans into fche Conflicts: build/rpm/fedora.spec src/pmie/pmie_check.sh src/pmie/pmie_daily.sh src/pmlogger/pmlogger_check.sh src/pmlogger/pmlogger_daily.sh commit 49a7ce795530c50de29f453fd8e9136369e59060 Author: Frank Ch. Eigler Date: Thu Oct 17 16:39:07 2013 -0400 pmwebd: document security benefits of authenticated PMAPI contexts commit fba80a45eaff5ee2fc590f9f5461cb4756e26537 Author: Frank Ch. Eigler Date: Wed Oct 16 16:55:53 2013 -0400 pcpqa FQDN cleanup cont'd: test case 503 commit 3470e5ac35a89dcb1763cea4f3430337ba718b16 Author: Frank Ch. Eigler Date: Wed Oct 16 16:17:10 2013 -0400 pcpqa FQDN cleanup cont'd: 297.* test outputs commit 89ffc9ec98368013ce37912d1b9e62993c6809b7 Author: Frank Ch. Eigler Date: Wed Oct 16 16:12:14 2013 -0400 pcpqa FQDN cleanup cont'd: 294.* test outputs commit 7a7999bfbd21912ae22c14ca7e318748c3d31fe2 Author: Frank Ch. Eigler Date: Wed Oct 16 15:53:33 2013 -0400 pcpqa FQDN cleanup cont'd commit b65a57ab0a3591d02ae37764fcab02e99186ac9e Author: Frank Ch. Eigler Date: Wed Oct 16 15:45:44 2013 -0400 pcpqa FQDN cleanup: tolerate new relaxed hostnames in qa suite commit 0cbcc9747f400a9caf40e4be9b1a20b79e4eac62 Author: Frank Ch. Eigler Date: Wed Oct 16 11:05:48 2013 -0400 *.spec: for pcp-testsuite, put pcpqa homedir under own directory The default, /home, may not generally be writeable, so put the home directory under the testsuite work directory itself. commit d35e1768c5d8c8af118e8fb871b658dba14cb8d5 Merge: 79044fb 8da1d1a Author: Frank Ch. Eigler Date: Wed Oct 16 09:39:56 2013 -0400 Merge remote-tracking branch 'pcp/dev' into fche/dev * pcp/dev: Fix a race condition in test qa/749 (pmcd probes) Handle absense of server unix domain socket file gracefully Address potential lock inversion issues in libpcp derived metrics commit 79044fbee849ed664c04ab8d013d27d2a9ca3d81 Author: Frank Ch. Eigler Date: Tue Oct 15 16:04:00 2013 -0400 FQDN cleanup: fix merge snafu in pmlogger_check.sh commit e9706dd290db120195390a2fea772d7fe3121a59 Merge: b34fde8 21be617 Author: Frank Ch. Eigler Date: Tue Oct 15 14:46:15 2013 -0400 Merge remote-tracking branch 'pcp/dev' into fche/dev * pcp/dev: (68 commits) Resolve recent failures observed in test qa/067 Fix up a recent pmevent argument parsing regression Make pmdammv pmcd.conf updater makefile rules now match pmdapmcd Tighten notrun check on auth test 823, needs plain mech Give stap more time in test 749, 1 sec for startup proved racey Resolve daylight-savings related failure in test 527 Improve test 444 handling of different hostname len Make test 438 deterministic on s390, where an extra I/O happens Tweak qa/177 log read filter, s390 platform makes one more Add Linux disk.partitions metrics to the default logged set Add Linux hinv.nlv DM metric, improve disk metrics help text Simplify test qa/364 to one output form. Tighten test 359 filter for kernels built without schedstats Allow default pmdaproc cgroup setting from the command line Add support for extracting client PID for unix sockets Alloc proc DSO PMDA builds - local context is fine Remove indeterminism from test 200 for initial connect Update test 652 output to match expected pmevent: use local: as default connection Start a new seq.full file between each run of test 652 ... commit b34fde81c0ec72e81985543499f8e016610188da Author: Frank Ch. Eigler Date: Tue Oct 15 14:39:46 2013 -0400 FQDN cleanup: pm{ie}_{check,daily}.sh now 100% pmhostname-free All these rather-similar scripts use the new PM{IE,LOGGER}_PID files to identify corresponding server processes for signalling or restarting. commit 6ce75ca0a5eaca920d16e74df1ea0f125729f0f5 Author: Frank Ch. Eigler Date: Sun Oct 13 16:43:10 2013 -0400 FQDN cleanup: pm{logger,ie}_check tweaks continued Eradicating pmhostname-based searches for pmie/pmlogger instances, instead using a .pid file within the individual log subdirectories, allows much simplification of the code. Also, reinterpret chkconfig-off state to shut down any *_check-controlled pmlogger/pmie instances (not just the "primary" logger). commit 9dd8090e1806f0e485eec24a7c033a6c6a46022a Author: Frank Ch. Eigler Date: Sun Oct 13 11:02:30 2013 -0400 fedora.spec: make /var/log/pcp also pcp:pcp owned, for NOTICES go there commit 1cc165f7b7f6d4d78e6a525c118ce21c3ed8500f Author: Frank Ch. Eigler Date: Sat Oct 12 12:29:37 2013 -0400 FQDN cleanup: note pmhostname as deprecated in its man page commit b533c54bb06f1248f7ce2d8740a37e1a9ff0f251 Author: Frank Ch. Eigler Date: Sat Oct 12 12:15:30 2013 -0400 FQDN cleanup: pcp.sh shan't call deprecated pmhostname commit 50c8c8f678301ddf09867cea0a19a19ab534a51e Author: Frank Ch. Eigler Date: Sat Oct 12 12:05:56 2013 -0400 FQDN cleanup: pmie local:ization Switch pmie sources to default to local: as the connection path. Fork the former dfltHost global into dfltHostConn (as connection path string) and dfltHostName (as pmContextGetName). commit f9737888285026b2b9d06d957d773b8ebd853cb8 Author: Frank Ch. Eigler Date: Sat Oct 12 11:50:13 2013 -0400 pmie FQDN cleanup: rc & _check files Use a logdirectory pmie.pid file to identify pmie instances running locally, not fuzzy notion of monitoring-target hostname. commit 1f7de9967bc4272a7c6e8cdfe5b3215afdeee7ff Author: Frank Ch. Eigler Date: Fri Oct 11 07:46:48 2013 -0400 no change is good change commit ad17a7cc26155af098db9e3f2a2dd7fdfc933553 Author: Frank Ch. Eigler Date: Fri Oct 11 07:45:11 2013 -0400 nothing will ever change commit 8feaca44e23f6fb1d43c8dec20aca7422970808e Author: Frank Ch. Eigler Date: Fri Oct 11 07:40:57 2013 -0400 nothing ever changes commit 1f6f2410f4f0f5542bfabedaa2742bc67c3b5d51 Author: Frank Ch. Eigler Date: Fri Oct 11 07:33:37 2013 -0400 nothing ever changes commit 2c81e04f0263bfcc299715e47b1c4ed721ace74b Author: Frank Ch. Eigler Date: Thu Oct 10 21:10:53 2013 -0400 pmevent: use local: as default connection Change the global "host" to be the result of pmGetContextHostName after connection. commit 96f0ade93a1b0ec0722a2bfe09f2ed2dd23300ad Author: Frank Ch. Eigler Date: Wed Oct 9 14:53:40 2013 -0400 pmlogger FQDN cleanup: use local: throughout, stop DNSification Remove use of DNS forward/backward mappings in pmlogger configuration and reporting, thereby separating access path (-h FOO parameter) vice actual target hostname. * src/pmlogger/control: Note peculiar treatment of LOCALHOSTNAME. * src/pmlogger/pmlogger_check.sh: Rework host name lookup. Force primary logger to use implied "-h local:". Use full hostname(2) for PCP_LOG_DIR subdir. * src/pmlogger/rc_pmlogger: Drop unused definition of $LOCALHOSTNAME. * src/pmlogger/src/pmlogger.c: Preserve original pmcd connection path in new variable pmcd_host_conn. Note it in the pmlogger startup message. * src/pmlogger/src/dopdu.c: Send back pmcd_host_conn in pmlc "fqdn" field, now that we send back the proper pmcd.hostname already in the archive-header.ill_hostname thence "ls_hostname". commit 74354ad745af836df85531d525ba17f9a6bfc824 Author: Frank Ch. Eigler Date: Wed Oct 9 14:53:18 2013 -0400 pmcd FQDN cleanup: drop DNSifying pmcd.hostname commit f3dd0df6ec3d76b71dd5b9064440f2b14a0a2635 Author: Frank Ch. Eigler Date: Wed Oct 9 14:04:21 2013 -0400 man pages: note default of local: vice localhost From brolley@redhat.com Tue Oct 29 11:45:58 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 58E0A7F3F for ; Tue, 29 Oct 2013 11:45:58 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 43BBE8F8059 for ; Tue, 29 Oct 2013 09:45:58 -0700 (PDT) X-ASG-Debug-ID: 1383065154-04cbb00dde22abe0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id IhgOXVo3qHvEWONJ for ; Tue, 29 Oct 2013 09:45:54 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9TGjrJc006649 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 29 Oct 2013 12:45:53 -0400 Received: from [10.15.16.136] (dhcp-10-15-16-136.yyz.redhat.com [10.15.16.136]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9TGjqXe025281; Tue, 29 Oct 2013 12:45:53 -0400 Message-ID: <526FE640.7000507@redhat.com> Date: Tue, 29 Oct 2013 12:45:52 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Nathan Scott CC: pcp@oss.sgi.com Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> <526EAD12.3090904@redhat.com> <526EB301.5090501@redhat.com> <1159676587.13325334.1383032522252.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers In-Reply-To: <1159676587.13325334.1383032522252.JavaMail.root@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1383065154 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 On 10/29/2013 03:42 AM, Nathan Scott wrote: > Hi Dave, > > > Attached patch tackles the build-configuration detection issue - as > discussed on IRC, be good to use this in that new QA test ... [ ... ] > Please review & merge as you see fit. Oh, had some build failures on > your dev branch wrt multiple definitions of some typedefs, fixed here > as well. Thanks. Reviewed, merged and pushed to brolley/dev > Also, be good to give the new Avahi code a quick read over from a code > consistency POV, its a bit all over the place (even relative to itself, > but also the rest of libpcp). I took a look. The only thing that stood out for me was naming convention. i.e. the use of lower_case_with_underscore as opposed to mixedCase. I've pushed some changes along these lines. Let me know if there was something more specific on your mind that I missed. Dave From nscott@redhat.com Tue Oct 29 20:02:34 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 54C557F3F for ; Tue, 29 Oct 2013 20:02:34 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id 2516E8F8052 for ; Tue, 29 Oct 2013 18:02:31 -0700 (PDT) X-ASG-Debug-ID: 1383094946-04bdf0789939e6a0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id UI6aKDdvMhBaa4Kw for ; Tue, 29 Oct 2013 18:02:26 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9U12PpZ012795; Tue, 29 Oct 2013 21:02:25 -0400 Date: Tue, 29 Oct 2013 21:02:25 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <745732126.14561474.1383094945661.JavaMail.root@redhat.com> In-Reply-To: <526EB301.5090501@redhat.com> References: <5251DF3C.7040805@redhat.com> <526EAD12.3090904@redhat.com> <526EB301.5090501@redhat.com> Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers Content-Type: multipart/mixed; boundary="----=_Part_14561471_814878153.1383094945658" X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: First Cut at Avahi Support for PCP Servers Thread-Index: HntShxKAbe2BX5alX67jsYDMdzBjcQ== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1383094946 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141898 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ------=_Part_14561471_814878153.1383094945658 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit ----- Original Message ----- > I forgot to mention that there is some qa fallout associated with new > messages in the pmcd log that I still need to address. I've added a new diagnostic flag to guard these (and future discovery related info/debug messages). Just running rest of QA now, 243 seems to have failed, unrelated to above (first pmcd did not start so second pmcd didn't get the expected bind(2) failure?) ... as has 283, similar issue - pmcd not starting. Tests on-going, so others might crop up as well yet - ~50% done. Given these issues, we should probably add a pmcd command line option to disable the server advertising code - just in case. I've also cleaned up those small consistency issues - see f7e39ca51 - and plan to merge it all shortly into dev, we'll need those remaining failure cases sorted out next I guess. cheers. -- Nathan ------=_Part_14561471_814878153.1383094945658 Content-Type: application/octet-stream; name=283.out.bad Content-Disposition: attachment; filename=283.out.bad Content-Transfer-Encoding: base64 UUEgb3V0cHV0IGNyZWF0ZWQgYnkgMjgzCgo9PT0gUE1DRF9QT1JUPSBwbWNkX29wdD0gPT09Ci0t LSBQTUNEX1BPUlQ9IC0tLQpfX3BtQ29ubmVjdFBNQ0QoSE9TVCk6IHBtY2QgY29ubmVjdGlvbiBw b3J0PTQ0MzIxIGZkPTxuPiBQRFUgdmVyc2lvbj0yCnNhbXBsZS5sb25nLm9uZSAxIDEKLS0tIFBN Q0RfUE9SVD05ODc2LDQzMjEsNDQzMjEgLS0tCl9fcG1Db25uZWN0UE1DRChIT1NUKTogcG1jZCBj b25uZWN0aW9uIHBvcnQ9NDQzMjEgZmQ9PG4+IFBEVSB2ZXJzaW9uPTIKc2FtcGxlLmxvbmcub25l IDEgMQoKPT09IFBNQ0RfUE9SVD05ODc2LDQ0MzIxLDQzMjEgcG1jZF9vcHQ9ID09PQotLS0gUE1D RF9QT1JUPSAtLS0KX19wbUNvbm5lY3RQTUNEKEhPU1QpOiBwbWNkIGNvbm5lY3Rpb24gcG9ydD00 NDMyMSBmYWlsZWQ6IENvbm5lY3Rpb24gcmVmdXNlZAotLS0gUE1DRF9QT1JUPTk4NzYsNDMyMSw0 NDMyMSAtLS0KX19wbUNvbm5lY3RQTUNEKEhPU1QpOiBwbWNkIGNvbm5lY3Rpb24gcG9ydD05ODc2 LDQzMjEsNDQzMjEgZmFpbGVkOiBDb25uZWN0aW9uIHJlZnVzZWQKL3Vzci9saWJleGVjL3BjcC9i aW4vcG1zaWduYWw6IGxpbmUgODg6IGtpbGw6ICgxNjY4NSkgLSBObyBzdWNoIHByb2Nlc3MKCj09 PSBQTUNEX1BPUlQ9IHBtY2Rfb3B0PS1wIDQzMjEgLXAgNDQzMjEgLXAgOTg3NiA9PT0KLS0tIFBN Q0RfUE9SVD0gLS0tCl9fcG1Db25uZWN0UE1DRChIT1NUKTogcG1jZCBjb25uZWN0aW9uIHBvcnQ9 NDQzMjEgZmFpbGVkOiBDb25uZWN0aW9uIHJlZnVzZWQKLS0tIFBNQ0RfUE9SVD05ODc2LDQzMjEs NDQzMjEgLS0tCl9fcG1Db25uZWN0UE1DRChIT1NUKTogcG1jZCBjb25uZWN0aW9uIHBvcnQ9OTg3 Niw0MzIxLDQ0MzIxIGZhaWxlZDogQ29ubmVjdGlvbiByZWZ1c2VkCi91c3IvbGliZXhlYy9wY3Av YmluL3Btc2lnbmFsOiBsaW5lIDg4OiBraWxsOiAoMTY3MTgpIC0gTm8gc3VjaCBwcm9jZXNzClN0 YXJ0aW5nIHBtY2QgLi4uIApTdGFydGluZyBwbWxvZ2dlciAuLi4gCg== ------=_Part_14561471_814878153.1383094945658 Content-Type: application/octet-stream; name=243.out.bad Content-Disposition: attachment; filename=243.out.bad Content-Transfer-Encoding: base64 UUEgb3V0cHV0IGNyZWF0ZWQgYnkgMjQzCldhaXRpbmcgZm9yIHBtY2QgdG8gdGVybWluYXRlIC4u LgpDaGVja2luZyBmb3Igc3RhcnR1cCBlcnJvcnMgLi4uCgpUcnlpbmcgdG8gc3RhcnQgYW5vdGhl ciBQTUNEIG92ZXIgdGhlIHRvcCBvZiB0aGUgZmlyc3Qgb25lLgpFeHBlY3QgImJpbmQ6ICBBZGRy ZXNzIGFscmVhZHkgaW4gdXNlIi4uLjoKQ2hlY2tpbmcgZm9yIHN0YXJ0dXAgZXJyb3JzIC4uLgpO T1RFOiBwbWNkIG5vdCBzdGFydGVkIGR1ZSB0byBlcnJvcnMhICBMb2cgZmlsZSAicG1jZC5sb2ci IGNvbnRhaW5zIC4uLgouLi4gYm9yaW5nIHN0dWZmIGRlbGV0ZWQKW0RBVEVdIHBtY2QoUElEKSBF cnJvcjogcG1jZCBpcyBhbHJlYWR5IHJ1bm5pbmcKW0RBVEVdIHBtY2QoUElEKSBFcnJvcjogT3Bl blJlcXVlc3RTb2NrZXQoNDQzMjEsIDB4MCwgaXB2NikgYmluZDogQWRkcmVzcyBhbHJlYWR5IGlu IHVzZQpbREFURV0gcG1jZChQSUQpIEVycm9yOiBwbWNkIGlzIGFscmVhZHkgcnVubmluZwpbREFU RV0gcG1jZChQSUQpIEVycm9yOiBwbWNkOiBjYW4ndCBvcGVuIGFueSByZXF1ZXN0IHBvcnRzLCBl eGl0aW5nCltEQVRFXSBwbWNkKFBJRCkgRXJyb3I6IHBtY2Qgbm90IHN0YXJ0ZWQgZHVlIHRvIGVy cm9ycyEKQ2hlY2tpbmcgdGhhdCBsb2cgaGFzbid0IGNoYW5nZWQgLi4uCjMsMTBjMyw2CjwgW1dl ZCBPY3QgMzAgMTE6Mzk6MzZdIHBtY2QoNTk0MikgRXJyb3I6IE9wZW5SZXF1ZXN0U29ja2V0KDQ0 MzIxLCBJTkFERFJfQU5ZLCBpbmV0KSBfX3BtQmluZDogQWRkcmVzcyBhbHJlYWR5IGluIHVzZQo8 IFtXZWQgT2N0IDMwIDExOjM5OjM2XSBwbWNkKDU5NDIpIEVycm9yOiBwbWNkIG1heSBhbHJlYWR5 IGJlIHJ1bm5pbmcKPCBbV2VkIE9jdCAzMCAxMTozOTozNl0gcG1jZCg1OTQyKSBFcnJvcjogT3Bl blJlcXVlc3RTb2NrZXQoNDQzMjEsIElOQUREUl9BTlksIGlwdjYpIF9fcG1CaW5kOiBBZGRyZXNz IGFscmVhZHkgaW4gdXNlCjwgW1dlZCBPY3QgMzAgMTE6Mzk6MzZdIHBtY2QoNTk0MikgRXJyb3I6 IHBtY2QgbWF5IGFscmVhZHkgYmUgcnVubmluZwo8IFtXZWQgT2N0IDMwIDExOjM5OjM2XSBwbWNk KDU5NDIpIEVycm9yOiBPcGVuUmVxdWVzdFNvY2tldCgwLCAvdG1wLzU1OTUvcG1jZC5zb2NrZXQs IHVuaXgpIF9fcG1CaW5kOiBBZGRyZXNzIGFscmVhZHkgaW4gdXNlCjwgW1dlZCBPY3QgMzAgMTE6 Mzk6MzZdIHBtY2QoNTk0MikgRXJyb3I6IHBtY2QgbWF5IGFscmVhZHkgYmUgcnVubmluZwo8IFtX ZWQgT2N0IDMwIDExOjM5OjM2XSBwbWNkKDU5NDIpIEVycm9yOiBwbWNkOiBjYW4ndCBvcGVuIGFu eSByZXF1ZXN0IHBvcnRzLCBleGl0aW5nCjwgW1dlZCBPY3QgMzAgMTE6Mzk6MzZdIHBtY2QoNTk0 MikgRXJyb3I6IHBtY2Qgbm90IHN0YXJ0ZWQgZHVlIHRvIGVycm9ycyEKLS0tCj4gcG1jZDogdW5l eHBlY3RlZCBlbmQtb2YtZmlsZSBhdCBpbml0aWFsIGV4Y2hhbmdlIHdpdGggcHJvYyBQTURBCj4g cG1jZDogdW5leHBlY3RlZCBlbmQtb2YtZmlsZSBhdCBpbml0aWFsIGV4Y2hhbmdlIHdpdGggdHJp dmlhbCBQTURBCj4gcG1jZDogdW5leHBlY3RlZCBlbmQtb2YtZmlsZSBhdCBpbml0aWFsIGV4Y2hh bmdlIHdpdGggc2FtcGxlIFBNREEKPiBwbWNkOiB1bmV4cGVjdGVkIGVuZC1vZi1maWxlIGF0IGlu aXRpYWwgZXhjaGFuZ2Ugd2l0aCBzaW1wbGUgUE1EQQoxMmM4LDM0CjwgTG9nIGZpbmlzaGVkIFdl ZCBPY3QgMzAgMTE6Mzk6MzYgMjAxMwotLS0KPiBhY3RpdmUgYWdlbnQgZG9tICAgcGlkICBpbiBv dXQgdmVyIHByb3RvY29sIHBhcmFtZXRlcnMKPiA9PT09PT09PT09PT0gPT09ID09PT09ID09PSA9 PT0gPT09ID09PT09PT09ID09PT09PT09PT0KPiBwbWNkICAgICAgICAgICAyICAgICAgICAgICAg ICAgICAyIGRzbyBpOjUgIGxpYj0vdmFyL2xpYi9wY3AvcG1kYXMvcG1jZC9wbWRhX3BtY2Quc28g ZW50cnk9cG1jZF9pbml0IFsweDdmNWE2ODIzYjk4MF0KPiBsaW51eCAgICAgICAgIDYwICAgICAg ICAgICAgICAgICAyIGRzbyBpOjQgIGxpYj0vdmFyL2xpYi9wY3AvcG1kYXMvbGludXgvcG1kYV9s aW51eC5zbyBlbnRyeT1saW51eF9pbml0IFsweDdmNWE2M2RlNWFhMF0KPiB4ZnMgICAgICAgICAg IDExICA1OTM2ICAxNCAgMTUgICAyIGJpbiBwaXBlIGNtZD0vdmFyL2xpYi9wY3AvcG1kYXMveGZz L3BtZGF4ZnMgLWQgMTEKPiBzYW1wbGVkc28gICAgIDMwICAgICAgICAgICAgICAgICAyIGRzbyBp OjYgIGxpYj0vdmFyL2xpYi9wY3AvcG1kYXMvc2FtcGxlL3BtZGFfc2FtcGxlLnNvIGVudHJ5PXNh bXBsZV9pbml0IFsweDdmNWE2M2JkMTQ0MF0KPiBqYmQyICAgICAgICAgMTIyICAgICAgICAgICAg ICAgICAyIGRzbyBpOjQgIGxpYj0vdmFyL2xpYi9wY3AvcG1kYXMvamJkMi9wbWRhX2piZDIuc28g ZW50cnk9amJkMl9pbml0IFsweDdmNWE2MzljOTY1MF0KPiBtbXYgICAgICAgICAgIDcwICAgICAg ICAgICAgICAgICAyIGRzbyBpOjQgIGxpYj0vdmFyL2xpYi9wY3AvcG1kYXMvbW12L3BtZGFfbW12 LnNvIGVudHJ5PW1tdl9pbml0IFsweDdmNWE2MzdjMjg3MF0KPiAKPiBIb3N0IGFjY2VzcyBsaXN0 Ogo+IDAwIDAxIEN1ci9NYXhDb25zIGhvc3Qtc3BlYyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBob3N0LW1hc2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbHZsIGhvc3QtbmFt ZQo+ID09ID09ID09PT09PT09PT09ID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PSA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0gPT09ID09PT09PT09 PT09PT09Cj4gIHkgIHkgICAgIDAgICAgIDAgMTkyLjE2OC4wLjEwOCAgICAgICAgICAgICAgICAg ICAgICAgICAgIDI1NS4yNTUuMjU1LjI1NSAgICAgICAgICAgICAgICAgICAgICAgICAgIDAgbG9j YWxob3N0Cj4gIHkgIHkgICAgIDAgICAgIDAgLyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEgdW5p eDoKPiAgICAgbiAgICAgMCAgICAgMCAwLjAuMC4wICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgMC4wLjAuMCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgNCAuKgo+ICAg ICBuICAgICAwICAgICAwIDo6ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6 OiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA4IDoqCj4gVXNlciBhY2Nl c3MgbGlzdCBlbXB0eTogdXNlci1iYXNlZCBhY2Nlc3MgY29udHJvbCB0dXJuZWQgb2ZmCj4gR3Jv dXAgYWNjZXNzIGxpc3QgZW1wdHk6IGdyb3VwLWJhc2VkIGFjY2VzcyBjb250cm9sIHR1cm5lZCBv ZmYKPiAKPiAKPiBwbWNkOiBQSUQgPSA1OTI4LCBQRFUgdmVyc2lvbiA9IDIKPiBwbWNkIHJlcXVl c3QgcG9ydChzKToKPiAgIHN0cyBmZCAgIHBvcnQgIGZhbWlseSBhZGRyZXNzCj4gICA9PT0gPT09 PSA9PT09PSA9PT09PT0gPT09PT09PQo+ICAgb2sgIDEwMjYgICAgICAgdW5peCAgIC90bXAvNTU5 NS9wbWNkLnNvY2tldAo+ICAgb2sgIDEwMjQgNDQzMjEgaW5ldCAgIElOQUREUl9BTlkKPiAgIG9r ICAxMDI1IDQ0MzIxIGlwdjYgICBJTkFERFJfQU5ZClJlc3RhcnQgYW5kIHBpbmcgcG1jZCAuLi4K U3RhcnRpbmcgcG1jZCAuLi4gClN0YXJ0aW5nIHBtbG9nZ2VyIC4uLiAKcG1jZC5jb250cm9sLmRl YnVnIDEK ------=_Part_14561471_814878153.1383094945658-- From nscott@redhat.com Tue Oct 29 21:58:28 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id DD51F7F3F for ; Tue, 29 Oct 2013 21:58:28 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id AD5D08F8064 for ; Tue, 29 Oct 2013 19:58:25 -0700 (PDT) X-ASG-Debug-ID: 1383101900-04bdf078973a2d40001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 7faKlI5qVwHS8o4r for ; Tue, 29 Oct 2013 19:58:20 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9U2wJeE003927 for ; Tue, 29 Oct 2013 22:58:19 -0400 Date: Tue, 29 Oct 2013 22:58:19 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: PCP Message-ID: <180839534.14636422.1383101899853.JavaMail.root@redhat.com> In-Reply-To: <527116882.14636308.1383101850518.JavaMail.root@redhat.com> Subject: pcp updates: pmcd service advertising (discovery phase#1) MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: pmcd service advertising (discovery phase#1) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: pmcd service advertising (discovery phase#1) Thread-Index: ktaYn8nPPy+EAFWdo/pwU+gN0eHxtw== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1383101900 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141900 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev CHANGELOG | 8 build/rpm/GNUmakefile | 3 build/rpm/fedora.spec | 1 build/rpm/pcp.spec.in | 5 configure | 1178 ++++++++++++++++++++++++------------------ configure.in | 94 ++- debian/control | 2 qa/454 | 1 qa/546 | 1 qa/640 | 60 -- qa/640.out | 3 qa/840 | 46 + qa/840.out | 2 qa/944 | 1 qa/group | 4 qa/src/GNUlocaldefs | 2 qa/src/pmpost-exploit.c | 95 --- src/include/builddefs.in | 5 src/include/pcp/config.h.in | 4 src/include/pcp/impl.h | 24 src/libpcp/src/GNUmakefile | 25 src/libpcp/src/auxserver.c | 255 ++++++--- src/libpcp/src/avahi.c | 724 +++++++++++++++++++------ src/libpcp/src/avahi.h | 61 +- src/libpcp/src/check-statics | 10 src/libpcp/src/config.c | 6 src/libpcp/src/internal.h | 16 src/libpcp/src/secureserver.c | 40 - src/pmcd/src/pmcd.c | 12 src/pmdbg/pmdbg.c | 2 30 files changed, 1675 insertions(+), 1015 deletions(-) commit cc5afacc0a22fdbd3952a772cfaddd7233488896 Author: Nathan Scott Date: Wed Oct 30 13:05:01 2013 +1100 Filter Avahi warning from tests intentionally running an extra pmcd commit de104f8be37379c8335780e46e417bc259d6e2e6 Author: Nathan Scott Date: Wed Oct 30 10:51:27 2013 +1100 Update test 640 output after recent test changes commit c845ba02f282511298d46adf39c18ba404aed5dd Author: Nathan Scott Date: Wed Oct 30 10:35:41 2013 +1100 Small changelog updates for planned small bugfix release commit 8b6d2e95a773095b6f75d6ef3122a0ba9d57e8ea Merge: 472edd3 169b84b Author: Nathan Scott Date: Wed Oct 30 10:29:52 2013 +1100 Merge branch 'brolley/dev' of ../pcpfans into dev commit 169b84b6fe596a983d728f0077169f9f349cbcc3 Author: Nathan Scott Date: Wed Oct 30 10:27:55 2013 +1100 Add a DBG_DISCOVERY tracing flag, and begin using it for Avahi commit 472edd343bfb5e61c635f29b9ae892a5e6a7274e Author: Nathan Scott Date: Wed Oct 30 10:22:54 2013 +1100 Rework the old pmpost exploit test so it does useful work commit f7e39ca5140380f02f197df1d434127714cb2295 Author: Nathan Scott Date: Wed Oct 30 09:48:02 2013 +1100 Trivial code consistency cleanups in shiny new Avahi code commit 836946462a62311b7a13ec9bb9432aa28921239f Author: Nathan Scott Date: Wed Oct 30 09:47:16 2013 +1100 Make qa/840 seek more widely for avahi-daemon (in /usr/sbin here) commit a8419b4b71b4a406eb6278f8c962576d82643c9e Author: Dave Brolley Date: Tue Oct 29 15:44:55 2013 -0400 New test 840, checks that PMCD is advertising using avahi when supported. commit 028fb3122faa8596ccc1cfcc3ad4fcf2b89a7b86 Author: Dave Brolley Date: Tue Oct 29 12:39:06 2013 -0400 Some code consistency fixups for the new avahi.c Mainly naming conventions changes: Use mixedCaseNames instead of lower_case_with_underscore where possible. The avahi API uses the latter, so those names could not be changed. commit a64c28341a86ee777fc02ac2104b66d0d5f8cd99 Merge: 17cd682 d7bb8c1 Author: Dave Brolley Date: Tue Oct 29 12:20:45 2013 -0400 Merge remote-tracking branch 'origin/dev' into brolley/dev commit 17cd68292f88e2d9be8606df5c8ff4e0c81aa77a Author: Nathan Scott Date: Tue Oct 29 12:06:04 2013 -0400 Implement build-configuration detection for service_discovery. commit e62d61223fe358b6466744b08332416dc2a9966b Merge: 97b1d9e c044afc Author: Dave Brolley Date: Mon Oct 28 13:53:46 2013 -0400 Merge remote-tracking branch 'origin/dev' into brolley/dev commit 97b1d9e75832624b0d1250b9d23513125fbdbf90 Author: Dave Brolley Date: Mon Oct 28 12:46:24 2013 -0400 Configuration enhancements for dns-sd from nathans. Also a few tweaks to make it merge cleanly with the current code. commit c554195887ace7d3c5007be893ffe8d0c539db92 Author: Dave Brolley Date: Mon Oct 28 11:10:44 2013 -0400 Rework libpcp support for servers to announce their presence on the network. - Plug the leak of avahi-ness in the API: - abstracted __pmServerPresence to be an opaque struct which can contain information about multiple broadcast methods. Currently only avahi is represented. The server need not be aware of which one(s) are available/active. - Replaced __pmServerSetServiceName() and __pmServerSetServiceTag() with __pmServerSetServiceSpec(const char *). The argument is a string which identifies the service to be advertised. Currently, it is simply the name of the server (e.g. "pmcd"). - __pmServerAdvertisePresence() can now use multiple methods (currently only avahi) to advertise the server. Similarly, __pmServerUnadvertisePresence() can clean up all of the active announcements. commit fc0d8cb59e6b2a3c22e895f657f5707ad0b81d3c Merge: 2c2bb7e fd4214f Author: Dave Brolley Date: Mon Oct 21 10:39:24 2013 -0400 Merge remote-tracking branch 'origin/dev' into brolley/dev commit 2c2bb7e60f8229076ac1ca5b43435d412e55168e Author: Dave Brolley Date: Mon Oct 21 10:38:28 2013 -0400 Reformat code to eliminate long source lines. commit d7912266708a553b610aff363610069f019b8dd1 Merge: 5cdeaa1 2942bd8 Author: Dave Brolley Date: Mon Oct 7 16:30:55 2013 -0400 Merge remote-tracking branch 'origin/dev' into brolley/dev commit 5cdeaa18b367a16d80a1a6066116d74749281929 Author: Dave Brolley Date: Mon Oct 7 16:21:55 2013 -0400 libpcp support for servers to advertise on the local network. - Support is provided by Avahi, where available and otherwise disabled. - Servers indicate that they want to advertise their presence by calling __pmServerSetServiceName() and/or __pmServerSetServiceTag(). When one or both of these functions has been called before __pmServerOpenRequestPorts(), then __pmServerOpenRequestPorts() will advertise the server once for each port it is listening on. The service for each port will be unadvertised when __pmCloseRequestPorts() is called or when the server shuts down. - Servers may also advertise themselves directly by calling __pmServerAdvertisePresence()/__pmServerUnadvertisePresence() This code is accessed via the new API functions __pmServerAdvertisePresence() and __pmServerUnadvertisePresence() From nscott@redhat.com Tue Oct 29 22:00:26 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 6F5FA7F3F for ; Tue, 29 Oct 2013 22:00:26 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id E0CA6AC004 for ; Tue, 29 Oct 2013 20:00:22 -0700 (PDT) X-ASG-Debug-ID: 1383102021-04bdf078993a2e50001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id fvGfTTYZiBZBzlkV for ; Tue, 29 Oct 2013 20:00:21 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9U30FEU004014; Tue, 29 Oct 2013 23:00:15 -0400 Date: Tue, 29 Oct 2013 23:00:15 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <62730036.14637319.1383102015353.JavaMail.root@redhat.com> In-Reply-To: <745732126.14561474.1383094945661.JavaMail.root@redhat.com> References: <5251DF3C.7040805@redhat.com> <526EAD12.3090904@redhat.com> <526EB301.5090501@redhat.com> <745732126.14561474.1383094945661.JavaMail.root@redhat.com> Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: First Cut at Avahi Support for PCP Servers Thread-Index: HntShxKAbe2BX5alX67jsYDMdzBjcUu+MVFt X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1383102021 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141900 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > > > ----- Original Message ----- > > I forgot to mention that there is some qa fallout associated with new > > messages in the pmcd log that I still need to address. > > I've added a new diagnostic flag to guard these (and future discovery > related info/debug messages). Just running rest of QA now, 243 seems > to have failed, unrelated to above (first pmcd did not start so second > pmcd didn't get the expected bind(2) failure?) ... as has 283, similar > issue - pmcd not starting. Tests on-going, so others might crop up as > well yet - ~50% done. Its just those two remaining now, I've fixed up the other few. > Given these issues, we should probably add a pmcd command line option > to disable the server advertising code - just in case. > > I've also cleaned up those small consistency issues - see f7e39ca51 - > and plan to merge it all shortly into dev, we'll need those remaining > failure cases sorted out next I guess. (merged now) cheers. -- Nathan From brolley@redhat.com Wed Oct 30 15:29:14 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id A16B77F52 for ; Wed, 30 Oct 2013 15:29:14 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id 807828F8064 for ; Wed, 30 Oct 2013 13:29:11 -0700 (PDT) X-ASG-Debug-ID: 1383164950-04bdf078983dc260001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id wMFsjlHETTpWvfKc for ; Wed, 30 Oct 2013 13:29:10 -0700 (PDT) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9UKT988002236 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 30 Oct 2013 16:29:09 -0400 Received: from [10.15.16.136] (dhcp-10-15-16-136.yyz.redhat.com [10.15.16.136]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9UKT9cN018199; Wed, 30 Oct 2013 16:29:09 -0400 Message-ID: <52716C14.7070808@redhat.com> Date: Wed, 30 Oct 2013 16:29:08 -0400 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Nathan Scott CC: pcp@oss.sgi.com Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers References: <5251DF3C.7040805@redhat.com> <526EAD12.3090904@redhat.com> <526EB301.5090501@redhat.com> <745732126.14561474.1383094945661.JavaMail.root@redhat.com> <62730036.14637319.1383102015353.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers In-Reply-To: <62730036.14637319.1383102015353.JavaMail.root@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1383164950 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 On 10/29/2013 11:00 PM, Nathan Scott wrote: > Just running rest of QA now, 243 seems > to have failed, unrelated to above (first pmcd did not start so second > pmcd didn't get the expected bind(2) failure?) ... as has 283, similar > issue - pmcd not starting. Tests on-going, so others might crop up as > well yet - ~50% done. > Its just those two remaining now, I've fixed up the other few. The following (see below) have been pushed to brolley/dev on pcpfans. With these changes, both tests still fail with an extra message about stopping pmlogger. I don't think that is related to the discovery stuff and may even be the correct output. 243 - output mismatch (see 243.out.bad) 18a19 > Stopping pmlogger ... Check local PMCD is still alive ... PMDA probe: pminfo -h brolley-t510 -f sample.milliseconds PMDA probe: pminfo -h brolley-t510 -f sampledso.milliseconds PMDA probe: pminfo -h brolley-t510 -f simple.numfetch 283 - output mismatch (see 283.out.bad) 26a27 > Stopping pmlogger ... Check local PMCD is still alive ... PMDA probe: pminfo -h brolley-t510 -f sample.milliseconds PMDA probe: pminfo -h brolley-t510 -f sampledso.milliseconds PMDA probe: pminfo -h brolley-t510 -f simple.numfetch Failures: 243 283 Failed 2 of 2 tests -------------------------------------------------------------------------------- commit 60e87882d300c7cd6f1f78444f01adb81dafc9a0 Author: Dave Brolley Date: Wed Oct 30 16:23:07 2013 -0400 Fix premature free of avahi service tag name. Also filter Avahi service name collisions messages in qa test 283. Completes the fix of qa test 243 and fixes qa test 283. commit 7619ccfb8a06b033b51cd0160033eb44d1e57303 Author: Dave Brolley Date: Wed Oct 30 16:22:20 2013 -0400 Revert previous change which opened the log before opening the request ports. Partially fixes qa test 243. From nscott@redhat.com Wed Oct 30 20:39:55 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id A47277F52 for ; Wed, 30 Oct 2013 20:39:55 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id 82E0530405F for ; Wed, 30 Oct 2013 18:39:55 -0700 (PDT) X-ASG-Debug-ID: 1383183591-04bdf078973e9500001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id gZiNO3eQKtIworhI for ; Wed, 30 Oct 2013 18:39:51 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9V1dolM007648; Wed, 30 Oct 2013 21:39:50 -0400 Date: Wed, 30 Oct 2013 21:39:50 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <400830526.15833932.1383183590869.JavaMail.root@redhat.com> In-Reply-To: <52716C14.7070808@redhat.com> References: <5251DF3C.7040805@redhat.com> <526EAD12.3090904@redhat.com> <526EB301.5090501@redhat.com> <745732126.14561474.1383094945661.JavaMail.root@redhat.com> <62730036.14637319.1383102015353.JavaMail.root@redhat.com> <52716C14.7070808@redhat.com> Subject: Re: [pcp] First Cut at Avahi Support for PCP Servers MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] First Cut at Avahi Support for PCP Servers Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: First Cut at Avahi Support for PCP Servers Thread-Index: G+uVzqwg2ysFFLEEc4AWmX9vg+muDw== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1383183591 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.03 X-Barracuda-Spam-Status: No, SCORE=0.03 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141920 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > On 10/29/2013 11:00 PM, Nathan Scott wrote: > > Its just those two remaining now, I've fixed up the other few. > The following (see below) have been pushed to brolley/dev on pcpfans. > With these changes, both tests still fail with an extra message about > stopping pmlogger. I don't think that is related to the discovery stuff > and may even be the correct output. > That will be because pmlogger was not chkconfig on at the start I think, which QA expects it to be. With last couple of tweaks here, adding new pmcd option and pmdapmcd metric, I think this is all good now & running hopefully last QA run for this release now. cheers. -- Nathan From nscott@redhat.com Wed Oct 30 21:25:35 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 93CB27F52 for ; Wed, 30 Oct 2013 21:25:35 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id 553C630405F for ; Wed, 30 Oct 2013 19:25:32 -0700 (PDT) X-ASG-Debug-ID: 1383186330-04bdf078993ea760001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id u3Sqjb48sHp73ue8 for ; Wed, 30 Oct 2013 19:25:30 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9V2PUMh014979 for ; Wed, 30 Oct 2013 22:25:30 -0400 Date: Wed, 30 Oct 2013 22:25:30 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1616318545.15847696.1383186330300.JavaMail.root@redhat.com> Subject: pcp updates: mostly harmless^Wqa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: mostly harmless^Wqa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: mostly harmless^Wqa Thread-Index: f1eZLzwAVsQ1lUKwiFeVqKkfk2yZ9w== X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1383186330 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.22 X-Barracuda-Spam-Status: No, SCORE=0.22 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=PR0N_SUBJECT, THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141922 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.20 PR0N_SUBJECT Subject has letters around special characters (pr0n) Changes committed to git://oss.sgi.com/pcp/pcp.git dev build/rpm/fedora.spec | 1 + man/man1/pmcd.1 | 13 ++++++++++--- qa/283 | 6 ++++-- qa/454 | 1 - qa/546 | 1 - qa/713 | 1 + qa/944 | 1 - src/include/pcp/impl.h | 1 + src/libpcp/src/auxserver.c | 21 +++++++++++++++++++-- src/libpcp/src/avahi.c | 29 +++++++++++++++++++---------- src/libpcp/src/internal.h | 1 + src/libpcp/src/secureserver.c | 7 +++++++ src/pmcd/src/pmcd.c | 11 ++++++++--- src/pmdas/pmcd/help | 3 +++ src/pmdas/pmcd/root_pmcd | 1 + src/pmdas/pmcd/src/pmcd.c | 7 +++++-- src/pmieconf/global/ov_actions | 4 ++-- src/pmieconf/global/pcp_actions | 7 +++---- 18 files changed, 85 insertions(+), 31 deletions(-) commit 4e3bcf0ad19e3d3f6ed27c6d05ac8355eb71c9f9 Author: Nathan Scott Date: Thu Oct 31 13:22:03 2013 +1100 Add the pmcd.feature.service_discovery metric commit d2aebacb6f43369f54009af74f807d3179314bfe Author: Nathan Scott Date: Thu Oct 31 13:21:25 2013 +1100 Rethink the conflicting-Avahi-service-registry-attempted message We've recently started to generate a warning message when the pmcd Avahi service needs to be shifted a slot, as there's one already registered. This is a normal scenario in the case where more than one pmcd port has been requested (back-compat mode) so we should not warn here. In most cases where this would happen (ie someone registers "PCP pmcd" as a service), its extremely like it was us. Its also highly problematic because of where the message is issued, has to be just prior to opening log files which means it goes into the ether anyway, usually, rather than being logged. Made this as a diagnostic info message guarded by the discovery pmDebug flag as a result. commit e3821d228e570ef4f48a3b5e754e8f7aaf248b19 Author: Nathan Scott Date: Thu Oct 31 13:04:22 2013 +1100 Add a new pmcd option to disable service advertisement commit 0cf39b9b5cb3db5ce822d7663701c9da14c5e4cf Author: Nathan Scott Date: Thu Oct 31 11:10:57 2013 +1100 Modernisation of a couple of older pmieconf templates commit 8f6c24931e59d7268ef6307efc494ba5b11aa523 Author: Nathan Scott Date: Thu Oct 31 10:23:07 2013 +1100 Update fedora spec changelog with bz details commit 993da349ef32c56d7daa271dffd7b8738bdf2f39 Author: Nathan Scott Date: Thu Oct 31 09:37:57 2013 +1100 Fix unused vars compiler warnings in pmdapmcd hostnameinfo commit 307d46fcba3e862fe68a70adec3f8b6e36af7309 Merge: 684c42a 60e8788 Author: Nathan Scott Date: Thu Oct 31 09:09:37 2013 +1100 Merge branch 'brolley/dev' of ../pcpfans into dev commit 60e87882d300c7cd6f1f78444f01adb81dafc9a0 Author: Dave Brolley Date: Wed Oct 30 16:23:07 2013 -0400 Fix premature free of avahi service tag name. Also filter Avahi service name collisions messages in qa test 283. Completes the fix of qa test 243 and fixes qa test 283. commit 7619ccfb8a06b033b51cd0160033eb44d1e57303 Author: Dave Brolley Date: Wed Oct 30 16:22:20 2013 -0400 Revert previous change which opened the log before opening the request ports. Partially fixes qa test 243. commit 684c42ae640d6d29bce19b7bd8f40da5bf766515 Author: Nathan Scott Date: Wed Oct 30 18:59:59 2013 +1100 Close a small log-file-create-race window in test qa/713 From stuart@nubnet.net Thu Oct 31 06:33:59 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: ** X-Spam-Status: No, score=2.2 required=5.0 tests=HTML_MESSAGE,MPART_ALT_DIFF autolearn=no version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id CBA467F56 for ; Thu, 31 Oct 2013 06:33:59 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay1.corp.sgi.com (Postfix) with ESMTP id B9BCB8F8064 for ; Thu, 31 Oct 2013 04:33:56 -0700 (PDT) X-ASG-Debug-ID: 1383219229-04cb6c40d53e6a30001-S8gJnT Received: from picon.itnow.net.au (picon.itnow.net.au [103.251.134.25]) by cuda.sgi.com with ESMTP id C8ZivkZzkMxBiebn for ; Thu, 31 Oct 2013 04:33:50 -0700 (PDT) X-Barracuda-Envelope-From: stuart@nubnet.net X-Barracuda-Apparent-Source-IP: 103.251.134.25 Received: from Unknown (unknown [103.251.134.25]) (Authenticated sender: stuart@nubnet.net) by picon.itnow.net.au (Postfix) with ESMTP id 793122DFFDE; Thu, 31 Oct 2013 21:33:43 +1000 (EST) Received: from Unknown ([5.248.59.45] helo=Unknown) by picon.itnow.net.au with SMTP (2.3.3); 31 Oct 2013 21:33:40 +1000 X-AntiVirus: Checked by Dr.Web [version: 8.0.7.07121, engine: 8.1.0.07100, virus records: 4617429, updated: 31.10.2013] Message-ID: Reply-To: =?iso-8859-5?Q?=C2=D0=E2=EC=EF=DD=D0_=CD=D4=E3=D0=E0=D4?= =?iso-8859-5?Q?=DE=D2=DD=D0?= From: =?iso-8859-5?Q?=C2=D0=E2=EC=EF=DD=D0_=CD=D4=E3=D0=E0=D4?= =?iso-8859-5?Q?=DE=D2=DD=D0?= To: , , , , Subject: =?iso-8859-5?Q?=B4=DE=D1=E0=EB=D9_=D4=D5=DD=EC?= Date: Thu, 31 Oct 2013 12:33:51 +0100 X-ASG-Orig-Subj: =?iso-8859-5?Q?=B4=DE=D1=E0=EB=D9_=D4=D5=DD=EC?= MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_NextPart_000_07DF_01CED635.748A1420" X-Priority: 3 X-Assp-Version: 2.3.3(13276) on picon.itnow.net.au X-Assp-ID: picon.itnow.net.au m1-19223-12361 X-Assp-Session: 1A1A3540 (mail 1) X-Assp-Envelope-From: stuart@nubnet.net X-Assp-Intended-For: navigator@navigator.hr X-Assp-Intended-For: cuchranova@flaga.sk X-Assp-Intended-For: pcp@oss.sgi.com X-Assp-Intended-For: office@tsonevflooring.ru X-Assp-Intended-For: shitova.natalia@cartuz.com X-Barracuda-Connect: picon.itnow.net.au[103.251.134.25] X-Barracuda-Start-Time: 1383219230 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.14 X-Barracuda-Spam-Status: No, SCORE=0.14 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=HTML_MESSAGE, MPART_ALT_DIFF X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141931 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 HTML_MESSAGE BODY: HTML included in message 0.14 MPART_ALT_DIFF BODY: HTML and text parts are different This is a multi-part message in MIME format. ------=_NextPart_000_07DF_01CED635.748A1420 Content-Type: text/plain; charset="iso-8859-5" Content-Transfer-Encoding: base64 aHR0cDovL3YxLnJ1L2dvLz91cmw9aHR0cDovL2NhZmVsYXN0cmFkYS5yby93cC1jb250ZW50L3Bs dWdpbnMvd3Bfc2VkL2hhYmxuLmh0bT8vZGFRINPb0NfQIGh0dHA6Ly92MS5ydS9nby8/dXJsPWh0 dHA6Ly9jYWZlbGFzdHJhZGEucm8vd3AtY29udGVudC9wbHVnaW5zL3dwX3NlZC9oYWJsbi5odG0/ L3ltSWVjbnVwZnLc3tPj4iDX0NzV59Di7CDS1eDd1dUuDQoNCuPU3tHd1dno2Nkg3NXi3tQg19Dp 2OLY4uHvIN7iINHb2Nfe4OPa3uHi2C4NCg== ------=_NextPart_000_07DF_01CED635.748A1420 Content-Type: text/html; charset="iso-8859-5" Content-Transfer-Encoding: base64 PGh0bWw+PGhlYWQ+PG1ldGEgY2hhcnNldD1pc28tODg1OS01PjwvaGVhZD48Ym9keSBzdHlsZT0i Zm9udC1mYW1pbHk6R2VvcmdpYTsiPjxkaXY+IDxwPiA8YSBocmVmPSJodHRwOi8vdjEucnUvZ28v P3VybD1odHRwOi8vY2FmZWxhc3RyYWRhLnJvL3dwLWNvbnRlbnQvcGx1Z2lucy93cF9zZWQvaGFi bG4uaHRtPy9kYVEiPmh0dHA6Ly92MS5ydS9nby8/dXJsPWh0dHA6Ly9jYWZlbGFzdHJhZGEucm8v d3AtY29udGVudC9wbHVnaW5zL3dwX3NlZC9oYWJsbi5odG0/L3ltSWVjbnVwZnI8L2E+INPb0NfQ INze0+PiINfQ3NXn0OLsINLV4N3V1S4gPGJyPiA8L2Rpdj4g49Te0d3V2ejY2SDc1eLe1CDX0OnY 4tji4e8g3uIg0dvY197g49re4eLYLiA8ZGl2PiA8L3A+IDxicj4gPC9kaXY+IDwvYm9keT48L2h0 bWw+DQo= ------=_NextPart_000_07DF_01CED635.748A1420-- From bugzilla@redhat.com Thu Oct 31 17:05:33 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 706EB7F56 for ; Thu, 31 Oct 2013 17:05:33 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 4E5CF304067 for ; Thu, 31 Oct 2013 15:05:30 -0700 (PDT) X-ASG-Debug-ID: 1383257125-04cb6c40d4416380001-S8gJnT Received: from mx1-phx2.redhat.com (mx1-phx2.redhat.com [209.132.183.26]) by cuda.sgi.com with ESMTP id oZLBfGihRaXTRZYY for ; Thu, 31 Oct 2013 15:05:26 -0700 (PDT) X-Barracuda-Envelope-From: bugzilla@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.26 X-Barracuda-Registry: Level1 [redhat.com/209.132.183.26] Received: from bzweb02.app.bz.hst.phx2.redhat.com (bzweb02.app.bz.hst.phx2.redhat.com [10.5.117.17]) by mx1-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9VM5PQV018075 for ; Thu, 31 Oct 2013 18:05:25 -0400 X-Barracuda-Registry: Level1 [redhat.com/209.132.183.26] X-Barracuda-Registry: Level1 [redhat.com/209.132.183.26] X-Barracuda-Registry: Level1 [redhat.com/209.132.183.26] Received: from bzweb02.app.bz.hst.phx2.redhat.com (localhost.localdomain [127.0.0.1]) by bzweb02.app.bz.hst.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9VM5Pkx001426 for ; Thu, 31 Oct 2013 18:05:25 -0400 Received: (from root@localhost) by bzweb02.app.bz.hst.phx2.redhat.com (8.13.8/8.13.8/Submit) id r9VM5P1m001425; Thu, 31 Oct 2013 18:05:25 -0400 From: bugzilla@redhat.com To: pcp@oss.sgi.com Subject: [Bug 998735] Several pmatop reporting/output oddities Date: Thu, 31 Oct 2013 22:05:20 +0000 X-ASG-Orig-Subj: [Bug 998735] Several pmatop reporting/output oddities X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Fedora X-Bugzilla-Product: Fedora X-Bugzilla-Component: pcp X-Bugzilla-Version: 20 X-Bugzilla-Keywords: X-Bugzilla-Severity: unspecified X-Bugzilla-Who: scox@redhat.com X-Bugzilla-Status: ASSIGNED X-Bugzilla-Priority: unspecified X-Bugzilla-Assigned-To: scox@redhat.com X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: bug_status X-Bugzilla-Comment: public X-Loop: bugzilla@redhat.com X-BeenThere: bugzilla@redhat.com X-Bugzilla-Reporter: nathans@redhat.com Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugzilla.redhat.com/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-Barracuda-Connect: mx1-phx2.redhat.com[209.132.183.26] X-Barracuda-Start-Time: 1383257126 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141945 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name https://bugzilla.redhat.com/show_bug.cgi?id=998735 Stan Cox changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #5 from Stan Cox --- I think the change "pmatop: use utime/stime instead of schedstat" will fix this. utime/stime units are smaller, milliseconds, and a "try_magnitude" display feature was added to try and use larger display units if possible -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=TyE2o06QZM&a=cc_unsubscribe From nscott@redhat.com Thu Oct 31 18:44:58 2013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.1 X-Original-To: pcp@oss.sgi.com Delivered-To: pcp@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 4BBD47F52 for ; Thu, 31 Oct 2013 18:44:58 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id D3380AC005 for ; Thu, 31 Oct 2013 16:44:54 -0700 (PDT) X-ASG-Debug-ID: 1383263092-04cb6c40d341af20001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id rAIjPBdScyu7xyGq for ; Thu, 31 Oct 2013 16:44:52 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9VNiqtO006311 for ; Thu, 31 Oct 2013 19:44:52 -0400 Date: Thu, 31 Oct 2013 19:44:52 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: PCP Message-ID: <194346526.16868842.1383263092048.JavaMail.root@redhat.com> In-Reply-To: <1469757180.16868664.1383262954498.JavaMail.root@redhat.com> Subject: pcp updates: qa, release prep MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa, release prep Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.5.82.11] X-Mailer: Zimbra 8.0.3_GA_5664 (ZimbraWebClient - FF17 (Linux)/8.0.3_GA_5664) Thread-Topic: pcp updates: qa, release prep Thread-Index: jajDClOdJo+6Kw+6y7so5BT2ZK6PUg== X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1383263092 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=THREAD_INDEX, THREAD_TOPIC X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141949 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... Changes committed to git://oss.sgi.com/pcp/pcp.git dev build/rpm/fedora.spec | 1 + debian/changelog | 2 +- qa/116 | 4 +++- src/libpcp/src/avahi.c | 12 +++++++----- src/pmlc/actions.c | 18 ++++++++++++++---- 5 files changed, 26 insertions(+), 11 deletions(-) commit 36ea91751bd723cb6de9913ef82b0ae0394f7d6a Author: Nathan Scott Date: Fri Nov 1 10:29:24 2013 +1100 Tweak changelog timestamp for deb packages commit 73958d95bcefca90fee2bbbec2fa09b35ec7e4cf Author: Nathan Scott Date: Fri Nov 1 10:27:14 2013 +1100 Extend pmlc localhost detection heuristics This tackles a failure in test qa/381, where we recently began reporting local: as a remote host name; turned out we were accidentally avoiding some existing heuristics to dodge this kind of scenario - fix it up to handle the new local: and unix: host specifications as well, and ensure we do not report these to the users as remote pmcd hosts. commit 180bddf801be2268ff95583342c22b1e0a032165 Author: Nathan Scott Date: Fri Nov 1 09:52:25 2013 +1100 Add scox spec changelog note re resolution to pmatop bz commit 7d893791fe12312be8c05fdf6342ce39a9168790 Author: Nathan Scott Date: Fri Nov 1 09:51:13 2013 +1100 Fix qa/116 filtering for remote hosts with pmcd.hostname commit bd41a8d3e9d91f42b914af7ad4540af780af26e6 Author: Nathan Scott Date: Fri Nov 1 09:50:24 2013 +1100 Fix two more spots where Avahi code too chatty by default