From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-vs1-xe2a.google.com with SMTP id o5so10273238vsc.0 for ; Tue, 25 Oct 2022 10:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=H+SGDR/KyILqSPYj3eD3FIQkTGNUPKEpzF80I/Q8Ntw=; b=XoWePsDa7Y3L2ntBF8+tVbIt2MHP3RePGkRORy/YIPeTTs80kUd0N5FbfVJBHgyvpn /UV+agzZ3draQN/sDQtbPt73X11xA9MWLRKsq0k7KttuTB+CviJNg6eljPKOWRsqGxck 4JT1LQmEqdP1d0UhQI/Dd0BZL6RP3Y04dELjM5mCXAh/nY3O5Z9k+w+aGsG+9qb6JjvT OgeQ+mFiV3id+Esah5cpa7uiTxfMth9YF4N3Pj490IFZuPUEA5we83yt3U1487EEWAx+ sN0yNQR+6N2XaM5k1RQvJkeefsPK398HYoGksBYnUn31t0xQbW0c4pOy8LIUNSAqZttJ stcg== 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-Google-Smtp-Source: AMsMyM7d5mCgpruiWehUR+xRD01LozPuOe4/EchXHsdQGBIBSbGLWmBOBc4ldtusMxRgZbPYShk/98w6/j1Qv50DaDQ= 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 From: Michael de Lang 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 Content-Type: text/plain; charset="UTF-8" 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 List-Id: 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);