From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Julian Graham" Newsgroups: gmane.lisp.guile.devel Subject: Re: Race condition in threading code? Date: Sat, 6 Sep 2008 20:12:39 -0400 Message-ID: <2bc5f8210809061712i39bac057u2df3015dce63e678@mail.gmail.com> References: <2bc5f8210808161142n2b415569y8499f3efafb4a@mail.gmail.com> <87prnu293y.fsf@gnu.org> <2bc5f8210808270614s3ddc6e9fued2ed9f95da15303@mail.gmail.com> <2bc5f8210808301605v5a6376ffs98b58c848c2f64fa@mail.gmail.com> <877i9x9w8j.fsf@gnu.org> <2bc5f8210808310805p34f88f9em8f8d9c16fbf42df@mail.gmail.com> <87myitynx4.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_69538_19858125.1220746359396" X-Trace: ger.gmane.org 1220746380 6176 80.91.229.12 (7 Sep 2008 00:13:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 7 Sep 2008 00:13:00 +0000 (UTC) Cc: guile-devel@gnu.org To: "=?ISO-8859-1?Q?Ludovic_Court=E8s?=" Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sun Sep 07 02:13:55 2008 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Kc7ua-0007jM-JB for guile-devel@m.gmane.org; Sun, 07 Sep 2008 02:13:52 +0200 Original-Received: from localhost ([127.0.0.1]:45057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kc7ta-00063p-N9 for guile-devel@m.gmane.org; Sat, 06 Sep 2008 20:12:50 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kc7tV-00063c-Qs for guile-devel@gnu.org; Sat, 06 Sep 2008 20:12:45 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kc7tT-00063D-08 for guile-devel@gnu.org; Sat, 06 Sep 2008 20:12:45 -0400 Original-Received: from [199.232.76.173] (port=59976 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kc7tS-000638-Sz for guile-devel@gnu.org; Sat, 06 Sep 2008 20:12:42 -0400 Original-Received: from ug-out-1314.google.com ([66.249.92.172]:6869) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kc7tR-0004IK-MF for guile-devel@gnu.org; Sat, 06 Sep 2008 20:12:42 -0400 Original-Received: by ug-out-1314.google.com with SMTP id k3so84378ugf.17 for ; Sat, 06 Sep 2008 17:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type:references; bh=nm/mAWlmf7BFFHNC198/yh/dOmFELbzAoP/6O99nRAE=; b=q7fmz9W5B22T3ZYZOpXOWgdc16cEcHUcZANXDkBmIIO903bcsCHWKc1+RNroqaFPRz 0wyfZtDGK0RmCj94aDfYHLM+FpmP0qhs1NFg9Dy1fbcSENcuNVc+MZDN7NXNMrFnnNiJ X2llQJqzUj+mdhBMDNxALB00YoQM1iGaomid4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:references; b=m5OYkXCEfjYCk78qj7b051zW0bVIw/vaAlS/PND3SxUEolDghynYLNbMPh+3AbR3zK Ba9r7BaMj3ewlEdaSlTrv8t3gcs6lBLWEFWEyTVQYdz6s+WXprKc10BK/CBFL7RRp+Jt 8tf8y9F+i2eWM0VqdjB6vArmpP/e12lgN5IWM= Original-Received: by 10.67.119.8 with SMTP id w8mr2358617ugm.20.1220746359513; Sat, 06 Sep 2008 17:12:39 -0700 (PDT) Original-Received: by 10.66.237.3 with HTTP; Sat, 6 Sep 2008 17:12:39 -0700 (PDT) In-Reply-To: <87myitynx4.fsf@gnu.org> X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:7601 Archived-At: ------=_Part_69538_19858125.1220746359396 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Ludovic, > The easiest way is to "cherry-pick" the change. So, assuming the commit > is at the tip of `master', you'd do: > > $ git checkout branch_release-1-8 > $ git cherry-pick master > > ... resolve conflicts... > > $ git commit -a -c THE-ID-THAT-GIT-TOLD-YOU-BEFORE > > And that's it! Hmm... that didn't quite seem to work. After some googling, I discovered the following, which -- I think -- did the trick: $ git checkout --tracking -b branch_release-1-8 origin/branch_release-1-8 ...And then I just reapplied the fix by hand because it was only one line. :) A patch against the branch is attached. Let me know if there are any problems with it. Regards, Julian ------=_Part_69538_19858125.1220746359396 Content-Type: text/x-diff; name=0001-Resolve-a-deadlock-caused-by-not-checking-mutex-stat.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fkswtt890 Content-Disposition: attachment; filename=0001-Resolve-a-deadlock-caused-by-not-checking-mutex-stat.patch RnJvbSBiZWNmOTRjZDg4ODM0ZDRkYmI3MjkzNDZmMzRkNTJjYTIwYjUwZDM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKdWxpYW4gR3JhaGFtIDxqdWxpYW5AY291bnR5aGVsbC4obm9u ZSk+CkRhdGU6IFNhdCwgNiBTZXAgMjAwOCAyMDowNjoxNyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hd IFJlc29sdmUgYSBkZWFkbG9jayBjYXVzZWQgYnkgbm90IGNoZWNraW5nIG11dGV4IHN0YXRlIGFm dGVyIGNhbGxpbmcKIGBTQ01fVElDSycuCgotLS0KIGxpYmd1aWxlL0NoYW5nZUxvZyB8ICAgIDUg KysrKysKIGxpYmd1aWxlL3RocmVhZHMuYyB8ICAgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgNiBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYmd1aWxlL0NoYW5n ZUxvZyBiL2xpYmd1aWxlL0NoYW5nZUxvZwppbmRleCA1NTUwYjdhLi43NWNkMjgzIDEwMDY0NAot LS0gYS9saWJndWlsZS9DaGFuZ2VMb2cKKysrIGIvbGliZ3VpbGUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsOCBAQAorMjAwOC0wOS0wNiAgSnVsaWFuIEdyYWhhbSAgPGpvb2xlYW5AZ21haWwuY29tPgor CisJKiB0aHJlYWRzLmMgKGZhdF9tdXRleF9sb2NrKTogUmVzb2x2ZSBhIGRlYWRsb2NrIGNhdXNl ZCBieSBub3QKKwljaGVja2luZyBtdXRleCBzdGF0ZSBhZnRlciBjYWxsaW5nIGBTQ01fVElDSycu CisKIDIwMDgtMDgtMjAgIEx1ZG92aWMgQ291cnTDqHMgIDxsdWRvQGdudS5vcmc+CiAKIAkqIGV2 YWwuYywgZmlsZXN5cy5jLCBnYy5jLCBudW1iZXJzLmMsIHBvc2l4LmMsIHNyZmktMTQuYywKZGlm ZiAtLWdpdCBhL2xpYmd1aWxlL3RocmVhZHMuYyBiL2xpYmd1aWxlL3RocmVhZHMuYwppbmRleCA4 NDNkZmNhLi5kZWRlODVlIDEwMDY0NAotLS0gYS9saWJndWlsZS90aHJlYWRzLmMKKysrIGIvbGli Z3VpbGUvdGhyZWFkcy5jCkBAIC0xMDMwLDkgKzEwMzAsOSBAQCBmYXRfbXV0ZXhfbG9jayAoU0NN IG11dGV4KQogICAgIHsKICAgICAgIHdoaWxlICgxKQogCXsKLQkgIGJsb2NrX3NlbGYgKG0tPndh aXRpbmcsIG11dGV4LCAmbS0+bG9jaywgTlVMTCk7CiAJICBpZiAoc2NtX2lzX2VxIChtLT5vd25l ciwgdGhyZWFkKSkKIAkgICAgYnJlYWs7CisJICBibG9ja19zZWxmIChtLT53YWl0aW5nLCBtdXRl eCwgJm0tPmxvY2ssIE5VTEwpOwogCSAgc2NtX2lfcHRocmVhZF9tdXRleF91bmxvY2sgKCZtLT5s b2NrKTsKIAkgIFNDTV9USUNLOwogCSAgc2NtX2lfc2NtX3B0aHJlYWRfbXV0ZXhfbG9jayAoJm0t PmxvY2spOwotLSAKMS41LjQuMwoK ------=_Part_69538_19858125.1220746359396--