From nobody Wed Feb 16 21:30:44 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2990519C7E2B; Wed, 16 Feb 2022 21:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JzWN50jrXz3hrm; Wed, 16 Feb 2022 21:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645047045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4qf9pvhZfgQ/MXj/oto4ScMaVrVX6UABwR16QLeAR8=; b=p/abhtwjAlTJfLZKPj6xzEINZheYIUaxuTSbSgAANMlRKKQZDb+QKUZY7y/5Hja53PA5Wx sBktKEc03NO0TGeK/+0NDrmCySPmY7BIQLAoNbVlzIS7IwXIZmTr//X+kXCpYPrOzdYEG0 FmLBSO7HZFe5eqX9GYIyQAECDzO6485SFNDeSRVdI5QiwOU7r3erwotMvpanu6MhSLEqbw hYGeXaZOylCzVfxlQYbxDCLwi+HytyLdGv9/99nxplvy2Tv+IKpBItAoGbmxMixl5wf+aq GIhEOk9Qn3gXk+nevH67nDH4805YxHR7UoaJwqpz4tAb0+XY4k9oVLS5hSFB9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC8EA1DA04; Wed, 16 Feb 2022 21:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21GLUij3041140; Wed, 16 Feb 2022 21:30:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21GLUiIc041139; Wed, 16 Feb 2022 21:30:44 GMT (envelope-from git) Date: Wed, 16 Feb 2022 21:30:44 GMT Message-Id: <202202162130.21GLUiIc041139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ef135466f81b - main - Clean up warnings in pthread tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef135466f81bc3f203efa77d1eb81132f7646196 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645047045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4qf9pvhZfgQ/MXj/oto4ScMaVrVX6UABwR16QLeAR8=; b=MTOmn6CjqFq6P1xeYeAwY+wCCX6bd5axqkKKq6GXL2+T66SoVYv2dLnsJhWuh4FFJxeufY bjECXTm7oCaPfHmOAhpgfeYexAl4uTPU7BMUWqK0QH0kaj9BhWb2WccwiDcVJ152OuuYbG 2ydAqZ50hk7IE0aTp6y2QGP4qSERZje0qFvbnkSK+VhJjxS/4QSQ8SPtExlYGrJ1c8ediL xDCxykxtAZMd3/u3aKKoQDbT3HO9KgusZoXX9PfERmix7W20gEIsTJfHv9ZGoQzYIRn1ZO NMNT0b0OETD4umUkSaQ4vcCRLi/IlwTjayjVMNRktXizCNVN6IOTv1dg7P7sqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645047045; a=rsa-sha256; cv=none; b=x1LEhn1hilmAPUxgD/iUJH2Br0ShDT3Ozc8uSUVCx9FgugwzU6g98L1Que9QeqKKrNcD+A jnq1QyTIIFkEmfchpC82K/Z+YGSye0DLsmBvZvx/AUt33nN71JRqGdl4MXaQBBAxsHCWOS ZHkLZ3Z3fXQEefmWgr2BHrgUCXkqCjmRR615t9A0FoK7eTKQWe0nRdGzrD3fDixy+GaShp 5+kwakMJf4BmuhUvAcLDSlp972m/S2dYLRapvUf34xevk2pKRSBTns9wu3m9kMBAgpuuvz 4+mo/8KsLmZjPDWvaw7XyEYLvaR6MF2i5eir+I5UGQRYYsIRgEqmXnZuNn4VuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ef135466f81bc3f203efa77d1eb81132f7646196 commit ef135466f81bc3f203efa77d1eb81132f7646196 Author: Ed Maste AuthorDate: 2022-02-16 21:10:45 +0000 Commit: Ed Maste CommitDate: 2022-02-16 21:28:31 +0000 Clean up warnings in pthread tests I intend to move these into lib/libthr/tests/ and connect to kyua. This is a first step to address warnings emitted when building using standard make infrastructure. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34306 --- tools/regression/pthread/cv_cancel1/cv_cancel1.c | 14 +++++++------- .../regression/pthread/mutex_isowned_np/mutex_isowned_np.c | 2 +- tools/regression/pthread/unwind/Test.cpp | 6 +++--- tools/regression/pthread/unwind/catch_pthread_exit.cpp | 6 +++--- tools/regression/pthread/unwind/cond_wait_cancel.cpp | 8 ++++---- tools/regression/pthread/unwind/cond_wait_cancel2.cpp | 12 ++++++------ tools/regression/pthread/unwind/sem_wait_cancel.cpp | 6 +++--- tools/regression/pthread/unwind/thread_normal_exit.cpp | 4 ++-- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tools/regression/pthread/cv_cancel1/cv_cancel1.c b/tools/regression/pthread/cv_cancel1/cv_cancel1.c index 2ae94c5a9f1c..140f55168dbb 100644 --- a/tools/regression/pthread/cv_cancel1/cv_cancel1.c +++ b/tools/regression/pthread/cv_cancel1/cv_cancel1.c @@ -32,14 +32,14 @@ #define NLOOPS 10 -pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; -pthread_cond_t cv = PTHREAD_COND_INITIALIZER; +static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t cv = PTHREAD_COND_INITIALIZER; -int wake; -int stop; +static int wake; +static int stop; -void * -thr_routine(void *arg) +static void * +thr_routine(void *arg __unused) { pthread_mutex_lock(&m); while (wake == 0) @@ -51,7 +51,7 @@ thr_routine(void *arg) return (NULL); } -int main(int argc, char **argv) +int main(int argc __unused, char **argv __unused) { pthread_t td; int i; diff --git a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c index 5c23568c33ac..9eefef84ecf0 100644 --- a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c +++ b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c @@ -46,7 +46,7 @@ thread(void *arg) } int -main(int argc, char *argv[]) +main(int argc __unused, char *argv[] __unused) { pthread_t thr; pthread_mutex_t mtx; diff --git a/tools/regression/pthread/unwind/Test.cpp b/tools/regression/pthread/unwind/Test.cpp index 9322deff621e..46e451c390b6 100644 --- a/tools/regression/pthread/unwind/Test.cpp +++ b/tools/regression/pthread/unwind/Test.cpp @@ -1,7 +1,7 @@ /* $FreeBSD$ */ -int destructed; -int destructed2; +static int destructed; +static int destructed2; class Test { public: @@ -10,7 +10,7 @@ public: }; void -cleanup_handler(void *arg) +cleanup_handler(void *arg __unused) { destructed2 = 1; printf("%s()\n", __func__); diff --git a/tools/regression/pthread/unwind/catch_pthread_exit.cpp b/tools/regression/pthread/unwind/catch_pthread_exit.cpp index 15abc20d1fea..db0e875ccaeb 100644 --- a/tools/regression/pthread/unwind/catch_pthread_exit.cpp +++ b/tools/regression/pthread/unwind/catch_pthread_exit.cpp @@ -5,10 +5,10 @@ #include #include -int caught; +static int caught; -void * -thr_routine(void *arg) +static void * +thr_routine(void *arg __unused) { try { pthread_exit(NULL); diff --git a/tools/regression/pthread/unwind/cond_wait_cancel.cpp b/tools/regression/pthread/unwind/cond_wait_cancel.cpp index 5975e028a5ca..4dfa57746552 100644 --- a/tools/regression/pthread/unwind/cond_wait_cancel.cpp +++ b/tools/regression/pthread/unwind/cond_wait_cancel.cpp @@ -8,11 +8,11 @@ #include "Test.cpp" -pthread_mutex_t mtx; -pthread_cond_t cv; +static pthread_mutex_t mtx; +static pthread_cond_t cv; -void * -thr(void *arg) +static void * +thr(void *arg __unused) { Test t; diff --git a/tools/regression/pthread/unwind/cond_wait_cancel2.cpp b/tools/regression/pthread/unwind/cond_wait_cancel2.cpp index c781068918f1..ba71289fad98 100644 --- a/tools/regression/pthread/unwind/cond_wait_cancel2.cpp +++ b/tools/regression/pthread/unwind/cond_wait_cancel2.cpp @@ -13,10 +13,10 @@ #include "Test.cpp" -pthread_mutex_t mtx; -pthread_cond_t cv; +static pthread_mutex_t mtx; +static pthread_cond_t cv; -void f() +static void f() { Test t; @@ -26,13 +26,13 @@ void f() printf("Bug, thread shouldn't be here.\n"); } -void g() +static void g() { f(); } -void * -thr(void *arg) +static void * +thr(void *arg __unused) { pthread_cleanup_push(cleanup_handler, NULL); g(); diff --git a/tools/regression/pthread/unwind/sem_wait_cancel.cpp b/tools/regression/pthread/unwind/sem_wait_cancel.cpp index 019164cb3166..2086de6037cb 100644 --- a/tools/regression/pthread/unwind/sem_wait_cancel.cpp +++ b/tools/regression/pthread/unwind/sem_wait_cancel.cpp @@ -8,10 +8,10 @@ #include "Test.cpp" -sem_t sem; +static sem_t sem; -void * -thr(void *arg) +static void * +thr(void *arg __unused) { Test t; diff --git a/tools/regression/pthread/unwind/thread_normal_exit.cpp b/tools/regression/pthread/unwind/thread_normal_exit.cpp index faf900e572c4..70768265be70 100644 --- a/tools/regression/pthread/unwind/thread_normal_exit.cpp +++ b/tools/regression/pthread/unwind/thread_normal_exit.cpp @@ -7,8 +7,8 @@ #include "Test.cpp" -void * -thr_routine(void *arg) +static void * +thr_routine(void *arg __unused) { Test test;