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.56 by root, Mon Sep 29 02:59:08 2008 UTC

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

Diff Legend

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