STABLE14-fslog-dpf-20060731

turns out it's nice to log why we exit

(cherry picked from commit 75922872e6c29bd059db3b07b7b274e3c4172715)

diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h
index 90fd15e7323ed956fe1c2232fb096c2f34fbbdf3..a3df75aa5ea0cc11067c52d4e43c213b373724c7 100644 (file)
--- a/src/rx/rx_globals.h
+++ b/src/rx/rx_globals.h
@@ -510,7 +510,11 @@ EXT FILE *rxevent_debugFile;       /* Set to an stdio descriptor for event logging to
 #ifdef AFS_NT40_ENV
 #define dpf(args) rxi_DebugPrint args; 
 #else
+#ifdef DPF_FSLOG
+#define dpf(args) FSLog args
+#else
 #define dpf(args) if (rx_debugFile) rxi_DebugPrint args; else
+#endif 
 #endif
 #define rx_Log_event rxevent_debugFile
 

diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in
index b10e1a4ca883a17985d38ddb920ce84d77218358..f7c234f5fb1234ace3e73b05b0289662bdc43721 100644 (file)
--- a/src/tviced/Makefile.in
+++ b/src/tviced/Makefile.in
@@ -15,6 +15,7 @@ CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG
 
 CCRULE=${CC} ${CFLAGS} -c $?
 
+RX=../rx
 VICED=../viced
 VLSERVER=../vlserver
 LWP=../lwp
@@ -42,13 +43,18 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
 
 FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
 
+RXOBJS = rx_pthread.o 
+
 objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
+        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a
 
 all: fileserver
 
+rx_pthread.o: ${RX}/rx_pthread.c
+       ${CCRULE} -DDPF_FSLOG
+
 viced.o: ${VICED}/viced.c
        ${CCRULE}
 

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 8b8b1a7578d4e47cd5c7b0462ced3da94a5376e1..153446df936105be252dce93dddcd9e21afbf588 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -23,6 +23,7 @@ DIR=../dir
 VOL=../vol
 FSINT=../fsint
 VOLSER=../volser
+RX=../rx
 
 VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o vscommon.o
 
@@ -41,8 +42,10 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
 
 FSINTOBJS=# afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
 
+RXOBJS=rx_pthread.o
+
 objects= ${VOLSEROBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
+        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a
 
@@ -50,6 +53,8 @@ all: volserver
 
 COMPILE=${CC} ${CFLAGS} -c $?
 
+rx_pthread.o: ${RX}/rx_pthread.c
+       ${COMPILE} -DDPF_FSLOG
 volmain.o: ${VOLSER}/volmain.c
        ${COMPILE}
 volprocs.o: ${VOLSER}/volprocs.c