From: <cli...@li...> - 2010-05-24 12:04:29
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src ChangeLog,1.7341,1.7342 (Sam Steingold) 2. clisp/modules/berkeley-db bdb.c,1.135,1.136 dbi.lisp,1.31,1.32 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Mon, 24 May 2010 02:15:33 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.7341,1.7342 To: cli...@li... Message-ID: <E1O...@sf...> Update of /cvsroot/clisp/clisp/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18443/src Modified Files: ChangeLog Log Message: (txn_status_check): add DEFCHECKER (TXN-CHECK): use it to output stat->st_txnarray->status symbolically (db-txn-active): status may be a keyword Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.7341 retrieving revision 1.7342 diff -u -d -r1.7341 -r1.7342 --- ChangeLog 21 May 2010 20:54:54 -0000 1.7341 +++ ChangeLog 24 May 2010 02:15:31 -0000 1.7342 @@ -1,3 +1,9 @@ +2010-05-23 Sam Steingold <sd...@gn...> + + * modules/berkeley-db/bdb.c (txn_status_check): add DEFCHECKER + (TXN-CHECK): use it to output stat->st_txnarray->status symbolically + * modules/berkeley-db/dbi.lisp (db-txn-active): status may be a keyword + 2010-05-21 Sam Steingold <sd...@gn...> * modules/pari/Makefile.in (pari.o): pass -I. first thing to CC ------------------------------ Message: 2 Date: Mon, 24 May 2010 02:15:33 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/berkeley-db bdb.c,1.135,1.136 dbi.lisp,1.31,1.32 To: cli...@li... Message-ID: <E1O...@sf...> Update of /cvsroot/clisp/clisp/modules/berkeley-db In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18443/modules/berkeley-db Modified Files: bdb.c dbi.lisp Log Message: (txn_status_check): add DEFCHECKER (TXN-CHECK): use it to output stat->st_txnarray->status symbolically (db-txn-active): status may be a keyword Index: bdb.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/bdb.c,v retrieving revision 1.135 retrieving revision 1.136 diff -u -d -r1.135 -r1.136 --- bdb.c 21 May 2010 18:07:24 -0000 1.135 +++ bdb.c 24 May 2010 02:15:30 -0000 1.136 @@ -2773,6 +2773,8 @@ VALUES0; } +DEFCHECKER(txn_status_check,prefix=TXN,default=, \ + ABORTED COMMITTED PREPARED RUNNING) DEFUN(BDB:TXN-STAT, dbe &key STAT-CLEAR) { /* transaction subsystem statistics */ u_int32_t flags = stat_flags(); @@ -2795,16 +2797,16 @@ { /* txnarray */ int ii, size = stat->st_nactive; DB_TXN_ACTIVE *txn_active = stat->st_txnarray; - for (ii=0; ii<size; ii++) { + for (ii=0; ii<size; ii++, txn_active++) { pushSTACK(uint32_to_I(txn_active->txnid)); pushSTACK(uint32_to_I(txn_active->parentid)); pushSTACK(make_lsn(&(txn_active->lsn))); - #if defined(HAVE_DB_TXN_ACTIVE_STATUS) /* 4.8 */ - pushSTACK(uint32_to_I(txn_active->status)); + #if defined(HAVE_DB_TXN_ACTIVE_STATUS) /* 4.7 */ + pushSTACK(txn_status_check_reverse(txn_active->status)); #else pushSTACK(uint32_to_I(txn_active->xa_status)); #endif - #if defined(HAVE_DB_TXN_ACTIVE_STATUS) /* 4.8 */ + #if defined(HAVE_DB_TXN_ACTIVE_GID) /* 4.8 */ pushSTACK(gid_to_vector(txn_active->gid)); #else pushSTACK(gid_to_vector(txn_active->xid)); Index: dbi.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/dbi.lisp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- dbi.lisp 21 May 2010 18:05:33 -0000 1.31 +++ dbi.lisp 24 May 2010 02:15:30 -0000 1.32 @@ -261,7 +261,7 @@ (lsn nil :type lsn :read-only t) ;; If the transaction is an XA transaction, the status of the ;; transaction, otherwise 0. - (status 0 :type (unsigned-byte 32) :read-only t) + (status 0 :type (or keyword (unsigned-byte 32)) :read-only t) ;; If the transaction is an XA transaction, the transaction's XA ID. (gid nil :type (vector (unsigned-byte 8) #,(dbe-get-options nil :DB-GID-SIZE)) ------------------------------ ------------------------------------------------------------------------------ ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 49, Issue 20 ***************************************** |