From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 3565 invoked from network); 20 Jun 2023 14:37:44 -0000 Received: from second.openwall.net (193.110.157.125) by inbox.vuxu.org with ESMTPUTF8; 20 Jun 2023 14:37:44 -0000 Received: (qmail 19761 invoked by uid 550); 20 Jun 2023 14:37:35 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 19618 invoked from network); 20 Jun 2023 14:37:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687271842; x=1689863842; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HRWYoaxdSzbqlxLDvXEfk6PvAhINFm+WBvQGzuItYXs=; b=HiIKBR7b/DP0DvmtND2DF6FeZHaJwYERC99TY6dOKOMEoZqoHKkP5zf3cezw6v9GG4 J0L4JATEvUqDCoN7AfQM0907nkSWLJ6NS+fcrkHUMA43yUww4CVw/EA61QR7adB7p9nK gc9Vvhq1iNXKSENbD1P7AaTDgVqwvkdOOVnncJJbNfkcGxCgwq/1YkL7zU3R+UGRJWyo 3irQSsM2KWD6h5ZpMy0CpE80tmqNzUrxjos2Bk+V6HpR+KVm4nUPXSoHqYOvc5UC732d ua4UMlExXbDHlxllqYdvHb5uXxYSO7/tL2Hk5G01/qtQYf4lJz0OY5E+3DX+k4NllOYs ahXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687271842; x=1689863842; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HRWYoaxdSzbqlxLDvXEfk6PvAhINFm+WBvQGzuItYXs=; b=OYT77LtzT6gX+X+PpnB+EKZshBke395y59Arbpe9l3GQlfUYloJe4HbAQIQIA5t7bK H1Zwu9E2OP5OsOpJSyWJe594T6Q+M7Ck7b/5MKRoKV734iJG7HY4pKUYWHIlntR6jQPO zXc5X4trIwe7b+Rc6yrimZoI6LhcQ3/lrogPzhTbF0Z0xW0UU1Lqa/Hj1YwGzUSXvK4x +oIYKc+QYdjCAToTN/hNKMmiRm+EteukTIu/ElMXZCCRxEpFWMh1EtQZ4fdumxkDxXWy +lN8dsLmY0TZc2ivfPYjqnDpLP4ZkAfMBO9nmP5j498qOviAZ67NZNQHoFBzigcpN/cC gycg== X-Gm-Message-State: AC+VfDxtdaoMG0Jsl/iZeSlKCRy+OQdPJqKISNkMRkaIWOZVq439EbZq 2cIOLbLaWDkSN6SI0RykrEk= X-Google-Smtp-Source: ACHHUZ43TYLzavgFjZnEdjsocF364dapfzSW9oO4lVPgIfXzs+x0Ug+hFUGthHGtzVLylMm8o+dCLQ== X-Received: by 2002:a05:6808:6398:b0:39c:8bc5:f8db with SMTP id ec24-20020a056808639800b0039c8bc5f8dbmr10274974oib.37.1687271842001; Tue, 20 Jun 2023 07:37:22 -0700 (PDT) From: Yonggang Luo To: Jens Gustedt , enh , musl@lists.openwall.com Cc: Yonggang Luo Date: Tue, 20 Jun 2023 22:36:59 +0800 Message-Id: <20230620143703.1415-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.39.0.windows.1 In-Reply-To: <20230620143703.1415-1-luoyonggang@gmail.com> References: <20230620143703.1415-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH v3 1/5] trim spaces of pthread_cond_timedwait.c and pthread_mutex_timedlock.c Signed-off-by: Yonggang Luo --- src/thread/pthread_cond_timedwait.c | 6 +++--- src/thread/pthread_mutex_timedlock.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index 6b761455..c5b35a6c 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -121,12 +121,12 @@ int __pthread_cond_timedwait(pthread_cond_t *restrict c, pthread_mutex_t *restri * via the futex notify below. */ lock(&c->_c_lock); - + if (c->_c_head == &node) c->_c_head = node.next; else if (node.prev) node.prev->next = node.next; if (c->_c_tail == &node) c->_c_tail = node.prev; else if (node.next) node.next->prev = node.prev; - + unlock(&c->_c_lock); if (node.notify) { @@ -156,7 +156,7 @@ relock: if (val>0) a_cas(&m->_m_lock, val, val|0x80000000); unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128)); } else if (!(m->_m_type & 8)) { - a_dec(&m->_m_waiters); + a_dec(&m->_m_waiters); } /* Since a signal was consumed, cancellation is not permitted. */ diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c index 9279fc54..87f89287 100644 --- a/src/thread/pthread_mutex_timedlock.c +++ b/src/thread/pthread_mutex_timedlock.c @@ -66,7 +66,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec if (r != EBUSY) return r; if (type&8) return pthread_mutex_timedlock_pi(m, at); - + int spins = 100; while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); -- 2.39.0.windows.1