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.1 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,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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 9C3B61F466 for ; Tue, 14 Jan 2020 18:53:19 +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:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=BoBaZ5yXgyclLUI9FcuYvCTX+xhzP8/5e/o0Dry8jmheATpphI6Bu IvpRF1lzJShoLO0QBrbwnRKNNC52pQBpNMUWgi1MQ/4KAwAvlPszcBhOa2dxCX/g 6VkfP9JGhRMB+4hN8zkDVgJgmwgCvBuAC3+t9Yc8sztyyI4GD1zSr0= 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:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=uPzuev83uDzuWYpE/dB17lZLHC4=; b=D+CQOPrpVjG1Nc3fumqFpDA9ZSbz edQAYgW8mqB87dYf8GXr8u2Ycg1GV33Bbn0UIqZugI0xE7ltX/OVfLk6vYN8DHk2 pnA9Kq2E84a4urO/IFspX7ZmAJ+U6jU+3U2wA+fOR8/OPydhEy8ZuhWn0qqz3VU1 b/hkceSNSx/ju30= Received: (qmail 91834 invoked by alias); 14 Jan 2020 18:53:17 -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 91807 invoked by uid 89); 14 Jan 2020 18:53:16 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [PATCH 03/10] htl: Add support for C11 threads behavior Date: Tue, 14 Jan 2020 19:52:48 +0100 Message-Id: <20200114185255.25813-5-samuel.thibault@ens-lyon.org> In-Reply-To: <20200114185255.25813-1-samuel.thibault@ens-lyon.org> References: <20200114185255.25813-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Essentially properly calling the thread function which returns an int instead of a void*. --- htl/pt-create.c | 20 +++++++++++++++++++- htl/pt-internal.h | 3 +++ sysdeps/htl/pthreadP.h | 3 +++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/htl/pt-create.c b/htl/pt-create.c index 0b3237f46a..090d394f53 100644 --- a/htl/pt-create.c +++ b/htl/pt-create.c @@ -59,7 +59,17 @@ entry_point (struct __pthread *self, void *(*start_routine) (void *), void *arg) __pthread_startup (); - __pthread_exit (start_routine (arg)); + if (self->c11) + { + /* The function pointer of the c11 thread start is cast to an incorrect + type on __pthread_create call, however it is casted back to correct + one so the call behavior is well-defined (it is assumed that pointers + to void are able to represent all values of int). */ + int (*start)(void*) = (int (*) (void*)) start_routine; + __pthread_exit ((void*) (uintptr_t) start (arg)); + } + else + __pthread_exit (start_routine (arg)); } /* Create a thread with attributes given by ATTR, executing @@ -99,6 +109,14 @@ __pthread_create_internal (struct __pthread **thread, if (err) goto failed; + if (attr == ATTR_C11_THREAD) + { + attr = NULL; + pthread->c11 = true; + } + else + pthread->c11 = false; + /* Use the default attributes if ATTR is NULL. */ setup = attr ? attr : &__pthread_default_attr; diff --git a/htl/pt-internal.h b/htl/pt-internal.h index f8d7d74244..8a45854070 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -100,6 +100,9 @@ struct __pthread /* Resolver state. */ struct __res_state res_state; + /* Indicates whether is a C11 thread created by thrd_creat. */ + bool c11; + /* Thread context. */ struct pthread_mcontext mcontext; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index b1c7575f89..fc8c9bc591 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -21,6 +21,9 @@ #include +/* Attribute to indicate thread creation was issued from C11 thrd_create. */ +#define ATTR_C11_THREAD ((void*)(uintptr_t)-1) + /* These represent the interface used by glibc itself. */ extern pthread_t __pthread_self (void); -- 2.24.1