From patchwork Tue Oct 25 17:39:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael de Lang X-Patchwork-Id: 10912 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1133195wru; Tue, 25 Oct 2022 10:40:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5CIxUAUUqnQ8DFyjug9WNGq/Zbav9B/lzWtVzfEqn1NDQBOKyVK+IQq18NMQdx0tfbvgZg X-Received: by 2002:a17:906:eec9:b0:783:e662:2513 with SMTP id wu9-20020a170906eec900b00783e6622513mr33007454ejb.656.1666719630643; Tue, 25 Oct 2022 10:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666719630; cv=none; d=google.com; s=arc-20160816; b=wKWhxfRKSJungfPzQJgAb/9XGxteQONgNNAlXWoWOmQoaA7RX6V/JikUIKqCqM7Wiy qbumX7X+MjlpEL4ul0XSvk45iSY7wPVPqpZ/dJpU3wzL4goE5dJHprAUzuox72bVJGvg 76hBmRVzFfyOY8ytPOi73i1gXi8yccZSBgyN3Q0L8I93UXpW3kcbzjg7TNFui9au5Dbz z9FBgjxQU1V+oWmf/aZntAg6OeN1Id6jdGUNWQL/erhfsNuBxKL3X6RV3Pkyq6BdrFlG CcLf9rYCqncPypxM2kT+NLpY9SKDP5+USwh0Sc3m5Oy6dcxhaP5dWs8ahmVL3NKGxUIX 3GZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=H+SGDR/KyILqSPYj3eD3FIQkTGNUPKEpzF80I/Q8Ntw=; b=Da6Q4ouydT3lugV2h1LgmdWe2Ohyh2OFQKwJFYsjw+AAqgYoWcxlsobuVRNvpECKiP I+e1sADyEHWYfrmW99L/UMKdafNJzIYskoJ5uKl8/x3D45pKhaMR2wYqT4VkhzDK4Xut 5QrolIHjNxDYHx+r6O9JRMc5NPHF91av2Bq9BNWeH3JKOlejHRvlIiY5K0xkW4pZsDOg otaEekoB53q4rM2itDA86h3S3J3glTRNgID7KxWoUxWk7DeFQSDxuIkUqQeib//Hafne InWmGJipe35kOXOYvLRbXrdIHhYjkws4U/4GohjxJTa1MQ1pW+jrXbYbnbMgN5XBaN0S Ns0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=PZvzd79V; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id o19-20020a1709061b1300b007811ace1701si2920085ejg.445.2022.10.25.10.40.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 10:40:30 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=PZvzd79V; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AAD343858C50 for ; Tue, 25 Oct 2022 17:40:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AAD343858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666719629; bh=H+SGDR/KyILqSPYj3eD3FIQkTGNUPKEpzF80I/Q8Ntw=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PZvzd79VVWxe3F/D9A60NCc4WRjvOe0xZ3eof5aaZ2BzUVYhNih3qwm5Nbu7sqLXt wz7Fz+5Cw9L8IQ7EPNoTvk4XSQBqjoP7/ML8sNPYowHSjO1zliAY4T0c2dL0+y+h3Z OKBdTnKd2JWbQINsG+Dzo/VL7bE3U0Fzria8ISUs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-vs1-xe2a.google.com (mail-vs1-xe2a.google.com [IPv6:2607:f8b0:4864:20::e2a]) by sourceware.org (Postfix) with ESMTPS id 6C7833858C5E for ; Tue, 25 Oct 2022 17:39:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6C7833858C5E Received: by mail-vs1-xe2a.google.com with SMTP id o5so10273238vsc.0 for ; Tue, 25 Oct 2022 10:39:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=H+SGDR/KyILqSPYj3eD3FIQkTGNUPKEpzF80I/Q8Ntw=; b=GYpfWq6pz0KDTn0JedIFtwbkQuCVCWvUNUtn9HU0ey0r8Nl34pnELUi6r5ocBVL9DH ot4TiB1rQr/PMdr5diMIMk3WAfa+DjO02aS65Vi5eT82EcU/Gy+ffGCleH7tDfp8yUnq z6GhsB85PmhpOMCSj7Td5aI5oVhbjrRkwpdALsoGL1GbVdPATi/fKxcv2TIdHYNokn0n XA5hiSMRHHN5X6d3T5/v+hVLcdSh51DXPW5UqvkuNsMByRD6YZg9slhK/lAj42dimgFu PbfqcQVijmRZFGoTdyg89EftEBLYDU7GI9dhnFnMbCWsDIENXwo16wS1iJHSY71p3Jp5 wMWg== X-Gm-Message-State: ACrzQf3YSbtMZIStwYvXBj3KjMJ8QPN0QRvgQsXx6dI7sbf6Zvp+rbUF m4T9JJV23SdVL3RB/tXfKIDCjHcmgwi6QhiJqwGP+PilA/8= X-Received: by 2002:a67:e281:0:b0:3aa:1c54:f8a1 with SMTP id g1-20020a67e281000000b003aa1c54f8a1mr6658359vsf.8.1666719584571; Tue, 25 Oct 2022 10:39:44 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 25 Oct 2022 19:39:33 +0200 Message-ID: Subject: [PATCH] tsan: fix test for machines without pthread_cond_clockwait To: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Michael de Lang via Gcc-patches From: Michael de Lang Reply-To: Michael de Lang Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747682203410706111?= X-GMAIL-MSGID: =?utf-8?q?1747682203410706111?= Hey, As per J. Wakeley's comments on https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100655 make the call to pthread_cond_clockwait conditional. This allows compilation on machines with older glibc versions. Cheers, Michael 2022-10-25 Michael de Lang * Fix testcase for pthread_cond_clockwait on machines with old glibc --- a/gcc/testsuite/g++.dg/tsan/pthread_cond_clockwait.C +++ b/gcc/testsuite/g++.dg/tsan/pthread_cond_clockwait.C @@ -4,6 +4,10 @@ #include +// Include this to get the libstdc++ _GLIBCXX_USE_PTHREAD_COND_CLOCKWAIT +// macro that indicates pthread_cond_clockwait is available. +#include + pthread_cond_t cv; pthread_mutex_t mtx; @@ -23,7 +27,9 @@ int main() { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); ts.tv_sec += 10; +#ifdef _GLIBCXX_USE_PTHREAD_COND_CLOCKWAIT pthread_cond_clockwait(&cv, &mtx, CLOCK_MONOTONIC, &ts); +#endif pthread_mutex_unlock(&mtx); pthread_join(tid, NULL);