From: Jiri Olsa <jolsa@redhat.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>, lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Ian Rogers <irogers@google.com>,
Stephane Eranian <eranian@google.com>,
Alexei Budankov <abudankov@huawei.com>
Subject: Re: [PATCH 06/24] perf daemon: Add config file support
Date: Thu, 4 Feb 2021 16:08:50 +0100 [thread overview]
Message-ID: <YBwOAvk0v2o2w5j9@krava> (raw)
In-Reply-To: <20210203211211.GS854763@kernel.org>
On Wed, Feb 03, 2021 at 06:12:11PM -0300, Arnaldo Carvalho de Melo wrote:
SNIP
> > -static struct daemon __daemon = { };
> > +static struct daemon __daemon = {
> > + .sessions = LIST_HEAD_INIT(__daemon.sessions),
> > +};
> >
> > static const char * const daemon_usage[] = {
> > "perf daemon start [<options>]",
> > @@ -43,6 +97,128 @@ static void sig_handler(int sig __maybe_unused)
> > done = true;
> > }
> >
> > +static struct session*
> > +daemon__add_session(struct daemon *config, char *name)
> > +{
> > + struct session *session;
> > +
> > + session = zalloc(sizeof(*session));
>
>
> struct session *session = zalloc(sizeof(*session));
>
> > + if (!session)
> > + return NULL;
> > +
> > + session->name = strdup(name);
> > + if (!session->name) {
> > + free(session);
> > + return NULL;
> > + }
> > +
> > + session->pid = -1;
> > + list_add_tail(&session->list, &config->sessions);
> > + return session;
> > +}
> > +
> > +static struct session*
>
> add space after type name
>
> static struct session *
>
> And we could have it in the same line:
>
> static struct session *daemon__find_session(struct daemon *daemon, char *name)
ok
SNIP
> > + /*
> > + * Either new or changed run value is defined,
> > + * trigger reconfig for the session.
> > + */
> > + session->state = SESSION_STATE__RECONFIG;
> > + }
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int server_config(const char *var, const char *value, void *cb)
> > +{
> > + struct daemon *daemon = cb;
> > +
> > + if (strstarts(var, "session-"))
> > + return session_config(daemon, var, value);
> > + else if (!strcmp(var, "daemon.base") && !daemon->base_user) {
>
> if else uses {}, if should too
ok
SNIP
> > +
> > +static void session__free(struct session *session)
> > +{
> > + free(session->base);
> > + free(session->name);
> > + free(session->run);
>
> zfree() so that if there is some dangling pointer to session, we'll get
> NULL derefs
and won't be notified by crash about the error ;-) ok
>
> > + free(session);
> > +}
> > +
> > +static void session__remove(struct session *session)
> > +{
> > + list_del(&session->list);
>
> list_del_init
>
> > + session__free(session);
> > +}
> > +
> > +static void daemon__kill(struct daemon *daemon)
> > +{
> > + daemon__signal(daemon, SIGTERM);
> > +}
> > +
> > static void daemon__free(struct daemon *daemon)
> > {
> > + struct session *session, *h;
> > +
> > + list_for_each_entry_safe(session, h, &daemon->sessions, list)
> > + session__remove(session);
>
> Wouldn't be better to have:
>
> list_for_each_entry_safe(session, h, &daemon->sessions, list) {
> list_del_init(&session->list);
> session__free(session);
> }
>
> Because naming that function "session__remove()" one thinks it is being
> removed from some data structure, but not that it is being as well
> deleted.
>
> Please rename session__free() to session__delete() to keep it consistent
> with other places.
ok
>
> > +
> > free(daemon->config_real);
> > free(daemon->base);
> > }
> >
> > static void daemon__exit(struct daemon *daemon)
> > {
> > + daemon__kill(daemon);
> > daemon__free(daemon);
>
> Ditto for daemon__free(): please rename it to daemon__delete()
ok
thanks,
jirka
next prev parent reply other threads:[~2021-02-04 15:12 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210129134855.195810-1-jolsa@redhat.com>
2021-01-30 23:48 ` [PATCHv3 00/24] perf tools: Add daemon command Jiri Olsa
2021-01-30 23:48 ` [PATCH 01/24] perf daemon: " Jiri Olsa
2021-01-30 23:48 ` [PATCH 02/24] perf daemon: Add config option Jiri Olsa
2021-02-03 20:57 ` Arnaldo Carvalho de Melo
2021-02-04 14:42 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 03/24] perf daemon: Add base option Jiri Olsa
2021-02-03 20:57 ` Arnaldo Carvalho de Melo
2021-01-30 23:48 ` [PATCH 04/24] perf daemon: Add server socket support Jiri Olsa
2021-02-03 21:04 ` Arnaldo Carvalho de Melo
2021-02-04 14:49 ` Jiri Olsa
2021-02-04 15:53 ` Arnaldo Carvalho de Melo
2021-02-05 11:30 ` Namhyung Kim
2021-02-06 19:04 ` Jiri Olsa
2021-02-07 1:36 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 05/24] perf daemon: Add client " Jiri Olsa
2021-02-03 21:05 ` Arnaldo Carvalho de Melo
2021-02-04 14:50 ` Jiri Olsa
2021-02-05 11:39 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 06/24] perf daemon: Add config file support Jiri Olsa
2021-02-03 21:12 ` Arnaldo Carvalho de Melo
2021-02-04 15:08 ` Jiri Olsa [this message]
2021-02-06 20:25 ` Jiri Olsa
2021-02-04 12:42 ` Namhyung Kim
2021-02-04 12:58 ` Arnaldo Carvalho de Melo
2021-02-04 15:10 ` Jiri Olsa
2021-02-06 8:06 ` Namhyung Kim
2021-02-05 12:14 ` Namhyung Kim
2021-02-05 12:56 ` Jiri Olsa
2021-02-06 8:05 ` Namhyung Kim
2021-02-06 22:35 ` Jiri Olsa
2021-02-07 1:38 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 07/24] perf daemon: Add config file change check Jiri Olsa
2021-02-03 21:13 ` Arnaldo Carvalho de Melo
2021-02-04 14:51 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 08/24] perf daemon: Add background support Jiri Olsa
2021-02-03 21:16 ` Arnaldo Carvalho de Melo
2021-02-04 14:52 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 09/24] perf daemon: Add signalfd support Jiri Olsa
2021-02-03 21:24 ` Arnaldo Carvalho de Melo
2021-02-04 15:06 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 10/24] perf daemon: Add list command Jiri Olsa
2021-01-30 23:48 ` [PATCH 11/24] perf daemon: Add signal command Jiri Olsa
2021-01-30 23:48 ` [PATCH 12/24] perf daemon: Add stop command Jiri Olsa
2021-01-30 23:48 ` [PATCH 13/24] perf daemon: Allow only one daemon over base directory Jiri Olsa
2021-01-30 23:48 ` [PATCH 14/24] perf daemon: Set control fifo for session Jiri Olsa
2021-01-30 23:48 ` [PATCH 15/24] perf daemon: Add ping command Jiri Olsa
2021-01-30 23:48 ` [PATCH 16/24] perf daemon: Use control to stop session Jiri Olsa
2021-01-30 23:48 ` [PATCH 17/24] perf daemon: Add up time for daemon/session list Jiri Olsa
2021-01-30 23:48 ` [PATCH 18/24] perf daemon: Add man page for perf-daemon Jiri Olsa
2021-02-03 21:17 ` Arnaldo Carvalho de Melo
2021-02-04 14:53 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 19/24] perf tests: Add daemon list command test Jiri Olsa
2021-01-30 23:48 ` [PATCH 20/24] perf tests: Add daemon reconfig test Jiri Olsa
2021-01-30 23:48 ` [PATCH 21/24] perf tests: Add daemon stop command test Jiri Olsa
2021-01-30 23:48 ` [PATCH 22/24] perf tests: Add daemon signal " Jiri Olsa
2021-01-30 23:48 ` [PATCH 23/24] perf tests: Add daemon ping " Jiri Olsa
2021-01-30 23:48 ` [PATCH 24/24] perf tests: Add daemon lock test Jiri Olsa
2021-02-08 20:08 [PATCHv4 00/24] perf tools: Add daemon command Jiri Olsa
2021-02-08 20:08 ` [PATCH 06/24] perf daemon: Add config file support Jiri Olsa
2021-02-11 6:01 ` Namhyung Kim
2021-02-11 16:45 ` Jiri Olsa
2021-02-11 17:10 ` Arnaldo Carvalho de Melo
2021-02-11 22:52 ` Jiri Olsa
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=YBwOAvk0v2o2w5j9@krava \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=abudankov@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
/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).