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

Comparing BDB/BDB.xs (file contents):
Revision 1.12 by root, Sun Jul 8 09:16:19 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);
… …
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 = X_MUTEX_INIT; 198static mutex_t reslock = X_MUTEX_INIT;
165static mutex_t reqlock = X_MUTEX_INIT; 199static mutex_t reqlock = X_MUTEX_INIT;
166static cond_t reqwait = X_COND_INIT; 200static cond_t reqwait = X_COND_INIT;
167 201
… …
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 X_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;
… …
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
… …
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{
… …
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 X_UNLOCK (reslock); 579 X_UNLOCK (reslock);
… …
555 return count; 616 return count;
556} 617}
557 618
558/*****************************************************************************/ 619/*****************************************************************************/
559 620
560static void *aio_proc (void *thr_arg) 621X_THREAD_PROC (bdb_proc)
561{ 622{
562 aio_req req; 623 aio_req req;
563 struct timespec ts; 624 struct timespec ts;
564 worker *self = (worker *)thr_arg; 625 worker *self = (worker *)thr_arg;
565 626
566 /* try to distribute timeouts somewhat evenly */ 627 /* try to distribute timeouts somewhat evenly */
567 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 628 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
568 * (1000000000UL / 1024UL);
569 629
570 for (;;) 630 for (;;)
571 { 631 {
572 ts.tv_sec = time (0) + IDLE_TIMEOUT; 632 ts.tv_sec = time (0) + IDLE_TIMEOUT;
573 633
… …
733 793
734 ++npending; 794 ++npending;
735 795
736 if (!reqq_push (&res_queue, req)) 796 if (!reqq_push (&res_queue, req))
737 /* write a dummy byte to the pipe so fh becomes ready */ 797 /* write a dummy byte to the pipe so fh becomes ready */
738 write (respipe [1], &respipe, 1); 798 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
739 799
740 self->req = 0; 800 self->req = 0;
741 worker_clear (self); 801 worker_clear (self);
742 802
743 X_UNLOCK (reslock); 803 X_UNLOCK (reslock);
… …
792 idle = 0; 852 idle = 0;
793 nreqs = 0; 853 nreqs = 0;
794 nready = 0; 854 nready = 0;
795 npending = 0; 855 npending = 0;
796 856
797 close (respipe [0]); 857 respipe_close (respipe [0]);
798 close (respipe [1]); 858 respipe_close (respipe [1]);
799 859
800 if (!create_pipe (respipe)) 860 create_pipe (respipe);
801 croak ("unable to initialize result pipe");
802 861
803 atfork_parent (); 862 atfork_parent ();
804} 863}
805 864
806#define dREQ(reqtype) \ 865#define dREQ(reqtype) \
… …
885 const_iv (DSYNC_DB) 944 const_iv (DSYNC_DB)
886 const_iv (DSYNC_LOG) 945 const_iv (DSYNC_LOG)
887 const_iv (LOG_AUTOREMOVE) 946 const_iv (LOG_AUTOREMOVE)
888 const_iv (LOG_INMEMORY) 947 const_iv (LOG_INMEMORY)
889 const_iv (NOLOCKING) 948 const_iv (NOLOCKING)
890 const_iv (MULTIVERSION)
891 const_iv (NOMMAP) 949 const_iv (NOMMAP)
892 const_iv (NOPANIC) 950 const_iv (NOPANIC)
893 const_iv (OVERWRITE) 951 const_iv (OVERWRITE)
894 const_iv (PANIC_ENVIRONMENT) 952 const_iv (PANIC_ENVIRONMENT)
895 const_iv (REGION_INIT) 953 const_iv (REGION_INIT)
896 const_iv (TIME_NOTGRANTED) 954 const_iv (TIME_NOTGRANTED)
897 const_iv (TXN_NOSYNC) 955 const_iv (TXN_NOSYNC)
898 const_iv (TXN_SNAPSHOT)
899 const_iv (TXN_WRITE_NOSYNC) 956 const_iv (TXN_WRITE_NOSYNC)
900 const_iv (WRITECURSOR) 957 const_iv (WRITECURSOR)
901 const_iv (YIELDCPU) 958 const_iv (YIELDCPU)
902 const_iv (ENCRYPT_AES) 959 const_iv (ENCRYPT_AES)
903 const_iv (XA_CREATE) 960 const_iv (XA_CREATE)
… …
946 const_iv (APPEND) 1003 const_iv (APPEND)
947 const_iv (NODUPDATA) 1004 const_iv (NODUPDATA)
948 const_iv (NOOVERWRITE) 1005 const_iv (NOOVERWRITE)
949 1006
950 const_iv (TXN_NOWAIT) 1007 const_iv (TXN_NOWAIT)
951 const_iv (TXN_SNAPSHOT)
952 const_iv (TXN_SYNC) 1008 const_iv (TXN_SYNC)
953 1009
954 const_iv (SET_LOCK_TIMEOUT) 1010 const_iv (SET_LOCK_TIMEOUT)
955 const_iv (SET_TXN_TIMEOUT) 1011 const_iv (SET_TXN_TIMEOUT)
956 1012
… …
984 const_iv (LOCK_YOUNGEST) 1040 const_iv (LOCK_YOUNGEST)
985 1041
986 const_iv (SEQ_DEC) 1042 const_iv (SEQ_DEC)
987 const_iv (SEQ_INC) 1043 const_iv (SEQ_INC)
988 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
989 }; 1099 };
990 1100
991 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; )
992 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1102 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
993 1103
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
994 if (!create_pipe (respipe)) 1107 create_pipe (respipe);
995 croak ("unable to initialize result pipe");
996 1108
997 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1109 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
998#ifdef _WIN32 1110#ifdef _WIN32
999 X_MUTEX_CHECK (wrklock); 1111 X_MUTEX_CHECK (wrklock);
1000 X_MUTEX_CHECK (reslock); 1112 X_MUTEX_CHECK (reslock);
… …
1141 PROTOTYPE: & 1253 PROTOTYPE: &
1142 CODE: 1254 CODE:
1143 SvREFCNT_dec (prepare_cb); 1255 SvREFCNT_dec (prepare_cb);
1144 prepare_cb = newSVsv (cb); 1256 prepare_cb = newSVsv (cb);
1145 1257
1258char *
1259strerror (int errorno = errno)
1260 PROTOTYPE: ;$
1261 CODE:
1262 RETVAL = db_strerror (errorno);
1263 OUTPUT:
1264 RETVAL
1146 1265
1147DB_ENV * 1266DB_ENV *
1148db_env_create (U32 env_flags = 0) 1267db_env_create (U32 env_flags = 0)
1149 CODE: 1268 CODE:
1150{ 1269{
1151 errno = db_env_create (&RETVAL, env_flags); 1270 errno = db_env_create (&RETVAL, env_flags);
1152 if (errno) 1271 if (errno)
1153 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 }
1154} 1279}
1155 OUTPUT: 1280 OUTPUT:
1156 RETVAL 1281 RETVAL
1157 1282
1158void 1283void
1159db_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)
1160 CODE: 1285 CODE:
1161{ 1286{
1162 env->set_thread_count (env, get_nthreads ());
1163
1164 dREQ (REQ_ENV_OPEN); 1287 dREQ (REQ_ENV_OPEN);
1288
1289 env->set_thread_count (env, wanted + 2);
1290
1165 req->env = env; 1291 req->env = env;
1166 req->uint1 = open_flags | DB_THREAD; 1292 req->uint1 = open_flags | DB_THREAD;
1167 req->int1 = mode; 1293 req->int1 = mode;
1168 req->buf1 = strdup_ornull (db_home); 1294 req->buf1 = strdup_ornull (db_home);
1169 REQ_SEND; 1295 REQ_SEND;
… …
1561 CODE: 1687 CODE:
1562 RETVAL = env->set_flags (env, flags, onoff); 1688 RETVAL = env->set_flags (env, flags, onoff);
1563 OUTPUT: 1689 OUTPUT:
1564 RETVAL 1690 RETVAL
1565 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
1566int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1706int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1567 CODE: 1707 CODE:
1568 RETVAL = env->set_encrypt (env, password, flags); 1708 RETVAL = env->set_encrypt (env, password, flags);
1569 OUTPUT: 1709 OUTPUT:
1570 RETVAL 1710 RETVAL
… …
1654 CODE: 1794 CODE:
1655 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1795 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1656 OUTPUT: 1796 OUTPUT:
1657 RETVAL 1797 RETVAL
1658 1798
1659int set_flags (DB *db, U32 flags); 1799int set_flags (DB *db, U32 flags)
1660 CODE: 1800 CODE:
1661 RETVAL = db->set_flags (db, flags); 1801 RETVAL = db->set_flags (db, flags);
1662 OUTPUT: 1802 OUTPUT:
1663 RETVAL 1803 RETVAL
1664 1804
… …
1678 CODE: 1818 CODE:
1679 RETVAL = db->set_bt_minkey (db, minkey); 1819 RETVAL = db->set_bt_minkey (db, minkey);
1680 OUTPUT: 1820 OUTPUT:
1681 RETVAL 1821 RETVAL
1682 1822
1683int set_re_delim(DB *db, int delim); 1823int set_re_delim (DB *db, int delim)
1684 CODE: 1824 CODE:
1685 RETVAL = db->set_re_delim (db, delim); 1825 RETVAL = db->set_re_delim (db, delim);
1686 OUTPUT: 1826 OUTPUT:
1687 RETVAL 1827 RETVAL
1688 1828

Diff Legend

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