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

Comparing BDB/BDB.xs (file contents):
Revision 1.9 by root, Sun Feb 11 22:38:37 2007 UTC vs.
Revision 1.19 by root, Mon Sep 24 18:14:11 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);
… …
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,
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
… …
365 free (req->buf1); 372 free (req->buf1);
366 free (req->buf2); 373 free (req->buf2);
367 Safefree (req); 374 Safefree (req);
368} 375}
369 376
370static void *aio_proc (void *arg); 377#ifdef USE_SOCKETS_AS_HANDLES
378# define TO_SOCKET(x) (win32_get_osfhandle (x))
379#else
380# define TO_SOCKET(x) (x)
381#endif
382
383static void
384create_respipe ()
385{
386 int old_readfd = respipe [0];
387
388 if (respipe [1] >= 0)
389 respipe_close (TO_SOCKET (respipe [1]));
390
391#ifdef _WIN32
392 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
393#else
394 if (pipe (respipe))
395#endif
396 croak ("unable to initialize result pipe");
397
398 if (old_readfd >= 0)
399 {
400 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
401 croak ("unable to initialize result pipe(2)");
402
403 respipe_close (respipe [0]);
404 respipe [0] = old_readfd;
405 }
406
407#ifdef _WIN32
408 int arg = 1;
409 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
410 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
411#else
412 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
413 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
414#endif
415 croak ("unable to initialize result pipe(3)");
416
417 respipe_osf [0] = TO_SOCKET (respipe [0]);
418 respipe_osf [1] = TO_SOCKET (respipe [1]);
419}
420
421X_THREAD_PROC (bdb_proc);
371 422
372static void start_thread (void) 423static void start_thread (void)
373{ 424{
374 sigset_t fullsigset, oldsigset;
375 pthread_attr_t attr;
376
377 worker *wrk = calloc (1, sizeof (worker)); 425 worker *wrk = calloc (1, sizeof (worker));
378 426
379 if (!wrk) 427 if (!wrk)
380 croak ("unable to allocate worker thread data"); 428 croak ("unable to allocate worker thread data");
381 429
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); 430 X_LOCK (wrklock);
391 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
392
393 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 431 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
394 { 432 {
395 wrk->prev = &wrk_first; 433 wrk->prev = &wrk_first;
396 wrk->next = wrk_first.next; 434 wrk->next = wrk_first.next;
397 wrk_first.next->prev = wrk; 435 wrk_first.next->prev = wrk;
398 wrk_first.next = wrk; 436 wrk_first.next = wrk;
399 ++started; 437 ++started;
400 } 438 }
401 else 439 else
402 free (wrk); 440 free (wrk);
403 441
404 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
405 UNLOCK (wrklock); 442 X_UNLOCK (wrklock);
406} 443}
407 444
408static void maybe_start_thread () 445static void maybe_start_thread ()
409{ 446{
410 if (get_nthreads () >= wanted) 447 if (get_nthreads () >= wanted)
… …
422 SV *wait_callback = 0; 459 SV *wait_callback = 0;
423 460
424 // synthesize callback if none given 461 // synthesize callback if none given
425 if (!SvOK (req->callback)) 462 if (!SvOK (req->callback))
426 { 463 {
464 int count;
465
427 dSP; 466 dSP;
428 PUSHMARK (SP); 467 PUSHMARK (SP);
429 PUTBACK; 468 PUTBACK;
430 int count = call_sv (prepare_cb, G_ARRAY); 469 count = call_sv (prepare_cb, G_ARRAY);
431 SPAGAIN; 470 SPAGAIN;
432 471
433 if (count != 2) 472 if (count != 2)
434 croak ("prepare callback must return exactly two values\n"); 473 croak ("prepare callback must return exactly two values\n");
435 474
… …
438 req->callback = SvREFCNT_inc (POPs); 477 req->callback = SvREFCNT_inc (POPs);
439 } 478 }
440 479
441 ++nreqs; 480 ++nreqs;
442 481
443 LOCK (reqlock); 482 X_LOCK (reqlock);
444 ++nready; 483 ++nready;
445 reqq_push (&req_queue, req); 484 reqq_push (&req_queue, req);
446 pthread_cond_signal (&reqwait); 485 X_COND_SIGNAL (reqwait);
447 UNLOCK (reqlock); 486 X_UNLOCK (reqlock);
448 487
449 maybe_start_thread (); 488 maybe_start_thread ();
450 489
451 if (wait_callback) 490 if (wait_callback)
452 { 491 {
… …
465 Newz (0, req, 1, aio_cb); 504 Newz (0, req, 1, aio_cb);
466 505
467 req->type = REQ_QUIT; 506 req->type = REQ_QUIT;
468 req->pri = PRI_MAX + PRI_BIAS; 507 req->pri = PRI_MAX + PRI_BIAS;
469 508
470 LOCK (reqlock); 509 X_LOCK (reqlock);
471 reqq_push (&req_queue, req); 510 reqq_push (&req_queue, req);
472 pthread_cond_signal (&reqwait); 511 X_COND_SIGNAL (reqwait);
473 UNLOCK (reqlock); 512 X_UNLOCK (reqlock);
474 513
475 LOCK (wrklock); 514 X_LOCK (wrklock);
476 --started; 515 --started;
477 UNLOCK (wrklock); 516 X_UNLOCK (wrklock);
478} 517}
479 518
480static void set_max_idle (int nthreads) 519static void set_max_idle (int nthreads)
481{ 520{
482 if (WORDACCESS_UNSAFE) LOCK (reqlock); 521 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
483 max_idle = nthreads <= 0 ? 1 : nthreads; 522 max_idle = nthreads <= 0 ? 1 : nthreads;
484 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 523 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
485} 524}
486 525
487static void min_parallel (int nthreads) 526static void min_parallel (int nthreads)
488{ 527{
489 if (wanted < nthreads) 528 if (wanted < nthreads)
… …
504 fd_set rfd; 543 fd_set rfd;
505 544
506 while (nreqs) 545 while (nreqs)
507 { 546 {
508 int size; 547 int size;
509 if (WORDACCESS_UNSAFE) LOCK (reslock); 548 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
510 size = res_queue.size; 549 size = res_queue.size;
511 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 550 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
512 551
513 if (size) 552 if (size)
514 return; 553 return;
515 554
516 maybe_start_thread (); 555 maybe_start_thread ();
517 556
518 FD_ZERO(&rfd); 557 FD_ZERO (&rfd);
519 FD_SET(respipe [0], &rfd); 558 FD_SET (respipe [0], &rfd);
520 559
521 select (respipe [0] + 1, &rfd, 0, 0, 0); 560 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
522 } 561 }
523} 562}
524 563
525static int poll_cb () 564static int poll_cb ()
526{ 565{
… …
538 { 577 {
539 for (;;) 578 for (;;)
540 { 579 {
541 maybe_start_thread (); 580 maybe_start_thread ();
542 581
543 LOCK (reslock); 582 X_LOCK (reslock);
544 req = reqq_shift (&res_queue); 583 req = reqq_shift (&res_queue);
545 584
546 if (req) 585 if (req)
547 { 586 {
548 --npending; 587 --npending;
549 588
550 if (!res_queue.size) 589 if (!res_queue.size)
551 { 590 {
552 /* read any signals sent by the worker threads */ 591 /* read any signals sent by the worker threads */
553 char buf [4]; 592 char buf [4];
554 while (read (respipe [0], buf, 4) == 4) 593 while (respipe_read (respipe [0], buf, 4) == 4)
555 ; 594 ;
556 } 595 }
557 } 596 }
558 597
559 UNLOCK (reslock); 598 X_UNLOCK (reslock);
560 599
561 if (!req) 600 if (!req)
562 break; 601 break;
563 602
564 --nreqs; 603 --nreqs;
… …
594 } 633 }
595 634
596 return count; 635 return count;
597} 636}
598 637
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/*****************************************************************************/ 638/*****************************************************************************/
612 639
613static void *aio_proc (void *thr_arg) 640X_THREAD_PROC (bdb_proc)
614{ 641{
615 aio_req req; 642 aio_req req;
616 struct timespec ts; 643 struct timespec ts;
617 worker *self = (worker *)thr_arg; 644 worker *self = (worker *)thr_arg;
618 645
619 /* try to distribute timeouts somewhat evenly */ 646 /* try to distribute timeouts somewhat evenly */
620 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 647 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
621 * (1000000000UL / 1024UL);
622 648
623 for (;;) 649 for (;;)
624 { 650 {
625 ts.tv_sec = time (0) + IDLE_TIMEOUT; 651 ts.tv_sec = time (0) + IDLE_TIMEOUT;
626 652
627 LOCK (reqlock); 653 X_LOCK (reqlock);
628 654
629 for (;;) 655 for (;;)
630 { 656 {
631 self->req = req = reqq_shift (&req_queue); 657 self->req = req = reqq_shift (&req_queue);
632 658
633 if (req) 659 if (req)
634 break; 660 break;
635 661
636 ++idle; 662 ++idle;
637 663
638 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 664 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
639 == ETIMEDOUT) 665 == ETIMEDOUT)
640 { 666 {
641 if (idle > max_idle) 667 if (idle > max_idle)
642 { 668 {
643 --idle; 669 --idle;
644 UNLOCK (reqlock); 670 X_UNLOCK (reqlock);
645 LOCK (wrklock); 671 X_LOCK (wrklock);
646 --started; 672 --started;
647 UNLOCK (wrklock); 673 X_UNLOCK (wrklock);
648 goto quit; 674 goto quit;
649 } 675 }
650 676
651 /* we are allowed to idle, so do so without any timeout */ 677 /* we are allowed to idle, so do so without any timeout */
652 pthread_cond_wait (&reqwait, &reqlock); 678 X_COND_WAIT (reqwait, reqlock);
653 ts.tv_sec = time (0) + IDLE_TIMEOUT; 679 ts.tv_sec = time (0) + IDLE_TIMEOUT;
654 } 680 }
655 681
656 --idle; 682 --idle;
657 } 683 }
658 684
659 --nready; 685 --nready;
660 686
661 UNLOCK (reqlock); 687 X_UNLOCK (reqlock);
662 688
663 switch (req->type) 689 switch (req->type)
664 { 690 {
665 case REQ_QUIT: 691 case REQ_QUIT:
692 req->result = ENOSYS;
666 goto quit; 693 goto quit;
667 694
668 case REQ_ENV_OPEN: 695 case REQ_ENV_OPEN:
669 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 696 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
670 break; 697 break;
… …
729 req->result = req->txn->commit (req->txn, req->uint1); 756 req->result = req->txn->commit (req->txn, req->uint1);
730 break; 757 break;
731 758
732 case REQ_TXN_ABORT: 759 case REQ_TXN_ABORT:
733 req->result = req->txn->abort (req->txn); 760 req->result = req->txn->abort (req->txn);
761 break;
762
763 case REQ_TXN_FINISH:
764 if (req->txn->flags & TXN_DEADLOCK)
765 {
766 req->result = req->txn->abort (req->txn);
767 if (!req->result)
768 req->result = DB_LOCK_DEADLOCK;
769 }
770 else
771 req->result = req->txn->commit (req->txn, req->uint1);
734 break; 772 break;
735 773
736 case REQ_C_CLOSE: 774 case REQ_C_CLOSE:
737 req->result = req->dbc->c_close (req->dbc); 775 req->result = req->dbc->c_close (req->dbc);
738 break; 776 break;
… …
780 default: 818 default:
781 req->result = ENOSYS; 819 req->result = ENOSYS;
782 break; 820 break;
783 } 821 }
784 822
823 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
824 req->txn->flags |= TXN_DEADLOCK;
825
785 LOCK (reslock); 826 X_LOCK (reslock);
786 827
787 ++npending; 828 ++npending;
788 829
789 if (!reqq_push (&res_queue, req)) 830 if (!reqq_push (&res_queue, req))
790 /* write a dummy byte to the pipe so fh becomes ready */ 831 /* write a dummy byte to the pipe so fh becomes ready */
791 write (respipe [1], &respipe, 1); 832 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
792 833
793 self->req = 0; 834 self->req = 0;
794 worker_clear (self); 835 worker_clear (self);
795 836
796 UNLOCK (reslock); 837 X_UNLOCK (reslock);
797 } 838 }
798 839
799quit: 840quit:
800 LOCK (wrklock); 841 X_LOCK (wrklock);
801 worker_free (self); 842 worker_free (self);
802 UNLOCK (wrklock); 843 X_UNLOCK (wrklock);
803 844
804 return 0; 845 return 0;
805} 846}
806 847
807/*****************************************************************************/ 848/*****************************************************************************/
808 849
809static void atfork_prepare (void) 850static void atfork_prepare (void)
810{ 851{
811 LOCK (wrklock); 852 X_LOCK (wrklock);
812 LOCK (reqlock); 853 X_LOCK (reqlock);
813 LOCK (reslock); 854 X_LOCK (reslock);
814} 855}
815 856
816static void atfork_parent (void) 857static void atfork_parent (void)
817{ 858{
818 UNLOCK (reslock); 859 X_UNLOCK (reslock);
819 UNLOCK (reqlock); 860 X_UNLOCK (reqlock);
820 UNLOCK (wrklock); 861 X_UNLOCK (wrklock);
821} 862}
822 863
823static void atfork_child (void) 864static void atfork_child (void)
824{ 865{
825 aio_req prv; 866 aio_req prv;
… …
845 idle = 0; 886 idle = 0;
846 nreqs = 0; 887 nreqs = 0;
847 nready = 0; 888 nready = 0;
848 npending = 0; 889 npending = 0;
849 890
850 close (respipe [0]);
851 close (respipe [1]);
852 create_pipe (); 891 create_respipe ();
853 892
854 atfork_parent (); 893 atfork_parent ();
855} 894}
856 895
857#define dREQ(reqtype) \ 896#define dREQ(reqtype) \
… …
936 const_iv (DSYNC_DB) 975 const_iv (DSYNC_DB)
937 const_iv (DSYNC_LOG) 976 const_iv (DSYNC_LOG)
938 const_iv (LOG_AUTOREMOVE) 977 const_iv (LOG_AUTOREMOVE)
939 const_iv (LOG_INMEMORY) 978 const_iv (LOG_INMEMORY)
940 const_iv (NOLOCKING) 979 const_iv (NOLOCKING)
941 const_iv (MULTIVERSION)
942 const_iv (NOMMAP) 980 const_iv (NOMMAP)
943 const_iv (NOPANIC) 981 const_iv (NOPANIC)
944 const_iv (OVERWRITE) 982 const_iv (OVERWRITE)
945 const_iv (PANIC_ENVIRONMENT) 983 const_iv (PANIC_ENVIRONMENT)
946 const_iv (REGION_INIT) 984 const_iv (REGION_INIT)
947 const_iv (TIME_NOTGRANTED) 985 const_iv (TIME_NOTGRANTED)
948 const_iv (TXN_NOSYNC) 986 const_iv (TXN_NOSYNC)
949 const_iv (TXN_SNAPSHOT)
950 const_iv (TXN_WRITE_NOSYNC) 987 const_iv (TXN_WRITE_NOSYNC)
951 const_iv (WRITECURSOR) 988 const_iv (WRITECURSOR)
952 const_iv (YIELDCPU) 989 const_iv (YIELDCPU)
953 const_iv (ENCRYPT_AES) 990 const_iv (ENCRYPT_AES)
954 const_iv (XA_CREATE) 991 const_iv (XA_CREATE)
… …
997 const_iv (APPEND) 1034 const_iv (APPEND)
998 const_iv (NODUPDATA) 1035 const_iv (NODUPDATA)
999 const_iv (NOOVERWRITE) 1036 const_iv (NOOVERWRITE)
1000 1037
1001 const_iv (TXN_NOWAIT) 1038 const_iv (TXN_NOWAIT)
1002 const_iv (TXN_SNAPSHOT)
1003 const_iv (TXN_SYNC) 1039 const_iv (TXN_SYNC)
1004 1040
1005 const_iv (SET_LOCK_TIMEOUT) 1041 const_iv (SET_LOCK_TIMEOUT)
1006 const_iv (SET_TXN_TIMEOUT) 1042 const_iv (SET_TXN_TIMEOUT)
1007 1043
… …
1035 const_iv (LOCK_YOUNGEST) 1071 const_iv (LOCK_YOUNGEST)
1036 1072
1037 const_iv (SEQ_DEC) 1073 const_iv (SEQ_DEC)
1038 const_iv (SEQ_INC) 1074 const_iv (SEQ_INC)
1039 const_iv (SEQ_WRAP) 1075 const_iv (SEQ_WRAP)
1076
1077 const_iv (BUFFER_SMALL)
1078 const_iv (DONOTINDEX)
1079 const_iv (KEYEMPTY )
1080 const_iv (KEYEXIST )
1081 const_iv (LOCK_DEADLOCK)
1082 const_iv (LOCK_NOTGRANTED)
1083 const_iv (LOG_BUFFER_FULL)
1084 const_iv (NOSERVER)
1085 const_iv (NOSERVER_HOME)
1086 const_iv (NOSERVER_ID)
1087 const_iv (NOTFOUND)
1088 const_iv (OLD_VERSION)
1089 const_iv (PAGE_NOTFOUND)
1090 const_iv (REP_DUPMASTER)
1091 const_iv (REP_HANDLE_DEAD)
1092 const_iv (REP_HOLDELECTION)
1093 const_iv (REP_IGNORE)
1094 const_iv (REP_ISPERM)
1095 const_iv (REP_JOIN_FAILURE)
1096 const_iv (REP_LOCKOUT)
1097 const_iv (REP_NEWMASTER)
1098 const_iv (REP_NEWSITE)
1099 const_iv (REP_NOTPERM)
1100 const_iv (REP_UNAVAIL)
1101 const_iv (RUNRECOVERY)
1102 const_iv (SECONDARY_BAD)
1103 const_iv (VERIFY_BAD)
1104 const_iv (VERSION_MISMATCH)
1105
1106 const_iv (VERB_DEADLOCK)
1107 const_iv (VERB_RECOVERY)
1108 const_iv (VERB_REGISTER)
1109 const_iv (VERB_REPLICATION)
1110 const_iv (VERB_WAITSFOR)
1111
1112 const_iv (VERSION_MAJOR)
1113 const_iv (VERSION_MINOR)
1114 const_iv (VERSION_PATCH)
1115#if DB_VERSION_MINOR >= 5
1116 const_iv (MULTIVERSION)
1117 const_iv (TXN_SNAPSHOT)
1118#endif
1119#if DB_VERSION_MINOR >= 6
1120 const_iv (PREV_DUP)
1121# if 0
1122 const_iv (PRIORITY_UNCHANGED)
1123 const_iv (PRIORITY_VERY_LOW)
1124 const_iv (PRIORITY_LOW)
1125 const_iv (PRIORITY_DEFAULT)
1126 const_iv (PRIORITY_HIGH)
1127 const_iv (PRIORITY_VERY_HIGH)
1128# endif
1129#endif
1040 }; 1130 };
1041 1131
1042 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1132 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1043 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1133 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1044 1134
1045 create_pipe (); 1135 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1136 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1137
1138 create_respipe ();
1139
1046 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1140 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1141#ifdef _WIN32
1142 X_MUTEX_CHECK (wrklock);
1143 X_MUTEX_CHECK (reslock);
1144 X_MUTEX_CHECK (reqlock);
1145
1146 X_COND_CHECK (reqwait);
1147#endif
1047} 1148}
1048 1149
1049void 1150void
1050max_poll_reqs (int nreqs) 1151max_poll_reqs (int nreqs)
1051 PROTOTYPE: $ 1152 PROTOTYPE: $
… …
1170 1271
1171int 1272int
1172nthreads () 1273nthreads ()
1173 PROTOTYPE: 1274 PROTOTYPE:
1174 CODE: 1275 CODE:
1175 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1276 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1176 RETVAL = started; 1277 RETVAL = started;
1177 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1278 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1178 OUTPUT: 1279 OUTPUT:
1179 RETVAL 1280 RETVAL
1180 1281
1181void 1282void
1182set_sync_prepare (SV *cb) 1283set_sync_prepare (SV *cb)
1183 PROTOTYPE: & 1284 PROTOTYPE: &
1184 CODE: 1285 CODE:
1185 SvREFCNT_dec (prepare_cb); 1286 SvREFCNT_dec (prepare_cb);
1186 prepare_cb = newSVsv (cb); 1287 prepare_cb = newSVsv (cb);
1187 1288
1289char *
1290strerror (int errorno = errno)
1291 PROTOTYPE: ;$
1292 CODE:
1293 RETVAL = db_strerror (errorno);
1294 OUTPUT:
1295 RETVAL
1188 1296
1189DB_ENV * 1297DB_ENV *
1190db_env_create (U32 env_flags = 0) 1298db_env_create (U32 env_flags = 0)
1191 CODE: 1299 CODE:
1192{ 1300{
1193 errno = db_env_create (&RETVAL, env_flags); 1301 errno = db_env_create (&RETVAL, env_flags);
1194 if (errno) 1302 if (errno)
1195 croak ("db_env_create: %s", db_strerror (errno)); 1303 croak ("db_env_create: %s", db_strerror (errno));
1304
1305 if (0)
1306 {
1307 RETVAL->set_errcall (RETVAL, debug_errcall);
1308 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1309 }
1196} 1310}
1197 OUTPUT: 1311 OUTPUT:
1198 RETVAL 1312 RETVAL
1199 1313
1200void 1314void
1201db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1315db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1202 CODE: 1316 CODE:
1203{ 1317{
1204 env->set_thread_count (env, get_nthreads ());
1205
1206 dREQ (REQ_ENV_OPEN); 1318 dREQ (REQ_ENV_OPEN);
1319
1320 env->set_thread_count (env, wanted + 2);
1321
1207 req->env = env; 1322 req->env = env;
1208 req->uint1 = open_flags | DB_THREAD; 1323 req->uint1 = open_flags | DB_THREAD;
1209 req->int1 = mode; 1324 req->int1 = mode;
1210 req->buf1 = strdup_ornull (db_home); 1325 req->buf1 = strdup_ornull (db_home);
1211 REQ_SEND; 1326 REQ_SEND;
… …
1416 REQ_SEND; 1531 REQ_SEND;
1417 ptr_nuke (ST (0)); 1532 ptr_nuke (ST (0));
1418} 1533}
1419 1534
1420void 1535void
1536db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1537 CODE:
1538{
1539 dREQ (REQ_TXN_FINISH);
1540 req->txn = txn;
1541 req->uint1 = flags;
1542 REQ_SEND;
1543 ptr_nuke (ST (0));
1544}
1545
1546void
1421db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1547db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1422 CODE: 1548 CODE:
1423{ 1549{
1424 dREQ (REQ_C_CLOSE); 1550 dREQ (REQ_C_CLOSE);
1425 req->dbc = dbc; 1551 req->dbc = dbc;
… …
1603 CODE: 1729 CODE:
1604 RETVAL = env->set_flags (env, flags, onoff); 1730 RETVAL = env->set_flags (env, flags, onoff);
1605 OUTPUT: 1731 OUTPUT:
1606 RETVAL 1732 RETVAL
1607 1733
1734void set_errfile (DB_ENV *env, FILE *errfile = 0)
1735 CODE:
1736 env->set_errfile (env, errfile);
1737
1738void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1739 CODE:
1740 env->set_msgfile (env, msgfile);
1741
1742int set_verbose (DB_ENV *env, U32 which, int onoff = 1)
1743 CODE:
1744 RETVAL = env->set_verbose (env, which, onoff);
1745 OUTPUT:
1746 RETVAL
1747
1608int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1748int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1609 CODE: 1749 CODE:
1610 RETVAL = env->set_encrypt (env, password, flags); 1750 RETVAL = env->set_encrypt (env, password, flags);
1611 OUTPUT: 1751 OUTPUT:
1612 RETVAL 1752 RETVAL
1613 1753
1614int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1754int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1615 CODE: 1755 CODE:
1616 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1756 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1617 OUTPUT: 1757 OUTPUT:
1618 RETVAL 1758 RETVAL
1619 1759
… …
1696 CODE: 1836 CODE:
1697 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1837 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1698 OUTPUT: 1838 OUTPUT:
1699 RETVAL 1839 RETVAL
1700 1840
1701int set_flags (DB *db, U32 flags); 1841int set_flags (DB *db, U32 flags)
1702 CODE: 1842 CODE:
1703 RETVAL = db->set_flags (db, flags); 1843 RETVAL = db->set_flags (db, flags);
1704 OUTPUT: 1844 OUTPUT:
1705 RETVAL 1845 RETVAL
1706 1846
… …
1720 CODE: 1860 CODE:
1721 RETVAL = db->set_bt_minkey (db, minkey); 1861 RETVAL = db->set_bt_minkey (db, minkey);
1722 OUTPUT: 1862 OUTPUT:
1723 RETVAL 1863 RETVAL
1724 1864
1725int set_re_delim(DB *db, int delim); 1865int set_re_delim (DB *db, int delim)
1726 CODE: 1866 CODE:
1727 RETVAL = db->set_re_delim (db, delim); 1867 RETVAL = db->set_re_delim (db, delim);
1728 OUTPUT: 1868 OUTPUT:
1729 RETVAL 1869 RETVAL
1730 1870
… …
1791DESTROY (DB_TXN_ornull *txn) 1931DESTROY (DB_TXN_ornull *txn)
1792 CODE: 1932 CODE:
1793 if (txn) 1933 if (txn)
1794 txn->abort (txn); 1934 txn->abort (txn);
1795 1935
1796int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1936int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1797 CODE: 1937 CODE:
1798 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 1938 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1939 OUTPUT:
1940 RETVAL
1941
1942int failed (DB_TXN *txn)
1943 CODE:
1944 RETVAL = !!(txn->flags & TXN_DEADLOCK);
1799 OUTPUT: 1945 OUTPUT:
1800 RETVAL 1946 RETVAL
1801 1947
1802 1948
1803MODULE = BDB PACKAGE = BDB::Cursor 1949MODULE = BDB PACKAGE = BDB::Cursor

Diff Legend

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