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

Comparing BDB/BDB.xs (file contents):
Revision 1.49 by root, Thu Sep 25 12:28:49 2008 UTC vs.
Revision 1.51 by root, Thu Sep 25 13:28:37 2008 UTC

… …
177 DB_KEY_RANGE key_range; 177 DB_KEY_RANGE key_range;
178#if DB_VERSION_MINOR >= 3 178#if DB_VERSION_MINOR >= 3
179 DB_SEQUENCE *seq; 179 DB_SEQUENCE *seq;
180 db_seq_t seq_t; 180 db_seq_t seq_t;
181#endif 181#endif
182
183 SV *rsv1, *rsv2; // keep some request objects alive
182} bdb_cb; 184} bdb_cb;
183 185
184typedef bdb_cb *bdb_req; 186typedef bdb_cb *bdb_req;
185 187
186enum { 188enum {
… …
425} 427}
426 428
427static void req_free (bdb_req req) 429static void req_free (bdb_req req)
428{ 430{
429 SvREFCNT_dec (req->callback); 431 SvREFCNT_dec (req->callback);
432
433 SvREFCNT_dec (req->rsv1);
434 SvREFCNT_dec (req->rsv2);
430 435
431 free (req->buf1); 436 free (req->buf1);
432 free (req->buf2); 437 free (req->buf2);
433 free (req->buf3); 438 free (req->buf3);
434 439
… …
709 714
710 return count; 715 return count;
711} 716}
712 717
713/*****************************************************************************/ 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}
714 877
715X_THREAD_PROC (bdb_proc) 878X_THREAD_PROC (bdb_proc)
716{ 879{
717 bdb_req req; 880 bdb_req req;
718 struct timespec ts; 881 struct timespec ts;
… …
759 922
760 --nready; 923 --nready;
761 924
762 X_UNLOCK (reqlock); 925 X_UNLOCK (reqlock);
763 926
764 switch (req->type) 927 if (req->type == REQ_QUIT)
765 {
766 case REQ_QUIT:
767 req->result = ENOSYS;
768 goto quit; 928 goto quit;
769 929
770 case REQ_ENV_OPEN: 930 bdb_request (req);
771 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
772 break;
773
774 case REQ_ENV_CLOSE:
775 req->result = req->env->close (req->env, req->uint1);
776 break;
777
778 case REQ_ENV_TXN_CHECKPOINT:
779 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
780 break;
781
782 case REQ_ENV_LOCK_DETECT:
783 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
784 break;
785
786 case REQ_ENV_MEMP_SYNC:
787 req->result = req->env->memp_sync (req->env, 0);
788 break;
789
790 case REQ_ENV_MEMP_TRICKLE:
791 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
792 break;
793
794 case REQ_ENV_DBREMOVE:
795 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
796 break;
797
798 case REQ_ENV_DBRENAME:
799 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
800 break;
801
802 case REQ_DB_OPEN:
803 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
804 break;
805
806 case REQ_DB_CLOSE:
807 req->result = req->db->close (req->db, req->uint1);
808 break;
809
810#if DB_VERSION_MINOR >= 4
811 case REQ_DB_COMPACT:
812 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
813 break;
814#endif
815
816 case REQ_DB_SYNC:
817 req->result = req->db->sync (req->db, req->uint1);
818 break;
819
820 case REQ_DB_UPGRADE:
821 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
822 break;
823
824 case REQ_DB_PUT:
825 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
826 break;
827
828#if DB_VERSION_MINOR >= 6
829 case REQ_DB_EXISTS:
830 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
831 break;
832#endif
833 case REQ_DB_GET:
834 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
835 break;
836
837 case REQ_DB_PGET:
838 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
839 break;
840
841 case REQ_DB_DEL:
842 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
843 break;
844
845 case REQ_DB_KEY_RANGE:
846 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
847 break;
848
849 case REQ_TXN_COMMIT:
850 req->result = req->txn->commit (req->txn, req->uint1);
851 break;
852
853 case REQ_TXN_ABORT:
854 req->result = req->txn->abort (req->txn);
855 break;
856
857 case REQ_TXN_FINISH:
858 if (req->txn->flags & TXN_DEADLOCK)
859 {
860 req->result = req->txn->abort (req->txn);
861 if (!req->result)
862 req->result = DB_LOCK_DEADLOCK;
863 }
864 else
865 req->result = req->txn->commit (req->txn, req->uint1);
866 break;
867
868 case REQ_C_CLOSE:
869 req->result = req->dbc->c_close (req->dbc);
870 break;
871
872 case REQ_C_COUNT:
873 {
874 db_recno_t recno;
875 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
876 req->uv1 = recno;
877 }
878 break;
879
880 case REQ_C_PUT:
881 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
882 break;
883
884 case REQ_C_GET:
885 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
886 break;
887
888 case REQ_C_PGET:
889 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
890 break;
891
892 case REQ_C_DEL:
893 req->result = req->dbc->c_del (req->dbc, req->uint1);
894 break;
895
896#if DB_VERSION_MINOR >= 3
897 case REQ_SEQ_OPEN:
898 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
899 break;
900
901 case REQ_SEQ_CLOSE:
902 req->result = req->seq->close (req->seq, req->uint1);
903 break;
904
905 case REQ_SEQ_GET:
906 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
907 break;
908
909 case REQ_SEQ_REMOVE:
910 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
911 break;
912#endif
913
914 default:
915 req->result = ENOSYS;
916 break;
917 }
918
919 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
920 req->txn->flags |= TXN_DEADLOCK;
921 931
922 X_LOCK (reslock); 932 X_LOCK (reslock);
923 933
924 ++npending; 934 ++npending;
925 935
… …
987 create_respipe (); 997 create_respipe ();
988 998
989 atfork_parent (); 999 atfork_parent ();
990} 1000}
991 1001
992#define dREQ(reqtype) \ 1002#define dREQ(reqtype,rsvcnt) \
993 bdb_req req; \ 1003 bdb_req req; \
994 int req_pri = next_pri; \ 1004 int req_pri = next_pri; \
995 next_pri = DEFAULT_PRI + PRI_BIAS; \ 1005 next_pri = DEFAULT_PRI + PRI_BIAS; \
996 \ 1006 \
997 if (callback && SvOK (callback)) \ 1007 if (callback && SvOK (callback)) \
… …
999 \ 1009 \
1000 Newz (0, req, 1, bdb_cb); \ 1010 Newz (0, req, 1, bdb_cb); \
1001 if (!req) \ 1011 if (!req) \
1002 croak ("out of memory during bdb_req allocation"); \ 1012 croak ("out of memory during bdb_req allocation"); \
1003 \ 1013 \
1004 req->callback = cb ? SvREFCNT_inc (cb) : 0; \ 1014 req->callback = SvREFCNT_inc (cb); \
1005 req->type = (reqtype); \ 1015 req->type = (reqtype); \
1006 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;
1007 1020
1008#define REQ_SEND \ 1021#define REQ_SEND \
1009 req_send (req) 1022 req_send (req)
1010 1023
1011#define SvPTR(var, arg, type, class, nullok) \ 1024#define SvPTR(var, arg, type, class, nullok) \
… …
1500db_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)
1501 PREINIT: 1514 PREINIT:
1502 CALLBACK 1515 CALLBACK
1503 CODE: 1516 CODE:
1504{ 1517{
1505 dREQ (REQ_ENV_OPEN); 1518 dREQ (REQ_ENV_OPEN, 1);
1506 req->env = env; 1519 req->env = env;
1507 req->uint1 = open_flags | DB_THREAD; 1520 req->uint1 = open_flags | DB_THREAD;
1508 req->int1 = mode; 1521 req->int1 = mode;
1509 req->buf1 = strdup_ornull (db_home); 1522 req->buf1 = strdup_ornull (db_home);
1510 REQ_SEND; 1523 REQ_SEND;
… …
1514db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1527db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1515 PREINIT: 1528 PREINIT:
1516 CALLBACK 1529 CALLBACK
1517 CODE: 1530 CODE:
1518{ 1531{
1519 dREQ (REQ_ENV_CLOSE); 1532 dREQ (REQ_ENV_CLOSE, 1);
1520 req->env = env; 1533 req->env = env;
1521 req->uint1 = flags; 1534 req->uint1 = flags;
1522 REQ_SEND; 1535 REQ_SEND;
1523 ptr_nuke (ST (0)); 1536 ptr_nuke (ST (0));
1524} 1537}
… …
1527db_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)
1528 PREINIT: 1541 PREINIT:
1529 CALLBACK 1542 CALLBACK
1530 CODE: 1543 CODE:
1531{ 1544{
1532 dREQ (REQ_ENV_TXN_CHECKPOINT); 1545 dREQ (REQ_ENV_TXN_CHECKPOINT, 1);
1533 req->env = env; 1546 req->env = env;
1534 req->uint1 = kbyte; 1547 req->uint1 = kbyte;
1535 req->int1 = min; 1548 req->int1 = min;
1536 req->uint2 = flags; 1549 req->uint2 = flags;
1537 REQ_SEND; 1550 REQ_SEND;
… …
1541db_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)
1542 PREINIT: 1555 PREINIT:
1543 CALLBACK 1556 CALLBACK
1544 CODE: 1557 CODE:
1545{ 1558{
1546 dREQ (REQ_ENV_LOCK_DETECT); 1559 dREQ (REQ_ENV_LOCK_DETECT, 1);
1547 req->env = env; 1560 req->env = env;
1548 req->uint1 = flags; 1561 req->uint1 = flags;
1549 req->uint2 = atype; 1562 req->uint2 = atype;
1550 /* req->int2 = 0; dummy */ 1563 /* req->int2 = 0; dummy */
1551 REQ_SEND; 1564 REQ_SEND;
… …
1555db_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)
1556 PREINIT: 1569 PREINIT:
1557 CALLBACK 1570 CALLBACK
1558 CODE: 1571 CODE:
1559{ 1572{
1560 dREQ (REQ_ENV_MEMP_SYNC); 1573 dREQ (REQ_ENV_MEMP_SYNC, 1);
1561 req->env = env; 1574 req->env = env;
1562 REQ_SEND; 1575 REQ_SEND;
1563} 1576}
1564 1577
1565void 1578void
1566db_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)
1567 PREINIT: 1580 PREINIT:
1568 CALLBACK 1581 CALLBACK
1569 CODE: 1582 CODE:
1570{ 1583{
1571 dREQ (REQ_ENV_MEMP_TRICKLE); 1584 dREQ (REQ_ENV_MEMP_TRICKLE, 1);
1572 req->env = env; 1585 req->env = env;
1573 req->int1 = percent; 1586 req->int1 = percent;
1574 REQ_SEND; 1587 REQ_SEND;
1575} 1588}
1576 1589
… …
1578db_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)
1579 PREINIT: 1592 PREINIT:
1580 CALLBACK 1593 CALLBACK
1581 CODE: 1594 CODE:
1582{ 1595{
1583 dREQ (REQ_ENV_DBREMOVE); 1596 dREQ (REQ_ENV_DBREMOVE, 2);
1584 req->env = env; 1597 req->env = env;
1585 req->buf1 = strdup_ornull (file); 1598 req->buf1 = strdup_ornull (file);
1586 req->buf2 = strdup_ornull (database); 1599 req->buf2 = strdup_ornull (database);
1587 req->uint1 = flags; 1600 req->uint1 = flags;
1588 REQ_SEND; 1601 REQ_SEND;
… …
1592db_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)
1593 PREINIT: 1606 PREINIT:
1594 CALLBACK 1607 CALLBACK
1595 CODE: 1608 CODE:
1596{ 1609{
1597 dREQ (REQ_ENV_DBRENAME); 1610 dREQ (REQ_ENV_DBRENAME, 2);
1598 req->env = env; 1611 req->env = env;
1599 req->buf1 = strdup_ornull (file); 1612 req->buf1 = strdup_ornull (file);
1600 req->buf2 = strdup_ornull (database); 1613 req->buf2 = strdup_ornull (database);
1601 req->buf3 = strdup_ornull (newname); 1614 req->buf3 = strdup_ornull (newname);
1602 req->uint1 = flags; 1615 req->uint1 = flags;
… …
1621db_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)
1622 PREINIT: 1635 PREINIT:
1623 CALLBACK 1636 CALLBACK
1624 CODE: 1637 CODE:
1625{ 1638{
1626 dREQ (REQ_DB_OPEN); 1639 dREQ (REQ_DB_OPEN, 2);
1627 req->db = db; 1640 req->db = db;
1628 req->txn = txnid; 1641 req->txn = txnid;
1629 req->buf1 = strdup_ornull (file); 1642 req->buf1 = strdup_ornull (file);
1630 req->buf2 = strdup_ornull (database); 1643 req->buf2 = strdup_ornull (database);
1631 req->int1 = type; 1644 req->int1 = type;
… …
1638db_close (DB *db, U32 flags = 0, SV *callback = 0) 1651db_close (DB *db, U32 flags = 0, SV *callback = 0)
1639 PREINIT: 1652 PREINIT:
1640 CALLBACK 1653 CALLBACK
1641 CODE: 1654 CODE:
1642{ 1655{
1643 dREQ (REQ_DB_CLOSE); 1656 dREQ (REQ_DB_CLOSE, 1);
1644 req->db = db; 1657 req->db = db;
1645 req->uint1 = flags; 1658 req->uint1 = flags;
1646 req->sv1 = (SV *)db->app_private; 1659 req->sv1 = (SV *)db->app_private;
1647 REQ_SEND; 1660 REQ_SEND;
1648 ptr_nuke (ST (0)); 1661 ptr_nuke (ST (0));
… …
1654db_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)
1655 PREINIT: 1668 PREINIT:
1656 CALLBACK 1669 CALLBACK
1657 CODE: 1670 CODE:
1658{ 1671{
1659 dREQ (REQ_DB_COMPACT); 1672 dREQ (REQ_DB_COMPACT, 2);
1660 req->db = db; 1673 req->db = db;
1661 req->txn = txn; 1674 req->txn = txn;
1662 sv_to_dbt (&req->dbt1, start); 1675 sv_to_dbt (&req->dbt1, start);
1663 sv_to_dbt (&req->dbt2, stop); 1676 sv_to_dbt (&req->dbt2, stop);
1664 req->uint1 = flags; 1677 req->uint1 = flags;
… …
1671db_sync (DB *db, U32 flags = 0, SV *callback = 0) 1684db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1672 PREINIT: 1685 PREINIT:
1673 CALLBACK 1686 CALLBACK
1674 CODE: 1687 CODE:
1675{ 1688{
1676 dREQ (REQ_DB_SYNC); 1689 dREQ (REQ_DB_SYNC, 1);
1677 req->db = db; 1690 req->db = db;
1678 req->uint1 = flags; 1691 req->uint1 = flags;
1679 REQ_SEND; 1692 REQ_SEND;
1680} 1693}
1681 1694
… …
1683db_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)
1684 PREINIT: 1697 PREINIT:
1685 CALLBACK 1698 CALLBACK
1686 CODE: 1699 CODE:
1687{ 1700{
1688 dREQ (REQ_DB_SYNC); 1701 dREQ (REQ_DB_SYNC, 1);
1689 req->db = db; 1702 req->db = db;
1690 req->buf1 = strdup (file); 1703 req->buf1 = strdup (file);
1691 req->uint1 = flags; 1704 req->uint1 = flags;
1692 REQ_SEND; 1705 REQ_SEND;
1693} 1706}
… …
1696db_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)
1697 PREINIT: 1710 PREINIT:
1698 CALLBACK 1711 CALLBACK
1699 CODE: 1712 CODE:
1700{ 1713{
1701 dREQ (REQ_DB_KEY_RANGE); 1714 dREQ (REQ_DB_KEY_RANGE, 2);
1702 req->db = db; 1715 req->db = db;
1703 req->txn = txn; 1716 req->txn = txn;
1704 sv_to_dbt (&req->dbt1, key); 1717 sv_to_dbt (&req->dbt1, key);
1705 req->uint1 = flags; 1718 req->uint1 = flags;
1706 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1719 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
… …
1711db_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)
1712 PREINIT: 1725 PREINIT:
1713 CALLBACK 1726 CALLBACK
1714 CODE: 1727 CODE:
1715{ 1728{
1716 dREQ (REQ_DB_PUT); 1729 dREQ (REQ_DB_PUT, 2);
1717 req->db = db; 1730 req->db = db;
1718 req->txn = txn; 1731 req->txn = txn;
1719 sv_to_dbt (&req->dbt1, key); 1732 sv_to_dbt (&req->dbt1, key);
1720 sv_to_dbt (&req->dbt2, data); 1733 sv_to_dbt (&req->dbt2, data);
1721 req->uint1 = flags; 1734 req->uint1 = flags;
… …
1728db_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)
1729 PREINIT: 1742 PREINIT:
1730 CALLBACK 1743 CALLBACK
1731 CODE: 1744 CODE:
1732{ 1745{
1733 dREQ (REQ_DB_EXISTS); 1746 dREQ (REQ_DB_EXISTS, 2);
1734 req->db = db; 1747 req->db = db;
1735 req->txn = txn; 1748 req->txn = txn;
1736 req->uint1 = flags; 1749 req->uint1 = flags;
1737 sv_to_dbt (&req->dbt1, key); 1750 sv_to_dbt (&req->dbt1, key);
1738 REQ_SEND; 1751 REQ_SEND;
… …
1746 CALLBACK 1759 CALLBACK
1747 CODE: 1760 CODE:
1748 if (SvREADONLY (data)) 1761 if (SvREADONLY (data))
1749 croak ("can't modify read-only data scalar in db_get"); 1762 croak ("can't modify read-only data scalar in db_get");
1750{ 1763{
1751 dREQ (REQ_DB_GET); 1764 dREQ (REQ_DB_GET, 2);
1752 req->db = db; 1765 req->db = db;
1753 req->txn = txn; 1766 req->txn = txn;
1754 req->uint1 = flags; 1767 req->uint1 = flags;
1755 sv_to_dbt (&req->dbt1, key); 1768 sv_to_dbt (&req->dbt1, key);
1756 req->dbt3.flags = DB_DBT_MALLOC; 1769 req->dbt3.flags = DB_DBT_MALLOC;
… …
1764 CALLBACK 1777 CALLBACK
1765 CODE: 1778 CODE:
1766 if (SvREADONLY (data)) 1779 if (SvREADONLY (data))
1767 croak ("can't modify read-only data scalar in db_pget"); 1780 croak ("can't modify read-only data scalar in db_pget");
1768{ 1781{
1769 dREQ (REQ_DB_PGET); 1782 dREQ (REQ_DB_PGET, 2);
1770 req->db = db; 1783 req->db = db;
1771 req->txn = txn; 1784 req->txn = txn;
1772 req->uint1 = flags; 1785 req->uint1 = flags;
1773 sv_to_dbt (&req->dbt1, key); 1786 sv_to_dbt (&req->dbt1, key);
1774 sv_to_dbt (&req->dbt2, pkey); 1787 sv_to_dbt (&req->dbt2, pkey);
… …
1781db_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)
1782 PREINIT: 1795 PREINIT:
1783 CALLBACK 1796 CALLBACK
1784 CODE: 1797 CODE:
1785{ 1798{
1786 dREQ (REQ_DB_DEL); 1799 dREQ (REQ_DB_DEL, 2);
1787 req->db = db; 1800 req->db = db;
1788 req->txn = txn; 1801 req->txn = txn;
1789 req->uint1 = flags; 1802 req->uint1 = flags;
1790 sv_to_dbt (&req->dbt1, key); 1803 sv_to_dbt (&req->dbt1, key);
1791 REQ_SEND; 1804 REQ_SEND;
… …
1795db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1808db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1796 PREINIT: 1809 PREINIT:
1797 CALLBACK 1810 CALLBACK
1798 CODE: 1811 CODE:
1799{ 1812{
1800 dREQ (REQ_TXN_COMMIT); 1813 dREQ (REQ_TXN_COMMIT, 1);
1801 req->txn = txn; 1814 req->txn = txn;
1802 req->uint1 = flags; 1815 req->uint1 = flags;
1803 REQ_SEND; 1816 REQ_SEND;
1804 ptr_nuke (ST (0)); 1817 ptr_nuke (ST (0));
1805} 1818}
… …
1808db_txn_abort (DB_TXN *txn, SV *callback = 0) 1821db_txn_abort (DB_TXN *txn, SV *callback = 0)
1809 PREINIT: 1822 PREINIT:
1810 CALLBACK 1823 CALLBACK
1811 CODE: 1824 CODE:
1812{ 1825{
1813 dREQ (REQ_TXN_ABORT); 1826 dREQ (REQ_TXN_ABORT, 1);
1814 req->txn = txn; 1827 req->txn = txn;
1815 REQ_SEND; 1828 REQ_SEND;
1816 ptr_nuke (ST (0)); 1829 ptr_nuke (ST (0));
1817} 1830}
1818 1831
… …
1820db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1833db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1821 PREINIT: 1834 PREINIT:
1822 CALLBACK 1835 CALLBACK
1823 CODE: 1836 CODE:
1824{ 1837{
1825 dREQ (REQ_TXN_FINISH); 1838 dREQ (REQ_TXN_FINISH, 1);
1826 req->txn = txn; 1839 req->txn = txn;
1827 req->uint1 = flags; 1840 req->uint1 = flags;
1828 REQ_SEND; 1841 REQ_SEND;
1829 ptr_nuke (ST (0)); 1842 ptr_nuke (ST (0));
1830} 1843}
… …
1833db_c_close (DBC *dbc, SV *callback = 0) 1846db_c_close (DBC *dbc, SV *callback = 0)
1834 PREINIT: 1847 PREINIT:
1835 CALLBACK 1848 CALLBACK
1836 CODE: 1849 CODE:
1837{ 1850{
1838 dREQ (REQ_C_CLOSE); 1851 dREQ (REQ_C_CLOSE, 1);
1839 req->dbc = dbc; 1852 req->dbc = dbc;
1840 REQ_SEND; 1853 REQ_SEND;
1841 ptr_nuke (ST (0)); 1854 ptr_nuke (ST (0));
1842} 1855}
1843 1856
… …
1845db_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)
1846 PREINIT: 1859 PREINIT:
1847 CALLBACK 1860 CALLBACK
1848 CODE: 1861 CODE:
1849{ 1862{
1850 dREQ (REQ_C_COUNT); 1863 dREQ (REQ_C_COUNT, 1);
1851 req->dbc = dbc; 1864 req->dbc = dbc;
1852 req->sv1 = SvREFCNT_inc (count); 1865 req->sv1 = SvREFCNT_inc (count);
1853 REQ_SEND; 1866 REQ_SEND;
1854} 1867}
1855 1868
… …
1857db_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)
1858 PREINIT: 1871 PREINIT:
1859 CALLBACK 1872 CALLBACK
1860 CODE: 1873 CODE:
1861{ 1874{
1862 dREQ (REQ_C_PUT); 1875 dREQ (REQ_C_PUT, 1);
1863 req->dbc = dbc; 1876 req->dbc = dbc;
1864 sv_to_dbt (&req->dbt1, key); 1877 sv_to_dbt (&req->dbt1, key);
1865 sv_to_dbt (&req->dbt2, data); 1878 sv_to_dbt (&req->dbt2, data);
1866 req->uint1 = flags; 1879 req->uint1 = flags;
1867 REQ_SEND; 1880 REQ_SEND;
… …
1871db_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)
1872 PREINIT: 1885 PREINIT:
1873 CALLBACK 1886 CALLBACK
1874 CODE: 1887 CODE:
1875{ 1888{
1876 dREQ (REQ_C_GET); 1889 dREQ (REQ_C_GET, 1);
1877 req->dbc = dbc; 1890 req->dbc = dbc;
1878 req->uint1 = flags; 1891 req->uint1 = flags;
1879 if ((flags & DB_SET) == DB_SET 1892 if ((flags & DB_SET) == DB_SET
1880 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1893 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1881 sv_to_dbt (&req->dbt1, key); 1894 sv_to_dbt (&req->dbt1, key);
… …
1898db_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)
1899 PREINIT: 1912 PREINIT:
1900 CALLBACK 1913 CALLBACK
1901 CODE: 1914 CODE:
1902{ 1915{
1903 dREQ (REQ_C_PGET); 1916 dREQ (REQ_C_PGET, 1);
1904 req->dbc = dbc; 1917 req->dbc = dbc;
1905 req->uint1 = flags; 1918 req->uint1 = flags;
1906 if ((flags & DB_SET) == DB_SET 1919 if ((flags & DB_SET) == DB_SET
1907 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1920 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1908 sv_to_dbt (&req->dbt1, key); 1921 sv_to_dbt (&req->dbt1, key);
… …
1928db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 1941db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1929 PREINIT: 1942 PREINIT:
1930 CALLBACK 1943 CALLBACK
1931 CODE: 1944 CODE:
1932{ 1945{
1933 dREQ (REQ_C_DEL); 1946 dREQ (REQ_C_DEL, 1);
1934 req->dbc = dbc; 1947 req->dbc = dbc;
1935 req->uint1 = flags; 1948 req->uint1 = flags;
1936 REQ_SEND; 1949 REQ_SEND;
1937} 1950}
1938 1951
… …
1943db_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)
1944 PREINIT: 1957 PREINIT:
1945 CALLBACK 1958 CALLBACK
1946 CODE: 1959 CODE:
1947{ 1960{
1948 dREQ (REQ_SEQ_OPEN); 1961 dREQ (REQ_SEQ_OPEN, 2);
1949 req->seq = seq; 1962 req->seq = seq;
1950 req->txn = txnid; 1963 req->txn = txnid;
1951 req->uint1 = flags | DB_THREAD; 1964 req->uint1 = flags | DB_THREAD;
1952 sv_to_dbt (&req->dbt1, key); 1965 sv_to_dbt (&req->dbt1, key);
1953 REQ_SEND; 1966 REQ_SEND;
… …
1957db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 1970db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1958 PREINIT: 1971 PREINIT:
1959 CALLBACK 1972 CALLBACK
1960 CODE: 1973 CODE:
1961{ 1974{
1962 dREQ (REQ_SEQ_CLOSE); 1975 dREQ (REQ_SEQ_CLOSE, 1);
1963 req->seq = seq; 1976 req->seq = seq;
1964 req->uint1 = flags; 1977 req->uint1 = flags;
1965 REQ_SEND; 1978 REQ_SEND;
1966 ptr_nuke (ST (0)); 1979 ptr_nuke (ST (0));
1967} 1980}
… …
1970db_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)
1971 PREINIT: 1984 PREINIT:
1972 CALLBACK 1985 CALLBACK
1973 CODE: 1986 CODE:
1974{ 1987{
1975 dREQ (REQ_SEQ_GET); 1988 dREQ (REQ_SEQ_GET, 2);
1976 req->seq = seq; 1989 req->seq = seq;
1977 req->txn = txnid; 1990 req->txn = txnid;
1978 req->int1 = delta; 1991 req->int1 = delta;
1979 req->uint1 = flags; 1992 req->uint1 = flags;
1980 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1993 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
… …
1985db_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)
1986 PREINIT: 1999 PREINIT:
1987 CALLBACK 2000 CALLBACK
1988 CODE: 2001 CODE:
1989{ 2002{
1990 dREQ (REQ_SEQ_REMOVE); 2003 dREQ (REQ_SEQ_REMOVE, 2);
1991 req->seq = seq; 2004 req->seq = seq;
1992 req->txn = txnid; 2005 req->txn = txnid;
1993 req->uint1 = flags; 2006 req->uint1 = flags;
1994 REQ_SEND; 2007 REQ_SEND;
1995} 2008}

Diff Legend

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