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.26 by root, Mon Dec 10 21:19:07 2007 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;
… …
51typedef SV SV8; /* byte-sv, used for argument-checking */ 45typedef SV SV8; /* byte-sv, used for argument-checking */
52typedef char *octetstring; 46typedef char *octetstring;
53 47
54static SV *prepare_cb; 48static SV *prepare_cb;
55 49
50#if DB_VERSION_MINOR >= 6
51# define c_close close
52# define c_count count
53# define c_del del
54# define c_dup dup
55# define c_get get
56# define c_pget pget
57# define c_put put
58#endif
59
60static void
61debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
62{
63 printf ("err[%s]\n", msg);
64}
65
66static void
67debug_msgcall (const DB_ENV *dbenv, const char *msg)
68{
69 printf ("msg[%s]\n", msg);
70}
71
56static inline char * 72static char *
57strdup_ornull (const char *s) 73strdup_ornull (const char *s)
58{ 74{
59 return s ? strdup (s) : 0; 75 return s ? strdup (s) : 0;
60} 76}
61 77
62static inline void 78static void
63sv_to_dbt (DBT *dbt, SV *sv) 79sv_to_dbt (DBT *dbt, SV *sv)
64{ 80{
65 STRLEN len; 81 STRLEN len;
66 char *data = SvPVbyte (sv, len); 82 char *data = SvPVbyte (sv, len);
67 83
… …
69 memcpy (dbt->data, data, len); 85 memcpy (dbt->data, data, len);
70 dbt->size = len; 86 dbt->size = len;
71 dbt->flags = DB_DBT_REALLOC; 87 dbt->flags = DB_DBT_REALLOC;
72} 88}
73 89
74static inline void 90static void
75dbt_to_sv (SV *sv, DBT *dbt) 91dbt_to_sv (SV *sv, DBT *dbt)
76{ 92{
77 if (sv) 93 if (sv)
78 { 94 {
79 SvREADONLY_off (sv); 95 SvREADONLY_off (sv);
… …
86 102
87enum { 103enum {
88 REQ_QUIT, 104 REQ_QUIT,
89 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
90 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
91 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 107 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, 108 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
93 REQ_TXN_COMMIT, REQ_TXN_ABORT, 109 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, 110 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, 111 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
96}; 112};
97 113
98typedef struct aio_cb 114typedef struct aio_cb
… …
143 159
144static int next_pri = DEFAULT_PRI + PRI_BIAS; 160static int next_pri = DEFAULT_PRI + PRI_BIAS;
145 161
146static unsigned int started, idle, wanted; 162static unsigned int started, idle, wanted;
147 163
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 */ 164/* worker threads management */
158static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 165static mutex_t wrklock = X_MUTEX_INIT;
159 166
160typedef struct worker { 167typedef struct worker {
161 /* locked by wrklock */ 168 /* locked by wrklock */
162 struct worker *prev, *next; 169 struct worker *prev, *next;
163 170
164 pthread_t tid; 171 thread_t tid;
165 172
166 /* locked by reslock, reqlock or wrklock */ 173 /* locked by reslock, reqlock or wrklock */
167 aio_req req; /* currently processed request */ 174 aio_req req; /* currently processed request */
168 void *dbuf; 175 void *dbuf;
169 DIR *dirp; 176 DIR *dirp;
… …
184} 191}
185 192
186static volatile unsigned int nreqs, nready, npending; 193static volatile unsigned int nreqs, nready, npending;
187static volatile unsigned int max_idle = 4; 194static volatile unsigned int max_idle = 4;
188static volatile unsigned int max_outstanding = 0xffffffff; 195static volatile unsigned int max_outstanding = 0xffffffff;
189static int respipe [2]; 196static int respipe_osf [2], respipe [2] = { -1, -1 };
190 197
191static pthread_mutex_t reslock = AIO_MUTEX_INIT; 198static mutex_t reslock = X_MUTEX_INIT;
192static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 199static mutex_t reqlock = X_MUTEX_INIT;
193static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 200static cond_t reqwait = X_COND_INIT;
194 201
195#if WORDACCESS_UNSAFE 202#if WORDACCESS_UNSAFE
196 203
197static unsigned int get_nready () 204static unsigned int get_nready ()
198{ 205{
199 unsigned int retval; 206 unsigned int retval;
200 207
201 LOCK (reqlock); 208 X_LOCK (reqlock);
202 retval = nready; 209 retval = nready;
203 UNLOCK (reqlock); 210 X_UNLOCK (reqlock);
204 211
205 return retval; 212 return retval;
206} 213}
207 214
208static unsigned int get_npending () 215static unsigned int get_npending ()
209{ 216{
210 unsigned int retval; 217 unsigned int retval;
211 218
212 LOCK (reslock); 219 X_LOCK (reslock);
213 retval = npending; 220 retval = npending;
214 UNLOCK (reslock); 221 X_UNLOCK (reslock);
215 222
216 return retval; 223 return retval;
217} 224}
218 225
219static unsigned int get_nthreads () 226static unsigned int get_nthreads ()
220{ 227{
221 unsigned int retval; 228 unsigned int retval;
222 229
223 LOCK (wrklock); 230 X_LOCK (wrklock);
224 retval = started; 231 retval = started;
225 UNLOCK (wrklock); 232 X_UNLOCK (wrklock);
226 233
227 return retval; 234 return retval;
228} 235}
229 236
230#else 237#else
… …
319 dbt_to_sv (req->sv1, &req->dbt1); 326 dbt_to_sv (req->sv1, &req->dbt1);
320 dbt_to_sv (req->sv2, &req->dbt2); 327 dbt_to_sv (req->sv2, &req->dbt2);
321 dbt_to_sv (req->sv3, &req->dbt3); 328 dbt_to_sv (req->sv3, &req->dbt3);
322 break; 329 break;
323 330
331 case REQ_DB_PUT:
332 case REQ_C_PUT:
333 dbt_to_sv (0, &req->dbt1);
334 dbt_to_sv (0, &req->dbt2);
335 break;
336
324 case REQ_DB_KEY_RANGE: 337 case REQ_DB_KEY_RANGE:
325 { 338 {
326 AV *av = newAV (); 339 AV *av = newAV ();
327 340
328 av_push (av, newSVnv (req->key_range.less)); 341 av_push (av, newSVnv (req->key_range.less));
… …
337 350
338 case REQ_SEQ_GET: 351 case REQ_SEQ_GET:
339 SvREADONLY_off (req->sv1); 352 SvREADONLY_off (req->sv1);
340 353
341 if (sizeof (IV) > 4) 354 if (sizeof (IV) > 4)
342 sv_setiv_mg (req->sv1, req->seq_t); 355 sv_setiv_mg (req->sv1, (IV)req->seq_t);
343 else 356 else
344 sv_setnv_mg (req->sv1, req->seq_t); 357 sv_setnv_mg (req->sv1, (NV)req->seq_t);
345 358
346 SvREFCNT_dec (req->sv1); 359 SvREFCNT_dec (req->sv1);
347 break; 360 break;
348 } 361 }
349 362
… …
365 free (req->buf1); 378 free (req->buf1);
366 free (req->buf2); 379 free (req->buf2);
367 Safefree (req); 380 Safefree (req);
368} 381}
369 382
370static void *aio_proc (void *arg); 383#ifdef USE_SOCKETS_AS_HANDLES
384# define TO_SOCKET(x) (win32_get_osfhandle (x))
385#else
386# define TO_SOCKET(x) (x)
387#endif
388
389static void
390create_respipe ()
391{
392#ifdef _WIN32
393 int arg; /* argg */
394#endif
395 int old_readfd = respipe [0];
396
397 if (respipe [1] >= 0)
398 respipe_close (TO_SOCKET (respipe [1]));
399
400#ifdef _WIN32
401 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
402#else
403 if (pipe (respipe))
404#endif
405 croak ("unable to initialize result pipe");
406
407 if (old_readfd >= 0)
408 {
409 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
410 croak ("unable to initialize result pipe(2)");
411
412 respipe_close (respipe [0]);
413 respipe [0] = old_readfd;
414 }
415
416#ifdef _WIN32
417 arg = 1;
418 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
419 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
420#else
421 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
422 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
423#endif
424 croak ("unable to initialize result pipe(3)");
425
426 respipe_osf [0] = TO_SOCKET (respipe [0]);
427 respipe_osf [1] = TO_SOCKET (respipe [1]);
428}
429
430X_THREAD_PROC (bdb_proc);
371 431
372static void start_thread (void) 432static void start_thread (void)
373{ 433{
374 sigset_t fullsigset, oldsigset;
375 pthread_attr_t attr;
376
377 worker *wrk = calloc (1, sizeof (worker)); 434 worker *wrk = calloc (1, sizeof (worker));
378 435
379 if (!wrk) 436 if (!wrk)
380 croak ("unable to allocate worker thread data"); 437 croak ("unable to allocate worker thread data");
381 438
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); 439 X_LOCK (wrklock);
391 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
392
393 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 440 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
394 { 441 {
395 wrk->prev = &wrk_first; 442 wrk->prev = &wrk_first;
396 wrk->next = wrk_first.next; 443 wrk->next = wrk_first.next;
397 wrk_first.next->prev = wrk; 444 wrk_first.next->prev = wrk;
398 wrk_first.next = wrk; 445 wrk_first.next = wrk;
399 ++started; 446 ++started;
400 } 447 }
401 else 448 else
402 free (wrk); 449 free (wrk);
403 450
404 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
405 UNLOCK (wrklock); 451 X_UNLOCK (wrklock);
406} 452}
407 453
408static void maybe_start_thread () 454static void maybe_start_thread ()
409{ 455{
410 if (get_nthreads () >= wanted) 456 if (get_nthreads () >= wanted)
… …
422 SV *wait_callback = 0; 468 SV *wait_callback = 0;
423 469
424 // synthesize callback if none given 470 // synthesize callback if none given
425 if (!SvOK (req->callback)) 471 if (!SvOK (req->callback))
426 { 472 {
473 int count;
474
427 dSP; 475 dSP;
428 PUSHMARK (SP); 476 PUSHMARK (SP);
429 PUTBACK; 477 PUTBACK;
430 int count = call_sv (prepare_cb, G_ARRAY); 478 count = call_sv (prepare_cb, G_ARRAY);
431 SPAGAIN; 479 SPAGAIN;
432 480
433 if (count != 2) 481 if (count != 2)
434 croak ("prepare callback must return exactly two values\n"); 482 croak ("prepare callback must return exactly two values\n");
435 483
… …
438 req->callback = SvREFCNT_inc (POPs); 486 req->callback = SvREFCNT_inc (POPs);
439 } 487 }
440 488
441 ++nreqs; 489 ++nreqs;
442 490
443 LOCK (reqlock); 491 X_LOCK (reqlock);
444 ++nready; 492 ++nready;
445 reqq_push (&req_queue, req); 493 reqq_push (&req_queue, req);
446 pthread_cond_signal (&reqwait); 494 X_COND_SIGNAL (reqwait);
447 UNLOCK (reqlock); 495 X_UNLOCK (reqlock);
448 496
449 maybe_start_thread (); 497 maybe_start_thread ();
450 498
451 if (wait_callback) 499 if (wait_callback)
452 { 500 {
… …
465 Newz (0, req, 1, aio_cb); 513 Newz (0, req, 1, aio_cb);
466 514
467 req->type = REQ_QUIT; 515 req->type = REQ_QUIT;
468 req->pri = PRI_MAX + PRI_BIAS; 516 req->pri = PRI_MAX + PRI_BIAS;
469 517
470 LOCK (reqlock); 518 X_LOCK (reqlock);
471 reqq_push (&req_queue, req); 519 reqq_push (&req_queue, req);
472 pthread_cond_signal (&reqwait); 520 X_COND_SIGNAL (reqwait);
473 UNLOCK (reqlock); 521 X_UNLOCK (reqlock);
474 522
475 LOCK (wrklock); 523 X_LOCK (wrklock);
476 --started; 524 --started;
477 UNLOCK (wrklock); 525 X_UNLOCK (wrklock);
478} 526}
479 527
480static void set_max_idle (int nthreads) 528static void set_max_idle (int nthreads)
481{ 529{
482 if (WORDACCESS_UNSAFE) LOCK (reqlock); 530 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
483 max_idle = nthreads <= 0 ? 1 : nthreads; 531 max_idle = nthreads <= 0 ? 1 : nthreads;
484 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 532 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
485} 533}
486 534
487static void min_parallel (int nthreads) 535static void min_parallel (int nthreads)
488{ 536{
489 if (wanted < nthreads) 537 if (wanted < nthreads)
… …
504 fd_set rfd; 552 fd_set rfd;
505 553
506 while (nreqs) 554 while (nreqs)
507 { 555 {
508 int size; 556 int size;
509 if (WORDACCESS_UNSAFE) LOCK (reslock); 557 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
510 size = res_queue.size; 558 size = res_queue.size;
511 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 559 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
512 560
513 if (size) 561 if (size)
514 return; 562 return;
515 563
516 maybe_start_thread (); 564 maybe_start_thread ();
517 565
518 FD_ZERO(&rfd); 566 FD_ZERO (&rfd);
519 FD_SET(respipe [0], &rfd); 567 FD_SET (respipe [0], &rfd);
520 568
521 select (respipe [0] + 1, &rfd, 0, 0, 0); 569 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
522 } 570 }
523} 571}
524 572
525static int poll_cb () 573static int poll_cb ()
526{ 574{
… …
538 { 586 {
539 for (;;) 587 for (;;)
540 { 588 {
541 maybe_start_thread (); 589 maybe_start_thread ();
542 590
543 LOCK (reslock); 591 X_LOCK (reslock);
544 req = reqq_shift (&res_queue); 592 req = reqq_shift (&res_queue);
545 593
546 if (req) 594 if (req)
547 { 595 {
548 --npending; 596 --npending;
549 597
550 if (!res_queue.size) 598 if (!res_queue.size)
551 { 599 {
552 /* read any signals sent by the worker threads */ 600 /* read any signals sent by the worker threads */
553 char buf [4]; 601 char buf [4];
554 while (read (respipe [0], buf, 4) == 4) 602 while (respipe_read (respipe [0], buf, 4) == 4)
555 ; 603 ;
556 } 604 }
557 } 605 }
558 606
559 UNLOCK (reslock); 607 X_UNLOCK (reslock);
560 608
561 if (!req) 609 if (!req)
562 break; 610 break;
563 611
564 --nreqs; 612 --nreqs;
… …
594 } 642 }
595 643
596 return count; 644 return count;
597} 645}
598 646
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/*****************************************************************************/ 647/*****************************************************************************/
612 648
613static void *aio_proc (void *thr_arg) 649X_THREAD_PROC (bdb_proc)
614{ 650{
615 aio_req req; 651 aio_req req;
616 struct timespec ts; 652 struct timespec ts;
617 worker *self = (worker *)thr_arg; 653 worker *self = (worker *)thr_arg;
618 654
619 /* try to distribute timeouts somewhat evenly */ 655 /* try to distribute timeouts somewhat evenly */
620 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 656 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
621 * (1000000000UL / 1024UL);
622 657
623 for (;;) 658 for (;;)
624 { 659 {
625 ts.tv_sec = time (0) + IDLE_TIMEOUT; 660 ts.tv_sec = time (0) + IDLE_TIMEOUT;
626 661
627 LOCK (reqlock); 662 X_LOCK (reqlock);
628 663
629 for (;;) 664 for (;;)
630 { 665 {
631 self->req = req = reqq_shift (&req_queue); 666 self->req = req = reqq_shift (&req_queue);
632 667
633 if (req) 668 if (req)
634 break; 669 break;
635 670
636 ++idle; 671 ++idle;
637 672
638 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 673 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
639 == ETIMEDOUT) 674 == ETIMEDOUT)
640 { 675 {
641 if (idle > max_idle) 676 if (idle > max_idle)
642 { 677 {
643 --idle; 678 --idle;
644 UNLOCK (reqlock); 679 X_UNLOCK (reqlock);
645 LOCK (wrklock); 680 X_LOCK (wrklock);
646 --started; 681 --started;
647 UNLOCK (wrklock); 682 X_UNLOCK (wrklock);
648 goto quit; 683 goto quit;
649 } 684 }
650 685
651 /* we are allowed to idle, so do so without any timeout */ 686 /* we are allowed to idle, so do so without any timeout */
652 pthread_cond_wait (&reqwait, &reqlock); 687 X_COND_WAIT (reqwait, reqlock);
653 ts.tv_sec = time (0) + IDLE_TIMEOUT; 688 ts.tv_sec = time (0) + IDLE_TIMEOUT;
654 } 689 }
655 690
656 --idle; 691 --idle;
657 } 692 }
658 693
659 --nready; 694 --nready;
660 695
661 UNLOCK (reqlock); 696 X_UNLOCK (reqlock);
662 697
663 switch (req->type) 698 switch (req->type)
664 { 699 {
665 case REQ_QUIT: 700 case REQ_QUIT:
701 req->result = ENOSYS;
666 goto quit; 702 goto quit;
667 703
668 case REQ_ENV_OPEN: 704 case REQ_ENV_OPEN:
669 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 705 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
670 break; 706 break;
… …
703 739
704 case REQ_DB_SYNC: 740 case REQ_DB_SYNC:
705 req->result = req->db->sync (req->db, req->uint1); 741 req->result = req->db->sync (req->db, req->uint1);
706 break; 742 break;
707 743
744 case REQ_DB_UPGRADE:
745 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
746 break;
747
708 case REQ_DB_PUT: 748 case REQ_DB_PUT:
709 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 749 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
710 break; 750 break;
711 751
712 case REQ_DB_GET: 752 case REQ_DB_GET:
… …
729 req->result = req->txn->commit (req->txn, req->uint1); 769 req->result = req->txn->commit (req->txn, req->uint1);
730 break; 770 break;
731 771
732 case REQ_TXN_ABORT: 772 case REQ_TXN_ABORT:
733 req->result = req->txn->abort (req->txn); 773 req->result = req->txn->abort (req->txn);
774 break;
775
776 case REQ_TXN_FINISH:
777 if (req->txn->flags & TXN_DEADLOCK)
778 {
779 req->result = req->txn->abort (req->txn);
780 if (!req->result)
781 req->result = DB_LOCK_DEADLOCK;
782 }
783 else
784 req->result = req->txn->commit (req->txn, req->uint1);
734 break; 785 break;
735 786
736 case REQ_C_CLOSE: 787 case REQ_C_CLOSE:
737 req->result = req->dbc->c_close (req->dbc); 788 req->result = req->dbc->c_close (req->dbc);
738 break; 789 break;
… …
780 default: 831 default:
781 req->result = ENOSYS; 832 req->result = ENOSYS;
782 break; 833 break;
783 } 834 }
784 835
836 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
837 req->txn->flags |= TXN_DEADLOCK;
838
785 LOCK (reslock); 839 X_LOCK (reslock);
786 840
787 ++npending; 841 ++npending;
788 842
789 if (!reqq_push (&res_queue, req)) 843 if (!reqq_push (&res_queue, req))
790 /* write a dummy byte to the pipe so fh becomes ready */ 844 /* write a dummy byte to the pipe so fh becomes ready */
791 write (respipe [1], &respipe, 1); 845 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
792 846
793 self->req = 0; 847 self->req = 0;
794 worker_clear (self); 848 worker_clear (self);
795 849
796 UNLOCK (reslock); 850 X_UNLOCK (reslock);
797 } 851 }
798 852
799quit: 853quit:
800 LOCK (wrklock); 854 X_LOCK (wrklock);
801 worker_free (self); 855 worker_free (self);
802 UNLOCK (wrklock); 856 X_UNLOCK (wrklock);
803 857
804 return 0; 858 return 0;
805} 859}
806 860
807/*****************************************************************************/ 861/*****************************************************************************/
808 862
809static void atfork_prepare (void) 863static void atfork_prepare (void)
810{ 864{
811 LOCK (wrklock); 865 X_LOCK (wrklock);
812 LOCK (reqlock); 866 X_LOCK (reqlock);
813 LOCK (reslock); 867 X_LOCK (reslock);
814} 868}
815 869
816static void atfork_parent (void) 870static void atfork_parent (void)
817{ 871{
818 UNLOCK (reslock); 872 X_UNLOCK (reslock);
819 UNLOCK (reqlock); 873 X_UNLOCK (reqlock);
820 UNLOCK (wrklock); 874 X_UNLOCK (wrklock);
821} 875}
822 876
823static void atfork_child (void) 877static void atfork_child (void)
824{ 878{
825 aio_req prv; 879 aio_req prv;
… …
845 idle = 0; 899 idle = 0;
846 nreqs = 0; 900 nreqs = 0;
847 nready = 0; 901 nready = 0;
848 npending = 0; 902 npending = 0;
849 903
850 close (respipe [0]);
851 close (respipe [1]);
852 create_pipe (); 904 create_respipe ();
853 905
854 atfork_parent (); 906 atfork_parent ();
855} 907}
856 908
857#define dREQ(reqtype) \ 909#define dREQ(reqtype) \
… …
921 const_iv (INIT_TXN) 973 const_iv (INIT_TXN)
922 const_iv (RECOVER) 974 const_iv (RECOVER)
923 const_iv (INIT_TXN) 975 const_iv (INIT_TXN)
924 const_iv (RECOVER_FATAL) 976 const_iv (RECOVER_FATAL)
925 const_iv (CREATE) 977 const_iv (CREATE)
978 const_iv (RDONLY)
926 const_iv (USE_ENVIRON) 979 const_iv (USE_ENVIRON)
927 const_iv (USE_ENVIRON_ROOT) 980 const_iv (USE_ENVIRON_ROOT)
928 const_iv (LOCKDOWN) 981 const_iv (LOCKDOWN)
929 const_iv (PRIVATE) 982 const_iv (PRIVATE)
930 const_iv (REGISTER) 983 const_iv (REGISTER)
… …
936 const_iv (DSYNC_DB) 989 const_iv (DSYNC_DB)
937 const_iv (DSYNC_LOG) 990 const_iv (DSYNC_LOG)
938 const_iv (LOG_AUTOREMOVE) 991 const_iv (LOG_AUTOREMOVE)
939 const_iv (LOG_INMEMORY) 992 const_iv (LOG_INMEMORY)
940 const_iv (NOLOCKING) 993 const_iv (NOLOCKING)
941 const_iv (MULTIVERSION)
942 const_iv (NOMMAP) 994 const_iv (NOMMAP)
943 const_iv (NOPANIC) 995 const_iv (NOPANIC)
944 const_iv (OVERWRITE) 996 const_iv (OVERWRITE)
945 const_iv (PANIC_ENVIRONMENT) 997 const_iv (PANIC_ENVIRONMENT)
946 const_iv (REGION_INIT) 998 const_iv (REGION_INIT)
947 const_iv (TIME_NOTGRANTED) 999 const_iv (TIME_NOTGRANTED)
948 const_iv (TXN_NOSYNC) 1000 const_iv (TXN_NOSYNC)
949 const_iv (TXN_SNAPSHOT) 1001 const_iv (TXN_NOT_DURABLE)
950 const_iv (TXN_WRITE_NOSYNC) 1002 const_iv (TXN_WRITE_NOSYNC)
951 const_iv (WRITECURSOR) 1003 const_iv (WRITECURSOR)
952 const_iv (YIELDCPU) 1004 const_iv (YIELDCPU)
953 const_iv (ENCRYPT_AES) 1005 const_iv (ENCRYPT_AES)
954 const_iv (XA_CREATE) 1006 const_iv (XA_CREATE)
… …
962 const_iv (READ_UNCOMMITTED) 1014 const_iv (READ_UNCOMMITTED)
963 const_iv (TRUNCATE) 1015 const_iv (TRUNCATE)
964 const_iv (NOSYNC) 1016 const_iv (NOSYNC)
965 const_iv (CHKSUM) 1017 const_iv (CHKSUM)
966 const_iv (ENCRYPT) 1018 const_iv (ENCRYPT)
967 const_iv (TXN_NOT_DURABLE)
968 const_iv (DUP) 1019 const_iv (DUP)
969 const_iv (DUPSORT) 1020 const_iv (DUPSORT)
970 const_iv (RECNUM) 1021 const_iv (RECNUM)
971 const_iv (RENUMBER) 1022 const_iv (RENUMBER)
972 const_iv (REVSPLITOFF) 1023 const_iv (REVSPLITOFF)
… …
997 const_iv (APPEND) 1048 const_iv (APPEND)
998 const_iv (NODUPDATA) 1049 const_iv (NODUPDATA)
999 const_iv (NOOVERWRITE) 1050 const_iv (NOOVERWRITE)
1000 1051
1001 const_iv (TXN_NOWAIT) 1052 const_iv (TXN_NOWAIT)
1002 const_iv (TXN_SNAPSHOT)
1003 const_iv (TXN_SYNC) 1053 const_iv (TXN_SYNC)
1004 1054
1005 const_iv (SET_LOCK_TIMEOUT) 1055 const_iv (SET_LOCK_TIMEOUT)
1006 const_iv (SET_TXN_TIMEOUT) 1056 const_iv (SET_TXN_TIMEOUT)
1007 1057
… …
1035 const_iv (LOCK_YOUNGEST) 1085 const_iv (LOCK_YOUNGEST)
1036 1086
1037 const_iv (SEQ_DEC) 1087 const_iv (SEQ_DEC)
1038 const_iv (SEQ_INC) 1088 const_iv (SEQ_INC)
1039 const_iv (SEQ_WRAP) 1089 const_iv (SEQ_WRAP)
1090
1091 const_iv (BUFFER_SMALL)
1092 const_iv (DONOTINDEX)
1093 const_iv (KEYEMPTY )
1094 const_iv (KEYEXIST )
1095 const_iv (LOCK_DEADLOCK)
1096 const_iv (LOCK_NOTGRANTED)
1097 const_iv (LOG_BUFFER_FULL)
1098 const_iv (NOSERVER)
1099 const_iv (NOSERVER_HOME)
1100 const_iv (NOSERVER_ID)
1101 const_iv (NOTFOUND)
1102 const_iv (PAGE_NOTFOUND)
1103 const_iv (REP_DUPMASTER)
1104 const_iv (REP_HANDLE_DEAD)
1105 const_iv (REP_HOLDELECTION)
1106 const_iv (REP_IGNORE)
1107 const_iv (REP_ISPERM)
1108 const_iv (REP_JOIN_FAILURE)
1109 const_iv (REP_LOCKOUT)
1110 const_iv (REP_NEWMASTER)
1111 const_iv (REP_NEWSITE)
1112 const_iv (REP_NOTPERM)
1113 const_iv (REP_UNAVAIL)
1114 const_iv (RUNRECOVERY)
1115 const_iv (SECONDARY_BAD)
1116 const_iv (VERIFY_BAD)
1117 const_iv (VERSION_MISMATCH)
1118
1119 const_iv (VERB_DEADLOCK)
1120 const_iv (VERB_RECOVERY)
1121 const_iv (VERB_REGISTER)
1122 const_iv (VERB_REPLICATION)
1123 const_iv (VERB_WAITSFOR)
1124
1125 const_iv (VERSION_MAJOR)
1126 const_iv (VERSION_MINOR)
1127 const_iv (VERSION_PATCH)
1128#if DB_VERSION_MINOR >= 5
1129 const_iv (MULTIVERSION)
1130 const_iv (TXN_SNAPSHOT)
1131#endif
1132#if DB_VERSION_MINOR >= 6
1133 const_iv (PREV_DUP)
1134# if 0
1135 const_iv (PRIORITY_UNCHANGED)
1136 const_iv (PRIORITY_VERY_LOW)
1137 const_iv (PRIORITY_LOW)
1138 const_iv (PRIORITY_DEFAULT)
1139 const_iv (PRIORITY_HIGH)
1140 const_iv (PRIORITY_VERY_HIGH)
1141# endif
1142#endif
1040 }; 1143 };
1041 1144
1042 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1145 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1043 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1146 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1044 1147
1045 create_pipe (); 1148 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1149 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1150
1151 create_respipe ();
1152
1046 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1153 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1154#ifdef _WIN32
1155 X_MUTEX_CHECK (wrklock);
1156 X_MUTEX_CHECK (reslock);
1157 X_MUTEX_CHECK (reqlock);
1158
1159 X_COND_CHECK (reqwait);
1160#endif
1047} 1161}
1048 1162
1049void 1163void
1050max_poll_reqs (int nreqs) 1164max_poll_reqs (int nreqs)
1051 PROTOTYPE: $ 1165 PROTOTYPE: $
… …
1170 1284
1171int 1285int
1172nthreads () 1286nthreads ()
1173 PROTOTYPE: 1287 PROTOTYPE:
1174 CODE: 1288 CODE:
1175 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1289 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1176 RETVAL = started; 1290 RETVAL = started;
1177 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1291 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1178 OUTPUT: 1292 OUTPUT:
1179 RETVAL 1293 RETVAL
1180 1294
1181void 1295void
1182set_sync_prepare (SV *cb) 1296set_sync_prepare (SV *cb)
1183 PROTOTYPE: & 1297 PROTOTYPE: &
1184 CODE: 1298 CODE:
1185 SvREFCNT_dec (prepare_cb); 1299 SvREFCNT_dec (prepare_cb);
1186 prepare_cb = newSVsv (cb); 1300 prepare_cb = newSVsv (cb);
1187 1301
1302char *
1303strerror (int errorno = errno)
1304 PROTOTYPE: ;$
1305 CODE:
1306 RETVAL = db_strerror (errorno);
1307 OUTPUT:
1308 RETVAL
1188 1309
1189DB_ENV * 1310DB_ENV *
1190db_env_create (U32 env_flags = 0) 1311db_env_create (U32 env_flags = 0)
1191 CODE: 1312 CODE:
1192{ 1313{
1193 errno = db_env_create (&RETVAL, env_flags); 1314 errno = db_env_create (&RETVAL, env_flags);
1194 if (errno) 1315 if (errno)
1195 croak ("db_env_create: %s", db_strerror (errno)); 1316 croak ("db_env_create: %s", db_strerror (errno));
1317
1318 if (0)
1319 {
1320 RETVAL->set_errcall (RETVAL, debug_errcall);
1321 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1322 }
1196} 1323}
1197 OUTPUT: 1324 OUTPUT:
1198 RETVAL 1325 RETVAL
1199 1326
1200void 1327void
1201db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1328db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1202 CODE: 1329 CODE:
1203{ 1330{
1204 env->set_thread_count (env, get_nthreads ());
1205
1206 dREQ (REQ_ENV_OPEN); 1331 dREQ (REQ_ENV_OPEN);
1332
1333 env->set_thread_count (env, wanted + 2);
1334
1207 req->env = env; 1335 req->env = env;
1208 req->uint1 = open_flags | DB_THREAD; 1336 req->uint1 = open_flags | DB_THREAD;
1209 req->int1 = mode; 1337 req->int1 = mode;
1210 req->buf1 = strdup_ornull (db_home); 1338 req->buf1 = strdup_ornull (db_home);
1211 REQ_SEND; 1339 REQ_SEND;
… …
1328 req->uint1 = flags; 1456 req->uint1 = flags;
1329 REQ_SEND; 1457 REQ_SEND;
1330} 1458}
1331 1459
1332void 1460void
1461db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
1462 CODE:
1463{
1464 dREQ (REQ_DB_SYNC);
1465 req->db = db;
1466 req->buf1 = strdup (file);
1467 req->uint1 = flags;
1468 REQ_SEND;
1469}
1470
1471void
1333db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1472db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1334 CODE: 1473 CODE:
1335{ 1474{
1336 dREQ (REQ_DB_KEY_RANGE); 1475 dREQ (REQ_DB_KEY_RANGE);
1337 req->db = db; 1476 req->db = db;
… …
1416 REQ_SEND; 1555 REQ_SEND;
1417 ptr_nuke (ST (0)); 1556 ptr_nuke (ST (0));
1418} 1557}
1419 1558
1420void 1559void
1560db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1561 CODE:
1562{
1563 dREQ (REQ_TXN_FINISH);
1564 req->txn = txn;
1565 req->uint1 = flags;
1566 REQ_SEND;
1567 ptr_nuke (ST (0));
1568}
1569
1570void
1421db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1571db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1422 CODE: 1572 CODE:
1423{ 1573{
1424 dREQ (REQ_C_CLOSE); 1574 dREQ (REQ_C_CLOSE);
1425 req->dbc = dbc; 1575 req->dbc = dbc;
… …
1597 CODE: 1747 CODE:
1598 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1748 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1599 OUTPUT: 1749 OUTPUT:
1600 RETVAL 1750 RETVAL
1601 1751
1602int set_flags (DB_ENV *env, U32 flags, int onoff) 1752int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1603 CODE: 1753 CODE:
1604 RETVAL = env->set_flags (env, flags, onoff); 1754 RETVAL = env->set_flags (env, flags, onoff);
1605 OUTPUT: 1755 OUTPUT:
1606 RETVAL 1756 RETVAL
1607 1757
1758void set_errfile (DB_ENV *env, FILE *errfile = 0)
1759 CODE:
1760 env->set_errfile (env, errfile);
1761
1762void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1763 CODE:
1764 env->set_msgfile (env, msgfile);
1765
1766int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1767 CODE:
1768 RETVAL = env->set_verbose (env, which, onoff);
1769 OUTPUT:
1770 RETVAL
1771
1608int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1772int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1609 CODE: 1773 CODE:
1610 RETVAL = env->set_encrypt (env, password, flags); 1774 RETVAL = env->set_encrypt (env, password, flags);
1611 OUTPUT: 1775 OUTPUT:
1612 RETVAL 1776 RETVAL
1613 1777
1614int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1778int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1615 CODE: 1779 CODE:
1616 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1780 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1617 OUTPUT: 1781 OUTPUT:
1618 RETVAL 1782 RETVAL
1619 1783
… …
1633 CODE: 1797 CODE:
1634 RETVAL = env->set_mp_mmapsize (env, ((size_t)mmapsize_mb) << 20); 1798 RETVAL = env->set_mp_mmapsize (env, ((size_t)mmapsize_mb) << 20);
1635 OUTPUT: 1799 OUTPUT:
1636 RETVAL 1800 RETVAL
1637 1801
1638int set_lk_detect (DB_ENV *env, U32 detect) 1802int set_lk_detect (DB_ENV *env, U32 detect = DB_LOCK_DEFAULT)
1639 CODE: 1803 CODE:
1640 RETVAL = env->set_lk_detect (env, detect); 1804 RETVAL = env->set_lk_detect (env, detect);
1641 OUTPUT: 1805 OUTPUT:
1642 RETVAL 1806 RETVAL
1643 1807
… …
1667 1831
1668int set_lg_max (DB_ENV *env, U32 max) 1832int set_lg_max (DB_ENV *env, U32 max)
1669 CODE: 1833 CODE:
1670 RETVAL = env->set_lg_max (env, max); 1834 RETVAL = env->set_lg_max (env, max);
1671 OUTPUT: 1835 OUTPUT:
1836 RETVAL
1837
1838int mutex_set_max (DB_ENV *env, U32 max)
1839 CODE:
1840 RETVAL = env->mutex_set_max (env, max);
1841 OUTPUT:
1842 RETVAL
1843
1844int mutex_set_increment (DB_ENV *env, U32 increment)
1845 CODE:
1846 RETVAL = env->mutex_set_increment (env, increment);
1847 OUTPUT:
1848 RETVAL
1849
1850int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1851 CODE:
1852 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1853 OUTPUT:
1854 RETVAL
1855
1856int mutex_set_align (DB_ENV *env, U32 align)
1857 CODE:
1858 RETVAL = env->mutex_set_align (env, align);
1859 OUTPUT:
1672 RETVAL 1860 RETVAL
1673 1861
1674DB_TXN * 1862DB_TXN *
1675txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1863txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1676 CODE: 1864 CODE:
… …
1696 CODE: 1884 CODE:
1697 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1885 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1698 OUTPUT: 1886 OUTPUT:
1699 RETVAL 1887 RETVAL
1700 1888
1701int set_flags (DB *db, U32 flags); 1889int set_flags (DB *db, U32 flags)
1702 CODE: 1890 CODE:
1703 RETVAL = db->set_flags (db, flags); 1891 RETVAL = db->set_flags (db, flags);
1704 OUTPUT: 1892 OUTPUT:
1705 RETVAL 1893 RETVAL
1706 1894
… …
1720 CODE: 1908 CODE:
1721 RETVAL = db->set_bt_minkey (db, minkey); 1909 RETVAL = db->set_bt_minkey (db, minkey);
1722 OUTPUT: 1910 OUTPUT:
1723 RETVAL 1911 RETVAL
1724 1912
1725int set_re_delim(DB *db, int delim); 1913int set_re_delim (DB *db, int delim)
1726 CODE: 1914 CODE:
1727 RETVAL = db->set_re_delim (db, delim); 1915 RETVAL = db->set_re_delim (db, delim);
1728 OUTPUT: 1916 OUTPUT:
1729 RETVAL 1917 RETVAL
1730 1918
… …
1791DESTROY (DB_TXN_ornull *txn) 1979DESTROY (DB_TXN_ornull *txn)
1792 CODE: 1980 CODE:
1793 if (txn) 1981 if (txn)
1794 txn->abort (txn); 1982 txn->abort (txn);
1795 1983
1796int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1984int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1797 CODE: 1985 CODE:
1798 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 1986 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1987 OUTPUT:
1988 RETVAL
1989
1990int failed (DB_TXN *txn)
1991 CODE:
1992 RETVAL = !!(txn->flags & TXN_DEADLOCK);
1799 OUTPUT: 1993 OUTPUT:
1800 RETVAL 1994 RETVAL
1801 1995
1802 1996
1803MODULE = BDB PACKAGE = BDB::Cursor 1997MODULE = BDB PACKAGE = BDB::Cursor

Diff Legend

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