public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Giuliano Belinassi <giulianob@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc(refs/users/giulianob/heads/autopar_rebase2)] libstdc++: Fix net::system_context stop condition
Date: Tue, 18 Aug 2020 01:36:46 +0000 (GMT)	[thread overview]
Message-ID: <20200818013646.2A0323944410@sourceware.org> (raw)

https://gcc.gnu.org/g:c437b51bbbd5f5427bd9a266e5cdd56f6bc9f9dd

commit c437b51bbbd5f5427bd9a266e5cdd56f6bc9f9dd
Author: Jonathan Wakely <jwakely@redhat.com>
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<mutex> __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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do run }
+// { dg-options "-pthread"  }
+// { dg-require-effective-target c++14 }
+// { dg-require-effective-target pthread }
+// { dg-require-gthreads "" }
+
+#include <experimental/executor>
+#include <testsuite_hooks.h>
+
+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();
+}


                 reply	other threads:[~2020-08-18  1:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200818013646.2A0323944410@sourceware.org \
    --to=giulianob@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).