Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 56024 invoked from network); 4 Dec 2007 06:30:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2007 06:30:47 -0000 Received: (qmail 39926 invoked by uid 500); 4 Dec 2007 06:30:34 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 39878 invoked by uid 500); 4 Dec 2007 06:30:34 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 39864 invoked by uid 99); 4 Dec 2007 06:30:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2007 22:30:34 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of slowhog@gmail.com designates 209.85.134.185 as permitted sender) Received: from [209.85.134.185] (HELO mu-out-0910.google.com) (209.85.134.185) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 06:30:14 +0000 Received: by mu-out-0910.google.com with SMTP id i10so688316mue for ; Mon, 03 Dec 2007 22:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:mime-version:content-type:x-google-sender-auth; bh=7879GN7VchsxiPfn2Yh8xnImseEQjBsofGi1AhuQIMo=; b=uN64wL2MPCyh3dsJcH4/lKy4kMApySxu16qzy6C2LYOYjGWrPGtlfAc1Ksogr1bWqclNLST8VRlMReb2iRA8wyoJNFfd0t1LiH+NWh+48apPNs4c6NXbVVY2DT0VVb+qdRF6W7mDvRMxsJhQIkaz9mnAkApoe9uU0uaVpxnLLV4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=received:message-id:date:from:sender:to:subject:mime-version:content-type:x-google-sender-auth; b=F/REI8fWkCIuBUTo9i6Hpeva/TtkWqx5mY2CzIwrFgDvqNaXjxb/DoUw3dtDjBrjw4nW8RiPkf+noJ3P8zsLHcrqvCaGA4T/t7l2kmP/Efya+9GIH0K8f9xgG6ZSI6alO3N4NKWK2htVUekbA/Y61RHU6JJlG18RbrNVgGIjGGc= Received: by 10.82.146.14 with SMTP id t14mr765965bud.1196749377091; Mon, 03 Dec 2007 22:22:57 -0800 (PST) Received: by 10.82.108.5 with HTTP; Mon, 3 Dec 2007 22:22:57 -0800 (PST) Message-ID: <369011d00712032222p38c14477n1ecf13dbba5abc4@mail.gmail.com> Date: Mon, 3 Dec 2007 22:22:57 -0800 From: "Henry Jen" Sender: slowhog@gmail.com To: "APR Developer List" Subject: [PATCH] Solaris port fix (bug 43000) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_13127_25764631.1196749377077" X-Google-Sender-Auth: 66f67fb8cb354c6a X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_13127_25764631.1196749377077 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, It's holiday season and things may be moving slower than it usually is. The patch have been available for a while, and it fixes the port code for Solaris which I really like to get it in. It could be somewhat controversial for the atomic code used to defer the port_associate in apr_pollset_add in order to pass the testpoll code, which is the needed fix if we consider the semantic of apr_pollset_poll should be giving accumulated events; Otherwise, we should revise the test/testpoll.c. With that said, I break the patch into two, the first port_1203-1.diff fix bugs of: 1. Return APR_SUCCESS if the poll removed from pollset is in the add_ring, which means the poll had been added but is current disassociated because an event. 2. In apr_pollcb_poll, call apr_pollcb_add to ensure port_associate. And the port_1203-2.diff is the fix to pass testpoll given current situation, which is less a concern as I consider in most apps, apr_pollset_poll is called in a loop. Any comments are welcomed. Cheers, Henry ------=_Part_13127_25764631.1196749377077 Content-Type: text/x-patch; name=port_1203-1.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_f9s0pl3f0 Content-Disposition: attachment; filename=port_1203-1.diff SW5kZXg6IHBvbGwvdW5peC9wb3J0LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcG9sbC91bml4L3BvcnQuYwko cmV2aXNpb24gNjAwNzkzKQorKysgcG9sbC91bml4L3BvcnQuYwkod29ya2luZyBjb3B5KQpAQCAt MTkyLDYgKzE5Miw3IEBACiAgICAgcGZkX2VsZW1fdCAqZXA7CiAgICAgYXByX3N0YXR1c190IHJ2 ID0gQVBSX1NVQ0NFU1M7CiAgICAgaW50IHJlczsKKyAgICBpbnQgZXJyOwogCiAgICAgcG9sbHNl dF9sb2NrX3JpbmdzKCk7CiAKQEAgLTIwNSw2ICsyMDYsNyBAQAogICAgIHJlcyA9IHBvcnRfZGlz c29jaWF0ZShwb2xsc2V0LT5wb3J0X2ZkLCBQT1JUX1NPVVJDRV9GRCwgZmQpOwogCiAgICAgaWYg KHJlcyA8IDApIHsKKyAgICAgICAgZXJyID0gZXJybm87CiAgICAgICAgIHJ2ID0gQVBSX05PVEZP VU5EOwogICAgIH0KIApAQCAtMjMzLDYgKzIzNSw5IEBACiAgICAgICAgICAgICAgICAgQVBSX1JJ TkdfUkVNT1ZFKGVwLCBsaW5rKTsKICAgICAgICAgICAgICAgICBBUFJfUklOR19JTlNFUlRfVEFJ TCgmKHBvbGxzZXQtPmRlYWRfcmluZyksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZXAsIHBmZF9lbGVtX3QsIGxpbmspOworICAgICAgICAgICAgICAgIGlmIChFTk9FTlQg PT0gZXJyKSB7CisgICAgICAgICAgICAgICAgICAgIHJ2ID0gQVBSX1NVQ0NFU1M7CisgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAg ICB9CkBAIC00NjQsNiArNDY5LDcgQEAKICAgICAgICAgICAgIGlmIChydikgewogICAgICAgICAg ICAgICAgIHJldHVybiBydjsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJ2ID0gYXByX3Bv bGxjYl9hZGQocG9sbGNiLCBwb2xsZmQpOwogICAgICAgICB9CiAgICAgfQogCg== ------=_Part_13127_25764631.1196749377077 Content-Type: text/x-patch; name=port_1203-2.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_f9s0pxoa1 Content-Disposition: attachment; filename=port_1203-2.diff LS0tIHBvbGwvdW5peC9wb3J0XzEuYwlNb24gRGVjICAzIDIxOjM3OjE0IDIwMDcKKysrIHBvbGwv dW5peC9wb3J0LmMJTW9uIERlYyAgMyAyMTozNzo0MSAyMDA3CkBAIC0xNSw2ICsxNSw3IEBACiAg Ki8KIAogI2luY2x1ZGUgImFwcl9hcmNoX3BvbGxfcHJpdmF0ZS5oIgorI2luY2x1ZGUgImFwcl9h dG9taWMuaCIKIAogI2lmZGVmIFBPTExTRVRfVVNFU19QT1JUCiAKQEAgLTgwLDYgKzgxLDggQEAK ICAgICAvKiBBIHJpbmcgb2YgcG9sbGZkX3Qgd2hlcmUgcmluZ3MgdGhhdCBoYXZlIGJlZW4gX3Jl bW92ZSdkIGJ1dAogICAgICAgIG1pZ2h0IHN0aWxsIGJlIGluc2lkZSBhIF9wb2xsICovCiAgICAg QVBSX1JJTkdfSEVBRChwZmRfZGVhZF9yaW5nX3QsIHBmZF9lbGVtX3QpIGRlYWRfcmluZzsKKyAg ICAvKiBudW1iZXIgb2YgdGhyZWFkcyBpbiBwb2xsICovCisgICAgdm9sYXRpbGUgYXByX3VpbnQz Ml90IHdhaXRpbmc7CiB9OwogCiBzdGF0aWMgYXByX3N0YXR1c190IGJhY2tlbmRfY2xlYW51cCh2 b2lkICpwXykKQEAgLTExMCw2ICsxMTMsNyBAQAogICAgICAgICByZXR1cm4gQVBSX0VOT1RJTVBM OwogICAgIH0KICNlbmRpZgorICAgICgqcG9sbHNldCktPndhaXRpbmcgPSAwOwogICAgICgqcG9s bHNldCktPm5lbHRzID0gMDsKICAgICAoKnBvbGxzZXQpLT5uYWxsb2MgPSBzaXplOwogICAgICgq cG9sbHNldCktPmZsYWdzID0gZmxhZ3M7CkBAIC0xNjgsMTYgKzE3MiwyMiBAQAogICAgICAgICBm ZCA9IGRlc2NyaXB0b3ItPmRlc2MuZi0+ZmlsZWRlczsKICAgICB9CiAKLSAgICByZXMgPSBwb3J0 X2Fzc29jaWF0ZShwb2xsc2V0LT5wb3J0X2ZkLCBQT1JUX1NPVVJDRV9GRCwgZmQsIAotICAgICAg ICAgICAgICAgICAgICAgICAgIGdldF9ldmVudChkZXNjcmlwdG9yLT5yZXFldmVudHMpLCAodm9p ZCAqKWVsZW0pOworICAgIGlmIChhcHJfYXRvbWljX3JlYWQzMigmcG9sbHNldC0+d2FpdGluZykp IHsKKyAgICAgICAgcmVzID0gcG9ydF9hc3NvY2lhdGUocG9sbHNldC0+cG9ydF9mZCwgUE9SVF9T T1VSQ0VfRkQsIGZkLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2V0X2V2ZW50KGRl c2NyaXB0b3ItPnJlcWV2ZW50cyksICh2b2lkICopZWxlbSk7CiAKLSAgICBpZiAocmVzIDwgMCkg ewotICAgICAgICBydiA9IEFQUl9FTk9NRU07Ci0gICAgICAgIEFQUl9SSU5HX0lOU0VSVF9UQUlM KCYocG9sbHNldC0+ZnJlZV9yaW5nKSwgZWxlbSwgcGZkX2VsZW1fdCwgbGluayk7Ci0gICAgfQor ICAgICAgICBpZiAocmVzIDwgMCkgeworICAgICAgICAgICAgcnYgPSBBUFJfRU5PTUVNOworICAg ICAgICAgICAgQVBSX1JJTkdfSU5TRVJUX1RBSUwoJihwb2xsc2V0LT5mcmVlX3JpbmcpLCBlbGVt LCBwZmRfZWxlbV90LCBsaW5rKTsKKyAgICAgICAgfQorICAgICAgICBlbHNlIHsKKyAgICAgICAg ICAgIHBvbGxzZXQtPm5lbHRzKys7CisgICAgICAgICAgICBBUFJfUklOR19JTlNFUlRfVEFJTCgm KHBvbGxzZXQtPnF1ZXJ5X3JpbmcpLCBlbGVtLCBwZmRfZWxlbV90LCBsaW5rKTsKKyAgICAgICAg fQorICAgIH0gCiAgICAgZWxzZSB7CiAgICAgICAgIHBvbGxzZXQtPm5lbHRzKys7Ci0gICAgICAg IEFQUl9SSU5HX0lOU0VSVF9UQUlMKCYocG9sbHNldC0+cXVlcnlfcmluZyksIGVsZW0sIHBmZF9l bGVtX3QsIGxpbmspOworICAgICAgICBBUFJfUklOR19JTlNFUlRfVEFJTCgmKHBvbGxzZXQtPmFk ZF9yaW5nKSwgZWxlbSwgcGZkX2VsZW1fdCwgbGluayk7CiAgICAgfQogCiAgICAgcG9sbHNldF91 bmxvY2tfcmluZ3MoKTsKQEAgLTI3Myw2ICsyODMsOCBAQAogCiAgICAgcG9sbHNldF9sb2NrX3Jp bmdzKCk7CiAKKyAgICBhcHJfYXRvbWljX2luYzMyKCZwb2xsc2V0LT53YWl0aW5nKTsKKwogICAg IHdoaWxlICghQVBSX1JJTkdfRU1QVFkoJihwb2xsc2V0LT5hZGRfcmluZyksIHBmZF9lbGVtX3Qs IGxpbmspKSB7CiAgICAgICAgIGVwID0gQVBSX1JJTkdfRklSU1QoJihwb2xsc2V0LT5hZGRfcmlu ZykpOwogICAgICAgICBBUFJfUklOR19SRU1PVkUoZXAsIGxpbmspOwpAQCAtMjk2LDYgKzMwOCw5 IEBACiAgICAgcmV0ID0gcG9ydF9nZXRuKHBvbGxzZXQtPnBvcnRfZmQsIHBvbGxzZXQtPnBvcnRf c2V0LCBwb2xsc2V0LT5uYWxsb2MsCiAgICAgICAgICAgICAgICAgICAgICZuZ2V0LCB0dnB0cik7 CiAKKyAgICAvKiBkZWNyZWFzZSB0aGUgd2FpdGluZyBBU0FQIHRvIHJlZHVjZSB0aGUgd2luZG93 IGZvciBjYWxsaW5nIAorICAgICAgIHBvcnRfYXNzb2NpYXRlIHdpdGhpbiBhcHJfcG9sbHNldF9h ZGQoKSAqLworICAgIGFwcl9hdG9taWNfZGVjMzIoJnBvbGxzZXQtPndhaXRpbmcpOwogICAgICgq bnVtKSA9IG5nZXQ7CiAKICAgICBpZiAocmV0ID09IC0xKSB7Cg== ------=_Part_13127_25764631.1196749377077--