svn commit: samba r12691 - in branches/tmp/jpeach-cluster/source: include lib locking smbd

[jpeach at samba.org]

Author: jpeach
Date: 2006-01-03 06:33:49 +0000 (Tue, 03 Jan 2006)
New Revision: 12691

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12691

Log:
Add a "locking" debug channel to enable debugging for the locking
subsystem(s).

Modified:
   branches/tmp/jpeach-cluster/source/include/debug.h
   branches/tmp/jpeach-cluster/source/lib/debug.c
   branches/tmp/jpeach-cluster/source/locking/brlock.c
   branches/tmp/jpeach-cluster/source/locking/locking.c
   branches/tmp/jpeach-cluster/source/locking/posix.c
   branches/tmp/jpeach-cluster/source/smbd/reply.c


Changeset:
Modified: branches/tmp/jpeach-cluster/source/include/debug.h
===================================================================
--- branches/tmp/jpeach-cluster/source/include/debug.h	2006-01-03 06:29:14 UTC (rev 12690)
+++ branches/tmp/jpeach-cluster/source/include/debug.h	2006-01-03 06:33:49 UTC (rev 12691)
@@ -95,6 +95,7 @@
 #define DBGC_QUOTA		14
 #define DBGC_ACLS		15
 #define DBGC_MSDFS		16
+#define DBGC_LOCKING		17
 
 /* So you can define DBGC_CLASS before including debug.h */
 #ifndef DBGC_CLASS

Modified: branches/tmp/jpeach-cluster/source/lib/debug.c
===================================================================
--- branches/tmp/jpeach-cluster/source/lib/debug.c	2006-01-03 06:29:14 UTC (rev 12690)
+++ branches/tmp/jpeach-cluster/source/lib/debug.c	2006-01-03 06:33:49 UTC (rev 12691)
@@ -165,6 +165,7 @@
 	"quota",	     /* DBGC_QUOTA	  */
 	"acls",		     /* DBGC_ACLS	  */
 	"msdfs",	     /* DBGC_MSDFS	  */
+	"locking",	     /* DBGC_LOCKING	  */
 	NULL
 };
 

Modified: branches/tmp/jpeach-cluster/source/locking/brlock.c
===================================================================
--- branches/tmp/jpeach-cluster/source/locking/brlock.c	2006-01-03 06:29:14 UTC (rev 12690)
+++ branches/tmp/jpeach-cluster/source/locking/brlock.c	2006-01-03 06:33:49 UTC (rev 12691)
@@ -25,6 +25,7 @@
    replacing the fcntl() based byte range locking previously
    used. This allows us to provide the same semantics as NT */
 
+#define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
 
 #define ZERO_ZERO 0

Modified: branches/tmp/jpeach-cluster/source/locking/locking.c
===================================================================
--- branches/tmp/jpeach-cluster/source/locking/locking.c	2006-01-03 06:29:14 UTC (rev 12690)
+++ branches/tmp/jpeach-cluster/source/locking/locking.c	2006-01-03 06:33:49 UTC (rev 12691)
@@ -34,6 +34,7 @@
    Added POSIX locking support. Jeremy Allison (jeremy at valinux.com), Apr. 2000.
 */
 
+#define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
 uint16 global_smbpid;
 

Modified: branches/tmp/jpeach-cluster/source/locking/posix.c
===================================================================
--- branches/tmp/jpeach-cluster/source/locking/posix.c	2006-01-03 06:29:14 UTC (rev 12690)
+++ branches/tmp/jpeach-cluster/source/locking/posix.c	2006-01-03 06:33:49 UTC (rev 12691)
@@ -22,6 +22,7 @@
    POSIX locking support. Jeremy Allison (jeremy at valinux.com), Apr. 2000.
 */
 
+#define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
 
 /*

Modified: branches/tmp/jpeach-cluster/source/smbd/reply.c
===================================================================
--- branches/tmp/jpeach-cluster/source/smbd/reply.c	2006-01-03 06:29:14 UTC (rev 12690)
+++ branches/tmp/jpeach-cluster/source/smbd/reply.c	2006-01-03 06:33:49 UTC (rev 12691)
@@ -2475,6 +2475,9 @@
  Reply to a writeunlock (core+).
 ****************************************************************************/
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 int reply_writeunlock(connection_struct *conn, char *inbuf,char *outbuf, 
 		      int size, int dum_buffsize)
 {
@@ -2535,6 +2538,9 @@
 	return outsize;
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
 /****************************************************************************
  Reply to a write.
 ****************************************************************************/
@@ -2983,6 +2989,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 /****************************************************************************
  Reply to a lock.
 ****************************************************************************/
@@ -3063,6 +3072,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
 /****************************************************************************
  Reply to a tdis.
 ****************************************************************************/
@@ -4484,6 +4496,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 /****************************************************************************
  Get a lock pid, dealing with large count requests.
 ****************************************************************************/
@@ -4821,6 +4836,9 @@
 	return chain_reply(inbuf,outbuf,length,bufsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
 /****************************************************************************
  Reply to a SMBreadbmpx (read block multiplex) request.
 ****************************************************************************/