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

Comparing BDB/BDB.xs (file contents):
Revision 1.10 by root, Mon Mar 5 19:47:01 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>
29 31
30#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5) 32#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4)
31# error you need Berkeley DB 4.5 or newer installed 33# error you need Berkeley DB 4.4 or newer installed
32#endif 34#endif
33 35
34/* number of seconds after which idle threads exit */ 36/* number of seconds after which idle threads exit */
35#define IDLE_TIMEOUT 10 37#define IDLE_TIMEOUT 10
36
37/* wether word reads are potentially non-atomic.
38 * this is conservatice, likely most arches this runs
39 * on have atomic word read/writes.
40 */
41#ifndef WORDACCESS_UNSAFE
42# if __i386 || __x86_64
43# define WORDACCESS_UNSAFE 0
44# else
45# define WORDACCESS_UNSAFE 1
46# endif
47#endif
48 38
49typedef DB_ENV DB_ENV_ornull; 39typedef DB_ENV DB_ENV_ornull;
50typedef DB_TXN DB_TXN_ornull; 40typedef DB_TXN DB_TXN_ornull;
51typedef DBC DBC_ornull; 41typedef DBC DBC_ornull;
52typedef DB DB_ornull; 42typedef DB DB_ornull;
… …
55typedef SV SV8; /* byte-sv, used for argument-checking */ 45typedef SV SV8; /* byte-sv, used for argument-checking */
56typedef char *octetstring; 46typedef char *octetstring;
57 47
58static SV *prepare_cb; 48static SV *prepare_cb;
59 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
60static inline char * 72static char *
61strdup_ornull (const char *s) 73strdup_ornull (const char *s)
62{ 74{
63 return s ? strdup (s) : 0; 75 return s ? strdup (s) : 0;
64} 76}
65 77
66static inline void 78static void
67sv_to_dbt (DBT *dbt, SV *sv) 79sv_to_dbt (DBT *dbt, SV *sv)
68{ 80{
69 STRLEN len; 81 STRLEN len;
70 char *data = SvPVbyte (sv, len); 82 char *data = SvPVbyte (sv, len);
71 83
… …
73 memcpy (dbt->data, data, len); 85 memcpy (dbt->data, data, len);
74 dbt->size = len; 86 dbt->size = len;
75 dbt->flags = DB_DBT_REALLOC; 87 dbt->flags = DB_DBT_REALLOC;
76} 88}
77 89
78static inline void 90static void
79dbt_to_sv (SV *sv, DBT *dbt) 91dbt_to_sv (SV *sv, DBT *dbt)
80{ 92{
81 if (sv) 93 if (sv)
82 { 94 {
83 SvREADONLY_off (sv); 95 SvREADONLY_off (sv);
… …
92 REQ_QUIT, 104 REQ_QUIT,
93 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,
94 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
95 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,
96 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,
97 REQ_TXN_COMMIT, REQ_TXN_ABORT, 109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
98 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,
99 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,
100}; 112};
101 113
102typedef struct aio_cb 114typedef struct aio_cb
… …
147 159
148static int next_pri = DEFAULT_PRI + PRI_BIAS; 160static int next_pri = DEFAULT_PRI + PRI_BIAS;
149 161
150static unsigned int started, idle, wanted; 162static unsigned int started, idle, wanted;
151 163
152#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
153# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
154#else
155# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
156#endif
157
158#define LOCK(mutex) pthread_mutex_lock (&(mutex))
159#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
160
161/* worker threads management */ 164/* worker threads management */
162static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 165static mutex_t wrklock = X_MUTEX_INIT;
163 166
164typedef struct worker { 167typedef struct worker {
165 /* locked by wrklock */ 168 /* locked by wrklock */
166 struct worker *prev, *next; 169 struct worker *prev, *next;
167 170
168 pthread_t tid; 171 thread_t tid;
169 172
170 /* locked by reslock, reqlock or wrklock */ 173 /* locked by reslock, reqlock or wrklock */
171 aio_req req; /* currently processed request */ 174 aio_req req; /* currently processed request */
172 void *dbuf; 175 void *dbuf;
173 DIR *dirp; 176 DIR *dirp;
… …
188} 191}
189 192
190static volatile unsigned int nreqs, nready, npending; 193static volatile unsigned int nreqs, nready, npending;
191static volatile unsigned int max_idle = 4; 194static volatile unsigned int max_idle = 4;
192static volatile unsigned int max_outstanding = 0xffffffff; 195static volatile unsigned int max_outstanding = 0xffffffff;
193static int respipe [2]; 196static int respipe_osf [2], respipe [2] = { -1, -1 };
194 197
195static pthread_mutex_t reslock = AIO_MUTEX_INIT; 198static mutex_t reslock = X_MUTEX_INIT;
196static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 199static mutex_t reqlock = X_MUTEX_INIT;
197static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 200static cond_t reqwait = X_COND_INIT;
198 201
199#if WORDACCESS_UNSAFE 202#if WORDACCESS_UNSAFE
200 203
201static unsigned int get_nready () 204static unsigned int get_nready ()
202{ 205{
203 unsigned int retval; 206 unsigned int retval;
204 207
205 LOCK (reqlock); 208 X_LOCK (reqlock);
206 retval = nready; 209 retval = nready;
207 UNLOCK (reqlock); 210 X_UNLOCK (reqlock);
208 211
209 return retval; 212 return retval;
210} 213}
211 214
212static unsigned int get_npending () 215static unsigned int get_npending ()
213{ 216{
214 unsigned int retval; 217 unsigned int retval;
215 218
216 LOCK (reslock); 219 X_LOCK (reslock);
217 retval = npending; 220 retval = npending;
218 UNLOCK (reslock); 221 X_UNLOCK (reslock);
219 222
220 return retval; 223 return retval;
221} 224}
222 225
223static unsigned int get_nthreads () 226static unsigned int get_nthreads ()
224{ 227{
225 unsigned int retval; 228 unsigned int retval;
226 229
227 LOCK (wrklock); 230 X_LOCK (wrklock);
228 retval = started; 231 retval = started;
229 UNLOCK (wrklock); 232 X_UNLOCK (wrklock);
230 233
231 return retval; 234 return retval;
232} 235}
233 236
234#else 237#else
… …
369 free (req->buf1); 372 free (req->buf1);
370 free (req->buf2); 373 free (req->buf2);
371 Safefree (req); 374 Safefree (req);
372} 375}
373 376
374static 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);
375 422
376static void start_thread (void) 423static void start_thread (void)
377{ 424{
378 sigset_t fullsigset, oldsigset;
379 pthread_attr_t attr;
380
381 worker *wrk = calloc (1, sizeof (worker)); 425 worker *wrk = calloc (1, sizeof (worker));
382 426
383 if (!wrk) 427 if (!wrk)
384 croak ("unable to allocate worker thread data"); 428 croak ("unable to allocate worker thread data");
385 429
386 pthread_attr_init (&attr);
387 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
388#ifdef PTHREAD_SCOPE_PROCESS
389 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
390#endif
391
392 sigfillset (&fullsigset);
393
394 LOCK (wrklock); 430 X_LOCK (wrklock);
395 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
396
397 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 431 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
398 { 432 {
399 wrk->prev = &wrk_first; 433 wrk->prev = &wrk_first;
400 wrk->next = wrk_first.next; 434 wrk->next = wrk_first.next;
401 wrk_first.next->prev = wrk; 435 wrk_first.next->prev = wrk;
402 wrk_first.next = wrk; 436 wrk_first.next = wrk;
403 ++started; 437 ++started;
404 } 438 }
405 else 439 else
406 free (wrk); 440 free (wrk);
407 441
408 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
409 UNLOCK (wrklock); 442 X_UNLOCK (wrklock);
410} 443}
411 444
412static void maybe_start_thread () 445static void maybe_start_thread ()
413{ 446{
414 if (get_nthreads () >= wanted) 447 if (get_nthreads () >= wanted)
… …
426 SV *wait_callback = 0; 459 SV *wait_callback = 0;
427 460
428 // synthesize callback if none given 461 // synthesize callback if none given
429 if (!SvOK (req->callback)) 462 if (!SvOK (req->callback))
430 { 463 {
464 int count;
465
431 dSP; 466 dSP;
432 PUSHMARK (SP); 467 PUSHMARK (SP);
433 PUTBACK; 468 PUTBACK;
434 int count = call_sv (prepare_cb, G_ARRAY); 469 count = call_sv (prepare_cb, G_ARRAY);
435 SPAGAIN; 470 SPAGAIN;
436 471
437 if (count != 2) 472 if (count != 2)
438 croak ("prepare callback must return exactly two values\n"); 473 croak ("prepare callback must return exactly two values\n");
439 474
… …
442 req->callback = SvREFCNT_inc (POPs); 477 req->callback = SvREFCNT_inc (POPs);
443 } 478 }
444 479
445 ++nreqs; 480 ++nreqs;
446 481
447 LOCK (reqlock); 482 X_LOCK (reqlock);
448 ++nready; 483 ++nready;
449 reqq_push (&req_queue, req); 484 reqq_push (&req_queue, req);
450 pthread_cond_signal (&reqwait); 485 X_COND_SIGNAL (reqwait);
451 UNLOCK (reqlock); 486 X_UNLOCK (reqlock);
452 487
453 maybe_start_thread (); 488 maybe_start_thread ();
454 489
455 if (wait_callback) 490 if (wait_callback)
456 { 491 {
… …
469 Newz (0, req, 1, aio_cb); 504 Newz (0, req, 1, aio_cb);
470 505
471 req->type = REQ_QUIT; 506 req->type = REQ_QUIT;
472 req->pri = PRI_MAX + PRI_BIAS; 507 req->pri = PRI_MAX + PRI_BIAS;
473 508
474 LOCK (reqlock); 509 X_LOCK (reqlock);
475 reqq_push (&req_queue, req); 510 reqq_push (&req_queue, req);
476 pthread_cond_signal (&reqwait); 511 X_COND_SIGNAL (reqwait);
477 UNLOCK (reqlock); 512 X_UNLOCK (reqlock);
478 513
479 LOCK (wrklock); 514 X_LOCK (wrklock);
480 --started; 515 --started;
481 UNLOCK (wrklock); 516 X_UNLOCK (wrklock);
482} 517}
483 518
484static void set_max_idle (int nthreads) 519static void set_max_idle (int nthreads)
485{ 520{
486 if (WORDACCESS_UNSAFE) LOCK (reqlock); 521 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
487 max_idle = nthreads <= 0 ? 1 : nthreads; 522 max_idle = nthreads <= 0 ? 1 : nthreads;
488 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 523 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
489} 524}
490 525
491static void min_parallel (int nthreads) 526static void min_parallel (int nthreads)
492{ 527{
493 if (wanted < nthreads) 528 if (wanted < nthreads)
… …
508 fd_set rfd; 543 fd_set rfd;
509 544
510 while (nreqs) 545 while (nreqs)
511 { 546 {
512 int size; 547 int size;
513 if (WORDACCESS_UNSAFE) LOCK (reslock); 548 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
514 size = res_queue.size; 549 size = res_queue.size;
515 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 550 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
516 551
517 if (size) 552 if (size)
518 return; 553 return;
519 554
520 maybe_start_thread (); 555 maybe_start_thread ();
521 556
522 FD_ZERO(&rfd); 557 FD_ZERO (&rfd);
523 FD_SET(respipe [0], &rfd); 558 FD_SET (respipe [0], &rfd);
524 559
525 select (respipe [0] + 1, &rfd, 0, 0, 0); 560 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
526 } 561 }
527} 562}
528 563
529static int poll_cb () 564static int poll_cb ()
530{ 565{
… …
542 { 577 {
543 for (;;) 578 for (;;)
544 { 579 {
545 maybe_start_thread (); 580 maybe_start_thread ();
546 581
547 LOCK (reslock); 582 X_LOCK (reslock);
548 req = reqq_shift (&res_queue); 583 req = reqq_shift (&res_queue);
549 584
550 if (req) 585 if (req)
551 { 586 {
552 --npending; 587 --npending;
553 588
554 if (!res_queue.size) 589 if (!res_queue.size)
555 { 590 {
556 /* read any signals sent by the worker threads */ 591 /* read any signals sent by the worker threads */
557 char buf [4]; 592 char buf [4];
558 while (read (respipe [0], buf, 4) == 4) 593 while (respipe_read (respipe [0], buf, 4) == 4)
559 ; 594 ;
560 } 595 }
561 } 596 }
562 597
563 UNLOCK (reslock); 598 X_UNLOCK (reslock);
564 599
565 if (!req) 600 if (!req)
566 break; 601 break;
567 602
568 --nreqs; 603 --nreqs;
… …
598 } 633 }
599 634
600 return count; 635 return count;
601} 636}
602 637
603static void create_pipe ()
604{
605 if (pipe (respipe))
606 croak ("unable to initialize result pipe");
607
608 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
609 croak ("cannot set result pipe to nonblocking mode");
610
611 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
612 croak ("cannot set result pipe to nonblocking mode");
613}
614
615/*****************************************************************************/ 638/*****************************************************************************/
616 639
617static void *aio_proc (void *thr_arg) 640X_THREAD_PROC (bdb_proc)
618{ 641{
619 aio_req req; 642 aio_req req;
620 struct timespec ts; 643 struct timespec ts;
621 worker *self = (worker *)thr_arg; 644 worker *self = (worker *)thr_arg;
622 645
623 /* try to distribute timeouts somewhat evenly */ 646 /* try to distribute timeouts somewhat evenly */
624 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 647 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
625 * (1000000000UL / 1024UL);
626 648
627 for (;;) 649 for (;;)
628 { 650 {
629 ts.tv_sec = time (0) + IDLE_TIMEOUT; 651 ts.tv_sec = time (0) + IDLE_TIMEOUT;
630 652
631 LOCK (reqlock); 653 X_LOCK (reqlock);
632 654
633 for (;;) 655 for (;;)
634 { 656 {
635 self->req = req = reqq_shift (&req_queue); 657 self->req = req = reqq_shift (&req_queue);
636 658
637 if (req) 659 if (req)
638 break; 660 break;
639 661
640 ++idle; 662 ++idle;
641 663
642 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 664 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
643 == ETIMEDOUT) 665 == ETIMEDOUT)
644 { 666 {
645 if (idle > max_idle) 667 if (idle > max_idle)
646 { 668 {
647 --idle; 669 --idle;
648 UNLOCK (reqlock); 670 X_UNLOCK (reqlock);
649 LOCK (wrklock); 671 X_LOCK (wrklock);
650 --started; 672 --started;
651 UNLOCK (wrklock); 673 X_UNLOCK (wrklock);
652 goto quit; 674 goto quit;
653 } 675 }
654 676
655 /* we are allowed to idle, so do so without any timeout */ 677 /* we are allowed to idle, so do so without any timeout */
656 pthread_cond_wait (&reqwait, &reqlock); 678 X_COND_WAIT (reqwait, reqlock);
657 ts.tv_sec = time (0) + IDLE_TIMEOUT; 679 ts.tv_sec = time (0) + IDLE_TIMEOUT;
658 } 680 }
659 681
660 --idle; 682 --idle;
661 } 683 }
662 684
663 --nready; 685 --nready;
664 686
665 UNLOCK (reqlock); 687 X_UNLOCK (reqlock);
666 688
667 switch (req->type) 689 switch (req->type)
668 { 690 {
669 case REQ_QUIT: 691 case REQ_QUIT:
692 req->result = ENOSYS;
670 goto quit; 693 goto quit;
671 694
672 case REQ_ENV_OPEN: 695 case REQ_ENV_OPEN:
673 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);
674 break; 697 break;
… …
733 req->result = req->txn->commit (req->txn, req->uint1); 756 req->result = req->txn->commit (req->txn, req->uint1);
734 break; 757 break;
735 758
736 case REQ_TXN_ABORT: 759 case REQ_TXN_ABORT:
737 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);
738 break; 772 break;
739 773
740 case REQ_C_CLOSE: 774 case REQ_C_CLOSE:
741 req->result = req->dbc->c_close (req->dbc); 775 req->result = req->dbc->c_close (req->dbc);
742 break; 776 break;
… …
784 default: 818 default:
785 req->result = ENOSYS; 819 req->result = ENOSYS;
786 break; 820 break;
787 } 821 }
788 822
823 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
824 req->txn->flags |= TXN_DEADLOCK;
825
789 LOCK (reslock); 826 X_LOCK (reslock);
790 827
791 ++npending; 828 ++npending;
792 829
793 if (!reqq_push (&res_queue, req)) 830 if (!reqq_push (&res_queue, req))
794 /* write a dummy byte to the pipe so fh becomes ready */ 831 /* write a dummy byte to the pipe so fh becomes ready */
795 write (respipe [1], &respipe, 1); 832 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
796 833
797 self->req = 0; 834 self->req = 0;
798 worker_clear (self); 835 worker_clear (self);
799 836
800 UNLOCK (reslock); 837 X_UNLOCK (reslock);
801 } 838 }
802 839
803quit: 840quit:
804 LOCK (wrklock); 841 X_LOCK (wrklock);
805 worker_free (self); 842 worker_free (self);
806 UNLOCK (wrklock); 843 X_UNLOCK (wrklock);
807 844
808 return 0; 845 return 0;
809} 846}
810 847
811/*****************************************************************************/ 848/*****************************************************************************/
812 849
813static void atfork_prepare (void) 850static void atfork_prepare (void)
814{ 851{
815 LOCK (wrklock); 852 X_LOCK (wrklock);
816 LOCK (reqlock); 853 X_LOCK (reqlock);
817 LOCK (reslock); 854 X_LOCK (reslock);
818} 855}
819 856
820static void atfork_parent (void) 857static void atfork_parent (void)
821{ 858{
822 UNLOCK (reslock); 859 X_UNLOCK (reslock);
823 UNLOCK (reqlock); 860 X_UNLOCK (reqlock);
824 UNLOCK (wrklock); 861 X_UNLOCK (wrklock);
825} 862}
826 863
827static void atfork_child (void) 864static void atfork_child (void)
828{ 865{
829 aio_req prv; 866 aio_req prv;
… …
849 idle = 0; 886 idle = 0;
850 nreqs = 0; 887 nreqs = 0;
851 nready = 0; 888 nready = 0;
852 npending = 0; 889 npending = 0;
853 890
854 close (respipe [0]);
855 close (respipe [1]);
856 create_pipe (); 891 create_respipe ();
857 892
858 atfork_parent (); 893 atfork_parent ();
859} 894}
860 895
861#define dREQ(reqtype) \ 896#define dREQ(reqtype) \
… …
940 const_iv (DSYNC_DB) 975 const_iv (DSYNC_DB)
941 const_iv (DSYNC_LOG) 976 const_iv (DSYNC_LOG)
942 const_iv (LOG_AUTOREMOVE) 977 const_iv (LOG_AUTOREMOVE)
943 const_iv (LOG_INMEMORY) 978 const_iv (LOG_INMEMORY)
944 const_iv (NOLOCKING) 979 const_iv (NOLOCKING)
945 const_iv (MULTIVERSION)
946 const_iv (NOMMAP) 980 const_iv (NOMMAP)
947 const_iv (NOPANIC) 981 const_iv (NOPANIC)
948 const_iv (OVERWRITE) 982 const_iv (OVERWRITE)
949 const_iv (PANIC_ENVIRONMENT) 983 const_iv (PANIC_ENVIRONMENT)
950 const_iv (REGION_INIT) 984 const_iv (REGION_INIT)
951 const_iv (TIME_NOTGRANTED) 985 const_iv (TIME_NOTGRANTED)
952 const_iv (TXN_NOSYNC) 986 const_iv (TXN_NOSYNC)
953 const_iv (TXN_SNAPSHOT)
954 const_iv (TXN_WRITE_NOSYNC) 987 const_iv (TXN_WRITE_NOSYNC)
955 const_iv (WRITECURSOR) 988 const_iv (WRITECURSOR)
956 const_iv (YIELDCPU) 989 const_iv (YIELDCPU)
957 const_iv (ENCRYPT_AES) 990 const_iv (ENCRYPT_AES)
958 const_iv (XA_CREATE) 991 const_iv (XA_CREATE)
… …
1001 const_iv (APPEND) 1034 const_iv (APPEND)
1002 const_iv (NODUPDATA) 1035 const_iv (NODUPDATA)
1003 const_iv (NOOVERWRITE) 1036 const_iv (NOOVERWRITE)
1004 1037
1005 const_iv (TXN_NOWAIT) 1038 const_iv (TXN_NOWAIT)
1006 const_iv (TXN_SNAPSHOT)
1007 const_iv (TXN_SYNC) 1039 const_iv (TXN_SYNC)
1008 1040
1009 const_iv (SET_LOCK_TIMEOUT) 1041 const_iv (SET_LOCK_TIMEOUT)
1010 const_iv (SET_TXN_TIMEOUT) 1042 const_iv (SET_TXN_TIMEOUT)
1011 1043
… …
1039 const_iv (LOCK_YOUNGEST) 1071 const_iv (LOCK_YOUNGEST)
1040 1072
1041 const_iv (SEQ_DEC) 1073 const_iv (SEQ_DEC)
1042 const_iv (SEQ_INC) 1074 const_iv (SEQ_INC)
1043 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
1044 }; 1130 };
1045 1131
1046 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; )
1047 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1133 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1048 1134
1049 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
1050 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
1051} 1148}
1052 1149
1053void 1150void
1054max_poll_reqs (int nreqs) 1151max_poll_reqs (int nreqs)
1055 PROTOTYPE: $ 1152 PROTOTYPE: $
… …
1174 1271
1175int 1272int
1176nthreads () 1273nthreads ()
1177 PROTOTYPE: 1274 PROTOTYPE:
1178 CODE: 1275 CODE:
1179 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1276 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1180 RETVAL = started; 1277 RETVAL = started;
1181 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1278 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1182 OUTPUT: 1279 OUTPUT:
1183 RETVAL 1280 RETVAL
1184 1281
1185void 1282void
1186set_sync_prepare (SV *cb) 1283set_sync_prepare (SV *cb)
1187 PROTOTYPE: & 1284 PROTOTYPE: &
1188 CODE: 1285 CODE:
1189 SvREFCNT_dec (prepare_cb); 1286 SvREFCNT_dec (prepare_cb);
1190 prepare_cb = newSVsv (cb); 1287 prepare_cb = newSVsv (cb);
1191 1288
1289char *
1290strerror (int errorno = errno)
1291 PROTOTYPE: ;$
1292 CODE:
1293 RETVAL = db_strerror (errorno);
1294 OUTPUT:
1295 RETVAL
1192 1296
1193DB_ENV * 1297DB_ENV *
1194db_env_create (U32 env_flags = 0) 1298db_env_create (U32 env_flags = 0)
1195 CODE: 1299 CODE:
1196{ 1300{
1197 errno = db_env_create (&RETVAL, env_flags); 1301 errno = db_env_create (&RETVAL, env_flags);
1198 if (errno) 1302 if (errno)
1199 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 }
1200} 1310}
1201 OUTPUT: 1311 OUTPUT:
1202 RETVAL 1312 RETVAL
1203 1313
1204void 1314void
1205db_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)
1206 CODE: 1316 CODE:
1207{ 1317{
1208 env->set_thread_count (env, get_nthreads ());
1209
1210 dREQ (REQ_ENV_OPEN); 1318 dREQ (REQ_ENV_OPEN);
1319
1320 env->set_thread_count (env, wanted + 2);
1321
1211 req->env = env; 1322 req->env = env;
1212 req->uint1 = open_flags | DB_THREAD; 1323 req->uint1 = open_flags | DB_THREAD;
1213 req->int1 = mode; 1324 req->int1 = mode;
1214 req->buf1 = strdup_ornull (db_home); 1325 req->buf1 = strdup_ornull (db_home);
1215 REQ_SEND; 1326 REQ_SEND;
… …
1420 REQ_SEND; 1531 REQ_SEND;
1421 ptr_nuke (ST (0)); 1532 ptr_nuke (ST (0));
1422} 1533}
1423 1534
1424void 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
1425db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1547db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1426 CODE: 1548 CODE:
1427{ 1549{
1428 dREQ (REQ_C_CLOSE); 1550 dREQ (REQ_C_CLOSE);
1429 req->dbc = dbc; 1551 req->dbc = dbc;
… …
1607 CODE: 1729 CODE:
1608 RETVAL = env->set_flags (env, flags, onoff); 1730 RETVAL = env->set_flags (env, flags, onoff);
1609 OUTPUT: 1731 OUTPUT:
1610 RETVAL 1732 RETVAL
1611 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
1612int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1748int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1613 CODE: 1749 CODE:
1614 RETVAL = env->set_encrypt (env, password, flags); 1750 RETVAL = env->set_encrypt (env, password, flags);
1615 OUTPUT: 1751 OUTPUT:
1616 RETVAL 1752 RETVAL
1617 1753
1618int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1754int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1619 CODE: 1755 CODE:
1620 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1756 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1621 OUTPUT: 1757 OUTPUT:
1622 RETVAL 1758 RETVAL
1623 1759
… …
1700 CODE: 1836 CODE:
1701 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1837 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1702 OUTPUT: 1838 OUTPUT:
1703 RETVAL 1839 RETVAL
1704 1840
1705int set_flags (DB *db, U32 flags); 1841int set_flags (DB *db, U32 flags)
1706 CODE: 1842 CODE:
1707 RETVAL = db->set_flags (db, flags); 1843 RETVAL = db->set_flags (db, flags);
1708 OUTPUT: 1844 OUTPUT:
1709 RETVAL 1845 RETVAL
1710 1846
… …
1724 CODE: 1860 CODE:
1725 RETVAL = db->set_bt_minkey (db, minkey); 1861 RETVAL = db->set_bt_minkey (db, minkey);
1726 OUTPUT: 1862 OUTPUT:
1727 RETVAL 1863 RETVAL
1728 1864
1729int set_re_delim(DB *db, int delim); 1865int set_re_delim (DB *db, int delim)
1730 CODE: 1866 CODE:
1731 RETVAL = db->set_re_delim (db, delim); 1867 RETVAL = db->set_re_delim (db, delim);
1732 OUTPUT: 1868 OUTPUT:
1733 RETVAL 1869 RETVAL
1734 1870
… …
1795DESTROY (DB_TXN_ornull *txn) 1931DESTROY (DB_TXN_ornull *txn)
1796 CODE: 1932 CODE:
1797 if (txn) 1933 if (txn)
1798 txn->abort (txn); 1934 txn->abort (txn);
1799 1935
1800int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1936int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1801 CODE: 1937 CODE:
1802 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);
1803 OUTPUT: 1945 OUTPUT:
1804 RETVAL 1946 RETVAL
1805 1947
1806 1948
1807MODULE = BDB PACKAGE = BDB::Cursor 1949MODULE = BDB PACKAGE = BDB::Cursor

Diff Legend

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