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.52 by root, Thu Sep 25 13:44:44 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
… …
566 } 577 }
567} 578}
568 579
569static void end_thread (void) 580static void end_thread (void)
570{ 581{
571 bdb_req req; 582 bdb_req req = calloc (1, sizeof (bdb_cb));
572
573 Newz (0, req, 1, bdb_cb);
574 583
575 req->type = REQ_QUIT; 584 req->type = REQ_QUIT;
576 req->pri = PRI_MAX + PRI_BIAS; 585 req->pri = PRI_MAX + PRI_BIAS;
577 586
578 X_LOCK (reqlock); 587 X_LOCK (reqlock);
… …
703 712
704 return count; 713 return count;
705} 714}
706 715
707/*****************************************************************************/ 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}
708 875
709X_THREAD_PROC (bdb_proc) 876X_THREAD_PROC (bdb_proc)
710{ 877{
711 bdb_req req; 878 bdb_req req;
712 struct timespec ts; 879 struct timespec ts;
… …
752 } 919 }
753 920
754 --nready; 921 --nready;
755 922
756 X_UNLOCK (reqlock); 923 X_UNLOCK (reqlock);
757 924
758 switch (req->type) 925 if (req->type == REQ_QUIT)
759 { 926 {
760 case REQ_QUIT: 927 X_LOCK (reslock);
761 req->result = ENOSYS; 928 free (req);
929 self->req = 0;
930 X_UNLOCK (reslock);
931
762 goto quit; 932 goto quit;
763
764 case REQ_ENV_OPEN:
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 } 933 }
912 934
913 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) 935 bdb_request (req);
914 req->txn->flags |= TXN_DEADLOCK;
915 936
916 X_LOCK (reslock); 937 X_LOCK (reslock);
917 938
918 ++npending; 939 ++npending;
919 940
… …
981 create_respipe (); 1002 create_respipe ();
982 1003
983 atfork_parent (); 1004 atfork_parent ();
984} 1005}
985 1006
986#define dREQ(reqtype) \ 1007#define dREQ(reqtype,rsvcnt) \
987 bdb_req req; \ 1008 bdb_req req; \
988 int req_pri = next_pri; \ 1009 int req_pri = next_pri; \
989 next_pri = DEFAULT_PRI + PRI_BIAS; \ 1010 next_pri = DEFAULT_PRI + PRI_BIAS; \
990 \ 1011 \
991 if (callback && SvOK (callback)) \ 1012 if (callback && SvOK (callback)) \
… …
993 \ 1014 \
994 Newz (0, req, 1, bdb_cb); \ 1015 Newz (0, req, 1, bdb_cb); \
995 if (!req) \ 1016 if (!req) \
996 croak ("out of memory during bdb_req allocation"); \ 1017 croak ("out of memory during bdb_req allocation"); \
997 \ 1018 \
998 req->callback = cb ? SvREFCNT_inc (cb) : 0; \ 1019 req->callback = SvREFCNT_inc (cb); \
999 req->type = (reqtype); \ 1020 req->type = (reqtype); \
1000 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;
1001 1025
1002#define REQ_SEND \ 1026#define REQ_SEND \
1003 req_send (req) 1027 req_send (req)
1004 1028
1005#define SvPTR(var, arg, type, class, nullok) \ 1029#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) 1518db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
1495 PREINIT: 1519 PREINIT:
1496 CALLBACK 1520 CALLBACK
1497 CODE: 1521 CODE:
1498{ 1522{
1499 dREQ (REQ_ENV_OPEN); 1523 dREQ (REQ_ENV_OPEN, 1);
1500 req->env = env; 1524 req->env = env;
1501 req->uint1 = open_flags | DB_THREAD; 1525 req->uint1 = open_flags | DB_THREAD;
1502 req->int1 = mode; 1526 req->int1 = mode;
1503 req->buf1 = strdup_ornull (db_home); 1527 req->buf1 = strdup_ornull (db_home);
1504 REQ_SEND; 1528 REQ_SEND;
… …
1508db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1532db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1509 PREINIT: 1533 PREINIT:
1510 CALLBACK 1534 CALLBACK
1511 CODE: 1535 CODE:
1512{ 1536{
1513 dREQ (REQ_ENV_CLOSE); 1537 dREQ (REQ_ENV_CLOSE, 1);
1514 req->env = env; 1538 req->env = env;
1515 req->uint1 = flags; 1539 req->uint1 = flags;
1516 REQ_SEND; 1540 REQ_SEND;
1517 ptr_nuke (ST (0)); 1541 ptr_nuke (ST (0));
1518} 1542}
… …
1521db_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)
1522 PREINIT: 1546 PREINIT:
1523 CALLBACK 1547 CALLBACK
1524 CODE: 1548 CODE:
1525{ 1549{
1526 dREQ (REQ_ENV_TXN_CHECKPOINT); 1550 dREQ (REQ_ENV_TXN_CHECKPOINT, 1);
1527 req->env = env; 1551 req->env = env;
1528 req->uint1 = kbyte; 1552 req->uint1 = kbyte;
1529 req->int1 = min; 1553 req->int1 = min;
1530 req->uint2 = flags; 1554 req->uint2 = flags;
1531 REQ_SEND; 1555 REQ_SEND;
… …
1535db_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)
1536 PREINIT: 1560 PREINIT:
1537 CALLBACK 1561 CALLBACK
1538 CODE: 1562 CODE:
1539{ 1563{
1540 dREQ (REQ_ENV_LOCK_DETECT); 1564 dREQ (REQ_ENV_LOCK_DETECT, 1);
1541 req->env = env; 1565 req->env = env;
1542 req->uint1 = flags; 1566 req->uint1 = flags;
1543 req->uint2 = atype; 1567 req->uint2 = atype;
1544 /* req->int2 = 0; dummy */ 1568 /* req->int2 = 0; dummy */
1545 REQ_SEND; 1569 REQ_SEND;
… …
1549db_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)
1550 PREINIT: 1574 PREINIT:
1551 CALLBACK 1575 CALLBACK
1552 CODE: 1576 CODE:
1553{ 1577{
1554 dREQ (REQ_ENV_MEMP_SYNC); 1578 dREQ (REQ_ENV_MEMP_SYNC, 1);
1555 req->env = env; 1579 req->env = env;
1556 REQ_SEND; 1580 REQ_SEND;
1557} 1581}
1558 1582
1559void 1583void
1560db_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)
1561 PREINIT: 1585 PREINIT:
1562 CALLBACK 1586 CALLBACK
1563 CODE: 1587 CODE:
1564{ 1588{
1565 dREQ (REQ_ENV_MEMP_TRICKLE); 1589 dREQ (REQ_ENV_MEMP_TRICKLE, 1);
1566 req->env = env; 1590 req->env = env;
1567 req->int1 = percent; 1591 req->int1 = percent;
1568 REQ_SEND; 1592 REQ_SEND;
1569} 1593}
1570 1594
… …
1572db_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)
1573 PREINIT: 1597 PREINIT:
1574 CALLBACK 1598 CALLBACK
1575 CODE: 1599 CODE:
1576{ 1600{
1577 dREQ (REQ_ENV_DBREMOVE); 1601 dREQ (REQ_ENV_DBREMOVE, 2);
1578 req->env = env; 1602 req->env = env;
1579 req->buf1 = strdup_ornull (file); 1603 req->buf1 = strdup_ornull (file);
1580 req->buf2 = strdup_ornull (database); 1604 req->buf2 = strdup_ornull (database);
1581 req->uint1 = flags; 1605 req->uint1 = flags;
1582 REQ_SEND; 1606 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) 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)
1587 PREINIT: 1611 PREINIT:
1588 CALLBACK 1612 CALLBACK
1589 CODE: 1613 CODE:
1590{ 1614{
1591 dREQ (REQ_ENV_DBRENAME); 1615 dREQ (REQ_ENV_DBRENAME, 2);
1592 req->env = env; 1616 req->env = env;
1593 req->buf1 = strdup_ornull (file); 1617 req->buf1 = strdup_ornull (file);
1594 req->buf2 = strdup_ornull (database); 1618 req->buf2 = strdup_ornull (database);
1595 req->buf3 = strdup_ornull (newname); 1619 req->buf3 = strdup_ornull (newname);
1596 req->uint1 = flags; 1620 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) 1639db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
1616 PREINIT: 1640 PREINIT:
1617 CALLBACK 1641 CALLBACK
1618 CODE: 1642 CODE:
1619{ 1643{
1620 dREQ (REQ_DB_OPEN); 1644 dREQ (REQ_DB_OPEN, 2);
1621 req->db = db; 1645 req->db = db;
1622 req->txn = txnid; 1646 req->txn = txnid;
1623 req->buf1 = strdup_ornull (file); 1647 req->buf1 = strdup_ornull (file);
1624 req->buf2 = strdup_ornull (database); 1648 req->buf2 = strdup_ornull (database);
1625 req->int1 = type; 1649 req->int1 = type;
… …
1632db_close (DB *db, U32 flags = 0, SV *callback = 0) 1656db_close (DB *db, U32 flags = 0, SV *callback = 0)
1633 PREINIT: 1657 PREINIT:
1634 CALLBACK 1658 CALLBACK
1635 CODE: 1659 CODE:
1636{ 1660{
1637 dREQ (REQ_DB_CLOSE); 1661 dREQ (REQ_DB_CLOSE, 1);
1638 req->db = db; 1662 req->db = db;
1639 req->uint1 = flags; 1663 req->uint1 = flags;
1640 req->sv1 = (SV *)db->app_private; 1664 req->sv1 = (SV *)db->app_private;
1641 REQ_SEND; 1665 REQ_SEND;
1642 ptr_nuke (ST (0)); 1666 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) 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)
1649 PREINIT: 1673 PREINIT:
1650 CALLBACK 1674 CALLBACK
1651 CODE: 1675 CODE:
1652{ 1676{
1653 dREQ (REQ_DB_COMPACT); 1677 dREQ (REQ_DB_COMPACT, 2);
1654 req->db = db; 1678 req->db = db;
1655 req->txn = txn; 1679 req->txn = txn;
1656 sv_to_dbt (&req->dbt1, start); 1680 sv_to_dbt (&req->dbt1, start);
1657 sv_to_dbt (&req->dbt2, stop); 1681 sv_to_dbt (&req->dbt2, stop);
1658 req->uint1 = flags; 1682 req->uint1 = flags;
… …
1665db_sync (DB *db, U32 flags = 0, SV *callback = 0) 1689db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1666 PREINIT: 1690 PREINIT:
1667 CALLBACK 1691 CALLBACK
1668 CODE: 1692 CODE:
1669{ 1693{
1670 dREQ (REQ_DB_SYNC); 1694 dREQ (REQ_DB_SYNC, 1);
1671 req->db = db; 1695 req->db = db;
1672 req->uint1 = flags; 1696 req->uint1 = flags;
1673 REQ_SEND; 1697 REQ_SEND;
1674} 1698}
1675 1699
… …
1677db_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)
1678 PREINIT: 1702 PREINIT:
1679 CALLBACK 1703 CALLBACK
1680 CODE: 1704 CODE:
1681{ 1705{
1682 dREQ (REQ_DB_SYNC); 1706 dREQ (REQ_DB_SYNC, 1);
1683 req->db = db; 1707 req->db = db;
1684 req->buf1 = strdup (file); 1708 req->buf1 = strdup (file);
1685 req->uint1 = flags; 1709 req->uint1 = flags;
1686 REQ_SEND; 1710 REQ_SEND;
1687} 1711}
… …
1690db_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)
1691 PREINIT: 1715 PREINIT:
1692 CALLBACK 1716 CALLBACK
1693 CODE: 1717 CODE:
1694{ 1718{
1695 dREQ (REQ_DB_KEY_RANGE); 1719 dREQ (REQ_DB_KEY_RANGE, 2);
1696 req->db = db; 1720 req->db = db;
1697 req->txn = txn; 1721 req->txn = txn;
1698 sv_to_dbt (&req->dbt1, key); 1722 sv_to_dbt (&req->dbt1, key);
1699 req->uint1 = flags; 1723 req->uint1 = flags;
1700 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1724 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) 1729db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1706 PREINIT: 1730 PREINIT:
1707 CALLBACK 1731 CALLBACK
1708 CODE: 1732 CODE:
1709{ 1733{
1710 dREQ (REQ_DB_PUT); 1734 dREQ (REQ_DB_PUT, 2);
1711 req->db = db; 1735 req->db = db;
1712 req->txn = txn; 1736 req->txn = txn;
1713 sv_to_dbt (&req->dbt1, key); 1737 sv_to_dbt (&req->dbt1, key);
1714 sv_to_dbt (&req->dbt2, data); 1738 sv_to_dbt (&req->dbt2, data);
1715 req->uint1 = flags; 1739 req->uint1 = flags;
… …
1722db_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)
1723 PREINIT: 1747 PREINIT:
1724 CALLBACK 1748 CALLBACK
1725 CODE: 1749 CODE:
1726{ 1750{
1727 dREQ (REQ_DB_EXISTS); 1751 dREQ (REQ_DB_EXISTS, 2);
1728 req->db = db; 1752 req->db = db;
1729 req->txn = txn; 1753 req->txn = txn;
1730 req->uint1 = flags; 1754 req->uint1 = flags;
1731 sv_to_dbt (&req->dbt1, key); 1755 sv_to_dbt (&req->dbt1, key);
1732 REQ_SEND; 1756 REQ_SEND;
… …
1740 CALLBACK 1764 CALLBACK
1741 CODE: 1765 CODE:
1742 if (SvREADONLY (data)) 1766 if (SvREADONLY (data))
1743 croak ("can't modify read-only data scalar in db_get"); 1767 croak ("can't modify read-only data scalar in db_get");
1744{ 1768{
1745 dREQ (REQ_DB_GET); 1769 dREQ (REQ_DB_GET, 2);
1746 req->db = db; 1770 req->db = db;
1747 req->txn = txn; 1771 req->txn = txn;
1748 req->uint1 = flags; 1772 req->uint1 = flags;
1749 sv_to_dbt (&req->dbt1, key); 1773 sv_to_dbt (&req->dbt1, key);
1750 req->dbt3.flags = DB_DBT_MALLOC; 1774 req->dbt3.flags = DB_DBT_MALLOC;
… …
1758 CALLBACK 1782 CALLBACK
1759 CODE: 1783 CODE:
1760 if (SvREADONLY (data)) 1784 if (SvREADONLY (data))
1761 croak ("can't modify read-only data scalar in db_pget"); 1785 croak ("can't modify read-only data scalar in db_pget");
1762{ 1786{
1763 dREQ (REQ_DB_PGET); 1787 dREQ (REQ_DB_PGET, 2);
1764 req->db = db; 1788 req->db = db;
1765 req->txn = txn; 1789 req->txn = txn;
1766 req->uint1 = flags; 1790 req->uint1 = flags;
1767 sv_to_dbt (&req->dbt1, key); 1791 sv_to_dbt (&req->dbt1, key);
1768 sv_to_dbt (&req->dbt2, pkey); 1792 sv_to_dbt (&req->dbt2, pkey);
… …
1775db_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)
1776 PREINIT: 1800 PREINIT:
1777 CALLBACK 1801 CALLBACK
1778 CODE: 1802 CODE:
1779{ 1803{
1780 dREQ (REQ_DB_DEL); 1804 dREQ (REQ_DB_DEL, 2);
1781 req->db = db; 1805 req->db = db;
1782 req->txn = txn; 1806 req->txn = txn;
1783 req->uint1 = flags; 1807 req->uint1 = flags;
1784 sv_to_dbt (&req->dbt1, key); 1808 sv_to_dbt (&req->dbt1, key);
1785 REQ_SEND; 1809 REQ_SEND;
… …
1789db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1813db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1790 PREINIT: 1814 PREINIT:
1791 CALLBACK 1815 CALLBACK
1792 CODE: 1816 CODE:
1793{ 1817{
1794 dREQ (REQ_TXN_COMMIT); 1818 dREQ (REQ_TXN_COMMIT, 1);
1795 req->txn = txn; 1819 req->txn = txn;
1796 req->uint1 = flags; 1820 req->uint1 = flags;
1797 REQ_SEND; 1821 REQ_SEND;
1798 ptr_nuke (ST (0)); 1822 ptr_nuke (ST (0));
1799} 1823}
… …
1802db_txn_abort (DB_TXN *txn, SV *callback = 0) 1826db_txn_abort (DB_TXN *txn, SV *callback = 0)
1803 PREINIT: 1827 PREINIT:
1804 CALLBACK 1828 CALLBACK
1805 CODE: 1829 CODE:
1806{ 1830{
1807 dREQ (REQ_TXN_ABORT); 1831 dREQ (REQ_TXN_ABORT, 1);
1808 req->txn = txn; 1832 req->txn = txn;
1809 REQ_SEND; 1833 REQ_SEND;
1810 ptr_nuke (ST (0)); 1834 ptr_nuke (ST (0));
1811} 1835}
1812 1836
… …
1814db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1838db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1815 PREINIT: 1839 PREINIT:
1816 CALLBACK 1840 CALLBACK
1817 CODE: 1841 CODE:
1818{ 1842{
1819 dREQ (REQ_TXN_FINISH); 1843 dREQ (REQ_TXN_FINISH, 1);
1820 req->txn = txn; 1844 req->txn = txn;
1821 req->uint1 = flags; 1845 req->uint1 = flags;
1822 REQ_SEND; 1846 REQ_SEND;
1823 ptr_nuke (ST (0)); 1847 ptr_nuke (ST (0));
1824} 1848}
… …
1827db_c_close (DBC *dbc, SV *callback = 0) 1851db_c_close (DBC *dbc, SV *callback = 0)
1828 PREINIT: 1852 PREINIT:
1829 CALLBACK 1853 CALLBACK
1830 CODE: 1854 CODE:
1831{ 1855{
1832 dREQ (REQ_C_CLOSE); 1856 dREQ (REQ_C_CLOSE, 1);
1833 req->dbc = dbc; 1857 req->dbc = dbc;
1834 REQ_SEND; 1858 REQ_SEND;
1835 ptr_nuke (ST (0)); 1859 ptr_nuke (ST (0));
1836} 1860}
1837 1861
… …
1839db_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)
1840 PREINIT: 1864 PREINIT:
1841 CALLBACK 1865 CALLBACK
1842 CODE: 1866 CODE:
1843{ 1867{
1844 dREQ (REQ_C_COUNT); 1868 dREQ (REQ_C_COUNT, 1);
1845 req->dbc = dbc; 1869 req->dbc = dbc;
1846 req->sv1 = SvREFCNT_inc (count); 1870 req->sv1 = SvREFCNT_inc (count);
1847 REQ_SEND; 1871 REQ_SEND;
1848} 1872}
1849 1873
… …
1851db_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)
1852 PREINIT: 1876 PREINIT:
1853 CALLBACK 1877 CALLBACK
1854 CODE: 1878 CODE:
1855{ 1879{
1856 dREQ (REQ_C_PUT); 1880 dREQ (REQ_C_PUT, 1);
1857 req->dbc = dbc; 1881 req->dbc = dbc;
1858 sv_to_dbt (&req->dbt1, key); 1882 sv_to_dbt (&req->dbt1, key);
1859 sv_to_dbt (&req->dbt2, data); 1883 sv_to_dbt (&req->dbt2, data);
1860 req->uint1 = flags; 1884 req->uint1 = flags;
1861 REQ_SEND; 1885 REQ_SEND;
… …
1865db_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)
1866 PREINIT: 1890 PREINIT:
1867 CALLBACK 1891 CALLBACK
1868 CODE: 1892 CODE:
1869{ 1893{
1870 dREQ (REQ_C_GET); 1894 dREQ (REQ_C_GET, 1);
1871 req->dbc = dbc; 1895 req->dbc = dbc;
1872 req->uint1 = flags; 1896 req->uint1 = flags;
1873 if ((flags & DB_SET) == DB_SET 1897 if ((flags & DB_SET) == DB_SET
1874 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1898 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1875 sv_to_dbt (&req->dbt1, key); 1899 sv_to_dbt (&req->dbt1, key);
… …
1892db_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)
1893 PREINIT: 1917 PREINIT:
1894 CALLBACK 1918 CALLBACK
1895 CODE: 1919 CODE:
1896{ 1920{
1897 dREQ (REQ_C_PGET); 1921 dREQ (REQ_C_PGET, 1);
1898 req->dbc = dbc; 1922 req->dbc = dbc;
1899 req->uint1 = flags; 1923 req->uint1 = flags;
1900 if ((flags & DB_SET) == DB_SET 1924 if ((flags & DB_SET) == DB_SET
1901 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1925 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1902 sv_to_dbt (&req->dbt1, key); 1926 sv_to_dbt (&req->dbt1, key);
… …
1922db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 1946db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1923 PREINIT: 1947 PREINIT:
1924 CALLBACK 1948 CALLBACK
1925 CODE: 1949 CODE:
1926{ 1950{
1927 dREQ (REQ_C_DEL); 1951 dREQ (REQ_C_DEL, 1);
1928 req->dbc = dbc; 1952 req->dbc = dbc;
1929 req->uint1 = flags; 1953 req->uint1 = flags;
1930 REQ_SEND; 1954 REQ_SEND;
1931} 1955}
1932 1956
… …
1937db_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)
1938 PREINIT: 1962 PREINIT:
1939 CALLBACK 1963 CALLBACK
1940 CODE: 1964 CODE:
1941{ 1965{
1942 dREQ (REQ_SEQ_OPEN); 1966 dREQ (REQ_SEQ_OPEN, 2);
1943 req->seq = seq; 1967 req->seq = seq;
1944 req->txn = txnid; 1968 req->txn = txnid;
1945 req->uint1 = flags | DB_THREAD; 1969 req->uint1 = flags | DB_THREAD;
1946 sv_to_dbt (&req->dbt1, key); 1970 sv_to_dbt (&req->dbt1, key);
1947 REQ_SEND; 1971 REQ_SEND;
… …
1951db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 1975db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1952 PREINIT: 1976 PREINIT:
1953 CALLBACK 1977 CALLBACK
1954 CODE: 1978 CODE:
1955{ 1979{
1956 dREQ (REQ_SEQ_CLOSE); 1980 dREQ (REQ_SEQ_CLOSE, 1);
1957 req->seq = seq; 1981 req->seq = seq;
1958 req->uint1 = flags; 1982 req->uint1 = flags;
1959 REQ_SEND; 1983 REQ_SEND;
1960 ptr_nuke (ST (0)); 1984 ptr_nuke (ST (0));
1961} 1985}
… …
1964db_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)
1965 PREINIT: 1989 PREINIT:
1966 CALLBACK 1990 CALLBACK
1967 CODE: 1991 CODE:
1968{ 1992{
1969 dREQ (REQ_SEQ_GET); 1993 dREQ (REQ_SEQ_GET, 2);
1970 req->seq = seq; 1994 req->seq = seq;
1971 req->txn = txnid; 1995 req->txn = txnid;
1972 req->int1 = delta; 1996 req->int1 = delta;
1973 req->uint1 = flags; 1997 req->uint1 = flags;
1974 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1998 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) 2003db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
1980 PREINIT: 2004 PREINIT:
1981 CALLBACK 2005 CALLBACK
1982 CODE: 2006 CODE:
1983{ 2007{
1984 dREQ (REQ_SEQ_REMOVE); 2008 dREQ (REQ_SEQ_REMOVE, 2);
1985 req->seq = seq; 2009 req->seq = seq;
1986 req->txn = txnid; 2010 req->txn = txnid;
1987 req->uint1 = flags; 2011 req->uint1 = flags;
1988 REQ_SEND; 2012 REQ_SEND;
1989} 2013}

Diff Legend

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