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.63 by root, Tue Oct 21 02:21:25 2008 UTC

1#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4
2
1#include "xthread.h" 3#include "xthread.h"
2 4
3#include <errno.h> 5#include <errno.h>
4 6
5#include "EXTERN.h" 7#include "EXTERN.h"
… …
34#endif 36#endif
35 37
36/* number of seconds after which idle threads exit */ 38/* number of seconds after which idle threads exit */
37#define IDLE_TIMEOUT 10 39#define IDLE_TIMEOUT 10
38 40
41typedef SV SV_mutable;
42
39typedef DB_ENV DB_ENV_ornull; 43typedef DB_ENV DB_ENV_ornull;
40typedef DB_TXN DB_TXN_ornull; 44typedef DB_TXN DB_TXN_ornull;
41typedef DBC DBC_ornull; 45typedef DBC DBC_ornull;
42typedef DB DB_ornull; 46typedef DB DB_ornull;
43 47
… …
49#if DB_VERSION_MINOR >= 3 53#if DB_VERSION_MINOR >= 3
50typedef DB_SEQUENCE DB_SEQUENCE_ornull; 54typedef DB_SEQUENCE DB_SEQUENCE_ornull;
51typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 55typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
52#endif 56#endif
53 57
54typedef SV SV8; /* byte-sv, used for argument-checking */
55typedef char *bdb_filename; 58typedef char *bdb_filename;
56 59
57static SV *prepare_cb; 60static SV *prepare_cb;
58 61
59#if DB_VERSION_MINOR >= 6 62#if DB_VERSION_MINOR >= 6
… …
130dbt_to_sv (SV *sv, DBT *dbt) 133dbt_to_sv (SV *sv, DBT *dbt)
131{ 134{
132 if (sv) 135 if (sv)
133 { 136 {
134 SvREADONLY_off (sv); 137 SvREADONLY_off (sv);
138
139 if (dbt->data)
135 sv_setpvn_mg (sv, dbt->data, dbt->size); 140 sv_setpvn_mg (sv, dbt->data, dbt->size);
141 else
142 sv_setsv_mg (sv, &PL_sv_undef);
143
136 SvREFCNT_dec (sv); 144 SvREFCNT_dec (sv);
137 } 145 }
138 146
139 free (dbt->data); 147 free (dbt->data);
140} 148}
141 149
142enum { 150enum {
143 REQ_QUIT, 151 REQ_QUIT,
144 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
145 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE,
146 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
147 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
148 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
149 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
150 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
… …
171 DB_KEY_RANGE key_range; 180 DB_KEY_RANGE key_range;
172#if DB_VERSION_MINOR >= 3 181#if DB_VERSION_MINOR >= 3
173 DB_SEQUENCE *seq; 182 DB_SEQUENCE *seq;
174 db_seq_t seq_t; 183 db_seq_t seq_t;
175#endif 184#endif
185
186 SV *rsv1, *rsv2; // keep some request objects alive
176} bdb_cb; 187} bdb_cb;
177 188
178typedef bdb_cb *bdb_req; 189typedef bdb_cb *bdb_req;
179 190
180enum { 191enum {
… …
339 abort (); 350 abort ();
340} 351}
341 352
342static int poll_cb (void); 353static int poll_cb (void);
343static void req_free (bdb_req req); 354static void req_free (bdb_req req);
344static void req_cancel (bdb_req req);
345 355
346static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
347{ 357{
348 dSP; 358 switch (req->type)
359 {
360 case REQ_DB_CLOSE:
361 SvREFCNT_dec (req->sv1);
362 break;
363
364 case REQ_DB_GET:
365 case REQ_DB_PGET:
366 case REQ_C_GET:
367 case REQ_C_PGET:
368 case REQ_DB_PUT:
369 case REQ_C_PUT:
370 dbt_to_sv (req->sv1, &req->dbt1);
371 dbt_to_sv (req->sv2, &req->dbt2);
372 dbt_to_sv (req->sv3, &req->dbt3);
373 break;
374
375 case REQ_DB_KEY_RANGE:
376 {
377 AV *av = newAV ();
378
379 av_push (av, newSVnv (req->key_range.less));
380 av_push (av, newSVnv (req->key_range.equal));
381 av_push (av, newSVnv (req->key_range.greater));
382
383 av = (AV *)newRV_noinc ((SV *)av);
384
385 SvREADONLY_off (req->sv1);
386 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
387 SvREFCNT_dec (av);
388 SvREFCNT_dec (req->sv1);
389 }
390 break;
391
392#if DB_VERSION_MINOR >= 3
393 case REQ_SEQ_GET:
394 SvREADONLY_off (req->sv1);
395
396 if (sizeof (IV) > 4)
397 sv_setiv_mg (req->sv1, (IV)req->seq_t);
398 else
399 sv_setnv_mg (req->sv1, (NV)req->seq_t);
400
401 SvREFCNT_dec (req->sv1);
402 break;
403#endif
404
405 case REQ_ENV_LOG_ARCHIVE:
406 {
407 AV *av = newAV ();
408 char **listp = (char **)req->buf1;
409
410 if (listp)
411 while (*listp)
412 av_push (av, newSVpv (*listp, 0)), ++listp;
413
414 av = (AV *)newRV_noinc ((SV *)av);
415
416 SvREADONLY_off (req->sv1);
417 sv_setsv_mg (req->sv1, (SV *)av);
418 SvREFCNT_dec (av);
419 SvREFCNT_dec (req->sv1);
420 }
421 break;
422 }
423
424 errno = req->result;
349 425
350 if (req->callback) 426 if (req->callback)
351 { 427 {
428 dSP;
429
352 ENTER; 430 ENTER;
353 SAVETMPS; 431 SAVETMPS;
354 PUSHMARK (SP); 432 PUSHMARK (SP);
355 433
356 switch (req->type)
357 {
358 case REQ_DB_CLOSE:
359 SvREFCNT_dec (req->sv1);
360 break;
361
362 case REQ_DB_GET:
363 case REQ_DB_PGET:
364 dbt_to_sv (req->sv3, &req->dbt3);
365 break;
366
367 case REQ_C_GET:
368 case REQ_C_PGET:
369 dbt_to_sv (req->sv1, &req->dbt1);
370 dbt_to_sv (req->sv2, &req->dbt2);
371 dbt_to_sv (req->sv3, &req->dbt3);
372 break;
373
374 case REQ_DB_PUT:
375 case REQ_C_PUT:
376 dbt_to_sv (0, &req->dbt1);
377 dbt_to_sv (0, &req->dbt2);
378 break;
379
380 case REQ_DB_KEY_RANGE:
381 {
382 AV *av = newAV ();
383
384 av_push (av, newSVnv (req->key_range.less));
385 av_push (av, newSVnv (req->key_range.equal));
386 av_push (av, newSVnv (req->key_range.greater));
387
388 SvREADONLY_off (req->sv1);
389 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
390 SvREFCNT_dec (req->sv1);
391 }
392 break;
393
394#if DB_VERSION_MINOR >= 3
395 case REQ_SEQ_GET:
396 SvREADONLY_off (req->sv1);
397
398 if (sizeof (IV) > 4)
399 sv_setiv_mg (req->sv1, (IV)req->seq_t);
400 else
401 sv_setnv_mg (req->sv1, (NV)req->seq_t);
402
403 SvREFCNT_dec (req->sv1);
404 break;
405#endif
406 }
407
408 errno = req->result;
409
410 PUTBACK; 434 PUTBACK;
411 call_sv (req->callback, G_VOID | G_EVAL); 435 call_sv (req->callback, G_VOID | G_EVAL);
412 SPAGAIN; 436 SPAGAIN;
413 437
414 FREETMPS; 438 FREETMPS;
415 LEAVE; 439 LEAVE;
440
441 return !SvTRUE (ERRSV);
416 } 442 }
417 443
418 return !SvTRUE (ERRSV); 444 return 1;
419} 445}
420 446
421static void req_free (bdb_req req) 447static void req_free (bdb_req req)
422{ 448{
423 SvREFCNT_dec (req->callback); 449 SvREFCNT_dec (req->callback);
450
451 SvREFCNT_dec (req->rsv1);
452 SvREFCNT_dec (req->rsv2);
424 453
425 free (req->buf1); 454 free (req->buf1);
426 free (req->buf2); 455 free (req->buf2);
427 free (req->buf3); 456 free (req->buf3);
428 457
… …
474 503
475 respipe_osf [0] = TO_SOCKET (respipe [0]); 504 respipe_osf [0] = TO_SOCKET (respipe [0]);
476 respipe_osf [1] = TO_SOCKET (respipe [1]); 505 respipe_osf [1] = TO_SOCKET (respipe [1]);
477} 506}
478 507
508static void bdb_request (bdb_req req);
479X_THREAD_PROC (bdb_proc); 509X_THREAD_PROC (bdb_proc);
480 510
481static void start_thread (void) 511static void start_thread (void)
482{ 512{
483 worker *wrk = calloc (1, sizeof (worker)); 513 worker *wrk = calloc (1, sizeof (worker));
… …
524 on_next_submit = 0; 554 on_next_submit = 0;
525 555
526 PUSHMARK (SP); 556 PUSHMARK (SP);
527 PUTBACK; 557 PUTBACK;
528 call_sv (cb, G_DISCARD | G_EVAL); 558 call_sv (cb, G_DISCARD | G_EVAL);
559 SPAGAIN;
529 } 560 }
530 561
531 // synthesize callback if none given 562 // synthesize callback if none given
532 if (!req->callback) 563 if (!req->callback)
533 { 564 {
565 if (SvOK (prepare_cb))
566 {
534 int count; 567 int count;
535 568
536 dSP; 569 dSP;
537 PUSHMARK (SP); 570 PUSHMARK (SP);
538 PUTBACK; 571 PUTBACK;
539 count = call_sv (prepare_cb, G_ARRAY); 572 count = call_sv (prepare_cb, G_ARRAY);
540 SPAGAIN; 573 SPAGAIN;
541 574
542 if (count != 2) 575 if (count != 2)
543 croak ("prepare callback must return exactly two values\n"); 576 croak ("sync prepare callback must return exactly two values\n");
544 577
545 wait_callback = POPs; 578 wait_callback = POPs;
546 SvREFCNT_dec (req->callback);
547 req->callback = SvREFCNT_inc (POPs); 579 req->callback = SvREFCNT_inc (POPs);
580 }
581 else
582 {
583 // execute request synchronously
584 bdb_request (req);
585 req_invoke (req);
586 req_free (req);
587 return;
588 }
548 } 589 }
549 590
550 ++nreqs; 591 ++nreqs;
551 592
552 X_LOCK (reqlock); 593 X_LOCK (reqlock);
… …
566 } 607 }
567} 608}
568 609
569static void end_thread (void) 610static void end_thread (void)
570{ 611{
571 bdb_req req; 612 bdb_req req = calloc (1, sizeof (bdb_cb));
572
573 Newz (0, req, 1, bdb_cb);
574 613
575 req->type = REQ_QUIT; 614 req->type = REQ_QUIT;
576 req->pri = PRI_MAX + PRI_BIAS; 615 req->pri = PRI_MAX + PRI_BIAS;
577 616
578 X_LOCK (reqlock); 617 X_LOCK (reqlock);
… …
703 742
704 return count; 743 return count;
705} 744}
706 745
707/*****************************************************************************/ 746/*****************************************************************************/
747
748static void
749bdb_request (bdb_req req)
750{
751 switch (req->type)
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_ENV_DBREMOVE:
778 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
779 break;
780
781 case REQ_ENV_DBRENAME:
782 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
783 break;
784
785 case REQ_DB_OPEN:
786 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
787 break;
788
789 case REQ_DB_CLOSE:
790 req->result = req->db->close (req->db, req->uint1);
791 break;
792
793#if DB_VERSION_MINOR >= 4
794 case REQ_DB_COMPACT:
795 req->result = req->db->compact (req->db, req->txn, req->dbt1.data ? &req->dbt1 : 0, req->dbt2.data ? &req->dbt2 : 0, 0, req->uint1, 0);
796 break;
797#endif
798
799 case REQ_DB_SYNC:
800 req->result = req->db->sync (req->db, req->uint1);
801 break;
802
803 case REQ_DB_UPGRADE:
804 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
805 break;
806
807 case REQ_DB_PUT:
808 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
809 break;
810
811#if DB_VERSION_MINOR >= 6
812 case REQ_DB_EXISTS:
813 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
814 break;
815#endif
816 case REQ_DB_GET:
817 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
818 break;
819
820 case REQ_DB_PGET:
821 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
822 break;
823
824 case REQ_DB_DEL:
825 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
826 break;
827
828 case REQ_DB_KEY_RANGE:
829 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
830 break;
831
832 case REQ_TXN_COMMIT:
833 req->result = req->txn->commit (req->txn, req->uint1);
834 break;
835
836 case REQ_TXN_ABORT:
837 req->result = req->txn->abort (req->txn);
838 break;
839
840 case REQ_TXN_FINISH:
841 if (req->txn->flags & TXN_DEADLOCK)
842 {
843 req->result = req->txn->abort (req->txn);
844 if (!req->result)
845 req->result = DB_LOCK_DEADLOCK;
846 }
847 else
848 req->result = req->txn->commit (req->txn, req->uint1);
849 break;
850
851 case REQ_C_CLOSE:
852 req->result = req->dbc->c_close (req->dbc);
853 break;
854
855 case REQ_C_COUNT:
856 {
857 db_recno_t recno;
858 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
859 req->uv1 = recno;
860 }
861 break;
862
863 case REQ_C_PUT:
864 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
865 break;
866
867 case REQ_C_GET:
868 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
869 break;
870
871 case REQ_C_PGET:
872 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
873 break;
874
875 case REQ_C_DEL:
876 req->result = req->dbc->c_del (req->dbc, req->uint1);
877 break;
878
879#if DB_VERSION_MINOR >= 3
880 case REQ_SEQ_OPEN:
881 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
882 break;
883
884 case REQ_SEQ_CLOSE:
885 req->result = req->seq->close (req->seq, req->uint1);
886 break;
887
888 case REQ_SEQ_GET:
889 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
890 break;
891
892 case REQ_SEQ_REMOVE:
893 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
894 break;
895#endif
896
897 case REQ_ENV_LOG_ARCHIVE:
898 {
899 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
900 req->result = req->env->log_archive (req->env, &listp, req->uint1);
901 req->buf1 = (char *)listp;
902 }
903 break;
904
905 default:
906 req->result = ENOSYS;
907 break;
908 }
909
910 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
911 req->txn->flags |= TXN_DEADLOCK;
912}
708 913
709X_THREAD_PROC (bdb_proc) 914X_THREAD_PROC (bdb_proc)
710{ 915{
711 bdb_req req; 916 bdb_req req;
712 struct timespec ts; 917 struct timespec ts;
… …
752 } 957 }
753 958
754 --nready; 959 --nready;
755 960
756 X_UNLOCK (reqlock); 961 X_UNLOCK (reqlock);
757 962
758 switch (req->type) 963 if (req->type == REQ_QUIT)
759 { 964 {
760 case REQ_QUIT: 965 X_LOCK (reslock);
761 req->result = ENOSYS; 966 free (req);
967 self->req = 0;
968 X_UNLOCK (reslock);
969
762 goto quit; 970 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 } 971 }
912 972
913 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) 973 bdb_request (req);
914 req->txn->flags |= TXN_DEADLOCK;
915 974
916 X_LOCK (reslock); 975 X_LOCK (reslock);
917 976
918 ++npending; 977 ++npending;
919 978
… …
981 create_respipe (); 1040 create_respipe ();
982 1041
983 atfork_parent (); 1042 atfork_parent ();
984} 1043}
985 1044
986#define dREQ(reqtype) \ 1045#define dREQ(reqtype,rsvcnt) \
987 bdb_req req; \ 1046 bdb_req req; \
988 int req_pri = next_pri; \ 1047 int req_pri = next_pri; \
989 next_pri = DEFAULT_PRI + PRI_BIAS; \ 1048 next_pri = DEFAULT_PRI + PRI_BIAS; \
990 \ 1049 \
991 if (callback && SvOK (callback)) \ 1050 if (callback && SvOK (callback)) \
… …
993 \ 1052 \
994 Newz (0, req, 1, bdb_cb); \ 1053 Newz (0, req, 1, bdb_cb); \
995 if (!req) \ 1054 if (!req) \
996 croak ("out of memory during bdb_req allocation"); \ 1055 croak ("out of memory during bdb_req allocation"); \
997 \ 1056 \
998 req->callback = cb ? SvREFCNT_inc (cb) : 0; \ 1057 req->callback = SvREFCNT_inc (cb); \
999 req->type = (reqtype); \ 1058 req->type = (reqtype); \
1000 req->pri = req_pri 1059 req->pri = req_pri; \
1060 if (rsvcnt >= 1) req->rsv1 = SvREFCNT_inc (ST (0)); \
1061 if (rsvcnt >= 2) req->rsv2 = SvREFCNT_inc (ST (1)); \
1062 (void)0;
1001 1063
1002#define REQ_SEND \ 1064#define REQ_SEND \
1003 req_send (req) 1065 req_send (req)
1004 1066
1005#define SvPTR(var, arg, type, class, nullok) \ 1067#define SvPTR(var, arg, type, class, nullok) \
… …
1012 } \ 1074 } \
1013 else if (sv_derived_from ((arg), # class)) \ 1075 else if (sv_derived_from ((arg), # class)) \
1014 { \ 1076 { \
1015 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1077 IV tmp = SvIV ((SV*) SvRV (arg)); \
1016 (var) = INT2PTR (type, tmp); \ 1078 (var) = INT2PTR (type, tmp); \
1017 if (!var && nullok != 2) \ 1079 if (!var && nullok != 2) \
1018 croak (# var " is not a valid " # class " object anymore"); \ 1080 croak (# var " is not a valid " # class " object anymore"); \
1019 } \ 1081 } \
1020 else \ 1082 else \
1021 croak (# var " is not of type " # class); 1083 croak (# var " is not of type " # class);
1084
1085#define ARG_MUTABLE(name) \
1086 if (SvREADONLY (name)) \
1087 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1022 1088
1023static void 1089static void
1024ptr_nuke (SV *sv) 1090ptr_nuke (SV *sv)
1025{ 1091{
1026 assert (SvROK (sv)); 1092 assert (SvROK (sv));
… …
1097 } 1163 }
1098 1164
1099 return 0; 1165 return 0;
1100} 1166}
1101 1167
1102/* stupid windoes defined CALLBACK as well */ 1168/* stupid windows defines CALLBACK as well */
1103#undef CALLBACK 1169#undef CALLBACK
1104#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1170#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1105 1171
1106MODULE = BDB PACKAGE = BDB 1172MODULE = BDB PACKAGE = BDB
1107 1173
… …
1160 const_iv (NOSYNC) 1226 const_iv (NOSYNC)
1161 const_iv (CHKSUM) 1227 const_iv (CHKSUM)
1162 const_iv (ENCRYPT) 1228 const_iv (ENCRYPT)
1163 const_iv (DUP) 1229 const_iv (DUP)
1164 const_iv (DUPSORT) 1230 const_iv (DUPSORT)
1165 const_iv (RECNUM) 1231 //const_iv (RECNUM)
1166 const_iv (RENUMBER) 1232 const_iv (RENUMBER)
1167 const_iv (REVSPLITOFF) 1233 const_iv (REVSPLITOFF)
1168 const_iv (CONSUME) 1234 const_iv (CONSUME)
1169 const_iv (CONSUME_WAIT) 1235 const_iv (CONSUME_WAIT)
1170 const_iv (GET_BOTH) 1236 const_iv (GET_BOTH)
… …
1242 const_iv (REP_UNAVAIL) 1308 const_iv (REP_UNAVAIL)
1243 const_iv (RUNRECOVERY) 1309 const_iv (RUNRECOVERY)
1244 const_iv (SECONDARY_BAD) 1310 const_iv (SECONDARY_BAD)
1245 const_iv (VERIFY_BAD) 1311 const_iv (VERIFY_BAD)
1246 1312
1313 const_iv (ARCH_ABS)
1314 const_iv (ARCH_DATA)
1315 const_iv (ARCH_LOG)
1316 const_iv (ARCH_REMOVE)
1317
1247 const_iv (VERB_DEADLOCK) 1318 const_iv (VERB_DEADLOCK)
1248 const_iv (VERB_RECOVERY) 1319 const_iv (VERB_RECOVERY)
1249 const_iv (VERB_REPLICATION) 1320 const_iv (VERB_REPLICATION)
1250 const_iv (VERB_WAITSFOR) 1321 const_iv (VERB_WAITSFOR)
1251 1322
… …
1284 const_iv (PRIORITY_VERY_LOW) 1355 const_iv (PRIORITY_VERY_LOW)
1285 const_iv (PRIORITY_LOW) 1356 const_iv (PRIORITY_LOW)
1286 const_iv (PRIORITY_DEFAULT) 1357 const_iv (PRIORITY_DEFAULT)
1287 const_iv (PRIORITY_HIGH) 1358 const_iv (PRIORITY_HIGH)
1288 const_iv (PRIORITY_VERY_HIGH) 1359 const_iv (PRIORITY_VERY_HIGH)
1360 const_iv (IGNORE_LEASE)
1289#endif 1361#endif
1290#if DB_VERSION_MINOR >= 7 1362#if DB_VERSION_MINOR >= 7
1363 //const_iv (MULTIPLE_KEY)
1291 const_iv (LOG_DIRECT) 1364 const_iv (LOG_DIRECT)
1292 const_iv (LOG_DSYNC) 1365 const_iv (LOG_DSYNC)
1293 const_iv (LOG_AUTO_REMOVE) 1366 const_iv (LOG_AUTO_REMOVE)
1294 const_iv (LOG_IN_MEMORY) 1367 const_iv (LOG_IN_MEMORY)
1295 const_iv (LOG_ZERO) 1368 const_iv (LOG_ZERO)
… …
1304 }; 1377 };
1305 1378
1306 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1379 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1307 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1380 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1308 1381
1382 prepare_cb = &PL_sv_undef;
1383
1309 { 1384 {
1310 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1385 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1311 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH }; 1386 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1312 1387
1313 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1388 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
… …
1451 RETVAL = started; 1526 RETVAL = started;
1452 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1527 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1453 OUTPUT: 1528 OUTPUT:
1454 RETVAL 1529 RETVAL
1455 1530
1456void 1531SV *
1457set_sync_prepare (SV *cb) 1532set_sync_prepare (SV *cb)
1458 PROTOTYPE: & 1533 PROTOTYPE: &
1459 CODE: 1534 CODE:
1460 SvREFCNT_dec (prepare_cb); 1535 RETVAL = prepare_cb;
1461 prepare_cb = newSVsv (cb); 1536 prepare_cb = newSVsv (cb);
1537 OUTPUT:
1538 RETVAL
1462 1539
1463char * 1540char *
1464strerror (int errorno = errno) 1541strerror (int errorno = errno)
1465 PROTOTYPE: ;$ 1542 PROTOTYPE: ;$
1466 CODE: 1543 CODE:
… …
1494db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0) 1571db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
1495 PREINIT: 1572 PREINIT:
1496 CALLBACK 1573 CALLBACK
1497 CODE: 1574 CODE:
1498{ 1575{
1499 dREQ (REQ_ENV_OPEN); 1576 dREQ (REQ_ENV_OPEN, 1);
1500 req->env = env; 1577 req->env = env;
1501 req->uint1 = open_flags | DB_THREAD; 1578 req->uint1 = open_flags | DB_THREAD;
1502 req->int1 = mode; 1579 req->int1 = mode;
1503 req->buf1 = strdup_ornull (db_home); 1580 req->buf1 = strdup_ornull (db_home);
1504 REQ_SEND; 1581 REQ_SEND;
… …
1508db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1585db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1509 PREINIT: 1586 PREINIT:
1510 CALLBACK 1587 CALLBACK
1511 CODE: 1588 CODE:
1512{ 1589{
1513 dREQ (REQ_ENV_CLOSE); 1590 dREQ (REQ_ENV_CLOSE, 0);
1591 ptr_nuke (ST (0));
1514 req->env = env; 1592 req->env = env;
1515 req->uint1 = flags; 1593 req->uint1 = flags;
1516 REQ_SEND; 1594 REQ_SEND;
1517 ptr_nuke (ST (0));
1518} 1595}
1519 1596
1520void 1597void
1521db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1598db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1522 PREINIT: 1599 PREINIT:
1523 CALLBACK 1600 CALLBACK
1524 CODE: 1601 CODE:
1525{ 1602{
1526 dREQ (REQ_ENV_TXN_CHECKPOINT); 1603 dREQ (REQ_ENV_TXN_CHECKPOINT, 1);
1527 req->env = env; 1604 req->env = env;
1528 req->uint1 = kbyte; 1605 req->uint1 = kbyte;
1529 req->int1 = min; 1606 req->int1 = min;
1530 req->uint2 = flags; 1607 req->uint2 = flags;
1531 REQ_SEND; 1608 REQ_SEND;
… …
1535db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0) 1612db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0)
1536 PREINIT: 1613 PREINIT:
1537 CALLBACK 1614 CALLBACK
1538 CODE: 1615 CODE:
1539{ 1616{
1540 dREQ (REQ_ENV_LOCK_DETECT); 1617 dREQ (REQ_ENV_LOCK_DETECT, 1);
1541 req->env = env; 1618 req->env = env;
1542 req->uint1 = flags; 1619 req->uint1 = flags;
1543 req->uint2 = atype; 1620 req->uint2 = atype;
1544 /* req->int2 = 0; dummy */ 1621 /* req->int2 = 0; dummy */
1545 REQ_SEND; 1622 REQ_SEND;
… …
1549db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0) 1626db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0)
1550 PREINIT: 1627 PREINIT:
1551 CALLBACK 1628 CALLBACK
1552 CODE: 1629 CODE:
1553{ 1630{
1554 dREQ (REQ_ENV_MEMP_SYNC); 1631 dREQ (REQ_ENV_MEMP_SYNC, 1);
1555 req->env = env; 1632 req->env = env;
1556 REQ_SEND; 1633 REQ_SEND;
1557} 1634}
1558 1635
1559void 1636void
1560db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0) 1637db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0)
1561 PREINIT: 1638 PREINIT:
1562 CALLBACK 1639 CALLBACK
1563 CODE: 1640 CODE:
1564{ 1641{
1565 dREQ (REQ_ENV_MEMP_TRICKLE); 1642 dREQ (REQ_ENV_MEMP_TRICKLE, 1);
1566 req->env = env; 1643 req->env = env;
1567 req->int1 = percent; 1644 req->int1 = percent;
1568 REQ_SEND; 1645 REQ_SEND;
1569} 1646}
1570 1647
… …
1572db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0) 1649db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0)
1573 PREINIT: 1650 PREINIT:
1574 CALLBACK 1651 CALLBACK
1575 CODE: 1652 CODE:
1576{ 1653{
1577 dREQ (REQ_ENV_DBREMOVE); 1654 dREQ (REQ_ENV_DBREMOVE, 2);
1578 req->env = env; 1655 req->env = env;
1579 req->buf1 = strdup_ornull (file); 1656 req->buf1 = strdup_ornull (file);
1580 req->buf2 = strdup_ornull (database); 1657 req->buf2 = strdup_ornull (database);
1581 req->uint1 = flags; 1658 req->uint1 = flags;
1582 REQ_SEND; 1659 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) 1663db_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: 1664 PREINIT:
1588 CALLBACK 1665 CALLBACK
1589 CODE: 1666 CODE:
1590{ 1667{
1591 dREQ (REQ_ENV_DBRENAME); 1668 dREQ (REQ_ENV_DBRENAME, 2);
1592 req->env = env; 1669 req->env = env;
1593 req->buf1 = strdup_ornull (file); 1670 req->buf1 = strdup_ornull (file);
1594 req->buf2 = strdup_ornull (database); 1671 req->buf2 = strdup_ornull (database);
1595 req->buf3 = strdup_ornull (newname); 1672 req->buf3 = strdup_ornull (newname);
1596 req->uint1 = flags; 1673 req->uint1 = flags;
1597 REQ_SEND; 1674 REQ_SEND;
1598} 1675}
1599 1676
1677void
1678db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1679 PREINIT:
1680 CALLBACK
1681 CODE:
1682{
1683 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1684 req->sv1 = SvREFCNT_inc (listp);
1685 req->env = env;
1686 req->uint1 = flags;
1687 REQ_SEND;
1688}
1689
1600DB * 1690DB *
1601db_create (DB_ENV *env = 0, U32 flags = 0) 1691db_create (DB_ENV *env = 0, U32 flags = 0)
1602 CODE: 1692 CODE:
1603{ 1693{
1604 errno = db_create (&RETVAL, env, flags); 1694 errno = db_create (&RETVAL, env, flags);
… …
1615db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0) 1705db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
1616 PREINIT: 1706 PREINIT:
1617 CALLBACK 1707 CALLBACK
1618 CODE: 1708 CODE:
1619{ 1709{
1620 dREQ (REQ_DB_OPEN); 1710 dREQ (REQ_DB_OPEN, 2);
1621 req->db = db; 1711 req->db = db;
1622 req->txn = txnid; 1712 req->txn = txnid;
1623 req->buf1 = strdup_ornull (file); 1713 req->buf1 = strdup_ornull (file);
1624 req->buf2 = strdup_ornull (database); 1714 req->buf2 = strdup_ornull (database);
1625 req->int1 = type; 1715 req->int1 = type;
… …
1632db_close (DB *db, U32 flags = 0, SV *callback = 0) 1722db_close (DB *db, U32 flags = 0, SV *callback = 0)
1633 PREINIT: 1723 PREINIT:
1634 CALLBACK 1724 CALLBACK
1635 CODE: 1725 CODE:
1636{ 1726{
1637 dREQ (REQ_DB_CLOSE); 1727 dREQ (REQ_DB_CLOSE, 0);
1728 ptr_nuke (ST (0));
1638 req->db = db; 1729 req->db = db;
1639 req->uint1 = flags; 1730 req->uint1 = flags;
1640 req->sv1 = (SV *)db->app_private; 1731 req->sv1 = (SV *)db->app_private;
1641 REQ_SEND; 1732 REQ_SEND;
1642 ptr_nuke (ST (0));
1643} 1733}
1644 1734
1645#if DB_VERSION_MINOR >= 4 1735#if DB_VERSION_MINOR >= 4
1646 1736
1647void 1737void
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) 1738db_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: 1739 PREINIT:
1650 CALLBACK 1740 CALLBACK
1651 CODE: 1741 CODE:
1652{ 1742{
1653 dREQ (REQ_DB_COMPACT); 1743 dREQ (REQ_DB_COMPACT, 2);
1654 req->db = db; 1744 req->db = db;
1655 req->txn = txn; 1745 req->txn = txn;
1656 sv_to_dbt (&req->dbt1, start); 1746 if (start) sv_to_dbt (&req->dbt1, start);
1657 sv_to_dbt (&req->dbt2, stop); 1747 if (stop ) sv_to_dbt (&req->dbt2, stop );
1658 req->uint1 = flags; 1748 req->uint1 = flags;
1659 REQ_SEND; 1749 REQ_SEND;
1660} 1750}
1661 1751
1662#endif 1752#endif
… …
1665db_sync (DB *db, U32 flags = 0, SV *callback = 0) 1755db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1666 PREINIT: 1756 PREINIT:
1667 CALLBACK 1757 CALLBACK
1668 CODE: 1758 CODE:
1669{ 1759{
1670 dREQ (REQ_DB_SYNC); 1760 dREQ (REQ_DB_SYNC, 1);
1671 req->db = db; 1761 req->db = db;
1672 req->uint1 = flags; 1762 req->uint1 = flags;
1673 REQ_SEND; 1763 REQ_SEND;
1674} 1764}
1675 1765
… …
1677db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1767db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1678 PREINIT: 1768 PREINIT:
1679 CALLBACK 1769 CALLBACK
1680 CODE: 1770 CODE:
1681{ 1771{
1682 dREQ (REQ_DB_SYNC); 1772 dREQ (REQ_DB_SYNC, 1);
1683 req->db = db; 1773 req->db = db;
1684 req->buf1 = strdup (file); 1774 req->buf1 = strdup (file);
1685 req->uint1 = flags; 1775 req->uint1 = flags;
1686 REQ_SEND; 1776 REQ_SEND;
1687} 1777}
1688 1778
1689void 1779void
1690db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1780db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *key_range, U32 flags = 0, SV *callback = 0)
1691 PREINIT: 1781 PREINIT:
1692 CALLBACK 1782 CALLBACK
1693 CODE: 1783 CODE:
1694{ 1784{
1695 dREQ (REQ_DB_KEY_RANGE); 1785 dREQ (REQ_DB_KEY_RANGE, 2);
1696 req->db = db; 1786 req->db = db;
1697 req->txn = txn; 1787 req->txn = txn;
1698 sv_to_dbt (&req->dbt1, key); 1788 sv_to_dbt (&req->dbt1, key);
1699 req->uint1 = flags; 1789 req->uint1 = flags;
1700 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1790 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) 1795db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1706 PREINIT: 1796 PREINIT:
1707 CALLBACK 1797 CALLBACK
1708 CODE: 1798 CODE:
1709{ 1799{
1710 dREQ (REQ_DB_PUT); 1800 dREQ (REQ_DB_PUT, 2);
1711 req->db = db; 1801 req->db = db;
1712 req->txn = txn; 1802 req->txn = txn;
1713 sv_to_dbt (&req->dbt1, key); 1803 sv_to_dbt (&req->dbt1, key);
1714 sv_to_dbt (&req->dbt2, data); 1804 sv_to_dbt (&req->dbt2, data);
1715 req->uint1 = flags; 1805 req->uint1 = flags;
… …
1722db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1812db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1723 PREINIT: 1813 PREINIT:
1724 CALLBACK 1814 CALLBACK
1725 CODE: 1815 CODE:
1726{ 1816{
1727 dREQ (REQ_DB_EXISTS); 1817 dREQ (REQ_DB_EXISTS, 2);
1728 req->db = db; 1818 req->db = db;
1729 req->txn = txn; 1819 req->txn = txn;
1730 req->uint1 = flags; 1820 req->uint1 = flags;
1731 sv_to_dbt (&req->dbt1, key); 1821 sv_to_dbt (&req->dbt1, key);
1732 REQ_SEND; 1822 REQ_SEND;
1733} 1823}
1734 1824
1735#endif 1825#endif
1736 1826
1737void 1827void
1738db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1828db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1739 PREINIT: 1829 PREINIT:
1740 CALLBACK 1830 CALLBACK
1741 CODE: 1831 CODE:
1742 if (SvREADONLY (data))
1743 croak ("can't modify read-only data scalar in db_get");
1744{ 1832{
1833 //TODO: key is somtimesmutable
1745 dREQ (REQ_DB_GET); 1834 dREQ (REQ_DB_GET, 2);
1746 req->db = db; 1835 req->db = db;
1747 req->txn = txn; 1836 req->txn = txn;
1748 req->uint1 = flags; 1837 req->uint1 = flags;
1749 sv_to_dbt (&req->dbt1, key); 1838 sv_to_dbt (&req->dbt1, key);
1750 req->dbt3.flags = DB_DBT_MALLOC; 1839 req->dbt3.flags = DB_DBT_MALLOC;
1751 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1840 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1752 REQ_SEND; 1841 REQ_SEND;
1753} 1842}
1754 1843
1755void 1844void
1756db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1845db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1757 PREINIT: 1846 PREINIT:
1758 CALLBACK 1847 CALLBACK
1759 CODE: 1848 CODE:
1760 if (SvREADONLY (data))
1761 croak ("can't modify read-only data scalar in db_pget");
1762{ 1849{
1850 //TODO: key is somtimesmutable
1763 dREQ (REQ_DB_PGET); 1851 dREQ (REQ_DB_PGET, 2);
1852 req->db = db;
1853 req->txn = txn;
1854 req->uint1 = flags;
1855
1856 sv_to_dbt (&req->dbt1, key);
1857
1858 req->dbt2.flags = DB_DBT_MALLOC;
1859 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1860
1861 req->dbt3.flags = DB_DBT_MALLOC;
1862 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1863 REQ_SEND;
1864}
1865
1866void
1867db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1868 PREINIT:
1869 CALLBACK
1870 CODE:
1871{
1872 dREQ (REQ_DB_DEL, 2);
1764 req->db = db; 1873 req->db = db;
1765 req->txn = txn; 1874 req->txn = txn;
1766 req->uint1 = flags; 1875 req->uint1 = flags;
1767 sv_to_dbt (&req->dbt1, key); 1876 sv_to_dbt (&req->dbt1, key);
1768 sv_to_dbt (&req->dbt2, pkey);
1769 req->dbt3.flags = DB_DBT_MALLOC;
1770 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1771 REQ_SEND; 1877 REQ_SEND;
1772} 1878}
1773 1879
1774void 1880void
1775db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1881db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1776 PREINIT: 1882 PREINIT:
1777 CALLBACK 1883 CALLBACK
1778 CODE: 1884 CODE:
1779{ 1885{
1780 dREQ (REQ_DB_DEL); 1886 dREQ (REQ_TXN_COMMIT, 0);
1781 req->db = db; 1887 ptr_nuke (ST (0));
1782 req->txn = txn; 1888 req->txn = txn;
1783 req->uint1 = flags; 1889 req->uint1 = flags;
1784 sv_to_dbt (&req->dbt1, key);
1785 REQ_SEND; 1890 REQ_SEND;
1786} 1891}
1787 1892
1788void 1893void
1894db_txn_abort (DB_TXN *txn, SV *callback = 0)
1895 PREINIT:
1896 CALLBACK
1897 CODE:
1898{
1899 dREQ (REQ_TXN_ABORT, 0);
1900 ptr_nuke (ST (0));
1901 req->txn = txn;
1902 REQ_SEND;
1903}
1904
1905void
1789db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1906db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1790 PREINIT: 1907 PREINIT:
1791 CALLBACK 1908 CALLBACK
1792 CODE: 1909 CODE:
1793{ 1910{
1794 dREQ (REQ_TXN_COMMIT); 1911 dREQ (REQ_TXN_FINISH, 0);
1912 ptr_nuke (ST (0));
1795 req->txn = txn; 1913 req->txn = txn;
1796 req->uint1 = flags; 1914 req->uint1 = flags;
1797 REQ_SEND; 1915 REQ_SEND;
1916}
1917
1918void
1919db_c_close (DBC *dbc, SV *callback = 0)
1920 PREINIT:
1921 CALLBACK
1922 CODE:
1923{
1924 dREQ (REQ_C_CLOSE, 0);
1798 ptr_nuke (ST (0)); 1925 ptr_nuke (ST (0));
1799}
1800
1801void
1802db_txn_abort (DB_TXN *txn, SV *callback = 0)
1803 PREINIT:
1804 CALLBACK
1805 CODE:
1806{
1807 dREQ (REQ_TXN_ABORT);
1808 req->txn = txn;
1809 REQ_SEND;
1810 ptr_nuke (ST (0));
1811}
1812
1813void
1814db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1815 PREINIT:
1816 CALLBACK
1817 CODE:
1818{
1819 dREQ (REQ_TXN_FINISH);
1820 req->txn = txn;
1821 req->uint1 = flags;
1822 REQ_SEND;
1823 ptr_nuke (ST (0));
1824}
1825
1826void
1827db_c_close (DBC *dbc, SV *callback = 0)
1828 PREINIT:
1829 CALLBACK
1830 CODE:
1831{
1832 dREQ (REQ_C_CLOSE);
1833 req->dbc = dbc; 1926 req->dbc = dbc;
1834 REQ_SEND; 1927 REQ_SEND;
1835 ptr_nuke (ST (0));
1836} 1928}
1837 1929
1838void 1930void
1839db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1931db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1840 PREINIT: 1932 PREINIT:
1841 CALLBACK 1933 CALLBACK
1842 CODE: 1934 CODE:
1843{ 1935{
1844 dREQ (REQ_C_COUNT); 1936 dREQ (REQ_C_COUNT, 1);
1845 req->dbc = dbc; 1937 req->dbc = dbc;
1846 req->sv1 = SvREFCNT_inc (count); 1938 req->sv1 = SvREFCNT_inc (count);
1847 REQ_SEND; 1939 REQ_SEND;
1848} 1940}
1849 1941
… …
1851db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1943db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1852 PREINIT: 1944 PREINIT:
1853 CALLBACK 1945 CALLBACK
1854 CODE: 1946 CODE:
1855{ 1947{
1856 dREQ (REQ_C_PUT); 1948 dREQ (REQ_C_PUT, 1);
1857 req->dbc = dbc; 1949 req->dbc = dbc;
1858 sv_to_dbt (&req->dbt1, key); 1950 sv_to_dbt (&req->dbt1, key);
1859 sv_to_dbt (&req->dbt2, data); 1951 sv_to_dbt (&req->dbt2, data);
1860 req->uint1 = flags; 1952 req->uint1 = flags;
1861 REQ_SEND; 1953 REQ_SEND;
1862} 1954}
1863 1955
1864void 1956void
1865db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1957db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1866 PREINIT: 1958 PREINIT:
1867 CALLBACK 1959 CALLBACK
1868 CODE: 1960 CODE:
1869{ 1961{
1962 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1963 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1964 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1965 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1966 "key",
1967 "BDB::db_c_get");
1968
1969 {
1870 dREQ (REQ_C_GET); 1970 dREQ (REQ_C_GET, 1);
1971 req->dbc = dbc;
1972 req->uint1 = flags;
1973 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1974 sv_to_dbt (&req->dbt1, key);
1975 else
1976 {
1977 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1978 sv_to_dbt (&req->dbt1, key);
1979 else
1980 req->dbt1.flags = DB_DBT_MALLOC;
1981
1982 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1983 }
1984
1985 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1986 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1987 sv_to_dbt (&req->dbt3, data);
1988 else
1989 req->dbt3.flags = DB_DBT_MALLOC;
1990
1991 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1992 REQ_SEND;
1993 }
1994}
1995
1996void
1997db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1998 PREINIT:
1999 CALLBACK
2000 CODE:
2001{
2002 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
2003 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2004 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2005 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2006 "key",
2007 "BDB::db_c_pget");
2008
2009 {
2010 dREQ (REQ_C_PGET, 1);
2011 req->dbc = dbc;
2012 req->uint1 = flags;
2013 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
2014 sv_to_dbt (&req->dbt1, key);
2015 else
2016 {
2017 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
2018 sv_to_dbt (&req->dbt1, key);
2019 else
2020 req->dbt1.flags = DB_DBT_MALLOC;
2021
2022 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
2023 }
2024
2025 req->dbt2.flags = DB_DBT_MALLOC;
2026 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
2027
2028 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
2029 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
2030 sv_to_dbt (&req->dbt3, data);
2031 else
2032 req->dbt3.flags = DB_DBT_MALLOC;
2033
2034 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
2035 REQ_SEND;
2036 }
2037}
2038
2039void
2040db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
2041 PREINIT:
2042 CALLBACK
2043 CODE:
2044{
2045 dREQ (REQ_C_DEL, 1);
1871 req->dbc = dbc; 2046 req->dbc = dbc;
1872 req->uint1 = flags; 2047 req->uint1 = flags;
1873 if ((flags & DB_SET) == DB_SET
1874 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1875 sv_to_dbt (&req->dbt1, key);
1876 else
1877 req->dbt1.flags = DB_DBT_MALLOC;
1878
1879 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1880
1881 if ((flags & DB_GET_BOTH) == DB_GET_BOTH
1882 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE)
1883 sv_to_dbt (&req->dbt3, data);
1884 else
1885 req->dbt3.flags = DB_DBT_MALLOC;
1886
1887 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1888 REQ_SEND;
1889}
1890
1891void
1892db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
1893 PREINIT:
1894 CALLBACK
1895 CODE:
1896{
1897 dREQ (REQ_C_PGET);
1898 req->dbc = dbc;
1899 req->uint1 = flags;
1900 if ((flags & DB_SET) == DB_SET
1901 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1902 sv_to_dbt (&req->dbt1, key);
1903 else
1904 req->dbt1.flags = DB_DBT_MALLOC;
1905
1906 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1907
1908 req->dbt2.flags = DB_DBT_MALLOC;
1909 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1910
1911 if ((flags & DB_GET_BOTH) == DB_GET_BOTH
1912 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE)
1913 sv_to_dbt (&req->dbt3, data);
1914 else
1915 req->dbt3.flags = DB_DBT_MALLOC;
1916
1917 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1918 REQ_SEND;
1919}
1920
1921void
1922db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1923 PREINIT:
1924 CALLBACK
1925 CODE:
1926{
1927 dREQ (REQ_C_DEL);
1928 req->dbc = dbc;
1929 req->uint1 = flags;
1930 REQ_SEND; 2048 REQ_SEND;
1931} 2049}
1932 2050
1933 2051
1934#if DB_VERSION_MINOR >= 3 2052#if DB_VERSION_MINOR >= 3
… …
1937db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0) 2055db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0)
1938 PREINIT: 2056 PREINIT:
1939 CALLBACK 2057 CALLBACK
1940 CODE: 2058 CODE:
1941{ 2059{
1942 dREQ (REQ_SEQ_OPEN); 2060 dREQ (REQ_SEQ_OPEN, 2);
1943 req->seq = seq; 2061 req->seq = seq;
1944 req->txn = txnid; 2062 req->txn = txnid;
1945 req->uint1 = flags | DB_THREAD; 2063 req->uint1 = flags | DB_THREAD;
1946 sv_to_dbt (&req->dbt1, key); 2064 sv_to_dbt (&req->dbt1, key);
1947 REQ_SEND; 2065 REQ_SEND;
… …
1951db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2069db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1952 PREINIT: 2070 PREINIT:
1953 CALLBACK 2071 CALLBACK
1954 CODE: 2072 CODE:
1955{ 2073{
1956 dREQ (REQ_SEQ_CLOSE); 2074 dREQ (REQ_SEQ_CLOSE, 0);
2075 ptr_nuke (ST (0));
1957 req->seq = seq; 2076 req->seq = seq;
1958 req->uint1 = flags; 2077 req->uint1 = flags;
1959 REQ_SEND; 2078 REQ_SEND;
1960 ptr_nuke (ST (0));
1961} 2079}
1962 2080
1963void 2081void
1964db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 2082db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV_mutable *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1965 PREINIT: 2083 PREINIT:
1966 CALLBACK 2084 CALLBACK
1967 CODE: 2085 CODE:
1968{ 2086{
1969 dREQ (REQ_SEQ_GET); 2087 dREQ (REQ_SEQ_GET, 2);
1970 req->seq = seq; 2088 req->seq = seq;
1971 req->txn = txnid; 2089 req->txn = txnid;
1972 req->int1 = delta; 2090 req->int1 = delta;
1973 req->uint1 = flags; 2091 req->uint1 = flags;
1974 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 2092 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) 2097db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
1980 PREINIT: 2098 PREINIT:
1981 CALLBACK 2099 CALLBACK
1982 CODE: 2100 CODE:
1983{ 2101{
1984 dREQ (REQ_SEQ_REMOVE); 2102 dREQ (REQ_SEQ_REMOVE, 2);
1985 req->seq = seq; 2103 req->seq = seq;
1986 req->txn = txnid; 2104 req->txn = txnid;
1987 req->uint1 = flags; 2105 req->uint1 = flags;
1988 REQ_SEND; 2106 REQ_SEND;
1989} 2107}
… …
2198 CODE: 2316 CODE:
2199 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2317 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2200 OUTPUT: 2318 OUTPUT:
2201 RETVAL 2319 RETVAL
2202 2320
2321int set_pagesize (DB *db, U32 pagesize)
2322 CODE:
2323 RETVAL = db->set_pagesize (db, pagesize);
2324 OUTPUT:
2325 RETVAL
2326
2203int set_flags (DB *db, U32 flags) 2327int set_flags (DB *db, U32 flags)
2204 CODE: 2328 CODE:
2205 RETVAL = db->set_flags (db, flags); 2329 RETVAL = db->set_flags (db, flags);
2206 OUTPUT: 2330 OUTPUT:
2207 RETVAL 2331 RETVAL

Diff Legend

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