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.55 by root, Fri Sep 26 02:37:33 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
135dbt_to_sv (SV *sv, DBT *dbt) 137dbt_to_sv (SV *sv, DBT *dbt)
136{ 138{
137 if (sv) 139 if (sv)
138 { 140 {
139 SvREADONLY_off (sv); 141 SvREADONLY_off (sv);
140 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef); 142
143 if (dbt->data)
144 sv_setpvn_mg (sv, dbt->data, dbt->size);
145 else
146 sv_setsv_mg (sv, &PL_sv_undef);
147
141 SvREFCNT_dec (sv); 148 SvREFCNT_dec (sv);
142 } 149 }
143 150
144 //assert (dbt->flags & DBT_MALLOC || !dbt->data);
145 free (dbt->data); 151 free (dbt->data);
146} 152}
147 153
148enum { 154enum {
149 REQ_QUIT, 155 REQ_QUIT,
351static void req_free (bdb_req req); 357static void req_free (bdb_req req);
352static void req_cancel (bdb_req req); 358static void req_cancel (bdb_req req);
353 359
354static int req_invoke (bdb_req req) 360static int req_invoke (bdb_req req)
355{ 361{
356 dSP; 362 switch (req->type)
363 {
364 case REQ_DB_CLOSE:
365 SvREFCNT_dec (req->sv1);
366 break;
367
368 case REQ_DB_GET:
369 case REQ_DB_PGET:
370 case REQ_C_GET:
371 case REQ_C_PGET:
372 case REQ_DB_PUT:
373 case REQ_C_PUT:
374 dbt_to_sv (req->sv1, &req->dbt1);
375 dbt_to_sv (req->sv2, &req->dbt2);
376 dbt_to_sv (req->sv3, &req->dbt3);
377 break;
378
379 case REQ_DB_KEY_RANGE:
380 {
381 AV *av = newAV ();
382
383 av_push (av, newSVnv (req->key_range.less));
384 av_push (av, newSVnv (req->key_range.equal));
385 av_push (av, newSVnv (req->key_range.greater));
386
387 SvREADONLY_off (req->sv1);
388 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
389 SvREFCNT_dec (req->sv1);
390 }
391 break;
392
393#if DB_VERSION_MINOR >= 3
394 case REQ_SEQ_GET:
395 SvREADONLY_off (req->sv1);
396
397 if (sizeof (IV) > 4)
398 sv_setiv_mg (req->sv1, (IV)req->seq_t);
399 else
400 sv_setnv_mg (req->sv1, (NV)req->seq_t);
401
402 SvREFCNT_dec (req->sv1);
403 break;
404#endif
405 }
406
407 errno = req->result;
357 408
358 if (req->callback) 409 if (req->callback)
359 { 410 {
411 dSP;
412
360 ENTER; 413 ENTER;
361 SAVETMPS; 414 SAVETMPS;
362 PUSHMARK (SP); 415 PUSHMARK (SP);
363 416
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; 417 PUTBACK;
419 call_sv (req->callback, G_VOID | G_EVAL); 418 call_sv (req->callback, G_VOID | G_EVAL);
420 SPAGAIN; 419 SPAGAIN;
421 420
422 FREETMPS; 421 FREETMPS;
423 LEAVE; 422 LEAVE;
423
424 return !SvTRUE (ERRSV);
424 } 425 }
425 426
426 return !SvTRUE (ERRSV); 427 return 1;
427} 428}
428 429
429static void req_free (bdb_req req) 430static void req_free (bdb_req req)
430{ 431{
431 SvREFCNT_dec (req->callback); 432 SvREFCNT_dec (req->callback);
485 486
486 respipe_osf [0] = TO_SOCKET (respipe [0]); 487 respipe_osf [0] = TO_SOCKET (respipe [0]);
487 respipe_osf [1] = TO_SOCKET (respipe [1]); 488 respipe_osf [1] = TO_SOCKET (respipe [1]);
488} 489}
489 490
491static void bdb_request (bdb_req req);
490X_THREAD_PROC (bdb_proc); 492X_THREAD_PROC (bdb_proc);
491 493
492static void start_thread (void) 494static void start_thread (void)
493{ 495{
494 worker *wrk = calloc (1, sizeof (worker)); 496 worker *wrk = calloc (1, sizeof (worker));
541 } 543 }
542 544
543 // synthesize callback if none given 545 // synthesize callback if none given
544 if (!req->callback) 546 if (!req->callback)
545 { 547 {
548 if (SvOK (prepare_cb))
549 {
546 int count; 550 int count;
547 551
548 dSP; 552 dSP;
549 PUSHMARK (SP); 553 PUSHMARK (SP);
550 PUTBACK; 554 PUTBACK;
551 count = call_sv (prepare_cb, G_ARRAY); 555 count = call_sv (prepare_cb, G_ARRAY);
552 SPAGAIN; 556 SPAGAIN;
553 557
554 if (count != 2) 558 if (count != 2)
555 croak ("prepare callback must return exactly two values\n"); 559 croak ("sync prepare callback must return exactly two values\n");
556 560
557 wait_callback = POPs; 561 wait_callback = POPs;
558 req->callback = SvREFCNT_inc (POPs); 562 req->callback = SvREFCNT_inc (POPs);
563 }
564 else
565 {
566 // execute request synchronously
567 bdb_request (req);
568 req_invoke (req);
569 req_free (req);
570 return;
571 }
559 } 572 }
560 573
561 ++nreqs; 574 ++nreqs;
562 575
563 X_LOCK (reqlock); 576 X_LOCK (reqlock);
577 } 590 }
578} 591}
579 592
580static void end_thread (void) 593static void end_thread (void)
581{ 594{
582 bdb_req req; 595 bdb_req req = calloc (1, sizeof (bdb_cb));
583
584 Newz (0, req, 1, bdb_cb);
585 596
586 req->type = REQ_QUIT; 597 req->type = REQ_QUIT;
587 req->pri = PRI_MAX + PRI_BIAS; 598 req->pri = PRI_MAX + PRI_BIAS;
588 599
589 X_LOCK (reqlock); 600 X_LOCK (reqlock);
714 725
715 return count; 726 return count;
716} 727}
717 728
718/*****************************************************************************/ 729/*****************************************************************************/
730
731static void
732bdb_request (bdb_req req)
733{
734 switch (req->type)
735 {
736 case REQ_ENV_OPEN:
737 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
738 break;
739
740 case REQ_ENV_CLOSE:
741 req->result = req->env->close (req->env, req->uint1);
742 break;
743
744 case REQ_ENV_TXN_CHECKPOINT:
745 req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2);
746 break;
747
748 case REQ_ENV_LOCK_DETECT:
749 req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1);
750 break;
751
752 case REQ_ENV_MEMP_SYNC:
753 req->result = req->env->memp_sync (req->env, 0);
754 break;
755
756 case REQ_ENV_MEMP_TRICKLE:
757 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
758 break;
759
760 case REQ_ENV_DBREMOVE:
761 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
762 break;
763
764 case REQ_ENV_DBRENAME:
765 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
766 break;
767
768 case REQ_DB_OPEN:
769 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
770 break;
771
772 case REQ_DB_CLOSE:
773 req->result = req->db->close (req->db, req->uint1);
774 break;
775
776#if DB_VERSION_MINOR >= 4
777 case REQ_DB_COMPACT:
778 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
779 break;
780#endif
781
782 case REQ_DB_SYNC:
783 req->result = req->db->sync (req->db, req->uint1);
784 break;
785
786 case REQ_DB_UPGRADE:
787 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
788 break;
789
790 case REQ_DB_PUT:
791 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
792 break;
793
794#if DB_VERSION_MINOR >= 6
795 case REQ_DB_EXISTS:
796 req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1);
797 break;
798#endif
799 case REQ_DB_GET:
800 req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1);
801 break;
802
803 case REQ_DB_PGET:
804 req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
805 break;
806
807 case REQ_DB_DEL:
808 req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1);
809 break;
810
811 case REQ_DB_KEY_RANGE:
812 req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1);
813 break;
814
815 case REQ_TXN_COMMIT:
816 req->result = req->txn->commit (req->txn, req->uint1);
817 break;
818
819 case REQ_TXN_ABORT:
820 req->result = req->txn->abort (req->txn);
821 break;
822
823 case REQ_TXN_FINISH:
824 if (req->txn->flags & TXN_DEADLOCK)
825 {
826 req->result = req->txn->abort (req->txn);
827 if (!req->result)
828 req->result = DB_LOCK_DEADLOCK;
829 }
830 else
831 req->result = req->txn->commit (req->txn, req->uint1);
832 break;
833
834 case REQ_C_CLOSE:
835 req->result = req->dbc->c_close (req->dbc);
836 break;
837
838 case REQ_C_COUNT:
839 {
840 db_recno_t recno;
841 req->result = req->dbc->c_count (req->dbc, &recno, req->uint1);
842 req->uv1 = recno;
843 }
844 break;
845
846 case REQ_C_PUT:
847 req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1);
848 break;
849
850 case REQ_C_GET:
851 req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1);
852 break;
853
854 case REQ_C_PGET:
855 req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1);
856 break;
857
858 case REQ_C_DEL:
859 req->result = req->dbc->c_del (req->dbc, req->uint1);
860 break;
861
862#if DB_VERSION_MINOR >= 3
863 case REQ_SEQ_OPEN:
864 req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1);
865 break;
866
867 case REQ_SEQ_CLOSE:
868 req->result = req->seq->close (req->seq, req->uint1);
869 break;
870
871 case REQ_SEQ_GET:
872 req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1);
873 break;
874
875 case REQ_SEQ_REMOVE:
876 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
877 break;
878#endif
879
880 default:
881 req->result = ENOSYS;
882 break;
883 }
884
885 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
886 req->txn->flags |= TXN_DEADLOCK;
887}
719 888
720X_THREAD_PROC (bdb_proc) 889X_THREAD_PROC (bdb_proc)
721{ 890{
722 bdb_req req; 891 bdb_req req;
723 struct timespec ts; 892 struct timespec ts;
764 933
765 --nready; 934 --nready;
766 935
767 X_UNLOCK (reqlock); 936 X_UNLOCK (reqlock);
768 937
769 switch (req->type) 938 if (req->type == REQ_QUIT)
770 { 939 {
771 case REQ_QUIT: 940 X_LOCK (reslock);
772 req->result = ENOSYS; 941 free (req);
942 self->req = 0;
943 X_UNLOCK (reslock);
944
773 goto quit; 945 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 } 946 }
923 947
924 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) 948 bdb_request (req);
925 req->txn->flags |= TXN_DEADLOCK;
926 949
927 X_LOCK (reslock); 950 X_LOCK (reslock);
928 951
929 ++npending; 952 ++npending;
930 953
1026 } \ 1049 } \
1027 else if (sv_derived_from ((arg), # class)) \ 1050 else if (sv_derived_from ((arg), # class)) \
1028 { \ 1051 { \
1029 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1052 IV tmp = SvIV ((SV*) SvRV (arg)); \
1030 (var) = INT2PTR (type, tmp); \ 1053 (var) = INT2PTR (type, tmp); \
1031 if (!var && nullok != 2) \ 1054 if (!var && nullok != 2) \
1032 croak (# var " is not a valid " # class " object anymore"); \ 1055 croak (# var " is not a valid " # class " object anymore"); \
1033 } \ 1056 } \
1034 else \ 1057 else \
1035 croak (# var " is not of type " # class); 1058 croak (# var " is not of type " # class);
1059
1060#define ARG_MUTABLE(name) \
1061 if (SvREADONLY (name)) \
1062 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1036 1063
1037static void 1064static void
1038ptr_nuke (SV *sv) 1065ptr_nuke (SV *sv)
1039{ 1066{
1040 assert (SvROK (sv)); 1067 assert (SvROK (sv));
1318 }; 1345 };
1319 1346
1320 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1347 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1321 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1348 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1322 1349
1350 prepare_cb = &PL_sv_undef;
1351
1323 { 1352 {
1324 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1353 /* 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 }; 1354 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1326 1355
1327 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1356 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1465 RETVAL = started; 1494 RETVAL = started;
1466 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1495 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1467 OUTPUT: 1496 OUTPUT:
1468 RETVAL 1497 RETVAL
1469 1498
1470void 1499SV *
1471set_sync_prepare (SV *cb) 1500set_sync_prepare (SV *cb)
1472 PROTOTYPE: & 1501 PROTOTYPE: &
1473 CODE: 1502 CODE:
1474 SvREFCNT_dec (prepare_cb); 1503 RETVAL = prepare_cb;
1475 prepare_cb = newSVsv (cb); 1504 prepare_cb = newSVsv (cb);
1505 OUTPUT:
1506 RETVAL
1476 1507
1477char * 1508char *
1478strerror (int errorno = errno) 1509strerror (int errorno = errno)
1479 PROTOTYPE: ;$ 1510 PROTOTYPE: ;$
1480 CODE: 1511 CODE:
1522db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1553db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1523 PREINIT: 1554 PREINIT:
1524 CALLBACK 1555 CALLBACK
1525 CODE: 1556 CODE:
1526{ 1557{
1558 ptr_nuke (ST (0));
1527 dREQ (REQ_ENV_CLOSE, 1); 1559 dREQ (REQ_ENV_CLOSE, 0);
1528 req->env = env; 1560 req->env = env;
1529 req->uint1 = flags; 1561 req->uint1 = flags;
1530 REQ_SEND; 1562 REQ_SEND;
1531 ptr_nuke (ST (0));
1532} 1563}
1533 1564
1534void 1565void
1535db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1566db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1536 PREINIT: 1567 PREINIT:
1646db_close (DB *db, U32 flags = 0, SV *callback = 0) 1677db_close (DB *db, U32 flags = 0, SV *callback = 0)
1647 PREINIT: 1678 PREINIT:
1648 CALLBACK 1679 CALLBACK
1649 CODE: 1680 CODE:
1650{ 1681{
1682 ptr_nuke (ST (0));
1651 dREQ (REQ_DB_CLOSE, 1); 1683 dREQ (REQ_DB_CLOSE, 0);
1652 req->db = db; 1684 req->db = db;
1653 req->uint1 = flags; 1685 req->uint1 = flags;
1654 req->sv1 = (SV *)db->app_private; 1686 req->sv1 = (SV *)db->app_private;
1655 REQ_SEND; 1687 REQ_SEND;
1656 ptr_nuke (ST (0));
1657} 1688}
1658 1689
1659#if DB_VERSION_MINOR >= 4 1690#if DB_VERSION_MINOR >= 4
1660 1691
1661void 1692void
1699 req->uint1 = flags; 1730 req->uint1 = flags;
1700 REQ_SEND; 1731 REQ_SEND;
1701} 1732}
1702 1733
1703void 1734void
1704db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1735db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *key_range, U32 flags = 0, SV *callback = 0)
1705 PREINIT: 1736 PREINIT:
1706 CALLBACK 1737 CALLBACK
1707 CODE: 1738 CODE:
1708{ 1739{
1709 dREQ (REQ_DB_KEY_RANGE, 2); 1740 dREQ (REQ_DB_KEY_RANGE, 2);
1747} 1778}
1748 1779
1749#endif 1780#endif
1750 1781
1751void 1782void
1752db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1783db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1753 PREINIT: 1784 PREINIT:
1754 CALLBACK 1785 CALLBACK
1755 CODE: 1786 CODE:
1756 if (SvREADONLY (data))
1757 croak ("can't modify read-only data scalar in db_get");
1758{ 1787{
1788 //TODO: key is somtimesmutable
1759 dREQ (REQ_DB_GET, 2); 1789 dREQ (REQ_DB_GET, 2);
1760 req->db = db; 1790 req->db = db;
1761 req->txn = txn; 1791 req->txn = txn;
1762 req->uint1 = flags; 1792 req->uint1 = flags;
1763 sv_to_dbt (&req->dbt1, key); 1793 sv_to_dbt (&req->dbt1, key);
1765 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1795 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1766 REQ_SEND; 1796 REQ_SEND;
1767} 1797}
1768 1798
1769void 1799void
1770db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1800db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1771 PREINIT: 1801 PREINIT:
1772 CALLBACK 1802 CALLBACK
1773 CODE: 1803 CODE:
1774 if (SvREADONLY (data))
1775 croak ("can't modify read-only data scalar in db_pget");
1776{ 1804{
1805 //TODO: key is somtimesmutable
1777 dREQ (REQ_DB_PGET, 2); 1806 dREQ (REQ_DB_PGET, 2);
1778 req->db = db; 1807 req->db = db;
1779 req->txn = txn; 1808 req->txn = txn;
1780 req->uint1 = flags; 1809 req->uint1 = flags;
1810
1781 sv_to_dbt (&req->dbt1, key); 1811 sv_to_dbt (&req->dbt1, key);
1782 sv_to_dbt (&req->dbt2, pkey); 1812
1813 req->dbt2.flags = DB_DBT_MALLOC;
1814 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1815
1783 req->dbt3.flags = DB_DBT_MALLOC; 1816 req->dbt3.flags = DB_DBT_MALLOC;
1784 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1817 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1785 REQ_SEND; 1818 REQ_SEND;
1786} 1819}
1787 1820
1803db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1836db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1804 PREINIT: 1837 PREINIT:
1805 CALLBACK 1838 CALLBACK
1806 CODE: 1839 CODE:
1807{ 1840{
1841 ptr_nuke (ST (0));
1808 dREQ (REQ_TXN_COMMIT, 1); 1842 dREQ (REQ_TXN_COMMIT, 0);
1809 req->txn = txn; 1843 req->txn = txn;
1810 req->uint1 = flags; 1844 req->uint1 = flags;
1811 REQ_SEND; 1845 REQ_SEND;
1846}
1847
1848void
1849db_txn_abort (DB_TXN *txn, SV *callback = 0)
1850 PREINIT:
1851 CALLBACK
1852 CODE:
1853{
1812 ptr_nuke (ST (0)); 1854 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); 1855 dREQ (REQ_TXN_ABORT, 0);
1822 req->txn = txn; 1856 req->txn = txn;
1823 REQ_SEND; 1857 REQ_SEND;
1858}
1859
1860void
1861db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1862 PREINIT:
1863 CALLBACK
1864 CODE:
1865{
1824 ptr_nuke (ST (0)); 1866 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); 1867 dREQ (REQ_TXN_FINISH, 0);
1834 req->txn = txn; 1868 req->txn = txn;
1835 req->uint1 = flags; 1869 req->uint1 = flags;
1836 REQ_SEND; 1870 REQ_SEND;
1871}
1872
1873void
1874db_c_close (DBC *dbc, SV *callback = 0)
1875 PREINIT:
1876 CALLBACK
1877 CODE:
1878{
1837 ptr_nuke (ST (0)); 1879 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); 1880 dREQ (REQ_C_CLOSE, 0);
1847 req->dbc = dbc; 1881 req->dbc = dbc;
1848 REQ_SEND; 1882 REQ_SEND;
1849 ptr_nuke (ST (0));
1850} 1883}
1851 1884
1852void 1885void
1853db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1886db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1854 PREINIT: 1887 PREINIT:
1874 req->uint1 = flags; 1907 req->uint1 = flags;
1875 REQ_SEND; 1908 REQ_SEND;
1876} 1909}
1877 1910
1878void 1911void
1879db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1912db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1880 PREINIT: 1913 PREINIT:
1881 CALLBACK 1914 CALLBACK
1882 CODE: 1915 CODE:
1883{ 1916{
1917 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key))
1918 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1919
1884 dREQ (REQ_C_GET, 1); 1920 dREQ (REQ_C_GET, 1);
1885 req->dbc = dbc; 1921 req->dbc = dbc;
1886 req->uint1 = flags; 1922 req->uint1 = flags;
1887 if ((flags & DB_SET) == DB_SET 1923 if (flags & DB_OPFLAGS_MASK == DB_SET)
1888 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1889 sv_to_dbt (&req->dbt1, key); 1924 sv_to_dbt (&req->dbt1, key);
1890 else 1925 else
1926 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key);
1929 else
1891 req->dbt1.flags = DB_DBT_MALLOC; 1930 req->dbt1.flags = DB_DBT_MALLOC;
1892 1931
1893 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 }
1894 1934
1895 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1896 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1897 sv_to_dbt (&req->dbt3, data); 1937 sv_to_dbt (&req->dbt3, data);
1898 else 1938 else
1899 req->dbt3.flags = DB_DBT_MALLOC; 1939 req->dbt3.flags = DB_DBT_MALLOC;
1900 1940
1901 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1902 REQ_SEND; 1942 REQ_SEND;
1903} 1943}
1904 1944
1905void 1945void
1906db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1946db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1907 PREINIT: 1947 PREINIT:
1908 CALLBACK 1948 CALLBACK
1909 CODE: 1949 CODE:
1910{ 1950{
1951 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key))
1952 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
1953
1911 dREQ (REQ_C_PGET, 1); 1954 dREQ (REQ_C_PGET, 1);
1912 req->dbc = dbc; 1955 req->dbc = dbc;
1913 req->uint1 = flags; 1956 req->uint1 = flags;
1914 if ((flags & DB_SET) == DB_SET 1957 if (flags & DB_OPFLAGS_MASK == DB_SET)
1915 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1916 sv_to_dbt (&req->dbt1, key); 1958 sv_to_dbt (&req->dbt1, key);
1917 else 1959 else
1960 {
1961 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1962 sv_to_dbt (&req->dbt1, key);
1963 else
1918 req->dbt1.flags = DB_DBT_MALLOC; 1964 req->dbt1.flags = DB_DBT_MALLOC;
1919 1965
1920 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1966 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1967 }
1921 1968
1922 req->dbt2.flags = DB_DBT_MALLOC; 1969 req->dbt2.flags = DB_DBT_MALLOC;
1923 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 1970 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1924 1971
1925 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1972 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1926 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1973 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1927 sv_to_dbt (&req->dbt3, data); 1974 sv_to_dbt (&req->dbt3, data);
1928 else 1975 else
1929 req->dbt3.flags = DB_DBT_MALLOC; 1976 req->dbt3.flags = DB_DBT_MALLOC;
1930 1977
1931 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1978 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1965db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2012db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1966 PREINIT: 2013 PREINIT:
1967 CALLBACK 2014 CALLBACK
1968 CODE: 2015 CODE:
1969{ 2016{
2017 ptr_nuke (ST (0));
1970 dREQ (REQ_SEQ_CLOSE, 1); 2018 dREQ (REQ_SEQ_CLOSE, 0);
1971 req->seq = seq; 2019 req->seq = seq;
1972 req->uint1 = flags; 2020 req->uint1 = flags;
1973 REQ_SEND; 2021 REQ_SEND;
1974 ptr_nuke (ST (0));
1975} 2022}
1976 2023
1977void 2024void
1978db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 2025db_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: 2026 PREINIT:
1980 CALLBACK 2027 CALLBACK
1981 CODE: 2028 CODE:
1982{ 2029{
1983 dREQ (REQ_SEQ_GET, 2); 2030 dREQ (REQ_SEQ_GET, 2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines