From: <cli...@li...> - 2004-07-27 03:15:04
|
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/modules/berkeley-db berkeley-db.xml,1.26,1.27 bdb.c,1.42,1.43 (Sam Steingold) 2. clisp/modules/berkeley-db test.tst,1.6,1.7 bdb.c,1.43,1.44 (Sam Steingold) 3. clisp/src lispbibl.d,1.534,1.535 ChangeLog,1.3331,1.3332 (Bruno Haible) --__--__-- Message: 1 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/berkeley-db berkeley-db.xml,1.26,1.27 bdb.c,1.42,1.43 Date: Mon, 26 Jul 2004 17:21:26 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/berkeley-db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19555/modules/berkeley-db Modified Files: berkeley-db.xml bdb.c Log Message: (BDB:DBE-SET-OPTIONS): finish the set_lk_conflicts() interface Index: bdb.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/bdb.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- bdb.c 23 Jul 2004 22:17:46 -0000 1.42 +++ bdb.c 26 Jul 2004 17:21:22 -0000 1.43 @@ -429,7 +429,28 @@ DBE_SET(lk_max_lockers,u_int32_t,I_to_uint32(check_uint32(STACK_0))); DBE_SET(lk_detect,u_int32_t,check_lk_detect(STACK_0)); if (!missingp(STACK_0)) { /* LK_CONFLICTS */ - NOTREACHED; + uintL dims[2]; + restart_LK_CONFLICTS: /* check arguments */ + STACK_0 = check_array(STACK_0); + if (2 != array_rank(STACK_0) + || (get_array_dimensions(STACK_0,2,dims), dims[0] != dims[1]) + || (array_atype(STACK_0) != Atype_8Bit)) { + pushSTACK(NIL); /* no PLACE */ + pushSTACK(STACK_1); /* TYPE-ERROR slot DATUM */ + pushSTACK(`(ARRAY (UNSIGNED-BYTE 8) (* *))`); /* EXPECTED-TYPE */ + pushSTACK(STACK_1); pushSTACK(`:LK_CONFLICTS`); + pushSTACK(TheSubr(subr_self)->name); + check_value(type_error, + GETTEXT("~S: ~S must be a square matrix of bytes, not ~S")); + STACK_0 = value1; + goto restart_LK_CONFLICTS; + } + { /* set the conflict matrix */ + uintL offset; + object data = array_displace_check(STACK_0,dims[0]*dims[1],&offset); + SYSCALL(dbe->set_lk_conflicts, + (dbe,TheSbvector(data)->data + offset,dims[0])); + } } skipSTACK(1); if (!missingp(STACK_0)) { /* TMP_DIR */ Index: berkeley-db.xml =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/berkeley-db.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- berkeley-db.xml 23 Jul 2004 22:17:46 -0000 1.26 +++ berkeley-db.xml 26 Jul 2004 17:21:22 -0000 1.27 @@ -303,6 +303,18 @@ DB->set_lorder Set the database byte order DB->set_pagesize Set the underlying database page size DB->set_paniccall Set panic callback + DB->set_append_recno Set record append callback + DB->set_bt_compare Set a Btree comparison function + DB->set_bt_minkey Set the minimum number of keys per Btree page + DB->set_bt_prefix Set a Btree prefix comparison function + DB->set_re_delim Set the variable-length record delimiter + DB->set_re_len Set the fixed-length record length + DB->set_re_pad Set the fixed-length record pad byte + DB->set_re_source Set the backing Recno text file + DB->set_h_ffactor Set the Hash table density + DB->set_h_hash Set a hashing function + DB->set_h_nelem Set the Hash table size + DB->set_q_extentsize Set Queue database extent size --> <variablelist> <varlistentry><term><literal role="sexp">(BDB:DB-SET-OPTIONS db @@ -408,40 +420,6 @@ </listitem></varlistentry> </variablelist> -<section id="bdb-bt-rn-config"><title>Btree/Recno Configuration</title> - -<!-- - DB->set_append_recno Set record append callback - DB->set_bt_compare Set a Btree comparison function - DB->set_bt_minkey Set the minimum number of keys per Btree page - DB->set_bt_prefix Set a Btree prefix comparison function - DB->set_re_delim Set the variable-length record delimiter - DB->set_re_len Set the fixed-length record length - DB->set_re_pad Set the fixed-length record pad byte - DB->set_re_source Set the backing Recno text file - --> - -<variablelist> -<varlistentry><term><literal role="sexp">()</literal></term> - <listitem><simpara></simpara></listitem></varlistentry> -</variablelist> -</section> - - -<section id="bdb-hash-q-config"><title>Hash/Queue Configuration</title> - <!-- - DB->set_h_ffactor Set the Hash table density - DB->set_h_hash Set a hashing function - DB->set_h_nelem Set the Hash table size - DB->set_q_extentsize Set Queue database extent size - --> -<variablelist> -<varlistentry><term><literal role="sexp">()</literal></term> - <listitem><simpara></simpara></listitem></varlistentry> -</variablelist> -</section> -</section> - <section id="bdb-cursor"><title>Database Cursor Operations</title> <!-- DB->cursor Create a cursor handle --__--__-- Message: 2 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/berkeley-db test.tst,1.6,1.7 bdb.c,1.43,1.44 Date: Mon, 26 Jul 2004 17:43:56 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/berkeley-db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23440/modules/berkeley-db Modified Files: test.tst bdb.c Log Message: must init index for array_displace_check() Index: bdb.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/bdb.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- bdb.c 26 Jul 2004 17:21:22 -0000 1.43 +++ bdb.c 26 Jul 2004 17:43:54 -0000 1.44 @@ -446,7 +446,7 @@ goto restart_LK_CONFLICTS; } { /* set the conflict matrix */ - uintL offset; + uintL offset = 0; object data = array_displace_check(STACK_0,dims[0]*dims[1],&offset); SYSCALL(dbe->set_lk_conflicts, (dbe,TheSbvector(data)->data + offset,dims[0])); Index: test.tst =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/test.tst,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- test.tst 23 Jul 2004 22:17:46 -0000 1.6 +++ test.tst 26 Jul 2004 17:43:54 -0000 1.7 @@ -66,13 +66,13 @@ :data_dir "bdb-data/") NIL -(progn (print (bdb:dbe-get-options *dbe*)) nil) NIL +(let ((*print-pretty* t)) (print (bdb:dbe-get-options *dbe*)) nil) NIL (bdb:dbe-open *dbe* :home "bdb-home/" :create t :init_mpool t :init_lock t) NIL -(progn (print (bdb:dbe-get-options *dbe*)) nil) NIL +(let ((*print-pretty* t)) (print (bdb:dbe-get-options *dbe*)) nil) NIL -(defvar *db* (print (bdb:db-create *dbe*))) *db* +(defvar *db* (let ((*print-pretty* t)) (print (bdb:db-create *dbe*)))) *db* ;; the actual file goes to ./bdb-data/bazonk.db ! (bdb:db-open *db* "bazonk.db" :type :BTREE :create t) NIL @@ -173,19 +173,30 @@ ;;; access -(progn (setq *dbe* (print (bdb:dbe-create))) nil) NIL +(let ((*print-pretty* t)) (setq *dbe* (print (bdb:dbe-create))) nil) NIL (bdb:dbe-set-options *dbe* :errfile "bdb-errors" :verbose t :data_dir "bdb-data/") NIL +(let ((arr #A((unsigned-byte 8) (6 6) + ((0 0 0 0 0 0) + (0 0 1 1 0 1) + (0 1 1 1 1 1) + (0 1 1 0 0 0) + (0 0 1 0 0 0) + (0 1 1 0 0 0))))) + (bdb:dbe-set-options *dbe* :lk_conflicts arr) + (equalp arr (bdb:dbe-get-options *dbe* :lk_conflicts))) +T + (bdb:dbe-open *dbe* :home "bdb-home/" :create t :init_mpool t :init_txn t :init_lock t) NIL -(progn (print (bdb:dbe-get-options *dbe*)) nil) NIL +(let ((*print-pretty* t)) (print (bdb:dbe-get-options *dbe*)) nil) NIL -(progn (setq *db* (print (bdb:db-create *dbe*))) nil) NIL +(let ((*print-pretty* t)) (setq *db* (print (bdb:db-create *dbe*))) nil) NIL (bdb:db-open *db* "bazonk.db" :rdonly t) NIL @@ -211,7 +222,7 @@ (close *cursor*) T (close *db*) T -(progn (setq *db* (print (bdb:db-create *dbe*))) nil) NIL +(let ((*print-pretty* t)) (setq *db* (print (bdb:db-create *dbe*))) nil) NIL (bdb:db-open *db* "bazonk.db") NIL (bdb:db-truncate *db*) 2 ; the number of records discarded (close *db*) T --__--__-- Message: 3 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src lispbibl.d,1.534,1.535 ChangeLog,1.3331,1.3332 Date: Mon, 26 Jul 2004 19:06:28 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8276 Modified Files: lispbibl.d ChangeLog Log Message: Restore decls in lispbibl.d. Hey Sam, when you make changes by yourself, put your name on it, not mine! Index: lispbibl.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/lispbibl.d,v retrieving revision 1.534 retrieving revision 1.535 diff -u -d -r1.534 -r1.535 --- lispbibl.d 26 Jul 2004 16:59:27 -0000 1.534 +++ lispbibl.d 26 Jul 2004 19:06:14 -0000 1.535 @@ -11501,6 +11501,22 @@ extern object array_element_type (object array); # used by PREDTYPE, IO +/* Returns the rank of an array. + array_rank(array) + > array: an array + < uintL result: its rank = number of dimensions */ +extern uintL array_rank (object array); +# used by modules + +/* Returns the dimensions of an array. + get_array_dimensions(array,rank,&dimensions[]); + > array: an array + > uintL rank: = array_rank(array) + > uintL dimensions[0..rank-1]: room for rank dimensions + < uintL dimensions[0..rank-1]: the array's dimensions */ +extern void get_array_dimensions (object array, uintL rank, uintL* dimensions); +# used by modules + # Function: Returns the list of dimensions of an array. # array_dimensions(array) # > array: an array Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.3331 retrieving revision 1.3332 diff -u -d -r1.3331 -r1.3332 --- ChangeLog 26 Jul 2004 17:21:22 -0000 1.3331 +++ ChangeLog 26 Jul 2004 19:06:25 -0000 1.3332 @@ -5,10 +5,12 @@ * genclisph.d (main): export array_atype() * array.d (array_atype): global, not local + * genclisph.d (main): Exported array_rank() and get_array_dimensions(). + 2004-07-26 Bruno Haible <br...@cl...> + * lispbibl.d (array_rank, get_array_dimensions): New declarations. * array.d (array_rank, get_array_dimensions): New functions. - * genclisph.d (main): Exported array_rank() and get_array_dimensions(). 2004-06-02 Bruno Haible <br...@cl...> --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |