From: Ian Rogers <irogers@google.com>
To: "Peter Zijlstra" <peterz@infradead.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Jiri Olsa" <jolsa@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Ian Rogers" <irogers@google.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"John Garry" <john.g.garry@oracle.com>,
"Will Deacon" <will@kernel.org>,
"James Clark" <james.clark@arm.com>,
"Mike Leach" <mike.leach@linaro.org>,
"Leo Yan" <leo.yan@linaro.org>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Suzuki K Poulose" <suzuki.poulose@arm.com>,
"Kan Liang" <kan.liang@linux.intel.com>,
"Raul Silvera" <rsilvera@google.com>,
"Athira Rajeev" <atrajeev@linux.vnet.ibm.com>,
"Ravi Bangoria" <ravi.bangoria@amd.com>,
"Florian Fischer" <florian.fischer@muhq.space>,
"Rob Herring" <robh@kernel.org>,
"Xing Zhengjun" <zhengjun.xing@linux.intel.com>,
"Sean Christopherson" <seanjc@google.com>,
"Chengdong Li" <chengdongli@tencent.com>,
"Denis Nikitin" <denik@chromium.org>,
"Martin Liška" <mliska@suse.cz>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org
Subject: [PATCH v1 1/6] perf ui: Move window resize signal functions
Date: Mon, 27 Mar 2023 18:40:53 -0700 [thread overview]
Message-ID: <20230328014058.870413-2-irogers@google.com> (raw)
In-Reply-To: <20230328014058.870413-1-irogers@google.com>
Move under tools/perf/ui rather than in perf.c. This simplifies
linking a main function when perf.c isn't present.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/perf.c | 18 ------------------
tools/perf/perf.h | 2 --
tools/perf/ui/setup.c | 19 +++++++++++++++++++
tools/perf/ui/tui/setup.c | 1 -
tools/perf/ui/ui.h | 3 +++
5 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 82bbe0ca858b..4b1b31e78332 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -432,24 +432,6 @@ static int run_argv(int *argcp, const char ***argv)
return 0;
}
-static void pthread__block_sigwinch(void)
-{
- sigset_t set;
-
- sigemptyset(&set);
- sigaddset(&set, SIGWINCH);
- pthread_sigmask(SIG_BLOCK, &set, NULL);
-}
-
-void pthread__unblock_sigwinch(void)
-{
- sigset_t set;
-
- sigemptyset(&set);
- sigaddset(&set, SIGWINCH);
- pthread_sigmask(SIG_UNBLOCK, &set, NULL);
-}
-
static int libperf_print(enum libperf_print_level level,
const char *fmt, va_list ap)
{
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 74014033df60..e21a7e15a34c 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -12,8 +12,6 @@ extern const char *input_name;
extern bool perf_host, perf_guest;
extern const char perf_version_string[];
-void pthread__unblock_sigwinch(void);
-
enum perf_affinity {
PERF_AFFINITY_SYS = 0,
PERF_AFFINITY_NODE,
diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c
index 25ded88801a3..ff800047e697 100644
--- a/tools/perf/ui/setup.c
+++ b/tools/perf/ui/setup.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include <dlfcn.h>
+#include <signal.h>
#include <unistd.h>
#include <subcmd/pager.h>
@@ -120,3 +121,21 @@ void exit_browser(bool wait_for_ok)
}
mutex_destroy(&ui__lock);
}
+
+void pthread__block_sigwinch(void)
+{
+ sigset_t set;
+
+ sigemptyset(&set);
+ sigaddset(&set, SIGWINCH);
+ pthread_sigmask(SIG_BLOCK, &set, NULL);
+}
+
+void pthread__unblock_sigwinch(void)
+{
+ sigset_t set;
+
+ sigemptyset(&set);
+ sigaddset(&set, SIGWINCH);
+ pthread_sigmask(SIG_UNBLOCK, &set, NULL);
+}
diff --git a/tools/perf/ui/tui/setup.c b/tools/perf/ui/tui/setup.c
index a3b8c397c24d..c1886aa184b3 100644
--- a/tools/perf/ui/tui/setup.c
+++ b/tools/perf/ui/tui/setup.c
@@ -9,7 +9,6 @@
#endif
#include "../../util/debug.h"
-#include "../../perf.h"
#include "../browser.h"
#include "../helpline.h"
#include "../ui.h"
diff --git a/tools/perf/ui/ui.h b/tools/perf/ui/ui.h
index 99f8d2fe9bc5..d8e911205582 100644
--- a/tools/perf/ui/ui.h
+++ b/tools/perf/ui/ui.h
@@ -31,4 +31,7 @@ struct option;
int stdio__config_color(const struct option *opt, const char *mode, int unset);
+void pthread__block_sigwinch(void);
+void pthread__unblock_sigwinch(void);
+
#endif /* _PERF_UI_H_ */
--
2.40.0.348.gf938b09366-goog
next prev parent reply other threads:[~2023-03-28 1:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 1:40 [PATCH v1 0/6] Simplify linking against tools/perf code Ian Rogers
2023-03-28 1:40 ` Ian Rogers [this message]
2023-03-28 1:40 ` [PATCH v1 2/6] perf usage: Move usage strings Ian Rogers
2023-03-28 1:40 ` [PATCH v1 3/6] perf header: Move perf_version_string declaration Ian Rogers
2023-03-28 1:40 ` [PATCH v1 4/6] perf version: Use regular verbose flag Ian Rogers
2023-03-28 1:40 ` [PATCH v1 5/6] perf util: Move input_name to util Ian Rogers
2023-03-28 1:40 ` [PATCH v1 6/6] perf util: Move perf_guest/host declarations Ian Rogers
2023-03-28 13:24 ` [PATCH v1 0/6] Simplify linking against tools/perf code Adrian Hunter
2023-03-28 16:14 ` Ian Rogers
2023-03-28 17:11 ` Adrian Hunter
2023-03-28 17:42 ` Ian Rogers
2023-03-30 5:39 ` Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230328014058.870413-2-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=chengdongli@tencent.com \
--cc=coresight@lists.linaro.org \
--cc=denik@chromium.org \
--cc=florian.fischer@muhq.space \
--cc=james.clark@arm.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=mliska@suse.cz \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=robh@kernel.org \
--cc=rsilvera@google.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).