From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1725) id 7645838708D5; Tue, 18 Aug 2020 18:35:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7645838708D5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1597775744; bh=mIzuY4mwiygyiocsGW2TgMG1l9AoAIOywiFzqidiu3E=; h=From:To:Subject:Date:From; b=swVpoBsS0SWlkoDNOh+fJYPPKnHA7znp/QQ1H7hjJ6hvLRea5B8niO1++/zeoJu+X gw6tCzAU4DmSsrhAK0hBZJRQT286VjuaDNFxYtw4Lf5zRUPNwzzSI2x8sgIAdb4tI1 QEtcqMh6KctsZRfaDNNKaa1X2md/M1FDpH/pqDO0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: William Schmidt To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/wschmidt/heads/builtins3)] libstdc++: Fix net::system_context stop condition X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/users/wschmidt/heads/builtins3 X-Git-Oldrev: 35e5294c4b779f8fc24fdc86464f999867332995 X-Git-Newrev: 61759518adc7679a6f46369543e30a761a16490a Message-Id: <20200818183544.7645838708D5@sourceware.org> Date: Tue, 18 Aug 2020 18:35:44 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2020 18:35:44 -0000 https://gcc.gnu.org/g:61759518adc7679a6f46369543e30a761a16490a commit 61759518adc7679a6f46369543e30a761a16490a Author: Jonathan Wakely Date: Tue Aug 11 16:16:21 2020 +0100 libstdc++: Fix net::system_context stop condition libstdc++-v3/ChangeLog: * include/experimental/executor (system_context::_M_run()): Fix predicate. * testsuite/experimental/net/system_context/1.cc: New test. Diff: --- libstdc++-v3/include/experimental/executor | 2 +- .../testsuite/experimental/net/system_context/1.cc | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/experimental/executor b/libstdc++-v3/include/experimental/executor index 763f4ce0e17..b5dc3035756 100644 --- a/libstdc++-v3/include/experimental/executor +++ b/libstdc++-v3/include/experimental/executor @@ -902,7 +902,7 @@ inline namespace v1 { unique_lock __lock(_M_mtx); _M_cv.wait(__lock, - [this]{ return !_M_stopped && !_M_tasks.empty(); }); + [this]{ return _M_stopped || !_M_tasks.empty(); }); if (_M_stopped) return; __f = std::move(_M_tasks.front()); diff --git a/libstdc++-v3/testsuite/experimental/net/system_context/1.cc b/libstdc++-v3/testsuite/experimental/net/system_context/1.cc new file mode 100644 index 00000000000..bc2405d31d3 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/net/system_context/1.cc @@ -0,0 +1,42 @@ +// Copyright (C) 2020 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library 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. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do run } +// { dg-options "-pthread" } +// { dg-require-effective-target c++14 } +// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } + +#include +#include + +namespace net = std::experimental::net; + +void +test01() +{ + net::system_context& c = net::system_executor{}.context(); + net::post( [&c] { c.stop(); } ); + c.join(); + VERIFY( c.stopped() ); +} + +int +main() +{ + test01(); +}