From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 31 Jul 2006 20:01:45 +0000 (+0000)
Subject: DEVEL15-fslog-dpf-20060731
X-Git-Tag: openafs-devel-1_5_5~14
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=21f3bdc53e64d6e686ba2e6f1013744722755eff;p=packages%2Fo%2Fopenafs.git

DEVEL15-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 3231d79d2..ea2af599a 100644
--- a/src/rx/rx_globals.h
+++ b/src/rx/rx_globals.h
@@ -522,7 +522,11 @@ EXT int rxdebug_active;
 #define dpf(args)
 #endif
 #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 68363fc54..67970cb4e 100644
--- a/src/tviced/Makefile.in
+++ b/src/tviced/Makefile.in
@@ -15,6 +15,7 @@ CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_
 
 CCRULE=${CC} ${CFLAGS} -c $?
 
+RX=../rx
 VICED=../viced
 VLSERVER=../vlserver
 LWP=../lwp
@@ -42,8 +43,10 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.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}
 
 SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a
 
@@ -51,6 +54,9 @@ LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.
 
 all: fileserver state_analyzer
 
+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 bfeb3a24a..834f98475 100644
--- 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
 
@@ -42,8 +43,10 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.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
 
@@ -51,6 +54,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