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

Comparing BDB/BDB.xs (file contents):
Revision 1.22 by root, Fri Dec 7 13:14:54 2007 UTC vs.
Revision 1.38 by root, Wed May 21 19:13:43 2008 UTC

… …
40typedef DB_TXN DB_TXN_ornull; 40typedef DB_TXN DB_TXN_ornull;
41typedef DBC DBC_ornull; 41typedef DBC DBC_ornull;
42typedef DB DB_ornull; 42typedef DB DB_ornull;
43typedef DB_SEQUENCE DB_SEQUENCE_ornull; 43typedef DB_SEQUENCE DB_SEQUENCE_ornull;
44 44
45typedef DB_ENV DB_ENV_ornuked;
46typedef DB_TXN DB_TXN_ornuked;
47typedef DBC DBC_ornuked;
48typedef DB DB_ornuked;
49typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
50
45typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
46typedef char *octetstring; 52typedef char *bdb_filename;
47 53
48static SV *prepare_cb; 54static SV *prepare_cb;
49 55
50#if DB_VERSION_MINOR >= 6 56#if DB_VERSION_MINOR >= 6
51# define c_close close 57# define c_close close
… …
55# define c_get get 61# define c_get get
56# define c_pget pget 62# define c_pget pget
57# define c_put put 63# define c_put put
58#endif 64#endif
59 65
66static char *
67get_bdb_filename (SV *sv)
68{
69 if (!SvOK (sv))
70 return 0;
71
72#if _WIN32
73 /* win32 madness + win32 perl absolutely brokenness make for horrible hacks */
74 {
75 STRLEN len;
76 char *src = SvPVbyte (sv, len);
77 SV *t1 = sv_newmortal ();
78 SV *t2 = sv_newmortal ();
79
80 sv_upgrade (t1, SVt_PV); SvPOK_only (t1); SvGROW (t1, len * 16 + 1);
81 sv_upgrade (t2, SVt_PV); SvPOK_only (t2); SvGROW (t2, len * 16 + 1);
82
83 len = MultiByteToWideChar (CP_ACP, 0, src, len, (WCHAR *)SvPVX (t1), SvLEN (t1) / sizeof (WCHAR));
84 len = WideCharToMultiByte (CP_UTF8, 0, (WCHAR *)SvPVX (t1), len, SvPVX (t2), SvLEN (t2), 0, 0);
85 SvPOK_only (t2);
86 SvPVX (t2)[len] = 0;
87 SvCUR_set (t2, len);
88
89 return SvPVX (t2);
90 }
91#else
92 return SvPVbyte_nolen (sv);
93#endif
94}
95
60static void 96static void
61debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg) 97debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
62{ 98{
63 printf ("err[%s]\n", msg); 99 printf ("err[%s]\n", msg);
64} 100}
… …
102 138
103enum { 139enum {
104 REQ_QUIT, 140 REQ_QUIT,
105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 141 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 143 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
108 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 144 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 145 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
110 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 146 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
111 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 147 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
112}; 148};
113 149
114typedef struct aio_cb 150typedef struct bdb_cb
115{ 151{
116 struct aio_cb *volatile next; 152 struct bdb_cb *volatile next;
117 SV *callback; 153 SV *callback;
118 int type, pri, result; 154 int type, pri, result;
119 155
120 DB_ENV *env; 156 DB_ENV *env;
121 DB *db; 157 DB *db;
… …
130 166
131 DBT dbt1, dbt2, dbt3; 167 DBT dbt1, dbt2, dbt3;
132 DB_KEY_RANGE key_range; 168 DB_KEY_RANGE key_range;
133 DB_SEQUENCE *seq; 169 DB_SEQUENCE *seq;
134 db_seq_t seq_t; 170 db_seq_t seq_t;
135} aio_cb; 171} bdb_cb;
136 172
137typedef aio_cb *aio_req; 173typedef bdb_cb *bdb_req;
138 174
139enum { 175enum {
140 PRI_MIN = -4, 176 PRI_MIN = -4,
141 PRI_MAX = 4, 177 PRI_MAX = 4,
142 178
… …
145 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 181 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
146}; 182};
147 183
148#define AIO_TICKS ((1000000 + 1023) >> 10) 184#define AIO_TICKS ((1000000 + 1023) >> 10)
149 185
186static SV *on_next_submit;
187
150static unsigned int max_poll_time = 0; 188static unsigned int max_poll_time = 0;
151static unsigned int max_poll_reqs = 0; 189static unsigned int max_poll_reqs = 0;
152 190
153/* calculcate time difference in ~1/AIO_TICKS of a second */ 191/* calculcate time difference in ~1/AIO_TICKS of a second */
154static int tvdiff (struct timeval *tv1, struct timeval *tv2) 192static int tvdiff (struct timeval *tv1, struct timeval *tv2)
… …
169 struct worker *prev, *next; 207 struct worker *prev, *next;
170 208
171 thread_t tid; 209 thread_t tid;
172 210
173 /* locked by reslock, reqlock or wrklock */ 211 /* locked by reslock, reqlock or wrklock */
174 aio_req req; /* currently processed request */ 212 bdb_req req; /* currently processed request */
175 void *dbuf; 213 void *dbuf;
176 DIR *dirp; 214 DIR *dirp;
177} worker; 215} worker;
178 216
179static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 217static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
199static mutex_t reqlock = X_MUTEX_INIT; 237static mutex_t reqlock = X_MUTEX_INIT;
200static cond_t reqwait = X_COND_INIT; 238static cond_t reqwait = X_COND_INIT;
201 239
202#if WORDACCESS_UNSAFE 240#if WORDACCESS_UNSAFE
203 241
204static unsigned int get_nready () 242static unsigned int get_nready (void)
205{ 243{
206 unsigned int retval; 244 unsigned int retval;
207 245
208 X_LOCK (reqlock); 246 X_LOCK (reqlock);
209 retval = nready; 247 retval = nready;
210 X_UNLOCK (reqlock); 248 X_UNLOCK (reqlock);
211 249
212 return retval; 250 return retval;
213} 251}
214 252
215static unsigned int get_npending () 253static unsigned int get_npending (void)
216{ 254{
217 unsigned int retval; 255 unsigned int retval;
218 256
219 X_LOCK (reslock); 257 X_LOCK (reslock);
220 retval = npending; 258 retval = npending;
221 X_UNLOCK (reslock); 259 X_UNLOCK (reslock);
222 260
223 return retval; 261 return retval;
224} 262}
225 263
226static unsigned int get_nthreads () 264static unsigned int get_nthreads (void)
227{ 265{
228 unsigned int retval; 266 unsigned int retval;
229 267
230 X_LOCK (wrklock); 268 X_LOCK (wrklock);
231 retval = started; 269 retval = started;
… …
246 * a somewhat faster data structure might be nice, but 284 * a somewhat faster data structure might be nice, but
247 * with 8 priorities this actually needs <20 insns 285 * with 8 priorities this actually needs <20 insns
248 * per shift, the most expensive operation. 286 * per shift, the most expensive operation.
249 */ 287 */
250typedef struct { 288typedef struct {
251 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 289 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
252 int size; 290 int size;
253} reqq; 291} reqq;
254 292
255static reqq req_queue; 293static reqq req_queue;
256static reqq res_queue; 294static reqq res_queue;
257 295
258int reqq_push (reqq *q, aio_req req) 296int reqq_push (reqq *q, bdb_req req)
259{ 297{
260 int pri = req->pri; 298 int pri = req->pri;
261 req->next = 0; 299 req->next = 0;
262 300
263 if (q->qe[pri]) 301 if (q->qe[pri])
… …
269 q->qe[pri] = q->qs[pri] = req; 307 q->qe[pri] = q->qs[pri] = req;
270 308
271 return q->size++; 309 return q->size++;
272} 310}
273 311
274aio_req reqq_shift (reqq *q) 312bdb_req reqq_shift (reqq *q)
275{ 313{
276 int pri; 314 int pri;
277 315
278 if (!q->size) 316 if (!q->size)
279 return 0; 317 return 0;
280 318
281 --q->size; 319 --q->size;
282 320
283 for (pri = NUM_PRI; pri--; ) 321 for (pri = NUM_PRI; pri--; )
284 { 322 {
285 aio_req req = q->qs[pri]; 323 bdb_req req = q->qs[pri];
286 324
287 if (req) 325 if (req)
288 { 326 {
289 if (!(q->qs[pri] = req->next)) 327 if (!(q->qs[pri] = req->next))
290 q->qe[pri] = 0; 328 q->qe[pri] = 0;
… …
294 } 332 }
295 333
296 abort (); 334 abort ();
297} 335}
298 336
299static int poll_cb (); 337static int poll_cb (void);
300static void req_free (aio_req req); 338static void req_free (bdb_req req);
301static void req_cancel (aio_req req); 339static void req_cancel (bdb_req req);
302 340
303static int req_invoke (aio_req req) 341static int req_invoke (bdb_req req)
304{ 342{
305 dSP; 343 dSP;
306 344
307 if (SvOK (req->callback)) 345 if (SvOK (req->callback))
308 { 346 {
… …
326 dbt_to_sv (req->sv1, &req->dbt1); 364 dbt_to_sv (req->sv1, &req->dbt1);
327 dbt_to_sv (req->sv2, &req->dbt2); 365 dbt_to_sv (req->sv2, &req->dbt2);
328 dbt_to_sv (req->sv3, &req->dbt3); 366 dbt_to_sv (req->sv3, &req->dbt3);
329 break; 367 break;
330 368
369 case REQ_DB_PUT:
370 case REQ_C_PUT:
371 dbt_to_sv (0, &req->dbt1);
372 dbt_to_sv (0, &req->dbt2);
373 break;
374
331 case REQ_DB_KEY_RANGE: 375 case REQ_DB_KEY_RANGE:
332 { 376 {
333 AV *av = newAV (); 377 AV *av = newAV ();
334 378
335 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
… …
365 } 409 }
366 410
367 return !SvTRUE (ERRSV); 411 return !SvTRUE (ERRSV);
368} 412}
369 413
370static void req_free (aio_req req) 414static void req_free (bdb_req req)
371{ 415{
372 free (req->buf1); 416 free (req->buf1);
373 free (req->buf2); 417 free (req->buf2);
374 Safefree (req); 418 Safefree (req);
375} 419}
… …
379#else 423#else
380# define TO_SOCKET(x) (x) 424# define TO_SOCKET(x) (x)
381#endif 425#endif
382 426
383static void 427static void
384create_respipe () 428create_respipe (void)
385{ 429{
386#ifdef _WIN32 430#ifdef _WIN32
387 int arg; /* argg */ 431 int arg; /* argg */
388#endif 432#endif
389 int old_readfd = respipe [0]; 433 int old_readfd = respipe [0];
… …
443 free (wrk); 487 free (wrk);
444 488
445 X_UNLOCK (wrklock); 489 X_UNLOCK (wrklock);
446} 490}
447 491
448static void maybe_start_thread () 492static void maybe_start_thread (void)
449{ 493{
450 if (get_nthreads () >= wanted) 494 if (get_nthreads () >= wanted)
451 return; 495 return;
452 496
453 /* todo: maybe use idle here, but might be less exact */ 497 /* todo: maybe use idle here, but might be less exact */
… …
455 return; 499 return;
456 500
457 start_thread (); 501 start_thread ();
458} 502}
459 503
460static void req_send (aio_req req) 504static void req_send (bdb_req req)
461{ 505{
462 SV *wait_callback = 0; 506 SV *wait_callback = 0;
507
508 if (on_next_submit)
509 {
510 dSP;
511 SV *cb = sv_2mortal (on_next_submit);
512
513 on_next_submit = 0;
514
515 PUSHMARK (SP);
516 PUTBACK;
517 call_sv (cb, G_DISCARD | G_EVAL);
518 }
463 519
464 // synthesize callback if none given 520 // synthesize callback if none given
465 if (!SvOK (req->callback)) 521 if (!SvOK (req->callback))
466 { 522 {
467 int count; 523 int count;
… …
473 SPAGAIN; 529 SPAGAIN;
474 530
475 if (count != 2) 531 if (count != 2)
476 croak ("prepare callback must return exactly two values\n"); 532 croak ("prepare callback must return exactly two values\n");
477 533
478 wait_callback = SvREFCNT_inc (POPs); 534 wait_callback = POPs;
479 SvREFCNT_dec (req->callback); 535 SvREFCNT_dec (req->callback);
480 req->callback = SvREFCNT_inc (POPs); 536 req->callback = SvREFCNT_inc (POPs);
481 } 537 }
482 538
483 ++nreqs; 539 ++nreqs;
… …
494 { 550 {
495 dSP; 551 dSP;
496 PUSHMARK (SP); 552 PUSHMARK (SP);
497 PUTBACK; 553 PUTBACK;
498 call_sv (wait_callback, G_DISCARD); 554 call_sv (wait_callback, G_DISCARD);
499 SvREFCNT_dec (wait_callback);
500 } 555 }
501} 556}
502 557
503static void end_thread (void) 558static void end_thread (void)
504{ 559{
505 aio_req req; 560 bdb_req req;
506 561
507 Newz (0, req, 1, aio_cb); 562 Newz (0, req, 1, bdb_cb);
508 563
509 req->type = REQ_QUIT; 564 req->type = REQ_QUIT;
510 req->pri = PRI_MAX + PRI_BIAS; 565 req->pri = PRI_MAX + PRI_BIAS;
511 566
512 X_LOCK (reqlock); 567 X_LOCK (reqlock);
… …
539 594
540 while (started > wanted) 595 while (started > wanted)
541 end_thread (); 596 end_thread ();
542} 597}
543 598
544static void poll_wait () 599static void poll_wait (void)
545{ 600{
546 fd_set rfd; 601 fd_set rfd;
547 602
548 while (nreqs) 603 while (nreqs)
549 { 604 {
… …
562 617
563 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 618 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
564 } 619 }
565} 620}
566 621
567static int poll_cb () 622static int poll_cb (void)
568{ 623{
569 dSP; 624 dSP;
570 int count = 0; 625 int count = 0;
571 int maxreqs = max_poll_reqs; 626 int maxreqs = max_poll_reqs;
572 int do_croak = 0; 627 int do_croak = 0;
573 struct timeval tv_start, tv_now; 628 struct timeval tv_start, tv_now;
574 aio_req req; 629 bdb_req req;
575 630
576 if (max_poll_time) 631 if (max_poll_time)
577 gettimeofday (&tv_start, 0); 632 gettimeofday (&tv_start, 0);
578 633
579 for (;;) 634 for (;;)
… …
640 695
641/*****************************************************************************/ 696/*****************************************************************************/
642 697
643X_THREAD_PROC (bdb_proc) 698X_THREAD_PROC (bdb_proc)
644{ 699{
645 aio_req req; 700 bdb_req req;
646 struct timespec ts; 701 struct timespec ts;
647 worker *self = (worker *)thr_arg; 702 worker *self = (worker *)thr_arg;
648 703
649 /* try to distribute timeouts somewhat evenly */ 704 /* try to distribute timeouts somewhat evenly */
650 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 705 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
733 788
734 case REQ_DB_SYNC: 789 case REQ_DB_SYNC:
735 req->result = req->db->sync (req->db, req->uint1); 790 req->result = req->db->sync (req->db, req->uint1);
736 break; 791 break;
737 792
793 case REQ_DB_UPGRADE:
794 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
795 break;
796
738 case REQ_DB_PUT: 797 case REQ_DB_PUT:
739 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 798 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
740 break; 799 break;
741 800
742 case REQ_DB_GET: 801 case REQ_DB_GET:
… …
864 X_UNLOCK (wrklock); 923 X_UNLOCK (wrklock);
865} 924}
866 925
867static void atfork_child (void) 926static void atfork_child (void)
868{ 927{
869 aio_req prv; 928 bdb_req prv;
870 929
871 while (prv = reqq_shift (&req_queue)) 930 while (prv = reqq_shift (&req_queue))
872 req_free (prv); 931 req_free (prv);
873 932
874 while (prv = reqq_shift (&res_queue)) 933 while (prv = reqq_shift (&res_queue))
… …
895 954
896 atfork_parent (); 955 atfork_parent ();
897} 956}
898 957
899#define dREQ(reqtype) \ 958#define dREQ(reqtype) \
900 aio_req req; \ 959 bdb_req req; \
901 int req_pri = next_pri; \ 960 int req_pri = next_pri; \
902 next_pri = DEFAULT_PRI + PRI_BIAS; \ 961 next_pri = DEFAULT_PRI + PRI_BIAS; \
903 \ 962 \
904 if (SvOK (callback) && !SvROK (callback)) \ 963 if (SvOK (callback) && !SvROK (callback)) \
905 croak ("callback must be undef or of reference type"); \ 964 croak ("callback must be undef or of reference type"); \
906 \ 965 \
907 Newz (0, req, 1, aio_cb); \ 966 Newz (0, req, 1, bdb_cb); \
908 if (!req) \ 967 if (!req) \
909 croak ("out of memory during aio_req allocation"); \ 968 croak ("out of memory during bdb_req allocation"); \
910 \ 969 \
911 req->callback = newSVsv (callback); \ 970 req->callback = newSVsv (callback); \
912 req->type = (reqtype); \ 971 req->type = (reqtype); \
913 req->pri = req_pri 972 req->pri = req_pri
914 973
915#define REQ_SEND \ 974#define REQ_SEND \
916 req_send (req) 975 req_send (req)
917 976
918#define SvPTR(var, arg, type, class, nullok) \ 977#define SvPTR(var, arg, type, class, nullok) \
919 if (!SvOK (arg)) \ 978 if (!SvOK (arg)) \
920 { \ 979 { \
921 if (!nullok) \ 980 if (nullok != 1) \
922 croak (# var " must be a " # class " object, not undef"); \ 981 croak (# var " must be a " # class " object, not undef"); \
923 \ 982 \
924 (var) = 0; \ 983 (var) = 0; \
925 } \ 984 } \
926 else if (sv_derived_from ((arg), # class)) \ 985 else if (sv_derived_from ((arg), # class)) \
927 { \ 986 { \
928 IV tmp = SvIV ((SV*) SvRV (arg)); \ 987 IV tmp = SvIV ((SV*) SvRV (arg)); \
929 (var) = INT2PTR (type, tmp); \ 988 (var) = INT2PTR (type, tmp); \
930 if (!var) \ 989 if (!var && nullok != 2) \
931 croak (# var " is not a valid " # class " object anymore"); \ 990 croak (# var " is not a valid " # class " object anymore"); \
932 } \ 991 } \
933 else \ 992 else \
934 croak (# var " is not of type " # class); \ 993 croak (# var " is not of type " # class); \
935 \ 994 \
… …
937static void 996static void
938ptr_nuke (SV *sv) 997ptr_nuke (SV *sv)
939{ 998{
940 assert (SvROK (sv)); 999 assert (SvROK (sv));
941 sv_setiv (SvRV (sv), 0); 1000 sv_setiv (SvRV (sv), 0);
1001}
1002
1003static int
1004errno_get (pTHX_ SV *sv, MAGIC *mg)
1005{
1006 if (*mg->mg_ptr == '!') // should always be the case
1007 if (-30999 <= errno && errno <= -30800)
1008 {
1009 sv_setnv (sv, (NV)errno);
1010 sv_setpv (sv, db_strerror (errno));
1011 SvNOK_on (sv); /* what a wonderful hack! */
1012 // ^^^ copied from perl sources
1013 return 0;
1014 }
1015
1016 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
1017}
1018
1019static MGVTBL vtbl_errno;
1020
1021// this wonderful hack :( patches perl's $! variable to support our errno values
1022static void
1023patch_errno (void)
1024{
1025 SV *sv;
1026 MAGIC *mg;
1027
1028 if (!(sv = get_sv ("!", 1)))
1029 return;
1030
1031 if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
1032 return;
1033
1034 if (mg->mg_virtual != &PL_vtbl_sv)
1035 return;
1036
1037 vtbl_errno = PL_vtbl_sv;
1038 vtbl_errno.svt_get = errno_get;
1039 mg->mg_virtual = &vtbl_errno;
942} 1040}
943 1041
944MODULE = BDB PACKAGE = BDB 1042MODULE = BDB PACKAGE = BDB
945 1043
946PROTOTYPES: ENABLE 1044PROTOTYPES: ENABLE
… …
1018 const_iv (GET_BOTH_RANGE) 1116 const_iv (GET_BOTH_RANGE)
1019 //const_iv (SET_RECNO) 1117 //const_iv (SET_RECNO)
1020 //const_iv (MULTIPLE) 1118 //const_iv (MULTIPLE)
1021 const_iv (SNAPSHOT) 1119 const_iv (SNAPSHOT)
1022 const_iv (JOIN_ITEM) 1120 const_iv (JOIN_ITEM)
1121 const_iv (JOIN_NOSORT)
1023 const_iv (RMW) 1122 const_iv (RMW)
1024 1123
1025 const_iv (NOTFOUND) 1124 const_iv (NOTFOUND)
1026 const_iv (KEYEMPTY) 1125 const_iv (KEYEMPTY)
1027 const_iv (LOCK_DEADLOCK) 1126 const_iv (LOCK_DEADLOCK)
… …
1043 const_iv (TXN_SYNC) 1142 const_iv (TXN_SYNC)
1044 1143
1045 const_iv (SET_LOCK_TIMEOUT) 1144 const_iv (SET_LOCK_TIMEOUT)
1046 const_iv (SET_TXN_TIMEOUT) 1145 const_iv (SET_TXN_TIMEOUT)
1047 1146
1048 const_iv (JOIN_ITEM)
1049 const_iv (FIRST) 1147 const_iv (FIRST)
1050 const_iv (NEXT) 1148 const_iv (NEXT)
1051 const_iv (NEXT_DUP) 1149 const_iv (NEXT_DUP)
1052 const_iv (NEXT_NODUP) 1150 const_iv (NEXT_NODUP)
1053 const_iv (PREV) 1151 const_iv (PREV)
… …
1087 const_iv (LOG_BUFFER_FULL) 1185 const_iv (LOG_BUFFER_FULL)
1088 const_iv (NOSERVER) 1186 const_iv (NOSERVER)
1089 const_iv (NOSERVER_HOME) 1187 const_iv (NOSERVER_HOME)
1090 const_iv (NOSERVER_ID) 1188 const_iv (NOSERVER_ID)
1091 const_iv (NOTFOUND) 1189 const_iv (NOTFOUND)
1092 const_iv (OLD_VERSION)
1093 const_iv (PAGE_NOTFOUND) 1190 const_iv (PAGE_NOTFOUND)
1094 const_iv (REP_DUPMASTER) 1191 const_iv (REP_DUPMASTER)
1095 const_iv (REP_HANDLE_DEAD) 1192 const_iv (REP_HANDLE_DEAD)
1096 const_iv (REP_HOLDELECTION) 1193 const_iv (REP_HOLDELECTION)
1097 const_iv (REP_IGNORE) 1194 const_iv (REP_IGNORE)
… …
1120 const_iv (MULTIVERSION) 1217 const_iv (MULTIVERSION)
1121 const_iv (TXN_SNAPSHOT) 1218 const_iv (TXN_SNAPSHOT)
1122#endif 1219#endif
1123#if DB_VERSION_MINOR >= 6 1220#if DB_VERSION_MINOR >= 6
1124 const_iv (PREV_DUP) 1221 const_iv (PREV_DUP)
1125# if 0
1126 const_iv (PRIORITY_UNCHANGED) 1222 const_iv (PRIORITY_UNCHANGED)
1127 const_iv (PRIORITY_VERY_LOW) 1223 const_iv (PRIORITY_VERY_LOW)
1128 const_iv (PRIORITY_LOW) 1224 const_iv (PRIORITY_LOW)
1129 const_iv (PRIORITY_DEFAULT) 1225 const_iv (PRIORITY_DEFAULT)
1130 const_iv (PRIORITY_HIGH) 1226 const_iv (PRIORITY_HIGH)
1131 const_iv (PRIORITY_VERY_HIGH) 1227 const_iv (PRIORITY_VERY_HIGH)
1132# endif
1133#endif 1228#endif
1134 }; 1229 };
1135 1230
1136 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1231 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1137 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1232 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1138 1233
1139 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1234 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1140 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1235 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1141 1236
1142 create_respipe (); 1237 create_respipe ();
1143 1238
1144 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1239 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1145#ifdef _WIN32 1240 patch_errno ();
1146 X_MUTEX_CHECK (wrklock);
1147 X_MUTEX_CHECK (reslock);
1148 X_MUTEX_CHECK (reqlock);
1149
1150 X_COND_CHECK (reqwait);
1151#endif
1152} 1241}
1153 1242
1154void 1243void
1155max_poll_reqs (int nreqs) 1244max_poll_reqs (int nreqs)
1156 PROTOTYPE: $ 1245 PROTOTYPE: $
… …
1296 CODE: 1385 CODE:
1297 RETVAL = db_strerror (errorno); 1386 RETVAL = db_strerror (errorno);
1298 OUTPUT: 1387 OUTPUT:
1299 RETVAL 1388 RETVAL
1300 1389
1390void _on_next_submit (SV *cb)
1391 CODE:
1392 SvREFCNT_dec (on_next_submit);
1393 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1394
1301DB_ENV * 1395DB_ENV *
1302db_env_create (U32 env_flags = 0) 1396db_env_create (U32 env_flags = 0)
1303 CODE: 1397 CODE:
1304{ 1398{
1305 errno = db_env_create (&RETVAL, env_flags); 1399 errno = db_env_create (&RETVAL, env_flags);
… …
1314} 1408}
1315 OUTPUT: 1409 OUTPUT:
1316 RETVAL 1410 RETVAL
1317 1411
1318void 1412void
1319db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1413db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1320 CODE: 1414 CODE:
1321{ 1415{
1322 dREQ (REQ_ENV_OPEN); 1416 dREQ (REQ_ENV_OPEN);
1323
1324 env->set_thread_count (env, wanted + 2);
1325 1417
1326 req->env = env; 1418 req->env = env;
1327 req->uint1 = open_flags | DB_THREAD; 1419 req->uint1 = open_flags | DB_THREAD;
1328 req->int1 = mode; 1420 req->int1 = mode;
1329 req->buf1 = strdup_ornull (db_home); 1421 req->buf1 = strdup_ornull (db_home);
… …
1397} 1489}
1398 OUTPUT: 1490 OUTPUT:
1399 RETVAL 1491 RETVAL
1400 1492
1401void 1493void
1402db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1494db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
1403 CODE: 1495 CODE:
1404{ 1496{
1405 dREQ (REQ_DB_OPEN); 1497 dREQ (REQ_DB_OPEN);
1406 req->db = db; 1498 req->db = db;
1407 req->txn = txnid; 1499 req->txn = txnid;
… …
1447 req->uint1 = flags; 1539 req->uint1 = flags;
1448 REQ_SEND; 1540 REQ_SEND;
1449} 1541}
1450 1542
1451void 1543void
1544db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
1545 CODE:
1546{
1547 dREQ (REQ_DB_SYNC);
1548 req->db = db;
1549 req->buf1 = strdup (file);
1550 req->uint1 = flags;
1551 REQ_SEND;
1552}
1553
1554void
1452db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1555db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1453 CODE: 1556 CODE:
1454{ 1557{
1455 dREQ (REQ_DB_KEY_RANGE); 1558 dREQ (REQ_DB_KEY_RANGE);
1456 req->db = db; 1559 req->db = db;
… …
1475} 1578}
1476 1579
1477void 1580void
1478db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1581db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1479 CODE: 1582 CODE:
1583 if (SvREADONLY (data))
1584 croak ("can't modify read-only data scalar in db_get");
1480{ 1585{
1481 dREQ (REQ_DB_GET); 1586 dREQ (REQ_DB_GET);
1482 req->db = db; 1587 req->db = db;
1483 req->txn = txn; 1588 req->txn = txn;
1484 req->uint1 = flags; 1589 req->uint1 = flags;
… …
1489} 1594}
1490 1595
1491void 1596void
1492db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1597db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1493 CODE: 1598 CODE:
1599 if (SvREADONLY (data))
1600 croak ("can't modify read-only data scalar in db_pget");
1494{ 1601{
1495 dREQ (REQ_DB_PGET); 1602 dREQ (REQ_DB_PGET);
1496 req->db = db; 1603 req->db = db;
1497 req->txn = txn; 1604 req->txn = txn;
1498 req->uint1 = flags; 1605 req->uint1 = flags;
… …
1692 1799
1693 1800
1694MODULE = BDB PACKAGE = BDB::Env 1801MODULE = BDB PACKAGE = BDB::Env
1695 1802
1696void 1803void
1697DESTROY (DB_ENV_ornull *env) 1804DESTROY (DB_ENV_ornuked *env)
1698 CODE: 1805 CODE:
1699 if (env) 1806 if (env)
1700 env->close (env, 0); 1807 env->close (env, 0);
1701 1808
1702int set_data_dir (DB_ENV *env, const char *dir) 1809int set_data_dir (DB_ENV *env, const char *dir)
… …
1727 CODE: 1834 CODE:
1728 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1835 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1729 OUTPUT: 1836 OUTPUT:
1730 RETVAL 1837 RETVAL
1731 1838
1732int set_flags (DB_ENV *env, U32 flags, int onoff) 1839int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1733 CODE: 1840 CODE:
1734 RETVAL = env->set_flags (env, flags, onoff); 1841 RETVAL = env->set_flags (env, flags, onoff);
1735 OUTPUT: 1842 OUTPUT:
1736 RETVAL 1843 RETVAL
1737 1844
… …
1741 1848
1742void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1849void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1743 CODE: 1850 CODE:
1744 env->set_msgfile (env, msgfile); 1851 env->set_msgfile (env, msgfile);
1745 1852
1746int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1853int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1747 CODE: 1854 CODE:
1748 RETVAL = env->set_verbose (env, which, onoff); 1855 RETVAL = env->set_verbose (env, which, onoff);
1749 OUTPUT: 1856 OUTPUT:
1750 RETVAL 1857 RETVAL
1751 1858
… …
1849 RETVAL 1956 RETVAL
1850 1957
1851MODULE = BDB PACKAGE = BDB::Db 1958MODULE = BDB PACKAGE = BDB::Db
1852 1959
1853void 1960void
1854DESTROY (DB_ornull *db) 1961DESTROY (DB_ornuked *db)
1855 CODE: 1962 CODE:
1856 if (db) 1963 if (db)
1857 { 1964 {
1858 SV *env = (SV *)db->app_private; 1965 SV *env = (SV *)db->app_private;
1859 db->close (db, 0); 1966 db->close (db, 0);
… …
1954 2061
1955 2062
1956MODULE = BDB PACKAGE = BDB::Txn 2063MODULE = BDB PACKAGE = BDB::Txn
1957 2064
1958void 2065void
1959DESTROY (DB_TXN_ornull *txn) 2066DESTROY (DB_TXN_ornuked *txn)
1960 CODE: 2067 CODE:
1961 if (txn) 2068 if (txn)
1962 txn->abort (txn); 2069 txn->abort (txn);
1963 2070
1964int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT) 2071int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
… …
1975 2082
1976 2083
1977MODULE = BDB PACKAGE = BDB::Cursor 2084MODULE = BDB PACKAGE = BDB::Cursor
1978 2085
1979void 2086void
1980DESTROY (DBC_ornull *dbc) 2087DESTROY (DBC_ornuked *dbc)
1981 CODE: 2088 CODE:
1982 if (dbc) 2089 if (dbc)
1983 dbc->c_close (dbc); 2090 dbc->c_close (dbc);
1984 2091
2092#if DB_VERSION_MINOR >= 6
2093
2094int set_priority (DBC *dbc, int priority)
2095 CODE:
2096 dbc->set_priority (dbc, priority);
2097
2098#endif
2099
1985MODULE = BDB PACKAGE = BDB::Sequence 2100MODULE = BDB PACKAGE = BDB::Sequence
1986 2101
1987void 2102void
1988DESTROY (DB_SEQUENCE_ornull *seq) 2103DESTROY (DB_SEQUENCE_ornuked *seq)
1989 CODE: 2104 CODE:
1990 if (seq) 2105 if (seq)
1991 seq->close (seq, 0); 2106 seq->close (seq, 0);
1992 2107
1993int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2108int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
2012 CODE: 2127 CODE:
2013 RETVAL = seq->set_range (seq, min, max); 2128 RETVAL = seq->set_range (seq, min, max);
2014 OUTPUT: 2129 OUTPUT:
2015 RETVAL 2130 RETVAL
2016 2131
2132

Diff Legend

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