From nobody Tue May 03 18:21:56 2022 X-Original-To: dev-commits-src-branches@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 6B58B1AB848F; Tue, 3 May 2022 18:21:57 +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 4Kt7b86nKpz3jBD; Tue, 3 May 2022 18:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651602117; 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=+4HOUrtc/50uOQlKQt0VpFDeUiK6P+Y1zfhhD03c0FM=; b=mgpOQh33IACp8aFA6BEc7m/M100kdamYI4gmDgv510nz55LC+yfzuzB+6Zr2DjI/KxL+m3 Jcg+gsA39uBhui0pyzisPZt3WnMFHtKQdSke8GSQ1sCyDk9q2+i+2+FRtOze6sxfa6HIHz exOSuYo+8w246qe+lX1mfKXDHXk3N3QSuFWAB3cECEwhhyd45ZT04GNBDHE61ALaTynsl/ CL6kD71QXQwwN4Z3I3yH0gvIVb4DbruNdza5JYPsifOJd6ddFByjWDYN7tVLPYvufa9yrG /dvezx4IvaASa1mN2P3hjrzHDorjwNCkNHMGTKAwkxepJ7phT0E3ybbRHRJ4+Q== 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 B3E08233D4; Tue, 3 May 2022 18:21:56 +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 243ILulK026815; Tue, 3 May 2022 18:21:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243ILutj026814; Tue, 3 May 2022 18:21:56 GMT (envelope-from git) Date: Tue, 3 May 2022 18:21:56 GMT Message-Id: <202205031821.243ILutj026814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5949d17a29b4 - stable/12 - Clean up warnings in pthread tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 5949d17a29b4234623e933e114825699e7a78d7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651602117; 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=+4HOUrtc/50uOQlKQt0VpFDeUiK6P+Y1zfhhD03c0FM=; b=tjJtyDGVRY9R/6UXGv883ZxScsijnOREMsABuKC0s8a1pinqe1M3J3NWlSU+UGdCOdB/f3 2D1NkxquaJ+kvUiH1DteCCP/l0qHt33P76qkx77agFeJ8EqKiquzRvZt30aUDqMhtO2dns yclNiBLiFyTC/bMuzH9i1/M+xPw4kpispG88EC2sJNnsNv7jq2p7LQyF19gUqvpHjg3wge QzdpHdIog2iLQlugF4EUmfLcMBvuJVm4aImtknJeMEIl+Gozix8l0pJ/CYSXvvLeDgsHeT eoJuj4B+8y7GcCNMViN/Nubl0GAPddvvJ+VM+eGKXSKPC3/0qxdsnBTB+WCPpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651602117; a=rsa-sha256; cv=none; b=UddcPqYjxJfL/PhmtCqe/W521cNBtY4mZXyHizJqXWPpK2ZlaPi1Q6gI9pf7/rX5nxcR0d 1UiUL1PRjWnKJbG1u56kvPjRqwR2vSlJuMrcDc+lBxVUbQfJDuw89n+N0VTk/oH6IhPJ7j a9GxZ74MS694zOhpgM4Lgoy2a11rWb73f1nDHiGqq8IAMbfG+zluRfX3y8Fidy4DKMsJDp pEtTWRjTbFXus8d/PPSa+HR0vW4b1s42PNIrajIAXmQ+ESNh4cD1EQdhppKaPHGcdnafWg 6H2a4R9+zV4byM7gExqxWupb3vM/2RTUjuVWG8ZesxFdb0NfJhZT/p8taChfGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5949d17a29b4234623e933e114825699e7a78d7a commit 5949d17a29b4234623e933e114825699e7a78d7a Author: Ed Maste AuthorDate: 2022-02-16 21:10:45 +0000 Commit: Ed Maste CommitDate: 2022-05-02 14:11:37 +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 (cherry picked from commit ef135466f81bc3f203efa77d1eb81132f7646196) (cherry picked from commit 7bfe5e45153b3d214cdb09ced8fccdef02337369) (cherry picked from commit 2e545745ce2ecbe966434fa5edc9b60d82b43c17) --- tools/regression/pthread/cv_cancel1/cv_cancel1.c | 15 ++++++++------- .../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, 30 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..fdc50a866411 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,8 @@ thr_routine(void *arg) return (NULL); } -int main(int argc, char **argv) +int +main(void) { 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..381921c38a06 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(void) { 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;