Date: Thu, 17 Apr 2025 13:24:25 -0600 From: Warner Losh <imp@bsdimp.com> To: Konstantin Belousov <kib@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: 3b2f0bfc3516 - main - Add POSIX psiginfo(3) call Message-ID: <CANCZdfp0k03Q=5Jvv_8mQQeYzSJ7_6zgXEbYtrZd6Ap=A%2Bc46g@mail.gmail.com> In-Reply-To: <CANCZdfodA022MidoB%2BCsKngVK%2Bm2%2B0DhwL-iLH9xz73Pr8_Z5A@mail.gmail.com> References: <202504171520.53HFK0o7057403@gitrepo.freebsd.org> <CANCZdfodA022MidoB%2BCsKngVK%2Bm2%2B0DhwL-iLH9xz73Pr8_Z5A@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, Apr 17, 2025, 9:27 AM Warner Losh <imp@bsdimp.com> wrote: > On Thu, Apr 17, 2025 at 9:20 AM Konstantin Belousov <kib@freebsd.org> > wrote: > > > > The branch main has been updated by kib: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3b2f0bfc35167724a41c969c1823be6b1ede15ab > > > > commit 3b2f0bfc35167724a41c969c1823be6b1ede15ab > > Author: Ricardo Branco <rbranco@suse.de> > > AuthorDate: 2025-04-16 07:52:13 +0000 > > Commit: Konstantin Belousov <kib@FreeBSD.org> > > CommitDate: 2025-04-17 15:19:44 +0000 > > > > Add POSIX psiginfo(3) call > > > > Signed-off-by: Ricardo Branco <rbranco@suse.de> > > PR: 286133 > > MFC after: 1 week > > Github PR: https://github.com/freebsd/freebsd-src/pull/1666 > > We've been using 'Pull Request: ' for this trailer. > And the reason we do Pull-request: or Pull Request: is that both autoclose the pull request... We're working on moving to the git standard with dashes since it simplifies tool and can have better uniformity enforcement... Warner Warner > > > --- > > include/signal.h | 1 + > > lib/libc/gen/Makefile.inc | 3 ++- > > lib/libc/gen/Symbol.map | 1 + > > lib/libc/gen/psignal.3 | 22 +++++++++++++++++++++- > > lib/libc/gen/psignal.c | 6 ++++++ > > 5 files changed, 31 insertions(+), 2 deletions(-) > > > > diff --git a/include/signal.h b/include/signal.h > > index 388e164d7943..c1d341f317f4 100644 > > --- a/include/signal.h > > +++ b/include/signal.h > > @@ -115,6 +115,7 @@ int siginterrupt(int, int); > > #endif > > > > #if __POSIX_VISIBLE >= 200809 > > +void psiginfo(const siginfo_t *, const char *); > > void psignal(int, const char *); > > #endif > > > > diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc > > index 9b92e52cdfad..a8308a057b05 100644 > > --- a/lib/libc/gen/Makefile.inc > > +++ b/lib/libc/gen/Makefile.inc > > @@ -465,7 +465,8 @@ MLINKS+=posix_spawn.3 posix_spawnp.3 \ > > posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \ > > posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \ > > posix_spawnattr_init.3 posix_spawnattr_destroy.3 > > -MLINKS+=psignal.3 strsignal.3 \ > > +MLINKS+=psignal.3 psiginfo.3 \ > > + psignal.3 strsignal.3 \ > > psignal.3 sys_siglist.3 \ > > psignal.3 sys_signame.3 > > MLINKS+=pwcache.3 gid_from_group.3 \ > > diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map > > index ca3974e6b747..21b66acba213 100644 > > --- a/lib/libc/gen/Symbol.map > > +++ b/lib/libc/gen/Symbol.map > > @@ -458,6 +458,7 @@ FBSD_1.8 { > > aio_read2; > > aio_write2; > > execvpe; > > + psiginfo; > > rtld_get_var; > > rtld_set_var; > > }; > > diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3 > > index cd3cef0b44a9..605c3cf2d8fe 100644 > > --- a/lib/libc/gen/psignal.3 > > +++ b/lib/libc/gen/psignal.3 > > @@ -25,11 +25,12 @@ > > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY > OF > > .\" SUCH DAMAGE. > > .\" > > -.Dd May 30, 2016 > > +.Dd Apr 16, 2025 > > .Dt PSIGNAL 3 > > .Os > > .Sh NAME > > .Nm psignal , > > +.Nm psiginfo , > > .Nm strsignal , > > .Nm sys_siglist , > > .Nm sys_signame > > @@ -40,6 +41,8 @@ > > .In signal.h > > .Ft void > > .Fn psignal "int sig" "const char *s" > > +.Ft void > > +.Fn psiginfo "const siginfo_t *si" "const char *s" > > .Vt extern const char * const sys_siglist[] ; > > .Vt extern const char * const sys_signame[] ; > > .In string.h > > @@ -79,6 +82,16 @@ the string > > .Dq "Unknown signal" > > is produced. > > .Pp > > +The > > +.Fn psiginfo > > +function is similar to > > +.Fn psignal , > > +except that the signal number information is taken from the > > +.Fa si > > +argument which is a > > +.Vt siginfo_t > > +structure. > > +.Pp > > The message strings can be accessed directly > > through the external array > > .Va sys_siglist , > > @@ -104,3 +117,10 @@ The > > .Fn psignal > > function appeared in > > .Bx 4.2 . > > +The > > +.Fn psiginfo > > +function appeared in > > +.Fx 15.0 , > > +.Nx 6.0 , > > +and > > +.Dx 4.1 . > > diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c > > index ab044f683d86..291a6a9337a0 100644 > > --- a/lib/libc/gen/psignal.c > > +++ b/lib/libc/gen/psignal.c > > @@ -55,3 +55,9 @@ psignal(int sig, const char *s) > > (void)_write(STDERR_FILENO, c, strlen(c)); > > (void)_write(STDERR_FILENO, "\n", 1); > > } > > + > > +void > > +psiginfo(const siginfo_t *si, const char *s) > > +{ > > + psignal(si->si_signo, s); > > +} > [-- Attachment #2 --] <div dir="auto"><div><br><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Thu, Apr 17, 2025, 9:27 AM Warner Losh <<a href="mailto:imp@bsdimp.com">imp@bsdimp.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Thu, Apr 17, 2025 at 9:20 AM Konstantin Belousov <<a href="mailto:kib@freebsd.org" target="_blank" rel="noreferrer">kib@freebsd.org</a>> wrote:<br> ><br> > The branch main has been updated by kib:<br> ><br> > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=3b2f0bfc35167724a41c969c1823be6b1ede15ab" rel="noreferrer noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=3b2f0bfc35167724a41c969c1823be6b1ede15ab</a><br>; ><br> > commit 3b2f0bfc35167724a41c969c1823be6b1ede15ab<br> > Author: Ricardo Branco <<a href="mailto:rbranco@suse.de" target="_blank" rel="noreferrer">rbranco@suse.de</a>><br> > AuthorDate: 2025-04-16 07:52:13 +0000<br> > Commit: Konstantin Belousov <kib@FreeBSD.org><br> > CommitDate: 2025-04-17 15:19:44 +0000<br> ><br> > Add POSIX psiginfo(3) call<br> ><br> > Signed-off-by: Ricardo Branco <<a href="mailto:rbranco@suse.de" target="_blank" rel="noreferrer">rbranco@suse.de</a>><br> > PR: 286133<br> > MFC after: 1 week<br> > Github PR: <a href="https://github.com/freebsd/freebsd-src/pull/1666" rel="noreferrer noreferrer" target="_blank">https://github.com/freebsd/freebsd-src/pull/1666</a><br>; <br> We've been using 'Pull Request: ' for this trailer.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">And the reason we do Pull-request: or Pull Request: is that both autoclose the pull request... We're working on moving to the git standard with dashes since it simplifies tool and can have better uniformity enforcement...</div><div dir="auto"><br></div><div dir="auto">Warner</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote gmail_quote_container"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Warner<br> <br> > ---<br> > include/signal.h | 1 +<br> > lib/libc/gen/Makefile.inc | 3 ++-<br> > lib/libc/gen/Symbol.map | 1 +<br> > lib/libc/gen/psignal.3 | 22 +++++++++++++++++++++-<br> > lib/libc/gen/psignal.c | 6 ++++++<br> > 5 files changed, 31 insertions(+), 2 deletions(-)<br> ><br> > diff --git a/include/signal.h b/include/signal.h<br> > index 388e164d7943..c1d341f317f4 100644<br> > --- a/include/signal.h<br> > +++ b/include/signal.h<br> > @@ -115,6 +115,7 @@ int siginterrupt(int, int);<br> > #endif<br> ><br> > #if __POSIX_VISIBLE >= 200809<br> > +void psiginfo(const siginfo_t *, const char *);<br> > void psignal(int, const char *);<br> > #endif<br> ><br> > diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc<br> > index 9b92e52cdfad..a8308a057b05 100644<br> > --- a/lib/libc/gen/Makefile.inc<br> > +++ b/lib/libc/gen/Makefile.inc<br> > @@ -465,7 +465,8 @@ MLINKS+=posix_spawn.3 posix_spawnp.3 \<br> > posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \<br> > posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \<br> > posix_spawnattr_init.3 posix_spawnattr_destroy.3<br> > -MLINKS+=psignal.3 strsignal.3 \<br> > +MLINKS+=psignal.3 psiginfo.3 \<br> > + psignal.3 strsignal.3 \<br> > psignal.3 sys_siglist.3 \<br> > psignal.3 sys_signame.3<br> > MLINKS+=pwcache.3 gid_from_group.3 \<br> > diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map<br> > index ca3974e6b747..21b66acba213 100644<br> > --- a/lib/libc/gen/Symbol.map<br> > +++ b/lib/libc/gen/Symbol.map<br> > @@ -458,6 +458,7 @@ FBSD_1.8 {<br> > aio_read2;<br> > aio_write2;<br> > execvpe;<br> > + psiginfo;<br> > rtld_get_var;<br> > rtld_set_var;<br> > };<br> > diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3<br> > index cd3cef0b44a9..605c3cf2d8fe 100644<br> > --- a/lib/libc/gen/psignal.3<br> > +++ b/lib/libc/gen/psignal.3<br> > @@ -25,11 +25,12 @@<br> > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF<br> > .\" SUCH DAMAGE.<br> > .\"<br> > -.Dd May 30, 2016<br> > +.Dd Apr 16, 2025<br> > .Dt PSIGNAL 3<br> > .Os<br> > .Sh NAME<br> > .Nm psignal ,<br> > +.Nm psiginfo ,<br> > .Nm strsignal ,<br> > .Nm sys_siglist ,<br> > .Nm sys_signame<br> > @@ -40,6 +41,8 @@<br> > .In signal.h<br> > .Ft void<br> > .Fn psignal "int sig" "const char *s"<br> > +.Ft void<br> > +.Fn psiginfo "const siginfo_t *si" "const char *s"<br> > .Vt extern const char * const sys_siglist[] ;<br> > .Vt extern const char * const sys_signame[] ;<br> > .In string.h<br> > @@ -79,6 +82,16 @@ the string<br> > .Dq "Unknown signal"<br> > is produced.<br> > .Pp<br> > +The<br> > +.Fn psiginfo<br> > +function is similar to<br> > +.Fn psignal ,<br> > +except that the signal number information is taken from the<br> > +.Fa si<br> > +argument which is a<br> > +.Vt siginfo_t<br> > +structure.<br> > +.Pp<br> > The message strings can be accessed directly<br> > through the external array<br> > .Va sys_siglist ,<br> > @@ -104,3 +117,10 @@ The<br> > .Fn psignal<br> > function appeared in<br> > .Bx 4.2 .<br> > +The<br> > +.Fn psiginfo<br> > +function appeared in<br> > +.Fx 15.0 ,<br> > +.Nx 6.0 ,<br> > +and<br> > +.Dx 4.1 .<br> > diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c<br> > index ab044f683d86..291a6a9337a0 100644<br> > --- a/lib/libc/gen/psignal.c<br> > +++ b/lib/libc/gen/psignal.c<br> > @@ -55,3 +55,9 @@ psignal(int sig, const char *s)<br> > (void)_write(STDERR_FILENO, c, strlen(c));<br> > (void)_write(STDERR_FILENO, "\n", 1);<br> > }<br> > +<br> > +void<br> > +psiginfo(const siginfo_t *si, const char *s)<br> > +{<br> > + psignal(si->si_signo, s);<br> > +}<br> </blockquote></div></div></div>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfp0k03Q=5Jvv_8mQQeYzSJ7_6zgXEbYtrZd6Ap=A%2Bc46g>