From 9a2ba7af2cef8b068c98e40fb349397616c91520 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 13 Jul 2004 09:08:21 +0000 Subject: [PATCH] 12658_thread.cc: Move/rename to 12658_thread-1.cc and xfail. 2004-07-13 Paolo Carlini * testsuite/22_locale/locale/cons/12658_thread.cc: Move/rename to 12658_thread-1.cc and xfail. * testsuite/22_locale/locale/cons/12658_thread-2.c: New, much simpler version of 12658_thread-1.cc, still failing on 3_3 and not failing on 3_4/mainline - both on single processor and multiprocessor machines. From-SVN: r84610 --- libstdc++-v3/ChangeLog | 9 +++ .../{12658_thread.cc => 12658_thread-1.cc} | 2 + .../22_locale/locale/cons/12658_thread-2.cc | 63 +++++++++++++++++++ 3 files changed, 74 insertions(+) rename libstdc++-v3/testsuite/22_locale/locale/cons/{12658_thread.cc => 12658_thread-1.cc} (98%) create mode 100644 libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6623438b834..bd21f89976c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2004-07-13 Paolo Carlini + + * testsuite/22_locale/locale/cons/12658_thread.cc: Move/rename + to 12658_thread-1.cc and xfail. + * testsuite/22_locale/locale/cons/12658_thread-2.c: New, much + simpler version of 12658_thread-1.cc, still failing on 3_3 and + not failing on 3_4/mainline - both on single processor and + multiprocessor machines. + 2004-07-12 Benjamin Kosnik * docs/html/abi.html: Remove non-public qualification. diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc similarity index 98% rename from libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread.cc rename to libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc index 3a89d371f62..8c39b505cba 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc @@ -22,6 +22,8 @@ // 22.1.1.2 locale constructors and destructors [lib.locale.cons] +// { dg-do run { xfail *-*-* } } + #include #include diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc new file mode 100644 index 00000000000..064a9b99473 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc @@ -0,0 +1,63 @@ +// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } } +// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* } } +// { dg-options "-pthreads" { target *-*-solaris* } } + +// Copyright (C) 2004 Free Software Foundation +// +// 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.1.1.2 locale constructors and destructors [lib.locale.cons] + +#include +#include + +const int max_thread_count = 20; +//const int max_loop_count = 1000000; // orig value +const int max_loop_count = 100000; +const int max_locales = 10; +std::locale loc[max_locales]; + +void* thread_main(void*) +{ + try + { + for (int i = 0; i < max_loop_count; ++i) + { + int k = i % max_locales; + std::locale::global(loc[k]); + } + } + catch (...) { } + return 0; +} + +int +main() +{ + pthread_t tid[max_thread_count]; + + for (int j = 0; j < max_locales; ++j) + loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR"); + + for (int i = 0; i < max_thread_count; i++) + pthread_create(&tid[i], NULL, thread_main, 0); + + for (int i = 0; i < max_thread_count; i++) + pthread_join(tid[i], NULL); + + return 0; +} -- 2.30.2