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

Comparing BDB/BDB.xs (file contents):
Revision 1.11 by root, Wed May 9 06:42:24 2007 UTC vs.
Revision 1.16 by root, Mon Aug 13 12:01:45 2007 UTC

… …
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8 8
9// perl stupidly defines these as macros, breaking
10// lots and lots of code.
11#undef open
12#undef close
13#undef abort
14#undef malloc
15#undef free
16#undef send
17
9#include <stddef.h> 18#include <stddef.h>
10#include <stdlib.h> 19#include <stdlib.h>
11#include <errno.h> 20#include <errno.h>
12#include <sys/time.h>
13#include <sys/types.h> 21#include <sys/types.h>
14#include <limits.h> 22#include <limits.h>
15#include <unistd.h>
16#include <fcntl.h> 23#include <fcntl.h>
17 24
25#ifndef _WIN32
26# include <sys/time.h>
27# include <unistd.h>
28#endif
29
18#include <db.h> 30#include <db.h>
19 31
20#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5) 32#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4)
21# error you need Berkeley DB 4.5 or newer installed 33# error you need Berkeley DB 4.4 or newer installed
22#endif 34#endif
23 35
24/* number of seconds after which idle threads exit */ 36/* number of seconds after which idle threads exit */
25#define IDLE_TIMEOUT 10 37#define IDLE_TIMEOUT 10
26 38
… …
33typedef SV SV8; /* byte-sv, used for argument-checking */ 45typedef SV SV8; /* byte-sv, used for argument-checking */
34typedef char *octetstring; 46typedef char *octetstring;
35 47
36static SV *prepare_cb; 48static SV *prepare_cb;
37 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
38static inline char * 72static char *
39strdup_ornull (const char *s) 73strdup_ornull (const char *s)
40{ 74{
41 return s ? strdup (s) : 0; 75 return s ? strdup (s) : 0;
42} 76}
43 77
44static inline void 78static void
45sv_to_dbt (DBT *dbt, SV *sv) 79sv_to_dbt (DBT *dbt, SV *sv)
46{ 80{
47 STRLEN len; 81 STRLEN len;
48 char *data = SvPVbyte (sv, len); 82 char *data = SvPVbyte (sv, len);
49 83
… …
51 memcpy (dbt->data, data, len); 85 memcpy (dbt->data, data, len);
52 dbt->size = len; 86 dbt->size = len;
53 dbt->flags = DB_DBT_REALLOC; 87 dbt->flags = DB_DBT_REALLOC;
54} 88}
55 89
56static inline void 90static void
57dbt_to_sv (SV *sv, DBT *dbt) 91dbt_to_sv (SV *sv, DBT *dbt)
58{ 92{
59 if (sv) 93 if (sv)
60 { 94 {
61 SvREADONLY_off (sv); 95 SvREADONLY_off (sv);
… …
126static int next_pri = DEFAULT_PRI + PRI_BIAS; 160static int next_pri = DEFAULT_PRI + PRI_BIAS;
127 161
128static unsigned int started, idle, wanted; 162static unsigned int started, idle, wanted;
129 163
130/* worker threads management */ 164/* worker threads management */
131static mutex_t wrklock = MUTEX_INIT; 165static mutex_t wrklock = X_MUTEX_INIT;
132 166
133typedef struct worker { 167typedef struct worker {
134 /* locked by wrklock */ 168 /* locked by wrklock */
135 struct worker *prev, *next; 169 struct worker *prev, *next;
136 170
… …
157} 191}
158 192
159static volatile unsigned int nreqs, nready, npending; 193static volatile unsigned int nreqs, nready, npending;
160static volatile unsigned int max_idle = 4; 194static volatile unsigned int max_idle = 4;
161static volatile unsigned int max_outstanding = 0xffffffff; 195static volatile unsigned int max_outstanding = 0xffffffff;
162static int respipe [2]; 196static int respipe [2], respipe_osf [2];
163 197
164static mutex_t reslock = MUTEX_INIT; 198static mutex_t reslock = X_MUTEX_INIT;
165static mutex_t reqlock = MUTEX_INIT; 199static mutex_t reqlock = X_MUTEX_INIT;
166static cond_t reqwait = COND_INIT; 200static cond_t reqwait = X_COND_INIT;
167 201
168#if WORDACCESS_UNSAFE 202#if WORDACCESS_UNSAFE
169 203
170static unsigned int get_nready () 204static unsigned int get_nready ()
171{ 205{
172 unsigned int retval; 206 unsigned int retval;
173 207
174 LOCK (reqlock); 208 X_LOCK (reqlock);
175 retval = nready; 209 retval = nready;
176 UNLOCK (reqlock); 210 X_UNLOCK (reqlock);
177 211
178 return retval; 212 return retval;
179} 213}
180 214
181static unsigned int get_npending () 215static unsigned int get_npending ()
182{ 216{
183 unsigned int retval; 217 unsigned int retval;
184 218
185 LOCK (reslock); 219 X_LOCK (reslock);
186 retval = npending; 220 retval = npending;
187 UNLOCK (reslock); 221 X_UNLOCK (reslock);
188 222
189 return retval; 223 return retval;
190} 224}
191 225
192static unsigned int get_nthreads () 226static unsigned int get_nthreads ()
193{ 227{
194 unsigned int retval; 228 unsigned int retval;
195 229
196 LOCK (wrklock); 230 X_LOCK (wrklock);
197 retval = started; 231 retval = started;
198 UNLOCK (wrklock); 232 X_UNLOCK (wrklock);
199 233
200 return retval; 234 return retval;
201} 235}
202 236
203#else 237#else
… …
338 free (req->buf1); 372 free (req->buf1);
339 free (req->buf2); 373 free (req->buf2);
340 Safefree (req); 374 Safefree (req);
341} 375}
342 376
343static 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_pipe (int fd[2])
385{
386#ifdef _WIN32
387 int arg = 1;
388 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd)
389 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg)
390 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg))
391#else
392 if (pipe (fd)
393 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
394 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
395#endif
396 croak ("unable to initialize result pipe");
397
398 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]);
400}
401
402X_THREAD_PROC (bdb_proc);
344 403
345static void start_thread (void) 404static void start_thread (void)
346{ 405{
347 worker *wrk = calloc (1, sizeof (worker)); 406 worker *wrk = calloc (1, sizeof (worker));
348 407
349 if (!wrk) 408 if (!wrk)
350 croak ("unable to allocate worker thread data"); 409 croak ("unable to allocate worker thread data");
351 410
352 LOCK (wrklock); 411 X_LOCK (wrklock);
353 if (thread_create (&wrk->tid, aio_proc, (void *)wrk)) 412 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
354 { 413 {
355 wrk->prev = &wrk_first; 414 wrk->prev = &wrk_first;
356 wrk->next = wrk_first.next; 415 wrk->next = wrk_first.next;
357 wrk_first.next->prev = wrk; 416 wrk_first.next->prev = wrk;
358 wrk_first.next = wrk; 417 wrk_first.next = wrk;
359 ++started; 418 ++started;
360 } 419 }
361 else 420 else
362 free (wrk); 421 free (wrk);
363 422
364 UNLOCK (wrklock); 423 X_UNLOCK (wrklock);
365} 424}
366 425
367static void maybe_start_thread () 426static void maybe_start_thread ()
368{ 427{
369 if (get_nthreads () >= wanted) 428 if (get_nthreads () >= wanted)
… …
381 SV *wait_callback = 0; 440 SV *wait_callback = 0;
382 441
383 // synthesize callback if none given 442 // synthesize callback if none given
384 if (!SvOK (req->callback)) 443 if (!SvOK (req->callback))
385 { 444 {
445 int count;
446
386 dSP; 447 dSP;
387 PUSHMARK (SP); 448 PUSHMARK (SP);
388 PUTBACK; 449 PUTBACK;
389 int count = call_sv (prepare_cb, G_ARRAY); 450 count = call_sv (prepare_cb, G_ARRAY);
390 SPAGAIN; 451 SPAGAIN;
391 452
392 if (count != 2) 453 if (count != 2)
393 croak ("prepare callback must return exactly two values\n"); 454 croak ("prepare callback must return exactly two values\n");
394 455
… …
397 req->callback = SvREFCNT_inc (POPs); 458 req->callback = SvREFCNT_inc (POPs);
398 } 459 }
399 460
400 ++nreqs; 461 ++nreqs;
401 462
402 LOCK (reqlock); 463 X_LOCK (reqlock);
403 ++nready; 464 ++nready;
404 reqq_push (&req_queue, req); 465 reqq_push (&req_queue, req);
405 COND_SIGNAL (reqwait); 466 X_COND_SIGNAL (reqwait);
406 UNLOCK (reqlock); 467 X_UNLOCK (reqlock);
407 468
408 maybe_start_thread (); 469 maybe_start_thread ();
409 470
410 if (wait_callback) 471 if (wait_callback)
411 { 472 {
… …
424 Newz (0, req, 1, aio_cb); 485 Newz (0, req, 1, aio_cb);
425 486
426 req->type = REQ_QUIT; 487 req->type = REQ_QUIT;
427 req->pri = PRI_MAX + PRI_BIAS; 488 req->pri = PRI_MAX + PRI_BIAS;
428 489
429 LOCK (reqlock); 490 X_LOCK (reqlock);
430 reqq_push (&req_queue, req); 491 reqq_push (&req_queue, req);
431 COND_SIGNAL (reqwait); 492 X_COND_SIGNAL (reqwait);
432 UNLOCK (reqlock); 493 X_UNLOCK (reqlock);
433 494
434 LOCK (wrklock); 495 X_LOCK (wrklock);
435 --started; 496 --started;
436 UNLOCK (wrklock); 497 X_UNLOCK (wrklock);
437} 498}
438 499
439static void set_max_idle (int nthreads) 500static void set_max_idle (int nthreads)
440{ 501{
441 if (WORDACCESS_UNSAFE) LOCK (reqlock); 502 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
442 max_idle = nthreads <= 0 ? 1 : nthreads; 503 max_idle = nthreads <= 0 ? 1 : nthreads;
443 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 504 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
444} 505}
445 506
446static void min_parallel (int nthreads) 507static void min_parallel (int nthreads)
447{ 508{
448 if (wanted < nthreads) 509 if (wanted < nthreads)
… …
463 fd_set rfd; 524 fd_set rfd;
464 525
465 while (nreqs) 526 while (nreqs)
466 { 527 {
467 int size; 528 int size;
468 if (WORDACCESS_UNSAFE) LOCK (reslock); 529 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
469 size = res_queue.size; 530 size = res_queue.size;
470 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 531 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
471 532
472 if (size) 533 if (size)
473 return; 534 return;
474 535
475 maybe_start_thread (); 536 maybe_start_thread ();
476 537
477 FD_ZERO(&rfd); 538 FD_ZERO (&rfd);
478 FD_SET(respipe [0], &rfd); 539 FD_SET (respipe [0], &rfd);
479 540
480 select (respipe [0] + 1, &rfd, 0, 0, 0); 541 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
481 } 542 }
482} 543}
483 544
484static int poll_cb () 545static int poll_cb ()
485{ 546{
… …
497 { 558 {
498 for (;;) 559 for (;;)
499 { 560 {
500 maybe_start_thread (); 561 maybe_start_thread ();
501 562
502 LOCK (reslock); 563 X_LOCK (reslock);
503 req = reqq_shift (&res_queue); 564 req = reqq_shift (&res_queue);
504 565
505 if (req) 566 if (req)
506 { 567 {
507 --npending; 568 --npending;
508 569
509 if (!res_queue.size) 570 if (!res_queue.size)
510 { 571 {
511 /* read any signals sent by the worker threads */ 572 /* read any signals sent by the worker threads */
512 char buf [4]; 573 char buf [4];
513 while (read (respipe [0], buf, 4) == 4) 574 while (respipe_read (respipe [0], buf, 4) == 4)
514 ; 575 ;
515 } 576 }
516 } 577 }
517 578
518 UNLOCK (reslock); 579 X_UNLOCK (reslock);
519 580
520 if (!req) 581 if (!req)
521 break; 582 break;
522 583
523 --nreqs; 584 --nreqs;
… …
553 } 614 }
554 615
555 return count; 616 return count;
556} 617}
557 618
558static void create_pipe ()
559{
560 if (pipe (respipe))
561 croak ("unable to initialize result pipe");
562
563 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
564 croak ("cannot set result pipe to nonblocking mode");
565
566 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
567 croak ("cannot set result pipe to nonblocking mode");
568}
569
570/*****************************************************************************/ 619/*****************************************************************************/
571 620
572static void *aio_proc (void *thr_arg) 621X_THREAD_PROC (bdb_proc)
573{ 622{
574 aio_req req; 623 aio_req req;
575 struct timespec ts; 624 struct timespec ts;
576 worker *self = (worker *)thr_arg; 625 worker *self = (worker *)thr_arg;
577 626
578 /* try to distribute timeouts somewhat evenly */ 627 /* try to distribute timeouts somewhat evenly */
579 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 628 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
580 * (1000000000UL / 1024UL);
581 629
582 for (;;) 630 for (;;)
583 { 631 {
584 ts.tv_sec = time (0) + IDLE_TIMEOUT; 632 ts.tv_sec = time (0) + IDLE_TIMEOUT;
585 633
586 LOCK (reqlock); 634 X_LOCK (reqlock);
587 635
588 for (;;) 636 for (;;)
589 { 637 {
590 self->req = req = reqq_shift (&req_queue); 638 self->req = req = reqq_shift (&req_queue);
591 639
592 if (req) 640 if (req)
593 break; 641 break;
594 642
595 ++idle; 643 ++idle;
596 644
597 if (COND_TIMEDWAIT (reqwait, reqlock, ts) 645 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
598 == ETIMEDOUT) 646 == ETIMEDOUT)
599 { 647 {
600 if (idle > max_idle) 648 if (idle > max_idle)
601 { 649 {
602 --idle; 650 --idle;
603 UNLOCK (reqlock); 651 X_UNLOCK (reqlock);
604 LOCK (wrklock); 652 X_LOCK (wrklock);
605 --started; 653 --started;
606 UNLOCK (wrklock); 654 X_UNLOCK (wrklock);
607 goto quit; 655 goto quit;
608 } 656 }
609 657
610 /* we are allowed to idle, so do so without any timeout */ 658 /* we are allowed to idle, so do so without any timeout */
611 COND_WAIT (reqwait, reqlock); 659 X_COND_WAIT (reqwait, reqlock);
612 ts.tv_sec = time (0) + IDLE_TIMEOUT; 660 ts.tv_sec = time (0) + IDLE_TIMEOUT;
613 } 661 }
614 662
615 --idle; 663 --idle;
616 } 664 }
617 665
618 --nready; 666 --nready;
619 667
620 UNLOCK (reqlock); 668 X_UNLOCK (reqlock);
621 669
622 switch (req->type) 670 switch (req->type)
623 { 671 {
624 case REQ_QUIT: 672 case REQ_QUIT:
625 goto quit; 673 goto quit;
… …
739 default: 787 default:
740 req->result = ENOSYS; 788 req->result = ENOSYS;
741 break; 789 break;
742 } 790 }
743 791
744 LOCK (reslock); 792 X_LOCK (reslock);
745 793
746 ++npending; 794 ++npending;
747 795
748 if (!reqq_push (&res_queue, req)) 796 if (!reqq_push (&res_queue, req))
749 /* write a dummy byte to the pipe so fh becomes ready */ 797 /* write a dummy byte to the pipe so fh becomes ready */
750 write (respipe [1], &respipe, 1); 798 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
751 799
752 self->req = 0; 800 self->req = 0;
753 worker_clear (self); 801 worker_clear (self);
754 802
755 UNLOCK (reslock); 803 X_UNLOCK (reslock);
756 } 804 }
757 805
758quit: 806quit:
759 LOCK (wrklock); 807 X_LOCK (wrklock);
760 worker_free (self); 808 worker_free (self);
761 UNLOCK (wrklock); 809 X_UNLOCK (wrklock);
762 810
763 return 0; 811 return 0;
764} 812}
765 813
766/*****************************************************************************/ 814/*****************************************************************************/
767 815
768static void atfork_prepare (void) 816static void atfork_prepare (void)
769{ 817{
770 LOCK (wrklock); 818 X_LOCK (wrklock);
771 LOCK (reqlock); 819 X_LOCK (reqlock);
772 LOCK (reslock); 820 X_LOCK (reslock);
773} 821}
774 822
775static void atfork_parent (void) 823static void atfork_parent (void)
776{ 824{
777 UNLOCK (reslock); 825 X_UNLOCK (reslock);
778 UNLOCK (reqlock); 826 X_UNLOCK (reqlock);
779 UNLOCK (wrklock); 827 X_UNLOCK (wrklock);
780} 828}
781 829
782static void atfork_child (void) 830static void atfork_child (void)
783{ 831{
784 aio_req prv; 832 aio_req prv;
… …
804 idle = 0; 852 idle = 0;
805 nreqs = 0; 853 nreqs = 0;
806 nready = 0; 854 nready = 0;
807 npending = 0; 855 npending = 0;
808 856
809 close (respipe [0]); 857 respipe_close (respipe [0]);
810 close (respipe [1]); 858 respipe_close (respipe [1]);
859
811 create_pipe (); 860 create_pipe (respipe);
812 861
813 atfork_parent (); 862 atfork_parent ();
814} 863}
815 864
816#define dREQ(reqtype) \ 865#define dREQ(reqtype) \
… …
895 const_iv (DSYNC_DB) 944 const_iv (DSYNC_DB)
896 const_iv (DSYNC_LOG) 945 const_iv (DSYNC_LOG)
897 const_iv (LOG_AUTOREMOVE) 946 const_iv (LOG_AUTOREMOVE)
898 const_iv (LOG_INMEMORY) 947 const_iv (LOG_INMEMORY)
899 const_iv (NOLOCKING) 948 const_iv (NOLOCKING)
900 const_iv (MULTIVERSION)
901 const_iv (NOMMAP) 949 const_iv (NOMMAP)
902 const_iv (NOPANIC) 950 const_iv (NOPANIC)
903 const_iv (OVERWRITE) 951 const_iv (OVERWRITE)
904 const_iv (PANIC_ENVIRONMENT) 952 const_iv (PANIC_ENVIRONMENT)
905 const_iv (REGION_INIT) 953 const_iv (REGION_INIT)
906 const_iv (TIME_NOTGRANTED) 954 const_iv (TIME_NOTGRANTED)
907 const_iv (TXN_NOSYNC) 955 const_iv (TXN_NOSYNC)
908 const_iv (TXN_SNAPSHOT)
909 const_iv (TXN_WRITE_NOSYNC) 956 const_iv (TXN_WRITE_NOSYNC)
910 const_iv (WRITECURSOR) 957 const_iv (WRITECURSOR)
911 const_iv (YIELDCPU) 958 const_iv (YIELDCPU)
912 const_iv (ENCRYPT_AES) 959 const_iv (ENCRYPT_AES)
913 const_iv (XA_CREATE) 960 const_iv (XA_CREATE)
… …
956 const_iv (APPEND) 1003 const_iv (APPEND)
957 const_iv (NODUPDATA) 1004 const_iv (NODUPDATA)
958 const_iv (NOOVERWRITE) 1005 const_iv (NOOVERWRITE)
959 1006
960 const_iv (TXN_NOWAIT) 1007 const_iv (TXN_NOWAIT)
961 const_iv (TXN_SNAPSHOT)
962 const_iv (TXN_SYNC) 1008 const_iv (TXN_SYNC)
963 1009
964 const_iv (SET_LOCK_TIMEOUT) 1010 const_iv (SET_LOCK_TIMEOUT)
965 const_iv (SET_TXN_TIMEOUT) 1011 const_iv (SET_TXN_TIMEOUT)
966 1012
… …
994 const_iv (LOCK_YOUNGEST) 1040 const_iv (LOCK_YOUNGEST)
995 1041
996 const_iv (SEQ_DEC) 1042 const_iv (SEQ_DEC)
997 const_iv (SEQ_INC) 1043 const_iv (SEQ_INC)
998 const_iv (SEQ_WRAP) 1044 const_iv (SEQ_WRAP)
1045
1046 const_iv (BUFFER_SMALL)
1047 const_iv (DONOTINDEX)
1048 const_iv (KEYEMPTY )
1049 const_iv (KEYEXIST )
1050 const_iv (LOCK_DEADLOCK)
1051 const_iv (LOCK_NOTGRANTED)
1052 const_iv (LOG_BUFFER_FULL)
1053 const_iv (NOSERVER)
1054 const_iv (NOSERVER_HOME)
1055 const_iv (NOSERVER_ID)
1056 const_iv (NOTFOUND)
1057 const_iv (OLD_VERSION)
1058 const_iv (PAGE_NOTFOUND)
1059 const_iv (REP_DUPMASTER)
1060 const_iv (REP_HANDLE_DEAD)
1061 const_iv (REP_HOLDELECTION)
1062 const_iv (REP_IGNORE)
1063 const_iv (REP_ISPERM)
1064 const_iv (REP_JOIN_FAILURE)
1065 const_iv (REP_LOCKOUT)
1066 const_iv (REP_NEWMASTER)
1067 const_iv (REP_NEWSITE)
1068 const_iv (REP_NOTPERM)
1069 const_iv (REP_UNAVAIL)
1070 const_iv (RUNRECOVERY)
1071 const_iv (SECONDARY_BAD)
1072 const_iv (VERIFY_BAD)
1073 const_iv (VERSION_MISMATCH)
1074
1075 const_iv (VERB_DEADLOCK)
1076 const_iv (VERB_RECOVERY)
1077 const_iv (VERB_REGISTER)
1078 const_iv (VERB_REPLICATION)
1079 const_iv (VERB_WAITSFOR)
1080
1081 const_iv (VERSION_MAJOR)
1082 const_iv (VERSION_MINOR)
1083 const_iv (VERSION_PATCH)
1084#if DB_VERSION_MINOR >= 5
1085 const_iv (MULTIVERSION)
1086 const_iv (TXN_SNAPSHOT)
1087#endif
1088#if DB_VERSION_MINOR >= 6
1089 const_iv (PREV_DUP)
1090# if 0
1091 const_iv (PRIORITY_UNCHANGED)
1092 const_iv (PRIORITY_VERY_LOW)
1093 const_iv (PRIORITY_LOW)
1094 const_iv (PRIORITY_DEFAULT)
1095 const_iv (PRIORITY_HIGH)
1096 const_iv (PRIORITY_VERY_HIGH)
1097# endif
1098#endif
999 }; 1099 };
1000 1100
1001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1101 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1102 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1003 1103
1004 create_pipe (); 1104 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1105 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1106
1107 create_pipe (respipe);
1108
1005 ATFORK (atfork_prepare, atfork_parent, atfork_child); 1109 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1110#ifdef _WIN32
1111 X_MUTEX_CHECK (wrklock);
1112 X_MUTEX_CHECK (reslock);
1113 X_MUTEX_CHECK (reqlock);
1114
1115 X_COND_CHECK (reqwait);
1116#endif
1006} 1117}
1007 1118
1008void 1119void
1009max_poll_reqs (int nreqs) 1120max_poll_reqs (int nreqs)
1010 PROTOTYPE: $ 1121 PROTOTYPE: $
… …
1129 1240
1130int 1241int
1131nthreads () 1242nthreads ()
1132 PROTOTYPE: 1243 PROTOTYPE:
1133 CODE: 1244 CODE:
1134 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1245 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1135 RETVAL = started; 1246 RETVAL = started;
1136 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1247 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1137 OUTPUT: 1248 OUTPUT:
1138 RETVAL 1249 RETVAL
1139 1250
1140void 1251void
1141set_sync_prepare (SV *cb) 1252set_sync_prepare (SV *cb)
1142 PROTOTYPE: & 1253 PROTOTYPE: &
1143 CODE: 1254 CODE:
1144 SvREFCNT_dec (prepare_cb); 1255 SvREFCNT_dec (prepare_cb);
1145 prepare_cb = newSVsv (cb); 1256 prepare_cb = newSVsv (cb);
1146 1257
1258char *
1259strerror (int errorno = errno)
1260 PROTOTYPE: ;$
1261 CODE:
1262 RETVAL = db_strerror (errorno);
1263 OUTPUT:
1264 RETVAL
1147 1265
1148DB_ENV * 1266DB_ENV *
1149db_env_create (U32 env_flags = 0) 1267db_env_create (U32 env_flags = 0)
1150 CODE: 1268 CODE:
1151{ 1269{
1152 errno = db_env_create (&RETVAL, env_flags); 1270 errno = db_env_create (&RETVAL, env_flags);
1153 if (errno) 1271 if (errno)
1154 croak ("db_env_create: %s", db_strerror (errno)); 1272 croak ("db_env_create: %s", db_strerror (errno));
1273
1274 if (0)
1275 {
1276 RETVAL->set_errcall (RETVAL, debug_errcall);
1277 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1278 }
1155} 1279}
1156 OUTPUT: 1280 OUTPUT:
1157 RETVAL 1281 RETVAL
1158 1282
1159void 1283void
1160db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1284db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1161 CODE: 1285 CODE:
1162{ 1286{
1163 env->set_thread_count (env, get_nthreads ());
1164
1165 dREQ (REQ_ENV_OPEN); 1287 dREQ (REQ_ENV_OPEN);
1288
1289 env->set_thread_count (env, wanted + 2);
1290
1166 req->env = env; 1291 req->env = env;
1167 req->uint1 = open_flags | DB_THREAD; 1292 req->uint1 = open_flags | DB_THREAD;
1168 req->int1 = mode; 1293 req->int1 = mode;
1169 req->buf1 = strdup_ornull (db_home); 1294 req->buf1 = strdup_ornull (db_home);
1170 REQ_SEND; 1295 REQ_SEND;
… …
1562 CODE: 1687 CODE:
1563 RETVAL = env->set_flags (env, flags, onoff); 1688 RETVAL = env->set_flags (env, flags, onoff);
1564 OUTPUT: 1689 OUTPUT:
1565 RETVAL 1690 RETVAL
1566 1691
1692void set_errfile (DB_ENV *env, FILE *errfile = 0)
1693 CODE:
1694 env->set_errfile (env, errfile);
1695
1696void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1697 CODE:
1698 env->set_msgfile (env, msgfile);
1699
1700int set_verbose (DB_ENV *env, U32 which, int onoff = 1)
1701 CODE:
1702 RETVAL = env->set_verbose (env, which, onoff);
1703 OUTPUT:
1704 RETVAL
1705
1567int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1706int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1568 CODE: 1707 CODE:
1569 RETVAL = env->set_encrypt (env, password, flags); 1708 RETVAL = env->set_encrypt (env, password, flags);
1570 OUTPUT: 1709 OUTPUT:
1571 RETVAL 1710 RETVAL
… …
1655 CODE: 1794 CODE:
1656 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1795 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1657 OUTPUT: 1796 OUTPUT:
1658 RETVAL 1797 RETVAL
1659 1798
1660int set_flags (DB *db, U32 flags); 1799int set_flags (DB *db, U32 flags)
1661 CODE: 1800 CODE:
1662 RETVAL = db->set_flags (db, flags); 1801 RETVAL = db->set_flags (db, flags);
1663 OUTPUT: 1802 OUTPUT:
1664 RETVAL 1803 RETVAL
1665 1804
… …
1679 CODE: 1818 CODE:
1680 RETVAL = db->set_bt_minkey (db, minkey); 1819 RETVAL = db->set_bt_minkey (db, minkey);
1681 OUTPUT: 1820 OUTPUT:
1682 RETVAL 1821 RETVAL
1683 1822
1684int set_re_delim(DB *db, int delim); 1823int set_re_delim (DB *db, int delim)
1685 CODE: 1824 CODE:
1686 RETVAL = db->set_re_delim (db, delim); 1825 RETVAL = db->set_re_delim (db, delim);
1687 OUTPUT: 1826 OUTPUT:
1688 RETVAL 1827 RETVAL
1689 1828

Diff Legend

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