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

Comparing BDB/BDB.xs (file contents):
Revision 1.16 by root, Mon Aug 13 12:01:45 2007 UTC vs.
Revision 1.39 by root, Mon Jul 7 22:11:04 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}
… …
101} 137}
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, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
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, 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;
… …
123 DBC *dbc; 159 DBC *dbc;
124 160
125 UV uv1; 161 UV uv1;
126 int int1, int2; 162 int int1, int2;
127 U32 uint1, uint2; 163 U32 uint1, uint2;
128 char *buf1, *buf2; 164 char *buf1, *buf2, *buf3;
129 SV *sv1, *sv2, *sv3; 165 SV *sv1, *sv2, *sv3;
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 };
… …
191} 229}
192 230
193static volatile unsigned int nreqs, nready, npending; 231static volatile unsigned int nreqs, nready, npending;
194static volatile unsigned int max_idle = 4; 232static volatile unsigned int max_idle = 4;
195static volatile unsigned int max_outstanding = 0xffffffff; 233static volatile unsigned int max_outstanding = 0xffffffff;
196static int respipe [2], respipe_osf [2]; 234static int respipe_osf [2], respipe [2] = { -1, -1 };
197 235
198static mutex_t reslock = X_MUTEX_INIT; 236static mutex_t reslock = X_MUTEX_INIT;
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));
… …
344 388
345 case REQ_SEQ_GET: 389 case REQ_SEQ_GET:
346 SvREADONLY_off (req->sv1); 390 SvREADONLY_off (req->sv1);
347 391
348 if (sizeof (IV) > 4) 392 if (sizeof (IV) > 4)
349 sv_setiv_mg (req->sv1, req->seq_t); 393 sv_setiv_mg (req->sv1, (IV)req->seq_t);
350 else 394 else
351 sv_setnv_mg (req->sv1, req->seq_t); 395 sv_setnv_mg (req->sv1, (NV)req->seq_t);
352 396
353 SvREFCNT_dec (req->sv1); 397 SvREFCNT_dec (req->sv1);
354 break; 398 break;
355 } 399 }
356 400
… …
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);
418 free (req->buf3);
374 Safefree (req); 419 Safefree (req);
375} 420}
376 421
377#ifdef USE_SOCKETS_AS_HANDLES 422#ifdef USE_SOCKETS_AS_HANDLES
378# define TO_SOCKET(x) (win32_get_osfhandle (x)) 423# define TO_SOCKET(x) (win32_get_osfhandle (x))
379#else 424#else
380# define TO_SOCKET(x) (x) 425# define TO_SOCKET(x) (x)
381#endif 426#endif
382 427
383static void 428static void
384create_pipe (int fd[2]) 429create_respipe (void)
385{ 430{
386#ifdef _WIN32 431#ifdef _WIN32
387 int arg = 1; 432 int arg; /* argg */
433#endif
434 int old_readfd = respipe [0];
435
436 if (respipe [1] >= 0)
437 respipe_close (TO_SOCKET (respipe [1]));
438
439#ifdef _WIN32
388 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd) 440 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
389 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg)
390 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg))
391#else 441#else
392 if (pipe (fd) 442 if (pipe (respipe))
393 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
394 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
395#endif 443#endif
396 croak ("unable to initialize result pipe"); 444 croak ("unable to initialize result pipe");
445
446 if (old_readfd >= 0)
447 {
448 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
449 croak ("unable to initialize result pipe(2)");
450
451 respipe_close (respipe [0]);
452 respipe [0] = old_readfd;
453 }
454
455#ifdef _WIN32
456 arg = 1;
457 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
458 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
459#else
460 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
461 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
462#endif
463 croak ("unable to initialize result pipe(3)");
397 464
398 respipe_osf [0] = TO_SOCKET (respipe [0]); 465 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]); 466 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 467}
401 468
… …
421 free (wrk); 488 free (wrk);
422 489
423 X_UNLOCK (wrklock); 490 X_UNLOCK (wrklock);
424} 491}
425 492
426static void maybe_start_thread () 493static void maybe_start_thread (void)
427{ 494{
428 if (get_nthreads () >= wanted) 495 if (get_nthreads () >= wanted)
429 return; 496 return;
430 497
431 /* todo: maybe use idle here, but might be less exact */ 498 /* todo: maybe use idle here, but might be less exact */
… …
433 return; 500 return;
434 501
435 start_thread (); 502 start_thread ();
436} 503}
437 504
438static void req_send (aio_req req) 505static void req_send (bdb_req req)
439{ 506{
440 SV *wait_callback = 0; 507 SV *wait_callback = 0;
508
509 if (on_next_submit)
510 {
511 dSP;
512 SV *cb = sv_2mortal (on_next_submit);
513
514 on_next_submit = 0;
515
516 PUSHMARK (SP);
517 PUTBACK;
518 call_sv (cb, G_DISCARD | G_EVAL);
519 }
441 520
442 // synthesize callback if none given 521 // synthesize callback if none given
443 if (!SvOK (req->callback)) 522 if (!SvOK (req->callback))
444 { 523 {
445 int count; 524 int count;
… …
451 SPAGAIN; 530 SPAGAIN;
452 531
453 if (count != 2) 532 if (count != 2)
454 croak ("prepare callback must return exactly two values\n"); 533 croak ("prepare callback must return exactly two values\n");
455 534
456 wait_callback = SvREFCNT_inc (POPs); 535 wait_callback = POPs;
457 SvREFCNT_dec (req->callback); 536 SvREFCNT_dec (req->callback);
458 req->callback = SvREFCNT_inc (POPs); 537 req->callback = SvREFCNT_inc (POPs);
459 } 538 }
460 539
461 ++nreqs; 540 ++nreqs;
… …
472 { 551 {
473 dSP; 552 dSP;
474 PUSHMARK (SP); 553 PUSHMARK (SP);
475 PUTBACK; 554 PUTBACK;
476 call_sv (wait_callback, G_DISCARD); 555 call_sv (wait_callback, G_DISCARD);
477 SvREFCNT_dec (wait_callback);
478 } 556 }
479} 557}
480 558
481static void end_thread (void) 559static void end_thread (void)
482{ 560{
483 aio_req req; 561 bdb_req req;
484 562
485 Newz (0, req, 1, aio_cb); 563 Newz (0, req, 1, bdb_cb);
486 564
487 req->type = REQ_QUIT; 565 req->type = REQ_QUIT;
488 req->pri = PRI_MAX + PRI_BIAS; 566 req->pri = PRI_MAX + PRI_BIAS;
489 567
490 X_LOCK (reqlock); 568 X_LOCK (reqlock);
… …
517 595
518 while (started > wanted) 596 while (started > wanted)
519 end_thread (); 597 end_thread ();
520} 598}
521 599
522static void poll_wait () 600static void poll_wait (void)
523{ 601{
524 fd_set rfd; 602 fd_set rfd;
525 603
526 while (nreqs) 604 while (nreqs)
527 { 605 {
… …
540 618
541 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 619 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
542 } 620 }
543} 621}
544 622
545static int poll_cb () 623static int poll_cb (void)
546{ 624{
547 dSP; 625 dSP;
548 int count = 0; 626 int count = 0;
549 int maxreqs = max_poll_reqs; 627 int maxreqs = max_poll_reqs;
550 int do_croak = 0; 628 int do_croak = 0;
551 struct timeval tv_start, tv_now; 629 struct timeval tv_start, tv_now;
552 aio_req req; 630 bdb_req req;
553 631
554 if (max_poll_time) 632 if (max_poll_time)
555 gettimeofday (&tv_start, 0); 633 gettimeofday (&tv_start, 0);
556 634
557 for (;;) 635 for (;;)
… …
618 696
619/*****************************************************************************/ 697/*****************************************************************************/
620 698
621X_THREAD_PROC (bdb_proc) 699X_THREAD_PROC (bdb_proc)
622{ 700{
623 aio_req req; 701 bdb_req req;
624 struct timespec ts; 702 struct timespec ts;
625 worker *self = (worker *)thr_arg; 703 worker *self = (worker *)thr_arg;
626 704
627 /* try to distribute timeouts somewhat evenly */ 705 /* try to distribute timeouts somewhat evenly */
628 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 706 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
668 X_UNLOCK (reqlock); 746 X_UNLOCK (reqlock);
669 747
670 switch (req->type) 748 switch (req->type)
671 { 749 {
672 case REQ_QUIT: 750 case REQ_QUIT:
751 req->result = ENOSYS;
673 goto quit; 752 goto quit;
674 753
675 case REQ_ENV_OPEN: 754 case REQ_ENV_OPEN:
676 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 755 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
677 break; 756 break;
… …
694 773
695 case REQ_ENV_MEMP_TRICKLE: 774 case REQ_ENV_MEMP_TRICKLE:
696 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2); 775 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
697 break; 776 break;
698 777
778 case REQ_ENV_DBREMOVE:
779 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
780 break;
781
782 case REQ_ENV_DBRENAME:
783 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
784 break;
785
699 case REQ_DB_OPEN: 786 case REQ_DB_OPEN:
700 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2); 787 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
701 break; 788 break;
702 789
703 case REQ_DB_CLOSE: 790 case REQ_DB_CLOSE:
… …
710 797
711 case REQ_DB_SYNC: 798 case REQ_DB_SYNC:
712 req->result = req->db->sync (req->db, req->uint1); 799 req->result = req->db->sync (req->db, req->uint1);
713 break; 800 break;
714 801
802 case REQ_DB_UPGRADE:
803 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
804 break;
805
715 case REQ_DB_PUT: 806 case REQ_DB_PUT:
716 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 807 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
717 break; 808 break;
718 809
719 case REQ_DB_GET: 810 case REQ_DB_GET:
… …
736 req->result = req->txn->commit (req->txn, req->uint1); 827 req->result = req->txn->commit (req->txn, req->uint1);
737 break; 828 break;
738 829
739 case REQ_TXN_ABORT: 830 case REQ_TXN_ABORT:
740 req->result = req->txn->abort (req->txn); 831 req->result = req->txn->abort (req->txn);
832 break;
833
834 case REQ_TXN_FINISH:
835 if (req->txn->flags & TXN_DEADLOCK)
836 {
837 req->result = req->txn->abort (req->txn);
838 if (!req->result)
839 req->result = DB_LOCK_DEADLOCK;
840 }
841 else
842 req->result = req->txn->commit (req->txn, req->uint1);
741 break; 843 break;
742 844
743 case REQ_C_CLOSE: 845 case REQ_C_CLOSE:
744 req->result = req->dbc->c_close (req->dbc); 846 req->result = req->dbc->c_close (req->dbc);
745 break; 847 break;
… …
787 default: 889 default:
788 req->result = ENOSYS; 890 req->result = ENOSYS;
789 break; 891 break;
790 } 892 }
791 893
894 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
895 req->txn->flags |= TXN_DEADLOCK;
896
792 X_LOCK (reslock); 897 X_LOCK (reslock);
793 898
794 ++npending; 899 ++npending;
795 900
796 if (!reqq_push (&res_queue, req)) 901 if (!reqq_push (&res_queue, req))
… …
827 X_UNLOCK (wrklock); 932 X_UNLOCK (wrklock);
828} 933}
829 934
830static void atfork_child (void) 935static void atfork_child (void)
831{ 936{
832 aio_req prv; 937 bdb_req prv;
833 938
834 while (prv = reqq_shift (&req_queue)) 939 while (prv = reqq_shift (&req_queue))
835 req_free (prv); 940 req_free (prv);
836 941
837 while (prv = reqq_shift (&res_queue)) 942 while (prv = reqq_shift (&res_queue))
… …
852 idle = 0; 957 idle = 0;
853 nreqs = 0; 958 nreqs = 0;
854 nready = 0; 959 nready = 0;
855 npending = 0; 960 npending = 0;
856 961
857 respipe_close (respipe [0]);
858 respipe_close (respipe [1]);
859
860 create_pipe (respipe); 962 create_respipe ();
861 963
862 atfork_parent (); 964 atfork_parent ();
863} 965}
864 966
865#define dREQ(reqtype) \ 967#define dREQ(reqtype) \
866 aio_req req; \ 968 bdb_req req; \
867 int req_pri = next_pri; \ 969 int req_pri = next_pri; \
868 next_pri = DEFAULT_PRI + PRI_BIAS; \ 970 next_pri = DEFAULT_PRI + PRI_BIAS; \
869 \ 971 \
870 if (SvOK (callback) && !SvROK (callback)) \ 972 if (SvOK (callback) && !SvROK (callback)) \
871 croak ("callback must be undef or of reference type"); \ 973 croak ("callback must be undef or of reference type"); \
872 \ 974 \
873 Newz (0, req, 1, aio_cb); \ 975 Newz (0, req, 1, bdb_cb); \
874 if (!req) \ 976 if (!req) \
875 croak ("out of memory during aio_req allocation"); \ 977 croak ("out of memory during bdb_req allocation"); \
876 \ 978 \
877 req->callback = newSVsv (callback); \ 979 req->callback = newSVsv (callback); \
878 req->type = (reqtype); \ 980 req->type = (reqtype); \
879 req->pri = req_pri 981 req->pri = req_pri
880 982
881#define REQ_SEND \ 983#define REQ_SEND \
882 req_send (req) 984 req_send (req)
883 985
884#define SvPTR(var, arg, type, class, nullok) \ 986#define SvPTR(var, arg, type, class, nullok) \
885 if (!SvOK (arg)) \ 987 if (!SvOK (arg)) \
886 { \ 988 { \
887 if (!nullok) \ 989 if (nullok != 1) \
888 croak (# var " must be a " # class " object, not undef"); \ 990 croak (# var " must be a " # class " object, not undef"); \
889 \ 991 \
890 (var) = 0; \ 992 (var) = 0; \
891 } \ 993 } \
892 else if (sv_derived_from ((arg), # class)) \ 994 else if (sv_derived_from ((arg), # class)) \
893 { \ 995 { \
894 IV tmp = SvIV ((SV*) SvRV (arg)); \ 996 IV tmp = SvIV ((SV*) SvRV (arg)); \
895 (var) = INT2PTR (type, tmp); \ 997 (var) = INT2PTR (type, tmp); \
896 if (!var) \ 998 if (!var && nullok != 2) \
897 croak (# var " is not a valid " # class " object anymore"); \ 999 croak (# var " is not a valid " # class " object anymore"); \
898 } \ 1000 } \
899 else \ 1001 else \
900 croak (# var " is not of type " # class); \ 1002 croak (# var " is not of type " # class); \
901 \ 1003 \
… …
903static void 1005static void
904ptr_nuke (SV *sv) 1006ptr_nuke (SV *sv)
905{ 1007{
906 assert (SvROK (sv)); 1008 assert (SvROK (sv));
907 sv_setiv (SvRV (sv), 0); 1009 sv_setiv (SvRV (sv), 0);
1010}
1011
1012static int
1013errno_get (pTHX_ SV *sv, MAGIC *mg)
1014{
1015 if (*mg->mg_ptr == '!') // should always be the case
1016 if (-30999 <= errno && errno <= -30800)
1017 {
1018 sv_setnv (sv, (NV)errno);
1019 sv_setpv (sv, db_strerror (errno));
1020 SvNOK_on (sv); /* what a wonderful hack! */
1021 // ^^^ copied from perl sources
1022 return 0;
1023 }
1024
1025 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
1026}
1027
1028static MGVTBL vtbl_errno;
1029
1030// this wonderful hack :( patches perl's $! variable to support our errno values
1031static void
1032patch_errno (void)
1033{
1034 SV *sv;
1035 MAGIC *mg;
1036
1037 if (!(sv = get_sv ("!", 1)))
1038 return;
1039
1040 if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
1041 return;
1042
1043 if (mg->mg_virtual != &PL_vtbl_sv)
1044 return;
1045
1046 vtbl_errno = PL_vtbl_sv;
1047 vtbl_errno.svt_get = errno_get;
1048 mg->mg_virtual = &vtbl_errno;
908} 1049}
909 1050
910MODULE = BDB PACKAGE = BDB 1051MODULE = BDB PACKAGE = BDB
911 1052
912PROTOTYPES: ENABLE 1053PROTOTYPES: ENABLE
… …
929 const_iv (INIT_TXN) 1070 const_iv (INIT_TXN)
930 const_iv (RECOVER) 1071 const_iv (RECOVER)
931 const_iv (INIT_TXN) 1072 const_iv (INIT_TXN)
932 const_iv (RECOVER_FATAL) 1073 const_iv (RECOVER_FATAL)
933 const_iv (CREATE) 1074 const_iv (CREATE)
1075 const_iv (RDONLY)
934 const_iv (USE_ENVIRON) 1076 const_iv (USE_ENVIRON)
935 const_iv (USE_ENVIRON_ROOT) 1077 const_iv (USE_ENVIRON_ROOT)
936 const_iv (LOCKDOWN) 1078 const_iv (LOCKDOWN)
937 const_iv (PRIVATE) 1079 const_iv (PRIVATE)
938 const_iv (REGISTER) 1080 const_iv (REGISTER)
939 const_iv (SYSTEM_MEM) 1081 const_iv (SYSTEM_MEM)
940 const_iv (AUTO_COMMIT) 1082 const_iv (AUTO_COMMIT)
941 const_iv (CDB_ALLDB) 1083 const_iv (CDB_ALLDB)
942 const_iv (DIRECT_DB) 1084 const_iv (DIRECT_DB)
943 const_iv (DIRECT_LOG)
944 const_iv (DSYNC_DB) 1085 const_iv (DSYNC_DB)
945 const_iv (DSYNC_LOG)
946 const_iv (LOG_AUTOREMOVE)
947 const_iv (LOG_INMEMORY)
948 const_iv (NOLOCKING) 1086 const_iv (NOLOCKING)
949 const_iv (NOMMAP) 1087 const_iv (NOMMAP)
950 const_iv (NOPANIC) 1088 const_iv (NOPANIC)
951 const_iv (OVERWRITE) 1089 const_iv (OVERWRITE)
952 const_iv (PANIC_ENVIRONMENT) 1090 const_iv (PANIC_ENVIRONMENT)
953 const_iv (REGION_INIT) 1091 const_iv (REGION_INIT)
954 const_iv (TIME_NOTGRANTED) 1092 const_iv (TIME_NOTGRANTED)
955 const_iv (TXN_NOSYNC) 1093 const_iv (TXN_NOSYNC)
1094 const_iv (TXN_NOT_DURABLE)
956 const_iv (TXN_WRITE_NOSYNC) 1095 const_iv (TXN_WRITE_NOSYNC)
957 const_iv (WRITECURSOR) 1096 const_iv (WRITECURSOR)
958 const_iv (YIELDCPU) 1097 const_iv (YIELDCPU)
959 const_iv (ENCRYPT_AES) 1098 const_iv (ENCRYPT_AES)
960 const_iv (XA_CREATE) 1099 const_iv (XA_CREATE)
… …
968 const_iv (READ_UNCOMMITTED) 1107 const_iv (READ_UNCOMMITTED)
969 const_iv (TRUNCATE) 1108 const_iv (TRUNCATE)
970 const_iv (NOSYNC) 1109 const_iv (NOSYNC)
971 const_iv (CHKSUM) 1110 const_iv (CHKSUM)
972 const_iv (ENCRYPT) 1111 const_iv (ENCRYPT)
973 const_iv (TXN_NOT_DURABLE)
974 const_iv (DUP) 1112 const_iv (DUP)
975 const_iv (DUPSORT) 1113 const_iv (DUPSORT)
976 const_iv (RECNUM) 1114 const_iv (RECNUM)
977 const_iv (RENUMBER) 1115 const_iv (RENUMBER)
978 const_iv (REVSPLITOFF) 1116 const_iv (REVSPLITOFF)
… …
983 const_iv (GET_BOTH_RANGE) 1121 const_iv (GET_BOTH_RANGE)
984 //const_iv (SET_RECNO) 1122 //const_iv (SET_RECNO)
985 //const_iv (MULTIPLE) 1123 //const_iv (MULTIPLE)
986 const_iv (SNAPSHOT) 1124 const_iv (SNAPSHOT)
987 const_iv (JOIN_ITEM) 1125 const_iv (JOIN_ITEM)
1126 const_iv (JOIN_NOSORT)
988 const_iv (RMW) 1127 const_iv (RMW)
989 1128
990 const_iv (NOTFOUND) 1129 const_iv (NOTFOUND)
991 const_iv (KEYEMPTY) 1130 const_iv (KEYEMPTY)
992 const_iv (LOCK_DEADLOCK) 1131 const_iv (LOCK_DEADLOCK)
… …
1008 const_iv (TXN_SYNC) 1147 const_iv (TXN_SYNC)
1009 1148
1010 const_iv (SET_LOCK_TIMEOUT) 1149 const_iv (SET_LOCK_TIMEOUT)
1011 const_iv (SET_TXN_TIMEOUT) 1150 const_iv (SET_TXN_TIMEOUT)
1012 1151
1013 const_iv (JOIN_ITEM)
1014 const_iv (FIRST) 1152 const_iv (FIRST)
1015 const_iv (NEXT) 1153 const_iv (NEXT)
1016 const_iv (NEXT_DUP) 1154 const_iv (NEXT_DUP)
1017 const_iv (NEXT_NODUP) 1155 const_iv (NEXT_NODUP)
1018 const_iv (PREV) 1156 const_iv (PREV)
… …
1052 const_iv (LOG_BUFFER_FULL) 1190 const_iv (LOG_BUFFER_FULL)
1053 const_iv (NOSERVER) 1191 const_iv (NOSERVER)
1054 const_iv (NOSERVER_HOME) 1192 const_iv (NOSERVER_HOME)
1055 const_iv (NOSERVER_ID) 1193 const_iv (NOSERVER_ID)
1056 const_iv (NOTFOUND) 1194 const_iv (NOTFOUND)
1057 const_iv (OLD_VERSION)
1058 const_iv (PAGE_NOTFOUND) 1195 const_iv (PAGE_NOTFOUND)
1059 const_iv (REP_DUPMASTER) 1196 const_iv (REP_DUPMASTER)
1060 const_iv (REP_HANDLE_DEAD) 1197 const_iv (REP_HANDLE_DEAD)
1061 const_iv (REP_HOLDELECTION) 1198 const_iv (REP_HOLDELECTION)
1062 const_iv (REP_IGNORE) 1199 const_iv (REP_IGNORE)
… …
1085 const_iv (MULTIVERSION) 1222 const_iv (MULTIVERSION)
1086 const_iv (TXN_SNAPSHOT) 1223 const_iv (TXN_SNAPSHOT)
1087#endif 1224#endif
1088#if DB_VERSION_MINOR >= 6 1225#if DB_VERSION_MINOR >= 6
1089 const_iv (PREV_DUP) 1226 const_iv (PREV_DUP)
1090# if 0
1091 const_iv (PRIORITY_UNCHANGED) 1227 const_iv (PRIORITY_UNCHANGED)
1092 const_iv (PRIORITY_VERY_LOW) 1228 const_iv (PRIORITY_VERY_LOW)
1093 const_iv (PRIORITY_LOW) 1229 const_iv (PRIORITY_LOW)
1094 const_iv (PRIORITY_DEFAULT) 1230 const_iv (PRIORITY_DEFAULT)
1095 const_iv (PRIORITY_HIGH) 1231 const_iv (PRIORITY_HIGH)
1096 const_iv (PRIORITY_VERY_HIGH) 1232 const_iv (PRIORITY_VERY_HIGH)
1097# endif 1233#endif
1234#if DB_VERSION_MINOR >= 7
1235 const_iv (LOG_DIRECT)
1236 const_iv (LOG_DSYNC)
1237 const_iv (LOG_AUTO_REMOVE)
1238 const_iv (LOG_IN_MEMORY)
1239 const_iv (LOG_ZERO)
1240#else
1241 const_iv (DIRECT_LOG)
1242 const_iv (DSYNC_LOG)
1243 const_iv (LOG_AUTOREMOVE)
1244 const_iv (LOG_INMEMORY)
1098#endif 1245#endif
1099 }; 1246 };
1100 1247
1101 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1248 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1102 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1249 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1103 1250
1104 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1251 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1105 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1252 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1106 1253
1107 create_pipe (respipe); 1254 create_respipe ();
1108 1255
1109 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1256 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1110#ifdef _WIN32 1257 patch_errno ();
1111 X_MUTEX_CHECK (wrklock);
1112 X_MUTEX_CHECK (reslock);
1113 X_MUTEX_CHECK (reqlock);
1114
1115 X_COND_CHECK (reqwait);
1116#endif
1117} 1258}
1118 1259
1119void 1260void
1120max_poll_reqs (int nreqs) 1261max_poll_reqs (int nreqs)
1121 PROTOTYPE: $ 1262 PROTOTYPE: $
… …
1261 CODE: 1402 CODE:
1262 RETVAL = db_strerror (errorno); 1403 RETVAL = db_strerror (errorno);
1263 OUTPUT: 1404 OUTPUT:
1264 RETVAL 1405 RETVAL
1265 1406
1407void _on_next_submit (SV *cb)
1408 CODE:
1409 SvREFCNT_dec (on_next_submit);
1410 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1411
1266DB_ENV * 1412DB_ENV *
1267db_env_create (U32 env_flags = 0) 1413db_env_create (U32 env_flags = 0)
1268 CODE: 1414 CODE:
1269{ 1415{
1270 errno = db_env_create (&RETVAL, env_flags); 1416 errno = db_env_create (&RETVAL, env_flags);
… …
1279} 1425}
1280 OUTPUT: 1426 OUTPUT:
1281 RETVAL 1427 RETVAL
1282 1428
1283void 1429void
1284db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1430db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1285 CODE: 1431 CODE:
1286{ 1432{
1287 dREQ (REQ_ENV_OPEN); 1433 dREQ (REQ_ENV_OPEN);
1288
1289 env->set_thread_count (env, wanted + 2);
1290 1434
1291 req->env = env; 1435 req->env = env;
1292 req->uint1 = open_flags | DB_THREAD; 1436 req->uint1 = open_flags | DB_THREAD;
1293 req->int1 = mode; 1437 req->int1 = mode;
1294 req->buf1 = strdup_ornull (db_home); 1438 req->buf1 = strdup_ornull (db_home);
… …
1346 req->env = env; 1490 req->env = env;
1347 req->int1 = percent; 1491 req->int1 = percent;
1348 REQ_SEND; 1492 REQ_SEND;
1349} 1493}
1350 1494
1495void
1496db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = &PL_sv_undef)
1497 CODE:
1498{
1499 dREQ (REQ_ENV_DBREMOVE);
1500 req->env = env;
1501 req->buf1 = strdup_ornull (file);
1502 req->buf2 = strdup_ornull (database);
1503 req->uint1 = flags;
1504 REQ_SEND;
1505}
1506
1507void
1508db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = &PL_sv_undef)
1509 CODE:
1510{
1511 dREQ (REQ_ENV_DBRENAME);
1512 req->env = env;
1513 req->buf1 = strdup_ornull (file);
1514 req->buf2 = strdup_ornull (database);
1515 req->buf3 = strdup_ornull (newname);
1516 req->uint1 = flags;
1517 REQ_SEND;
1518}
1351 1519
1352DB * 1520DB *
1353db_create (DB_ENV *env = 0, U32 flags = 0) 1521db_create (DB_ENV *env = 0, U32 flags = 0)
1354 CODE: 1522 CODE:
1355{ 1523{
… …
1362} 1530}
1363 OUTPUT: 1531 OUTPUT:
1364 RETVAL 1532 RETVAL
1365 1533
1366void 1534void
1367db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1535db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
1368 CODE: 1536 CODE:
1369{ 1537{
1370 dREQ (REQ_DB_OPEN); 1538 dREQ (REQ_DB_OPEN);
1371 req->db = db; 1539 req->db = db;
1372 req->txn = txnid; 1540 req->txn = txnid;
… …
1412 req->uint1 = flags; 1580 req->uint1 = flags;
1413 REQ_SEND; 1581 REQ_SEND;
1414} 1582}
1415 1583
1416void 1584void
1585db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
1586 CODE:
1587{
1588 dREQ (REQ_DB_SYNC);
1589 req->db = db;
1590 req->buf1 = strdup (file);
1591 req->uint1 = flags;
1592 REQ_SEND;
1593}
1594
1595void
1417db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1596db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1418 CODE: 1597 CODE:
1419{ 1598{
1420 dREQ (REQ_DB_KEY_RANGE); 1599 dREQ (REQ_DB_KEY_RANGE);
1421 req->db = db; 1600 req->db = db;
… …
1440} 1619}
1441 1620
1442void 1621void
1443db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1622db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1444 CODE: 1623 CODE:
1624 if (SvREADONLY (data))
1625 croak ("can't modify read-only data scalar in db_get");
1445{ 1626{
1446 dREQ (REQ_DB_GET); 1627 dREQ (REQ_DB_GET);
1447 req->db = db; 1628 req->db = db;
1448 req->txn = txn; 1629 req->txn = txn;
1449 req->uint1 = flags; 1630 req->uint1 = flags;
… …
1454} 1635}
1455 1636
1456void 1637void
1457db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1638db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1458 CODE: 1639 CODE:
1640 if (SvREADONLY (data))
1641 croak ("can't modify read-only data scalar in db_pget");
1459{ 1642{
1460 dREQ (REQ_DB_PGET); 1643 dREQ (REQ_DB_PGET);
1461 req->db = db; 1644 req->db = db;
1462 req->txn = txn; 1645 req->txn = txn;
1463 req->uint1 = flags; 1646 req->uint1 = flags;
… …
1500 REQ_SEND; 1683 REQ_SEND;
1501 ptr_nuke (ST (0)); 1684 ptr_nuke (ST (0));
1502} 1685}
1503 1686
1504void 1687void
1688db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1689 CODE:
1690{
1691 dREQ (REQ_TXN_FINISH);
1692 req->txn = txn;
1693 req->uint1 = flags;
1694 REQ_SEND;
1695 ptr_nuke (ST (0));
1696}
1697
1698void
1505db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1699db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1506 CODE: 1700 CODE:
1507{ 1701{
1508 dREQ (REQ_C_CLOSE); 1702 dREQ (REQ_C_CLOSE);
1509 req->dbc = dbc; 1703 req->dbc = dbc;
… …
1646 1840
1647 1841
1648MODULE = BDB PACKAGE = BDB::Env 1842MODULE = BDB PACKAGE = BDB::Env
1649 1843
1650void 1844void
1651DESTROY (DB_ENV_ornull *env) 1845DESTROY (DB_ENV_ornuked *env)
1652 CODE: 1846 CODE:
1653 if (env) 1847 if (env)
1654 env->close (env, 0); 1848 env->close (env, 0);
1655 1849
1656int set_data_dir (DB_ENV *env, const char *dir) 1850int set_data_dir (DB_ENV *env, const char *dir)
… …
1681 CODE: 1875 CODE:
1682 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1876 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1683 OUTPUT: 1877 OUTPUT:
1684 RETVAL 1878 RETVAL
1685 1879
1686int set_flags (DB_ENV *env, U32 flags, int onoff) 1880int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1687 CODE: 1881 CODE:
1688 RETVAL = env->set_flags (env, flags, onoff); 1882 RETVAL = env->set_flags (env, flags, onoff);
1689 OUTPUT: 1883 OUTPUT:
1690 RETVAL 1884 RETVAL
1691 1885
1886#if DB_VERSION_MINOR >= 7
1887
1888int set_intermediate_dir_mode (DB_ENV *env, const char *mode)
1889 CODE:
1890 RETVAL = env->set_intermediate_dir_mode (env, mode);
1891 OUTPUT:
1892 RETVAL
1893
1894int log_set_config (DB_ENV *env, U32 flags, int onoff = 1)
1895 CODE:
1896 RETVAL = env->log_set_config (env, flags, onoff);
1897 OUTPUT:
1898 RETVAL
1899
1900#endif
1901
1902
1692void set_errfile (DB_ENV *env, FILE *errfile = 0) 1903void set_errfile (DB_ENV *env, FILE *errfile = 0)
1693 CODE: 1904 CODE:
1694 env->set_errfile (env, errfile); 1905 env->set_errfile (env, errfile);
1695 1906
1696void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1907void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1697 CODE: 1908 CODE:
1698 env->set_msgfile (env, msgfile); 1909 env->set_msgfile (env, msgfile);
1699 1910
1700int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1911int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1701 CODE: 1912 CODE:
1702 RETVAL = env->set_verbose (env, which, onoff); 1913 RETVAL = env->set_verbose (env, which, onoff);
1703 OUTPUT: 1914 OUTPUT:
1704 RETVAL 1915 RETVAL
1705 1916
… …
1707 CODE: 1918 CODE:
1708 RETVAL = env->set_encrypt (env, password, flags); 1919 RETVAL = env->set_encrypt (env, password, flags);
1709 OUTPUT: 1920 OUTPUT:
1710 RETVAL 1921 RETVAL
1711 1922
1712int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1923int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1713 CODE: 1924 CODE:
1714 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1925 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1715 OUTPUT: 1926 OUTPUT:
1716 RETVAL 1927 RETVAL
1717 1928
… …
1765 1976
1766int set_lg_max (DB_ENV *env, U32 max) 1977int set_lg_max (DB_ENV *env, U32 max)
1767 CODE: 1978 CODE:
1768 RETVAL = env->set_lg_max (env, max); 1979 RETVAL = env->set_lg_max (env, max);
1769 OUTPUT: 1980 OUTPUT:
1981 RETVAL
1982
1983int mutex_set_max (DB_ENV *env, U32 max)
1984 CODE:
1985 RETVAL = env->mutex_set_max (env, max);
1986 OUTPUT:
1987 RETVAL
1988
1989int mutex_set_increment (DB_ENV *env, U32 increment)
1990 CODE:
1991 RETVAL = env->mutex_set_increment (env, increment);
1992 OUTPUT:
1993 RETVAL
1994
1995int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1996 CODE:
1997 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1998 OUTPUT:
1999 RETVAL
2000
2001int mutex_set_align (DB_ENV *env, U32 align)
2002 CODE:
2003 RETVAL = env->mutex_set_align (env, align);
2004 OUTPUT:
1770 RETVAL 2005 RETVAL
1771 2006
1772DB_TXN * 2007DB_TXN *
1773txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 2008txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1774 CODE: 2009 CODE:
… …
1779 RETVAL 2014 RETVAL
1780 2015
1781MODULE = BDB PACKAGE = BDB::Db 2016MODULE = BDB PACKAGE = BDB::Db
1782 2017
1783void 2018void
1784DESTROY (DB_ornull *db) 2019DESTROY (DB_ornuked *db)
1785 CODE: 2020 CODE:
1786 if (db) 2021 if (db)
1787 { 2022 {
1788 SV *env = (SV *)db->app_private; 2023 SV *env = (SV *)db->app_private;
1789 db->close (db, 0); 2024 db->close (db, 0);
… …
1884 2119
1885 2120
1886MODULE = BDB PACKAGE = BDB::Txn 2121MODULE = BDB PACKAGE = BDB::Txn
1887 2122
1888void 2123void
1889DESTROY (DB_TXN_ornull *txn) 2124DESTROY (DB_TXN_ornuked *txn)
1890 CODE: 2125 CODE:
1891 if (txn) 2126 if (txn)
1892 txn->abort (txn); 2127 txn->abort (txn);
1893 2128
1894int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 2129int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1895 CODE: 2130 CODE:
1896 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 2131 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1897 OUTPUT: 2132 OUTPUT:
1898 RETVAL 2133 RETVAL
1899 2134
2135int failed (DB_TXN *txn)
2136 CODE:
2137 RETVAL = !!(txn->flags & TXN_DEADLOCK);
2138 OUTPUT:
2139 RETVAL
2140
1900 2141
1901MODULE = BDB PACKAGE = BDB::Cursor 2142MODULE = BDB PACKAGE = BDB::Cursor
1902 2143
1903void 2144void
1904DESTROY (DBC_ornull *dbc) 2145DESTROY (DBC_ornuked *dbc)
1905 CODE: 2146 CODE:
1906 if (dbc) 2147 if (dbc)
1907 dbc->c_close (dbc); 2148 dbc->c_close (dbc);
1908 2149
2150#if DB_VERSION_MINOR >= 6
2151
2152int set_priority (DBC *dbc, int priority)
2153 CODE:
2154 dbc->set_priority (dbc, priority);
2155
2156#endif
2157
1909MODULE = BDB PACKAGE = BDB::Sequence 2158MODULE = BDB PACKAGE = BDB::Sequence
1910 2159
1911void 2160void
1912DESTROY (DB_SEQUENCE_ornull *seq) 2161DESTROY (DB_SEQUENCE_ornuked *seq)
1913 CODE: 2162 CODE:
1914 if (seq) 2163 if (seq)
1915 seq->close (seq, 0); 2164 seq->close (seq, 0);
1916 2165
1917int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2166int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
1936 CODE: 2185 CODE:
1937 RETVAL = seq->set_range (seq, min, max); 2186 RETVAL = seq->set_range (seq, min, max);
1938 OUTPUT: 2187 OUTPUT:
1939 RETVAL 2188 RETVAL
1940 2189
2190

Diff Legend

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