From patchwork Wed Jan 26 23:53:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 80567 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id B4891B7113 for ; Thu, 27 Jan 2011 10:53:38 +1100 (EST) Received: (qmail 1905 invoked by alias); 26 Jan 2011 23:53:35 -0000 Received: (qmail 1886 invoked by uid 22791); 26 Jan 2011 23:53:34 -0000 X-SWARE-Spam-Status: No, hits=-3.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.67) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 26 Jan 2011 23:53:29 +0000 Received: from kpbe16.cbf.corp.google.com (kpbe16.cbf.corp.google.com [172.25.105.80]) by smtp-out.google.com with ESMTP id p0QNrQT7006367 for ; Wed, 26 Jan 2011 15:53:26 -0800 Received: from gxk9 (gxk9.prod.google.com [10.202.11.9]) by kpbe16.cbf.corp.google.com with ESMTP id p0QNqpmI008015 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT) for ; Wed, 26 Jan 2011 15:53:25 -0800 Received: by gxk9 with SMTP id 9so375736gxk.19 for ; Wed, 26 Jan 2011 15:53:24 -0800 (PST) Received: by 10.236.110.1 with SMTP id t1mr268701yhg.94.1296086004697; Wed, 26 Jan 2011 15:53:24 -0800 (PST) Received: from coign.google.com (dhcp-172-22-124-221.mtv.corp.google.com [172.22.124.221]) by mx.google.com with ESMTPS id i18sm1477393yhd.22.2011.01.26.15.53.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 26 Jan 2011 15:53:24 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Fix race condition in netchan test Date: Wed, 26 Jan 2011 15:53:22 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch, copied from the master Go library, avoids a race condition in the netchan test. The consequence of the race condition would normally be a deadlock. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian Index: libgo/go/netchan/netchan_test.go =================================================================== --- libgo/go/netchan/netchan_test.go (revision 169248) +++ libgo/go/netchan/netchan_test.go (working copy) @@ -395,7 +395,7 @@ func TestCrossConnect(t *testing.T) { t.Fatal("new importer:", err) } - go crossExport(e1, e2, t) + crossExport(e1, e2, t) crossImport(i1, i2, t) } @@ -413,7 +413,7 @@ func crossExport(e1, e2 *Exporter, t *te t.Fatal("exportReceive:", err) } - crossLoop("export", s, r, t) + go crossLoop("export", s, r, t) } // Import side of cross-traffic.