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.15 by root, Mon Aug 13 11:16:22 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
50static void
51debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
52{
53 printf ("err[%s]\n", msg);
54}
55
56static void
57debug_msgcall (const DB_ENV *dbenv, const char *msg)
58{
59 printf ("msg[%s]\n", msg);
60}
61
38static inline char * 62static char *
39strdup_ornull (const char *s) 63strdup_ornull (const char *s)
40{ 64{
41 return s ? strdup (s) : 0; 65 return s ? strdup (s) : 0;
42} 66}
43 67
44static inline void 68static void
45sv_to_dbt (DBT *dbt, SV *sv) 69sv_to_dbt (DBT *dbt, SV *sv)
46{ 70{
47 STRLEN len; 71 STRLEN len;
48 char *data = SvPVbyte (sv, len); 72 char *data = SvPVbyte (sv, len);
49 73
… …
51 memcpy (dbt->data, data, len); 75 memcpy (dbt->data, data, len);
52 dbt->size = len; 76 dbt->size = len;
53 dbt->flags = DB_DBT_REALLOC; 77 dbt->flags = DB_DBT_REALLOC;
54} 78}
55 79
56static inline void 80static void
57dbt_to_sv (SV *sv, DBT *dbt) 81dbt_to_sv (SV *sv, DBT *dbt)
58{ 82{
59 if (sv) 83 if (sv)
60 { 84 {
61 SvREADONLY_off (sv); 85 SvREADONLY_off (sv);
… …
126static int next_pri = DEFAULT_PRI + PRI_BIAS; 150static int next_pri = DEFAULT_PRI + PRI_BIAS;
127 151
128static unsigned int started, idle, wanted; 152static unsigned int started, idle, wanted;
129 153
130/* worker threads management */ 154/* worker threads management */
131static mutex_t wrklock = MUTEX_INIT; 155static mutex_t wrklock = X_MUTEX_INIT;
132 156
133typedef struct worker { 157typedef struct worker {
134 /* locked by wrklock */ 158 /* locked by wrklock */
135 struct worker *prev, *next; 159 struct worker *prev, *next;
136 160
… …
157} 181}
158 182
159static volatile unsigned int nreqs, nready, npending; 183static volatile unsigned int nreqs, nready, npending;
160static volatile unsigned int max_idle = 4; 184static volatile unsigned int max_idle = 4;
161static volatile unsigned int max_outstanding = 0xffffffff; 185static volatile unsigned int max_outstanding = 0xffffffff;
162static int respipe [2]; 186static int respipe [2], respipe_osf [2];
163 187
164static mutex_t reslock = MUTEX_INIT; 188static mutex_t reslock = X_MUTEX_INIT;
165static mutex_t reqlock = MUTEX_INIT; 189static mutex_t reqlock = X_MUTEX_INIT;
166static cond_t reqwait = COND_INIT; 190static cond_t reqwait = X_COND_INIT;
167 191
168#if WORDACCESS_UNSAFE 192#if WORDACCESS_UNSAFE
169 193
170static unsigned int get_nready () 194static unsigned int get_nready ()
171{ 195{
172 unsigned int retval; 196 unsigned int retval;
173 197
174 LOCK (reqlock); 198 X_LOCK (reqlock);
175 retval = nready; 199 retval = nready;
176 UNLOCK (reqlock); 200 X_UNLOCK (reqlock);
177 201
178 return retval; 202 return retval;
179} 203}
180 204
181static unsigned int get_npending () 205static unsigned int get_npending ()
182{ 206{
183 unsigned int retval; 207 unsigned int retval;
184 208
185 LOCK (reslock); 209 X_LOCK (reslock);
186 retval = npending; 210 retval = npending;
187 UNLOCK (reslock); 211 X_UNLOCK (reslock);
188 212
189 return retval; 213 return retval;
190} 214}
191 215
192static unsigned int get_nthreads () 216static unsigned int get_nthreads ()
193{ 217{
194 unsigned int retval; 218 unsigned int retval;
195 219
196 LOCK (wrklock); 220 X_LOCK (wrklock);
197 retval = started; 221 retval = started;
198 UNLOCK (wrklock); 222 X_UNLOCK (wrklock);
199 223
200 return retval; 224 return retval;
201} 225}
202 226
203#else 227#else
… …
338 free (req->buf1); 362 free (req->buf1);
339 free (req->buf2); 363 free (req->buf2);
340 Safefree (req); 364 Safefree (req);
341} 365}
342 366
343static void *aio_proc (void *arg); 367#ifdef USE_SOCKETS_AS_HANDLES
368# define TO_SOCKET(x) (win32_get_osfhandle (x))
369#else
370# define TO_SOCKET(x) (x)
371#endif
372
373static void
374create_pipe (int fd[2])
375{
376#ifdef _WIN32
377 int arg = 1;
378 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd)
379 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg)
380 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg))
381#else
382 if (pipe (fd)
383 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
384 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
385#endif
386 croak ("unable to initialize result pipe");
387
388 respipe_osf [0] = TO_SOCKET (respipe [0]);
389 respipe_osf [1] = TO_SOCKET (respipe [1]);
390}
391
392X_THREAD_PROC (bdb_proc);
344 393
345static void start_thread (void) 394static void start_thread (void)
346{ 395{
347 worker *wrk = calloc (1, sizeof (worker)); 396 worker *wrk = calloc (1, sizeof (worker));
348 397
349 if (!wrk) 398 if (!wrk)
350 croak ("unable to allocate worker thread data"); 399 croak ("unable to allocate worker thread data");
351 400
352 LOCK (wrklock); 401 X_LOCK (wrklock);
353 if (thread_create (&wrk->tid, aio_proc, (void *)wrk)) 402 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
354 { 403 {
355 wrk->prev = &wrk_first; 404 wrk->prev = &wrk_first;
356 wrk->next = wrk_first.next; 405 wrk->next = wrk_first.next;
357 wrk_first.next->prev = wrk; 406 wrk_first.next->prev = wrk;
358 wrk_first.next = wrk; 407 wrk_first.next = wrk;
359 ++started; 408 ++started;
360 } 409 }
361 else 410 else
362 free (wrk); 411 free (wrk);
363 412
364 UNLOCK (wrklock); 413 X_UNLOCK (wrklock);
365} 414}
366 415
367static void maybe_start_thread () 416static void maybe_start_thread ()
368{ 417{
369 if (get_nthreads () >= wanted) 418 if (get_nthreads () >= wanted)
… …
381 SV *wait_callback = 0; 430 SV *wait_callback = 0;
382 431
383 // synthesize callback if none given 432 // synthesize callback if none given
384 if (!SvOK (req->callback)) 433 if (!SvOK (req->callback))
385 { 434 {
435 int count;
436
386 dSP; 437 dSP;
387 PUSHMARK (SP); 438 PUSHMARK (SP);
388 PUTBACK; 439 PUTBACK;
389 int count = call_sv (prepare_cb, G_ARRAY); 440 count = call_sv (prepare_cb, G_ARRAY);
390 SPAGAIN; 441 SPAGAIN;
391 442
392 if (count != 2) 443 if (count != 2)
393 croak ("prepare callback must return exactly two values\n"); 444 croak ("prepare callback must return exactly two values\n");
394 445
… …
397 req->callback = SvREFCNT_inc (POPs); 448 req->callback = SvREFCNT_inc (POPs);
398 } 449 }
399 450
400 ++nreqs; 451 ++nreqs;
401 452
402 LOCK (reqlock); 453 X_LOCK (reqlock);
403 ++nready; 454 ++nready;
404 reqq_push (&req_queue, req); 455 reqq_push (&req_queue, req);
405 COND_SIGNAL (reqwait); 456 X_COND_SIGNAL (reqwait);
406 UNLOCK (reqlock); 457 X_UNLOCK (reqlock);
407 458
408 maybe_start_thread (); 459 maybe_start_thread ();
409 460
410 if (wait_callback) 461 if (wait_callback)
411 { 462 {
… …
424 Newz (0, req, 1, aio_cb); 475 Newz (0, req, 1, aio_cb);
425 476
426 req->type = REQ_QUIT; 477 req->type = REQ_QUIT;
427 req->pri = PRI_MAX + PRI_BIAS; 478 req->pri = PRI_MAX + PRI_BIAS;
428 479
429 LOCK (reqlock); 480 X_LOCK (reqlock);
430 reqq_push (&req_queue, req); 481 reqq_push (&req_queue, req);
431 COND_SIGNAL (reqwait); 482 X_COND_SIGNAL (reqwait);
432 UNLOCK (reqlock); 483 X_UNLOCK (reqlock);
433 484
434 LOCK (wrklock); 485 X_LOCK (wrklock);
435 --started; 486 --started;
436 UNLOCK (wrklock); 487 X_UNLOCK (wrklock);
437} 488}
438 489
439static void set_max_idle (int nthreads) 490static void set_max_idle (int nthreads)
440{ 491{
441 if (WORDACCESS_UNSAFE) LOCK (reqlock); 492 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
442 max_idle = nthreads <= 0 ? 1 : nthreads; 493 max_idle = nthreads <= 0 ? 1 : nthreads;
443 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 494 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
444} 495}
445 496
446static void min_parallel (int nthreads) 497static void min_parallel (int nthreads)
447{ 498{
448 if (wanted < nthreads) 499 if (wanted < nthreads)
… …
463 fd_set rfd; 514 fd_set rfd;
464 515
465 while (nreqs) 516 while (nreqs)
466 { 517 {
467 int size; 518 int size;
468 if (WORDACCESS_UNSAFE) LOCK (reslock); 519 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
469 size = res_queue.size; 520 size = res_queue.size;
470 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 521 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
471 522
472 if (size) 523 if (size)
473 return; 524 return;
474 525
475 maybe_start_thread (); 526 maybe_start_thread ();
476 527
477 FD_ZERO(&rfd); 528 FD_ZERO (&rfd);
478 FD_SET(respipe [0], &rfd); 529 FD_SET (respipe [0], &rfd);
479 530
480 select (respipe [0] + 1, &rfd, 0, 0, 0); 531 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
481 } 532 }
482} 533}
483 534
484static int poll_cb () 535static int poll_cb ()
485{ 536{
… …
497 { 548 {
498 for (;;) 549 for (;;)
499 { 550 {
500 maybe_start_thread (); 551 maybe_start_thread ();
501 552
502 LOCK (reslock); 553 X_LOCK (reslock);
503 req = reqq_shift (&res_queue); 554 req = reqq_shift (&res_queue);
504 555
505 if (req) 556 if (req)
506 { 557 {
507 --npending; 558 --npending;
508 559
509 if (!res_queue.size) 560 if (!res_queue.size)
510 { 561 {
511 /* read any signals sent by the worker threads */ 562 /* read any signals sent by the worker threads */
512 char buf [4]; 563 char buf [4];
513 while (read (respipe [0], buf, 4) == 4) 564 while (respipe_read (respipe [0], buf, 4) == 4)
514 ; 565 ;
515 } 566 }
516 } 567 }
517 568
518 UNLOCK (reslock); 569 X_UNLOCK (reslock);
519 570
520 if (!req) 571 if (!req)
521 break; 572 break;
522 573
523 --nreqs; 574 --nreqs;
… …
553 } 604 }
554 605
555 return count; 606 return count;
556} 607}
557 608
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/*****************************************************************************/ 609/*****************************************************************************/
571 610
572static void *aio_proc (void *thr_arg) 611X_THREAD_PROC (bdb_proc)
573{ 612{
574 aio_req req; 613 aio_req req;
575 struct timespec ts; 614 struct timespec ts;
576 worker *self = (worker *)thr_arg; 615 worker *self = (worker *)thr_arg;
577 616
578 /* try to distribute timeouts somewhat evenly */ 617 /* try to distribute timeouts somewhat evenly */
579 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 618 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
580 * (1000000000UL / 1024UL);
581 619
582 for (;;) 620 for (;;)
583 { 621 {
584 ts.tv_sec = time (0) + IDLE_TIMEOUT; 622 ts.tv_sec = time (0) + IDLE_TIMEOUT;
585 623
586 LOCK (reqlock); 624 X_LOCK (reqlock);
587 625
588 for (;;) 626 for (;;)
589 { 627 {
590 self->req = req = reqq_shift (&req_queue); 628 self->req = req = reqq_shift (&req_queue);
591 629
592 if (req) 630 if (req)
593 break; 631 break;
594 632
595 ++idle; 633 ++idle;
596 634
597 if (COND_TIMEDWAIT (reqwait, reqlock, ts) 635 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
598 == ETIMEDOUT) 636 == ETIMEDOUT)
599 { 637 {
600 if (idle > max_idle) 638 if (idle > max_idle)
601 { 639 {
602 --idle; 640 --idle;
603 UNLOCK (reqlock); 641 X_UNLOCK (reqlock);
604 LOCK (wrklock); 642 X_LOCK (wrklock);
605 --started; 643 --started;
606 UNLOCK (wrklock); 644 X_UNLOCK (wrklock);
607 goto quit; 645 goto quit;
608 } 646 }
609 647
610 /* we are allowed to idle, so do so without any timeout */ 648 /* we are allowed to idle, so do so without any timeout */
611 COND_WAIT (reqwait, reqlock); 649 X_COND_WAIT (reqwait, reqlock);
612 ts.tv_sec = time (0) + IDLE_TIMEOUT; 650 ts.tv_sec = time (0) + IDLE_TIMEOUT;
613 } 651 }
614 652
615 --idle; 653 --idle;
616 } 654 }
617 655
618 --nready; 656 --nready;
619 657
620 UNLOCK (reqlock); 658 X_UNLOCK (reqlock);
621 659
622 switch (req->type) 660 switch (req->type)
623 { 661 {
624 case REQ_QUIT: 662 case REQ_QUIT:
625 goto quit; 663 goto quit;
… …
739 default: 777 default:
740 req->result = ENOSYS; 778 req->result = ENOSYS;
741 break; 779 break;
742 } 780 }
743 781
744 LOCK (reslock); 782 X_LOCK (reslock);
745 783
746 ++npending; 784 ++npending;
747 785
748 if (!reqq_push (&res_queue, req)) 786 if (!reqq_push (&res_queue, req))
749 /* write a dummy byte to the pipe so fh becomes ready */ 787 /* write a dummy byte to the pipe so fh becomes ready */
750 write (respipe [1], &respipe, 1); 788 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
751 789
752 self->req = 0; 790 self->req = 0;
753 worker_clear (self); 791 worker_clear (self);
754 792
755 UNLOCK (reslock); 793 X_UNLOCK (reslock);
756 } 794 }
757 795
758quit: 796quit:
759 LOCK (wrklock); 797 X_LOCK (wrklock);
760 worker_free (self); 798 worker_free (self);
761 UNLOCK (wrklock); 799 X_UNLOCK (wrklock);
762 800
763 return 0; 801 return 0;
764} 802}
765 803
766/*****************************************************************************/ 804/*****************************************************************************/
767 805
768static void atfork_prepare (void) 806static void atfork_prepare (void)
769{ 807{
770 LOCK (wrklock); 808 X_LOCK (wrklock);
771 LOCK (reqlock); 809 X_LOCK (reqlock);
772 LOCK (reslock); 810 X_LOCK (reslock);
773} 811}
774 812
775static void atfork_parent (void) 813static void atfork_parent (void)
776{ 814{
777 UNLOCK (reslock); 815 X_UNLOCK (reslock);
778 UNLOCK (reqlock); 816 X_UNLOCK (reqlock);
779 UNLOCK (wrklock); 817 X_UNLOCK (wrklock);
780} 818}
781 819
782static void atfork_child (void) 820static void atfork_child (void)
783{ 821{
784 aio_req prv; 822 aio_req prv;
… …
804 idle = 0; 842 idle = 0;
805 nreqs = 0; 843 nreqs = 0;
806 nready = 0; 844 nready = 0;
807 npending = 0; 845 npending = 0;
808 846
809 close (respipe [0]); 847 respipe_close (respipe [0]);
810 close (respipe [1]); 848 respipe_close (respipe [1]);
849
811 create_pipe (); 850 create_pipe (respipe);
812 851
813 atfork_parent (); 852 atfork_parent ();
814} 853}
815 854
816#define dREQ(reqtype) \ 855#define dREQ(reqtype) \
… …
895 const_iv (DSYNC_DB) 934 const_iv (DSYNC_DB)
896 const_iv (DSYNC_LOG) 935 const_iv (DSYNC_LOG)
897 const_iv (LOG_AUTOREMOVE) 936 const_iv (LOG_AUTOREMOVE)
898 const_iv (LOG_INMEMORY) 937 const_iv (LOG_INMEMORY)
899 const_iv (NOLOCKING) 938 const_iv (NOLOCKING)
900 const_iv (MULTIVERSION)
901 const_iv (NOMMAP) 939 const_iv (NOMMAP)
902 const_iv (NOPANIC) 940 const_iv (NOPANIC)
903 const_iv (OVERWRITE) 941 const_iv (OVERWRITE)
904 const_iv (PANIC_ENVIRONMENT) 942 const_iv (PANIC_ENVIRONMENT)
905 const_iv (REGION_INIT) 943 const_iv (REGION_INIT)
906 const_iv (TIME_NOTGRANTED) 944 const_iv (TIME_NOTGRANTED)
907 const_iv (TXN_NOSYNC) 945 const_iv (TXN_NOSYNC)
908 const_iv (TXN_SNAPSHOT)
909 const_iv (TXN_WRITE_NOSYNC) 946 const_iv (TXN_WRITE_NOSYNC)
910 const_iv (WRITECURSOR) 947 const_iv (WRITECURSOR)
911 const_iv (YIELDCPU) 948 const_iv (YIELDCPU)
912 const_iv (ENCRYPT_AES) 949 const_iv (ENCRYPT_AES)
913 const_iv (XA_CREATE) 950 const_iv (XA_CREATE)
… …
956 const_iv (APPEND) 993 const_iv (APPEND)
957 const_iv (NODUPDATA) 994 const_iv (NODUPDATA)
958 const_iv (NOOVERWRITE) 995 const_iv (NOOVERWRITE)
959 996
960 const_iv (TXN_NOWAIT) 997 const_iv (TXN_NOWAIT)
961 const_iv (TXN_SNAPSHOT)
962 const_iv (TXN_SYNC) 998 const_iv (TXN_SYNC)
963 999
964 const_iv (SET_LOCK_TIMEOUT) 1000 const_iv (SET_LOCK_TIMEOUT)
965 const_iv (SET_TXN_TIMEOUT) 1001 const_iv (SET_TXN_TIMEOUT)
966 1002
… …
994 const_iv (LOCK_YOUNGEST) 1030 const_iv (LOCK_YOUNGEST)
995 1031
996 const_iv (SEQ_DEC) 1032 const_iv (SEQ_DEC)
997 const_iv (SEQ_INC) 1033 const_iv (SEQ_INC)
998 const_iv (SEQ_WRAP) 1034 const_iv (SEQ_WRAP)
1035
1036 const_iv (BUFFER_SMALL)
1037 const_iv (DONOTINDEX)
1038 const_iv (KEYEMPTY )
1039 const_iv (KEYEXIST )
1040 const_iv (LOCK_DEADLOCK)
1041 const_iv (LOCK_NOTGRANTED)
1042 const_iv (LOG_BUFFER_FULL)
1043 const_iv (NOSERVER)
1044 const_iv (NOSERVER_HOME)
1045 const_iv (NOSERVER_ID)
1046 const_iv (NOTFOUND)
1047 const_iv (OLD_VERSION)
1048 const_iv (PAGE_NOTFOUND)
1049 const_iv (REP_DUPMASTER)
1050 const_iv (REP_HANDLE_DEAD)
1051 const_iv (REP_HOLDELECTION)
1052 const_iv (REP_IGNORE)
1053 const_iv (REP_ISPERM)
1054 const_iv (REP_JOIN_FAILURE)
1055 const_iv (REP_LOCKOUT)
1056 const_iv (REP_NEWMASTER)
1057 const_iv (REP_NEWSITE)
1058 const_iv (REP_NOTPERM)
1059 const_iv (REP_UNAVAIL)
1060 const_iv (RUNRECOVERY)
1061 const_iv (SECONDARY_BAD)
1062 const_iv (VERIFY_BAD)
1063 const_iv (VERSION_MISMATCH)
1064
1065 const_iv (VERB_DEADLOCK)
1066 const_iv (VERB_RECOVERY)
1067 const_iv (VERB_REGISTER)
1068 const_iv (VERB_REPLICATION)
1069 const_iv (VERB_WAITSFOR)
1070
1071 const_iv (VERSION_MAJOR)
1072 const_iv (VERSION_MINOR)
1073 const_iv (VERSION_PATCH)
1074#if DB_VERSION_MINOR >= 5
1075 const_iv (MULTIVERSION)
1076 const_iv (TXN_SNAPSHOT)
1077#endif
1078#if DB_VERSION_MINOR >= 6
1079 const_iv (DB_PREV_DUP)
1080#endif
999 }; 1081 };
1000 1082
1001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1083 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1003 1085
1004 create_pipe (); 1086 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1087 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1088
1089 create_pipe (respipe);
1090
1005 ATFORK (atfork_prepare, atfork_parent, atfork_child); 1091 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1092#ifdef _WIN32
1093 X_MUTEX_CHECK (wrklock);
1094 X_MUTEX_CHECK (reslock);
1095 X_MUTEX_CHECK (reqlock);
1096
1097 X_COND_CHECK (reqwait);
1098#endif
1006} 1099}
1007 1100
1008void 1101void
1009max_poll_reqs (int nreqs) 1102max_poll_reqs (int nreqs)
1010 PROTOTYPE: $ 1103 PROTOTYPE: $
… …
1129 1222
1130int 1223int
1131nthreads () 1224nthreads ()
1132 PROTOTYPE: 1225 PROTOTYPE:
1133 CODE: 1226 CODE:
1134 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1227 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1135 RETVAL = started; 1228 RETVAL = started;
1136 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1229 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1137 OUTPUT: 1230 OUTPUT:
1138 RETVAL 1231 RETVAL
1139 1232
1140void 1233void
1141set_sync_prepare (SV *cb) 1234set_sync_prepare (SV *cb)
1142 PROTOTYPE: & 1235 PROTOTYPE: &
1143 CODE: 1236 CODE:
1144 SvREFCNT_dec (prepare_cb); 1237 SvREFCNT_dec (prepare_cb);
1145 prepare_cb = newSVsv (cb); 1238 prepare_cb = newSVsv (cb);
1146 1239
1240char *
1241strerror (int errorno = errno)
1242 PROTOTYPE: ;$
1243 CODE:
1244 RETVAL = db_strerror (errorno);
1245 OUTPUT:
1246 RETVAL
1147 1247
1148DB_ENV * 1248DB_ENV *
1149db_env_create (U32 env_flags = 0) 1249db_env_create (U32 env_flags = 0)
1150 CODE: 1250 CODE:
1151{ 1251{
1152 errno = db_env_create (&RETVAL, env_flags); 1252 errno = db_env_create (&RETVAL, env_flags);
1153 if (errno) 1253 if (errno)
1154 croak ("db_env_create: %s", db_strerror (errno)); 1254 croak ("db_env_create: %s", db_strerror (errno));
1255
1256 if (0)
1257 {
1258 RETVAL->set_errcall (RETVAL, debug_errcall);
1259 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1260 }
1155} 1261}
1156 OUTPUT: 1262 OUTPUT:
1157 RETVAL 1263 RETVAL
1158 1264
1159void 1265void
1160db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1266db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1161 CODE: 1267 CODE:
1162{ 1268{
1163 env->set_thread_count (env, get_nthreads ());
1164
1165 dREQ (REQ_ENV_OPEN); 1269 dREQ (REQ_ENV_OPEN);
1270
1271 env->set_thread_count (env, wanted + 2);
1272
1166 req->env = env; 1273 req->env = env;
1167 req->uint1 = open_flags | DB_THREAD; 1274 req->uint1 = open_flags | DB_THREAD;
1168 req->int1 = mode; 1275 req->int1 = mode;
1169 req->buf1 = strdup_ornull (db_home); 1276 req->buf1 = strdup_ornull (db_home);
1170 REQ_SEND; 1277 REQ_SEND;
… …
1562 CODE: 1669 CODE:
1563 RETVAL = env->set_flags (env, flags, onoff); 1670 RETVAL = env->set_flags (env, flags, onoff);
1564 OUTPUT: 1671 OUTPUT:
1565 RETVAL 1672 RETVAL
1566 1673
1674void set_errfile (DB_ENV *env, FILE *errfile)
1675 CODE:
1676 env->set_errfile (env, errfile);
1677
1678void set_msgfile (DB_ENV *env, FILE *msgfile)
1679 CODE:
1680 env->set_msgfile (env, msgfile);
1681
1682int set_verbose (DB_ENV *env, U32 which, int onoff = 1)
1683 CODE:
1684 RETVAL = env->set_verbose (env, which, onoff);
1685 OUTPUT:
1686 RETVAL
1687
1567int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1688int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1568 CODE: 1689 CODE:
1569 RETVAL = env->set_encrypt (env, password, flags); 1690 RETVAL = env->set_encrypt (env, password, flags);
1570 OUTPUT: 1691 OUTPUT:
1571 RETVAL 1692 RETVAL

Diff Legend

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