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

Diff Legend

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