summaryrefslogtreecommitdiff
path: root/db/tcl/tcl_lock.c
diff options
context:
space:
mode:
Diffstat (limited to 'db/tcl/tcl_lock.c')
-rw-r--r--db/tcl/tcl_lock.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/db/tcl/tcl_lock.c b/db/tcl/tcl_lock.c
index 4a3de36bd..bc73bf81b 100644
--- a/db/tcl/tcl_lock.c
+++ b/db/tcl/tcl_lock.c
@@ -1,23 +1,18 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 1999-2004
- * Sleepycat Software. All rights reserved.
+ * Copyright (c) 1999-2006
+ * Oracle Corporation. All rights reserved.
*
- * $Id: tcl_lock.c,v 11.59 2004/10/07 16:48:39 bostic Exp $
+ * $Id: tcl_lock.c,v 12.6 2006/08/24 14:46:33 bostic Exp $
*/
#include "db_config.h"
+#include "db_int.h"
#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <string.h>
#include <tcl.h>
#endif
-
-#include "db_int.h"
#include "dbinc/tcl_db.h"
/*
@@ -259,10 +254,14 @@ tcl_LockStat(interp, objc, objv, envp)
MAKE_STAT_LIST("Maximum number of lockers so far", sp->st_maxnlockers);
MAKE_STAT_LIST("Current number of objects", sp->st_nobjects);
MAKE_STAT_LIST("Maximum number of objects so far", sp->st_maxnobjects);
- MAKE_STAT_LIST("Number of conflicts", sp->st_nconflicts);
MAKE_STAT_LIST("Lock requests", sp->st_nrequests);
MAKE_STAT_LIST("Lock releases", sp->st_nreleases);
- MAKE_STAT_LIST("Lock requests that would have waited", sp->st_nnowaits);
+ MAKE_STAT_LIST("Lock upgrades", sp->st_nupgrade);
+ MAKE_STAT_LIST("Lock downgrades", sp->st_ndowngrade);
+ MAKE_STAT_LIST("Number of conflicted locks for which we waited",
+ sp->st_lock_wait);
+ MAKE_STAT_LIST("Number of conflicted locks for which we did not wait",
+ sp->st_lock_nowait);
MAKE_STAT_LIST("Deadlocks detected", sp->st_ndeadlocks);
MAKE_STAT_LIST("Number of region lock waits", sp->st_region_wait);
MAKE_STAT_LIST("Number of region lock nowaits", sp->st_region_nowait);