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

Comparing BDB/BDB.xs (file contents):
Revision 1.12 by root, Sun Jul 8 09:16:19 2007 UTC vs.
Revision 1.39 by root, Mon Jul 7 22:11:04 2008 UTC

… …
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8 8
9// perl stupidly defines these as macros, breaking
10// lots and lots of code.
11#undef open
12#undef close
13#undef abort
14#undef malloc
15#undef free
16#undef send
17
9#include <stddef.h> 18#include <stddef.h>
10#include <stdlib.h> 19#include <stdlib.h>
11#include <errno.h> 20#include <errno.h>
12#include <sys/time.h>
13#include <sys/types.h> 21#include <sys/types.h>
14#include <limits.h> 22#include <limits.h>
15#include <unistd.h>
16#include <fcntl.h> 23#include <fcntl.h>
17 24
25#ifndef _WIN32
26# include <sys/time.h>
27# include <unistd.h>
28#endif
29
18#include <db.h> 30#include <db.h>
19 31
20#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5) 32#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4)
21# error you need Berkeley DB 4.5 or newer installed 33# error you need Berkeley DB 4.4 or newer installed
22#endif 34#endif
23 35
24/* number of seconds after which idle threads exit */ 36/* number of seconds after which idle threads exit */
25#define IDLE_TIMEOUT 10 37#define IDLE_TIMEOUT 10
26 38
… …
28typedef DB_TXN DB_TXN_ornull; 40typedef DB_TXN DB_TXN_ornull;
29typedef DBC DBC_ornull; 41typedef DBC DBC_ornull;
30typedef DB DB_ornull; 42typedef DB DB_ornull;
31typedef DB_SEQUENCE DB_SEQUENCE_ornull; 43typedef DB_SEQUENCE DB_SEQUENCE_ornull;
32 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
33typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
34typedef char *octetstring; 52typedef char *bdb_filename;
35 53
36static SV *prepare_cb; 54static SV *prepare_cb;
37 55
56#if DB_VERSION_MINOR >= 6
57# define c_close close
58# define c_count count
59# define c_del del
60# define c_dup dup
61# define c_get get
62# define c_pget pget
63# define c_put put
64#endif
65
38static inline char * 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
96static void
97debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
98{
99 printf ("err[%s]\n", msg);
100}
101
102static void
103debug_msgcall (const DB_ENV *dbenv, const char *msg)
104{
105 printf ("msg[%s]\n", msg);
106}
107
108static char *
39strdup_ornull (const char *s) 109strdup_ornull (const char *s)
40{ 110{
41 return s ? strdup (s) : 0; 111 return s ? strdup (s) : 0;
42} 112}
43 113
44static inline void 114static void
45sv_to_dbt (DBT *dbt, SV *sv) 115sv_to_dbt (DBT *dbt, SV *sv)
46{ 116{
47 STRLEN len; 117 STRLEN len;
48 char *data = SvPVbyte (sv, len); 118 char *data = SvPVbyte (sv, len);
49 119
… …
51 memcpy (dbt->data, data, len); 121 memcpy (dbt->data, data, len);
52 dbt->size = len; 122 dbt->size = len;
53 dbt->flags = DB_DBT_REALLOC; 123 dbt->flags = DB_DBT_REALLOC;
54} 124}
55 125
56static inline void 126static void
57dbt_to_sv (SV *sv, DBT *dbt) 127dbt_to_sv (SV *sv, DBT *dbt)
58{ 128{
59 if (sv) 129 if (sv)
60 { 130 {
61 SvREADONLY_off (sv); 131 SvREADONLY_off (sv);
… …
67} 137}
68 138
69enum { 139enum {
70 REQ_QUIT, 140 REQ_QUIT,
71 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,
72 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
73 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,
74 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,
75 REQ_TXN_COMMIT, REQ_TXN_ABORT, 145 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
76 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,
77 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,
78}; 148};
79 149
80typedef struct aio_cb 150typedef struct bdb_cb
81{ 151{
82 struct aio_cb *volatile next; 152 struct bdb_cb *volatile next;
83 SV *callback; 153 SV *callback;
84 int type, pri, result; 154 int type, pri, result;
85 155
86 DB_ENV *env; 156 DB_ENV *env;
87 DB *db; 157 DB *db;
… …
89 DBC *dbc; 159 DBC *dbc;
90 160
91 UV uv1; 161 UV uv1;
92 int int1, int2; 162 int int1, int2;
93 U32 uint1, uint2; 163 U32 uint1, uint2;
94 char *buf1, *buf2; 164 char *buf1, *buf2, *buf3;
95 SV *sv1, *sv2, *sv3; 165 SV *sv1, *sv2, *sv3;
96 166
97 DBT dbt1, dbt2, dbt3; 167 DBT dbt1, dbt2, dbt3;
98 DB_KEY_RANGE key_range; 168 DB_KEY_RANGE key_range;
99 DB_SEQUENCE *seq; 169 DB_SEQUENCE *seq;
100 db_seq_t seq_t; 170 db_seq_t seq_t;
101} aio_cb; 171} bdb_cb;
102 172
103typedef aio_cb *aio_req; 173typedef bdb_cb *bdb_req;
104 174
105enum { 175enum {
106 PRI_MIN = -4, 176 PRI_MIN = -4,
107 PRI_MAX = 4, 177 PRI_MAX = 4,
108 178
… …
111 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 181 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
112}; 182};
113 183
114#define AIO_TICKS ((1000000 + 1023) >> 10) 184#define AIO_TICKS ((1000000 + 1023) >> 10)
115 185
186static SV *on_next_submit;
187
116static unsigned int max_poll_time = 0; 188static unsigned int max_poll_time = 0;
117static unsigned int max_poll_reqs = 0; 189static unsigned int max_poll_reqs = 0;
118 190
119/* calculcate time difference in ~1/AIO_TICKS of a second */ 191/* calculcate time difference in ~1/AIO_TICKS of a second */
120static int tvdiff (struct timeval *tv1, struct timeval *tv2) 192static int tvdiff (struct timeval *tv1, struct timeval *tv2)
… …
135 struct worker *prev, *next; 207 struct worker *prev, *next;
136 208
137 thread_t tid; 209 thread_t tid;
138 210
139 /* locked by reslock, reqlock or wrklock */ 211 /* locked by reslock, reqlock or wrklock */
140 aio_req req; /* currently processed request */ 212 bdb_req req; /* currently processed request */
141 void *dbuf; 213 void *dbuf;
142 DIR *dirp; 214 DIR *dirp;
143} worker; 215} worker;
144 216
145static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 217static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
157} 229}
158 230
159static volatile unsigned int nreqs, nready, npending; 231static volatile unsigned int nreqs, nready, npending;
160static volatile unsigned int max_idle = 4; 232static volatile unsigned int max_idle = 4;
161static volatile unsigned int max_outstanding = 0xffffffff; 233static volatile unsigned int max_outstanding = 0xffffffff;
162static int respipe [2]; 234static int respipe_osf [2], respipe [2] = { -1, -1 };
163 235
164static mutex_t reslock = X_MUTEX_INIT; 236static mutex_t reslock = X_MUTEX_INIT;
165static mutex_t reqlock = X_MUTEX_INIT; 237static mutex_t reqlock = X_MUTEX_INIT;
166static cond_t reqwait = X_COND_INIT; 238static cond_t reqwait = X_COND_INIT;
167 239
168#if WORDACCESS_UNSAFE 240#if WORDACCESS_UNSAFE
169 241
170static unsigned int get_nready () 242static unsigned int get_nready (void)
171{ 243{
172 unsigned int retval; 244 unsigned int retval;
173 245
174 X_LOCK (reqlock); 246 X_LOCK (reqlock);
175 retval = nready; 247 retval = nready;
176 X_UNLOCK (reqlock); 248 X_UNLOCK (reqlock);
177 249
178 return retval; 250 return retval;
179} 251}
180 252
181static unsigned int get_npending () 253static unsigned int get_npending (void)
182{ 254{
183 unsigned int retval; 255 unsigned int retval;
184 256
185 X_LOCK (reslock); 257 X_LOCK (reslock);
186 retval = npending; 258 retval = npending;
187 X_UNLOCK (reslock); 259 X_UNLOCK (reslock);
188 260
189 return retval; 261 return retval;
190} 262}
191 263
192static unsigned int get_nthreads () 264static unsigned int get_nthreads (void)
193{ 265{
194 unsigned int retval; 266 unsigned int retval;
195 267
196 X_LOCK (wrklock); 268 X_LOCK (wrklock);
197 retval = started; 269 retval = started;
… …
212 * a somewhat faster data structure might be nice, but 284 * a somewhat faster data structure might be nice, but
213 * with 8 priorities this actually needs <20 insns 285 * with 8 priorities this actually needs <20 insns
214 * per shift, the most expensive operation. 286 * per shift, the most expensive operation.
215 */ 287 */
216typedef struct { 288typedef struct {
217 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 289 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
218 int size; 290 int size;
219} reqq; 291} reqq;
220 292
221static reqq req_queue; 293static reqq req_queue;
222static reqq res_queue; 294static reqq res_queue;
223 295
224int reqq_push (reqq *q, aio_req req) 296int reqq_push (reqq *q, bdb_req req)
225{ 297{
226 int pri = req->pri; 298 int pri = req->pri;
227 req->next = 0; 299 req->next = 0;
228 300
229 if (q->qe[pri]) 301 if (q->qe[pri])
… …
235 q->qe[pri] = q->qs[pri] = req; 307 q->qe[pri] = q->qs[pri] = req;
236 308
237 return q->size++; 309 return q->size++;
238} 310}
239 311
240aio_req reqq_shift (reqq *q) 312bdb_req reqq_shift (reqq *q)
241{ 313{
242 int pri; 314 int pri;
243 315
244 if (!q->size) 316 if (!q->size)
245 return 0; 317 return 0;
246 318
247 --q->size; 319 --q->size;
248 320
249 for (pri = NUM_PRI; pri--; ) 321 for (pri = NUM_PRI; pri--; )
250 { 322 {
251 aio_req req = q->qs[pri]; 323 bdb_req req = q->qs[pri];
252 324
253 if (req) 325 if (req)
254 { 326 {
255 if (!(q->qs[pri] = req->next)) 327 if (!(q->qs[pri] = req->next))
256 q->qe[pri] = 0; 328 q->qe[pri] = 0;
… …
260 } 332 }
261 333
262 abort (); 334 abort ();
263} 335}
264 336
265static int poll_cb (); 337static int poll_cb (void);
266static void req_free (aio_req req); 338static void req_free (bdb_req req);
267static void req_cancel (aio_req req); 339static void req_cancel (bdb_req req);
268 340
269static int req_invoke (aio_req req) 341static int req_invoke (bdb_req req)
270{ 342{
271 dSP; 343 dSP;
272 344
273 if (SvOK (req->callback)) 345 if (SvOK (req->callback))
274 { 346 {
… …
292 dbt_to_sv (req->sv1, &req->dbt1); 364 dbt_to_sv (req->sv1, &req->dbt1);
293 dbt_to_sv (req->sv2, &req->dbt2); 365 dbt_to_sv (req->sv2, &req->dbt2);
294 dbt_to_sv (req->sv3, &req->dbt3); 366 dbt_to_sv (req->sv3, &req->dbt3);
295 break; 367 break;
296 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
297 case REQ_DB_KEY_RANGE: 375 case REQ_DB_KEY_RANGE:
298 { 376 {
299 AV *av = newAV (); 377 AV *av = newAV ();
300 378
301 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
… …
310 388
311 case REQ_SEQ_GET: 389 case REQ_SEQ_GET:
312 SvREADONLY_off (req->sv1); 390 SvREADONLY_off (req->sv1);
313 391
314 if (sizeof (IV) > 4) 392 if (sizeof (IV) > 4)
315 sv_setiv_mg (req->sv1, req->seq_t); 393 sv_setiv_mg (req->sv1, (IV)req->seq_t);
316 else 394 else
317 sv_setnv_mg (req->sv1, req->seq_t); 395 sv_setnv_mg (req->sv1, (NV)req->seq_t);
318 396
319 SvREFCNT_dec (req->sv1); 397 SvREFCNT_dec (req->sv1);
320 break; 398 break;
321 } 399 }
322 400
… …
331 } 409 }
332 410
333 return !SvTRUE (ERRSV); 411 return !SvTRUE (ERRSV);
334} 412}
335 413
336static void req_free (aio_req req) 414static void req_free (bdb_req req)
337{ 415{
338 free (req->buf1); 416 free (req->buf1);
339 free (req->buf2); 417 free (req->buf2);
418 free (req->buf3);
340 Safefree (req); 419 Safefree (req);
341} 420}
342 421
343static void *aio_proc (void *arg); 422#ifdef USE_SOCKETS_AS_HANDLES
423# define TO_SOCKET(x) (win32_get_osfhandle (x))
424#else
425# define TO_SOCKET(x) (x)
426#endif
427
428static void
429create_respipe (void)
430{
431#ifdef _WIN32
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
440 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
441#else
442 if (pipe (respipe))
443#endif
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)");
464
465 respipe_osf [0] = TO_SOCKET (respipe [0]);
466 respipe_osf [1] = TO_SOCKET (respipe [1]);
467}
468
469X_THREAD_PROC (bdb_proc);
344 470
345static void start_thread (void) 471static void start_thread (void)
346{ 472{
347 worker *wrk = calloc (1, sizeof (worker)); 473 worker *wrk = calloc (1, sizeof (worker));
348 474
349 if (!wrk) 475 if (!wrk)
350 croak ("unable to allocate worker thread data"); 476 croak ("unable to allocate worker thread data");
351 477
352 X_LOCK (wrklock); 478 X_LOCK (wrklock);
353 if (thread_create (&wrk->tid, aio_proc, (void *)wrk)) 479 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
354 { 480 {
355 wrk->prev = &wrk_first; 481 wrk->prev = &wrk_first;
356 wrk->next = wrk_first.next; 482 wrk->next = wrk_first.next;
357 wrk_first.next->prev = wrk; 483 wrk_first.next->prev = wrk;
358 wrk_first.next = wrk; 484 wrk_first.next = wrk;
… …
362 free (wrk); 488 free (wrk);
363 489
364 X_UNLOCK (wrklock); 490 X_UNLOCK (wrklock);
365} 491}
366 492
367static void maybe_start_thread () 493static void maybe_start_thread (void)
368{ 494{
369 if (get_nthreads () >= wanted) 495 if (get_nthreads () >= wanted)
370 return; 496 return;
371 497
372 /* todo: maybe use idle here, but might be less exact */ 498 /* todo: maybe use idle here, but might be less exact */
… …
374 return; 500 return;
375 501
376 start_thread (); 502 start_thread ();
377} 503}
378 504
379static void req_send (aio_req req) 505static void req_send (bdb_req req)
380{ 506{
381 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 }
382 520
383 // synthesize callback if none given 521 // synthesize callback if none given
384 if (!SvOK (req->callback)) 522 if (!SvOK (req->callback))
385 { 523 {
524 int count;
525
386 dSP; 526 dSP;
387 PUSHMARK (SP); 527 PUSHMARK (SP);
388 PUTBACK; 528 PUTBACK;
389 int count = call_sv (prepare_cb, G_ARRAY); 529 count = call_sv (prepare_cb, G_ARRAY);
390 SPAGAIN; 530 SPAGAIN;
391 531
392 if (count != 2) 532 if (count != 2)
393 croak ("prepare callback must return exactly two values\n"); 533 croak ("prepare callback must return exactly two values\n");
394 534
395 wait_callback = SvREFCNT_inc (POPs); 535 wait_callback = POPs;
396 SvREFCNT_dec (req->callback); 536 SvREFCNT_dec (req->callback);
397 req->callback = SvREFCNT_inc (POPs); 537 req->callback = SvREFCNT_inc (POPs);
398 } 538 }
399 539
400 ++nreqs; 540 ++nreqs;
… …
411 { 551 {
412 dSP; 552 dSP;
413 PUSHMARK (SP); 553 PUSHMARK (SP);
414 PUTBACK; 554 PUTBACK;
415 call_sv (wait_callback, G_DISCARD); 555 call_sv (wait_callback, G_DISCARD);
416 SvREFCNT_dec (wait_callback);
417 } 556 }
418} 557}
419 558
420static void end_thread (void) 559static void end_thread (void)
421{ 560{
422 aio_req req; 561 bdb_req req;
423 562
424 Newz (0, req, 1, aio_cb); 563 Newz (0, req, 1, bdb_cb);
425 564
426 req->type = REQ_QUIT; 565 req->type = REQ_QUIT;
427 req->pri = PRI_MAX + PRI_BIAS; 566 req->pri = PRI_MAX + PRI_BIAS;
428 567
429 X_LOCK (reqlock); 568 X_LOCK (reqlock);
… …
456 595
457 while (started > wanted) 596 while (started > wanted)
458 end_thread (); 597 end_thread ();
459} 598}
460 599
461static void poll_wait () 600static void poll_wait (void)
462{ 601{
463 fd_set rfd; 602 fd_set rfd;
464 603
465 while (nreqs) 604 while (nreqs)
466 { 605 {
… …
472 if (size) 611 if (size)
473 return; 612 return;
474 613
475 maybe_start_thread (); 614 maybe_start_thread ();
476 615
477 FD_ZERO(&rfd); 616 FD_ZERO (&rfd);
478 FD_SET(respipe [0], &rfd); 617 FD_SET (respipe [0], &rfd);
479 618
480 select (respipe [0] + 1, &rfd, 0, 0, 0); 619 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
481 } 620 }
482} 621}
483 622
484static int poll_cb () 623static int poll_cb (void)
485{ 624{
486 dSP; 625 dSP;
487 int count = 0; 626 int count = 0;
488 int maxreqs = max_poll_reqs; 627 int maxreqs = max_poll_reqs;
489 int do_croak = 0; 628 int do_croak = 0;
490 struct timeval tv_start, tv_now; 629 struct timeval tv_start, tv_now;
491 aio_req req; 630 bdb_req req;
492 631
493 if (max_poll_time) 632 if (max_poll_time)
494 gettimeofday (&tv_start, 0); 633 gettimeofday (&tv_start, 0);
495 634
496 for (;;) 635 for (;;)
… …
508 647
509 if (!res_queue.size) 648 if (!res_queue.size)
510 { 649 {
511 /* read any signals sent by the worker threads */ 650 /* read any signals sent by the worker threads */
512 char buf [4]; 651 char buf [4];
513 while (read (respipe [0], buf, 4) == 4) 652 while (respipe_read (respipe [0], buf, 4) == 4)
514 ; 653 ;
515 } 654 }
516 } 655 }
517 656
518 X_UNLOCK (reslock); 657 X_UNLOCK (reslock);
… …
555 return count; 694 return count;
556} 695}
557 696
558/*****************************************************************************/ 697/*****************************************************************************/
559 698
560static void *aio_proc (void *thr_arg) 699X_THREAD_PROC (bdb_proc)
561{ 700{
562 aio_req req; 701 bdb_req req;
563 struct timespec ts; 702 struct timespec ts;
564 worker *self = (worker *)thr_arg; 703 worker *self = (worker *)thr_arg;
565 704
566 /* try to distribute timeouts somewhat evenly */ 705 /* try to distribute timeouts somewhat evenly */
567 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 706 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
568 * (1000000000UL / 1024UL);
569 707
570 for (;;) 708 for (;;)
571 { 709 {
572 ts.tv_sec = time (0) + IDLE_TIMEOUT; 710 ts.tv_sec = time (0) + IDLE_TIMEOUT;
573 711
… …
608 X_UNLOCK (reqlock); 746 X_UNLOCK (reqlock);
609 747
610 switch (req->type) 748 switch (req->type)
611 { 749 {
612 case REQ_QUIT: 750 case REQ_QUIT:
751 req->result = ENOSYS;
613 goto quit; 752 goto quit;
614 753
615 case REQ_ENV_OPEN: 754 case REQ_ENV_OPEN:
616 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);
617 break; 756 break;
… …
634 773
635 case REQ_ENV_MEMP_TRICKLE: 774 case REQ_ENV_MEMP_TRICKLE:
636 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);
637 break; 776 break;
638 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
639 case REQ_DB_OPEN: 786 case REQ_DB_OPEN:
640 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);
641 break; 788 break;
642 789
643 case REQ_DB_CLOSE: 790 case REQ_DB_CLOSE:
… …
650 797
651 case REQ_DB_SYNC: 798 case REQ_DB_SYNC:
652 req->result = req->db->sync (req->db, req->uint1); 799 req->result = req->db->sync (req->db, req->uint1);
653 break; 800 break;
654 801
802 case REQ_DB_UPGRADE:
803 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
804 break;
805
655 case REQ_DB_PUT: 806 case REQ_DB_PUT:
656 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);
657 break; 808 break;
658 809
659 case REQ_DB_GET: 810 case REQ_DB_GET:
… …
676 req->result = req->txn->commit (req->txn, req->uint1); 827 req->result = req->txn->commit (req->txn, req->uint1);
677 break; 828 break;
678 829
679 case REQ_TXN_ABORT: 830 case REQ_TXN_ABORT:
680 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);
681 break; 843 break;
682 844
683 case REQ_C_CLOSE: 845 case REQ_C_CLOSE:
684 req->result = req->dbc->c_close (req->dbc); 846 req->result = req->dbc->c_close (req->dbc);
685 break; 847 break;
… …
727 default: 889 default:
728 req->result = ENOSYS; 890 req->result = ENOSYS;
729 break; 891 break;
730 } 892 }
731 893
894 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
895 req->txn->flags |= TXN_DEADLOCK;
896
732 X_LOCK (reslock); 897 X_LOCK (reslock);
733 898
734 ++npending; 899 ++npending;
735 900
736 if (!reqq_push (&res_queue, req)) 901 if (!reqq_push (&res_queue, req))
737 /* write a dummy byte to the pipe so fh becomes ready */ 902 /* write a dummy byte to the pipe so fh becomes ready */
738 write (respipe [1], &respipe, 1); 903 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
739 904
740 self->req = 0; 905 self->req = 0;
741 worker_clear (self); 906 worker_clear (self);
742 907
743 X_UNLOCK (reslock); 908 X_UNLOCK (reslock);
… …
767 X_UNLOCK (wrklock); 932 X_UNLOCK (wrklock);
768} 933}
769 934
770static void atfork_child (void) 935static void atfork_child (void)
771{ 936{
772 aio_req prv; 937 bdb_req prv;
773 938
774 while (prv = reqq_shift (&req_queue)) 939 while (prv = reqq_shift (&req_queue))
775 req_free (prv); 940 req_free (prv);
776 941
777 while (prv = reqq_shift (&res_queue)) 942 while (prv = reqq_shift (&res_queue))
… …
792 idle = 0; 957 idle = 0;
793 nreqs = 0; 958 nreqs = 0;
794 nready = 0; 959 nready = 0;
795 npending = 0; 960 npending = 0;
796 961
797 close (respipe [0]); 962 create_respipe ();
798 close (respipe [1]);
799
800 if (!create_pipe (respipe))
801 croak ("unable to initialize result pipe");
802 963
803 atfork_parent (); 964 atfork_parent ();
804} 965}
805 966
806#define dREQ(reqtype) \ 967#define dREQ(reqtype) \
807 aio_req req; \ 968 bdb_req req; \
808 int req_pri = next_pri; \ 969 int req_pri = next_pri; \
809 next_pri = DEFAULT_PRI + PRI_BIAS; \ 970 next_pri = DEFAULT_PRI + PRI_BIAS; \
810 \ 971 \
811 if (SvOK (callback) && !SvROK (callback)) \ 972 if (SvOK (callback) && !SvROK (callback)) \
812 croak ("callback must be undef or of reference type"); \ 973 croak ("callback must be undef or of reference type"); \
813 \ 974 \
814 Newz (0, req, 1, aio_cb); \ 975 Newz (0, req, 1, bdb_cb); \
815 if (!req) \ 976 if (!req) \
816 croak ("out of memory during aio_req allocation"); \ 977 croak ("out of memory during bdb_req allocation"); \
817 \ 978 \
818 req->callback = newSVsv (callback); \ 979 req->callback = newSVsv (callback); \
819 req->type = (reqtype); \ 980 req->type = (reqtype); \
820 req->pri = req_pri 981 req->pri = req_pri
821 982
822#define REQ_SEND \ 983#define REQ_SEND \
823 req_send (req) 984 req_send (req)
824 985
825#define SvPTR(var, arg, type, class, nullok) \ 986#define SvPTR(var, arg, type, class, nullok) \
826 if (!SvOK (arg)) \ 987 if (!SvOK (arg)) \
827 { \ 988 { \
828 if (!nullok) \ 989 if (nullok != 1) \
829 croak (# var " must be a " # class " object, not undef"); \ 990 croak (# var " must be a " # class " object, not undef"); \
830 \ 991 \
831 (var) = 0; \ 992 (var) = 0; \
832 } \ 993 } \
833 else if (sv_derived_from ((arg), # class)) \ 994 else if (sv_derived_from ((arg), # class)) \
834 { \ 995 { \
835 IV tmp = SvIV ((SV*) SvRV (arg)); \ 996 IV tmp = SvIV ((SV*) SvRV (arg)); \
836 (var) = INT2PTR (type, tmp); \ 997 (var) = INT2PTR (type, tmp); \
837 if (!var) \ 998 if (!var && nullok != 2) \
838 croak (# var " is not a valid " # class " object anymore"); \ 999 croak (# var " is not a valid " # class " object anymore"); \
839 } \ 1000 } \
840 else \ 1001 else \
841 croak (# var " is not of type " # class); \ 1002 croak (# var " is not of type " # class); \
842 \ 1003 \
… …
844static void 1005static void
845ptr_nuke (SV *sv) 1006ptr_nuke (SV *sv)
846{ 1007{
847 assert (SvROK (sv)); 1008 assert (SvROK (sv));
848 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;
849} 1049}
850 1050
851MODULE = BDB PACKAGE = BDB 1051MODULE = BDB PACKAGE = BDB
852 1052
853PROTOTYPES: ENABLE 1053PROTOTYPES: ENABLE
… …
870 const_iv (INIT_TXN) 1070 const_iv (INIT_TXN)
871 const_iv (RECOVER) 1071 const_iv (RECOVER)
872 const_iv (INIT_TXN) 1072 const_iv (INIT_TXN)
873 const_iv (RECOVER_FATAL) 1073 const_iv (RECOVER_FATAL)
874 const_iv (CREATE) 1074 const_iv (CREATE)
1075 const_iv (RDONLY)
875 const_iv (USE_ENVIRON) 1076 const_iv (USE_ENVIRON)
876 const_iv (USE_ENVIRON_ROOT) 1077 const_iv (USE_ENVIRON_ROOT)
877 const_iv (LOCKDOWN) 1078 const_iv (LOCKDOWN)
878 const_iv (PRIVATE) 1079 const_iv (PRIVATE)
879 const_iv (REGISTER) 1080 const_iv (REGISTER)
880 const_iv (SYSTEM_MEM) 1081 const_iv (SYSTEM_MEM)
881 const_iv (AUTO_COMMIT) 1082 const_iv (AUTO_COMMIT)
882 const_iv (CDB_ALLDB) 1083 const_iv (CDB_ALLDB)
883 const_iv (DIRECT_DB) 1084 const_iv (DIRECT_DB)
884 const_iv (DIRECT_LOG)
885 const_iv (DSYNC_DB) 1085 const_iv (DSYNC_DB)
886 const_iv (DSYNC_LOG)
887 const_iv (LOG_AUTOREMOVE)
888 const_iv (LOG_INMEMORY)
889 const_iv (NOLOCKING) 1086 const_iv (NOLOCKING)
890 const_iv (MULTIVERSION)
891 const_iv (NOMMAP) 1087 const_iv (NOMMAP)
892 const_iv (NOPANIC) 1088 const_iv (NOPANIC)
893 const_iv (OVERWRITE) 1089 const_iv (OVERWRITE)
894 const_iv (PANIC_ENVIRONMENT) 1090 const_iv (PANIC_ENVIRONMENT)
895 const_iv (REGION_INIT) 1091 const_iv (REGION_INIT)
896 const_iv (TIME_NOTGRANTED) 1092 const_iv (TIME_NOTGRANTED)
897 const_iv (TXN_NOSYNC) 1093 const_iv (TXN_NOSYNC)
898 const_iv (TXN_SNAPSHOT) 1094 const_iv (TXN_NOT_DURABLE)
899 const_iv (TXN_WRITE_NOSYNC) 1095 const_iv (TXN_WRITE_NOSYNC)
900 const_iv (WRITECURSOR) 1096 const_iv (WRITECURSOR)
901 const_iv (YIELDCPU) 1097 const_iv (YIELDCPU)
902 const_iv (ENCRYPT_AES) 1098 const_iv (ENCRYPT_AES)
903 const_iv (XA_CREATE) 1099 const_iv (XA_CREATE)
… …
911 const_iv (READ_UNCOMMITTED) 1107 const_iv (READ_UNCOMMITTED)
912 const_iv (TRUNCATE) 1108 const_iv (TRUNCATE)
913 const_iv (NOSYNC) 1109 const_iv (NOSYNC)
914 const_iv (CHKSUM) 1110 const_iv (CHKSUM)
915 const_iv (ENCRYPT) 1111 const_iv (ENCRYPT)
916 const_iv (TXN_NOT_DURABLE)
917 const_iv (DUP) 1112 const_iv (DUP)
918 const_iv (DUPSORT) 1113 const_iv (DUPSORT)
919 const_iv (RECNUM) 1114 const_iv (RECNUM)
920 const_iv (RENUMBER) 1115 const_iv (RENUMBER)
921 const_iv (REVSPLITOFF) 1116 const_iv (REVSPLITOFF)
… …
926 const_iv (GET_BOTH_RANGE) 1121 const_iv (GET_BOTH_RANGE)
927 //const_iv (SET_RECNO) 1122 //const_iv (SET_RECNO)
928 //const_iv (MULTIPLE) 1123 //const_iv (MULTIPLE)
929 const_iv (SNAPSHOT) 1124 const_iv (SNAPSHOT)
930 const_iv (JOIN_ITEM) 1125 const_iv (JOIN_ITEM)
1126 const_iv (JOIN_NOSORT)
931 const_iv (RMW) 1127 const_iv (RMW)
932 1128
933 const_iv (NOTFOUND) 1129 const_iv (NOTFOUND)
934 const_iv (KEYEMPTY) 1130 const_iv (KEYEMPTY)
935 const_iv (LOCK_DEADLOCK) 1131 const_iv (LOCK_DEADLOCK)
… …
946 const_iv (APPEND) 1142 const_iv (APPEND)
947 const_iv (NODUPDATA) 1143 const_iv (NODUPDATA)
948 const_iv (NOOVERWRITE) 1144 const_iv (NOOVERWRITE)
949 1145
950 const_iv (TXN_NOWAIT) 1146 const_iv (TXN_NOWAIT)
951 const_iv (TXN_SNAPSHOT)
952 const_iv (TXN_SYNC) 1147 const_iv (TXN_SYNC)
953 1148
954 const_iv (SET_LOCK_TIMEOUT) 1149 const_iv (SET_LOCK_TIMEOUT)
955 const_iv (SET_TXN_TIMEOUT) 1150 const_iv (SET_TXN_TIMEOUT)
956 1151
957 const_iv (JOIN_ITEM)
958 const_iv (FIRST) 1152 const_iv (FIRST)
959 const_iv (NEXT) 1153 const_iv (NEXT)
960 const_iv (NEXT_DUP) 1154 const_iv (NEXT_DUP)
961 const_iv (NEXT_NODUP) 1155 const_iv (NEXT_NODUP)
962 const_iv (PREV) 1156 const_iv (PREV)
… …
984 const_iv (LOCK_YOUNGEST) 1178 const_iv (LOCK_YOUNGEST)
985 1179
986 const_iv (SEQ_DEC) 1180 const_iv (SEQ_DEC)
987 const_iv (SEQ_INC) 1181 const_iv (SEQ_INC)
988 const_iv (SEQ_WRAP) 1182 const_iv (SEQ_WRAP)
1183
1184 const_iv (BUFFER_SMALL)
1185 const_iv (DONOTINDEX)
1186 const_iv (KEYEMPTY )
1187 const_iv (KEYEXIST )
1188 const_iv (LOCK_DEADLOCK)
1189 const_iv (LOCK_NOTGRANTED)
1190 const_iv (LOG_BUFFER_FULL)
1191 const_iv (NOSERVER)
1192 const_iv (NOSERVER_HOME)
1193 const_iv (NOSERVER_ID)
1194 const_iv (NOTFOUND)
1195 const_iv (PAGE_NOTFOUND)
1196 const_iv (REP_DUPMASTER)
1197 const_iv (REP_HANDLE_DEAD)
1198 const_iv (REP_HOLDELECTION)
1199 const_iv (REP_IGNORE)
1200 const_iv (REP_ISPERM)
1201 const_iv (REP_JOIN_FAILURE)
1202 const_iv (REP_LOCKOUT)
1203 const_iv (REP_NEWMASTER)
1204 const_iv (REP_NEWSITE)
1205 const_iv (REP_NOTPERM)
1206 const_iv (REP_UNAVAIL)
1207 const_iv (RUNRECOVERY)
1208 const_iv (SECONDARY_BAD)
1209 const_iv (VERIFY_BAD)
1210 const_iv (VERSION_MISMATCH)
1211
1212 const_iv (VERB_DEADLOCK)
1213 const_iv (VERB_RECOVERY)
1214 const_iv (VERB_REGISTER)
1215 const_iv (VERB_REPLICATION)
1216 const_iv (VERB_WAITSFOR)
1217
1218 const_iv (VERSION_MAJOR)
1219 const_iv (VERSION_MINOR)
1220 const_iv (VERSION_PATCH)
1221#if DB_VERSION_MINOR >= 5
1222 const_iv (MULTIVERSION)
1223 const_iv (TXN_SNAPSHOT)
1224#endif
1225#if DB_VERSION_MINOR >= 6
1226 const_iv (PREV_DUP)
1227 const_iv (PRIORITY_UNCHANGED)
1228 const_iv (PRIORITY_VERY_LOW)
1229 const_iv (PRIORITY_LOW)
1230 const_iv (PRIORITY_DEFAULT)
1231 const_iv (PRIORITY_HIGH)
1232 const_iv (PRIORITY_VERY_HIGH)
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)
1245#endif
989 }; 1246 };
990 1247
991 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; )
992 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1249 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
993 1250
1251 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1252 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1253
994 if (!create_pipe (respipe)) 1254 create_respipe ();
995 croak ("unable to initialize result pipe");
996 1255
997 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1256 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
998#ifdef _WIN32 1257 patch_errno ();
999 X_MUTEX_CHECK (wrklock);
1000 X_MUTEX_CHECK (reslock);
1001 X_MUTEX_CHECK (reqlock);
1002
1003 X_COND_CHECK (reqwait);
1004#endif
1005} 1258}
1006 1259
1007void 1260void
1008max_poll_reqs (int nreqs) 1261max_poll_reqs (int nreqs)
1009 PROTOTYPE: $ 1262 PROTOTYPE: $
… …
1141 PROTOTYPE: & 1394 PROTOTYPE: &
1142 CODE: 1395 CODE:
1143 SvREFCNT_dec (prepare_cb); 1396 SvREFCNT_dec (prepare_cb);
1144 prepare_cb = newSVsv (cb); 1397 prepare_cb = newSVsv (cb);
1145 1398
1399char *
1400strerror (int errorno = errno)
1401 PROTOTYPE: ;$
1402 CODE:
1403 RETVAL = db_strerror (errorno);
1404 OUTPUT:
1405 RETVAL
1406
1407void _on_next_submit (SV *cb)
1408 CODE:
1409 SvREFCNT_dec (on_next_submit);
1410 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1146 1411
1147DB_ENV * 1412DB_ENV *
1148db_env_create (U32 env_flags = 0) 1413db_env_create (U32 env_flags = 0)
1149 CODE: 1414 CODE:
1150{ 1415{
1151 errno = db_env_create (&RETVAL, env_flags); 1416 errno = db_env_create (&RETVAL, env_flags);
1152 if (errno) 1417 if (errno)
1153 croak ("db_env_create: %s", db_strerror (errno)); 1418 croak ("db_env_create: %s", db_strerror (errno));
1419
1420 if (0)
1421 {
1422 RETVAL->set_errcall (RETVAL, debug_errcall);
1423 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1424 }
1154} 1425}
1155 OUTPUT: 1426 OUTPUT:
1156 RETVAL 1427 RETVAL
1157 1428
1158void 1429void
1159db_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)
1160 CODE: 1431 CODE:
1161{ 1432{
1162 env->set_thread_count (env, get_nthreads ());
1163
1164 dREQ (REQ_ENV_OPEN); 1433 dREQ (REQ_ENV_OPEN);
1434
1165 req->env = env; 1435 req->env = env;
1166 req->uint1 = open_flags | DB_THREAD; 1436 req->uint1 = open_flags | DB_THREAD;
1167 req->int1 = mode; 1437 req->int1 = mode;
1168 req->buf1 = strdup_ornull (db_home); 1438 req->buf1 = strdup_ornull (db_home);
1169 REQ_SEND; 1439 REQ_SEND;
… …
1220 req->env = env; 1490 req->env = env;
1221 req->int1 = percent; 1491 req->int1 = percent;
1222 REQ_SEND; 1492 REQ_SEND;
1223} 1493}
1224 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}
1225 1519
1226DB * 1520DB *
1227db_create (DB_ENV *env = 0, U32 flags = 0) 1521db_create (DB_ENV *env = 0, U32 flags = 0)
1228 CODE: 1522 CODE:
1229{ 1523{
… …
1236} 1530}
1237 OUTPUT: 1531 OUTPUT:
1238 RETVAL 1532 RETVAL
1239 1533
1240void 1534void
1241db_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)
1242 CODE: 1536 CODE:
1243{ 1537{
1244 dREQ (REQ_DB_OPEN); 1538 dREQ (REQ_DB_OPEN);
1245 req->db = db; 1539 req->db = db;
1246 req->txn = txnid; 1540 req->txn = txnid;
… …
1286 req->uint1 = flags; 1580 req->uint1 = flags;
1287 REQ_SEND; 1581 REQ_SEND;
1288} 1582}
1289 1583
1290void 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
1291db_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)
1292 CODE: 1597 CODE:
1293{ 1598{
1294 dREQ (REQ_DB_KEY_RANGE); 1599 dREQ (REQ_DB_KEY_RANGE);
1295 req->db = db; 1600 req->db = db;
… …
1314} 1619}
1315 1620
1316void 1621void
1317db_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)
1318 CODE: 1623 CODE:
1624 if (SvREADONLY (data))
1625 croak ("can't modify read-only data scalar in db_get");
1319{ 1626{
1320 dREQ (REQ_DB_GET); 1627 dREQ (REQ_DB_GET);
1321 req->db = db; 1628 req->db = db;
1322 req->txn = txn; 1629 req->txn = txn;
1323 req->uint1 = flags; 1630 req->uint1 = flags;
… …
1328} 1635}
1329 1636
1330void 1637void
1331db_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)
1332 CODE: 1639 CODE:
1640 if (SvREADONLY (data))
1641 croak ("can't modify read-only data scalar in db_pget");
1333{ 1642{
1334 dREQ (REQ_DB_PGET); 1643 dREQ (REQ_DB_PGET);
1335 req->db = db; 1644 req->db = db;
1336 req->txn = txn; 1645 req->txn = txn;
1337 req->uint1 = flags; 1646 req->uint1 = flags;
… …
1374 REQ_SEND; 1683 REQ_SEND;
1375 ptr_nuke (ST (0)); 1684 ptr_nuke (ST (0));
1376} 1685}
1377 1686
1378void 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
1379db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1699db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1380 CODE: 1700 CODE:
1381{ 1701{
1382 dREQ (REQ_C_CLOSE); 1702 dREQ (REQ_C_CLOSE);
1383 req->dbc = dbc; 1703 req->dbc = dbc;
… …
1520 1840
1521 1841
1522MODULE = BDB PACKAGE = BDB::Env 1842MODULE = BDB PACKAGE = BDB::Env
1523 1843
1524void 1844void
1525DESTROY (DB_ENV_ornull *env) 1845DESTROY (DB_ENV_ornuked *env)
1526 CODE: 1846 CODE:
1527 if (env) 1847 if (env)
1528 env->close (env, 0); 1848 env->close (env, 0);
1529 1849
1530int set_data_dir (DB_ENV *env, const char *dir) 1850int set_data_dir (DB_ENV *env, const char *dir)
… …
1555 CODE: 1875 CODE:
1556 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1876 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1557 OUTPUT: 1877 OUTPUT:
1558 RETVAL 1878 RETVAL
1559 1879
1560int set_flags (DB_ENV *env, U32 flags, int onoff) 1880int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1561 CODE: 1881 CODE:
1562 RETVAL = env->set_flags (env, flags, onoff); 1882 RETVAL = env->set_flags (env, flags, onoff);
1563 OUTPUT: 1883 OUTPUT:
1564 RETVAL 1884 RETVAL
1565 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
1903void set_errfile (DB_ENV *env, FILE *errfile = 0)
1904 CODE:
1905 env->set_errfile (env, errfile);
1906
1907void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1908 CODE:
1909 env->set_msgfile (env, msgfile);
1910
1911int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1912 CODE:
1913 RETVAL = env->set_verbose (env, which, onoff);
1914 OUTPUT:
1915 RETVAL
1916
1566int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1917int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1567 CODE: 1918 CODE:
1568 RETVAL = env->set_encrypt (env, password, flags); 1919 RETVAL = env->set_encrypt (env, password, flags);
1569 OUTPUT: 1920 OUTPUT:
1570 RETVAL 1921 RETVAL
1571 1922
1572int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1923int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1573 CODE: 1924 CODE:
1574 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1925 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1575 OUTPUT: 1926 OUTPUT:
1576 RETVAL 1927 RETVAL
1577 1928
… …
1625 1976
1626int set_lg_max (DB_ENV *env, U32 max) 1977int set_lg_max (DB_ENV *env, U32 max)
1627 CODE: 1978 CODE:
1628 RETVAL = env->set_lg_max (env, max); 1979 RETVAL = env->set_lg_max (env, max);
1629 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:
1630 RETVAL 2005 RETVAL
1631 2006
1632DB_TXN * 2007DB_TXN *
1633txn_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)
1634 CODE: 2009 CODE:
… …
1639 RETVAL 2014 RETVAL
1640 2015
1641MODULE = BDB PACKAGE = BDB::Db 2016MODULE = BDB PACKAGE = BDB::Db
1642 2017
1643void 2018void
1644DESTROY (DB_ornull *db) 2019DESTROY (DB_ornuked *db)
1645 CODE: 2020 CODE:
1646 if (db) 2021 if (db)
1647 { 2022 {
1648 SV *env = (SV *)db->app_private; 2023 SV *env = (SV *)db->app_private;
1649 db->close (db, 0); 2024 db->close (db, 0);
… …
1654 CODE: 2029 CODE:
1655 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2030 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1656 OUTPUT: 2031 OUTPUT:
1657 RETVAL 2032 RETVAL
1658 2033
1659int set_flags (DB *db, U32 flags); 2034int set_flags (DB *db, U32 flags)
1660 CODE: 2035 CODE:
1661 RETVAL = db->set_flags (db, flags); 2036 RETVAL = db->set_flags (db, flags);
1662 OUTPUT: 2037 OUTPUT:
1663 RETVAL 2038 RETVAL
1664 2039
… …
1678 CODE: 2053 CODE:
1679 RETVAL = db->set_bt_minkey (db, minkey); 2054 RETVAL = db->set_bt_minkey (db, minkey);
1680 OUTPUT: 2055 OUTPUT:
1681 RETVAL 2056 RETVAL
1682 2057
1683int set_re_delim(DB *db, int delim); 2058int set_re_delim (DB *db, int delim)
1684 CODE: 2059 CODE:
1685 RETVAL = db->set_re_delim (db, delim); 2060 RETVAL = db->set_re_delim (db, delim);
1686 OUTPUT: 2061 OUTPUT:
1687 RETVAL 2062 RETVAL
1688 2063
… …
1744 2119
1745 2120
1746MODULE = BDB PACKAGE = BDB::Txn 2121MODULE = BDB PACKAGE = BDB::Txn
1747 2122
1748void 2123void
1749DESTROY (DB_TXN_ornull *txn) 2124DESTROY (DB_TXN_ornuked *txn)
1750 CODE: 2125 CODE:
1751 if (txn) 2126 if (txn)
1752 txn->abort (txn); 2127 txn->abort (txn);
1753 2128
1754int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 2129int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1755 CODE: 2130 CODE:
1756 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 2131 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1757 OUTPUT: 2132 OUTPUT:
1758 RETVAL 2133 RETVAL
1759 2134
2135int failed (DB_TXN *txn)
2136 CODE:
2137 RETVAL = !!(txn->flags & TXN_DEADLOCK);
2138 OUTPUT:
2139 RETVAL
2140
1760 2141
1761MODULE = BDB PACKAGE = BDB::Cursor 2142MODULE = BDB PACKAGE = BDB::Cursor
1762 2143
1763void 2144void
1764DESTROY (DBC_ornull *dbc) 2145DESTROY (DBC_ornuked *dbc)
1765 CODE: 2146 CODE:
1766 if (dbc) 2147 if (dbc)
1767 dbc->c_close (dbc); 2148 dbc->c_close (dbc);
1768 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
1769MODULE = BDB PACKAGE = BDB::Sequence 2158MODULE = BDB PACKAGE = BDB::Sequence
1770 2159
1771void 2160void
1772DESTROY (DB_SEQUENCE_ornull *seq) 2161DESTROY (DB_SEQUENCE_ornuked *seq)
1773 CODE: 2162 CODE:
1774 if (seq) 2163 if (seq)
1775 seq->close (seq, 0); 2164 seq->close (seq, 0);
1776 2165
1777int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2166int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
1796 CODE: 2185 CODE:
1797 RETVAL = seq->set_range (seq, min, max); 2186 RETVAL = seq->set_range (seq, min, max);
1798 OUTPUT: 2187 OUTPUT:
1799 RETVAL 2188 RETVAL
1800 2189
2190

Diff Legend

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