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.52 by root, Thu Sep 25 13:44:44 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
… …
572 } 577 }
573} 578}
574 579
575static void end_thread (void) 580static void end_thread (void)
576{ 581{
577 bdb_req req; 582 bdb_req req = calloc (1, sizeof (bdb_cb));
578
579 Newz (0, req, 1, bdb_cb);
580 583
581 req->type = REQ_QUIT; 584 req->type = REQ_QUIT;
582 req->pri = PRI_MAX + PRI_BIAS; 585 req->pri = PRI_MAX + PRI_BIAS;
583 586
584 X_LOCK (reqlock); 587 X_LOCK (reqlock);
… …
709 712
710 return count; 713 return count;
711} 714}
712 715
713/*****************************************************************************/ 716/*****************************************************************************/
717
718static void
719bdb_request (bdb_req req)
720{
721 switch (req->type)
722 {
723 case REQ_ENV_OPEN:
724 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
725 break;
726
727 case REQ_ENV_CLOSE:
728 req->result = req->env->close (req->env, req->uint1);
729 break;
730
731 case REQ_ENV_TXN_CHECKPOINT:
732 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
733 break;
734
735 case REQ_ENV_LOCK_DETECT:
736 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
737 break;
738
739 case REQ_ENV_MEMP_SYNC:
740 req->result = req->env->memp_sync (req->env, 0);
741 break;
742
743 case REQ_ENV_MEMP_TRICKLE:
744 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
745 break;
746
747 case REQ_ENV_DBREMOVE:
748 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
749 break;
750
751 case REQ_ENV_DBRENAME:
752 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
753 break;
754
755 case REQ_DB_OPEN:
756 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
757 break;
758
759 case REQ_DB_CLOSE:
760 req->result = req->db->close (req->db, req->uint1);
761 break;
762
763#if DB_VERSION_MINOR >= 4
764 case REQ_DB_COMPACT:
765 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
766 break;
767#endif
768
769 case REQ_DB_SYNC:
770 req->result = req->db->sync (req->db, req->uint1);
771 break;
772
773 case REQ_DB_UPGRADE:
774 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
775 break;
776
777 case REQ_DB_PUT:
778 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
779 break;
780
781#if DB_VERSION_MINOR >= 6
782 case REQ_DB_EXISTS:
783 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
784 break;
785#endif
786 case REQ_DB_GET:
787 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
788 break;
789
790 case REQ_DB_PGET:
791 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
792 break;
793
794 case REQ_DB_DEL:
795 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
796 break;
797
798 case REQ_DB_KEY_RANGE:
799 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
800 break;
801
802 case REQ_TXN_COMMIT:
803 req->result = req->txn->commit (req->txn, req->uint1);
804 break;
805
806 case REQ_TXN_ABORT:
807 req->result = req->txn->abort (req->txn);
808 break;
809
810 case REQ_TXN_FINISH:
811 if (req->txn->flags & TXN_DEADLOCK)
812 {
813 req->result = req->txn->abort (req->txn);
814 if (!req->result)
815 req->result = DB_LOCK_DEADLOCK;
816 }
817 else
818 req->result = req->txn->commit (req->txn, req->uint1);
819 break;
820
821 case REQ_C_CLOSE:
822 req->result = req->dbc->c_close (req->dbc);
823 break;
824
825 case REQ_C_COUNT:
826 {
827 db_recno_t recno;
828 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
829 req->uv1 = recno;
830 }
831 break;
832
833 case REQ_C_PUT:
834 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
835 break;
836
837 case REQ_C_GET:
838 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
839 break;
840
841 case REQ_C_PGET:
842 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
843 break;
844
845 case REQ_C_DEL:
846 req->result = req->dbc->c_del (req->dbc, req->uint1);
847 break;
848
849#if DB_VERSION_MINOR >= 3
850 case REQ_SEQ_OPEN:
851 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
852 break;
853
854 case REQ_SEQ_CLOSE:
855 req->result = req->seq->close (req->seq, req->uint1);
856 break;
857
858 case REQ_SEQ_GET:
859 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
860 break;
861
862 case REQ_SEQ_REMOVE:
863 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
864 break;
865#endif
866
867 default:
868 req->result = ENOSYS;
869 break;
870 }
871
872 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
873 req->txn->flags |= TXN_DEADLOCK;
874}
714 875
715X_THREAD_PROC (bdb_proc) 876X_THREAD_PROC (bdb_proc)
716{ 877{
717 bdb_req req; 878 bdb_req req;
718 struct timespec ts; 879 struct timespec ts;
… …
759 920
760 --nready; 921 --nready;
761 922
762 X_UNLOCK (reqlock); 923 X_UNLOCK (reqlock);
763 924
764 switch (req->type) 925 if (req->type == REQ_QUIT)
765 { 926 {
766 case REQ_QUIT: 927 X_LOCK (reslock);
767 req->result = ENOSYS; 928 free (req);
929 self->req = 0;
930 X_UNLOCK (reslock);
931
768 goto quit; 932 goto quit;
769
770 case REQ_ENV_OPEN:
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 } 933 }
918 934
919 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) 935 bdb_request (req);
920 req->txn->flags |= TXN_DEADLOCK;
921 936
922 X_LOCK (reslock); 937 X_LOCK (reslock);
923 938
924 ++npending; 939 ++npending;
925 940
… …
987 create_respipe (); 1002 create_respipe ();
988 1003
989 atfork_parent (); 1004 atfork_parent ();
990} 1005}
991 1006
992#define dREQ(reqtype) \ 1007#define dREQ(reqtype,rsvcnt) \
993 bdb_req req; \ 1008 bdb_req req; \
994 int req_pri = next_pri; \ 1009 int req_pri = next_pri; \
995 next_pri = DEFAULT_PRI + PRI_BIAS; \ 1010 next_pri = DEFAULT_PRI + PRI_BIAS; \
996 \ 1011 \
997 if (callback && SvOK (callback)) \ 1012 if (callback && SvOK (callback)) \
… …
999 \ 1014 \
1000 Newz (0, req, 1, bdb_cb); \ 1015 Newz (0, req, 1, bdb_cb); \
1001 if (!req) \ 1016 if (!req) \
1002 croak ("out of memory during bdb_req allocation"); \ 1017 croak ("out of memory during bdb_req allocation"); \
1003 \ 1018 \
1004 req->callback = cb ? SvREFCNT_inc (cb) : 0; \ 1019 req->callback = SvREFCNT_inc (cb); \
1005 req->type = (reqtype); \ 1020 req->type = (reqtype); \
1006 req->pri = req_pri 1021 req->pri = req_pri; \
1022 if (rsvcnt >= 1) req->rsv1 = SvREFCNT_inc (ST (0)); \
1023 if (rsvcnt >= 2) req->rsv2 = SvREFCNT_inc (ST (1)); \
1024 (void)0;
1007 1025
1008#define REQ_SEND \ 1026#define REQ_SEND \
1009 req_send (req) 1027 req_send (req)
1010 1028
1011#define SvPTR(var, arg, type, class, nullok) \ 1029#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) 1518db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
1501 PREINIT: 1519 PREINIT:
1502 CALLBACK 1520 CALLBACK
1503 CODE: 1521 CODE:
1504{ 1522{
1505 dREQ (REQ_ENV_OPEN); 1523 dREQ (REQ_ENV_OPEN, 1);
1506 req->env = env; 1524 req->env = env;
1507 req->uint1 = open_flags | DB_THREAD; 1525 req->uint1 = open_flags | DB_THREAD;
1508 req->int1 = mode; 1526 req->int1 = mode;
1509 req->buf1 = strdup_ornull (db_home); 1527 req->buf1 = strdup_ornull (db_home);
1510 REQ_SEND; 1528 REQ_SEND;
… …
1514db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1532db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1515 PREINIT: 1533 PREINIT:
1516 CALLBACK 1534 CALLBACK
1517 CODE: 1535 CODE:
1518{ 1536{
1519 dREQ (REQ_ENV_CLOSE); 1537 dREQ (REQ_ENV_CLOSE, 1);
1520 req->env = env; 1538 req->env = env;
1521 req->uint1 = flags; 1539 req->uint1 = flags;
1522 REQ_SEND; 1540 REQ_SEND;
1523 ptr_nuke (ST (0)); 1541 ptr_nuke (ST (0));
1524} 1542}
… …
1527db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1545db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1528 PREINIT: 1546 PREINIT:
1529 CALLBACK 1547 CALLBACK
1530 CODE: 1548 CODE:
1531{ 1549{
1532 dREQ (REQ_ENV_TXN_CHECKPOINT); 1550 dREQ (REQ_ENV_TXN_CHECKPOINT, 1);
1533 req->env = env; 1551 req->env = env;
1534 req->uint1 = kbyte; 1552 req->uint1 = kbyte;
1535 req->int1 = min; 1553 req->int1 = min;
1536 req->uint2 = flags; 1554 req->uint2 = flags;
1537 REQ_SEND; 1555 REQ_SEND;
… …
1541db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0) 1559db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0)
1542 PREINIT: 1560 PREINIT:
1543 CALLBACK 1561 CALLBACK
1544 CODE: 1562 CODE:
1545{ 1563{
1546 dREQ (REQ_ENV_LOCK_DETECT); 1564 dREQ (REQ_ENV_LOCK_DETECT, 1);
1547 req->env = env; 1565 req->env = env;
1548 req->uint1 = flags; 1566 req->uint1 = flags;
1549 req->uint2 = atype; 1567 req->uint2 = atype;
1550 /* req->int2 = 0; dummy */ 1568 /* req->int2 = 0; dummy */
1551 REQ_SEND; 1569 REQ_SEND;
… …
1555db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0) 1573db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0)
1556 PREINIT: 1574 PREINIT:
1557 CALLBACK 1575 CALLBACK
1558 CODE: 1576 CODE:
1559{ 1577{
1560 dREQ (REQ_ENV_MEMP_SYNC); 1578 dREQ (REQ_ENV_MEMP_SYNC, 1);
1561 req->env = env; 1579 req->env = env;
1562 REQ_SEND; 1580 REQ_SEND;
1563} 1581}
1564 1582
1565void 1583void
1566db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0) 1584db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0)
1567 PREINIT: 1585 PREINIT:
1568 CALLBACK 1586 CALLBACK
1569 CODE: 1587 CODE:
1570{ 1588{
1571 dREQ (REQ_ENV_MEMP_TRICKLE); 1589 dREQ (REQ_ENV_MEMP_TRICKLE, 1);
1572 req->env = env; 1590 req->env = env;
1573 req->int1 = percent; 1591 req->int1 = percent;
1574 REQ_SEND; 1592 REQ_SEND;
1575} 1593}
1576 1594
… …
1578db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0) 1596db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0)
1579 PREINIT: 1597 PREINIT:
1580 CALLBACK 1598 CALLBACK
1581 CODE: 1599 CODE:
1582{ 1600{
1583 dREQ (REQ_ENV_DBREMOVE); 1601 dREQ (REQ_ENV_DBREMOVE, 2);
1584 req->env = env; 1602 req->env = env;
1585 req->buf1 = strdup_ornull (file); 1603 req->buf1 = strdup_ornull (file);
1586 req->buf2 = strdup_ornull (database); 1604 req->buf2 = strdup_ornull (database);
1587 req->uint1 = flags; 1605 req->uint1 = flags;
1588 REQ_SEND; 1606 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) 1610db_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: 1611 PREINIT:
1594 CALLBACK 1612 CALLBACK
1595 CODE: 1613 CODE:
1596{ 1614{
1597 dREQ (REQ_ENV_DBRENAME); 1615 dREQ (REQ_ENV_DBRENAME, 2);
1598 req->env = env; 1616 req->env = env;
1599 req->buf1 = strdup_ornull (file); 1617 req->buf1 = strdup_ornull (file);
1600 req->buf2 = strdup_ornull (database); 1618 req->buf2 = strdup_ornull (database);
1601 req->buf3 = strdup_ornull (newname); 1619 req->buf3 = strdup_ornull (newname);
1602 req->uint1 = flags; 1620 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) 1639db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
1622 PREINIT: 1640 PREINIT:
1623 CALLBACK 1641 CALLBACK
1624 CODE: 1642 CODE:
1625{ 1643{
1626 dREQ (REQ_DB_OPEN); 1644 dREQ (REQ_DB_OPEN, 2);
1627 req->db = db; 1645 req->db = db;
1628 req->txn = txnid; 1646 req->txn = txnid;
1629 req->buf1 = strdup_ornull (file); 1647 req->buf1 = strdup_ornull (file);
1630 req->buf2 = strdup_ornull (database); 1648 req->buf2 = strdup_ornull (database);
1631 req->int1 = type; 1649 req->int1 = type;
… …
1638db_close (DB *db, U32 flags = 0, SV *callback = 0) 1656db_close (DB *db, U32 flags = 0, SV *callback = 0)
1639 PREINIT: 1657 PREINIT:
1640 CALLBACK 1658 CALLBACK
1641 CODE: 1659 CODE:
1642{ 1660{
1643 dREQ (REQ_DB_CLOSE); 1661 dREQ (REQ_DB_CLOSE, 1);
1644 req->db = db; 1662 req->db = db;
1645 req->uint1 = flags; 1663 req->uint1 = flags;
1646 req->sv1 = (SV *)db->app_private; 1664 req->sv1 = (SV *)db->app_private;
1647 REQ_SEND; 1665 REQ_SEND;
1648 ptr_nuke (ST (0)); 1666 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) 1672db_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: 1673 PREINIT:
1656 CALLBACK 1674 CALLBACK
1657 CODE: 1675 CODE:
1658{ 1676{
1659 dREQ (REQ_DB_COMPACT); 1677 dREQ (REQ_DB_COMPACT, 2);
1660 req->db = db; 1678 req->db = db;
1661 req->txn = txn; 1679 req->txn = txn;
1662 sv_to_dbt (&req->dbt1, start); 1680 sv_to_dbt (&req->dbt1, start);
1663 sv_to_dbt (&req->dbt2, stop); 1681 sv_to_dbt (&req->dbt2, stop);
1664 req->uint1 = flags; 1682 req->uint1 = flags;
… …
1671db_sync (DB *db, U32 flags = 0, SV *callback = 0) 1689db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1672 PREINIT: 1690 PREINIT:
1673 CALLBACK 1691 CALLBACK
1674 CODE: 1692 CODE:
1675{ 1693{
1676 dREQ (REQ_DB_SYNC); 1694 dREQ (REQ_DB_SYNC, 1);
1677 req->db = db; 1695 req->db = db;
1678 req->uint1 = flags; 1696 req->uint1 = flags;
1679 REQ_SEND; 1697 REQ_SEND;
1680} 1698}
1681 1699
… …
1683db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1701db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1684 PREINIT: 1702 PREINIT:
1685 CALLBACK 1703 CALLBACK
1686 CODE: 1704 CODE:
1687{ 1705{
1688 dREQ (REQ_DB_SYNC); 1706 dREQ (REQ_DB_SYNC, 1);
1689 req->db = db; 1707 req->db = db;
1690 req->buf1 = strdup (file); 1708 req->buf1 = strdup (file);
1691 req->uint1 = flags; 1709 req->uint1 = flags;
1692 REQ_SEND; 1710 REQ_SEND;
1693} 1711}
… …
1696db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1714db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0)
1697 PREINIT: 1715 PREINIT:
1698 CALLBACK 1716 CALLBACK
1699 CODE: 1717 CODE:
1700{ 1718{
1701 dREQ (REQ_DB_KEY_RANGE); 1719 dREQ (REQ_DB_KEY_RANGE, 2);
1702 req->db = db; 1720 req->db = db;
1703 req->txn = txn; 1721 req->txn = txn;
1704 sv_to_dbt (&req->dbt1, key); 1722 sv_to_dbt (&req->dbt1, key);
1705 req->uint1 = flags; 1723 req->uint1 = flags;
1706 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1724 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) 1729db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1712 PREINIT: 1730 PREINIT:
1713 CALLBACK 1731 CALLBACK
1714 CODE: 1732 CODE:
1715{ 1733{
1716 dREQ (REQ_DB_PUT); 1734 dREQ (REQ_DB_PUT, 2);
1717 req->db = db; 1735 req->db = db;
1718 req->txn = txn; 1736 req->txn = txn;
1719 sv_to_dbt (&req->dbt1, key); 1737 sv_to_dbt (&req->dbt1, key);
1720 sv_to_dbt (&req->dbt2, data); 1738 sv_to_dbt (&req->dbt2, data);
1721 req->uint1 = flags; 1739 req->uint1 = flags;
… …
1728db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1746db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1729 PREINIT: 1747 PREINIT:
1730 CALLBACK 1748 CALLBACK
1731 CODE: 1749 CODE:
1732{ 1750{
1733 dREQ (REQ_DB_EXISTS); 1751 dREQ (REQ_DB_EXISTS, 2);
1734 req->db = db; 1752 req->db = db;
1735 req->txn = txn; 1753 req->txn = txn;
1736 req->uint1 = flags; 1754 req->uint1 = flags;
1737 sv_to_dbt (&req->dbt1, key); 1755 sv_to_dbt (&req->dbt1, key);
1738 REQ_SEND; 1756 REQ_SEND;
… …
1746 CALLBACK 1764 CALLBACK
1747 CODE: 1765 CODE:
1748 if (SvREADONLY (data)) 1766 if (SvREADONLY (data))
1749 croak ("can't modify read-only data scalar in db_get"); 1767 croak ("can't modify read-only data scalar in db_get");
1750{ 1768{
1751 dREQ (REQ_DB_GET); 1769 dREQ (REQ_DB_GET, 2);
1752 req->db = db; 1770 req->db = db;
1753 req->txn = txn; 1771 req->txn = txn;
1754 req->uint1 = flags; 1772 req->uint1 = flags;
1755 sv_to_dbt (&req->dbt1, key); 1773 sv_to_dbt (&req->dbt1, key);
1756 req->dbt3.flags = DB_DBT_MALLOC; 1774 req->dbt3.flags = DB_DBT_MALLOC;
… …
1764 CALLBACK 1782 CALLBACK
1765 CODE: 1783 CODE:
1766 if (SvREADONLY (data)) 1784 if (SvREADONLY (data))
1767 croak ("can't modify read-only data scalar in db_pget"); 1785 croak ("can't modify read-only data scalar in db_pget");
1768{ 1786{
1769 dREQ (REQ_DB_PGET); 1787 dREQ (REQ_DB_PGET, 2);
1770 req->db = db; 1788 req->db = db;
1771 req->txn = txn; 1789 req->txn = txn;
1772 req->uint1 = flags; 1790 req->uint1 = flags;
1773 sv_to_dbt (&req->dbt1, key); 1791 sv_to_dbt (&req->dbt1, key);
1774 sv_to_dbt (&req->dbt2, pkey); 1792 sv_to_dbt (&req->dbt2, pkey);
… …
1781db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1799db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1782 PREINIT: 1800 PREINIT:
1783 CALLBACK 1801 CALLBACK
1784 CODE: 1802 CODE:
1785{ 1803{
1786 dREQ (REQ_DB_DEL); 1804 dREQ (REQ_DB_DEL, 2);
1787 req->db = db; 1805 req->db = db;
1788 req->txn = txn; 1806 req->txn = txn;
1789 req->uint1 = flags; 1807 req->uint1 = flags;
1790 sv_to_dbt (&req->dbt1, key); 1808 sv_to_dbt (&req->dbt1, key);
1791 REQ_SEND; 1809 REQ_SEND;
… …
1795db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1813db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1796 PREINIT: 1814 PREINIT:
1797 CALLBACK 1815 CALLBACK
1798 CODE: 1816 CODE:
1799{ 1817{
1800 dREQ (REQ_TXN_COMMIT); 1818 dREQ (REQ_TXN_COMMIT, 1);
1801 req->txn = txn; 1819 req->txn = txn;
1802 req->uint1 = flags; 1820 req->uint1 = flags;
1803 REQ_SEND; 1821 REQ_SEND;
1804 ptr_nuke (ST (0)); 1822 ptr_nuke (ST (0));
1805} 1823}
… …
1808db_txn_abort (DB_TXN *txn, SV *callback = 0) 1826db_txn_abort (DB_TXN *txn, SV *callback = 0)
1809 PREINIT: 1827 PREINIT:
1810 CALLBACK 1828 CALLBACK
1811 CODE: 1829 CODE:
1812{ 1830{
1813 dREQ (REQ_TXN_ABORT); 1831 dREQ (REQ_TXN_ABORT, 1);
1814 req->txn = txn; 1832 req->txn = txn;
1815 REQ_SEND; 1833 REQ_SEND;
1816 ptr_nuke (ST (0)); 1834 ptr_nuke (ST (0));
1817} 1835}
1818 1836
… …
1820db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1838db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1821 PREINIT: 1839 PREINIT:
1822 CALLBACK 1840 CALLBACK
1823 CODE: 1841 CODE:
1824{ 1842{
1825 dREQ (REQ_TXN_FINISH); 1843 dREQ (REQ_TXN_FINISH, 1);
1826 req->txn = txn; 1844 req->txn = txn;
1827 req->uint1 = flags; 1845 req->uint1 = flags;
1828 REQ_SEND; 1846 REQ_SEND;
1829 ptr_nuke (ST (0)); 1847 ptr_nuke (ST (0));
1830} 1848}
… …
1833db_c_close (DBC *dbc, SV *callback = 0) 1851db_c_close (DBC *dbc, SV *callback = 0)
1834 PREINIT: 1852 PREINIT:
1835 CALLBACK 1853 CALLBACK
1836 CODE: 1854 CODE:
1837{ 1855{
1838 dREQ (REQ_C_CLOSE); 1856 dREQ (REQ_C_CLOSE, 1);
1839 req->dbc = dbc; 1857 req->dbc = dbc;
1840 REQ_SEND; 1858 REQ_SEND;
1841 ptr_nuke (ST (0)); 1859 ptr_nuke (ST (0));
1842} 1860}
1843 1861
… …
1845db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1863db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1846 PREINIT: 1864 PREINIT:
1847 CALLBACK 1865 CALLBACK
1848 CODE: 1866 CODE:
1849{ 1867{
1850 dREQ (REQ_C_COUNT); 1868 dREQ (REQ_C_COUNT, 1);
1851 req->dbc = dbc; 1869 req->dbc = dbc;
1852 req->sv1 = SvREFCNT_inc (count); 1870 req->sv1 = SvREFCNT_inc (count);
1853 REQ_SEND; 1871 REQ_SEND;
1854} 1872}
1855 1873
… …
1857db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1875db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1858 PREINIT: 1876 PREINIT:
1859 CALLBACK 1877 CALLBACK
1860 CODE: 1878 CODE:
1861{ 1879{
1862 dREQ (REQ_C_PUT); 1880 dREQ (REQ_C_PUT, 1);
1863 req->dbc = dbc; 1881 req->dbc = dbc;
1864 sv_to_dbt (&req->dbt1, key); 1882 sv_to_dbt (&req->dbt1, key);
1865 sv_to_dbt (&req->dbt2, data); 1883 sv_to_dbt (&req->dbt2, data);
1866 req->uint1 = flags; 1884 req->uint1 = flags;
1867 REQ_SEND; 1885 REQ_SEND;
… …
1871db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1889db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1872 PREINIT: 1890 PREINIT:
1873 CALLBACK 1891 CALLBACK
1874 CODE: 1892 CODE:
1875{ 1893{
1876 dREQ (REQ_C_GET); 1894 dREQ (REQ_C_GET, 1);
1877 req->dbc = dbc; 1895 req->dbc = dbc;
1878 req->uint1 = flags; 1896 req->uint1 = flags;
1879 if ((flags & DB_SET) == DB_SET 1897 if ((flags & DB_SET) == DB_SET
1880 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1898 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1881 sv_to_dbt (&req->dbt1, key); 1899 sv_to_dbt (&req->dbt1, key);
… …
1898db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1916db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
1899 PREINIT: 1917 PREINIT:
1900 CALLBACK 1918 CALLBACK
1901 CODE: 1919 CODE:
1902{ 1920{
1903 dREQ (REQ_C_PGET); 1921 dREQ (REQ_C_PGET, 1);
1904 req->dbc = dbc; 1922 req->dbc = dbc;
1905 req->uint1 = flags; 1923 req->uint1 = flags;
1906 if ((flags & DB_SET) == DB_SET 1924 if ((flags & DB_SET) == DB_SET
1907 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1925 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1908 sv_to_dbt (&req->dbt1, key); 1926 sv_to_dbt (&req->dbt1, key);
… …
1928db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 1946db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1929 PREINIT: 1947 PREINIT:
1930 CALLBACK 1948 CALLBACK
1931 CODE: 1949 CODE:
1932{ 1950{
1933 dREQ (REQ_C_DEL); 1951 dREQ (REQ_C_DEL, 1);
1934 req->dbc = dbc; 1952 req->dbc = dbc;
1935 req->uint1 = flags; 1953 req->uint1 = flags;
1936 REQ_SEND; 1954 REQ_SEND;
1937} 1955}
1938 1956
… …
1943db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0) 1961db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0)
1944 PREINIT: 1962 PREINIT:
1945 CALLBACK 1963 CALLBACK
1946 CODE: 1964 CODE:
1947{ 1965{
1948 dREQ (REQ_SEQ_OPEN); 1966 dREQ (REQ_SEQ_OPEN, 2);
1949 req->seq = seq; 1967 req->seq = seq;
1950 req->txn = txnid; 1968 req->txn = txnid;
1951 req->uint1 = flags | DB_THREAD; 1969 req->uint1 = flags | DB_THREAD;
1952 sv_to_dbt (&req->dbt1, key); 1970 sv_to_dbt (&req->dbt1, key);
1953 REQ_SEND; 1971 REQ_SEND;
… …
1957db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 1975db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1958 PREINIT: 1976 PREINIT:
1959 CALLBACK 1977 CALLBACK
1960 CODE: 1978 CODE:
1961{ 1979{
1962 dREQ (REQ_SEQ_CLOSE); 1980 dREQ (REQ_SEQ_CLOSE, 1);
1963 req->seq = seq; 1981 req->seq = seq;
1964 req->uint1 = flags; 1982 req->uint1 = flags;
1965 REQ_SEND; 1983 REQ_SEND;
1966 ptr_nuke (ST (0)); 1984 ptr_nuke (ST (0));
1967} 1985}
… …
1970db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 1988db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1971 PREINIT: 1989 PREINIT:
1972 CALLBACK 1990 CALLBACK
1973 CODE: 1991 CODE:
1974{ 1992{
1975 dREQ (REQ_SEQ_GET); 1993 dREQ (REQ_SEQ_GET, 2);
1976 req->seq = seq; 1994 req->seq = seq;
1977 req->txn = txnid; 1995 req->txn = txnid;
1978 req->int1 = delta; 1996 req->int1 = delta;
1979 req->uint1 = flags; 1997 req->uint1 = flags;
1980 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1998 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) 2003db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
1986 PREINIT: 2004 PREINIT:
1987 CALLBACK 2005 CALLBACK
1988 CODE: 2006 CODE:
1989{ 2007{
1990 dREQ (REQ_SEQ_REMOVE); 2008 dREQ (REQ_SEQ_REMOVE, 2);
1991 req->seq = seq; 2009 req->seq = seq;
1992 req->txn = txnid; 2010 req->txn = txnid;
1993 req->uint1 = flags; 2011 req->uint1 = flags;
1994 REQ_SEND; 2012 REQ_SEND;
1995} 2013}

Diff Legend

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