Peter Eisentraut wrote:
> Bruce Momjian wrote:
> > Is there no API to return the name of signals?
> 
> There is, but it's not portable.  If someone wants to perform an 
> exercise in writing configure code, look for strsignal() and 
> sys_siglist[].

Good idea.  I only have sys_siglist[] on BSD/OS, and Linux and FreeBSD
have that too, so I only used that.  We will now print both signal
descriptions and numbers for backend error exits, and descriptions only
for pclose() because we only have a three-argument function to log.
Attached and applied.

-- 
  Bruce Momjian   [EMAIL PROTECTED]
  EnterpriseDB    http://www.enterprisedb.com

  + If your life is a hard drive, Christ can be your backup. +
Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.530
diff -c -c -r1.530 configure
*** configure	18 Jan 2007 14:07:30 -0000	1.530
--- configure	28 Jan 2007 01:02:58 -0000
***************
*** 15600,15605 ****
--- 15600,15667 ----
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
+ echo "$as_me:$LINENO: checking for sys_siglist" >&5
+ echo $ECHO_N "checking for sys_siglist... $ECHO_C" >&6
+ if test "${pgac_cv_var_sys_siglist+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <signal.h>
+ int
+ main ()
+ {
+ extern char *sys_siglist[]; (void)sys_siglist[0];
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+ 	 { ac_try='test -z "$ac_c_werror_flag"
+ 			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   pgac_cv_var_sys_siglist=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ pgac_cv_var_sys_siglist=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $pgac_cv_var_sys_siglist" >&5
+ echo "${ECHO_T}$pgac_cv_var_sys_siglist" >&6
+ if test x"$pgac_cv_var_sys_siglist" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SYS_SIGLIST 1
+ _ACEOF
+ 
+ fi
+ 
  echo "$as_me:$LINENO: checking for syslog" >&5
  echo $ECHO_N "checking for syslog... $ECHO_C" >&6
  if test "${ac_cv_func_syslog+set}" = set; then
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.497
diff -c -c -r1.497 configure.in
*** configure.in	18 Jan 2007 14:07:31 -0000	1.497
--- configure.in	28 Jan 2007 01:03:00 -0000
***************
*** 1059,1064 ****
--- 1059,1073 ----
  AC_MSG_RESULT(yes)],
              [AC_MSG_RESULT(no)])
  
+ AC_CACHE_CHECK([for sys_siglist], pgac_cv_var_sys_siglist,
+ [AC_TRY_LINK([#include <signal.h>],
+   [extern char *sys_siglist[]; (void)sys_siglist[0];],
+   [pgac_cv_var_sys_siglist=yes],
+   [pgac_cv_var_sys_siglist=no])])
+ if test x"$pgac_cv_var_sys_siglist" = x"yes"; then
+   AC_DEFINE(HAVE_SYS_SIGLIST, 1, [Define to 1 if you have the global variable 'char *sys_siglist[]'.])
+ fi
+ 
  AC_CHECK_FUNC(syslog,
                [AC_CHECK_HEADER(syslog.h,
                                 [AC_DEFINE(HAVE_SYSLOG, 1, [Define to 1 if you have the syslog interface.])])])
Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v
retrieving revision 1.512
diff -c -c -r1.512 postmaster.c
*** src/backend/postmaster/postmaster.c	23 Jan 2007 03:28:49 -0000	1.512
--- src/backend/postmaster/postmaster.c	28 Jan 2007 01:03:02 -0000
***************
*** 2421,2443 ****
  				(errmsg("%s (PID %d) exited with exit code %d",
  						procname, pid, WEXITSTATUS(exitstatus))));
  	else if (WIFSIGNALED(exitstatus))
! #ifndef WIN32
  		ereport(lev,
  
  		/*------
  		  translator: %s is a noun phrase describing a child process, such as
  		  "server process" */
! 				(errmsg("%s (PID %d) was terminated by signal %d",
! 						procname, pid, WTERMSIG(exitstatus))));
  #else
  		ereport(lev,
  
  		/*------
  		  translator: %s is a noun phrase describing a child process, such as
  		  "server process" */
! 				(errmsg("%s (PID %d) was terminated by exception %X",
! 						procname, pid, WTERMSIG(exitstatus)),
! 				 errhint("See /include/ntstatus.h for a description of the hex value.")));
  #endif
  	else
  		ereport(lev,
--- 2421,2453 ----
  				(errmsg("%s (PID %d) exited with exit code %d",
  						procname, pid, WEXITSTATUS(exitstatus))));
  	else if (WIFSIGNALED(exitstatus))
! #if defined(WIN32)
  		ereport(lev,
  
  		/*------
  		  translator: %s is a noun phrase describing a child process, such as
  		  "server process" */
! 				(errmsg("%s (PID %d) was terminated by exception %X",
! 						procname, pid, WTERMSIG(exitstatus)),
! 				 errhint("See C include file \"ntstatus.h\" for a description of the hex value.")));
! #elif defined(HAVE_SYS_SIGLIST)
! 		ereport(lev,
! 
! 		/*------
! 		  translator: %s is a noun phrase describing a child process, such as
! 		  "server process" */
! 				(errmsg("%s (PID %d) was terminated by signal: %s (%d)",
! 						procname, pid, WTERMSIG(exitstatus) < NSIG ?
! 						sys_siglist[WTERMSIG(exitstatus)] : "unknown signal",
! 						WTERMSIG(exitstatus))));
  #else
  		ereport(lev,
  
  		/*------
  		  translator: %s is a noun phrase describing a child process, such as
  		  "server process" */
! 				(errmsg("%s (PID %d) was terminated by signal %d",
! 						procname, pid, WTERMSIG(exitstatus))));
  #endif
  	else
  		ereport(lev,
Index: src/include/pg_config.h.in
===================================================================
RCS file: /cvsroot/pgsql/src/include/pg_config.h.in,v
retrieving revision 1.108
diff -c -c -r1.108 pg_config.h.in
*** src/include/pg_config.h.in	2 Jan 2007 21:25:50 -0000	1.108
--- src/include/pg_config.h.in	28 Jan 2007 01:03:03 -0000
***************
*** 478,483 ****
--- 478,486 ----
  /* Define to 1 if you have the <sys/shm.h> header file. */
  #undef HAVE_SYS_SHM_H
  
+ /* Define to 1 if you have the global variable 'char *sys_siglist[]'. */
+ #undef HAVE_SYS_SIGLIST
+ 
  /* Define to 1 if you have the <sys/socket.h> header file. */
  #undef HAVE_SYS_SOCKET_H
  
Index: src/port/exec.c
===================================================================
RCS file: /cvsroot/pgsql/src/port/exec.c,v
retrieving revision 1.48
diff -c -c -r1.48 exec.c
*** src/port/exec.c	23 Jan 2007 03:31:33 -0000	1.48
--- src/port/exec.c	28 Jan 2007 01:03:05 -0000
***************
*** 582,592 ****
  		log_error(_("child process exited with exit code %d"),
  				  WEXITSTATUS(exitstatus));
  	else if (WIFSIGNALED(exitstatus))
! #ifndef WIN32
! 		log_error(_("child process was terminated by signal %d"),
  				  WTERMSIG(exitstatus));
  #else
! 		log_error(_("child process was terminated by exception %X\nSee /include/ntstatus.h for a description of the hex value."),
  				  WTERMSIG(exitstatus));
  #endif
  	else
--- 582,596 ----
  		log_error(_("child process exited with exit code %d"),
  				  WEXITSTATUS(exitstatus));
  	else if (WIFSIGNALED(exitstatus))
! #if defined(WIN32)
! 		log_error(_("child process was terminated by exception %X\nSee C include file \"ntstatus.h\" for a description of the hex value."),
  				  WTERMSIG(exitstatus));
+ #elif defined(HAVE_SYS_SIGLIST)
+ 		log_error(_("child process was terminated by signal: %s"),
+ 					WTERMSIG(exitstatus) < NSIG ?
+ 					sys_siglist[WTERMSIG(exitstatus)] : "unknown signal");
  #else
! 		log_error(_("child process was terminated by signal %d"),
  				  WTERMSIG(exitstatus));
  #endif
  	else
---------------------------(end of broadcast)---------------------------
TIP 2: Don't 'kill -9' the postmaster

Reply via email to