RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 24-Dec-2010 17:11:20
Branch: HEAD Handle: 2010122416111900
Modified files:
rpm CHANGES
rpm/rpmdb db3.c
Log:
- db3: adjust event debugging, add DB->cursor() open flags.
Summary:
Revision Changes Path
1.3512 +1 -0 rpm/CHANGES
1.157 +45 -2 rpm/rpmdb/db3.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3511 -r1.3512 CHANGES
--- rpm/CHANGES 24 Dec 2010 14:31:02 -0000 1.3511
+++ rpm/CHANGES 24 Dec 2010 16:11:19 -0000 1.3512
@@ -1,4 +1,5 @@
5.3.7 -> 5.4a1:
+ - jbj: db3: adjust event debugging, add DB->cursor() open flags.
- jbj: rpmdb: rename the dependency cache pseudo-tag.
- jbj: verify: re-add digest/signature checks.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.156 -r1.157 db3.c
--- rpm/rpmdb/db3.c 2 Dec 2010 14:38:08 -0000 1.156
+++ rpm/rpmdb/db3.c 24 Dec 2010 16:11:19 -0000 1.157
@@ -337,6 +337,29 @@
#define _AFFLAGS(_afflags) fmtDBafflags(_afflags)
/*...@unchecked@*/ /*...@observer@*/
+static KEY DBCoflags[] = {
+#ifdef NOTYET /* XXX DB->cursor() doco for db-5.1.19 lists, undef'd */
+ _ENTRY(BULK),
+#endif
+ _ENTRY(READ_COMMITTED),
+ _ENTRY(READ_UNCOMMITTED),
+ _ENTRY(WRITECURSOR),
+ _ENTRY(TXN_SNAPSHOT),
+};
+/*...@unchecked@*/
+static size_t nDBCoflags = sizeof(DBCoflags) / sizeof(DBCoflags[0]);
+/*...@observer@*/
+static const char * fmtDBCoflags(uint32_t flags)
+ /*...@*/
+{
+ static char buf[BUFSIZ];
+ char * te = buf;
+ (void) fmtBits(flags, DBCoflags, nDBCoflags, te);
+ return buf;
+}
+#define _DBCOFLAGS(_coflags) fmtDBCoflags(_coflags)
+
+/*...@unchecked@*/ /*...@observer@*/
static KEY DBCflags[] = {
_ENTRY(AFTER), /* Dbc.put */
_ENTRY(APPEND), /* Db.put */
@@ -684,9 +707,28 @@
const char * n;
uint32_t v;
} _events[] = {
+ /* XXX numbered from db-5.1.19, older versions are different. */
+#if (DB_VERSION_MAJOR == 5)
+ _TABLE(PANIC), /* 0 */
+ _TABLE(REG_ALIVE), /* 1 */
+ _TABLE(REG_PANIC), /* 2 */
+ _TABLE(REP_CLIENT), /* 3 */
+ _TABLE(REP_DUPMASTER), /* 4 */
+ _TABLE(REP_ELECTED), /* 5 */
+ _TABLE(REP_ELECTION_FAILED),/* 6 */
+ _TABLE(REP_JOIN_FAILURE), /* 7 */
+ _TABLE(REP_MASTER), /* 8 */
+ _TABLE(REP_MASTER_FAILURE), /* 9 */
+ _TABLE(REP_NEWMASTER), /* 10 */
+ _TABLE(REP_PERM_FAILED), /* 11 */
+ _TABLE(REP_STARTUPDONE), /* 12 */
+ _TABLE(WRITE_FAILED), /* 13 */
+ _TABLE(NO_SUCH_EVENT), /* 14 */
+ _TABLE(NO_SUCH_EVENT), /* 15 */
+#else
_TABLE(NO_SUCH_EVENT), /* 0 */
_TABLE(PANIC), /* 1 */
-#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || (DB_VERSION_MAJOR ==
5)
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8)
_TABLE(REG_ALIVE), /* 2 */
_TABLE(REG_PANIC), /* 3 */
#else
@@ -705,6 +747,7 @@
_TABLE(NO_SUCH_EVENT), /* 13 */
_TABLE(NO_SUCH_EVENT), /* 14 */
_TABLE(NO_SUCH_EVENT), /* 15 */
+#endif
};
#undef _TABLE
@@ -1208,7 +1251,7 @@
else
(void) db3cclose(dbi, dbcursor, 0);
-DBIDEBUG(dbi, (stderr, "<-- %s(%p,%p,%p,0x%x) dbc %p rc %d\n", __FUNCTION__,
dbi, txnid, dbcp, dbiflags, dbcursor, rc));
+DBIDEBUG(dbi, (stderr, "<-- %s(%p,%p,%p,0x%x) dbc %p %s rc %d\n",
__FUNCTION__, dbi, txnid, dbcp, dbiflags, dbcursor, _DBCOFLAGS(flags), rc));
return rc;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
