ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/BDB/BDB.xs
(Generate patch)

Comparing BDB/BDB.xs (file contents):
Revision 1.47 by root, Fri Jul 18 22:39:10 2008 UTC vs.
Revision 1.51 by root, Thu Sep 25 13:28:37 2008 UTC

1#include <sys/user.h>
2#include <sys/ptrace.h>
3
4#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4
5
1#include "xthread.h" 6#include "xthread.h"
2 7
3#include <errno.h> 8#include <errno.h>
4 9
5#include "EXTERN.h" 10#include "EXTERN.h"
… …
130dbt_to_sv (SV *sv, DBT *dbt) 135dbt_to_sv (SV *sv, DBT *dbt)
131{ 136{
132 if (sv) 137 if (sv)
133 { 138 {
134 SvREADONLY_off (sv); 139 SvREADONLY_off (sv);
135 sv_setpvn_mg (sv, dbt->data, dbt->size); 140 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef);
136 SvREFCNT_dec (sv); 141 SvREFCNT_dec (sv);
137 } 142 }
138 143
144 //assert (dbt->flags & DBT_MALLOC || !dbt->data);
139 free (dbt->data); 145 free (dbt->data);
140} 146}
141 147
142enum { 148enum {
143 REQ_QUIT, 149 REQ_QUIT,
… …
171 DB_KEY_RANGE key_range; 177 DB_KEY_RANGE key_range;
172#if DB_VERSION_MINOR >= 3 178#if DB_VERSION_MINOR >= 3
173 DB_SEQUENCE *seq; 179 DB_SEQUENCE *seq;
174 db_seq_t seq_t; 180 db_seq_t seq_t;
175#endif 181#endif
182
183 SV *rsv1, *rsv2; // keep some request objects alive
176} bdb_cb; 184} bdb_cb;
177 185
178typedef bdb_cb *bdb_req; 186typedef bdb_cb *bdb_req;
179 187
180enum { 188enum {
… …
419} 427}
420 428
421static void req_free (bdb_req req) 429static void req_free (bdb_req req)
422{ 430{
423 SvREFCNT_dec (req->callback); 431 SvREFCNT_dec (req->callback);
432
433 SvREFCNT_dec (req->rsv1);
434 SvREFCNT_dec (req->rsv2);
424 435
425 free (req->buf1); 436 free (req->buf1);
426 free (req->buf2); 437 free (req->buf2);
427 free (req->buf3); 438 free (req->buf3);
428 439
… …
524 on_next_submit = 0; 535 on_next_submit = 0;
525 536
526 PUSHMARK (SP); 537 PUSHMARK (SP);
527 PUTBACK; 538 PUTBACK;
528 call_sv (cb, G_DISCARD | G_EVAL); 539 call_sv (cb, G_DISCARD | G_EVAL);
540 SPAGAIN;
529 } 541 }
530 542
531 // synthesize callback if none given 543 // synthesize callback if none given
532 if (!req->callback) 544 if (!req->callback)
533 { 545 {
… …
541 553
542 if (count != 2) 554 if (count != 2)
543 croak ("prepare callback must return exactly two values\n"); 555 croak ("prepare callback must return exactly two values\n");
544 556
545 wait_callback = POPs; 557 wait_callback = POPs;
546 SvREFCNT_dec (req->callback);
547 req->callback = SvREFCNT_inc (POPs); 558 req->callback = SvREFCNT_inc (POPs);
548 } 559 }
549 560
550 ++nreqs; 561 ++nreqs;
551 562
… …
703 714
704 return count; 715 return count;
705} 716}
706 717
707/*****************************************************************************/ 718/*****************************************************************************/
719
720static void
721bdb_request (bdb_req req)
722{
723 switch (req->type)
724 {
725 case REQ_ENV_OPEN:
726 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
727 break;
728
729 case REQ_ENV_CLOSE:
730 req->result = req->env->close (req->env, req->uint1);
731 break;
732
733 case REQ_ENV_TXN_CHECKPOINT:
734 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
735 break;
736
737 case REQ_ENV_LOCK_DETECT:
738 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
739 break;
740
741 case REQ_ENV_MEMP_SYNC:
742 req->result = req->env->memp_sync (req->env, 0);
743 break;
744
745 case REQ_ENV_MEMP_TRICKLE:
746 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
747 break;
748
749 case REQ_ENV_DBREMOVE:
750 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
751 break;
752
753 case REQ_ENV_DBRENAME:
754 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
755 break;
756
757 case REQ_DB_OPEN:
758 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
759 break;
760
761 case REQ_DB_CLOSE:
762 req->result = req->db->close (req->db, req->uint1);
763 break;
764
765#if DB_VERSION_MINOR >= 4
766 case REQ_DB_COMPACT:
767 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
768 break;
769#endif
770
771 case REQ_DB_SYNC:
772 req->result = req->db->sync (req->db, req->uint1);
773 break;
774
775 case REQ_DB_UPGRADE:
776 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
777 break;
778
779 case REQ_DB_PUT:
780 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
781 break;
782
783#if DB_VERSION_MINOR >= 6
784 case REQ_DB_EXISTS:
785 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
786 break;
787#endif
788 case REQ_DB_GET:
789 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
790 break;
791
792 case REQ_DB_PGET:
793 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
794 break;
795
796 case REQ_DB_DEL:
797 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
798 break;
799
800 case REQ_DB_KEY_RANGE:
801 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
802 break;
803
804 case REQ_TXN_COMMIT:
805 req->result = req->txn->commit (req->txn, req->uint1);
806 break;
807
808 case REQ_TXN_ABORT:
809 req->result = req->txn->abort (req->txn);
810 break;
811
812 case REQ_TXN_FINISH:
813 if (req->txn->flags & TXN_DEADLOCK)
814 {
815 req->result = req->txn->abort (req->txn);
816 if (!req->result)
817 req->result = DB_LOCK_DEADLOCK;
818 }
819 else
820 req->result = req->txn->commit (req->txn, req->uint1);
821 break;
822
823 case REQ_C_CLOSE:
824 req->result = req->dbc->c_close (req->dbc);
825 break;
826
827 case REQ_C_COUNT:
828 {
829 db_recno_t recno;
830 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
831 req->uv1 = recno;
832 }
833 break;
834
835 case REQ_C_PUT:
836 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
837 break;
838
839 case REQ_C_GET:
840 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
841 break;
842
843 case REQ_C_PGET:
844 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
845 break;
846
847 case REQ_C_DEL:
848 req->result = req->dbc->c_del (req->dbc, req->uint1);
849 break;
850
851#if DB_VERSION_MINOR >= 3
852 case REQ_SEQ_OPEN:
853 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
854 break;
855
856 case REQ_SEQ_CLOSE:
857 req->result = req->seq->close (req->seq, req->uint1);
858 break;
859
860 case REQ_SEQ_GET:
861 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
862 break;
863
864 case REQ_SEQ_REMOVE:
865 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
866 break;
867#endif
868
869 default:
870 req->result = ENOSYS;
871 break;
872 }
873
874 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
875 req->txn->flags |= TXN_DEADLOCK;
876}
708 877
709X_THREAD_PROC (bdb_proc) 878X_THREAD_PROC (bdb_proc)
710{ 879{
711 bdb_req req; 880 bdb_req req;
712 struct timespec ts; 881 struct timespec ts;
… …
752 } 921 }
753 922
754 --nready; 923 --nready;
755 924
756 X_UNLOCK (reqlock); 925 X_UNLOCK (reqlock);
757 926
758 switch (req->type) 927 if (req->type == REQ_QUIT)
759 {
760 case REQ_QUIT:
761 req->result = ENOSYS;
762 goto quit; 928 goto quit;
763 929
764 case REQ_ENV_OPEN: 930 bdb_request (req);
765 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
766 break;
767
768 case REQ_ENV_CLOSE:
769 req->result = req->env->close (req->env, req->uint1);
770 break;
771
772 case REQ_ENV_TXN_CHECKPOINT:
773 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
774 break;
775
776 case REQ_ENV_LOCK_DETECT:
777 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
778 break;
779
780 case REQ_ENV_MEMP_SYNC:
781 req->result = req->env->memp_sync (req->env, 0);
782 break;
783
784 case REQ_ENV_MEMP_TRICKLE:
785 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
786 break;
787
788 case REQ_ENV_DBREMOVE:
789 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
790 break;
791
792 case REQ_ENV_DBRENAME:
793 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
794 break;
795
796 case REQ_DB_OPEN:
797 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
798 break;
799
800 case REQ_DB_CLOSE:
801 req->result = req->db->close (req->db, req->uint1);
802 break;
803
804#if DB_VERSION_MINOR >= 4
805 case REQ_DB_COMPACT:
806 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
807 break;
808#endif
809
810 case REQ_DB_SYNC:
811 req->result = req->db->sync (req->db, req->uint1);
812 break;
813
814 case REQ_DB_UPGRADE:
815 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
816 break;
817
818 case REQ_DB_PUT:
819 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
820 break;
821
822#if DB_VERSION_MINOR >= 6
823 case REQ_DB_EXISTS:
824 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
825 break;
826#endif
827 case REQ_DB_GET:
828 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
829 break;
830
831 case REQ_DB_PGET:
832 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
833 break;
834
835 case REQ_DB_DEL:
836 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
837 break;
838
839 case REQ_DB_KEY_RANGE:
840 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
841 break;
842
843 case REQ_TXN_COMMIT:
844 req->result = req->txn->commit (req->txn, req->uint1);
845 break;
846
847 case REQ_TXN_ABORT:
848 req->result = req->txn->abort (req->txn);
849 break;
850
851 case REQ_TXN_FINISH:
852 if (req->txn->flags & TXN_DEADLOCK)
853 {
854 req->result = req->txn->abort (req->txn);
855 if (!req->result)
856 req->result = DB_LOCK_DEADLOCK;
857 }
858 else
859 req->result = req->txn->commit (req->txn, req->uint1);
860 break;
861
862 case REQ_C_CLOSE:
863 req->result = req->dbc->c_close (req->dbc);
864 break;
865
866 case REQ_C_COUNT:
867 {
868 db_recno_t recno;
869 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
870 req->uv1 = recno;
871 }
872 break;
873
874 case REQ_C_PUT:
875 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
876 break;
877
878 case REQ_C_GET:
879 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
880 break;
881
882 case REQ_C_PGET:
883 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
884 break;
885
886 case REQ_C_DEL:
887 req->result = req->dbc->c_del (req->dbc, req->uint1);
888 break;
889
890#if DB_VERSION_MINOR >= 3
891 case REQ_SEQ_OPEN:
892 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
893 break;
894
895 case REQ_SEQ_CLOSE:
896 req->result = req->seq->close (req->seq, req->uint1);
897 break;
898
899 case REQ_SEQ_GET:
900 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
901 break;
902
903 case REQ_SEQ_REMOVE:
904 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
905 break;
906#endif
907
908 default:
909 req->result = ENOSYS;
910 break;
911 }
912
913 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
914 req->txn->flags |= TXN_DEADLOCK;
915 931
916 X_LOCK (reslock); 932 X_LOCK (reslock);
917 933
918 ++npending; 934 ++npending;
919 935
… …
981 create_respipe (); 997 create_respipe ();
982 998
983 atfork_parent (); 999 atfork_parent ();
984} 1000}
985 1001
986#define dREQ(reqtype) \ 1002#define dREQ(reqtype,rsvcnt) \
987 bdb_req req; \ 1003 bdb_req req; \
988 int req_pri = next_pri; \ 1004 int req_pri = next_pri; \
989 next_pri = DEFAULT_PRI + PRI_BIAS; \ 1005 next_pri = DEFAULT_PRI + PRI_BIAS; \
990 \ 1006 \
991 if (callback && SvOK (callback)) \ 1007 if (callback && SvOK (callback)) \
… …
993 \ 1009 \
994 Newz (0, req, 1, bdb_cb); \ 1010 Newz (0, req, 1, bdb_cb); \
995 if (!req) \ 1011 if (!req) \
996 croak ("out of memory during bdb_req allocation"); \ 1012 croak ("out of memory during bdb_req allocation"); \
997 \ 1013 \
998 req->callback = cb ? SvREFCNT_inc (cb) : 0; \ 1014 req->callback = SvREFCNT_inc (cb); \
999 req->type = (reqtype); \ 1015 req->type = (reqtype); \
1000 req->pri = req_pri 1016 req->pri = req_pri; \
1017 if (rsvcnt >= 1) req->rsv1 = SvREFCNT_inc (ST (0)); \
1018 if (rsvcnt >= 2) req->rsv2 = SvREFCNT_inc (ST (1)); \
1019 (void)0;
1001 1020
1002#define REQ_SEND \ 1021#define REQ_SEND \
1003 req_send (req) 1022 req_send (req)
1004 1023
1005#define SvPTR(var, arg, type, class, nullok) \ 1024#define SvPTR(var, arg, type, class, nullok) \
… …
1494db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0) 1513db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
1495 PREINIT: 1514 PREINIT:
1496 CALLBACK 1515 CALLBACK
1497 CODE: 1516 CODE:
1498{ 1517{
1499 dREQ (REQ_ENV_OPEN); 1518 dREQ (REQ_ENV_OPEN, 1);
1500 req->env = env; 1519 req->env = env;
1501 req->uint1 = open_flags | DB_THREAD; 1520 req->uint1 = open_flags | DB_THREAD;
1502 req->int1 = mode; 1521 req->int1 = mode;
1503 req->buf1 = strdup_ornull (db_home); 1522 req->buf1 = strdup_ornull (db_home);
1504 REQ_SEND; 1523 REQ_SEND;
… …
1508db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1527db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1509 PREINIT: 1528 PREINIT:
1510 CALLBACK 1529 CALLBACK
1511 CODE: 1530 CODE:
1512{ 1531{
1513 dREQ (REQ_ENV_CLOSE); 1532 dREQ (REQ_ENV_CLOSE, 1);
1514 req->env = env; 1533 req->env = env;
1515 req->uint1 = flags; 1534 req->uint1 = flags;
1516 REQ_SEND; 1535 REQ_SEND;
1517 ptr_nuke (ST (0)); 1536 ptr_nuke (ST (0));
1518} 1537}
… …
1521db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1540db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1522 PREINIT: 1541 PREINIT:
1523 CALLBACK 1542 CALLBACK
1524 CODE: 1543 CODE:
1525{ 1544{
1526 dREQ (REQ_ENV_TXN_CHECKPOINT); 1545 dREQ (REQ_ENV_TXN_CHECKPOINT, 1);
1527 req->env = env; 1546 req->env = env;
1528 req->uint1 = kbyte; 1547 req->uint1 = kbyte;
1529 req->int1 = min; 1548 req->int1 = min;
1530 req->uint2 = flags; 1549 req->uint2 = flags;
1531 REQ_SEND; 1550 REQ_SEND;
… …
1535db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0) 1554db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0)
1536 PREINIT: 1555 PREINIT:
1537 CALLBACK 1556 CALLBACK
1538 CODE: 1557 CODE:
1539{ 1558{
1540 dREQ (REQ_ENV_LOCK_DETECT); 1559 dREQ (REQ_ENV_LOCK_DETECT, 1);
1541 req->env = env; 1560 req->env = env;
1542 req->uint1 = flags; 1561 req->uint1 = flags;
1543 req->uint2 = atype; 1562 req->uint2 = atype;
1544 /* req->int2 = 0; dummy */ 1563 /* req->int2 = 0; dummy */
1545 REQ_SEND; 1564 REQ_SEND;
… …
1549db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0) 1568db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0)
1550 PREINIT: 1569 PREINIT:
1551 CALLBACK 1570 CALLBACK
1552 CODE: 1571 CODE:
1553{ 1572{
1554 dREQ (REQ_ENV_MEMP_SYNC); 1573 dREQ (REQ_ENV_MEMP_SYNC, 1);
1555 req->env = env; 1574 req->env = env;
1556 REQ_SEND; 1575 REQ_SEND;
1557} 1576}
1558 1577
1559void 1578void
1560db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0) 1579db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0)
1561 PREINIT: 1580 PREINIT:
1562 CALLBACK 1581 CALLBACK
1563 CODE: 1582 CODE:
1564{ 1583{
1565 dREQ (REQ_ENV_MEMP_TRICKLE); 1584 dREQ (REQ_ENV_MEMP_TRICKLE, 1);
1566 req->env = env; 1585 req->env = env;
1567 req->int1 = percent; 1586 req->int1 = percent;
1568 REQ_SEND; 1587 REQ_SEND;
1569} 1588}
1570 1589
… …
1572db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0) 1591db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0)
1573 PREINIT: 1592 PREINIT:
1574 CALLBACK 1593 CALLBACK
1575 CODE: 1594 CODE:
1576{ 1595{
1577 dREQ (REQ_ENV_DBREMOVE); 1596 dREQ (REQ_ENV_DBREMOVE, 2);
1578 req->env = env; 1597 req->env = env;
1579 req->buf1 = strdup_ornull (file); 1598 req->buf1 = strdup_ornull (file);
1580 req->buf2 = strdup_ornull (database); 1599 req->buf2 = strdup_ornull (database);
1581 req->uint1 = flags; 1600 req->uint1 = flags;
1582 REQ_SEND; 1601 REQ_SEND;
… …
1586db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = 0) 1605db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = 0)
1587 PREINIT: 1606 PREINIT:
1588 CALLBACK 1607 CALLBACK
1589 CODE: 1608 CODE:
1590{ 1609{
1591 dREQ (REQ_ENV_DBRENAME); 1610 dREQ (REQ_ENV_DBRENAME, 2);
1592 req->env = env; 1611 req->env = env;
1593 req->buf1 = strdup_ornull (file); 1612 req->buf1 = strdup_ornull (file);
1594 req->buf2 = strdup_ornull (database); 1613 req->buf2 = strdup_ornull (database);
1595 req->buf3 = strdup_ornull (newname); 1614 req->buf3 = strdup_ornull (newname);
1596 req->uint1 = flags; 1615 req->uint1 = flags;
… …
1615db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0) 1634db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
1616 PREINIT: 1635 PREINIT:
1617 CALLBACK 1636 CALLBACK
1618 CODE: 1637 CODE:
1619{ 1638{
1620 dREQ (REQ_DB_OPEN); 1639 dREQ (REQ_DB_OPEN, 2);
1621 req->db = db; 1640 req->db = db;
1622 req->txn = txnid; 1641 req->txn = txnid;
1623 req->buf1 = strdup_ornull (file); 1642 req->buf1 = strdup_ornull (file);
1624 req->buf2 = strdup_ornull (database); 1643 req->buf2 = strdup_ornull (database);
1625 req->int1 = type; 1644 req->int1 = type;
… …
1632db_close (DB *db, U32 flags = 0, SV *callback = 0) 1651db_close (DB *db, U32 flags = 0, SV *callback = 0)
1633 PREINIT: 1652 PREINIT:
1634 CALLBACK 1653 CALLBACK
1635 CODE: 1654 CODE:
1636{ 1655{
1637 dREQ (REQ_DB_CLOSE); 1656 dREQ (REQ_DB_CLOSE, 1);
1638 req->db = db; 1657 req->db = db;
1639 req->uint1 = flags; 1658 req->uint1 = flags;
1640 req->sv1 = (SV *)db->app_private; 1659 req->sv1 = (SV *)db->app_private;
1641 REQ_SEND; 1660 REQ_SEND;
1642 ptr_nuke (ST (0)); 1661 ptr_nuke (ST (0));
… …
1648db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = 0) 1667db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = 0)
1649 PREINIT: 1668 PREINIT:
1650 CALLBACK 1669 CALLBACK
1651 CODE: 1670 CODE:
1652{ 1671{
1653 dREQ (REQ_DB_COMPACT); 1672 dREQ (REQ_DB_COMPACT, 2);
1654 req->db = db; 1673 req->db = db;
1655 req->txn = txn; 1674 req->txn = txn;
1656 sv_to_dbt (&req->dbt1, start); 1675 sv_to_dbt (&req->dbt1, start);
1657 sv_to_dbt (&req->dbt2, stop); 1676 sv_to_dbt (&req->dbt2, stop);
1658 req->uint1 = flags; 1677 req->uint1 = flags;
… …
1665db_sync (DB *db, U32 flags = 0, SV *callback = 0) 1684db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1666 PREINIT: 1685 PREINIT:
1667 CALLBACK 1686 CALLBACK
1668 CODE: 1687 CODE:
1669{ 1688{
1670 dREQ (REQ_DB_SYNC); 1689 dREQ (REQ_DB_SYNC, 1);
1671 req->db = db; 1690 req->db = db;
1672 req->uint1 = flags; 1691 req->uint1 = flags;
1673 REQ_SEND; 1692 REQ_SEND;
1674} 1693}
1675 1694
… …
1677db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1696db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1678 PREINIT: 1697 PREINIT:
1679 CALLBACK 1698 CALLBACK
1680 CODE: 1699 CODE:
1681{ 1700{
1682 dREQ (REQ_DB_SYNC); 1701 dREQ (REQ_DB_SYNC, 1);
1683 req->db = db; 1702 req->db = db;
1684 req->buf1 = strdup (file); 1703 req->buf1 = strdup (file);
1685 req->uint1 = flags; 1704 req->uint1 = flags;
1686 REQ_SEND; 1705 REQ_SEND;
1687} 1706}
… …
1690db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1709db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0)
1691 PREINIT: 1710 PREINIT:
1692 CALLBACK 1711 CALLBACK
1693 CODE: 1712 CODE:
1694{ 1713{
1695 dREQ (REQ_DB_KEY_RANGE); 1714 dREQ (REQ_DB_KEY_RANGE, 2);
1696 req->db = db; 1715 req->db = db;
1697 req->txn = txn; 1716 req->txn = txn;
1698 sv_to_dbt (&req->dbt1, key); 1717 sv_to_dbt (&req->dbt1, key);
1699 req->uint1 = flags; 1718 req->uint1 = flags;
1700 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1719 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
… …
1705db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1724db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1706 PREINIT: 1725 PREINIT:
1707 CALLBACK 1726 CALLBACK
1708 CODE: 1727 CODE:
1709{ 1728{
1710 dREQ (REQ_DB_PUT); 1729 dREQ (REQ_DB_PUT, 2);
1711 req->db = db; 1730 req->db = db;
1712 req->txn = txn; 1731 req->txn = txn;
1713 sv_to_dbt (&req->dbt1, key); 1732 sv_to_dbt (&req->dbt1, key);
1714 sv_to_dbt (&req->dbt2, data); 1733 sv_to_dbt (&req->dbt2, data);
1715 req->uint1 = flags; 1734 req->uint1 = flags;
… …
1722db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1741db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1723 PREINIT: 1742 PREINIT:
1724 CALLBACK 1743 CALLBACK
1725 CODE: 1744 CODE:
1726{ 1745{
1727 dREQ (REQ_DB_EXISTS); 1746 dREQ (REQ_DB_EXISTS, 2);
1728 req->db = db; 1747 req->db = db;
1729 req->txn = txn; 1748 req->txn = txn;
1730 req->uint1 = flags; 1749 req->uint1 = flags;
1731 sv_to_dbt (&req->dbt1, key); 1750 sv_to_dbt (&req->dbt1, key);
1732 REQ_SEND; 1751 REQ_SEND;
… …
1740 CALLBACK 1759 CALLBACK
1741 CODE: 1760 CODE:
1742 if (SvREADONLY (data)) 1761 if (SvREADONLY (data))
1743 croak ("can't modify read-only data scalar in db_get"); 1762 croak ("can't modify read-only data scalar in db_get");
1744{ 1763{
1745 dREQ (REQ_DB_GET); 1764 dREQ (REQ_DB_GET, 2);
1746 req->db = db; 1765 req->db = db;
1747 req->txn = txn; 1766 req->txn = txn;
1748 req->uint1 = flags; 1767 req->uint1 = flags;
1749 sv_to_dbt (&req->dbt1, key); 1768 sv_to_dbt (&req->dbt1, key);
1750 req->dbt3.flags = DB_DBT_MALLOC; 1769 req->dbt3.flags = DB_DBT_MALLOC;
… …
1758 CALLBACK 1777 CALLBACK
1759 CODE: 1778 CODE:
1760 if (SvREADONLY (data)) 1779 if (SvREADONLY (data))
1761 croak ("can't modify read-only data scalar in db_pget"); 1780 croak ("can't modify read-only data scalar in db_pget");
1762{ 1781{
1763 dREQ (REQ_DB_PGET); 1782 dREQ (REQ_DB_PGET, 2);
1764 req->db = db; 1783 req->db = db;
1765 req->txn = txn; 1784 req->txn = txn;
1766 req->uint1 = flags; 1785 req->uint1 = flags;
1767 sv_to_dbt (&req->dbt1, key); 1786 sv_to_dbt (&req->dbt1, key);
1768 sv_to_dbt (&req->dbt2, pkey); 1787 sv_to_dbt (&req->dbt2, pkey);
… …
1775db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1794db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1776 PREINIT: 1795 PREINIT:
1777 CALLBACK 1796 CALLBACK
1778 CODE: 1797 CODE:
1779{ 1798{
1780 dREQ (REQ_DB_DEL); 1799 dREQ (REQ_DB_DEL, 2);
1781 req->db = db; 1800 req->db = db;
1782 req->txn = txn; 1801 req->txn = txn;
1783 req->uint1 = flags; 1802 req->uint1 = flags;
1784 sv_to_dbt (&req->dbt1, key); 1803 sv_to_dbt (&req->dbt1, key);
1785 REQ_SEND; 1804 REQ_SEND;
… …
1789db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1808db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1790 PREINIT: 1809 PREINIT:
1791 CALLBACK 1810 CALLBACK
1792 CODE: 1811 CODE:
1793{ 1812{
1794 dREQ (REQ_TXN_COMMIT); 1813 dREQ (REQ_TXN_COMMIT, 1);
1795 req->txn = txn; 1814 req->txn = txn;
1796 req->uint1 = flags; 1815 req->uint1 = flags;
1797 REQ_SEND; 1816 REQ_SEND;
1798 ptr_nuke (ST (0)); 1817 ptr_nuke (ST (0));
1799} 1818}
… …
1802db_txn_abort (DB_TXN *txn, SV *callback = 0) 1821db_txn_abort (DB_TXN *txn, SV *callback = 0)
1803 PREINIT: 1822 PREINIT:
1804 CALLBACK 1823 CALLBACK
1805 CODE: 1824 CODE:
1806{ 1825{
1807 dREQ (REQ_TXN_ABORT); 1826 dREQ (REQ_TXN_ABORT, 1);
1808 req->txn = txn; 1827 req->txn = txn;
1809 REQ_SEND; 1828 REQ_SEND;
1810 ptr_nuke (ST (0)); 1829 ptr_nuke (ST (0));
1811} 1830}
1812 1831
… …
1814db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1833db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1815 PREINIT: 1834 PREINIT:
1816 CALLBACK 1835 CALLBACK
1817 CODE: 1836 CODE:
1818{ 1837{
1819 dREQ (REQ_TXN_FINISH); 1838 dREQ (REQ_TXN_FINISH, 1);
1820 req->txn = txn; 1839 req->txn = txn;
1821 req->uint1 = flags; 1840 req->uint1 = flags;
1822 REQ_SEND; 1841 REQ_SEND;
1823 ptr_nuke (ST (0)); 1842 ptr_nuke (ST (0));
1824} 1843}
… …
1827db_c_close (DBC *dbc, SV *callback = 0) 1846db_c_close (DBC *dbc, SV *callback = 0)
1828 PREINIT: 1847 PREINIT:
1829 CALLBACK 1848 CALLBACK
1830 CODE: 1849 CODE:
1831{ 1850{
1832 dREQ (REQ_C_CLOSE); 1851 dREQ (REQ_C_CLOSE, 1);
1833 req->dbc = dbc; 1852 req->dbc = dbc;
1834 REQ_SEND; 1853 REQ_SEND;
1835 ptr_nuke (ST (0)); 1854 ptr_nuke (ST (0));
1836} 1855}
1837 1856
… …
1839db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1858db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1840 PREINIT: 1859 PREINIT:
1841 CALLBACK 1860 CALLBACK
1842 CODE: 1861 CODE:
1843{ 1862{
1844 dREQ (REQ_C_COUNT); 1863 dREQ (REQ_C_COUNT, 1);
1845 req->dbc = dbc; 1864 req->dbc = dbc;
1846 req->sv1 = SvREFCNT_inc (count); 1865 req->sv1 = SvREFCNT_inc (count);
1847 REQ_SEND; 1866 REQ_SEND;
1848} 1867}
1849 1868
… …
1851db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1870db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1852 PREINIT: 1871 PREINIT:
1853 CALLBACK 1872 CALLBACK
1854 CODE: 1873 CODE:
1855{ 1874{
1856 dREQ (REQ_C_PUT); 1875 dREQ (REQ_C_PUT, 1);
1857 req->dbc = dbc; 1876 req->dbc = dbc;
1858 sv_to_dbt (&req->dbt1, key); 1877 sv_to_dbt (&req->dbt1, key);
1859 sv_to_dbt (&req->dbt2, data); 1878 sv_to_dbt (&req->dbt2, data);
1860 req->uint1 = flags; 1879 req->uint1 = flags;
1861 REQ_SEND; 1880 REQ_SEND;
… …
1865db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1884db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1866 PREINIT: 1885 PREINIT:
1867 CALLBACK 1886 CALLBACK
1868 CODE: 1887 CODE:
1869{ 1888{
1870 dREQ (REQ_C_GET); 1889 dREQ (REQ_C_GET, 1);
1871 req->dbc = dbc; 1890 req->dbc = dbc;
1872 req->uint1 = flags; 1891 req->uint1 = flags;
1873 if ((flags & DB_SET) == DB_SET 1892 if ((flags & DB_SET) == DB_SET
1874 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1893 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1875 sv_to_dbt (&req->dbt1, key); 1894 sv_to_dbt (&req->dbt1, key);
… …
1892db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1911db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
1893 PREINIT: 1912 PREINIT:
1894 CALLBACK 1913 CALLBACK
1895 CODE: 1914 CODE:
1896{ 1915{
1897 dREQ (REQ_C_PGET); 1916 dREQ (REQ_C_PGET, 1);
1898 req->dbc = dbc; 1917 req->dbc = dbc;
1899 req->uint1 = flags; 1918 req->uint1 = flags;
1900 if ((flags & DB_SET) == DB_SET 1919 if ((flags & DB_SET) == DB_SET
1901 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1920 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1902 sv_to_dbt (&req->dbt1, key); 1921 sv_to_dbt (&req->dbt1, key);
… …
1922db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 1941db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1923 PREINIT: 1942 PREINIT:
1924 CALLBACK 1943 CALLBACK
1925 CODE: 1944 CODE:
1926{ 1945{
1927 dREQ (REQ_C_DEL); 1946 dREQ (REQ_C_DEL, 1);
1928 req->dbc = dbc; 1947 req->dbc = dbc;
1929 req->uint1 = flags; 1948 req->uint1 = flags;
1930 REQ_SEND; 1949 REQ_SEND;
1931} 1950}
1932 1951
… …
1937db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0) 1956db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0)
1938 PREINIT: 1957 PREINIT:
1939 CALLBACK 1958 CALLBACK
1940 CODE: 1959 CODE:
1941{ 1960{
1942 dREQ (REQ_SEQ_OPEN); 1961 dREQ (REQ_SEQ_OPEN, 2);
1943 req->seq = seq; 1962 req->seq = seq;
1944 req->txn = txnid; 1963 req->txn = txnid;
1945 req->uint1 = flags | DB_THREAD; 1964 req->uint1 = flags | DB_THREAD;
1946 sv_to_dbt (&req->dbt1, key); 1965 sv_to_dbt (&req->dbt1, key);
1947 REQ_SEND; 1966 REQ_SEND;
… …
1951db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 1970db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1952 PREINIT: 1971 PREINIT:
1953 CALLBACK 1972 CALLBACK
1954 CODE: 1973 CODE:
1955{ 1974{
1956 dREQ (REQ_SEQ_CLOSE); 1975 dREQ (REQ_SEQ_CLOSE, 1);
1957 req->seq = seq; 1976 req->seq = seq;
1958 req->uint1 = flags; 1977 req->uint1 = flags;
1959 REQ_SEND; 1978 REQ_SEND;
1960 ptr_nuke (ST (0)); 1979 ptr_nuke (ST (0));
1961} 1980}
… …
1964db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 1983db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1965 PREINIT: 1984 PREINIT:
1966 CALLBACK 1985 CALLBACK
1967 CODE: 1986 CODE:
1968{ 1987{
1969 dREQ (REQ_SEQ_GET); 1988 dREQ (REQ_SEQ_GET, 2);
1970 req->seq = seq; 1989 req->seq = seq;
1971 req->txn = txnid; 1990 req->txn = txnid;
1972 req->int1 = delta; 1991 req->int1 = delta;
1973 req->uint1 = flags; 1992 req->uint1 = flags;
1974 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1993 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
… …
1979db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0) 1998db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
1980 PREINIT: 1999 PREINIT:
1981 CALLBACK 2000 CALLBACK
1982 CODE: 2001 CODE:
1983{ 2002{
1984 dREQ (REQ_SEQ_REMOVE); 2003 dREQ (REQ_SEQ_REMOVE, 2);
1985 req->seq = seq; 2004 req->seq = seq;
1986 req->txn = txnid; 2005 req->txn = txnid;
1987 req->uint1 = flags; 2006 req->uint1 = flags;
1988 REQ_SEND; 2007 REQ_SEND;
1989} 2008}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines