From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id C98A21F454 for ; Mon, 11 Nov 2019 12:50:28 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:in-reply-to:references :reply-to:mime-version:content-transfer-encoding:content-type :message-id; q=dns; s=default; b=FD1cwFRt4LJCY6xW5NZbKfziuiC6P9f Z3mXIL9VPTLeUbkVobdGG+ixCjCiWWLFgDAgnErohJiZg4bjviyTPuIzt4rGoqqZ /ot+5G5e+FotMFDfAmpSRouciz82Ez8nleCbtOBSdrrLFqwgXvexXBgBOdNNqBcW 1A8tB27U2izE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:in-reply-to:references :reply-to:mime-version:content-transfer-encoding:content-type :message-id; s=default; bh=k90dRqah0uTmF3Te0D4Pvh3X43Y=; b=Fu46D VzNJmGWtu+/4zaCkTwCU8aLn2Jszt1eo2uwUG7T6a5x08GqyYtOTMOMt26eW3CQY qWNATPLcl/6TGSv0Y9nDHgGwyivt7tdzNcEJF/aHITG3lI8vNqPTjL/rp7QoqKJt PIMHe808KYMG2nMNSV8u8v92JKfuaK/hQTUhug= Received: (qmail 75629 invoked by alias); 11 Nov 2019 12:50:19 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 75563 invoked by uid 89); 11 Nov 2019 12:50:18 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mx1.osci.io X-Gerrit-PatchSet: 2 Date: Mon, 11 Nov 2019 07:50:09 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Florian Weimer , libc-alpha@sourceware.org Cc: Christian Brauner Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] support: Add support_set_small_thread_stack_size X-Gerrit-Change-Id: I1cf79a469984f8f30a4a947ee9ec2a5e74de8926 X-Gerrit-Change-Number: 608 X-Gerrit-ChangeURL: X-Gerrit-Commit: 36ada9ee2cd3b686df6952446b92816584eacbb8 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, fweimer@redhat.com, libc-alpha@sourceware.org, christian.brauner@ubuntu.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/3.0.3-76-gf8b6da0ab5 Content-Type: text/plain; charset=UTF-8 Message-Id: <20191111125009.731BD20AF6@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/608 ...................................................................... support: Add support_set_small_thread_stack_size And support_small_stack_thread_attribute Change-Id: I1cf79a469984f8f30a4a947ee9ec2a5e74de8926 --- M support/Makefile A support/support_set_small_thread_stack_size.c A support/support_small_stack_thread_attribute.c M support/xthread.h 4 files changed, 94 insertions(+), 0 deletions(-) Approvals: Christian Brauner: Looks good to me, approved diff --git a/support/Makefile b/support/Makefile index ca238ee..a6081bb 100644 --- a/support/Makefile +++ b/support/Makefile @@ -63,7 +63,9 @@ support_quote_string \ support_record_failure \ support_run_diff \ + support_set_small_thread_stack_size \ support_shared_allocate \ + support_small_stack_thread_attribute \ support_subprocess \ support_test_compare_blob \ support_test_compare_failure \ diff --git a/support/support_set_small_thread_stack_size.c b/support/support_set_small_thread_stack_size.c new file mode 100644 index 0000000..23189fd --- /dev/null +++ b/support/support_set_small_thread_stack_size.c @@ -0,0 +1,30 @@ +/* Set a small stack size, but still large enough for glibc's needs. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +void +support_set_small_thread_stack_size (pthread_attr_t *attr) +{ + /* Some architectures have too small values for PTHREAD_STACK_MIN + which cannot be used for creating threads. Ensure that the stack + size is at least 256 KiB. */ + xpthread_attr_setstacksize (attr, MAX (256 * 1024, PTHREAD_STACK_MIN)); +} diff --git a/support/support_small_stack_thread_attribute.c b/support/support_small_stack_thread_attribute.c new file mode 100644 index 0000000..a65097d --- /dev/null +++ b/support/support_small_stack_thread_attribute.c @@ -0,0 +1,54 @@ +/* A thread attribute with a small stack. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +static void * +allocate (void *closure) +{ + pthread_attr_t *result = malloc (sizeof (*result)); + xpthread_attr_init (result); + support_set_small_thread_stack_size (result); + return result; +} + +static void +deallocate (void *ptr, void *closure) +{ + xpthread_attr_destroy (ptr); + free (ptr); +} + +static void *small_stack_attr; + +pthread_attr_t * +support_small_stack_thread_attribute (void) +{ + return allocate_once (&small_stack_attr, allocate, deallocate, NULL); +} + +static void __attribute__ ((destructor)) +fini (void) +{ + if (small_stack_attr != NULL) + { + deallocate (small_stack_attr, NULL); + small_stack_attr = NULL; + } +} diff --git a/support/xthread.h b/support/xthread.h index 829397c..f39720c 100644 --- a/support/xthread.h +++ b/support/xthread.h @@ -75,6 +75,14 @@ void xpthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize); +/* Set the stack size in ATTR to a small value, but still large enough + to cover most internal glibc stack usage. */ +void support_set_small_thread_stack_size (pthread_attr_t *attr); + +/* Return a pointer to a thread attribute which requests a small + stack. The caller must not free this pointer. */ +pthread_attr_t *support_small_stack_thread_attribute (void); + /* This function returns non-zero if pthread_barrier_wait returned PTHREAD_BARRIER_SERIAL_THREAD. */ int xpthread_barrier_wait (pthread_barrier_t *barrier); -- Gerrit-Project: glibc Gerrit-Branch: master Gerrit-Change-Id: I1cf79a469984f8f30a4a947ee9ec2a5e74de8926 Gerrit-Change-Number: 608 Gerrit-PatchSet: 2 Gerrit-Owner: Florian Weimer Gerrit-Reviewer: Christian Brauner Gerrit-MessageType: merged