From: Michael Meffie <mmeffie@sinenomine.net>
Date: Wed, 2 Sep 2015 20:33:46 +0000 (-0400)
Subject: ptserver: convert the ptserver to opr softsig
X-Git-Tag: upstream/1.8.0_pre1^2~127
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=83fcf5d69800f6ba3c5733cb8cc0007f8b2c9dbc;p=packages%2Fo%2Fopenafs.git

ptserver: convert the ptserver to opr softsig

Convert the ptserver from regular signal handling to the opr soft
signal handling when built with pthreads. This makes it safe to call
pthread functions within signal handlers.

Change-Id: I43d345517c75e275d6896154a979a908181a1f39
Reviewed-on: https://gerrit.openafs.org/11997
Reviewed-by: Perry Ruiter <pruiter@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 14bb962e5..fdf37c1b2 100644
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -114,6 +114,10 @@
 
 #include <roken.h>
 #include <afs/opr.h>
+#ifdef AFS_PTHREAD_ENV
+# include <opr/softsig.h>
+# include <afs/procmgmt_softsig.h> /* must come after softsig.h */
+#endif
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
@@ -441,7 +445,12 @@ main(int argc, char **argv)
     serverLogSyslogTag = "ptserver";
 #endif
     OpenLog(logFile);	/* set up logging */
+#ifdef AFS_PTHREAD_ENV
+    opr_softsig_Init();
+    SetupLogSoftSignals();
+#else
     SetupLogSignals();
+#endif
 
     prdir = afsconf_Open(configDir);
     if (!prdir) {