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

Comparing BDB/BDB.xs (file contents):
Revision 1.48 by root, Tue Jul 29 03:33:16 2008 UTC vs.
Revision 1.54 by root, Fri Sep 26 02:03:48 2008 UTC

1#include <sys/user.h>
2#include <sys/ptrace.h>
3
1#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4 4#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4
2 5
3#include "xthread.h" 6#include "xthread.h"
4 7
5#include <errno.h> 8#include <errno.h>
… …
36#endif 39#endif
37 40
38/* number of seconds after which idle threads exit */ 41/* number of seconds after which idle threads exit */
39#define IDLE_TIMEOUT 10 42#define IDLE_TIMEOUT 10
40 43
44typedef SV SV_mutable;
45
41typedef DB_ENV DB_ENV_ornull; 46typedef DB_ENV DB_ENV_ornull;
42typedef DB_TXN DB_TXN_ornull; 47typedef DB_TXN DB_TXN_ornull;
43typedef DBC DBC_ornull; 48typedef DBC DBC_ornull;
44typedef DB DB_ornull; 49typedef DB DB_ornull;
45 50
… …
132dbt_to_sv (SV *sv, DBT *dbt) 137dbt_to_sv (SV *sv, DBT *dbt)
133{ 138{
134 if (sv) 139 if (sv)
135 { 140 {
136 SvREADONLY_off (sv); 141 SvREADONLY_off (sv);
137 sv_setpvn_mg (sv, dbt->data, dbt->size); 142 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef);
138 SvREFCNT_dec (sv); 143 SvREFCNT_dec (sv);
139 } 144 }
140 145
146 if (dbt->flags & DB_DBT_MALLOC)
141 free (dbt->data); 147 free (dbt->data);
142} 148}
143 149
144enum { 150enum {
145 REQ_QUIT, 151 REQ_QUIT,
146 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,
… …
173 DB_KEY_RANGE key_range; 179 DB_KEY_RANGE key_range;
174#if DB_VERSION_MINOR >= 3 180#if DB_VERSION_MINOR >= 3
175 DB_SEQUENCE *seq; 181 DB_SEQUENCE *seq;
176 db_seq_t seq_t; 182 db_seq_t seq_t;
177#endif 183#endif
184
185 SV *rsv1, *rsv2; // keep some request objects alive
178} bdb_cb; 186} bdb_cb;
179 187
180typedef bdb_cb *bdb_req; 188typedef bdb_cb *bdb_req;
181 189
182enum { 190enum {
… …
345static void req_free (bdb_req req); 353static void req_free (bdb_req req);
346static void req_cancel (bdb_req req); 354static void req_cancel (bdb_req req);
347 355
348static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
349{ 357{
350 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 SvREADONLY_off (req->sv1);
384 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
385 SvREFCNT_dec (req->sv1);
386 }
387 break;
388
389#if DB_VERSION_MINOR >= 3
390 case REQ_SEQ_GET:
391 SvREADONLY_off (req->sv1);
392
393 if (sizeof (IV) > 4)
394 sv_setiv_mg (req->sv1, (IV)req->seq_t);
395 else
396 sv_setnv_mg (req->sv1, (NV)req->seq_t);
397
398 SvREFCNT_dec (req->sv1);
399 break;
400#endif
401 }
402
403 errno = req->result;
351 404
352 if (req->callback) 405 if (req->callback)
353 { 406 {
407 dSP;
408
354 ENTER; 409 ENTER;
355 SAVETMPS; 410 SAVETMPS;
356 PUSHMARK (SP); 411 PUSHMARK (SP);
357 412
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 dbt_to_sv (req->sv3, &req->dbt3);
367 break;
368
369 case REQ_C_GET:
370 case REQ_C_PGET:
371 dbt_to_sv (req->sv1, &req->dbt1);
372 dbt_to_sv (req->sv2, &req->dbt2);
373 dbt_to_sv (req->sv3, &req->dbt3);
374 break;
375
376 case REQ_DB_PUT:
377 case REQ_C_PUT:
378 dbt_to_sv (0, &req->dbt1);
379 dbt_to_sv (0, &req->dbt2);
380 break;
381
382 case REQ_DB_KEY_RANGE:
383 {
384 AV *av = newAV ();
385
386 av_push (av, newSVnv (req->key_range.less));
387 av_push (av, newSVnv (req->key_range.equal));
388 av_push (av, newSVnv (req->key_range.greater));
389
390 SvREADONLY_off (req->sv1);
391 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
392 SvREFCNT_dec (req->sv1);
393 }
394 break;
395
396#if DB_VERSION_MINOR >= 3
397 case REQ_SEQ_GET:
398 SvREADONLY_off (req->sv1);
399
400 if (sizeof (IV) > 4)
401 sv_setiv_mg (req->sv1, (IV)req->seq_t);
402 else
403 sv_setnv_mg (req->sv1, (NV)req->seq_t);
404
405 SvREFCNT_dec (req->sv1);
406 break;
407#endif
408 }
409
410 errno = req->result;
411
412 PUTBACK; 413 PUTBACK;
413 call_sv (req->callback, G_VOID | G_EVAL); 414 call_sv (req->callback, G_VOID | G_EVAL);
414 SPAGAIN; 415 SPAGAIN;
415 416
416 FREETMPS; 417 FREETMPS;
417 LEAVE; 418 LEAVE;
419
420 return !SvTRUE (ERRSV);
418 } 421 }
419 422
420 return !SvTRUE (ERRSV); 423 return 1;
421} 424}
422 425
423static void req_free (bdb_req req) 426static void req_free (bdb_req req)
424{ 427{
425 SvREFCNT_dec (req->callback); 428 SvREFCNT_dec (req->callback);
429
430 SvREFCNT_dec (req->rsv1);
431 SvREFCNT_dec (req->rsv2);
426 432
427 free (req->buf1); 433 free (req->buf1);
428 free (req->buf2); 434 free (req->buf2);
429 free (req->buf3); 435 free (req->buf3);
430 436
… …
476 482
477 respipe_osf [0] = TO_SOCKET (respipe [0]); 483 respipe_osf [0] = TO_SOCKET (respipe [0]);
478 respipe_osf [1] = TO_SOCKET (respipe [1]); 484 respipe_osf [1] = TO_SOCKET (respipe [1]);
479} 485}
480 486
487static void bdb_request (bdb_req req);
481X_THREAD_PROC (bdb_proc); 488X_THREAD_PROC (bdb_proc);
482 489
483static void start_thread (void) 490static void start_thread (void)
484{ 491{
485 worker *wrk = calloc (1, sizeof (worker)); 492 worker *wrk = calloc (1, sizeof (worker));
… …
526 on_next_submit = 0; 533 on_next_submit = 0;
527 534
528 PUSHMARK (SP); 535 PUSHMARK (SP);
529 PUTBACK; 536 PUTBACK;
530 call_sv (cb, G_DISCARD | G_EVAL); 537 call_sv (cb, G_DISCARD | G_EVAL);
538 SPAGAIN;
531 } 539 }
532 540
533 // synthesize callback if none given 541 // synthesize callback if none given
534 if (!req->callback) 542 if (!req->callback)
535 { 543 {
544 if (SvOK (prepare_cb))
545 {
536 int count; 546 int count;
537 547
538 dSP; 548 dSP;
539 PUSHMARK (SP); 549 PUSHMARK (SP);
540 PUTBACK; 550 PUTBACK;
541 count = call_sv (prepare_cb, G_ARRAY); 551 count = call_sv (prepare_cb, G_ARRAY);
542 SPAGAIN; 552 SPAGAIN;
543 553
544 if (count != 2) 554 if (count != 2)
545 croak ("prepare callback must return exactly two values\n"); 555 croak ("sync prepare callback must return exactly two values\n");
546 556
547 wait_callback = POPs; 557 wait_callback = POPs;
548 SvREFCNT_dec (req->callback);
549 req->callback = SvREFCNT_inc (POPs); 558 req->callback = SvREFCNT_inc (POPs);
559 }
560 else
561 {
562 // execute request synchronously
563 bdb_request (req);
564 req_invoke (req);
565 req_free (req);
566 return;
567 }
550 } 568 }
551 569
552 ++nreqs; 570 ++nreqs;
553 571
554 X_LOCK (reqlock); 572 X_LOCK (reqlock);
… …
568 } 586 }
569} 587}
570 588
571static void end_thread (void) 589static void end_thread (void)
572{ 590{
573 bdb_req req; 591 bdb_req req = calloc (1, sizeof (bdb_cb));
574
575 Newz (0, req, 1, bdb_cb);
576 592
577 req->type = REQ_QUIT; 593 req->type = REQ_QUIT;
578 req->pri = PRI_MAX + PRI_BIAS; 594 req->pri = PRI_MAX + PRI_BIAS;
579 595
580 X_LOCK (reqlock); 596 X_LOCK (reqlock);
… …
705 721
706 return count; 722 return count;
707} 723}
708 724
709/*****************************************************************************/ 725/*****************************************************************************/
726
727static void
728bdb_request (bdb_req req)
729{
730 switch (req->type)
731 {
732 case REQ_ENV_OPEN:
733 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
734 break;
735
736 case REQ_ENV_CLOSE:
737 req->result = req->env->close (req->env, req->uint1);
738 break;
739
740 case REQ_ENV_TXN_CHECKPOINT:
741 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
742 break;
743
744 case REQ_ENV_LOCK_DETECT:
745 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
746 break;
747
748 case REQ_ENV_MEMP_SYNC:
749 req->result = req->env->memp_sync (req->env, 0);
750 break;
751
752 case REQ_ENV_MEMP_TRICKLE:
753 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
754 break;
755
756 case REQ_ENV_DBREMOVE:
757 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
758 break;
759
760 case REQ_ENV_DBRENAME:
761 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
762 break;
763
764 case REQ_DB_OPEN:
765 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
766 break;
767
768 case REQ_DB_CLOSE:
769 req->result = req->db->close (req->db, req->uint1);
770 break;
771
772#if DB_VERSION_MINOR >= 4
773 case REQ_DB_COMPACT:
774 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
775 break;
776#endif
777
778 case REQ_DB_SYNC:
779 req->result = req->db->sync (req->db, req->uint1);
780 break;
781
782 case REQ_DB_UPGRADE:
783 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
784 break;
785
786 case REQ_DB_PUT:
787 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
788 break;
789
790#if DB_VERSION_MINOR >= 6
791 case REQ_DB_EXISTS:
792 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
793 break;
794#endif
795 case REQ_DB_GET:
796 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
797 break;
798
799 case REQ_DB_PGET:
800 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
801 break;
802
803 case REQ_DB_DEL:
804 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
805 break;
806
807 case REQ_DB_KEY_RANGE:
808 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
809 break;
810
811 case REQ_TXN_COMMIT:
812 req->result = req->txn->commit (req->txn, req->uint1);
813 break;
814
815 case REQ_TXN_ABORT:
816 req->result = req->txn->abort (req->txn);
817 break;
818
819 case REQ_TXN_FINISH:
820 if (req->txn->flags & TXN_DEADLOCK)
821 {
822 req->result = req->txn->abort (req->txn);
823 if (!req->result)
824 req->result = DB_LOCK_DEADLOCK;
825 }
826 else
827 req->result = req->txn->commit (req->txn, req->uint1);
828 break;
829
830 case REQ_C_CLOSE:
831 req->result = req->dbc->c_close (req->dbc);
832 break;
833
834 case REQ_C_COUNT:
835 {
836 db_recno_t recno;
837 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
838 req->uv1 = recno;
839 }
840 break;
841
842 case REQ_C_PUT:
843 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
844 break;
845
846 case REQ_C_GET:
847 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
848 break;
849
850 case REQ_C_PGET:
851 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
852 break;
853
854 case REQ_C_DEL:
855 req->result = req->dbc->c_del (req->dbc, req->uint1);
856 break;
857
858#if DB_VERSION_MINOR >= 3
859 case REQ_SEQ_OPEN:
860 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
861 break;
862
863 case REQ_SEQ_CLOSE:
864 req->result = req->seq->close (req->seq, req->uint1);
865 break;
866
867 case REQ_SEQ_GET:
868 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
869 break;
870
871 case REQ_SEQ_REMOVE:
872 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
873 break;
874#endif
875
876 default:
877 req->result = ENOSYS;
878 break;
879 }
880
881 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
882 req->txn->flags |= TXN_DEADLOCK;
883}
710 884
711X_THREAD_PROC (bdb_proc) 885X_THREAD_PROC (bdb_proc)
712{ 886{
713 bdb_req req; 887 bdb_req req;
714 struct timespec ts; 888 struct timespec ts;
… …
754 } 928 }
755 929
756 --nready; 930 --nready;
757 931
758 X_UNLOCK (reqlock); 932 X_UNLOCK (reqlock);
759 933
760 switch (req->type) 934 if (req->type == REQ_QUIT)
761 { 935 {
762 case REQ_QUIT: 936 X_LOCK (reslock);
763 req->result = ENOSYS; 937 free (req);
938 self->req = 0;
939 X_UNLOCK (reslock);
940
764 goto quit; 941 goto quit;
765
766 case REQ_ENV_OPEN:
767 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
768 break;
769
770 case REQ_ENV_CLOSE:
771 req->result = req->env->close (req->env, req->uint1);
772 break;
773
774 case REQ_ENV_TXN_CHECKPOINT:
775 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
776 break;
777
778 case REQ_ENV_LOCK_DETECT:
779 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
780 break;
781
782 case REQ_ENV_MEMP_SYNC:
783 req->result = req->env->memp_sync (req->env, 0);
784 break;
785
786 case REQ_ENV_MEMP_TRICKLE:
787 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
788 break;
789
790 case REQ_ENV_DBREMOVE:
791 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
792 break;
793
794 case REQ_ENV_DBRENAME:
795 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
796 break;
797
798 case REQ_DB_OPEN:
799 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
800 break;
801
802 case REQ_DB_CLOSE:
803 req->result = req->db->close (req->db, req->uint1);
804 break;
805
806#if DB_VERSION_MINOR >= 4
807 case REQ_DB_COMPACT:
808 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
809 break;
810#endif
811
812 case REQ_DB_SYNC:
813 req->result = req->db->sync (req->db, req->uint1);
814 break;
815
816 case REQ_DB_UPGRADE:
817 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
818 break;
819
820 case REQ_DB_PUT:
821 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
822 break;
823
824#if DB_VERSION_MINOR >= 6
825 case REQ_DB_EXISTS:
826 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
827 break;
828#endif
829 case REQ_DB_GET:
830 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
831 break;
832
833 case REQ_DB_PGET:
834 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
835 break;
836
837 case REQ_DB_DEL:
838 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
839 break;
840
841 case REQ_DB_KEY_RANGE:
842 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
843 break;
844
845 case REQ_TXN_COMMIT:
846 req->result = req->txn->commit (req->txn, req->uint1);
847 break;
848
849 case REQ_TXN_ABORT:
850 req->result = req->txn->abort (req->txn);
851 break;
852
853 case REQ_TXN_FINISH:
854 if (req->txn->flags & TXN_DEADLOCK)
855 {
856 req->result = req->txn->abort (req->txn);
857 if (!req->result)
858 req->result = DB_LOCK_DEADLOCK;
859 }
860 else
861 req->result = req->txn->commit (req->txn, req->uint1);
862 break;
863
864 case REQ_C_CLOSE:
865 req->result = req->dbc->c_close (req->dbc);
866 break;
867
868 case REQ_C_COUNT:
869 {
870 db_recno_t recno;
871 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
872 req->uv1 = recno;
873 }
874 break;
875
876 case REQ_C_PUT:
877 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
878 break;
879
880 case REQ_C_GET:
881 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
882 break;
883
884 case REQ_C_PGET:
885 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
886 break;
887
888 case REQ_C_DEL:
889 req->result = req->dbc->c_del (req->dbc, req->uint1);
890 break;
891
892#if DB_VERSION_MINOR >= 3
893 case REQ_SEQ_OPEN:
894 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
895 break;
896
897 case REQ_SEQ_CLOSE:
898 req->result = req->seq->close (req->seq, req->uint1);
899 break;
900
901 case REQ_SEQ_GET:
902 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
903 break;
904
905 case REQ_SEQ_REMOVE:
906 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
907 break;
908#endif
909
910 default:
911 req->result = ENOSYS;
912 break;
913 } 942 }
914 943
915 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) 944 bdb_request (req);
916 req->txn->flags |= TXN_DEADLOCK;
917 945
918 X_LOCK (reslock); 946 X_LOCK (reslock);
919 947
920 ++npending; 948 ++npending;
921 949
… …
983 create_respipe (); 1011 create_respipe ();
984 1012
985 atfork_parent (); 1013 atfork_parent ();
986} 1014}
987 1015
988#define dREQ(reqtype) \ 1016#define dREQ(reqtype,rsvcnt) \
989 bdb_req req; \ 1017 bdb_req req; \
990 int req_pri = next_pri; \ 1018 int req_pri = next_pri; \
991 next_pri = DEFAULT_PRI + PRI_BIAS; \ 1019 next_pri = DEFAULT_PRI + PRI_BIAS; \
992 \ 1020 \
993 if (callback && SvOK (callback)) \ 1021 if (callback && SvOK (callback)) \
… …
995 \ 1023 \
996 Newz (0, req, 1, bdb_cb); \ 1024 Newz (0, req, 1, bdb_cb); \
997 if (!req) \ 1025 if (!req) \
998 croak ("out of memory during bdb_req allocation"); \ 1026 croak ("out of memory during bdb_req allocation"); \
999 \ 1027 \
1000 req->callback = cb ? SvREFCNT_inc (cb) : 0; \ 1028 req->callback = SvREFCNT_inc (cb); \
1001 req->type = (reqtype); \ 1029 req->type = (reqtype); \
1002 req->pri = req_pri 1030 req->pri = req_pri; \
1031 if (rsvcnt >= 1) req->rsv1 = SvREFCNT_inc (ST (0)); \
1032 if (rsvcnt >= 2) req->rsv2 = SvREFCNT_inc (ST (1)); \
1033 (void)0;
1003 1034
1004#define REQ_SEND \ 1035#define REQ_SEND \
1005 req_send (req) 1036 req_send (req)
1006 1037
1007#define SvPTR(var, arg, type, class, nullok) \ 1038#define SvPTR(var, arg, type, class, nullok) \
… …
1014 } \ 1045 } \
1015 else if (sv_derived_from ((arg), # class)) \ 1046 else if (sv_derived_from ((arg), # class)) \
1016 { \ 1047 { \
1017 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1048 IV tmp = SvIV ((SV*) SvRV (arg)); \
1018 (var) = INT2PTR (type, tmp); \ 1049 (var) = INT2PTR (type, tmp); \
1019 if (!var && nullok != 2) \ 1050 if (!var && nullok != 2) \
1020 croak (# var " is not a valid " # class " object anymore"); \ 1051 croak (# var " is not a valid " # class " object anymore"); \
1021 } \ 1052 } \
1022 else \ 1053 else \
1023 croak (# var " is not of type " # class); 1054 croak (# var " is not of type " # class);
1055
1056#define ARG_MUTABLE(name) \
1057 if (SvREADONLY (name)) \
1058 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1024 1059
1025static void 1060static void
1026ptr_nuke (SV *sv) 1061ptr_nuke (SV *sv)
1027{ 1062{
1028 assert (SvROK (sv)); 1063 assert (SvROK (sv));
… …
1306 }; 1341 };
1307 1342
1308 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1343 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1309 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1344 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1310 1345
1346 prepare_cb = &PL_sv_undef;
1347
1311 { 1348 {
1312 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1349 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1313 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH }; 1350 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1314 1351
1315 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1352 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
… …
1453 RETVAL = started; 1490 RETVAL = started;
1454 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1491 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1455 OUTPUT: 1492 OUTPUT:
1456 RETVAL 1493 RETVAL
1457 1494
1458void 1495SV *
1459set_sync_prepare (SV *cb) 1496set_sync_prepare (SV *cb)
1460 PROTOTYPE: & 1497 PROTOTYPE: &
1461 CODE: 1498 CODE:
1462 SvREFCNT_dec (prepare_cb); 1499 RETVAL = prepare_cb;
1463 prepare_cb = newSVsv (cb); 1500 prepare_cb = newSVsv (cb);
1501 OUTPUT:
1502 RETVAL
1464 1503
1465char * 1504char *
1466strerror (int errorno = errno) 1505strerror (int errorno = errno)
1467 PROTOTYPE: ;$ 1506 PROTOTYPE: ;$
1468 CODE: 1507 CODE:
… …
1496db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0) 1535db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
1497 PREINIT: 1536 PREINIT:
1498 CALLBACK 1537 CALLBACK
1499 CODE: 1538 CODE:
1500{ 1539{
1501 dREQ (REQ_ENV_OPEN); 1540 dREQ (REQ_ENV_OPEN, 1);
1502 req->env = env; 1541 req->env = env;
1503 req->uint1 = open_flags | DB_THREAD; 1542 req->uint1 = open_flags | DB_THREAD;
1504 req->int1 = mode; 1543 req->int1 = mode;
1505 req->buf1 = strdup_ornull (db_home); 1544 req->buf1 = strdup_ornull (db_home);
1506 REQ_SEND; 1545 REQ_SEND;
… …
1510db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1549db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1511 PREINIT: 1550 PREINIT:
1512 CALLBACK 1551 CALLBACK
1513 CODE: 1552 CODE:
1514{ 1553{
1554 ptr_nuke (ST (0));
1515 dREQ (REQ_ENV_CLOSE); 1555 dREQ (REQ_ENV_CLOSE, 0);
1516 req->env = env; 1556 req->env = env;
1517 req->uint1 = flags; 1557 req->uint1 = flags;
1518 REQ_SEND; 1558 REQ_SEND;
1519 ptr_nuke (ST (0));
1520} 1559}
1521 1560
1522void 1561void
1523db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1562db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1524 PREINIT: 1563 PREINIT:
1525 CALLBACK 1564 CALLBACK
1526 CODE: 1565 CODE:
1527{ 1566{
1528 dREQ (REQ_ENV_TXN_CHECKPOINT); 1567 dREQ (REQ_ENV_TXN_CHECKPOINT, 1);
1529 req->env = env; 1568 req->env = env;
1530 req->uint1 = kbyte; 1569 req->uint1 = kbyte;
1531 req->int1 = min; 1570 req->int1 = min;
1532 req->uint2 = flags; 1571 req->uint2 = flags;
1533 REQ_SEND; 1572 REQ_SEND;
… …
1537db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0) 1576db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0)
1538 PREINIT: 1577 PREINIT:
1539 CALLBACK 1578 CALLBACK
1540 CODE: 1579 CODE:
1541{ 1580{
1542 dREQ (REQ_ENV_LOCK_DETECT); 1581 dREQ (REQ_ENV_LOCK_DETECT, 1);
1543 req->env = env; 1582 req->env = env;
1544 req->uint1 = flags; 1583 req->uint1 = flags;
1545 req->uint2 = atype; 1584 req->uint2 = atype;
1546 /* req->int2 = 0; dummy */ 1585 /* req->int2 = 0; dummy */
1547 REQ_SEND; 1586 REQ_SEND;
… …
1551db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0) 1590db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0)
1552 PREINIT: 1591 PREINIT:
1553 CALLBACK 1592 CALLBACK
1554 CODE: 1593 CODE:
1555{ 1594{
1556 dREQ (REQ_ENV_MEMP_SYNC); 1595 dREQ (REQ_ENV_MEMP_SYNC, 1);
1557 req->env = env; 1596 req->env = env;
1558 REQ_SEND; 1597 REQ_SEND;
1559} 1598}
1560 1599
1561void 1600void
1562db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0) 1601db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0)
1563 PREINIT: 1602 PREINIT:
1564 CALLBACK 1603 CALLBACK
1565 CODE: 1604 CODE:
1566{ 1605{
1567 dREQ (REQ_ENV_MEMP_TRICKLE); 1606 dREQ (REQ_ENV_MEMP_TRICKLE, 1);
1568 req->env = env; 1607 req->env = env;
1569 req->int1 = percent; 1608 req->int1 = percent;
1570 REQ_SEND; 1609 REQ_SEND;
1571} 1610}
1572 1611
… …
1574db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0) 1613db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0)
1575 PREINIT: 1614 PREINIT:
1576 CALLBACK 1615 CALLBACK
1577 CODE: 1616 CODE:
1578{ 1617{
1579 dREQ (REQ_ENV_DBREMOVE); 1618 dREQ (REQ_ENV_DBREMOVE, 2);
1580 req->env = env; 1619 req->env = env;
1581 req->buf1 = strdup_ornull (file); 1620 req->buf1 = strdup_ornull (file);
1582 req->buf2 = strdup_ornull (database); 1621 req->buf2 = strdup_ornull (database);
1583 req->uint1 = flags; 1622 req->uint1 = flags;
1584 REQ_SEND; 1623 REQ_SEND;
… …
1588db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = 0) 1627db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = 0)
1589 PREINIT: 1628 PREINIT:
1590 CALLBACK 1629 CALLBACK
1591 CODE: 1630 CODE:
1592{ 1631{
1593 dREQ (REQ_ENV_DBRENAME); 1632 dREQ (REQ_ENV_DBRENAME, 2);
1594 req->env = env; 1633 req->env = env;
1595 req->buf1 = strdup_ornull (file); 1634 req->buf1 = strdup_ornull (file);
1596 req->buf2 = strdup_ornull (database); 1635 req->buf2 = strdup_ornull (database);
1597 req->buf3 = strdup_ornull (newname); 1636 req->buf3 = strdup_ornull (newname);
1598 req->uint1 = flags; 1637 req->uint1 = flags;
… …
1617db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0) 1656db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
1618 PREINIT: 1657 PREINIT:
1619 CALLBACK 1658 CALLBACK
1620 CODE: 1659 CODE:
1621{ 1660{
1622 dREQ (REQ_DB_OPEN); 1661 dREQ (REQ_DB_OPEN, 2);
1623 req->db = db; 1662 req->db = db;
1624 req->txn = txnid; 1663 req->txn = txnid;
1625 req->buf1 = strdup_ornull (file); 1664 req->buf1 = strdup_ornull (file);
1626 req->buf2 = strdup_ornull (database); 1665 req->buf2 = strdup_ornull (database);
1627 req->int1 = type; 1666 req->int1 = type;
… …
1634db_close (DB *db, U32 flags = 0, SV *callback = 0) 1673db_close (DB *db, U32 flags = 0, SV *callback = 0)
1635 PREINIT: 1674 PREINIT:
1636 CALLBACK 1675 CALLBACK
1637 CODE: 1676 CODE:
1638{ 1677{
1678 ptr_nuke (ST (0));
1639 dREQ (REQ_DB_CLOSE); 1679 dREQ (REQ_DB_CLOSE, 0);
1640 req->db = db; 1680 req->db = db;
1641 req->uint1 = flags; 1681 req->uint1 = flags;
1642 req->sv1 = (SV *)db->app_private; 1682 req->sv1 = (SV *)db->app_private;
1643 REQ_SEND; 1683 REQ_SEND;
1644 ptr_nuke (ST (0));
1645} 1684}
1646 1685
1647#if DB_VERSION_MINOR >= 4 1686#if DB_VERSION_MINOR >= 4
1648 1687
1649void 1688void
1650db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = 0) 1689db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = 0)
1651 PREINIT: 1690 PREINIT:
1652 CALLBACK 1691 CALLBACK
1653 CODE: 1692 CODE:
1654{ 1693{
1655 dREQ (REQ_DB_COMPACT); 1694 dREQ (REQ_DB_COMPACT, 2);
1656 req->db = db; 1695 req->db = db;
1657 req->txn = txn; 1696 req->txn = txn;
1658 sv_to_dbt (&req->dbt1, start); 1697 sv_to_dbt (&req->dbt1, start);
1659 sv_to_dbt (&req->dbt2, stop); 1698 sv_to_dbt (&req->dbt2, stop);
1660 req->uint1 = flags; 1699 req->uint1 = flags;
… …
1667db_sync (DB *db, U32 flags = 0, SV *callback = 0) 1706db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1668 PREINIT: 1707 PREINIT:
1669 CALLBACK 1708 CALLBACK
1670 CODE: 1709 CODE:
1671{ 1710{
1672 dREQ (REQ_DB_SYNC); 1711 dREQ (REQ_DB_SYNC, 1);
1673 req->db = db; 1712 req->db = db;
1674 req->uint1 = flags; 1713 req->uint1 = flags;
1675 REQ_SEND; 1714 REQ_SEND;
1676} 1715}
1677 1716
… …
1679db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1718db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1680 PREINIT: 1719 PREINIT:
1681 CALLBACK 1720 CALLBACK
1682 CODE: 1721 CODE:
1683{ 1722{
1684 dREQ (REQ_DB_SYNC); 1723 dREQ (REQ_DB_SYNC, 1);
1685 req->db = db; 1724 req->db = db;
1686 req->buf1 = strdup (file); 1725 req->buf1 = strdup (file);
1687 req->uint1 = flags; 1726 req->uint1 = flags;
1688 REQ_SEND; 1727 REQ_SEND;
1689} 1728}
1690 1729
1691void 1730void
1692db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1731db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *key_range, U32 flags = 0, SV *callback = 0)
1693 PREINIT: 1732 PREINIT:
1694 CALLBACK 1733 CALLBACK
1695 CODE: 1734 CODE:
1696{ 1735{
1697 dREQ (REQ_DB_KEY_RANGE); 1736 dREQ (REQ_DB_KEY_RANGE, 2);
1698 req->db = db; 1737 req->db = db;
1699 req->txn = txn; 1738 req->txn = txn;
1700 sv_to_dbt (&req->dbt1, key); 1739 sv_to_dbt (&req->dbt1, key);
1701 req->uint1 = flags; 1740 req->uint1 = flags;
1702 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1741 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
… …
1707db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1746db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1708 PREINIT: 1747 PREINIT:
1709 CALLBACK 1748 CALLBACK
1710 CODE: 1749 CODE:
1711{ 1750{
1712 dREQ (REQ_DB_PUT); 1751 dREQ (REQ_DB_PUT, 2);
1713 req->db = db; 1752 req->db = db;
1714 req->txn = txn; 1753 req->txn = txn;
1715 sv_to_dbt (&req->dbt1, key); 1754 sv_to_dbt (&req->dbt1, key);
1716 sv_to_dbt (&req->dbt2, data); 1755 sv_to_dbt (&req->dbt2, data);
1717 req->uint1 = flags; 1756 req->uint1 = flags;
… …
1724db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1763db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1725 PREINIT: 1764 PREINIT:
1726 CALLBACK 1765 CALLBACK
1727 CODE: 1766 CODE:
1728{ 1767{
1729 dREQ (REQ_DB_EXISTS); 1768 dREQ (REQ_DB_EXISTS, 2);
1730 req->db = db; 1769 req->db = db;
1731 req->txn = txn; 1770 req->txn = txn;
1732 req->uint1 = flags; 1771 req->uint1 = flags;
1733 sv_to_dbt (&req->dbt1, key); 1772 sv_to_dbt (&req->dbt1, key);
1734 REQ_SEND; 1773 REQ_SEND;
1735} 1774}
1736 1775
1737#endif 1776#endif
1738 1777
1739void 1778void
1740db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1779db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1741 PREINIT: 1780 PREINIT:
1742 CALLBACK 1781 CALLBACK
1743 CODE: 1782 CODE:
1744 if (SvREADONLY (data))
1745 croak ("can't modify read-only data scalar in db_get");
1746{ 1783{
1784 //TODO: key is somtimesmutable
1747 dREQ (REQ_DB_GET); 1785 dREQ (REQ_DB_GET, 2);
1748 req->db = db; 1786 req->db = db;
1749 req->txn = txn; 1787 req->txn = txn;
1750 req->uint1 = flags; 1788 req->uint1 = flags;
1751 sv_to_dbt (&req->dbt1, key); 1789 sv_to_dbt (&req->dbt1, key);
1752 req->dbt3.flags = DB_DBT_MALLOC; 1790 req->dbt3.flags = DB_DBT_MALLOC;
1753 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1791 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1754 REQ_SEND; 1792 REQ_SEND;
1755} 1793}
1756 1794
1757void 1795void
1758db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1796db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1759 PREINIT: 1797 PREINIT:
1760 CALLBACK 1798 CALLBACK
1761 CODE: 1799 CODE:
1762 if (SvREADONLY (data))
1763 croak ("can't modify read-only data scalar in db_pget");
1764{ 1800{
1801 //TODO: key is somtimesmutable
1765 dREQ (REQ_DB_PGET); 1802 dREQ (REQ_DB_PGET, 2);
1803 req->db = db;
1804 req->txn = txn;
1805 req->uint1 = flags;
1806
1807 sv_to_dbt (&req->dbt1, key);
1808
1809 req->dbt2.flags = DB_DBT_MALLOC;
1810 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1811
1812 req->dbt3.flags = DB_DBT_MALLOC;
1813 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1814 REQ_SEND;
1815}
1816
1817void
1818db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1819 PREINIT:
1820 CALLBACK
1821 CODE:
1822{
1823 dREQ (REQ_DB_DEL, 2);
1766 req->db = db; 1824 req->db = db;
1767 req->txn = txn; 1825 req->txn = txn;
1768 req->uint1 = flags; 1826 req->uint1 = flags;
1769 sv_to_dbt (&req->dbt1, key); 1827 sv_to_dbt (&req->dbt1, key);
1770 sv_to_dbt (&req->dbt2, pkey);
1771 req->dbt3.flags = DB_DBT_MALLOC;
1772 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1773 REQ_SEND; 1828 REQ_SEND;
1774} 1829}
1775 1830
1776void 1831void
1777db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) 1832db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1778 PREINIT: 1833 PREINIT:
1779 CALLBACK 1834 CALLBACK
1780 CODE: 1835 CODE:
1781{ 1836{
1782 dREQ (REQ_DB_DEL); 1837 ptr_nuke (ST (0));
1783 req->db = db; 1838 dREQ (REQ_TXN_COMMIT, 0);
1784 req->txn = txn; 1839 req->txn = txn;
1785 req->uint1 = flags; 1840 req->uint1 = flags;
1786 sv_to_dbt (&req->dbt1, key);
1787 REQ_SEND; 1841 REQ_SEND;
1788} 1842}
1789 1843
1790void 1844void
1845db_txn_abort (DB_TXN *txn, SV *callback = 0)
1846 PREINIT:
1847 CALLBACK
1848 CODE:
1849{
1850 ptr_nuke (ST (0));
1851 dREQ (REQ_TXN_ABORT, 0);
1852 req->txn = txn;
1853 REQ_SEND;
1854}
1855
1856void
1791db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1857db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1792 PREINIT: 1858 PREINIT:
1793 CALLBACK 1859 CALLBACK
1794 CODE: 1860 CODE:
1795{ 1861{
1862 ptr_nuke (ST (0));
1796 dREQ (REQ_TXN_COMMIT); 1863 dREQ (REQ_TXN_FINISH, 0);
1797 req->txn = txn; 1864 req->txn = txn;
1798 req->uint1 = flags; 1865 req->uint1 = flags;
1799 REQ_SEND; 1866 REQ_SEND;
1867}
1868
1869void
1870db_c_close (DBC *dbc, SV *callback = 0)
1871 PREINIT:
1872 CALLBACK
1873 CODE:
1874{
1800 ptr_nuke (ST (0)); 1875 ptr_nuke (ST (0));
1801}
1802
1803void
1804db_txn_abort (DB_TXN *txn, SV *callback = 0)
1805 PREINIT:
1806 CALLBACK
1807 CODE:
1808{
1809 dREQ (REQ_TXN_ABORT);
1810 req->txn = txn;
1811 REQ_SEND;
1812 ptr_nuke (ST (0));
1813}
1814
1815void
1816db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1817 PREINIT:
1818 CALLBACK
1819 CODE:
1820{
1821 dREQ (REQ_TXN_FINISH);
1822 req->txn = txn;
1823 req->uint1 = flags;
1824 REQ_SEND;
1825 ptr_nuke (ST (0));
1826}
1827
1828void
1829db_c_close (DBC *dbc, SV *callback = 0)
1830 PREINIT:
1831 CALLBACK
1832 CODE:
1833{
1834 dREQ (REQ_C_CLOSE); 1876 dREQ (REQ_C_CLOSE, 0);
1835 req->dbc = dbc; 1877 req->dbc = dbc;
1836 REQ_SEND; 1878 REQ_SEND;
1837 ptr_nuke (ST (0));
1838} 1879}
1839 1880
1840void 1881void
1841db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1882db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1842 PREINIT: 1883 PREINIT:
1843 CALLBACK 1884 CALLBACK
1844 CODE: 1885 CODE:
1845{ 1886{
1846 dREQ (REQ_C_COUNT); 1887 dREQ (REQ_C_COUNT, 1);
1847 req->dbc = dbc; 1888 req->dbc = dbc;
1848 req->sv1 = SvREFCNT_inc (count); 1889 req->sv1 = SvREFCNT_inc (count);
1849 REQ_SEND; 1890 REQ_SEND;
1850} 1891}
1851 1892
… …
1853db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1894db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1854 PREINIT: 1895 PREINIT:
1855 CALLBACK 1896 CALLBACK
1856 CODE: 1897 CODE:
1857{ 1898{
1858 dREQ (REQ_C_PUT); 1899 dREQ (REQ_C_PUT, 1);
1859 req->dbc = dbc; 1900 req->dbc = dbc;
1860 sv_to_dbt (&req->dbt1, key); 1901 sv_to_dbt (&req->dbt1, key);
1861 sv_to_dbt (&req->dbt2, data); 1902 sv_to_dbt (&req->dbt2, data);
1862 req->uint1 = flags; 1903 req->uint1 = flags;
1863 REQ_SEND; 1904 REQ_SEND;
1864} 1905}
1865 1906
1866void 1907void
1867db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1908db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1868 PREINIT: 1909 PREINIT:
1869 CALLBACK 1910 CALLBACK
1870 CODE: 1911 CODE:
1871{ 1912{
1913 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key))
1914 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1915
1872 dREQ (REQ_C_GET); 1916 dREQ (REQ_C_GET, 1);
1873 req->dbc = dbc; 1917 req->dbc = dbc;
1874 req->uint1 = flags; 1918 req->uint1 = flags;
1875 if ((flags & DB_SET) == DB_SET 1919 if (flags & DB_OPFLAGS_MASK == DB_SET)
1876 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1877 sv_to_dbt (&req->dbt1, key); 1920 sv_to_dbt (&req->dbt1, key);
1878 else 1921 else
1922 {
1923 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1924 sv_to_dbt (&req->dbt1, key);
1925 else
1879 req->dbt1.flags = DB_DBT_MALLOC; 1926 req->dbt1.flags = DB_DBT_MALLOC;
1880 1927
1881 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1928 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1929 }
1882 1930
1883 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1931 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1884 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1932 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1885 sv_to_dbt (&req->dbt3, data); 1933 sv_to_dbt (&req->dbt3, data);
1886 else 1934 else
1887 req->dbt3.flags = DB_DBT_MALLOC; 1935 req->dbt3.flags = DB_DBT_MALLOC;
1888 1936
1889 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1937 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1890 REQ_SEND; 1938 REQ_SEND;
1891} 1939}
1892 1940
1893void 1941void
1894db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1942db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1895 PREINIT: 1943 PREINIT:
1896 CALLBACK 1944 CALLBACK
1897 CODE: 1945 CODE:
1898{ 1946{
1947 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key))
1948 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
1949
1899 dREQ (REQ_C_PGET); 1950 dREQ (REQ_C_PGET, 1);
1900 req->dbc = dbc; 1951 req->dbc = dbc;
1901 req->uint1 = flags; 1952 req->uint1 = flags;
1902 if ((flags & DB_SET) == DB_SET 1953 if (flags & DB_OPFLAGS_MASK == DB_SET)
1903 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1904 sv_to_dbt (&req->dbt1, key); 1954 sv_to_dbt (&req->dbt1, key);
1905 else 1955 else
1956 {
1957 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1958 sv_to_dbt (&req->dbt1, key);
1959 else
1906 req->dbt1.flags = DB_DBT_MALLOC; 1960 req->dbt1.flags = DB_DBT_MALLOC;
1907 1961
1908 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1962 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1963 }
1909 1964
1910 req->dbt2.flags = DB_DBT_MALLOC; 1965 req->dbt2.flags = DB_DBT_MALLOC;
1911 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 1966 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1912 1967
1913 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1968 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1914 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1969 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1915 sv_to_dbt (&req->dbt3, data); 1970 sv_to_dbt (&req->dbt3, data);
1916 else 1971 else
1917 req->dbt3.flags = DB_DBT_MALLOC; 1972 req->dbt3.flags = DB_DBT_MALLOC;
1918 1973
1919 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1974 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
1924db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 1979db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1925 PREINIT: 1980 PREINIT:
1926 CALLBACK 1981 CALLBACK
1927 CODE: 1982 CODE:
1928{ 1983{
1929 dREQ (REQ_C_DEL); 1984 dREQ (REQ_C_DEL, 1);
1930 req->dbc = dbc; 1985 req->dbc = dbc;
1931 req->uint1 = flags; 1986 req->uint1 = flags;
1932 REQ_SEND; 1987 REQ_SEND;
1933} 1988}
1934 1989
… …
1939db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0) 1994db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0)
1940 PREINIT: 1995 PREINIT:
1941 CALLBACK 1996 CALLBACK
1942 CODE: 1997 CODE:
1943{ 1998{
1944 dREQ (REQ_SEQ_OPEN); 1999 dREQ (REQ_SEQ_OPEN, 2);
1945 req->seq = seq; 2000 req->seq = seq;
1946 req->txn = txnid; 2001 req->txn = txnid;
1947 req->uint1 = flags | DB_THREAD; 2002 req->uint1 = flags | DB_THREAD;
1948 sv_to_dbt (&req->dbt1, key); 2003 sv_to_dbt (&req->dbt1, key);
1949 REQ_SEND; 2004 REQ_SEND;
… …
1953db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2008db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1954 PREINIT: 2009 PREINIT:
1955 CALLBACK 2010 CALLBACK
1956 CODE: 2011 CODE:
1957{ 2012{
2013 ptr_nuke (ST (0));
1958 dREQ (REQ_SEQ_CLOSE); 2014 dREQ (REQ_SEQ_CLOSE, 0);
1959 req->seq = seq; 2015 req->seq = seq;
1960 req->uint1 = flags; 2016 req->uint1 = flags;
1961 REQ_SEND; 2017 REQ_SEND;
1962 ptr_nuke (ST (0));
1963} 2018}
1964 2019
1965void 2020void
1966db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 2021db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV_mutable *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1967 PREINIT: 2022 PREINIT:
1968 CALLBACK 2023 CALLBACK
1969 CODE: 2024 CODE:
1970{ 2025{
1971 dREQ (REQ_SEQ_GET); 2026 dREQ (REQ_SEQ_GET, 2);
1972 req->seq = seq; 2027 req->seq = seq;
1973 req->txn = txnid; 2028 req->txn = txnid;
1974 req->int1 = delta; 2029 req->int1 = delta;
1975 req->uint1 = flags; 2030 req->uint1 = flags;
1976 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 2031 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
… …
1981db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0) 2036db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
1982 PREINIT: 2037 PREINIT:
1983 CALLBACK 2038 CALLBACK
1984 CODE: 2039 CODE:
1985{ 2040{
1986 dREQ (REQ_SEQ_REMOVE); 2041 dREQ (REQ_SEQ_REMOVE, 2);
1987 req->seq = seq; 2042 req->seq = seq;
1988 req->txn = txnid; 2043 req->txn = txnid;
1989 req->uint1 = flags; 2044 req->uint1 = flags;
1990 REQ_SEND; 2045 REQ_SEND;
1991} 2046}

Diff Legend

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