From patchwork Wed Apr 11 20:24:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 151871 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 5FCCDB706B for ; Thu, 12 Apr 2012 06:25:22 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1334780722; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=urCS153 H5BITSBc8Alg8Be+woNc=; b=jfo9uNDbtOZOD7XjtF/5vU9ixhZ8Z++yvELwUwK NmboE97CvzKz0c0aftwZguNtVodwtOcZyYlsakHsYasvk98cicZ00BnZlSrdNIiq XaQoT07yLtrdLaycVNTypetj37hd+9xOETw/yrrfNRR9xZBV4u01qzx9UGkcoCZW oCto= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=tA/gmlYMVSkSVmvjcvuLU+m6CHlMA3AjGHScq4mlCnvs3Y1Mj7evxKVtRzPraG /gFq3tF6o50RI04nLv52PLtVt6c5qeD2TrsceghHwMXPdFbbxqqQT9luoBIIFVPd Zook62zprFd49cfd9lYsyNedYqAmzNE0AAXJeBCk2xvOU=; Received: (qmail 1480 invoked by alias); 11 Apr 2012 20:25:13 -0000 Received: (qmail 1454 invoked by uid 22791); 11 Apr 2012 20:25:11 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-lb0-f175.google.com (HELO mail-lb0-f175.google.com) (209.85.217.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 11 Apr 2012 20:24:49 +0000 Received: by lbky2 with SMTP id y2so1050569lbk.20 for ; Wed, 11 Apr 2012 13:24:47 -0700 (PDT) MIME-Version: 1.0 Received: by 10.152.131.9 with SMTP id oi9mr19317415lab.6.1334175887600; Wed, 11 Apr 2012 13:24:47 -0700 (PDT) Received: by 10.112.85.98 with HTTP; Wed, 11 Apr 2012 13:24:47 -0700 (PDT) Date: Wed, 11 Apr 2012 21:24:47 +0100 Message-ID: Subject: [v3] fix broken performance test From: Jonathan Wakely To: "libstdc++" , gcc-patches 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 fixes a check-performance failure caused by my changes for libstdc++/49204 * testsuite/performance/30_threads/future/polling.cc: Adjust. Tested x86_64-linux, committing to trunk and 4.7 branch. commit fbb91a75e318226e666967a28883483a027f1f07 Author: Jonathan Wakely Date: Wed Apr 11 20:49:21 2012 +0100 * testsuite/performance/30_threads/future/polling.cc: Adjust. diff --git a/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc b/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc index 83fde27..26cf632 100644 --- a/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc +++ b/libstdc++-v3/testsuite/performance/30_threads/future/polling.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -22,7 +22,7 @@ inline bool is_ready(std::shared_future& f) { - return f.wait_for(std::chrono::microseconds(1)); + return f.wait_for(std::chrono::microseconds(1)) == std::future_status::ready; } void poll(std::shared_future f)