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

Comparing BDB/BDB.xs (file contents):
Revision 1.8 by root, Sun Feb 11 22:07:23 2007 UTC vs.
Revision 1.35 by root, Sun Mar 30 07:12:12 2008 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include <pthread.h> 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
18 17
19#include <stddef.h> 18#include <stddef.h>
20#include <stdlib.h> 19#include <stdlib.h>
21#include <errno.h> 20#include <errno.h>
22#include <sys/time.h>
23#include <sys/types.h> 21#include <sys/types.h>
24#include <limits.h> 22#include <limits.h>
25#include <unistd.h>
26#include <fcntl.h> 23#include <fcntl.h>
27 24
25#ifndef _WIN32
26# include <sys/time.h>
27# include <unistd.h>
28#endif
29
28#include <db.h> 30#include <db.h>
31
32#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4)
33# error you need Berkeley DB 4.4 or newer installed
34#endif
29 35
30/* number of seconds after which idle threads exit */ 36/* number of seconds after which idle threads exit */
31#define IDLE_TIMEOUT 10 37#define IDLE_TIMEOUT 10
32
33/* wether word reads are potentially non-atomic.
34 * this is conservatice, likely most arches this runs
35 * on have atomic word read/writes.
36 */
37#ifndef WORDACCESS_UNSAFE
38# if __i386 || __x86_64
39# define WORDACCESS_UNSAFE 0
40# else
41# define WORDACCESS_UNSAFE 1
42# endif
43#endif
44 38
45typedef DB_ENV DB_ENV_ornull; 39typedef DB_ENV DB_ENV_ornull;
46typedef DB_TXN DB_TXN_ornull; 40typedef DB_TXN DB_TXN_ornull;
47typedef DBC DBC_ornull; 41typedef DBC DBC_ornull;
48typedef DB DB_ornull; 42typedef DB DB_ornull;
49typedef DB_SEQUENCE DB_SEQUENCE_ornull; 43typedef DB_SEQUENCE DB_SEQUENCE_ornull;
50 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
51typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
52typedef char *octetstring; 52typedef char *bdb_filename;
53 53
54static SV *prepare_cb; 54static SV *prepare_cb;
55 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
56static inline char * 66static char *
67get_bdb_filename (SV *sv)
68{
69 return !SvOK (sv)
70 ? 0
71 :
72#if _WIN32
73 SvPVutf8_nolen (sv)
74#else
75 SvPVbyte_nolen (sv)
76#endif
77 ;
78}
79
80static void
81debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
82{
83 printf ("err[%s]\n", msg);
84}
85
86static void
87debug_msgcall (const DB_ENV *dbenv, const char *msg)
88{
89 printf ("msg[%s]\n", msg);
90}
91
92static char *
57strdup_ornull (const char *s) 93strdup_ornull (const char *s)
58{ 94{
59 return s ? strdup (s) : 0; 95 return s ? strdup (s) : 0;
60} 96}
61 97
62static inline void 98static void
63sv_to_dbt (DBT *dbt, SV *sv) 99sv_to_dbt (DBT *dbt, SV *sv)
64{ 100{
65 STRLEN len; 101 STRLEN len;
66 char *data = SvPVbyte (sv, len); 102 char *data = SvPVbyte (sv, len);
67 103
… …
69 memcpy (dbt->data, data, len); 105 memcpy (dbt->data, data, len);
70 dbt->size = len; 106 dbt->size = len;
71 dbt->flags = DB_DBT_REALLOC; 107 dbt->flags = DB_DBT_REALLOC;
72} 108}
73 109
74static inline void 110static void
75dbt_to_sv (SV *sv, DBT *dbt) 111dbt_to_sv (SV *sv, DBT *dbt)
76{ 112{
77 if (sv) 113 if (sv)
78 { 114 {
79 SvREADONLY_off (sv); 115 SvREADONLY_off (sv);
… …
86 122
87enum { 123enum {
88 REQ_QUIT, 124 REQ_QUIT,
89 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 125 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
90 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 126 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
91 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 127 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
92 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 128 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
93 REQ_TXN_COMMIT, REQ_TXN_ABORT, 129 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
94 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 130 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
95 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 131 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
96}; 132};
97 133
98typedef struct aio_cb 134typedef struct bdb_cb
99{ 135{
100 struct aio_cb *volatile next; 136 struct bdb_cb *volatile next;
101 SV *callback; 137 SV *callback;
102 int type, pri, result; 138 int type, pri, result;
103 139
104 DB_ENV *env; 140 DB_ENV *env;
105 DB *db; 141 DB *db;
… …
114 150
115 DBT dbt1, dbt2, dbt3; 151 DBT dbt1, dbt2, dbt3;
116 DB_KEY_RANGE key_range; 152 DB_KEY_RANGE key_range;
117 DB_SEQUENCE *seq; 153 DB_SEQUENCE *seq;
118 db_seq_t seq_t; 154 db_seq_t seq_t;
119} aio_cb; 155} bdb_cb;
120 156
121typedef aio_cb *aio_req; 157typedef bdb_cb *bdb_req;
122 158
123enum { 159enum {
124 PRI_MIN = -4, 160 PRI_MIN = -4,
125 PRI_MAX = 4, 161 PRI_MAX = 4,
126 162
… …
143 179
144static int next_pri = DEFAULT_PRI + PRI_BIAS; 180static int next_pri = DEFAULT_PRI + PRI_BIAS;
145 181
146static unsigned int started, idle, wanted; 182static unsigned int started, idle, wanted;
147 183
148#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
149# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
150#else
151# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
152#endif
153
154#define LOCK(mutex) pthread_mutex_lock (&(mutex))
155#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
156
157/* worker threads management */ 184/* worker threads management */
158static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 185static mutex_t wrklock = X_MUTEX_INIT;
159 186
160typedef struct worker { 187typedef struct worker {
161 /* locked by wrklock */ 188 /* locked by wrklock */
162 struct worker *prev, *next; 189 struct worker *prev, *next;
163 190
164 pthread_t tid; 191 thread_t tid;
165 192
166 /* locked by reslock, reqlock or wrklock */ 193 /* locked by reslock, reqlock or wrklock */
167 aio_req req; /* currently processed request */ 194 bdb_req req; /* currently processed request */
168 void *dbuf; 195 void *dbuf;
169 DIR *dirp; 196 DIR *dirp;
170} worker; 197} worker;
171 198
172static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 199static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
184} 211}
185 212
186static volatile unsigned int nreqs, nready, npending; 213static volatile unsigned int nreqs, nready, npending;
187static volatile unsigned int max_idle = 4; 214static volatile unsigned int max_idle = 4;
188static volatile unsigned int max_outstanding = 0xffffffff; 215static volatile unsigned int max_outstanding = 0xffffffff;
189static int respipe [2]; 216static int respipe_osf [2], respipe [2] = { -1, -1 };
190 217
191static pthread_mutex_t reslock = AIO_MUTEX_INIT; 218static mutex_t reslock = X_MUTEX_INIT;
192static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 219static mutex_t reqlock = X_MUTEX_INIT;
193static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 220static cond_t reqwait = X_COND_INIT;
194 221
195#if WORDACCESS_UNSAFE 222#if WORDACCESS_UNSAFE
196 223
197static unsigned int get_nready () 224static unsigned int get_nready (void)
198{ 225{
199 unsigned int retval; 226 unsigned int retval;
200 227
201 LOCK (reqlock); 228 X_LOCK (reqlock);
202 retval = nready; 229 retval = nready;
203 UNLOCK (reqlock); 230 X_UNLOCK (reqlock);
204 231
205 return retval; 232 return retval;
206} 233}
207 234
208static unsigned int get_npending () 235static unsigned int get_npending (void)
209{ 236{
210 unsigned int retval; 237 unsigned int retval;
211 238
212 LOCK (reslock); 239 X_LOCK (reslock);
213 retval = npending; 240 retval = npending;
214 UNLOCK (reslock); 241 X_UNLOCK (reslock);
215 242
216 return retval; 243 return retval;
217} 244}
218 245
219static unsigned int get_nthreads () 246static unsigned int get_nthreads (void)
220{ 247{
221 unsigned int retval; 248 unsigned int retval;
222 249
223 LOCK (wrklock); 250 X_LOCK (wrklock);
224 retval = started; 251 retval = started;
225 UNLOCK (wrklock); 252 X_UNLOCK (wrklock);
226 253
227 return retval; 254 return retval;
228} 255}
229 256
230#else 257#else
… …
239 * a somewhat faster data structure might be nice, but 266 * a somewhat faster data structure might be nice, but
240 * with 8 priorities this actually needs <20 insns 267 * with 8 priorities this actually needs <20 insns
241 * per shift, the most expensive operation. 268 * per shift, the most expensive operation.
242 */ 269 */
243typedef struct { 270typedef struct {
244 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 271 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
245 int size; 272 int size;
246} reqq; 273} reqq;
247 274
248static reqq req_queue; 275static reqq req_queue;
249static reqq res_queue; 276static reqq res_queue;
250 277
251int reqq_push (reqq *q, aio_req req) 278int reqq_push (reqq *q, bdb_req req)
252{ 279{
253 int pri = req->pri; 280 int pri = req->pri;
254 req->next = 0; 281 req->next = 0;
255 282
256 if (q->qe[pri]) 283 if (q->qe[pri])
… …
262 q->qe[pri] = q->qs[pri] = req; 289 q->qe[pri] = q->qs[pri] = req;
263 290
264 return q->size++; 291 return q->size++;
265} 292}
266 293
267aio_req reqq_shift (reqq *q) 294bdb_req reqq_shift (reqq *q)
268{ 295{
269 int pri; 296 int pri;
270 297
271 if (!q->size) 298 if (!q->size)
272 return 0; 299 return 0;
273 300
274 --q->size; 301 --q->size;
275 302
276 for (pri = NUM_PRI; pri--; ) 303 for (pri = NUM_PRI; pri--; )
277 { 304 {
278 aio_req req = q->qs[pri]; 305 bdb_req req = q->qs[pri];
279 306
280 if (req) 307 if (req)
281 { 308 {
282 if (!(q->qs[pri] = req->next)) 309 if (!(q->qs[pri] = req->next))
283 q->qe[pri] = 0; 310 q->qe[pri] = 0;
… …
287 } 314 }
288 315
289 abort (); 316 abort ();
290} 317}
291 318
292static int poll_cb (); 319static int poll_cb (void);
293static void req_free (aio_req req); 320static void req_free (bdb_req req);
294static void req_cancel (aio_req req); 321static void req_cancel (bdb_req req);
295 322
296static int req_invoke (aio_req req) 323static int req_invoke (bdb_req req)
297{ 324{
298 dSP; 325 dSP;
299 326
300 if (SvOK (req->callback)) 327 if (SvOK (req->callback))
301 { 328 {
… …
319 dbt_to_sv (req->sv1, &req->dbt1); 346 dbt_to_sv (req->sv1, &req->dbt1);
320 dbt_to_sv (req->sv2, &req->dbt2); 347 dbt_to_sv (req->sv2, &req->dbt2);
321 dbt_to_sv (req->sv3, &req->dbt3); 348 dbt_to_sv (req->sv3, &req->dbt3);
322 break; 349 break;
323 350
351 case REQ_DB_PUT:
352 case REQ_C_PUT:
353 dbt_to_sv (0, &req->dbt1);
354 dbt_to_sv (0, &req->dbt2);
355 break;
356
324 case REQ_DB_KEY_RANGE: 357 case REQ_DB_KEY_RANGE:
325 { 358 {
326 AV *av = newAV (); 359 AV *av = newAV ();
327 360
328 av_push (av, newSVnv (req->key_range.less)); 361 av_push (av, newSVnv (req->key_range.less));
… …
337 370
338 case REQ_SEQ_GET: 371 case REQ_SEQ_GET:
339 SvREADONLY_off (req->sv1); 372 SvREADONLY_off (req->sv1);
340 373
341 if (sizeof (IV) > 4) 374 if (sizeof (IV) > 4)
342 sv_setiv_mg (req->sv1, req->seq_t); 375 sv_setiv_mg (req->sv1, (IV)req->seq_t);
343 else 376 else
344 sv_setnv_mg (req->sv1, req->seq_t); 377 sv_setnv_mg (req->sv1, (NV)req->seq_t);
345 378
346 SvREFCNT_dec (req->sv1); 379 SvREFCNT_dec (req->sv1);
347 break; 380 break;
348 } 381 }
349 382
… …
358 } 391 }
359 392
360 return !SvTRUE (ERRSV); 393 return !SvTRUE (ERRSV);
361} 394}
362 395
363static void req_free (aio_req req) 396static void req_free (bdb_req req)
364{ 397{
365 free (req->buf1); 398 free (req->buf1);
366 free (req->buf2); 399 free (req->buf2);
367 Safefree (req); 400 Safefree (req);
368} 401}
369 402
370static void *aio_proc (void *arg); 403#ifdef USE_SOCKETS_AS_HANDLES
404# define TO_SOCKET(x) (win32_get_osfhandle (x))
405#else
406# define TO_SOCKET(x) (x)
407#endif
408
409static void
410create_respipe (void)
411{
412#ifdef _WIN32
413 int arg; /* argg */
414#endif
415 int old_readfd = respipe [0];
416
417 if (respipe [1] >= 0)
418 respipe_close (TO_SOCKET (respipe [1]));
419
420#ifdef _WIN32
421 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
422#else
423 if (pipe (respipe))
424#endif
425 croak ("unable to initialize result pipe");
426
427 if (old_readfd >= 0)
428 {
429 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
430 croak ("unable to initialize result pipe(2)");
431
432 respipe_close (respipe [0]);
433 respipe [0] = old_readfd;
434 }
435
436#ifdef _WIN32
437 arg = 1;
438 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
439 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
440#else
441 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
442 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
443#endif
444 croak ("unable to initialize result pipe(3)");
445
446 respipe_osf [0] = TO_SOCKET (respipe [0]);
447 respipe_osf [1] = TO_SOCKET (respipe [1]);
448}
449
450X_THREAD_PROC (bdb_proc);
371 451
372static void start_thread (void) 452static void start_thread (void)
373{ 453{
374 sigset_t fullsigset, oldsigset;
375 pthread_attr_t attr;
376
377 worker *wrk = calloc (1, sizeof (worker)); 454 worker *wrk = calloc (1, sizeof (worker));
378 455
379 if (!wrk) 456 if (!wrk)
380 croak ("unable to allocate worker thread data"); 457 croak ("unable to allocate worker thread data");
381 458
382 pthread_attr_init (&attr);
383 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
384#ifdef PTHREAD_SCOPE_PROCESS
385 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
386#endif
387
388 sigfillset (&fullsigset);
389
390 LOCK (wrklock); 459 X_LOCK (wrklock);
391 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
392
393 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 460 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
394 { 461 {
395 wrk->prev = &wrk_first; 462 wrk->prev = &wrk_first;
396 wrk->next = wrk_first.next; 463 wrk->next = wrk_first.next;
397 wrk_first.next->prev = wrk; 464 wrk_first.next->prev = wrk;
398 wrk_first.next = wrk; 465 wrk_first.next = wrk;
399 ++started; 466 ++started;
400 } 467 }
401 else 468 else
402 free (wrk); 469 free (wrk);
403 470
404 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
405 UNLOCK (wrklock); 471 X_UNLOCK (wrklock);
406} 472}
407 473
408static void maybe_start_thread () 474static void maybe_start_thread (void)
409{ 475{
410 if (get_nthreads () >= wanted) 476 if (get_nthreads () >= wanted)
411 return; 477 return;
412 478
413 /* todo: maybe use idle here, but might be less exact */ 479 /* todo: maybe use idle here, but might be less exact */
… …
415 return; 481 return;
416 482
417 start_thread (); 483 start_thread ();
418} 484}
419 485
420static void req_send (aio_req req) 486static void req_send (bdb_req req)
421{ 487{
422 SV *wait_callback = 0; 488 SV *wait_callback = 0;
423 489
424 // synthesize callback if none given 490 // synthesize callback if none given
425 if (!SvOK (req->callback)) 491 if (!SvOK (req->callback))
426 { 492 {
493 int count;
494
427 dSP; 495 dSP;
428 PUSHMARK (SP); 496 PUSHMARK (SP);
429 PUTBACK; 497 PUTBACK;
430 int count = call_sv (prepare_cb, G_ARRAY); 498 count = call_sv (prepare_cb, G_ARRAY);
431 SPAGAIN; 499 SPAGAIN;
432 500
433 if (count != 2) 501 if (count != 2)
434 croak ("prepare callback must return exactly two values\n"); 502 croak ("prepare callback must return exactly two values\n");
435 503
436 wait_callback = SvREFCNT_inc (POPs); 504 wait_callback = POPs;
437 SvREFCNT_dec (req->callback); 505 SvREFCNT_dec (req->callback);
438 req->callback = SvREFCNT_inc (POPs); 506 req->callback = SvREFCNT_inc (POPs);
439 } 507 }
440 508
441 ++nreqs; 509 ++nreqs;
442 510
443 LOCK (reqlock); 511 X_LOCK (reqlock);
444 ++nready; 512 ++nready;
445 reqq_push (&req_queue, req); 513 reqq_push (&req_queue, req);
446 pthread_cond_signal (&reqwait); 514 X_COND_SIGNAL (reqwait);
447 UNLOCK (reqlock); 515 X_UNLOCK (reqlock);
448 516
449 maybe_start_thread (); 517 maybe_start_thread ();
450 518
451 if (wait_callback) 519 if (wait_callback)
452 { 520 {
453 dSP; 521 dSP;
454 PUSHMARK (SP); 522 PUSHMARK (SP);
455 PUTBACK; 523 PUTBACK;
456 call_sv (wait_callback, G_DISCARD); 524 call_sv (wait_callback, G_DISCARD);
457 SvREFCNT_dec (wait_callback);
458 } 525 }
459} 526}
460 527
461static void end_thread (void) 528static void end_thread (void)
462{ 529{
463 aio_req req; 530 bdb_req req;
464 531
465 Newz (0, req, 1, aio_cb); 532 Newz (0, req, 1, bdb_cb);
466 533
467 req->type = REQ_QUIT; 534 req->type = REQ_QUIT;
468 req->pri = PRI_MAX + PRI_BIAS; 535 req->pri = PRI_MAX + PRI_BIAS;
469 536
470 LOCK (reqlock); 537 X_LOCK (reqlock);
471 reqq_push (&req_queue, req); 538 reqq_push (&req_queue, req);
472 pthread_cond_signal (&reqwait); 539 X_COND_SIGNAL (reqwait);
473 UNLOCK (reqlock); 540 X_UNLOCK (reqlock);
474 541
475 LOCK (wrklock); 542 X_LOCK (wrklock);
476 --started; 543 --started;
477 UNLOCK (wrklock); 544 X_UNLOCK (wrklock);
478} 545}
479 546
480static void set_max_idle (int nthreads) 547static void set_max_idle (int nthreads)
481{ 548{
482 if (WORDACCESS_UNSAFE) LOCK (reqlock); 549 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
483 max_idle = nthreads <= 0 ? 1 : nthreads; 550 max_idle = nthreads <= 0 ? 1 : nthreads;
484 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 551 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
485} 552}
486 553
487static void min_parallel (int nthreads) 554static void min_parallel (int nthreads)
488{ 555{
489 if (wanted < nthreads) 556 if (wanted < nthreads)
… …
497 564
498 while (started > wanted) 565 while (started > wanted)
499 end_thread (); 566 end_thread ();
500} 567}
501 568
502static void poll_wait () 569static void poll_wait (void)
503{ 570{
504 fd_set rfd; 571 fd_set rfd;
505 572
506 while (nreqs) 573 while (nreqs)
507 { 574 {
508 int size; 575 int size;
509 if (WORDACCESS_UNSAFE) LOCK (reslock); 576 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
510 size = res_queue.size; 577 size = res_queue.size;
511 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 578 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
512 579
513 if (size) 580 if (size)
514 return; 581 return;
515 582
516 maybe_start_thread (); 583 maybe_start_thread ();
517 584
518 FD_ZERO(&rfd); 585 FD_ZERO (&rfd);
519 FD_SET(respipe [0], &rfd); 586 FD_SET (respipe [0], &rfd);
520 587
521 select (respipe [0] + 1, &rfd, 0, 0, 0); 588 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
522 } 589 }
523} 590}
524 591
525static int poll_cb () 592static int poll_cb (void)
526{ 593{
527 dSP; 594 dSP;
528 int count = 0; 595 int count = 0;
529 int maxreqs = max_poll_reqs; 596 int maxreqs = max_poll_reqs;
530 int do_croak = 0; 597 int do_croak = 0;
531 struct timeval tv_start, tv_now; 598 struct timeval tv_start, tv_now;
532 aio_req req; 599 bdb_req req;
533 600
534 if (max_poll_time) 601 if (max_poll_time)
535 gettimeofday (&tv_start, 0); 602 gettimeofday (&tv_start, 0);
536 603
537 for (;;) 604 for (;;)
538 { 605 {
539 for (;;) 606 for (;;)
540 { 607 {
541 maybe_start_thread (); 608 maybe_start_thread ();
542 609
543 LOCK (reslock); 610 X_LOCK (reslock);
544 req = reqq_shift (&res_queue); 611 req = reqq_shift (&res_queue);
545 612
546 if (req) 613 if (req)
547 { 614 {
548 --npending; 615 --npending;
549 616
550 if (!res_queue.size) 617 if (!res_queue.size)
551 { 618 {
552 /* read any signals sent by the worker threads */ 619 /* read any signals sent by the worker threads */
553 char buf [4]; 620 char buf [4];
554 while (read (respipe [0], buf, 4) == 4) 621 while (respipe_read (respipe [0], buf, 4) == 4)
555 ; 622 ;
556 } 623 }
557 } 624 }
558 625
559 UNLOCK (reslock); 626 X_UNLOCK (reslock);
560 627
561 if (!req) 628 if (!req)
562 break; 629 break;
563 630
564 --nreqs; 631 --nreqs;
… …
594 } 661 }
595 662
596 return count; 663 return count;
597} 664}
598 665
599static void create_pipe ()
600{
601 if (pipe (respipe))
602 croak ("unable to initialize result pipe");
603
604 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
605 croak ("cannot set result pipe to nonblocking mode");
606
607 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
608 croak ("cannot set result pipe to nonblocking mode");
609}
610
611/*****************************************************************************/ 666/*****************************************************************************/
612 667
613static void *aio_proc (void *thr_arg) 668X_THREAD_PROC (bdb_proc)
614{ 669{
615 aio_req req; 670 bdb_req req;
616 struct timespec ts; 671 struct timespec ts;
617 worker *self = (worker *)thr_arg; 672 worker *self = (worker *)thr_arg;
618 673
619 /* try to distribute timeouts somewhat evenly */ 674 /* try to distribute timeouts somewhat evenly */
620 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 675 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
621 * (1000000000UL / 1024UL);
622 676
623 for (;;) 677 for (;;)
624 { 678 {
625 ts.tv_sec = time (0) + IDLE_TIMEOUT; 679 ts.tv_sec = time (0) + IDLE_TIMEOUT;
626 680
627 LOCK (reqlock); 681 X_LOCK (reqlock);
628 682
629 for (;;) 683 for (;;)
630 { 684 {
631 self->req = req = reqq_shift (&req_queue); 685 self->req = req = reqq_shift (&req_queue);
632 686
633 if (req) 687 if (req)
634 break; 688 break;
635 689
636 ++idle; 690 ++idle;
637 691
638 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 692 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
639 == ETIMEDOUT) 693 == ETIMEDOUT)
640 { 694 {
641 if (idle > max_idle) 695 if (idle > max_idle)
642 { 696 {
643 --idle; 697 --idle;
644 UNLOCK (reqlock); 698 X_UNLOCK (reqlock);
645 LOCK (wrklock); 699 X_LOCK (wrklock);
646 --started; 700 --started;
647 UNLOCK (wrklock); 701 X_UNLOCK (wrklock);
648 goto quit; 702 goto quit;
649 } 703 }
650 704
651 /* we are allowed to idle, so do so without any timeout */ 705 /* we are allowed to idle, so do so without any timeout */
652 pthread_cond_wait (&reqwait, &reqlock); 706 X_COND_WAIT (reqwait, reqlock);
653 ts.tv_sec = time (0) + IDLE_TIMEOUT; 707 ts.tv_sec = time (0) + IDLE_TIMEOUT;
654 } 708 }
655 709
656 --idle; 710 --idle;
657 } 711 }
658 712
659 --nready; 713 --nready;
660 714
661 UNLOCK (reqlock); 715 X_UNLOCK (reqlock);
662 716
663 switch (req->type) 717 switch (req->type)
664 { 718 {
665 case REQ_QUIT: 719 case REQ_QUIT:
720 req->result = ENOSYS;
666 goto quit; 721 goto quit;
667 722
668 case REQ_ENV_OPEN: 723 case REQ_ENV_OPEN:
669 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 724 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
670 break; 725 break;
… …
703 758
704 case REQ_DB_SYNC: 759 case REQ_DB_SYNC:
705 req->result = req->db->sync (req->db, req->uint1); 760 req->result = req->db->sync (req->db, req->uint1);
706 break; 761 break;
707 762
763 case REQ_DB_UPGRADE:
764 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
765 break;
766
708 case REQ_DB_PUT: 767 case REQ_DB_PUT:
709 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 768 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
710 break; 769 break;
711 770
712 case REQ_DB_GET: 771 case REQ_DB_GET:
… …
729 req->result = req->txn->commit (req->txn, req->uint1); 788 req->result = req->txn->commit (req->txn, req->uint1);
730 break; 789 break;
731 790
732 case REQ_TXN_ABORT: 791 case REQ_TXN_ABORT:
733 req->result = req->txn->abort (req->txn); 792 req->result = req->txn->abort (req->txn);
793 break;
794
795 case REQ_TXN_FINISH:
796 if (req->txn->flags & TXN_DEADLOCK)
797 {
798 req->result = req->txn->abort (req->txn);
799 if (!req->result)
800 req->result = DB_LOCK_DEADLOCK;
801 }
802 else
803 req->result = req->txn->commit (req->txn, req->uint1);
734 break; 804 break;
735 805
736 case REQ_C_CLOSE: 806 case REQ_C_CLOSE:
737 req->result = req->dbc->c_close (req->dbc); 807 req->result = req->dbc->c_close (req->dbc);
738 break; 808 break;
… …
780 default: 850 default:
781 req->result = ENOSYS; 851 req->result = ENOSYS;
782 break; 852 break;
783 } 853 }
784 854
855 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
856 req->txn->flags |= TXN_DEADLOCK;
857
785 LOCK (reslock); 858 X_LOCK (reslock);
786 859
787 ++npending; 860 ++npending;
788 861
789 if (!reqq_push (&res_queue, req)) 862 if (!reqq_push (&res_queue, req))
790 /* write a dummy byte to the pipe so fh becomes ready */ 863 /* write a dummy byte to the pipe so fh becomes ready */
791 write (respipe [1], &respipe, 1); 864 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
792 865
793 self->req = 0; 866 self->req = 0;
794 worker_clear (self); 867 worker_clear (self);
795 868
796 UNLOCK (reslock); 869 X_UNLOCK (reslock);
797 } 870 }
798 871
799quit: 872quit:
800 LOCK (wrklock); 873 X_LOCK (wrklock);
801 worker_free (self); 874 worker_free (self);
802 UNLOCK (wrklock); 875 X_UNLOCK (wrklock);
803 876
804 return 0; 877 return 0;
805} 878}
806 879
807/*****************************************************************************/ 880/*****************************************************************************/
808 881
809static void atfork_prepare (void) 882static void atfork_prepare (void)
810{ 883{
811 LOCK (wrklock); 884 X_LOCK (wrklock);
812 LOCK (reqlock); 885 X_LOCK (reqlock);
813 LOCK (reslock); 886 X_LOCK (reslock);
814} 887}
815 888
816static void atfork_parent (void) 889static void atfork_parent (void)
817{ 890{
818 UNLOCK (reslock); 891 X_UNLOCK (reslock);
819 UNLOCK (reqlock); 892 X_UNLOCK (reqlock);
820 UNLOCK (wrklock); 893 X_UNLOCK (wrklock);
821} 894}
822 895
823static void atfork_child (void) 896static void atfork_child (void)
824{ 897{
825 aio_req prv; 898 bdb_req prv;
826 899
827 while (prv = reqq_shift (&req_queue)) 900 while (prv = reqq_shift (&req_queue))
828 req_free (prv); 901 req_free (prv);
829 902
830 while (prv = reqq_shift (&res_queue)) 903 while (prv = reqq_shift (&res_queue))
… …
845 idle = 0; 918 idle = 0;
846 nreqs = 0; 919 nreqs = 0;
847 nready = 0; 920 nready = 0;
848 npending = 0; 921 npending = 0;
849 922
850 close (respipe [0]);
851 close (respipe [1]);
852 create_pipe (); 923 create_respipe ();
853 924
854 atfork_parent (); 925 atfork_parent ();
855} 926}
856 927
857#define dREQ(reqtype) \ 928#define dREQ(reqtype) \
858 aio_req req; \ 929 bdb_req req; \
859 int req_pri = next_pri; \ 930 int req_pri = next_pri; \
860 next_pri = DEFAULT_PRI + PRI_BIAS; \ 931 next_pri = DEFAULT_PRI + PRI_BIAS; \
861 \ 932 \
862 if (SvOK (callback) && !SvROK (callback)) \ 933 if (SvOK (callback) && !SvROK (callback)) \
863 croak ("callback must be undef or of reference type"); \ 934 croak ("callback must be undef or of reference type"); \
864 \ 935 \
865 Newz (0, req, 1, aio_cb); \ 936 Newz (0, req, 1, bdb_cb); \
866 if (!req) \ 937 if (!req) \
867 croak ("out of memory during aio_req allocation"); \ 938 croak ("out of memory during bdb_req allocation"); \
868 \ 939 \
869 req->callback = newSVsv (callback); \ 940 req->callback = newSVsv (callback); \
870 req->type = (reqtype); \ 941 req->type = (reqtype); \
871 req->pri = req_pri 942 req->pri = req_pri
872 943
873#define REQ_SEND \ 944#define REQ_SEND \
874 req_send (req) 945 req_send (req)
875 946
876#define SvPTR(var, arg, type, class, nullok) \ 947#define SvPTR(var, arg, type, class, nullok) \
877 if (!SvOK (arg)) \ 948 if (!SvOK (arg)) \
878 { \ 949 { \
879 if (!nullok) \ 950 if (nullok != 1) \
880 croak (# var " must be a " # class " object, not undef"); \ 951 croak (# var " must be a " # class " object, not undef"); \
881 \ 952 \
882 (var) = 0; \ 953 (var) = 0; \
883 } \ 954 } \
884 else if (sv_derived_from ((arg), # class)) \ 955 else if (sv_derived_from ((arg), # class)) \
885 { \ 956 { \
886 IV tmp = SvIV ((SV*) SvRV (arg)); \ 957 IV tmp = SvIV ((SV*) SvRV (arg)); \
887 (var) = INT2PTR (type, tmp); \ 958 (var) = INT2PTR (type, tmp); \
888 if (!var) \ 959 if (!var && nullok != 2) \
889 croak (# var " is not a valid " # class " object anymore"); \ 960 croak (# var " is not a valid " # class " object anymore"); \
890 } \ 961 } \
891 else \ 962 else \
892 croak (# var " is not of type " # class); \ 963 croak (# var " is not of type " # class); \
893 \ 964 \
… …
895static void 966static void
896ptr_nuke (SV *sv) 967ptr_nuke (SV *sv)
897{ 968{
898 assert (SvROK (sv)); 969 assert (SvROK (sv));
899 sv_setiv (SvRV (sv), 0); 970 sv_setiv (SvRV (sv), 0);
971}
972
973static int
974errno_get (pTHX_ SV *sv, MAGIC *mg)
975{
976 if (*mg->mg_ptr == '!') // should always be the case
977 if (-30999 <= errno && errno <= -30800)
978 {
979 sv_setnv (sv, (NV)errno);
980 sv_setpv (sv, db_strerror (errno));
981 SvNOK_on (sv); /* what a wonderful hack! */
982 // ^^^ copied from perl sources
983 return 0;
984 }
985
986 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
987}
988
989static MGVTBL vtbl_errno;
990
991// this wonderful hack :( patches perl's $! variable to support our errno values
992static void
993patch_errno (void)
994{
995 SV *sv;
996 MAGIC *mg;
997
998 if (!(sv = get_sv ("!", 1)))
999 return;
1000
1001 if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
1002 return;
1003
1004 if (mg->mg_virtual != &PL_vtbl_sv)
1005 return;
1006
1007 vtbl_errno = PL_vtbl_sv;
1008 vtbl_errno.svt_get = errno_get;
1009 mg->mg_virtual = &vtbl_errno;
900} 1010}
901 1011
902MODULE = BDB PACKAGE = BDB 1012MODULE = BDB PACKAGE = BDB
903 1013
904PROTOTYPES: ENABLE 1014PROTOTYPES: ENABLE
… …
921 const_iv (INIT_TXN) 1031 const_iv (INIT_TXN)
922 const_iv (RECOVER) 1032 const_iv (RECOVER)
923 const_iv (INIT_TXN) 1033 const_iv (INIT_TXN)
924 const_iv (RECOVER_FATAL) 1034 const_iv (RECOVER_FATAL)
925 const_iv (CREATE) 1035 const_iv (CREATE)
1036 const_iv (RDONLY)
926 const_iv (USE_ENVIRON) 1037 const_iv (USE_ENVIRON)
927 const_iv (USE_ENVIRON_ROOT) 1038 const_iv (USE_ENVIRON_ROOT)
928 const_iv (LOCKDOWN) 1039 const_iv (LOCKDOWN)
929 const_iv (PRIVATE) 1040 const_iv (PRIVATE)
930 const_iv (REGISTER) 1041 const_iv (REGISTER)
… …
936 const_iv (DSYNC_DB) 1047 const_iv (DSYNC_DB)
937 const_iv (DSYNC_LOG) 1048 const_iv (DSYNC_LOG)
938 const_iv (LOG_AUTOREMOVE) 1049 const_iv (LOG_AUTOREMOVE)
939 const_iv (LOG_INMEMORY) 1050 const_iv (LOG_INMEMORY)
940 const_iv (NOLOCKING) 1051 const_iv (NOLOCKING)
941 const_iv (MULTIVERSION)
942 const_iv (NOMMAP) 1052 const_iv (NOMMAP)
943 const_iv (NOPANIC) 1053 const_iv (NOPANIC)
944 const_iv (OVERWRITE) 1054 const_iv (OVERWRITE)
945 const_iv (PANIC_ENVIRONMENT) 1055 const_iv (PANIC_ENVIRONMENT)
946 const_iv (REGION_INIT) 1056 const_iv (REGION_INIT)
947 const_iv (TIME_NOTGRANTED) 1057 const_iv (TIME_NOTGRANTED)
948 const_iv (TXN_NOSYNC) 1058 const_iv (TXN_NOSYNC)
949 const_iv (TXN_SNAPSHOT) 1059 const_iv (TXN_NOT_DURABLE)
950 const_iv (TXN_WRITE_NOSYNC) 1060 const_iv (TXN_WRITE_NOSYNC)
951 const_iv (WRITECURSOR) 1061 const_iv (WRITECURSOR)
952 const_iv (YIELDCPU) 1062 const_iv (YIELDCPU)
953 const_iv (ENCRYPT_AES) 1063 const_iv (ENCRYPT_AES)
954 const_iv (XA_CREATE) 1064 const_iv (XA_CREATE)
… …
962 const_iv (READ_UNCOMMITTED) 1072 const_iv (READ_UNCOMMITTED)
963 const_iv (TRUNCATE) 1073 const_iv (TRUNCATE)
964 const_iv (NOSYNC) 1074 const_iv (NOSYNC)
965 const_iv (CHKSUM) 1075 const_iv (CHKSUM)
966 const_iv (ENCRYPT) 1076 const_iv (ENCRYPT)
967 const_iv (TXN_NOT_DURABLE)
968 const_iv (DUP) 1077 const_iv (DUP)
969 const_iv (DUPSORT) 1078 const_iv (DUPSORT)
970 const_iv (RECNUM) 1079 const_iv (RECNUM)
971 const_iv (RENUMBER) 1080 const_iv (RENUMBER)
972 const_iv (REVSPLITOFF) 1081 const_iv (REVSPLITOFF)
… …
977 const_iv (GET_BOTH_RANGE) 1086 const_iv (GET_BOTH_RANGE)
978 //const_iv (SET_RECNO) 1087 //const_iv (SET_RECNO)
979 //const_iv (MULTIPLE) 1088 //const_iv (MULTIPLE)
980 const_iv (SNAPSHOT) 1089 const_iv (SNAPSHOT)
981 const_iv (JOIN_ITEM) 1090 const_iv (JOIN_ITEM)
1091 const_iv (JOIN_NOSORT)
982 const_iv (RMW) 1092 const_iv (RMW)
983 1093
984 const_iv (NOTFOUND) 1094 const_iv (NOTFOUND)
985 const_iv (KEYEMPTY) 1095 const_iv (KEYEMPTY)
986 const_iv (LOCK_DEADLOCK) 1096 const_iv (LOCK_DEADLOCK)
… …
997 const_iv (APPEND) 1107 const_iv (APPEND)
998 const_iv (NODUPDATA) 1108 const_iv (NODUPDATA)
999 const_iv (NOOVERWRITE) 1109 const_iv (NOOVERWRITE)
1000 1110
1001 const_iv (TXN_NOWAIT) 1111 const_iv (TXN_NOWAIT)
1002 const_iv (TXN_SNAPSHOT)
1003 const_iv (TXN_SYNC) 1112 const_iv (TXN_SYNC)
1004 1113
1005 const_iv (SET_LOCK_TIMEOUT) 1114 const_iv (SET_LOCK_TIMEOUT)
1006 const_iv (SET_TXN_TIMEOUT) 1115 const_iv (SET_TXN_TIMEOUT)
1007 1116
1008 const_iv (JOIN_ITEM)
1009 const_iv (FIRST) 1117 const_iv (FIRST)
1010 const_iv (NEXT) 1118 const_iv (NEXT)
1011 const_iv (NEXT_DUP) 1119 const_iv (NEXT_DUP)
1012 const_iv (NEXT_NODUP) 1120 const_iv (NEXT_NODUP)
1013 const_iv (PREV) 1121 const_iv (PREV)
… …
1035 const_iv (LOCK_YOUNGEST) 1143 const_iv (LOCK_YOUNGEST)
1036 1144
1037 const_iv (SEQ_DEC) 1145 const_iv (SEQ_DEC)
1038 const_iv (SEQ_INC) 1146 const_iv (SEQ_INC)
1039 const_iv (SEQ_WRAP) 1147 const_iv (SEQ_WRAP)
1148
1149 const_iv (BUFFER_SMALL)
1150 const_iv (DONOTINDEX)
1151 const_iv (KEYEMPTY )
1152 const_iv (KEYEXIST )
1153 const_iv (LOCK_DEADLOCK)
1154 const_iv (LOCK_NOTGRANTED)
1155 const_iv (LOG_BUFFER_FULL)
1156 const_iv (NOSERVER)
1157 const_iv (NOSERVER_HOME)
1158 const_iv (NOSERVER_ID)
1159 const_iv (NOTFOUND)
1160 const_iv (PAGE_NOTFOUND)
1161 const_iv (REP_DUPMASTER)
1162 const_iv (REP_HANDLE_DEAD)
1163 const_iv (REP_HOLDELECTION)
1164 const_iv (REP_IGNORE)
1165 const_iv (REP_ISPERM)
1166 const_iv (REP_JOIN_FAILURE)
1167 const_iv (REP_LOCKOUT)
1168 const_iv (REP_NEWMASTER)
1169 const_iv (REP_NEWSITE)
1170 const_iv (REP_NOTPERM)
1171 const_iv (REP_UNAVAIL)
1172 const_iv (RUNRECOVERY)
1173 const_iv (SECONDARY_BAD)
1174 const_iv (VERIFY_BAD)
1175 const_iv (VERSION_MISMATCH)
1176
1177 const_iv (VERB_DEADLOCK)
1178 const_iv (VERB_RECOVERY)
1179 const_iv (VERB_REGISTER)
1180 const_iv (VERB_REPLICATION)
1181 const_iv (VERB_WAITSFOR)
1182
1183 const_iv (VERSION_MAJOR)
1184 const_iv (VERSION_MINOR)
1185 const_iv (VERSION_PATCH)
1186#if DB_VERSION_MINOR >= 5
1187 const_iv (MULTIVERSION)
1188 const_iv (TXN_SNAPSHOT)
1189#endif
1190#if DB_VERSION_MINOR >= 6
1191 const_iv (PREV_DUP)
1192 const_iv (PRIORITY_UNCHANGED)
1193 const_iv (PRIORITY_VERY_LOW)
1194 const_iv (PRIORITY_LOW)
1195 const_iv (PRIORITY_DEFAULT)
1196 const_iv (PRIORITY_HIGH)
1197 const_iv (PRIORITY_VERY_HIGH)
1198#endif
1040 }; 1199 };
1041 1200
1042 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1201 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1043 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1202 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1044 1203
1045 create_pipe (); 1204 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1205 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1206
1207 create_respipe ();
1208
1046 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1209 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1210#ifdef _WIN32
1211 X_MUTEX_CHECK (wrklock);
1212 X_MUTEX_CHECK (reslock);
1213 X_MUTEX_CHECK (reqlock);
1214
1215 X_COND_CHECK (reqwait);
1216#endif
1217 patch_errno ();
1047} 1218}
1048 1219
1049void 1220void
1050max_poll_reqs (int nreqs) 1221max_poll_reqs (int nreqs)
1051 PROTOTYPE: $ 1222 PROTOTYPE: $
… …
1170 1341
1171int 1342int
1172nthreads () 1343nthreads ()
1173 PROTOTYPE: 1344 PROTOTYPE:
1174 CODE: 1345 CODE:
1175 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1346 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1176 RETVAL = started; 1347 RETVAL = started;
1177 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1348 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1178 OUTPUT: 1349 OUTPUT:
1179 RETVAL 1350 RETVAL
1180 1351
1181void 1352void
1182set_sync_prepare (SV *cb) 1353set_sync_prepare (SV *cb)
1183 PROTOTYPE: & 1354 PROTOTYPE: &
1184 CODE: 1355 CODE:
1185 SvREFCNT_dec (prepare_cb); 1356 SvREFCNT_dec (prepare_cb);
1186 prepare_cb = newSVsv (cb); 1357 prepare_cb = newSVsv (cb);
1187 1358
1359char *
1360strerror (int errorno = errno)
1361 PROTOTYPE: ;$
1362 CODE:
1363 RETVAL = db_strerror (errorno);
1364 OUTPUT:
1365 RETVAL
1188 1366
1189DB_ENV * 1367DB_ENV *
1190db_env_create (U32 env_flags = 0) 1368db_env_create (U32 env_flags = 0)
1191 CODE: 1369 CODE:
1192{ 1370{
1193 errno = db_env_create (&RETVAL, env_flags); 1371 errno = db_env_create (&RETVAL, env_flags);
1194 if (errno) 1372 if (errno)
1195 croak ("db_env_create: %s", db_strerror (errno)); 1373 croak ("db_env_create: %s", db_strerror (errno));
1374
1375 if (0)
1376 {
1377 RETVAL->set_errcall (RETVAL, debug_errcall);
1378 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1379 }
1196} 1380}
1197 OUTPUT: 1381 OUTPUT:
1198 RETVAL 1382 RETVAL
1199 1383
1200void 1384void
1201db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1385db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1202 CODE: 1386 CODE:
1203{ 1387{
1204 env->set_thread_count (env, get_nthreads ());
1205
1206 dREQ (REQ_ENV_OPEN); 1388 dREQ (REQ_ENV_OPEN);
1389
1207 req->env = env; 1390 req->env = env;
1208 req->uint1 = open_flags | DB_THREAD; 1391 req->uint1 = open_flags | DB_THREAD;
1209 req->int1 = mode; 1392 req->int1 = mode;
1210 req->buf1 = strdup_ornull (db_home); 1393 req->buf1 = strdup_ornull (db_home);
1211 REQ_SEND; 1394 REQ_SEND;
… …
1278} 1461}
1279 OUTPUT: 1462 OUTPUT:
1280 RETVAL 1463 RETVAL
1281 1464
1282void 1465void
1283db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1466db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
1284 CODE: 1467 CODE:
1285{ 1468{
1286 dREQ (REQ_DB_OPEN); 1469 dREQ (REQ_DB_OPEN);
1287 req->db = db; 1470 req->db = db;
1288 req->txn = txnid; 1471 req->txn = txnid;
… …
1328 req->uint1 = flags; 1511 req->uint1 = flags;
1329 REQ_SEND; 1512 REQ_SEND;
1330} 1513}
1331 1514
1332void 1515void
1516db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
1517 CODE:
1518{
1519 dREQ (REQ_DB_SYNC);
1520 req->db = db;
1521 req->buf1 = strdup (file);
1522 req->uint1 = flags;
1523 REQ_SEND;
1524}
1525
1526void
1333db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1527db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1334 CODE: 1528 CODE:
1335{ 1529{
1336 dREQ (REQ_DB_KEY_RANGE); 1530 dREQ (REQ_DB_KEY_RANGE);
1337 req->db = db; 1531 req->db = db;
… …
1356} 1550}
1357 1551
1358void 1552void
1359db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1553db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1360 CODE: 1554 CODE:
1555 if (SvREADONLY (data))
1556 croak ("can't modify read-only data scalar in db_get");
1361{ 1557{
1362 dREQ (REQ_DB_GET); 1558 dREQ (REQ_DB_GET);
1363 req->db = db; 1559 req->db = db;
1364 req->txn = txn; 1560 req->txn = txn;
1365 req->uint1 = flags; 1561 req->uint1 = flags;
… …
1370} 1566}
1371 1567
1372void 1568void
1373db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1569db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1374 CODE: 1570 CODE:
1571 if (SvREADONLY (data))
1572 croak ("can't modify read-only data scalar in db_pget");
1375{ 1573{
1376 dREQ (REQ_DB_PGET); 1574 dREQ (REQ_DB_PGET);
1377 req->db = db; 1575 req->db = db;
1378 req->txn = txn; 1576 req->txn = txn;
1379 req->uint1 = flags; 1577 req->uint1 = flags;
… …
1416 REQ_SEND; 1614 REQ_SEND;
1417 ptr_nuke (ST (0)); 1615 ptr_nuke (ST (0));
1418} 1616}
1419 1617
1420void 1618void
1619db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1620 CODE:
1621{
1622 dREQ (REQ_TXN_FINISH);
1623 req->txn = txn;
1624 req->uint1 = flags;
1625 REQ_SEND;
1626 ptr_nuke (ST (0));
1627}
1628
1629void
1421db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1630db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1422 CODE: 1631 CODE:
1423{ 1632{
1424 dREQ (REQ_C_CLOSE); 1633 dREQ (REQ_C_CLOSE);
1425 req->dbc = dbc; 1634 req->dbc = dbc;
… …
1562 1771
1563 1772
1564MODULE = BDB PACKAGE = BDB::Env 1773MODULE = BDB PACKAGE = BDB::Env
1565 1774
1566void 1775void
1567DESTROY (DB_ENV_ornull *env) 1776DESTROY (DB_ENV_ornuked *env)
1568 CODE: 1777 CODE:
1569 if (env) 1778 if (env)
1570 env->close (env, 0); 1779 env->close (env, 0);
1571 1780
1572int set_data_dir (DB_ENV *env, const char *dir) 1781int set_data_dir (DB_ENV *env, const char *dir)
… …
1597 CODE: 1806 CODE:
1598 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1807 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1599 OUTPUT: 1808 OUTPUT:
1600 RETVAL 1809 RETVAL
1601 1810
1602int set_flags (DB_ENV *env, U32 flags, int onoff) 1811int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1603 CODE: 1812 CODE:
1604 RETVAL = env->set_flags (env, flags, onoff); 1813 RETVAL = env->set_flags (env, flags, onoff);
1605 OUTPUT: 1814 OUTPUT:
1606 RETVAL 1815 RETVAL
1607 1816
1817void set_errfile (DB_ENV *env, FILE *errfile = 0)
1818 CODE:
1819 env->set_errfile (env, errfile);
1820
1821void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1822 CODE:
1823 env->set_msgfile (env, msgfile);
1824
1825int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1826 CODE:
1827 RETVAL = env->set_verbose (env, which, onoff);
1828 OUTPUT:
1829 RETVAL
1830
1608int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1831int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1609 CODE: 1832 CODE:
1610 RETVAL = env->set_encrypt (env, password, flags); 1833 RETVAL = env->set_encrypt (env, password, flags);
1611 OUTPUT: 1834 OUTPUT:
1612 RETVAL 1835 RETVAL
1613 1836
1614int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1837int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1615 CODE: 1838 CODE:
1616 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1839 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1617 OUTPUT: 1840 OUTPUT:
1618 RETVAL 1841 RETVAL
1619 1842
… …
1633 CODE: 1856 CODE:
1634 RETVAL = env->set_mp_mmapsize (env, ((size_t)mmapsize_mb) << 20); 1857 RETVAL = env->set_mp_mmapsize (env, ((size_t)mmapsize_mb) << 20);
1635 OUTPUT: 1858 OUTPUT:
1636 RETVAL 1859 RETVAL
1637 1860
1638int set_lk_detect (DB_ENV *env, U32 detect) 1861int set_lk_detect (DB_ENV *env, U32 detect = DB_LOCK_DEFAULT)
1639 CODE: 1862 CODE:
1640 RETVAL = env->set_lk_detect (env, detect); 1863 RETVAL = env->set_lk_detect (env, detect);
1641 OUTPUT: 1864 OUTPUT:
1642 RETVAL 1865 RETVAL
1643 1866
… …
1667 1890
1668int set_lg_max (DB_ENV *env, U32 max) 1891int set_lg_max (DB_ENV *env, U32 max)
1669 CODE: 1892 CODE:
1670 RETVAL = env->set_lg_max (env, max); 1893 RETVAL = env->set_lg_max (env, max);
1671 OUTPUT: 1894 OUTPUT:
1895 RETVAL
1896
1897int mutex_set_max (DB_ENV *env, U32 max)
1898 CODE:
1899 RETVAL = env->mutex_set_max (env, max);
1900 OUTPUT:
1901 RETVAL
1902
1903int mutex_set_increment (DB_ENV *env, U32 increment)
1904 CODE:
1905 RETVAL = env->mutex_set_increment (env, increment);
1906 OUTPUT:
1907 RETVAL
1908
1909int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1910 CODE:
1911 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1912 OUTPUT:
1913 RETVAL
1914
1915int mutex_set_align (DB_ENV *env, U32 align)
1916 CODE:
1917 RETVAL = env->mutex_set_align (env, align);
1918 OUTPUT:
1672 RETVAL 1919 RETVAL
1673 1920
1674DB_TXN * 1921DB_TXN *
1675txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1922txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1676 CODE: 1923 CODE:
… …
1681 RETVAL 1928 RETVAL
1682 1929
1683MODULE = BDB PACKAGE = BDB::Db 1930MODULE = BDB PACKAGE = BDB::Db
1684 1931
1685void 1932void
1686DESTROY (DB_ornull *db) 1933DESTROY (DB_ornuked *db)
1687 CODE: 1934 CODE:
1688 if (db) 1935 if (db)
1689 { 1936 {
1690 SV *env = (SV *)db->app_private; 1937 SV *env = (SV *)db->app_private;
1691 db->close (db, 0); 1938 db->close (db, 0);
… …
1696 CODE: 1943 CODE:
1697 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1944 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1698 OUTPUT: 1945 OUTPUT:
1699 RETVAL 1946 RETVAL
1700 1947
1701int set_flags (DB *db, U32 flags); 1948int set_flags (DB *db, U32 flags)
1702 CODE: 1949 CODE:
1703 RETVAL = db->set_flags (db, flags); 1950 RETVAL = db->set_flags (db, flags);
1704 OUTPUT: 1951 OUTPUT:
1705 RETVAL 1952 RETVAL
1706 1953
… …
1720 CODE: 1967 CODE:
1721 RETVAL = db->set_bt_minkey (db, minkey); 1968 RETVAL = db->set_bt_minkey (db, minkey);
1722 OUTPUT: 1969 OUTPUT:
1723 RETVAL 1970 RETVAL
1724 1971
1725int set_re_delim(DB *db, int delim); 1972int set_re_delim (DB *db, int delim)
1726 CODE: 1973 CODE:
1727 RETVAL = db->set_re_delim (db, delim); 1974 RETVAL = db->set_re_delim (db, delim);
1728 OUTPUT: 1975 OUTPUT:
1729 RETVAL 1976 RETVAL
1730 1977
… …
1786 2033
1787 2034
1788MODULE = BDB PACKAGE = BDB::Txn 2035MODULE = BDB PACKAGE = BDB::Txn
1789 2036
1790void 2037void
1791DESTROY (DB_TXN_ornull *txn) 2038DESTROY (DB_TXN_ornuked *txn)
1792 CODE: 2039 CODE:
1793 if (txn) 2040 if (txn)
1794 txn->abort (txn); 2041 txn->abort (txn);
1795 2042
1796int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 2043int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1797 CODE: 2044 CODE:
1798 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 2045 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1799 OUTPUT: 2046 OUTPUT:
1800 RETVAL 2047 RETVAL
1801 2048
2049int failed (DB_TXN *txn)
2050 CODE:
2051 RETVAL = !!(txn->flags & TXN_DEADLOCK);
2052 OUTPUT:
2053 RETVAL
2054
1802 2055
1803MODULE = BDB PACKAGE = BDB::Cursor 2056MODULE = BDB PACKAGE = BDB::Cursor
1804 2057
1805void 2058void
1806DESTROY (DBC_ornull *dbc) 2059DESTROY (DBC_ornuked *dbc)
1807 CODE: 2060 CODE:
1808 if (dbc) 2061 if (dbc)
1809 dbc->c_close (dbc); 2062 dbc->c_close (dbc);
1810 2063
2064#if DB_VERSION_MINOR >= 6
2065
2066int set_priority (DBC *dbc, int priority)
2067 CODE:
2068 dbc->set_priority (dbc, priority);
2069
2070#endif
2071
1811MODULE = BDB PACKAGE = BDB::Sequence 2072MODULE = BDB PACKAGE = BDB::Sequence
1812 2073
1813void 2074void
1814DESTROY (DB_SEQUENCE_ornull *seq) 2075DESTROY (DB_SEQUENCE_ornuked *seq)
1815 CODE: 2076 CODE:
1816 if (seq) 2077 if (seq)
1817 seq->close (seq, 0); 2078 seq->close (seq, 0);
1818 2079
1819int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2080int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
1838 CODE: 2099 CODE:
1839 RETVAL = seq->set_range (seq, min, max); 2100 RETVAL = seq->set_range (seq, min, max);
1840 OUTPUT: 2101 OUTPUT:
1841 RETVAL 2102 RETVAL
1842 2103
2104

Diff Legend

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