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

Comparing BDB/BDB.xs (file contents):
Revision 1.37 by root, Sat May 10 20:23:06 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"
… …
27# include <unistd.h> 32# include <unistd.h>
28#endif 33#endif
29 34
30#include <db.h> 35#include <db.h>
31 36
32#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4) 37#if DB_VERSION_MAJOR != 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3)
33# error you need Berkeley DB 4.4 or newer installed 38# error you need Berkeley DB 4.3 or a newer 4.x version installed
34#endif 39#endif
35 40
36/* number of seconds after which idle threads exit */ 41/* number of seconds after which idle threads exit */
37#define IDLE_TIMEOUT 10 42#define IDLE_TIMEOUT 10
38 43
39typedef DB_ENV DB_ENV_ornull; 44typedef DB_ENV DB_ENV_ornull;
40typedef DB_TXN DB_TXN_ornull; 45typedef DB_TXN DB_TXN_ornull;
41typedef DBC DBC_ornull; 46typedef DBC DBC_ornull;
42typedef DB DB_ornull; 47typedef DB DB_ornull;
43typedef DB_SEQUENCE DB_SEQUENCE_ornull;
44 48
45typedef DB_ENV DB_ENV_ornuked; 49typedef DB_ENV DB_ENV_ornuked;
46typedef DB_TXN DB_TXN_ornuked; 50typedef DB_TXN DB_TXN_ornuked;
47typedef DBC DBC_ornuked; 51typedef DBC DBC_ornuked;
48typedef DB DB_ornuked; 52typedef DB DB_ornuked;
53
54#if DB_VERSION_MINOR >= 3
55typedef DB_SEQUENCE DB_SEQUENCE_ornull;
49typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 56typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
57#endif
50 58
51typedef SV SV8; /* byte-sv, used for argument-checking */ 59typedef SV SV8; /* byte-sv, used for argument-checking */
52typedef char *bdb_filename; 60typedef char *bdb_filename;
53 61
54static SV *prepare_cb; 62static SV *prepare_cb;
… …
127dbt_to_sv (SV *sv, DBT *dbt) 135dbt_to_sv (SV *sv, DBT *dbt)
128{ 136{
129 if (sv) 137 if (sv)
130 { 138 {
131 SvREADONLY_off (sv); 139 SvREADONLY_off (sv);
132 sv_setpvn_mg (sv, dbt->data, dbt->size); 140 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef);
133 SvREFCNT_dec (sv); 141 SvREFCNT_dec (sv);
134 } 142 }
135 143
144 //assert (dbt->flags & DBT_MALLOC || !dbt->data);
136 free (dbt->data); 145 free (dbt->data);
137} 146}
138 147
139enum { 148enum {
140 REQ_QUIT, 149 REQ_QUIT,
141 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 150 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 151 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
143 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 152 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
144 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 153 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
145 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 154 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
146 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 155 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
147 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 156 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
148}; 157};
149 158
… …
159 DBC *dbc; 168 DBC *dbc;
160 169
161 UV uv1; 170 UV uv1;
162 int int1, int2; 171 int int1, int2;
163 U32 uint1, uint2; 172 U32 uint1, uint2;
164 char *buf1, *buf2; 173 char *buf1, *buf2, *buf3;
165 SV *sv1, *sv2, *sv3; 174 SV *sv1, *sv2, *sv3;
166 175
167 DBT dbt1, dbt2, dbt3; 176 DBT dbt1, dbt2, dbt3;
168 DB_KEY_RANGE key_range; 177 DB_KEY_RANGE key_range;
178#if DB_VERSION_MINOR >= 3
169 DB_SEQUENCE *seq; 179 DB_SEQUENCE *seq;
170 db_seq_t seq_t; 180 db_seq_t seq_t;
181#endif
182
183 SV *rsv1, *rsv2; // keep some request objects alive
171} bdb_cb; 184} bdb_cb;
172 185
173typedef bdb_cb *bdb_req; 186typedef bdb_cb *bdb_req;
174 187
175enum { 188enum {
… …
340 353
341static int req_invoke (bdb_req req) 354static int req_invoke (bdb_req req)
342{ 355{
343 dSP; 356 dSP;
344 357
345 if (SvOK (req->callback)) 358 if (req->callback)
346 { 359 {
347 ENTER; 360 ENTER;
348 SAVETMPS; 361 SAVETMPS;
349 PUSHMARK (SP); 362 PUSHMARK (SP);
350 363
… …
384 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 397 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
385 SvREFCNT_dec (req->sv1); 398 SvREFCNT_dec (req->sv1);
386 } 399 }
387 break; 400 break;
388 401
402#if DB_VERSION_MINOR >= 3
389 case REQ_SEQ_GET: 403 case REQ_SEQ_GET:
390 SvREADONLY_off (req->sv1); 404 SvREADONLY_off (req->sv1);
391 405
392 if (sizeof (IV) > 4) 406 if (sizeof (IV) > 4)
393 sv_setiv_mg (req->sv1, (IV)req->seq_t); 407 sv_setiv_mg (req->sv1, (IV)req->seq_t);
394 else 408 else
395 sv_setnv_mg (req->sv1, (NV)req->seq_t); 409 sv_setnv_mg (req->sv1, (NV)req->seq_t);
396 410
397 SvREFCNT_dec (req->sv1); 411 SvREFCNT_dec (req->sv1);
398 break; 412 break;
413#endif
399 } 414 }
400 415
401 errno = req->result; 416 errno = req->result;
402 417
403 PUTBACK; 418 PUTBACK;
… …
411 return !SvTRUE (ERRSV); 426 return !SvTRUE (ERRSV);
412} 427}
413 428
414static void req_free (bdb_req req) 429static void req_free (bdb_req req)
415{ 430{
431 SvREFCNT_dec (req->callback);
432
433 SvREFCNT_dec (req->rsv1);
434 SvREFCNT_dec (req->rsv2);
435
416 free (req->buf1); 436 free (req->buf1);
417 free (req->buf2); 437 free (req->buf2);
438 free (req->buf3);
439
418 Safefree (req); 440 Safefree (req);
419} 441}
420 442
421#ifdef USE_SOCKETS_AS_HANDLES 443#ifdef USE_SOCKETS_AS_HANDLES
422# define TO_SOCKET(x) (win32_get_osfhandle (x)) 444# define TO_SOCKET(x) (win32_get_osfhandle (x))
… …
513 on_next_submit = 0; 535 on_next_submit = 0;
514 536
515 PUSHMARK (SP); 537 PUSHMARK (SP);
516 PUTBACK; 538 PUTBACK;
517 call_sv (cb, G_DISCARD | G_EVAL); 539 call_sv (cb, G_DISCARD | G_EVAL);
540 SPAGAIN;
518 } 541 }
519 542
520 // synthesize callback if none given 543 // synthesize callback if none given
521 if (!SvOK (req->callback)) 544 if (!req->callback)
522 { 545 {
523 int count; 546 int count;
524 547
525 dSP; 548 dSP;
526 PUSHMARK (SP); 549 PUSHMARK (SP);
… …
530 553
531 if (count != 2) 554 if (count != 2)
532 croak ("prepare callback must return exactly two values\n"); 555 croak ("prepare callback must return exactly two values\n");
533 556
534 wait_callback = POPs; 557 wait_callback = POPs;
535 SvREFCNT_dec (req->callback);
536 req->callback = SvREFCNT_inc (POPs); 558 req->callback = SvREFCNT_inc (POPs);
537 } 559 }
538 560
539 ++nreqs; 561 ++nreqs;
540 562
… …
555 } 577 }
556} 578}
557 579
558static void end_thread (void) 580static void end_thread (void)
559{ 581{
560 bdb_req req; 582 bdb_req req = calloc (1, sizeof (bdb_cb));
561
562 Newz (0, req, 1, bdb_cb);
563 583
564 req->type = REQ_QUIT; 584 req->type = REQ_QUIT;
565 req->pri = PRI_MAX + PRI_BIAS; 585 req->pri = PRI_MAX + PRI_BIAS;
566 586
567 X_LOCK (reqlock); 587 X_LOCK (reqlock);
… …
692 712
693 return count; 713 return count;
694} 714}
695 715
696/*****************************************************************************/ 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}
697 875
698X_THREAD_PROC (bdb_proc) 876X_THREAD_PROC (bdb_proc)
699{ 877{
700 bdb_req req; 878 bdb_req req;
701 struct timespec ts; 879 struct timespec ts;
… …
741 } 919 }
742 920
743 --nready; 921 --nready;
744 922
745 X_UNLOCK (reqlock); 923 X_UNLOCK (reqlock);
746 924
747 switch (req->type) 925 if (req->type == REQ_QUIT)
748 { 926 {
749 case REQ_QUIT: 927 X_LOCK (reslock);
750 req->result = ENOSYS; 928 free (req);
929 self->req = 0;
930 X_UNLOCK (reslock);
931
751 goto quit; 932 goto quit;
752
753 case REQ_ENV_OPEN:
754 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
755 break;
756
757 case REQ_ENV_CLOSE:
758 req->result = req->env->close (req->env, req->uint1);
759 break;
760
761 case REQ_ENV_TXN_CHECKPOINT:
762 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
763 break;
764
765 case REQ_ENV_LOCK_DETECT:
766 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
767 break;
768
769 case REQ_ENV_MEMP_SYNC:
770 req->result = req->env->memp_sync (req->env, 0);
771 break;
772
773 case REQ_ENV_MEMP_TRICKLE:
774 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
775 break;
776
777 case REQ_DB_OPEN:
778 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
779 break;
780
781 case REQ_DB_CLOSE:
782 req->result = req->db->close (req->db, req->uint1);
783 break;
784
785 case REQ_DB_COMPACT:
786 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
787 break;
788
789 case REQ_DB_SYNC:
790 req->result = req->db->sync (req->db, req->uint1);
791 break;
792
793 case REQ_DB_UPGRADE:
794 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
795 break;
796
797 case REQ_DB_PUT:
798 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
799 break;
800
801 case REQ_DB_GET:
802 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
803 break;
804
805 case REQ_DB_PGET:
806 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
807 break;
808
809 case REQ_DB_DEL:
810 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
811 break;
812
813 case REQ_DB_KEY_RANGE:
814 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
815 break;
816
817 case REQ_TXN_COMMIT:
818 req->result = req->txn->commit (req->txn, req->uint1);
819 break;
820
821 case REQ_TXN_ABORT:
822 req->result = req->txn->abort (req->txn);
823 break;
824
825 case REQ_TXN_FINISH:
826 if (req->txn->flags & TXN_DEADLOCK)
827 {
828 req->result = req->txn->abort (req->txn);
829 if (!req->result)
830 req->result = DB_LOCK_DEADLOCK;
831 }
832 else
833 req->result = req->txn->commit (req->txn, req->uint1);
834 break;
835
836 case REQ_C_CLOSE:
837 req->result = req->dbc->c_close (req->dbc);
838 break;
839
840 case REQ_C_COUNT:
841 {
842 db_recno_t recno;
843 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
844 req->uv1 = recno;
845 }
846 break;
847
848 case REQ_C_PUT:
849 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
850 break;
851
852 case REQ_C_GET:
853 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
854 break;
855
856 case REQ_C_PGET:
857 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
858 break;
859
860 case REQ_C_DEL:
861 req->result = req->dbc->c_del (req->dbc, req->uint1);
862 break;
863
864 case REQ_SEQ_OPEN:
865 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
866 break;
867
868 case REQ_SEQ_CLOSE:
869 req->result = req->seq->close (req->seq, req->uint1);
870 break;
871
872 case REQ_SEQ_GET:
873 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
874 break;
875
876 case REQ_SEQ_REMOVE:
877 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
878 break;
879
880 default:
881 req->result = ENOSYS;
882 break;
883 } 933 }
884 934
885 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) 935 bdb_request (req);
886 req->txn->flags |= TXN_DEADLOCK;
887 936
888 X_LOCK (reslock); 937 X_LOCK (reslock);
889 938
890 ++npending; 939 ++npending;
891 940
… …
953 create_respipe (); 1002 create_respipe ();
954 1003
955 atfork_parent (); 1004 atfork_parent ();
956} 1005}
957 1006
958#define dREQ(reqtype) \ 1007#define dREQ(reqtype,rsvcnt) \
959 bdb_req req; \ 1008 bdb_req req; \
960 int req_pri = next_pri; \ 1009 int req_pri = next_pri; \
961 next_pri = DEFAULT_PRI + PRI_BIAS; \ 1010 next_pri = DEFAULT_PRI + PRI_BIAS; \
962 \ 1011 \
963 if (SvOK (callback) && !SvROK (callback)) \ 1012 if (callback && SvOK (callback)) \
964 croak ("callback must be undef or of reference type"); \ 1013 croak ("callback has illegal type or extra arguments"); \
965 \ 1014 \
966 Newz (0, req, 1, bdb_cb); \ 1015 Newz (0, req, 1, bdb_cb); \
967 if (!req) \ 1016 if (!req) \
968 croak ("out of memory during bdb_req allocation"); \ 1017 croak ("out of memory during bdb_req allocation"); \
969 \ 1018 \
970 req->callback = newSVsv (callback); \ 1019 req->callback = SvREFCNT_inc (cb); \
971 req->type = (reqtype); \ 1020 req->type = (reqtype); \
972 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;
973 1025
974#define REQ_SEND \ 1026#define REQ_SEND \
975 req_send (req) 1027 req_send (req)
976 1028
977#define SvPTR(var, arg, type, class, nullok) \ 1029#define SvPTR(var, arg, type, class, nullok) \
… …
988 (var) = INT2PTR (type, tmp); \ 1040 (var) = INT2PTR (type, tmp); \
989 if (!var && nullok != 2) \ 1041 if (!var && nullok != 2) \
990 croak (# var " is not a valid " # class " object anymore"); \ 1042 croak (# var " is not a valid " # class " object anymore"); \
991 } \ 1043 } \
992 else \ 1044 else \
993 croak (# var " is not of type " # class); \ 1045 croak (# var " is not of type " # class);
994 \
995 1046
996static void 1047static void
997ptr_nuke (SV *sv) 1048ptr_nuke (SV *sv)
998{ 1049{
999 assert (SvROK (sv)); 1050 assert (SvROK (sv));
… …
1036 1087
1037 vtbl_errno = PL_vtbl_sv; 1088 vtbl_errno = PL_vtbl_sv;
1038 vtbl_errno.svt_get = errno_get; 1089 vtbl_errno.svt_get = errno_get;
1039 mg->mg_virtual = &vtbl_errno; 1090 mg->mg_virtual = &vtbl_errno;
1040} 1091}
1092
1093#if __GNUC__ >= 4
1094# define noinline __attribute__ ((noinline))
1095#else
1096# define noinline
1097#endif
1098
1099static noinline SV *
1100pop_callback (I32 *ritems, SV *sv)
1101{
1102 if (SvROK (sv))
1103 {
1104 HV *st;
1105 GV *gvp;
1106 CV *cv;
1107 const char *name;
1108
1109 /* forgive me */
1110 if (SvTYPE (SvRV (sv)) == SVt_PVMG
1111 && (st = SvSTASH (SvRV (sv)))
1112 && (name = HvNAME_get (st))
1113 && (name [0] == 'B' && name [1] == 'D' && name [2] == 'B' && name [3] == ':'))
1114 return 0;
1115
1116 if ((cv = sv_2cv (sv, &st, &gvp, 0)))
1117 {
1118 --*ritems;
1119 return (SV *)cv;
1120 }
1121 }
1122
1123 return 0;
1124}
1125
1126/* stupid windoes defined CALLBACK as well */
1127#undef CALLBACK
1128#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1041 1129
1042MODULE = BDB PACKAGE = BDB 1130MODULE = BDB PACKAGE = BDB
1043 1131
1044PROTOTYPES: ENABLE 1132PROTOTYPES: ENABLE
1045 1133
… …
1066 const_iv (RDONLY) 1154 const_iv (RDONLY)
1067 const_iv (USE_ENVIRON) 1155 const_iv (USE_ENVIRON)
1068 const_iv (USE_ENVIRON_ROOT) 1156 const_iv (USE_ENVIRON_ROOT)
1069 const_iv (LOCKDOWN) 1157 const_iv (LOCKDOWN)
1070 const_iv (PRIVATE) 1158 const_iv (PRIVATE)
1071 const_iv (REGISTER)
1072 const_iv (SYSTEM_MEM) 1159 const_iv (SYSTEM_MEM)
1073 const_iv (AUTO_COMMIT) 1160 const_iv (AUTO_COMMIT)
1074 const_iv (CDB_ALLDB) 1161 const_iv (CDB_ALLDB)
1075 const_iv (DIRECT_DB) 1162 const_iv (DIRECT_DB)
1076 const_iv (DIRECT_LOG)
1077 const_iv (DSYNC_DB)
1078 const_iv (DSYNC_LOG)
1079 const_iv (LOG_AUTOREMOVE)
1080 const_iv (LOG_INMEMORY)
1081 const_iv (NOLOCKING) 1163 const_iv (NOLOCKING)
1082 const_iv (NOMMAP) 1164 const_iv (NOMMAP)
1083 const_iv (NOPANIC) 1165 const_iv (NOPANIC)
1084 const_iv (OVERWRITE) 1166 const_iv (OVERWRITE)
1085 const_iv (PANIC_ENVIRONMENT) 1167 const_iv (PANIC_ENVIRONMENT)
… …
1096 const_iv (HASH) 1178 const_iv (HASH)
1097 const_iv (QUEUE) 1179 const_iv (QUEUE)
1098 const_iv (RECNO) 1180 const_iv (RECNO)
1099 const_iv (UNKNOWN) 1181 const_iv (UNKNOWN)
1100 const_iv (EXCL) 1182 const_iv (EXCL)
1101 const_iv (READ_COMMITTED)
1102 const_iv (READ_UNCOMMITTED)
1103 const_iv (TRUNCATE) 1183 const_iv (TRUNCATE)
1104 const_iv (NOSYNC) 1184 const_iv (NOSYNC)
1105 const_iv (CHKSUM) 1185 const_iv (CHKSUM)
1106 const_iv (ENCRYPT) 1186 const_iv (ENCRYPT)
1107 const_iv (DUP) 1187 const_iv (DUP)
1108 const_iv (DUPSORT) 1188 const_iv (DUPSORT)
1109 const_iv (RECNUM) 1189 const_iv (RECNUM)
1110 const_iv (RENUMBER) 1190 const_iv (RENUMBER)
1111 const_iv (REVSPLITOFF) 1191 const_iv (REVSPLITOFF)
1112 const_iv (INORDER)
1113 const_iv (CONSUME) 1192 const_iv (CONSUME)
1114 const_iv (CONSUME_WAIT) 1193 const_iv (CONSUME_WAIT)
1115 const_iv (GET_BOTH) 1194 const_iv (GET_BOTH)
1116 const_iv (GET_BOTH_RANGE) 1195 const_iv (GET_BOTH_RANGE)
1117 //const_iv (SET_RECNO) 1196 //const_iv (SET_RECNO)
… …
1126 const_iv (LOCK_DEADLOCK) 1205 const_iv (LOCK_DEADLOCK)
1127 const_iv (LOCK_NOTGRANTED) 1206 const_iv (LOCK_NOTGRANTED)
1128 const_iv (RUNRECOVERY) 1207 const_iv (RUNRECOVERY)
1129 const_iv (OLD_VERSION) 1208 const_iv (OLD_VERSION)
1130 const_iv (REP_HANDLE_DEAD) 1209 const_iv (REP_HANDLE_DEAD)
1131 const_iv (REP_LOCKOUT)
1132 const_iv (SECONDARY_BAD) 1210 const_iv (SECONDARY_BAD)
1133
1134 const_iv (FREE_SPACE)
1135 const_iv (FREELIST_ONLY)
1136 1211
1137 const_iv (APPEND) 1212 const_iv (APPEND)
1138 const_iv (NODUPDATA) 1213 const_iv (NODUPDATA)
1139 const_iv (NOOVERWRITE) 1214 const_iv (NOOVERWRITE)
1140 1215
… …
1163 const_iv (FORCE) 1238 const_iv (FORCE)
1164 1239
1165 const_iv (LOCK_DEFAULT) 1240 const_iv (LOCK_DEFAULT)
1166 const_iv (LOCK_EXPIRE) 1241 const_iv (LOCK_EXPIRE)
1167 const_iv (LOCK_MAXLOCKS) 1242 const_iv (LOCK_MAXLOCKS)
1168 const_iv (LOCK_MAXWRITE)
1169 const_iv (LOCK_MINLOCKS) 1243 const_iv (LOCK_MINLOCKS)
1170 const_iv (LOCK_MINWRITE) 1244 const_iv (LOCK_MINWRITE)
1171 const_iv (LOCK_OLDEST) 1245 const_iv (LOCK_OLDEST)
1172 const_iv (LOCK_RANDOM) 1246 const_iv (LOCK_RANDOM)
1173 const_iv (LOCK_YOUNGEST) 1247 const_iv (LOCK_YOUNGEST)
1174 1248
1175 const_iv (SEQ_DEC)
1176 const_iv (SEQ_INC)
1177 const_iv (SEQ_WRAP)
1178
1179 const_iv (BUFFER_SMALL)
1180 const_iv (DONOTINDEX) 1249 const_iv (DONOTINDEX)
1181 const_iv (KEYEMPTY ) 1250 const_iv (KEYEMPTY )
1182 const_iv (KEYEXIST ) 1251 const_iv (KEYEXIST )
1183 const_iv (LOCK_DEADLOCK) 1252 const_iv (LOCK_DEADLOCK)
1184 const_iv (LOCK_NOTGRANTED) 1253 const_iv (LOCK_NOTGRANTED)
1185 const_iv (LOG_BUFFER_FULL)
1186 const_iv (NOSERVER) 1254 const_iv (NOSERVER)
1187 const_iv (NOSERVER_HOME) 1255 const_iv (NOSERVER_HOME)
1188 const_iv (NOSERVER_ID) 1256 const_iv (NOSERVER_ID)
1189 const_iv (NOTFOUND) 1257 const_iv (NOTFOUND)
1190 const_iv (PAGE_NOTFOUND) 1258 const_iv (PAGE_NOTFOUND)
1191 const_iv (REP_DUPMASTER) 1259 const_iv (REP_DUPMASTER)
1192 const_iv (REP_HANDLE_DEAD) 1260 const_iv (REP_HANDLE_DEAD)
1193 const_iv (REP_HOLDELECTION) 1261 const_iv (REP_HOLDELECTION)
1194 const_iv (REP_IGNORE)
1195 const_iv (REP_ISPERM) 1262 const_iv (REP_ISPERM)
1196 const_iv (REP_JOIN_FAILURE)
1197 const_iv (REP_LOCKOUT)
1198 const_iv (REP_NEWMASTER) 1263 const_iv (REP_NEWMASTER)
1199 const_iv (REP_NEWSITE) 1264 const_iv (REP_NEWSITE)
1200 const_iv (REP_NOTPERM) 1265 const_iv (REP_NOTPERM)
1201 const_iv (REP_UNAVAIL) 1266 const_iv (REP_UNAVAIL)
1202 const_iv (RUNRECOVERY) 1267 const_iv (RUNRECOVERY)
1203 const_iv (SECONDARY_BAD) 1268 const_iv (SECONDARY_BAD)
1204 const_iv (VERIFY_BAD) 1269 const_iv (VERIFY_BAD)
1205 const_iv (VERSION_MISMATCH)
1206 1270
1207 const_iv (VERB_DEADLOCK) 1271 const_iv (VERB_DEADLOCK)
1208 const_iv (VERB_RECOVERY) 1272 const_iv (VERB_RECOVERY)
1209 const_iv (VERB_REGISTER)
1210 const_iv (VERB_REPLICATION) 1273 const_iv (VERB_REPLICATION)
1211 const_iv (VERB_WAITSFOR) 1274 const_iv (VERB_WAITSFOR)
1212 1275
1213 const_iv (VERSION_MAJOR) 1276 const_iv (VERSION_MAJOR)
1214 const_iv (VERSION_MINOR) 1277 const_iv (VERSION_MINOR)
1215 const_iv (VERSION_PATCH) 1278 const_iv (VERSION_PATCH)
1279#if DB_VERSION_MINOR >= 3
1280 const_iv (INORDER)
1281 const_iv (LOCK_MAXWRITE)
1282 const_iv (SEQ_DEC)
1283 const_iv (SEQ_INC)
1284 const_iv (SEQ_WRAP)
1285 const_iv (BUFFER_SMALL)
1286 const_iv (LOG_BUFFER_FULL)
1287 const_iv (VERSION_MISMATCH)
1288#endif
1289#if DB_VERSION_MINOR >= 4
1290 const_iv (REGISTER)
1291 const_iv (DSYNC_DB)
1292 const_iv (READ_COMMITTED)
1293 const_iv (READ_UNCOMMITTED)
1294 const_iv (REP_IGNORE)
1295 const_iv (REP_LOCKOUT)
1296 const_iv (REP_JOIN_FAILURE)
1297 const_iv (FREE_SPACE)
1298 const_iv (FREELIST_ONLY)
1299 const_iv (VERB_REGISTER)
1300#endif
1216#if DB_VERSION_MINOR >= 5 1301#if DB_VERSION_MINOR >= 5
1217 const_iv (MULTIVERSION) 1302 const_iv (MULTIVERSION)
1218 const_iv (TXN_SNAPSHOT) 1303 const_iv (TXN_SNAPSHOT)
1219#endif 1304#endif
1220#if DB_VERSION_MINOR >= 6 1305#if DB_VERSION_MINOR >= 6
… …
1224 const_iv (PRIORITY_LOW) 1309 const_iv (PRIORITY_LOW)
1225 const_iv (PRIORITY_DEFAULT) 1310 const_iv (PRIORITY_DEFAULT)
1226 const_iv (PRIORITY_HIGH) 1311 const_iv (PRIORITY_HIGH)
1227 const_iv (PRIORITY_VERY_HIGH) 1312 const_iv (PRIORITY_VERY_HIGH)
1228#endif 1313#endif
1314#if DB_VERSION_MINOR >= 7
1315 const_iv (LOG_DIRECT)
1316 const_iv (LOG_DSYNC)
1317 const_iv (LOG_AUTO_REMOVE)
1318 const_iv (LOG_IN_MEMORY)
1319 const_iv (LOG_ZERO)
1320#else
1321 const_iv (DIRECT_LOG)
1322 const_iv (LOG_AUTOREMOVE)
1323# if DB_VERSION_MINOR >= 3
1324 const_iv (DSYNC_LOG)
1325 const_iv (LOG_INMEMORY)
1326# endif
1327#endif
1229 }; 1328 };
1230 1329
1231 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1330 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1232 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1331 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1233 1332
1234 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1333 {
1334 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1335 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1336
1337 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1338 }
1339
1235 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1340 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1236 1341
1237 create_respipe (); 1342 create_respipe ();
1238 1343
1239 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1344 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1240#ifdef _WIN32
1241 X_MUTEX_CHECK (wrklock);
1242 X_MUTEX_CHECK (reslock);
1243 X_MUTEX_CHECK (reqlock);
1244
1245 X_COND_CHECK (reqwait);
1246#endif
1247 patch_errno (); 1345 patch_errno ();
1248} 1346}
1249 1347
1250void 1348void
1251max_poll_reqs (int nreqs) 1349max_poll_reqs (int nreqs)
… …
1415} 1513}
1416 OUTPUT: 1514 OUTPUT:
1417 RETVAL 1515 RETVAL
1418 1516
1419void 1517void
1420db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1518db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
1519 PREINIT:
1520 CALLBACK
1421 CODE: 1521 CODE:
1422{ 1522{
1423 dREQ (REQ_ENV_OPEN); 1523 dREQ (REQ_ENV_OPEN, 1);
1424
1425 req->env = env; 1524 req->env = env;
1426 req->uint1 = open_flags | DB_THREAD; 1525 req->uint1 = open_flags | DB_THREAD;
1427 req->int1 = mode; 1526 req->int1 = mode;
1428 req->buf1 = strdup_ornull (db_home); 1527 req->buf1 = strdup_ornull (db_home);
1429 REQ_SEND; 1528 REQ_SEND;
1430} 1529}
1431 1530
1432void 1531void
1433db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = &PL_sv_undef) 1532db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1533 PREINIT:
1534 CALLBACK
1434 CODE: 1535 CODE:
1435{ 1536{
1436 dREQ (REQ_ENV_CLOSE); 1537 dREQ (REQ_ENV_CLOSE, 1);
1437 req->env = env; 1538 req->env = env;
1438 req->uint1 = flags; 1539 req->uint1 = flags;
1439 REQ_SEND; 1540 REQ_SEND;
1440 ptr_nuke (ST (0)); 1541 ptr_nuke (ST (0));
1441} 1542}
1442 1543
1443void 1544void
1444db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = &PL_sv_undef) 1545db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1546 PREINIT:
1547 CALLBACK
1445 CODE: 1548 CODE:
1446{ 1549{
1447 dREQ (REQ_ENV_TXN_CHECKPOINT); 1550 dREQ (REQ_ENV_TXN_CHECKPOINT, 1);
1448 req->env = env; 1551 req->env = env;
1449 req->uint1 = kbyte; 1552 req->uint1 = kbyte;
1450 req->int1 = min; 1553 req->int1 = min;
1451 req->uint2 = flags; 1554 req->uint2 = flags;
1452 REQ_SEND; 1555 REQ_SEND;
1453} 1556}
1454 1557
1455void 1558void
1456db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = &PL_sv_undef) 1559db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0)
1560 PREINIT:
1561 CALLBACK
1457 CODE: 1562 CODE:
1458{ 1563{
1459 dREQ (REQ_ENV_LOCK_DETECT); 1564 dREQ (REQ_ENV_LOCK_DETECT, 1);
1460 req->env = env; 1565 req->env = env;
1461 req->uint1 = flags; 1566 req->uint1 = flags;
1462 req->uint2 = atype; 1567 req->uint2 = atype;
1568 /* req->int2 = 0; dummy */
1463 REQ_SEND; 1569 REQ_SEND;
1464} 1570}
1465 1571
1466void 1572void
1467db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = &PL_sv_undef) 1573db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0)
1574 PREINIT:
1575 CALLBACK
1468 CODE: 1576 CODE:
1469{ 1577{
1470 dREQ (REQ_ENV_MEMP_SYNC); 1578 dREQ (REQ_ENV_MEMP_SYNC, 1);
1471 req->env = env; 1579 req->env = env;
1472 REQ_SEND; 1580 REQ_SEND;
1473} 1581}
1474 1582
1475void 1583void
1476db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = &PL_sv_undef) 1584db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0)
1585 PREINIT:
1586 CALLBACK
1477 CODE: 1587 CODE:
1478{ 1588{
1479 dREQ (REQ_ENV_MEMP_TRICKLE); 1589 dREQ (REQ_ENV_MEMP_TRICKLE, 1);
1480 req->env = env; 1590 req->env = env;
1481 req->int1 = percent; 1591 req->int1 = percent;
1482 REQ_SEND; 1592 REQ_SEND;
1483} 1593}
1484 1594
1595void
1596db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0)
1597 PREINIT:
1598 CALLBACK
1599 CODE:
1600{
1601 dREQ (REQ_ENV_DBREMOVE, 2);
1602 req->env = env;
1603 req->buf1 = strdup_ornull (file);
1604 req->buf2 = strdup_ornull (database);
1605 req->uint1 = flags;
1606 REQ_SEND;
1607}
1608
1609void
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)
1611 PREINIT:
1612 CALLBACK
1613 CODE:
1614{
1615 dREQ (REQ_ENV_DBRENAME, 2);
1616 req->env = env;
1617 req->buf1 = strdup_ornull (file);
1618 req->buf2 = strdup_ornull (database);
1619 req->buf3 = strdup_ornull (newname);
1620 req->uint1 = flags;
1621 REQ_SEND;
1622}
1485 1623
1486DB * 1624DB *
1487db_create (DB_ENV *env = 0, U32 flags = 0) 1625db_create (DB_ENV *env = 0, U32 flags = 0)
1488 CODE: 1626 CODE:
1489{ 1627{
… …
1496} 1634}
1497 OUTPUT: 1635 OUTPUT:
1498 RETVAL 1636 RETVAL
1499 1637
1500void 1638void
1501db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1639db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
1640 PREINIT:
1641 CALLBACK
1502 CODE: 1642 CODE:
1503{ 1643{
1504 dREQ (REQ_DB_OPEN); 1644 dREQ (REQ_DB_OPEN, 2);
1505 req->db = db; 1645 req->db = db;
1506 req->txn = txnid; 1646 req->txn = txnid;
1507 req->buf1 = strdup_ornull (file); 1647 req->buf1 = strdup_ornull (file);
1508 req->buf2 = strdup_ornull (database); 1648 req->buf2 = strdup_ornull (database);
1509 req->int1 = type; 1649 req->int1 = type;
… …
1511 req->int2 = mode; 1651 req->int2 = mode;
1512 REQ_SEND; 1652 REQ_SEND;
1513} 1653}
1514 1654
1515void 1655void
1516db_close (DB *db, U32 flags = 0, SV *callback = &PL_sv_undef) 1656db_close (DB *db, U32 flags = 0, SV *callback = 0)
1657 PREINIT:
1658 CALLBACK
1517 CODE: 1659 CODE:
1518{ 1660{
1519 dREQ (REQ_DB_CLOSE); 1661 dREQ (REQ_DB_CLOSE, 1);
1520 req->db = db; 1662 req->db = db;
1521 req->uint1 = flags; 1663 req->uint1 = flags;
1522 req->sv1 = (SV *)db->app_private; 1664 req->sv1 = (SV *)db->app_private;
1523 REQ_SEND; 1665 REQ_SEND;
1524 ptr_nuke (ST (0)); 1666 ptr_nuke (ST (0));
1525} 1667}
1526 1668
1669#if DB_VERSION_MINOR >= 4
1670
1527void 1671void
1528db_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 = &PL_sv_undef) 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)
1673 PREINIT:
1674 CALLBACK
1529 CODE: 1675 CODE:
1530{ 1676{
1531 dREQ (REQ_DB_COMPACT); 1677 dREQ (REQ_DB_COMPACT, 2);
1532 req->db = db; 1678 req->db = db;
1533 req->txn = txn; 1679 req->txn = txn;
1534 sv_to_dbt (&req->dbt1, start); 1680 sv_to_dbt (&req->dbt1, start);
1535 sv_to_dbt (&req->dbt2, stop); 1681 sv_to_dbt (&req->dbt2, stop);
1536 req->uint1 = flags; 1682 req->uint1 = flags;
1537 REQ_SEND; 1683 REQ_SEND;
1538} 1684}
1539 1685
1686#endif
1687
1540void 1688void
1541db_sync (DB *db, U32 flags = 0, SV *callback = &PL_sv_undef) 1689db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1690 PREINIT:
1691 CALLBACK
1542 CODE: 1692 CODE:
1543{ 1693{
1544 dREQ (REQ_DB_SYNC); 1694 dREQ (REQ_DB_SYNC, 1);
1545 req->db = db; 1695 req->db = db;
1546 req->uint1 = flags; 1696 req->uint1 = flags;
1547 REQ_SEND; 1697 REQ_SEND;
1548} 1698}
1549 1699
1550void 1700void
1551db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef) 1701db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1702 PREINIT:
1703 CALLBACK
1552 CODE: 1704 CODE:
1553{ 1705{
1554 dREQ (REQ_DB_SYNC); 1706 dREQ (REQ_DB_SYNC, 1);
1555 req->db = db; 1707 req->db = db;
1556 req->buf1 = strdup (file); 1708 req->buf1 = strdup (file);
1557 req->uint1 = flags; 1709 req->uint1 = flags;
1558 REQ_SEND; 1710 REQ_SEND;
1559} 1711}
1560 1712
1561void 1713void
1562db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1714db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0)
1715 PREINIT:
1716 CALLBACK
1563 CODE: 1717 CODE:
1564{ 1718{
1565 dREQ (REQ_DB_KEY_RANGE); 1719 dREQ (REQ_DB_KEY_RANGE, 2);
1566 req->db = db; 1720 req->db = db;
1567 req->txn = txn; 1721 req->txn = txn;
1568 sv_to_dbt (&req->dbt1, key); 1722 sv_to_dbt (&req->dbt1, key);
1569 req->uint1 = flags; 1723 req->uint1 = flags;
1570 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1724 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
1571 REQ_SEND; 1725 REQ_SEND;
1572} 1726}
1573 1727
1574void 1728void
1575db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1729db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1730 PREINIT:
1731 CALLBACK
1576 CODE: 1732 CODE:
1577{ 1733{
1578 dREQ (REQ_DB_PUT); 1734 dREQ (REQ_DB_PUT, 2);
1579 req->db = db; 1735 req->db = db;
1580 req->txn = txn; 1736 req->txn = txn;
1581 sv_to_dbt (&req->dbt1, key); 1737 sv_to_dbt (&req->dbt1, key);
1582 sv_to_dbt (&req->dbt2, data); 1738 sv_to_dbt (&req->dbt2, data);
1583 req->uint1 = flags; 1739 req->uint1 = flags;
1584 REQ_SEND; 1740 REQ_SEND;
1585} 1741}
1586 1742
1743#if DB_VERSION_MINOR >= 6
1744
1587void 1745void
1746db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1747 PREINIT:
1748 CALLBACK
1749 CODE:
1750{
1751 dREQ (REQ_DB_EXISTS, 2);
1752 req->db = db;
1753 req->txn = txn;
1754 req->uint1 = flags;
1755 sv_to_dbt (&req->dbt1, key);
1756 REQ_SEND;
1757}
1758
1759#endif
1760
1761void
1588db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1762db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1763 PREINIT:
1764 CALLBACK
1589 CODE: 1765 CODE:
1590 if (SvREADONLY (data)) 1766 if (SvREADONLY (data))
1591 croak ("can't modify read-only data scalar in db_get"); 1767 croak ("can't modify read-only data scalar in db_get");
1592{ 1768{
1593 dREQ (REQ_DB_GET); 1769 dREQ (REQ_DB_GET, 2);
1594 req->db = db; 1770 req->db = db;
1595 req->txn = txn; 1771 req->txn = txn;
1596 req->uint1 = flags; 1772 req->uint1 = flags;
1597 sv_to_dbt (&req->dbt1, key); 1773 sv_to_dbt (&req->dbt1, key);
1598 req->dbt3.flags = DB_DBT_MALLOC; 1774 req->dbt3.flags = DB_DBT_MALLOC;
1599 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1775 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1600 REQ_SEND; 1776 REQ_SEND;
1601} 1777}
1602 1778
1603void 1779void
1604db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1780db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
1781 PREINIT:
1782 CALLBACK
1605 CODE: 1783 CODE:
1606 if (SvREADONLY (data)) 1784 if (SvREADONLY (data))
1607 croak ("can't modify read-only data scalar in db_pget"); 1785 croak ("can't modify read-only data scalar in db_pget");
1608{ 1786{
1609 dREQ (REQ_DB_PGET); 1787 dREQ (REQ_DB_PGET, 2);
1610 req->db = db; 1788 req->db = db;
1611 req->txn = txn; 1789 req->txn = txn;
1612 req->uint1 = flags; 1790 req->uint1 = flags;
1613 sv_to_dbt (&req->dbt1, key); 1791 sv_to_dbt (&req->dbt1, key);
1614 sv_to_dbt (&req->dbt2, pkey); 1792 sv_to_dbt (&req->dbt2, pkey);
… …
1616 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1794 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1617 REQ_SEND; 1795 REQ_SEND;
1618} 1796}
1619 1797
1620void 1798void
1621db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = &PL_sv_undef) 1799db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1800 PREINIT:
1801 CALLBACK
1622 CODE: 1802 CODE:
1623{ 1803{
1624 dREQ (REQ_DB_DEL); 1804 dREQ (REQ_DB_DEL, 2);
1625 req->db = db; 1805 req->db = db;
1626 req->txn = txn; 1806 req->txn = txn;
1627 req->uint1 = flags; 1807 req->uint1 = flags;
1628 sv_to_dbt (&req->dbt1, key); 1808 sv_to_dbt (&req->dbt1, key);
1629 REQ_SEND; 1809 REQ_SEND;
1630} 1810}
1631 1811
1632void 1812void
1633db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef) 1813db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1814 PREINIT:
1815 CALLBACK
1634 CODE: 1816 CODE:
1635{ 1817{
1636 dREQ (REQ_TXN_COMMIT); 1818 dREQ (REQ_TXN_COMMIT, 1);
1637 req->txn = txn; 1819 req->txn = txn;
1638 req->uint1 = flags; 1820 req->uint1 = flags;
1639 REQ_SEND; 1821 REQ_SEND;
1640 ptr_nuke (ST (0)); 1822 ptr_nuke (ST (0));
1641} 1823}
1642 1824
1643void 1825void
1644db_txn_abort (DB_TXN *txn, SV *callback = &PL_sv_undef) 1826db_txn_abort (DB_TXN *txn, SV *callback = 0)
1827 PREINIT:
1828 CALLBACK
1645 CODE: 1829 CODE:
1646{ 1830{
1647 dREQ (REQ_TXN_ABORT); 1831 dREQ (REQ_TXN_ABORT, 1);
1648 req->txn = txn; 1832 req->txn = txn;
1649 REQ_SEND; 1833 REQ_SEND;
1650 ptr_nuke (ST (0)); 1834 ptr_nuke (ST (0));
1651} 1835}
1652 1836
1653void 1837void
1654db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef) 1838db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1839 PREINIT:
1840 CALLBACK
1655 CODE: 1841 CODE:
1656{ 1842{
1657 dREQ (REQ_TXN_FINISH); 1843 dREQ (REQ_TXN_FINISH, 1);
1658 req->txn = txn; 1844 req->txn = txn;
1659 req->uint1 = flags; 1845 req->uint1 = flags;
1660 REQ_SEND; 1846 REQ_SEND;
1661 ptr_nuke (ST (0)); 1847 ptr_nuke (ST (0));
1662} 1848}
1663 1849
1664void 1850void
1665db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1851db_c_close (DBC *dbc, SV *callback = 0)
1852 PREINIT:
1853 CALLBACK
1666 CODE: 1854 CODE:
1667{ 1855{
1668 dREQ (REQ_C_CLOSE); 1856 dREQ (REQ_C_CLOSE, 1);
1669 req->dbc = dbc; 1857 req->dbc = dbc;
1670 REQ_SEND; 1858 REQ_SEND;
1671 ptr_nuke (ST (0)); 1859 ptr_nuke (ST (0));
1672} 1860}
1673 1861
1674void 1862void
1675db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = &PL_sv_undef) 1863db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1864 PREINIT:
1865 CALLBACK
1676 CODE: 1866 CODE:
1677{ 1867{
1678 dREQ (REQ_C_COUNT); 1868 dREQ (REQ_C_COUNT, 1);
1679 req->dbc = dbc; 1869 req->dbc = dbc;
1680 req->sv1 = SvREFCNT_inc (count); 1870 req->sv1 = SvREFCNT_inc (count);
1681 REQ_SEND; 1871 REQ_SEND;
1682} 1872}
1683 1873
1684void 1874void
1685db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1875db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1876 PREINIT:
1877 CALLBACK
1686 CODE: 1878 CODE:
1687{ 1879{
1688 dREQ (REQ_C_PUT); 1880 dREQ (REQ_C_PUT, 1);
1689 req->dbc = dbc; 1881 req->dbc = dbc;
1690 sv_to_dbt (&req->dbt1, key); 1882 sv_to_dbt (&req->dbt1, key);
1691 sv_to_dbt (&req->dbt2, data); 1883 sv_to_dbt (&req->dbt2, data);
1692 req->uint1 = flags; 1884 req->uint1 = flags;
1693 REQ_SEND; 1885 REQ_SEND;
1694} 1886}
1695 1887
1696void 1888void
1697db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1889db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1890 PREINIT:
1891 CALLBACK
1698 CODE: 1892 CODE:
1699{ 1893{
1700 dREQ (REQ_C_GET); 1894 dREQ (REQ_C_GET, 1);
1701 req->dbc = dbc; 1895 req->dbc = dbc;
1702 req->uint1 = flags; 1896 req->uint1 = flags;
1703 if ((flags & DB_SET) == DB_SET 1897 if ((flags & DB_SET) == DB_SET
1704 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1898 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1705 sv_to_dbt (&req->dbt1, key); 1899 sv_to_dbt (&req->dbt1, key);
… …
1717 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1911 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1718 REQ_SEND; 1912 REQ_SEND;
1719} 1913}
1720 1914
1721void 1915void
1722db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1916db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
1917 PREINIT:
1918 CALLBACK
1723 CODE: 1919 CODE:
1724{ 1920{
1725 dREQ (REQ_C_PGET); 1921 dREQ (REQ_C_PGET, 1);
1726 req->dbc = dbc; 1922 req->dbc = dbc;
1727 req->uint1 = flags; 1923 req->uint1 = flags;
1728 if ((flags & DB_SET) == DB_SET 1924 if ((flags & DB_SET) == DB_SET
1729 || (flags & DB_SET_RANGE) == DB_SET_RANGE) 1925 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1730 sv_to_dbt (&req->dbt1, key); 1926 sv_to_dbt (&req->dbt1, key);
… …
1745 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1746 REQ_SEND; 1942 REQ_SEND;
1747} 1943}
1748 1944
1749void 1945void
1750db_c_del (DBC *dbc, U32 flags = 0, SV *callback = &PL_sv_undef) 1946db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1947 PREINIT:
1948 CALLBACK
1751 CODE: 1949 CODE:
1752{ 1950{
1753 dREQ (REQ_C_DEL); 1951 dREQ (REQ_C_DEL, 1);
1754 req->dbc = dbc; 1952 req->dbc = dbc;
1755 req->uint1 = flags; 1953 req->uint1 = flags;
1756 REQ_SEND; 1954 REQ_SEND;
1757} 1955}
1758 1956
1759 1957
1958#if DB_VERSION_MINOR >= 3
1959
1760void 1960void
1761db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = &PL_sv_undef) 1961db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0)
1962 PREINIT:
1963 CALLBACK
1762 CODE: 1964 CODE:
1763{ 1965{
1764 dREQ (REQ_SEQ_OPEN); 1966 dREQ (REQ_SEQ_OPEN, 2);
1765 req->seq = seq; 1967 req->seq = seq;
1766 req->txn = txnid; 1968 req->txn = txnid;
1767 req->uint1 = flags | DB_THREAD; 1969 req->uint1 = flags | DB_THREAD;
1768 sv_to_dbt (&req->dbt1, key); 1970 sv_to_dbt (&req->dbt1, key);
1769 REQ_SEND; 1971 REQ_SEND;
1770} 1972}
1771 1973
1772void 1974void
1773db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = &PL_sv_undef) 1975db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1976 PREINIT:
1977 CALLBACK
1774 CODE: 1978 CODE:
1775{ 1979{
1776 dREQ (REQ_SEQ_CLOSE); 1980 dREQ (REQ_SEQ_CLOSE, 1);
1777 req->seq = seq; 1981 req->seq = seq;
1778 req->uint1 = flags; 1982 req->uint1 = flags;
1779 REQ_SEND; 1983 REQ_SEND;
1780 ptr_nuke (ST (0)); 1984 ptr_nuke (ST (0));
1781} 1985}
1782 1986
1783void 1987void
1784db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = &PL_sv_undef) 1988db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1989 PREINIT:
1990 CALLBACK
1785 CODE: 1991 CODE:
1786{ 1992{
1787 dREQ (REQ_SEQ_GET); 1993 dREQ (REQ_SEQ_GET, 2);
1788 req->seq = seq; 1994 req->seq = seq;
1789 req->txn = txnid; 1995 req->txn = txnid;
1790 req->int1 = delta; 1996 req->int1 = delta;
1791 req->uint1 = flags; 1997 req->uint1 = flags;
1792 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1998 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
1793 REQ_SEND; 1999 REQ_SEND;
1794} 2000}
1795 2001
1796void 2002void
1797db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = &PL_sv_undef) 2003db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
2004 PREINIT:
2005 CALLBACK
1798 CODE: 2006 CODE:
1799{ 2007{
1800 dREQ (REQ_SEQ_REMOVE); 2008 dREQ (REQ_SEQ_REMOVE, 2);
1801 req->seq = seq; 2009 req->seq = seq;
1802 req->txn = txnid; 2010 req->txn = txnid;
1803 req->uint1 = flags; 2011 req->uint1 = flags;
1804 REQ_SEND; 2012 REQ_SEND;
1805} 2013}
1806 2014
2015#endif
2016
1807 2017
1808MODULE = BDB PACKAGE = BDB::Env 2018MODULE = BDB PACKAGE = BDB::Env
1809 2019
1810void 2020void
1811DESTROY (DB_ENV_ornuked *env) 2021DESTROY (DB_ENV_ornuked *env)
… …
1847 CODE: 2057 CODE:
1848 RETVAL = env->set_flags (env, flags, onoff); 2058 RETVAL = env->set_flags (env, flags, onoff);
1849 OUTPUT: 2059 OUTPUT:
1850 RETVAL 2060 RETVAL
1851 2061
2062#if DB_VERSION_MINOR >= 7
2063
2064int set_intermediate_dir_mode (DB_ENV *env, const char *mode)
2065 CODE:
2066 RETVAL = env->set_intermediate_dir_mode (env, mode);
2067 OUTPUT:
2068 RETVAL
2069
2070int log_set_config (DB_ENV *env, U32 flags, int onoff = 1)
2071 CODE:
2072 RETVAL = env->log_set_config (env, flags, onoff);
2073 OUTPUT:
2074 RETVAL
2075
2076#endif
2077
2078
1852void set_errfile (DB_ENV *env, FILE *errfile = 0) 2079void set_errfile (DB_ENV *env, FILE *errfile = 0)
1853 CODE: 2080 CODE:
1854 env->set_errfile (env, errfile); 2081 env->set_errfile (env, errfile);
1855 2082
1856void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 2083void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
… …
1926int set_lg_max (DB_ENV *env, U32 max) 2153int set_lg_max (DB_ENV *env, U32 max)
1927 CODE: 2154 CODE:
1928 RETVAL = env->set_lg_max (env, max); 2155 RETVAL = env->set_lg_max (env, max);
1929 OUTPUT: 2156 OUTPUT:
1930 RETVAL 2157 RETVAL
2158
2159#if DB_VERSION_MINOR >= 4
1931 2160
1932int mutex_set_max (DB_ENV *env, U32 max) 2161int mutex_set_max (DB_ENV *env, U32 max)
1933 CODE: 2162 CODE:
1934 RETVAL = env->mutex_set_max (env, max); 2163 RETVAL = env->mutex_set_max (env, max);
1935 OUTPUT: 2164 OUTPUT:
… …
1951 CODE: 2180 CODE:
1952 RETVAL = env->mutex_set_align (env, align); 2181 RETVAL = env->mutex_set_align (env, align);
1953 OUTPUT: 2182 OUTPUT:
1954 RETVAL 2183 RETVAL
1955 2184
2185#endif
2186
1956DB_TXN * 2187DB_TXN *
1957txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 2188txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1958 CODE: 2189 CODE:
1959 errno = env->txn_begin (env, parent, &RETVAL, flags); 2190 errno = env->txn_begin (env, parent, &RETVAL, flags);
1960 if (errno) 2191 if (errno)
1961 croak ("DB_ENV->txn_begin: %s", db_strerror (errno)); 2192 croak ("DB_ENV->txn_begin: %s", db_strerror (errno));
1962 OUTPUT: 2193 OUTPUT:
1963 RETVAL 2194 RETVAL
2195
2196#if DB_VERSION_MINOR >= 5
2197
2198DB_TXN *
2199cdsgroup_begin (DB_ENV *env)
2200 CODE:
2201 errno = env->cdsgroup_begin (env, &RETVAL);
2202 if (errno)
2203 croak ("DB_ENV->cdsgroup_begin: %s", db_strerror (errno));
2204 OUTPUT:
2205 RETVAL
2206
2207#endif
1964 2208
1965MODULE = BDB PACKAGE = BDB::Db 2209MODULE = BDB PACKAGE = BDB::Db
1966 2210
1967void 2211void
1968DESTROY (DB_ornuked *db) 2212DESTROY (DB_ornuked *db)
… …
2053 if (errno) 2297 if (errno)
2054 croak ("DB->cursor: %s", db_strerror (errno)); 2298 croak ("DB->cursor: %s", db_strerror (errno));
2055 OUTPUT: 2299 OUTPUT:
2056 RETVAL 2300 RETVAL
2057 2301
2302#if DB_VERSION_MINOR >= 3
2303
2058DB_SEQUENCE * 2304DB_SEQUENCE *
2059sequence (DB *db, U32 flags = 0) 2305sequence (DB *db, U32 flags = 0)
2060 CODE: 2306 CODE:
2061{ 2307{
2062 errno = db_sequence_create (&RETVAL, db, flags); 2308 errno = db_sequence_create (&RETVAL, db, flags);
… …
2064 croak ("db_sequence_create: %s", db_strerror (errno)); 2310 croak ("db_sequence_create: %s", db_strerror (errno));
2065} 2311}
2066 OUTPUT: 2312 OUTPUT:
2067 RETVAL 2313 RETVAL
2068 2314
2315#endif
2316
2069 2317
2070MODULE = BDB PACKAGE = BDB::Txn 2318MODULE = BDB PACKAGE = BDB::Txn
2071 2319
2072void 2320void
2073DESTROY (DB_TXN_ornuked *txn) 2321DESTROY (DB_TXN_ornuked *txn)
… …
2102 CODE: 2350 CODE:
2103 dbc->set_priority (dbc, priority); 2351 dbc->set_priority (dbc, priority);
2104 2352
2105#endif 2353#endif
2106 2354
2355#if DB_VERSION_MINOR >= 3
2356
2107MODULE = BDB PACKAGE = BDB::Sequence 2357MODULE = BDB PACKAGE = BDB::Sequence
2108 2358
2109void 2359void
2110DESTROY (DB_SEQUENCE_ornuked *seq) 2360DESTROY (DB_SEQUENCE_ornuked *seq)
2111 CODE: 2361 CODE:
… …
2134 CODE: 2384 CODE:
2135 RETVAL = seq->set_range (seq, min, max); 2385 RETVAL = seq->set_range (seq, min, max);
2136 OUTPUT: 2386 OUTPUT:
2137 RETVAL 2387 RETVAL
2138 2388
2389#endif
2139 2390
2391

Diff Legend

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