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

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

Diff Legend

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