svn commit: samba r13799 - in branches/SAMBA_3_0/source/torture: .

[jra at samba.org]

Author: jra
Date: 2006-03-02 23:23:05 +0000 (Thu, 02 Mar 2006)
New Revision: 13799

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

Log:
Make locktest debug a little easier to read.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/torture/locktest.c


Changeset:
Modified: branches/SAMBA_3_0/source/torture/locktest.c
===================================================================
--- branches/SAMBA_3_0/source/torture/locktest.c	2006-03-02 22:58:50 UTC (rev 13798)
+++ branches/SAMBA_3_0/source/torture/locktest.c	2006-03-02 23:23:05 UTC (rev 13799)
@@ -51,6 +51,20 @@
 
 enum lock_op {OP_LOCK, OP_UNLOCK, OP_REOPEN};
 
+const char *lock_op_type(int op)
+{
+	if (op == WRITE_LOCK) return "write";
+	else if (op == READ_LOCK) return "read";
+	else return "other";
+}
+
+const char *lock_op_name(enum lock_op op)
+{
+	if (op == OP_LOCK) return "lock";
+	else if (op == OP_UNLOCK) return "unlock";
+	else return "reopen";
+}
+
 struct record {
 	enum lock_op lock_op;
 	enum brl_type lock_type;
@@ -520,9 +534,9 @@
 	close_files(cli, fnum);
 
 	for (i=0;i<n;i++) {
-		printf("{%d, %d, %u, %u, %.0f, %.0f, %u},\n",
-		       recorded[i].lock_op,
-		       recorded[i].lock_type,
+		printf("{%s, %s, conn = %u, file = %u, start = %.0f, len = %.0f, %u},\n",
+		       lock_op_name(recorded[i].lock_op),
+		       lock_op_type(recorded[i].lock_type),
 		       recorded[i].conn,
 		       recorded[i].f,
 		       (double)recorded[i].start,