From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 0F6455A0051 for ; Tue, 18 Jun 2024 02:52:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1718671915; bh=wUqX0ReRuA9h7kw2FApYbm/3oJDyEFoYytdjxoymjOY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lMH9cRdAOjN5HUSQ4MIIg8gnXqWuXV5j9GJ7w7bTKlULAh6+d4m/Hzuyr4FaxaEX7 CLX6KbFyZSo84ab+/7XyGbhAK+lhLDS0EAdVTf8oqUVrejs8vniMqWS6QELdww3OEd d8YaybGI+0qSw5JlibK/yUeiU2xXOSKr3gtGLQnG/Egk1WqLa16f1316GTLnneNq1w 7vC4OitqG9rsmuzjR5/KFFwf81X0qi0NLzxIao7BpW1xXsy4A/IkpUI8rYFDKi8QP7 iAN1MJrcSnezJ1Odtc5TmIzPqjqM/IgMlVkbFkjxQW36QRRF8IpxptCH0Xy3A/9WdW GX4d6QAMZ/KQw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4W37Vz1rGgz4wp3; Tue, 18 Jun 2024 10:51:55 +1000 (AEST) Date: Tue, 18 Jun 2024 10:39:13 +1000 From: David Gibson To: Stefano Brivio Subject: Re: [PATCH 2/6] conf, log: Introduce internal log flags, instead of abusing log levels Message-ID: References: <20240617120319.1206857-1-sbrivio@redhat.com> <20240617120319.1206857-3-sbrivio@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="s/4urZ5wO2DxPMwi" Content-Disposition: inline In-Reply-To: <20240617120319.1206857-3-sbrivio@redhat.com> Message-ID-Hash: RBFHMX2II46H3V23DSMSSPZW7KYLHNLH X-Message-ID-Hash: RBFHMX2II46H3V23DSMSSPZW7KYLHNLH X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top, Yalan Zhang X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --s/4urZ5wO2DxPMwi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 17, 2024 at 02:03:15PM +0200, Stefano Brivio wrote: > We currently use a LOG_EMERG log mask to represent the fact that we > don't know yet what the mask resulting from configuration should be, > before the command line is parsed. >=20 > However, we have the necessity of representing another phase as well, > that is, configuration is parsed but we didn't daemonise yet, or > we're not ready for operation yet. The next patch will add that > notion explicitly. >=20 > Mapping these cases to further log levels isn't really practical. > Introduce internal log flags to represent them, instead of abusing > log priorities. >=20 > Signed-off-by: Stefano Brivio I like not abusing the log priorities. But, do we actually need a flags field with constants and helpers, rather than just bool log_conf_parsed; and open code it from there? > --- > conf.c | 5 ++--- > log.c | 18 +++++++++++++----- > log.h | 4 ++++ > 3 files changed, 19 insertions(+), 8 deletions(-) >=20 > diff --git a/conf.c b/conf.c > index dbdbb62..0b76da9 100644 > --- a/conf.c > +++ b/conf.c > @@ -1701,9 +1701,6 @@ void conf(struct ctx *c, int argc, char **argv) > logfile, logsize); > } > =20 > - /* Once the log mask is not LOG_EARLY, we will no longer log to stderr > - * if there was a log file specified. > - */ > if (c->debug) > __setlogmask(LOG_UPTO(LOG_DEBUG)); > else if (c->quiet) > @@ -1711,6 +1708,8 @@ void conf(struct ctx *c, int argc, char **argv) > else > __setlogmask(LOG_UPTO(LOG_INFO)); > =20 > + log_set_flag(LOG_FLAG_CONF_PARSED); /* Stop printing everything */ > + > nl_sock_init(c, false); > if (!v6_only) > c->ifi4 =3D conf_ip4(ifi4, &c->ip4, c->mac); > diff --git a/log.c b/log.c > index aaf2beb..3b5a1c6 100644 > --- a/log.c > +++ b/log.c > @@ -30,14 +30,13 @@ > #include "util.h" > #include "passt.h" > =20 > -/* LOG_EARLY means we don't know yet: log everything. LOG_EMERG is unuse= d */ > -#define LOG_EARLY LOG_MASK(LOG_EMERG) > - > static int log_sock =3D -1; /* Optional socket to system logger */ > static char log_ident[BUFSIZ]; /* Identifier string for openlog() */ > -static int log_mask =3D LOG_EARLY; /* Current log priority mask */ > +static int log_mask; /* Current log priority mask */ > static int log_opt; /* Options for openlog() */ > =20 > +static uint8_t log_flags; /* Internal, see LOG_FLAG_* in log.h */ > + > static int log_file =3D -1; /* Optional log file descriptor */ > static size_t log_size; /* Maximum log file size in bytes */ > static size_t log_written; /* Currently used bytes in log file */ > @@ -50,7 +49,7 @@ int log_trace; /* --trace mode enabled */ > void vlogmsg(int pri, const char *format, va_list ap) > { > bool debug_print =3D (log_mask & LOG_MASK(LOG_DEBUG)) && log_file =3D= =3D -1; > - bool early_print =3D LOG_PRI(log_mask) =3D=3D LOG_EARLY; > + bool early_print =3D !(log_flags & LOG_FLAG_CONF_PARSED); > struct timespec tp; > =20 > if (debug_print) { > @@ -150,6 +149,15 @@ void __setlogmask(int mask) > setlogmask(mask); > } > =20 > +/** > + * log_set_flag() - Set an internal log flag > + * @flag: Flag as defined by LOG_FLAG_* in log.h > + */ > +void log_set_flag(uint8_t flag) > +{ > + log_flags |=3D flag; > +} > + > /** > * passt_vsyslog() - vsyslog() implementation not using heap memory > * @pri: Facility and level map, same as priority for vsyslog() > diff --git a/log.h b/log.h > index e0aab5a..6a3224a 100644 > --- a/log.h > +++ b/log.h > @@ -6,8 +6,11 @@ > #ifndef LOG_H > #define LOG_H > =20 > +#include > #include > =20 > +#define LOG_FLAG_CONF_PARSED BIT(0) /* We already parsed logging options= */ > + > #define LOGFILE_SIZE_DEFAULT (1024 * 1024UL) > #define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */ > #define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE)) > @@ -40,5 +43,6 @@ void logfile_init(const char *name, const char *path, s= ize_t size); > void passt_vsyslog(int pri, const char *format, va_list ap); > void logfile_write(int pri, const char *format, va_list ap); > void __setlogmask(int mask); > +void log_set_flag(uint8_t flag); > =20 > #endif /* LOG_H */ --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --s/4urZ5wO2DxPMwi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmZw1zAACgkQzQJF27ox 2GfIYw/+K2zfuAkKnTR7OKBzbepg08BE5wsJU/o4kl6q7/3vG6w5hzaK4b0CtoA9 zVi0cPE/+bp8MZwsiUHouI2w9CSmDoEjFEfAoQdvyfmDwbRlL1Aien7/9ZAU48eb 6Fg6MpUSGX0N6fxKMbH4pihdxHYSrOL8QaKJjP8Umlooi7v+ixVZEAqtGkPJ/hJ5 iHP34OiaVuWG1xLze558TbAxYsBgRTQp+pNCwsETRzFdMgDEMmHbIo0nOqKkX95O zgPBx3AXImNPsLTEuwZk91iPB/nMTehRvYCN1ufIGSZeizqT7pZjFTWGHZ0yY9xL RekBnl++37yVnhQK6NSlVte2D0KmWW0+ZiPOtS0SBxB42961TRrqTSb7kzgziR+k HFx+Kt3f2RP8STd8CCd37nebLLKnmD7du484ljrZg3BaXYSbMSBkznFXuLOsr4qL EGglKuv1DTfiT7Q5nyJxUogq71b51+0wk1W/DXfpS2o0a+zMyjT6IE+wrNEmO3XM r9eZxkgvpB2zFgfApvJ0exw+KAHDTKHBtC0RS4t7ctoCsuKxtD2xgTiRnlgUHB7g izrlQUgBL7cMyCKbbv24EgGr5rc3FSmI7mz9WG+MXBeW7Mlz2xPB2PkE0D6/Rqu2 UdiLaCtGFr9sNUEZrA4s9I/2WMrvimOYJNMEKXYVug3QLUeYW0c= =pTq3 -----END PGP SIGNATURE----- --s/4urZ5wO2DxPMwi--