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

Comparing BDB/BDB.xs (file contents):
Revision 1.50 by root, Thu Sep 25 13:22:32 2008 UTC vs.
Revision 1.54 by root, Fri Sep 26 02:03:48 2008 UTC

39#endif 39#endif
40 40
41/* number of seconds after which idle threads exit */ 41/* number of seconds after which idle threads exit */
42#define IDLE_TIMEOUT 10 42#define IDLE_TIMEOUT 10
43 43
44typedef SV SV_mutable;
45
44typedef DB_ENV DB_ENV_ornull; 46typedef DB_ENV DB_ENV_ornull;
45typedef DB_TXN DB_TXN_ornull; 47typedef DB_TXN DB_TXN_ornull;
46typedef DBC DBC_ornull; 48typedef DBC DBC_ornull;
47typedef DB DB_ornull; 49typedef DB DB_ornull;
48 50
139 SvREADONLY_off (sv); 141 SvREADONLY_off (sv);
140 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef); 142 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef);
141 SvREFCNT_dec (sv); 143 SvREFCNT_dec (sv);
142 } 144 }
143 145
144 //assert (dbt->flags & DBT_MALLOC || !dbt->data); 146 if (dbt->flags & DB_DBT_MALLOC)
145 free (dbt->data); 147 free (dbt->data);
146} 148}
147 149
148enum { 150enum {
149 REQ_QUIT, 151 REQ_QUIT,
150 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,
351static void req_free (bdb_req req); 353static void req_free (bdb_req req);
352static void req_cancel (bdb_req req); 354static void req_cancel (bdb_req req);
353 355
354static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
355{ 357{
356 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;
357 404
358 if (req->callback) 405 if (req->callback)
359 { 406 {
407 dSP;
408
360 ENTER; 409 ENTER;
361 SAVETMPS; 410 SAVETMPS;
362 PUSHMARK (SP); 411 PUSHMARK (SP);
363 412
364 switch (req->type)
365 {
366 case REQ_DB_CLOSE:
367 SvREFCNT_dec (req->sv1);
368 break;
369
370 case REQ_DB_GET:
371 case REQ_DB_PGET:
372 dbt_to_sv (req->sv3, &req->dbt3);
373 break;
374
375 case REQ_C_GET:
376 case REQ_C_PGET:
377 dbt_to_sv (req->sv1, &req->dbt1);
378 dbt_to_sv (req->sv2, &req->dbt2);
379 dbt_to_sv (req->sv3, &req->dbt3);
380 break;
381
382 case REQ_DB_PUT:
383 case REQ_C_PUT:
384 dbt_to_sv (0, &req->dbt1);
385 dbt_to_sv (0, &req->dbt2);
386 break;
387
388 case REQ_DB_KEY_RANGE:
389 {
390 AV *av = newAV ();
391
392 av_push (av, newSVnv (req->key_range.less));
393 av_push (av, newSVnv (req->key_range.equal));
394 av_push (av, newSVnv (req->key_range.greater));
395
396 SvREADONLY_off (req->sv1);
397 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
398 SvREFCNT_dec (req->sv1);
399 }
400 break;
401
402#if DB_VERSION_MINOR >= 3
403 case REQ_SEQ_GET:
404 SvREADONLY_off (req->sv1);
405
406 if (sizeof (IV) > 4)
407 sv_setiv_mg (req->sv1, (IV)req->seq_t);
408 else
409 sv_setnv_mg (req->sv1, (NV)req->seq_t);
410
411 SvREFCNT_dec (req->sv1);
412 break;
413#endif
414 }
415
416 errno = req->result;
417
418 PUTBACK; 413 PUTBACK;
419 call_sv (req->callback, G_VOID | G_EVAL); 414 call_sv (req->callback, G_VOID | G_EVAL);
420 SPAGAIN; 415 SPAGAIN;
421 416
422 FREETMPS; 417 FREETMPS;
423 LEAVE; 418 LEAVE;
419
420 return !SvTRUE (ERRSV);
424 } 421 }
425 422
426 return !SvTRUE (ERRSV); 423 return 1;
427} 424}
428 425
429static void req_free (bdb_req req) 426static void req_free (bdb_req req)
430{ 427{
431 SvREFCNT_dec (req->callback); 428 SvREFCNT_dec (req->callback);
485 482
486 respipe_osf [0] = TO_SOCKET (respipe [0]); 483 respipe_osf [0] = TO_SOCKET (respipe [0]);
487 respipe_osf [1] = TO_SOCKET (respipe [1]); 484 respipe_osf [1] = TO_SOCKET (respipe [1]);
488} 485}
489 486
487static void bdb_request (bdb_req req);
490X_THREAD_PROC (bdb_proc); 488X_THREAD_PROC (bdb_proc);
491 489
492static void start_thread (void) 490static void start_thread (void)
493{ 491{
494 worker *wrk = calloc (1, sizeof (worker)); 492 worker *wrk = calloc (1, sizeof (worker));
541 } 539 }
542 540
543 // synthesize callback if none given 541 // synthesize callback if none given
544 if (!req->callback) 542 if (!req->callback)
545 { 543 {
544 if (SvOK (prepare_cb))
545 {
546 int count; 546 int count;
547 547
548 dSP; 548 dSP;
549 PUSHMARK (SP); 549 PUSHMARK (SP);
550 PUTBACK; 550 PUTBACK;
551 count = call_sv (prepare_cb, G_ARRAY); 551 count = call_sv (prepare_cb, G_ARRAY);
552 SPAGAIN; 552 SPAGAIN;
553 553
554 if (count != 2) 554 if (count != 2)
555 croak ("prepare callback must return exactly two values\n"); 555 croak ("sync prepare callback must return exactly two values\n");
556 556
557 wait_callback = POPs; 557 wait_callback = POPs;
558 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 }
559 } 568 }
560 569
561 ++nreqs; 570 ++nreqs;
562 571
563 X_LOCK (reqlock); 572 X_LOCK (reqlock);
577 } 586 }
578} 587}
579 588
580static void end_thread (void) 589static void end_thread (void)
581{ 590{
582 bdb_req req; 591 bdb_req req = calloc (1, sizeof (bdb_cb));
583
584 Newz (0, req, 1, bdb_cb);
585 592
586 req->type = REQ_QUIT; 593 req->type = REQ_QUIT;
587 req->pri = PRI_MAX + PRI_BIAS; 594 req->pri = PRI_MAX + PRI_BIAS;
588 595
589 X_LOCK (reqlock); 596 X_LOCK (reqlock);
714 721
715 return count; 722 return count;
716} 723}
717 724
718/*****************************************************************************/ 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}
719 884
720X_THREAD_PROC (bdb_proc) 885X_THREAD_PROC (bdb_proc)
721{ 886{
722 bdb_req req; 887 bdb_req req;
723 struct timespec ts; 888 struct timespec ts;
764 929
765 --nready; 930 --nready;
766 931
767 X_UNLOCK (reqlock); 932 X_UNLOCK (reqlock);
768 933
769 switch (req->type) 934 if (req->type == REQ_QUIT)
770 { 935 {
771 case REQ_QUIT: 936 X_LOCK (reslock);
772 req->result = ENOSYS; 937 free (req);
938 self->req = 0;
939 X_UNLOCK (reslock);
940
773 goto quit; 941 goto quit;
774
775 case REQ_ENV_OPEN:
776 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
777 break;
778
779 case REQ_ENV_CLOSE:
780 req->result = req->env->close (req->env, req->uint1);
781 break;
782
783 case REQ_ENV_TXN_CHECKPOINT:
784 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
785 break;
786
787 case REQ_ENV_LOCK_DETECT:
788 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
789 break;
790
791 case REQ_ENV_MEMP_SYNC:
792 req->result = req->env->memp_sync (req->env, 0);
793 break;
794
795 case REQ_ENV_MEMP_TRICKLE:
796 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
797 break;
798
799 case REQ_ENV_DBREMOVE:
800 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
801 break;
802
803 case REQ_ENV_DBRENAME:
804 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
805 break;
806
807 case REQ_DB_OPEN:
808 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
809 break;
810
811 case REQ_DB_CLOSE:
812 req->result = req->db->close (req->db, req->uint1);
813 break;
814
815#if DB_VERSION_MINOR >= 4
816 case REQ_DB_COMPACT:
817 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
818 break;
819#endif
820
821 case REQ_DB_SYNC:
822 req->result = req->db->sync (req->db, req->uint1);
823 break;
824
825 case REQ_DB_UPGRADE:
826 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
827 break;
828
829 case REQ_DB_PUT:
830 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
831 break;
832
833#if DB_VERSION_MINOR >= 6
834 case REQ_DB_EXISTS:
835 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
836 break;
837#endif
838 case REQ_DB_GET:
839 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
840 break;
841
842 case REQ_DB_PGET:
843 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
844 break;
845
846 case REQ_DB_DEL:
847 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
848 break;
849
850 case REQ_DB_KEY_RANGE:
851 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
852 break;
853
854 case REQ_TXN_COMMIT:
855 req->result = req->txn->commit (req->txn, req->uint1);
856 break;
857
858 case REQ_TXN_ABORT:
859 req->result = req->txn->abort (req->txn);
860 break;
861
862 case REQ_TXN_FINISH:
863 if (req->txn->flags & TXN_DEADLOCK)
864 {
865 req->result = req->txn->abort (req->txn);
866 if (!req->result)
867 req->result = DB_LOCK_DEADLOCK;
868 }
869 else
870 req->result = req->txn->commit (req->txn, req->uint1);
871 break;
872
873 case REQ_C_CLOSE:
874 req->result = req->dbc->c_close (req->dbc);
875 break;
876
877 case REQ_C_COUNT:
878 {
879 db_recno_t recno;
880 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
881 req->uv1 = recno;
882 }
883 break;
884
885 case REQ_C_PUT:
886 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
887 break;
888
889 case REQ_C_GET:
890 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
891 break;
892
893 case REQ_C_PGET:
894 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
895 break;
896
897 case REQ_C_DEL:
898 req->result = req->dbc->c_del (req->dbc, req->uint1);
899 break;
900
901#if DB_VERSION_MINOR >= 3
902 case REQ_SEQ_OPEN:
903 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
904 break;
905
906 case REQ_SEQ_CLOSE:
907 req->result = req->seq->close (req->seq, req->uint1);
908 break;
909
910 case REQ_SEQ_GET:
911 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
912 break;
913
914 case REQ_SEQ_REMOVE:
915 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
916 break;
917#endif
918
919 default:
920 req->result = ENOSYS;
921 break;
922 } 942 }
923 943
924 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) 944 bdb_request (req);
925 req->txn->flags |= TXN_DEADLOCK;
926 945
927 X_LOCK (reslock); 946 X_LOCK (reslock);
928 947
929 ++npending; 948 ++npending;
930 949
1026 } \ 1045 } \
1027 else if (sv_derived_from ((arg), # class)) \ 1046 else if (sv_derived_from ((arg), # class)) \
1028 { \ 1047 { \
1029 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1048 IV tmp = SvIV ((SV*) SvRV (arg)); \
1030 (var) = INT2PTR (type, tmp); \ 1049 (var) = INT2PTR (type, tmp); \
1031 if (!var && nullok != 2) \ 1050 if (!var && nullok != 2) \
1032 croak (# var " is not a valid " # class " object anymore"); \ 1051 croak (# var " is not a valid " # class " object anymore"); \
1033 } \ 1052 } \
1034 else \ 1053 else \
1035 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");
1036 1059
1037static void 1060static void
1038ptr_nuke (SV *sv) 1061ptr_nuke (SV *sv)
1039{ 1062{
1040 assert (SvROK (sv)); 1063 assert (SvROK (sv));
1318 }; 1341 };
1319 1342
1320 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; )
1321 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1344 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1322 1345
1346 prepare_cb = &PL_sv_undef;
1347
1323 { 1348 {
1324 /* 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 */
1325 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 };
1326 1351
1327 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1352 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1465 RETVAL = started; 1490 RETVAL = started;
1466 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1491 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1467 OUTPUT: 1492 OUTPUT:
1468 RETVAL 1493 RETVAL
1469 1494
1470void 1495SV *
1471set_sync_prepare (SV *cb) 1496set_sync_prepare (SV *cb)
1472 PROTOTYPE: & 1497 PROTOTYPE: &
1473 CODE: 1498 CODE:
1474 SvREFCNT_dec (prepare_cb); 1499 RETVAL = prepare_cb;
1475 prepare_cb = newSVsv (cb); 1500 prepare_cb = newSVsv (cb);
1501 OUTPUT:
1502 RETVAL
1476 1503
1477char * 1504char *
1478strerror (int errorno = errno) 1505strerror (int errorno = errno)
1479 PROTOTYPE: ;$ 1506 PROTOTYPE: ;$
1480 CODE: 1507 CODE:
1522db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1549db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1523 PREINIT: 1550 PREINIT:
1524 CALLBACK 1551 CALLBACK
1525 CODE: 1552 CODE:
1526{ 1553{
1554 ptr_nuke (ST (0));
1527 dREQ (REQ_ENV_CLOSE, 1); 1555 dREQ (REQ_ENV_CLOSE, 0);
1528 req->env = env; 1556 req->env = env;
1529 req->uint1 = flags; 1557 req->uint1 = flags;
1530 REQ_SEND; 1558 REQ_SEND;
1531 ptr_nuke (ST (0));
1532} 1559}
1533 1560
1534void 1561void
1535db_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)
1536 PREINIT: 1563 PREINIT:
1646db_close (DB *db, U32 flags = 0, SV *callback = 0) 1673db_close (DB *db, U32 flags = 0, SV *callback = 0)
1647 PREINIT: 1674 PREINIT:
1648 CALLBACK 1675 CALLBACK
1649 CODE: 1676 CODE:
1650{ 1677{
1678 ptr_nuke (ST (0));
1651 dREQ (REQ_DB_CLOSE, 1); 1679 dREQ (REQ_DB_CLOSE, 0);
1652 req->db = db; 1680 req->db = db;
1653 req->uint1 = flags; 1681 req->uint1 = flags;
1654 req->sv1 = (SV *)db->app_private; 1682 req->sv1 = (SV *)db->app_private;
1655 REQ_SEND; 1683 REQ_SEND;
1656 ptr_nuke (ST (0));
1657} 1684}
1658 1685
1659#if DB_VERSION_MINOR >= 4 1686#if DB_VERSION_MINOR >= 4
1660 1687
1661void 1688void
1699 req->uint1 = flags; 1726 req->uint1 = flags;
1700 REQ_SEND; 1727 REQ_SEND;
1701} 1728}
1702 1729
1703void 1730void
1704db_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)
1705 PREINIT: 1732 PREINIT:
1706 CALLBACK 1733 CALLBACK
1707 CODE: 1734 CODE:
1708{ 1735{
1709 dREQ (REQ_DB_KEY_RANGE, 2); 1736 dREQ (REQ_DB_KEY_RANGE, 2);
1747} 1774}
1748 1775
1749#endif 1776#endif
1750 1777
1751void 1778void
1752db_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)
1753 PREINIT: 1780 PREINIT:
1754 CALLBACK 1781 CALLBACK
1755 CODE: 1782 CODE:
1756 if (SvREADONLY (data))
1757 croak ("can't modify read-only data scalar in db_get");
1758{ 1783{
1784 //TODO: key is somtimesmutable
1759 dREQ (REQ_DB_GET, 2); 1785 dREQ (REQ_DB_GET, 2);
1760 req->db = db; 1786 req->db = db;
1761 req->txn = txn; 1787 req->txn = txn;
1762 req->uint1 = flags; 1788 req->uint1 = flags;
1763 sv_to_dbt (&req->dbt1, key); 1789 sv_to_dbt (&req->dbt1, key);
1765 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1791 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1766 REQ_SEND; 1792 REQ_SEND;
1767} 1793}
1768 1794
1769void 1795void
1770db_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)
1771 PREINIT: 1797 PREINIT:
1772 CALLBACK 1798 CALLBACK
1773 CODE: 1799 CODE:
1774 if (SvREADONLY (data))
1775 croak ("can't modify read-only data scalar in db_pget");
1776{ 1800{
1801 //TODO: key is somtimesmutable
1777 dREQ (REQ_DB_PGET, 2); 1802 dREQ (REQ_DB_PGET, 2);
1778 req->db = db; 1803 req->db = db;
1779 req->txn = txn; 1804 req->txn = txn;
1780 req->uint1 = flags; 1805 req->uint1 = flags;
1806
1781 sv_to_dbt (&req->dbt1, key); 1807 sv_to_dbt (&req->dbt1, key);
1782 sv_to_dbt (&req->dbt2, pkey); 1808
1809 req->dbt2.flags = DB_DBT_MALLOC;
1810 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1811
1783 req->dbt3.flags = DB_DBT_MALLOC; 1812 req->dbt3.flags = DB_DBT_MALLOC;
1784 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1813 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1785 REQ_SEND; 1814 REQ_SEND;
1786} 1815}
1787 1816
1803db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1832db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1804 PREINIT: 1833 PREINIT:
1805 CALLBACK 1834 CALLBACK
1806 CODE: 1835 CODE:
1807{ 1836{
1837 ptr_nuke (ST (0));
1808 dREQ (REQ_TXN_COMMIT, 1); 1838 dREQ (REQ_TXN_COMMIT, 0);
1809 req->txn = txn; 1839 req->txn = txn;
1810 req->uint1 = flags; 1840 req->uint1 = flags;
1811 REQ_SEND; 1841 REQ_SEND;
1842}
1843
1844void
1845db_txn_abort (DB_TXN *txn, SV *callback = 0)
1846 PREINIT:
1847 CALLBACK
1848 CODE:
1849{
1812 ptr_nuke (ST (0)); 1850 ptr_nuke (ST (0));
1813}
1814
1815void
1816db_txn_abort (DB_TXN *txn, SV *callback = 0)
1817 PREINIT:
1818 CALLBACK
1819 CODE:
1820{
1821 dREQ (REQ_TXN_ABORT, 1); 1851 dREQ (REQ_TXN_ABORT, 0);
1822 req->txn = txn; 1852 req->txn = txn;
1823 REQ_SEND; 1853 REQ_SEND;
1854}
1855
1856void
1857db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1858 PREINIT:
1859 CALLBACK
1860 CODE:
1861{
1824 ptr_nuke (ST (0)); 1862 ptr_nuke (ST (0));
1825}
1826
1827void
1828db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1829 PREINIT:
1830 CALLBACK
1831 CODE:
1832{
1833 dREQ (REQ_TXN_FINISH, 1); 1863 dREQ (REQ_TXN_FINISH, 0);
1834 req->txn = txn; 1864 req->txn = txn;
1835 req->uint1 = flags; 1865 req->uint1 = flags;
1836 REQ_SEND; 1866 REQ_SEND;
1867}
1868
1869void
1870db_c_close (DBC *dbc, SV *callback = 0)
1871 PREINIT:
1872 CALLBACK
1873 CODE:
1874{
1837 ptr_nuke (ST (0)); 1875 ptr_nuke (ST (0));
1838}
1839
1840void
1841db_c_close (DBC *dbc, SV *callback = 0)
1842 PREINIT:
1843 CALLBACK
1844 CODE:
1845{
1846 dREQ (REQ_C_CLOSE, 1); 1876 dREQ (REQ_C_CLOSE, 0);
1847 req->dbc = dbc; 1877 req->dbc = dbc;
1848 REQ_SEND; 1878 REQ_SEND;
1849 ptr_nuke (ST (0));
1850} 1879}
1851 1880
1852void 1881void
1853db_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)
1854 PREINIT: 1883 PREINIT:
1874 req->uint1 = flags; 1903 req->uint1 = flags;
1875 REQ_SEND; 1904 REQ_SEND;
1876} 1905}
1877 1906
1878void 1907void
1879db_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)
1880 PREINIT: 1909 PREINIT:
1881 CALLBACK 1910 CALLBACK
1882 CODE: 1911 CODE:
1883{ 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
1884 dREQ (REQ_C_GET, 1); 1916 dREQ (REQ_C_GET, 1);
1885 req->dbc = dbc; 1917 req->dbc = dbc;
1886 req->uint1 = flags; 1918 req->uint1 = flags;
1887 if ((flags & DB_SET) == DB_SET 1919 if (flags & DB_OPFLAGS_MASK == DB_SET)
1888 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1889 sv_to_dbt (&req->dbt1, key); 1920 sv_to_dbt (&req->dbt1, key);
1890 else 1921 else
1922 {
1923 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1924 sv_to_dbt (&req->dbt1, key);
1925 else
1891 req->dbt1.flags = DB_DBT_MALLOC; 1926 req->dbt1.flags = DB_DBT_MALLOC;
1892 1927
1893 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1928 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1929 }
1894 1930
1895 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1931 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1896 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1932 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1897 sv_to_dbt (&req->dbt3, data); 1933 sv_to_dbt (&req->dbt3, data);
1898 else 1934 else
1899 req->dbt3.flags = DB_DBT_MALLOC; 1935 req->dbt3.flags = DB_DBT_MALLOC;
1900 1936
1901 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1937 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1902 REQ_SEND; 1938 REQ_SEND;
1903} 1939}
1904 1940
1905void 1941void
1906db_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)
1907 PREINIT: 1943 PREINIT:
1908 CALLBACK 1944 CALLBACK
1909 CODE: 1945 CODE:
1910{ 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
1911 dREQ (REQ_C_PGET, 1); 1950 dREQ (REQ_C_PGET, 1);
1912 req->dbc = dbc; 1951 req->dbc = dbc;
1913 req->uint1 = flags; 1952 req->uint1 = flags;
1914 if ((flags & DB_SET) == DB_SET 1953 if (flags & DB_OPFLAGS_MASK == DB_SET)
1915 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1916 sv_to_dbt (&req->dbt1, key); 1954 sv_to_dbt (&req->dbt1, key);
1917 else 1955 else
1956 {
1957 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1958 sv_to_dbt (&req->dbt1, key);
1959 else
1918 req->dbt1.flags = DB_DBT_MALLOC; 1960 req->dbt1.flags = DB_DBT_MALLOC;
1919 1961
1920 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1962 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1963 }
1921 1964
1922 req->dbt2.flags = DB_DBT_MALLOC; 1965 req->dbt2.flags = DB_DBT_MALLOC;
1923 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 1966 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1924 1967
1925 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1968 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1926 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1969 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1927 sv_to_dbt (&req->dbt3, data); 1970 sv_to_dbt (&req->dbt3, data);
1928 else 1971 else
1929 req->dbt3.flags = DB_DBT_MALLOC; 1972 req->dbt3.flags = DB_DBT_MALLOC;
1930 1973
1931 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1974 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1965db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2008db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1966 PREINIT: 2009 PREINIT:
1967 CALLBACK 2010 CALLBACK
1968 CODE: 2011 CODE:
1969{ 2012{
2013 ptr_nuke (ST (0));
1970 dREQ (REQ_SEQ_CLOSE, 1); 2014 dREQ (REQ_SEQ_CLOSE, 0);
1971 req->seq = seq; 2015 req->seq = seq;
1972 req->uint1 = flags; 2016 req->uint1 = flags;
1973 REQ_SEND; 2017 REQ_SEND;
1974 ptr_nuke (ST (0));
1975} 2018}
1976 2019
1977void 2020void
1978db_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)
1979 PREINIT: 2022 PREINIT:
1980 CALLBACK 2023 CALLBACK
1981 CODE: 2024 CODE:
1982{ 2025{
1983 dREQ (REQ_SEQ_GET, 2); 2026 dREQ (REQ_SEQ_GET, 2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines