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.38 by root, Wed May 21 19:13:43 2008 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;
49typedef DB_SEQUENCE DB_SEQUENCE_ornull; 43typedef DB_SEQUENCE DB_SEQUENCE_ornull;
50 44
45typedef DB_ENV DB_ENV_ornuked;
46typedef DB_TXN DB_TXN_ornuked;
47typedef DBC DBC_ornuked;
48typedef DB DB_ornuked;
49typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
50
51typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
52typedef char *octetstring; 52typedef char *bdb_filename;
53 53
54static SV *prepare_cb; 54static SV *prepare_cb;
55 55
56#if DB_VERSION_MINOR >= 6
57# define c_close close
58# define c_count count
59# define c_del del
60# define c_dup dup
61# define c_get get
62# define c_pget pget
63# define c_put put
64#endif
65
56static inline char * 66static char *
67get_bdb_filename (SV *sv)
68{
69 if (!SvOK (sv))
70 return 0;
71
72#if _WIN32
73 /* win32 madness + win32 perl absolutely brokenness make for horrible hacks */
74 {
75 STRLEN len;
76 char *src = SvPVbyte (sv, len);
77 SV *t1 = sv_newmortal ();
78 SV *t2 = sv_newmortal ();
79
80 sv_upgrade (t1, SVt_PV); SvPOK_only (t1); SvGROW (t1, len * 16 + 1);
81 sv_upgrade (t2, SVt_PV); SvPOK_only (t2); SvGROW (t2, len * 16 + 1);
82
83 len = MultiByteToWideChar (CP_ACP, 0, src, len, (WCHAR *)SvPVX (t1), SvLEN (t1) / sizeof (WCHAR));
84 len = WideCharToMultiByte (CP_UTF8, 0, (WCHAR *)SvPVX (t1), len, SvPVX (t2), SvLEN (t2), 0, 0);
85 SvPOK_only (t2);
86 SvPVX (t2)[len] = 0;
87 SvCUR_set (t2, len);
88
89 return SvPVX (t2);
90 }
91#else
92 return SvPVbyte_nolen (sv);
93#endif
94}
95
96static void
97debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
98{
99 printf ("err[%s]\n", msg);
100}
101
102static void
103debug_msgcall (const DB_ENV *dbenv, const char *msg)
104{
105 printf ("msg[%s]\n", msg);
106}
107
108static char *
57strdup_ornull (const char *s) 109strdup_ornull (const char *s)
58{ 110{
59 return s ? strdup (s) : 0; 111 return s ? strdup (s) : 0;
60} 112}
61 113
62static inline void 114static void
63sv_to_dbt (DBT *dbt, SV *sv) 115sv_to_dbt (DBT *dbt, SV *sv)
64{ 116{
65 STRLEN len; 117 STRLEN len;
66 char *data = SvPVbyte (sv, len); 118 char *data = SvPVbyte (sv, len);
67 119
… …
69 memcpy (dbt->data, data, len); 121 memcpy (dbt->data, data, len);
70 dbt->size = len; 122 dbt->size = len;
71 dbt->flags = DB_DBT_REALLOC; 123 dbt->flags = DB_DBT_REALLOC;
72} 124}
73 125
74static inline void 126static void
75dbt_to_sv (SV *sv, DBT *dbt) 127dbt_to_sv (SV *sv, DBT *dbt)
76{ 128{
77 if (sv) 129 if (sv)
78 { 130 {
79 SvREADONLY_off (sv); 131 SvREADONLY_off (sv);
… …
86 138
87enum { 139enum {
88 REQ_QUIT, 140 REQ_QUIT,
89 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 141 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
90 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
91 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 143 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
92 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 144 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
93 REQ_TXN_COMMIT, REQ_TXN_ABORT, 145 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, 146 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, 147 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
96}; 148};
97 149
98typedef struct aio_cb 150typedef struct bdb_cb
99{ 151{
100 struct aio_cb *volatile next; 152 struct bdb_cb *volatile next;
101 SV *callback; 153 SV *callback;
102 int type, pri, result; 154 int type, pri, result;
103 155
104 DB_ENV *env; 156 DB_ENV *env;
105 DB *db; 157 DB *db;
… …
114 166
115 DBT dbt1, dbt2, dbt3; 167 DBT dbt1, dbt2, dbt3;
116 DB_KEY_RANGE key_range; 168 DB_KEY_RANGE key_range;
117 DB_SEQUENCE *seq; 169 DB_SEQUENCE *seq;
118 db_seq_t seq_t; 170 db_seq_t seq_t;
119} aio_cb; 171} bdb_cb;
120 172
121typedef aio_cb *aio_req; 173typedef bdb_cb *bdb_req;
122 174
123enum { 175enum {
124 PRI_MIN = -4, 176 PRI_MIN = -4,
125 PRI_MAX = 4, 177 PRI_MAX = 4,
126 178
… …
129 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 181 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
130}; 182};
131 183
132#define AIO_TICKS ((1000000 + 1023) >> 10) 184#define AIO_TICKS ((1000000 + 1023) >> 10)
133 185
186static SV *on_next_submit;
187
134static unsigned int max_poll_time = 0; 188static unsigned int max_poll_time = 0;
135static unsigned int max_poll_reqs = 0; 189static unsigned int max_poll_reqs = 0;
136 190
137/* calculcate time difference in ~1/AIO_TICKS of a second */ 191/* calculcate time difference in ~1/AIO_TICKS of a second */
138static int tvdiff (struct timeval *tv1, struct timeval *tv2) 192static int tvdiff (struct timeval *tv1, struct timeval *tv2)
… …
143 197
144static int next_pri = DEFAULT_PRI + PRI_BIAS; 198static int next_pri = DEFAULT_PRI + PRI_BIAS;
145 199
146static unsigned int started, idle, wanted; 200static unsigned int started, idle, wanted;
147 201
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 */ 202/* worker threads management */
158static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 203static mutex_t wrklock = X_MUTEX_INIT;
159 204
160typedef struct worker { 205typedef struct worker {
161 /* locked by wrklock */ 206 /* locked by wrklock */
162 struct worker *prev, *next; 207 struct worker *prev, *next;
163 208
164 pthread_t tid; 209 thread_t tid;
165 210
166 /* locked by reslock, reqlock or wrklock */ 211 /* locked by reslock, reqlock or wrklock */
167 aio_req req; /* currently processed request */ 212 bdb_req req; /* currently processed request */
168 void *dbuf; 213 void *dbuf;
169 DIR *dirp; 214 DIR *dirp;
170} worker; 215} worker;
171 216
172static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 217static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
184} 229}
185 230
186static volatile unsigned int nreqs, nready, npending; 231static volatile unsigned int nreqs, nready, npending;
187static volatile unsigned int max_idle = 4; 232static volatile unsigned int max_idle = 4;
188static volatile unsigned int max_outstanding = 0xffffffff; 233static volatile unsigned int max_outstanding = 0xffffffff;
189static int respipe [2]; 234static int respipe_osf [2], respipe [2] = { -1, -1 };
190 235
191static pthread_mutex_t reslock = AIO_MUTEX_INIT; 236static mutex_t reslock = X_MUTEX_INIT;
192static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 237static mutex_t reqlock = X_MUTEX_INIT;
193static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 238static cond_t reqwait = X_COND_INIT;
194 239
195#if WORDACCESS_UNSAFE 240#if WORDACCESS_UNSAFE
196 241
197static unsigned int get_nready () 242static unsigned int get_nready (void)
198{ 243{
199 unsigned int retval; 244 unsigned int retval;
200 245
201 LOCK (reqlock); 246 X_LOCK (reqlock);
202 retval = nready; 247 retval = nready;
203 UNLOCK (reqlock); 248 X_UNLOCK (reqlock);
204 249
205 return retval; 250 return retval;
206} 251}
207 252
208static unsigned int get_npending () 253static unsigned int get_npending (void)
209{ 254{
210 unsigned int retval; 255 unsigned int retval;
211 256
212 LOCK (reslock); 257 X_LOCK (reslock);
213 retval = npending; 258 retval = npending;
214 UNLOCK (reslock); 259 X_UNLOCK (reslock);
215 260
216 return retval; 261 return retval;
217} 262}
218 263
219static unsigned int get_nthreads () 264static unsigned int get_nthreads (void)
220{ 265{
221 unsigned int retval; 266 unsigned int retval;
222 267
223 LOCK (wrklock); 268 X_LOCK (wrklock);
224 retval = started; 269 retval = started;
225 UNLOCK (wrklock); 270 X_UNLOCK (wrklock);
226 271
227 return retval; 272 return retval;
228} 273}
229 274
230#else 275#else
… …
239 * a somewhat faster data structure might be nice, but 284 * a somewhat faster data structure might be nice, but
240 * with 8 priorities this actually needs <20 insns 285 * with 8 priorities this actually needs <20 insns
241 * per shift, the most expensive operation. 286 * per shift, the most expensive operation.
242 */ 287 */
243typedef struct { 288typedef struct {
244 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 289 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
245 int size; 290 int size;
246} reqq; 291} reqq;
247 292
248static reqq req_queue; 293static reqq req_queue;
249static reqq res_queue; 294static reqq res_queue;
250 295
251int reqq_push (reqq *q, aio_req req) 296int reqq_push (reqq *q, bdb_req req)
252{ 297{
253 int pri = req->pri; 298 int pri = req->pri;
254 req->next = 0; 299 req->next = 0;
255 300
256 if (q->qe[pri]) 301 if (q->qe[pri])
… …
262 q->qe[pri] = q->qs[pri] = req; 307 q->qe[pri] = q->qs[pri] = req;
263 308
264 return q->size++; 309 return q->size++;
265} 310}
266 311
267aio_req reqq_shift (reqq *q) 312bdb_req reqq_shift (reqq *q)
268{ 313{
269 int pri; 314 int pri;
270 315
271 if (!q->size) 316 if (!q->size)
272 return 0; 317 return 0;
273 318
274 --q->size; 319 --q->size;
275 320
276 for (pri = NUM_PRI; pri--; ) 321 for (pri = NUM_PRI; pri--; )
277 { 322 {
278 aio_req req = q->qs[pri]; 323 bdb_req req = q->qs[pri];
279 324
280 if (req) 325 if (req)
281 { 326 {
282 if (!(q->qs[pri] = req->next)) 327 if (!(q->qs[pri] = req->next))
283 q->qe[pri] = 0; 328 q->qe[pri] = 0;
… …
287 } 332 }
288 333
289 abort (); 334 abort ();
290} 335}
291 336
292static int poll_cb (); 337static int poll_cb (void);
293static void req_free (aio_req req); 338static void req_free (bdb_req req);
294static void req_cancel (aio_req req); 339static void req_cancel (bdb_req req);
295 340
296static int req_invoke (aio_req req) 341static int req_invoke (bdb_req req)
297{ 342{
298 dSP; 343 dSP;
299 344
300 if (SvOK (req->callback)) 345 if (SvOK (req->callback))
301 { 346 {
… …
319 dbt_to_sv (req->sv1, &req->dbt1); 364 dbt_to_sv (req->sv1, &req->dbt1);
320 dbt_to_sv (req->sv2, &req->dbt2); 365 dbt_to_sv (req->sv2, &req->dbt2);
321 dbt_to_sv (req->sv3, &req->dbt3); 366 dbt_to_sv (req->sv3, &req->dbt3);
322 break; 367 break;
323 368
369 case REQ_DB_PUT:
370 case REQ_C_PUT:
371 dbt_to_sv (0, &req->dbt1);
372 dbt_to_sv (0, &req->dbt2);
373 break;
374
324 case REQ_DB_KEY_RANGE: 375 case REQ_DB_KEY_RANGE:
325 { 376 {
326 AV *av = newAV (); 377 AV *av = newAV ();
327 378
328 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
… …
337 388
338 case REQ_SEQ_GET: 389 case REQ_SEQ_GET:
339 SvREADONLY_off (req->sv1); 390 SvREADONLY_off (req->sv1);
340 391
341 if (sizeof (IV) > 4) 392 if (sizeof (IV) > 4)
342 sv_setiv_mg (req->sv1, req->seq_t); 393 sv_setiv_mg (req->sv1, (IV)req->seq_t);
343 else 394 else
344 sv_setnv_mg (req->sv1, req->seq_t); 395 sv_setnv_mg (req->sv1, (NV)req->seq_t);
345 396
346 SvREFCNT_dec (req->sv1); 397 SvREFCNT_dec (req->sv1);
347 break; 398 break;
348 } 399 }
349 400
… …
358 } 409 }
359 410
360 return !SvTRUE (ERRSV); 411 return !SvTRUE (ERRSV);
361} 412}
362 413
363static void req_free (aio_req req) 414static void req_free (bdb_req req)
364{ 415{
365 free (req->buf1); 416 free (req->buf1);
366 free (req->buf2); 417 free (req->buf2);
367 Safefree (req); 418 Safefree (req);
368} 419}
369 420
370static void *aio_proc (void *arg); 421#ifdef USE_SOCKETS_AS_HANDLES
422# define TO_SOCKET(x) (win32_get_osfhandle (x))
423#else
424# define TO_SOCKET(x) (x)
425#endif
426
427static void
428create_respipe (void)
429{
430#ifdef _WIN32
431 int arg; /* argg */
432#endif
433 int old_readfd = respipe [0];
434
435 if (respipe [1] >= 0)
436 respipe_close (TO_SOCKET (respipe [1]));
437
438#ifdef _WIN32
439 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
440#else
441 if (pipe (respipe))
442#endif
443 croak ("unable to initialize result pipe");
444
445 if (old_readfd >= 0)
446 {
447 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
448 croak ("unable to initialize result pipe(2)");
449
450 respipe_close (respipe [0]);
451 respipe [0] = old_readfd;
452 }
453
454#ifdef _WIN32
455 arg = 1;
456 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
457 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
458#else
459 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
460 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
461#endif
462 croak ("unable to initialize result pipe(3)");
463
464 respipe_osf [0] = TO_SOCKET (respipe [0]);
465 respipe_osf [1] = TO_SOCKET (respipe [1]);
466}
467
468X_THREAD_PROC (bdb_proc);
371 469
372static void start_thread (void) 470static void start_thread (void)
373{ 471{
374 sigset_t fullsigset, oldsigset;
375 pthread_attr_t attr;
376
377 worker *wrk = calloc (1, sizeof (worker)); 472 worker *wrk = calloc (1, sizeof (worker));
378 473
379 if (!wrk) 474 if (!wrk)
380 croak ("unable to allocate worker thread data"); 475 croak ("unable to allocate worker thread data");
381 476
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); 477 X_LOCK (wrklock);
391 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
392
393 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 478 if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
394 { 479 {
395 wrk->prev = &wrk_first; 480 wrk->prev = &wrk_first;
396 wrk->next = wrk_first.next; 481 wrk->next = wrk_first.next;
397 wrk_first.next->prev = wrk; 482 wrk_first.next->prev = wrk;
398 wrk_first.next = wrk; 483 wrk_first.next = wrk;
399 ++started; 484 ++started;
400 } 485 }
401 else 486 else
402 free (wrk); 487 free (wrk);
403 488
404 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
405 UNLOCK (wrklock); 489 X_UNLOCK (wrklock);
406} 490}
407 491
408static void maybe_start_thread () 492static void maybe_start_thread (void)
409{ 493{
410 if (get_nthreads () >= wanted) 494 if (get_nthreads () >= wanted)
411 return; 495 return;
412 496
413 /* todo: maybe use idle here, but might be less exact */ 497 /* todo: maybe use idle here, but might be less exact */
… …
415 return; 499 return;
416 500
417 start_thread (); 501 start_thread ();
418} 502}
419 503
420static void req_send (aio_req req) 504static void req_send (bdb_req req)
421{ 505{
422 SV *wait_callback = 0; 506 SV *wait_callback = 0;
507
508 if (on_next_submit)
509 {
510 dSP;
511 SV *cb = sv_2mortal (on_next_submit);
512
513 on_next_submit = 0;
514
515 PUSHMARK (SP);
516 PUTBACK;
517 call_sv (cb, G_DISCARD | G_EVAL);
518 }
423 519
424 // synthesize callback if none given 520 // synthesize callback if none given
425 if (!SvOK (req->callback)) 521 if (!SvOK (req->callback))
426 { 522 {
523 int count;
524
427 dSP; 525 dSP;
428 PUSHMARK (SP); 526 PUSHMARK (SP);
429 PUTBACK; 527 PUTBACK;
430 int count = call_sv (prepare_cb, G_ARRAY); 528 count = call_sv (prepare_cb, G_ARRAY);
431 SPAGAIN; 529 SPAGAIN;
432 530
433 if (count != 2) 531 if (count != 2)
434 croak ("prepare callback must return exactly two values\n"); 532 croak ("prepare callback must return exactly two values\n");
435 533
436 wait_callback = SvREFCNT_inc (POPs); 534 wait_callback = POPs;
437 SvREFCNT_dec (req->callback); 535 SvREFCNT_dec (req->callback);
438 req->callback = SvREFCNT_inc (POPs); 536 req->callback = SvREFCNT_inc (POPs);
439 } 537 }
440 538
441 ++nreqs; 539 ++nreqs;
442 540
443 LOCK (reqlock); 541 X_LOCK (reqlock);
444 ++nready; 542 ++nready;
445 reqq_push (&req_queue, req); 543 reqq_push (&req_queue, req);
446 pthread_cond_signal (&reqwait); 544 X_COND_SIGNAL (reqwait);
447 UNLOCK (reqlock); 545 X_UNLOCK (reqlock);
448 546
449 maybe_start_thread (); 547 maybe_start_thread ();
450 548
451 if (wait_callback) 549 if (wait_callback)
452 { 550 {
453 dSP; 551 dSP;
454 PUSHMARK (SP); 552 PUSHMARK (SP);
455 PUTBACK; 553 PUTBACK;
456 call_sv (wait_callback, G_DISCARD); 554 call_sv (wait_callback, G_DISCARD);
457 SvREFCNT_dec (wait_callback);
458 } 555 }
459} 556}
460 557
461static void end_thread (void) 558static void end_thread (void)
462{ 559{
463 aio_req req; 560 bdb_req req;
464 561
465 Newz (0, req, 1, aio_cb); 562 Newz (0, req, 1, bdb_cb);
466 563
467 req->type = REQ_QUIT; 564 req->type = REQ_QUIT;
468 req->pri = PRI_MAX + PRI_BIAS; 565 req->pri = PRI_MAX + PRI_BIAS;
469 566
470 LOCK (reqlock); 567 X_LOCK (reqlock);
471 reqq_push (&req_queue, req); 568 reqq_push (&req_queue, req);
472 pthread_cond_signal (&reqwait); 569 X_COND_SIGNAL (reqwait);
473 UNLOCK (reqlock); 570 X_UNLOCK (reqlock);
474 571
475 LOCK (wrklock); 572 X_LOCK (wrklock);
476 --started; 573 --started;
477 UNLOCK (wrklock); 574 X_UNLOCK (wrklock);
478} 575}
479 576
480static void set_max_idle (int nthreads) 577static void set_max_idle (int nthreads)
481{ 578{
482 if (WORDACCESS_UNSAFE) LOCK (reqlock); 579 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
483 max_idle = nthreads <= 0 ? 1 : nthreads; 580 max_idle = nthreads <= 0 ? 1 : nthreads;
484 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 581 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
485} 582}
486 583
487static void min_parallel (int nthreads) 584static void min_parallel (int nthreads)
488{ 585{
489 if (wanted < nthreads) 586 if (wanted < nthreads)
… …
497 594
498 while (started > wanted) 595 while (started > wanted)
499 end_thread (); 596 end_thread ();
500} 597}
501 598
502static void poll_wait () 599static void poll_wait (void)
503{ 600{
504 fd_set rfd; 601 fd_set rfd;
505 602
506 while (nreqs) 603 while (nreqs)
507 { 604 {
508 int size; 605 int size;
509 if (WORDACCESS_UNSAFE) LOCK (reslock); 606 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
510 size = res_queue.size; 607 size = res_queue.size;
511 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 608 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
512 609
513 if (size) 610 if (size)
514 return; 611 return;
515 612
516 maybe_start_thread (); 613 maybe_start_thread ();
517 614
518 FD_ZERO(&rfd); 615 FD_ZERO (&rfd);
519 FD_SET(respipe [0], &rfd); 616 FD_SET (respipe [0], &rfd);
520 617
521 select (respipe [0] + 1, &rfd, 0, 0, 0); 618 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
522 } 619 }
523} 620}
524 621
525static int poll_cb () 622static int poll_cb (void)
526{ 623{
527 dSP; 624 dSP;
528 int count = 0; 625 int count = 0;
529 int maxreqs = max_poll_reqs; 626 int maxreqs = max_poll_reqs;
530 int do_croak = 0; 627 int do_croak = 0;
531 struct timeval tv_start, tv_now; 628 struct timeval tv_start, tv_now;
532 aio_req req; 629 bdb_req req;
533 630
534 if (max_poll_time) 631 if (max_poll_time)
535 gettimeofday (&tv_start, 0); 632 gettimeofday (&tv_start, 0);
536 633
537 for (;;) 634 for (;;)
538 { 635 {
539 for (;;) 636 for (;;)
540 { 637 {
541 maybe_start_thread (); 638 maybe_start_thread ();
542 639
543 LOCK (reslock); 640 X_LOCK (reslock);
544 req = reqq_shift (&res_queue); 641 req = reqq_shift (&res_queue);
545 642
546 if (req) 643 if (req)
547 { 644 {
548 --npending; 645 --npending;
549 646
550 if (!res_queue.size) 647 if (!res_queue.size)
551 { 648 {
552 /* read any signals sent by the worker threads */ 649 /* read any signals sent by the worker threads */
553 char buf [4]; 650 char buf [4];
554 while (read (respipe [0], buf, 4) == 4) 651 while (respipe_read (respipe [0], buf, 4) == 4)
555 ; 652 ;
556 } 653 }
557 } 654 }
558 655
559 UNLOCK (reslock); 656 X_UNLOCK (reslock);
560 657
561 if (!req) 658 if (!req)
562 break; 659 break;
563 660
564 --nreqs; 661 --nreqs;
… …
594 } 691 }
595 692
596 return count; 693 return count;
597} 694}
598 695
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/*****************************************************************************/ 696/*****************************************************************************/
612 697
613static void *aio_proc (void *thr_arg) 698X_THREAD_PROC (bdb_proc)
614{ 699{
615 aio_req req; 700 bdb_req req;
616 struct timespec ts; 701 struct timespec ts;
617 worker *self = (worker *)thr_arg; 702 worker *self = (worker *)thr_arg;
618 703
619 /* try to distribute timeouts somewhat evenly */ 704 /* try to distribute timeouts somewhat evenly */
620 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 705 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
621 * (1000000000UL / 1024UL);
622 706
623 for (;;) 707 for (;;)
624 { 708 {
625 ts.tv_sec = time (0) + IDLE_TIMEOUT; 709 ts.tv_sec = time (0) + IDLE_TIMEOUT;
626 710
627 LOCK (reqlock); 711 X_LOCK (reqlock);
628 712
629 for (;;) 713 for (;;)
630 { 714 {
631 self->req = req = reqq_shift (&req_queue); 715 self->req = req = reqq_shift (&req_queue);
632 716
633 if (req) 717 if (req)
634 break; 718 break;
635 719
636 ++idle; 720 ++idle;
637 721
638 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 722 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
639 == ETIMEDOUT) 723 == ETIMEDOUT)
640 { 724 {
641 if (idle > max_idle) 725 if (idle > max_idle)
642 { 726 {
643 --idle; 727 --idle;
644 UNLOCK (reqlock); 728 X_UNLOCK (reqlock);
645 LOCK (wrklock); 729 X_LOCK (wrklock);
646 --started; 730 --started;
647 UNLOCK (wrklock); 731 X_UNLOCK (wrklock);
648 goto quit; 732 goto quit;
649 } 733 }
650 734
651 /* we are allowed to idle, so do so without any timeout */ 735 /* we are allowed to idle, so do so without any timeout */
652 pthread_cond_wait (&reqwait, &reqlock); 736 X_COND_WAIT (reqwait, reqlock);
653 ts.tv_sec = time (0) + IDLE_TIMEOUT; 737 ts.tv_sec = time (0) + IDLE_TIMEOUT;
654 } 738 }
655 739
656 --idle; 740 --idle;
657 } 741 }
658 742
659 --nready; 743 --nready;
660 744
661 UNLOCK (reqlock); 745 X_UNLOCK (reqlock);
662 746
663 switch (req->type) 747 switch (req->type)
664 { 748 {
665 case REQ_QUIT: 749 case REQ_QUIT:
750 req->result = ENOSYS;
666 goto quit; 751 goto quit;
667 752
668 case REQ_ENV_OPEN: 753 case REQ_ENV_OPEN:
669 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 754 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
670 break; 755 break;
… …
703 788
704 case REQ_DB_SYNC: 789 case REQ_DB_SYNC:
705 req->result = req->db->sync (req->db, req->uint1); 790 req->result = req->db->sync (req->db, req->uint1);
706 break; 791 break;
707 792
793 case REQ_DB_UPGRADE:
794 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
795 break;
796
708 case REQ_DB_PUT: 797 case REQ_DB_PUT:
709 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 798 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
710 break; 799 break;
711 800
712 case REQ_DB_GET: 801 case REQ_DB_GET:
… …
729 req->result = req->txn->commit (req->txn, req->uint1); 818 req->result = req->txn->commit (req->txn, req->uint1);
730 break; 819 break;
731 820
732 case REQ_TXN_ABORT: 821 case REQ_TXN_ABORT:
733 req->result = req->txn->abort (req->txn); 822 req->result = req->txn->abort (req->txn);
823 break;
824
825 case REQ_TXN_FINISH:
826 if (req->txn->flags & TXN_DEADLOCK)
827 {
828 req->result = req->txn->abort (req->txn);
829 if (!req->result)
830 req->result = DB_LOCK_DEADLOCK;
831 }
832 else
833 req->result = req->txn->commit (req->txn, req->uint1);
734 break; 834 break;
735 835
736 case REQ_C_CLOSE: 836 case REQ_C_CLOSE:
737 req->result = req->dbc->c_close (req->dbc); 837 req->result = req->dbc->c_close (req->dbc);
738 break; 838 break;
… …
780 default: 880 default:
781 req->result = ENOSYS; 881 req->result = ENOSYS;
782 break; 882 break;
783 } 883 }
784 884
885 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
886 req->txn->flags |= TXN_DEADLOCK;
887
785 LOCK (reslock); 888 X_LOCK (reslock);
786 889
787 ++npending; 890 ++npending;
788 891
789 if (!reqq_push (&res_queue, req)) 892 if (!reqq_push (&res_queue, req))
790 /* write a dummy byte to the pipe so fh becomes ready */ 893 /* write a dummy byte to the pipe so fh becomes ready */
791 write (respipe [1], &respipe, 1); 894 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
792 895
793 self->req = 0; 896 self->req = 0;
794 worker_clear (self); 897 worker_clear (self);
795 898
796 UNLOCK (reslock); 899 X_UNLOCK (reslock);
797 } 900 }
798 901
799quit: 902quit:
800 LOCK (wrklock); 903 X_LOCK (wrklock);
801 worker_free (self); 904 worker_free (self);
802 UNLOCK (wrklock); 905 X_UNLOCK (wrklock);
803 906
804 return 0; 907 return 0;
805} 908}
806 909
807/*****************************************************************************/ 910/*****************************************************************************/
808 911
809static void atfork_prepare (void) 912static void atfork_prepare (void)
810{ 913{
811 LOCK (wrklock); 914 X_LOCK (wrklock);
812 LOCK (reqlock); 915 X_LOCK (reqlock);
813 LOCK (reslock); 916 X_LOCK (reslock);
814} 917}
815 918
816static void atfork_parent (void) 919static void atfork_parent (void)
817{ 920{
818 UNLOCK (reslock); 921 X_UNLOCK (reslock);
819 UNLOCK (reqlock); 922 X_UNLOCK (reqlock);
820 UNLOCK (wrklock); 923 X_UNLOCK (wrklock);
821} 924}
822 925
823static void atfork_child (void) 926static void atfork_child (void)
824{ 927{
825 aio_req prv; 928 bdb_req prv;
826 929
827 while (prv = reqq_shift (&req_queue)) 930 while (prv = reqq_shift (&req_queue))
828 req_free (prv); 931 req_free (prv);
829 932
830 while (prv = reqq_shift (&res_queue)) 933 while (prv = reqq_shift (&res_queue))
… …
845 idle = 0; 948 idle = 0;
846 nreqs = 0; 949 nreqs = 0;
847 nready = 0; 950 nready = 0;
848 npending = 0; 951 npending = 0;
849 952
850 close (respipe [0]);
851 close (respipe [1]);
852 create_pipe (); 953 create_respipe ();
853 954
854 atfork_parent (); 955 atfork_parent ();
855} 956}
856 957
857#define dREQ(reqtype) \ 958#define dREQ(reqtype) \
858 aio_req req; \ 959 bdb_req req; \
859 int req_pri = next_pri; \ 960 int req_pri = next_pri; \
860 next_pri = DEFAULT_PRI + PRI_BIAS; \ 961 next_pri = DEFAULT_PRI + PRI_BIAS; \
861 \ 962 \
862 if (SvOK (callback) && !SvROK (callback)) \ 963 if (SvOK (callback) && !SvROK (callback)) \
863 croak ("callback must be undef or of reference type"); \ 964 croak ("callback must be undef or of reference type"); \
864 \ 965 \
865 Newz (0, req, 1, aio_cb); \ 966 Newz (0, req, 1, bdb_cb); \
866 if (!req) \ 967 if (!req) \
867 croak ("out of memory during aio_req allocation"); \ 968 croak ("out of memory during bdb_req allocation"); \
868 \ 969 \
869 req->callback = newSVsv (callback); \ 970 req->callback = newSVsv (callback); \
870 req->type = (reqtype); \ 971 req->type = (reqtype); \
871 req->pri = req_pri 972 req->pri = req_pri
872 973
873#define REQ_SEND \ 974#define REQ_SEND \
874 req_send (req) 975 req_send (req)
875 976
876#define SvPTR(var, arg, type, class, nullok) \ 977#define SvPTR(var, arg, type, class, nullok) \
877 if (!SvOK (arg)) \ 978 if (!SvOK (arg)) \
878 { \ 979 { \
879 if (!nullok) \ 980 if (nullok != 1) \
880 croak (# var " must be a " # class " object, not undef"); \ 981 croak (# var " must be a " # class " object, not undef"); \
881 \ 982 \
882 (var) = 0; \ 983 (var) = 0; \
883 } \ 984 } \
884 else if (sv_derived_from ((arg), # class)) \ 985 else if (sv_derived_from ((arg), # class)) \
885 { \ 986 { \
886 IV tmp = SvIV ((SV*) SvRV (arg)); \ 987 IV tmp = SvIV ((SV*) SvRV (arg)); \
887 (var) = INT2PTR (type, tmp); \ 988 (var) = INT2PTR (type, tmp); \
888 if (!var) \ 989 if (!var && nullok != 2) \
889 croak (# var " is not a valid " # class " object anymore"); \ 990 croak (# var " is not a valid " # class " object anymore"); \
890 } \ 991 } \
891 else \ 992 else \
892 croak (# var " is not of type " # class); \ 993 croak (# var " is not of type " # class); \
893 \ 994 \
… …
895static void 996static void
896ptr_nuke (SV *sv) 997ptr_nuke (SV *sv)
897{ 998{
898 assert (SvROK (sv)); 999 assert (SvROK (sv));
899 sv_setiv (SvRV (sv), 0); 1000 sv_setiv (SvRV (sv), 0);
1001}
1002
1003static int
1004errno_get (pTHX_ SV *sv, MAGIC *mg)
1005{
1006 if (*mg->mg_ptr == '!') // should always be the case
1007 if (-30999 <= errno && errno <= -30800)
1008 {
1009 sv_setnv (sv, (NV)errno);
1010 sv_setpv (sv, db_strerror (errno));
1011 SvNOK_on (sv); /* what a wonderful hack! */
1012 // ^^^ copied from perl sources
1013 return 0;
1014 }
1015
1016 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
1017}
1018
1019static MGVTBL vtbl_errno;
1020
1021// this wonderful hack :( patches perl's $! variable to support our errno values
1022static void
1023patch_errno (void)
1024{
1025 SV *sv;
1026 MAGIC *mg;
1027
1028 if (!(sv = get_sv ("!", 1)))
1029 return;
1030
1031 if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
1032 return;
1033
1034 if (mg->mg_virtual != &PL_vtbl_sv)
1035 return;
1036
1037 vtbl_errno = PL_vtbl_sv;
1038 vtbl_errno.svt_get = errno_get;
1039 mg->mg_virtual = &vtbl_errno;
900} 1040}
901 1041
902MODULE = BDB PACKAGE = BDB 1042MODULE = BDB PACKAGE = BDB
903 1043
904PROTOTYPES: ENABLE 1044PROTOTYPES: ENABLE
… …
921 const_iv (INIT_TXN) 1061 const_iv (INIT_TXN)
922 const_iv (RECOVER) 1062 const_iv (RECOVER)
923 const_iv (INIT_TXN) 1063 const_iv (INIT_TXN)
924 const_iv (RECOVER_FATAL) 1064 const_iv (RECOVER_FATAL)
925 const_iv (CREATE) 1065 const_iv (CREATE)
1066 const_iv (RDONLY)
926 const_iv (USE_ENVIRON) 1067 const_iv (USE_ENVIRON)
927 const_iv (USE_ENVIRON_ROOT) 1068 const_iv (USE_ENVIRON_ROOT)
928 const_iv (LOCKDOWN) 1069 const_iv (LOCKDOWN)
929 const_iv (PRIVATE) 1070 const_iv (PRIVATE)
930 const_iv (REGISTER) 1071 const_iv (REGISTER)
… …
936 const_iv (DSYNC_DB) 1077 const_iv (DSYNC_DB)
937 const_iv (DSYNC_LOG) 1078 const_iv (DSYNC_LOG)
938 const_iv (LOG_AUTOREMOVE) 1079 const_iv (LOG_AUTOREMOVE)
939 const_iv (LOG_INMEMORY) 1080 const_iv (LOG_INMEMORY)
940 const_iv (NOLOCKING) 1081 const_iv (NOLOCKING)
941 const_iv (MULTIVERSION)
942 const_iv (NOMMAP) 1082 const_iv (NOMMAP)
943 const_iv (NOPANIC) 1083 const_iv (NOPANIC)
944 const_iv (OVERWRITE) 1084 const_iv (OVERWRITE)
945 const_iv (PANIC_ENVIRONMENT) 1085 const_iv (PANIC_ENVIRONMENT)
946 const_iv (REGION_INIT) 1086 const_iv (REGION_INIT)
947 const_iv (TIME_NOTGRANTED) 1087 const_iv (TIME_NOTGRANTED)
948 const_iv (TXN_NOSYNC) 1088 const_iv (TXN_NOSYNC)
949 const_iv (TXN_SNAPSHOT) 1089 const_iv (TXN_NOT_DURABLE)
950 const_iv (TXN_WRITE_NOSYNC) 1090 const_iv (TXN_WRITE_NOSYNC)
951 const_iv (WRITECURSOR) 1091 const_iv (WRITECURSOR)
952 const_iv (YIELDCPU) 1092 const_iv (YIELDCPU)
953 const_iv (ENCRYPT_AES) 1093 const_iv (ENCRYPT_AES)
954 const_iv (XA_CREATE) 1094 const_iv (XA_CREATE)
… …
962 const_iv (READ_UNCOMMITTED) 1102 const_iv (READ_UNCOMMITTED)
963 const_iv (TRUNCATE) 1103 const_iv (TRUNCATE)
964 const_iv (NOSYNC) 1104 const_iv (NOSYNC)
965 const_iv (CHKSUM) 1105 const_iv (CHKSUM)
966 const_iv (ENCRYPT) 1106 const_iv (ENCRYPT)
967 const_iv (TXN_NOT_DURABLE)
968 const_iv (DUP) 1107 const_iv (DUP)
969 const_iv (DUPSORT) 1108 const_iv (DUPSORT)
970 const_iv (RECNUM) 1109 const_iv (RECNUM)
971 const_iv (RENUMBER) 1110 const_iv (RENUMBER)
972 const_iv (REVSPLITOFF) 1111 const_iv (REVSPLITOFF)
… …
977 const_iv (GET_BOTH_RANGE) 1116 const_iv (GET_BOTH_RANGE)
978 //const_iv (SET_RECNO) 1117 //const_iv (SET_RECNO)
979 //const_iv (MULTIPLE) 1118 //const_iv (MULTIPLE)
980 const_iv (SNAPSHOT) 1119 const_iv (SNAPSHOT)
981 const_iv (JOIN_ITEM) 1120 const_iv (JOIN_ITEM)
1121 const_iv (JOIN_NOSORT)
982 const_iv (RMW) 1122 const_iv (RMW)
983 1123
984 const_iv (NOTFOUND) 1124 const_iv (NOTFOUND)
985 const_iv (KEYEMPTY) 1125 const_iv (KEYEMPTY)
986 const_iv (LOCK_DEADLOCK) 1126 const_iv (LOCK_DEADLOCK)
… …
997 const_iv (APPEND) 1137 const_iv (APPEND)
998 const_iv (NODUPDATA) 1138 const_iv (NODUPDATA)
999 const_iv (NOOVERWRITE) 1139 const_iv (NOOVERWRITE)
1000 1140
1001 const_iv (TXN_NOWAIT) 1141 const_iv (TXN_NOWAIT)
1002 const_iv (TXN_SNAPSHOT)
1003 const_iv (TXN_SYNC) 1142 const_iv (TXN_SYNC)
1004 1143
1005 const_iv (SET_LOCK_TIMEOUT) 1144 const_iv (SET_LOCK_TIMEOUT)
1006 const_iv (SET_TXN_TIMEOUT) 1145 const_iv (SET_TXN_TIMEOUT)
1007 1146
1008 const_iv (JOIN_ITEM)
1009 const_iv (FIRST) 1147 const_iv (FIRST)
1010 const_iv (NEXT) 1148 const_iv (NEXT)
1011 const_iv (NEXT_DUP) 1149 const_iv (NEXT_DUP)
1012 const_iv (NEXT_NODUP) 1150 const_iv (NEXT_NODUP)
1013 const_iv (PREV) 1151 const_iv (PREV)
… …
1035 const_iv (LOCK_YOUNGEST) 1173 const_iv (LOCK_YOUNGEST)
1036 1174
1037 const_iv (SEQ_DEC) 1175 const_iv (SEQ_DEC)
1038 const_iv (SEQ_INC) 1176 const_iv (SEQ_INC)
1039 const_iv (SEQ_WRAP) 1177 const_iv (SEQ_WRAP)
1178
1179 const_iv (BUFFER_SMALL)
1180 const_iv (DONOTINDEX)
1181 const_iv (KEYEMPTY )
1182 const_iv (KEYEXIST )
1183 const_iv (LOCK_DEADLOCK)
1184 const_iv (LOCK_NOTGRANTED)
1185 const_iv (LOG_BUFFER_FULL)
1186 const_iv (NOSERVER)
1187 const_iv (NOSERVER_HOME)
1188 const_iv (NOSERVER_ID)
1189 const_iv (NOTFOUND)
1190 const_iv (PAGE_NOTFOUND)
1191 const_iv (REP_DUPMASTER)
1192 const_iv (REP_HANDLE_DEAD)
1193 const_iv (REP_HOLDELECTION)
1194 const_iv (REP_IGNORE)
1195 const_iv (REP_ISPERM)
1196 const_iv (REP_JOIN_FAILURE)
1197 const_iv (REP_LOCKOUT)
1198 const_iv (REP_NEWMASTER)
1199 const_iv (REP_NEWSITE)
1200 const_iv (REP_NOTPERM)
1201 const_iv (REP_UNAVAIL)
1202 const_iv (RUNRECOVERY)
1203 const_iv (SECONDARY_BAD)
1204 const_iv (VERIFY_BAD)
1205 const_iv (VERSION_MISMATCH)
1206
1207 const_iv (VERB_DEADLOCK)
1208 const_iv (VERB_RECOVERY)
1209 const_iv (VERB_REGISTER)
1210 const_iv (VERB_REPLICATION)
1211 const_iv (VERB_WAITSFOR)
1212
1213 const_iv (VERSION_MAJOR)
1214 const_iv (VERSION_MINOR)
1215 const_iv (VERSION_PATCH)
1216#if DB_VERSION_MINOR >= 5
1217 const_iv (MULTIVERSION)
1218 const_iv (TXN_SNAPSHOT)
1219#endif
1220#if DB_VERSION_MINOR >= 6
1221 const_iv (PREV_DUP)
1222 const_iv (PRIORITY_UNCHANGED)
1223 const_iv (PRIORITY_VERY_LOW)
1224 const_iv (PRIORITY_LOW)
1225 const_iv (PRIORITY_DEFAULT)
1226 const_iv (PRIORITY_HIGH)
1227 const_iv (PRIORITY_VERY_HIGH)
1228#endif
1040 }; 1229 };
1041 1230
1042 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1231 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1043 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1232 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1044 1233
1045 create_pipe (); 1234 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1235 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1236
1237 create_respipe ();
1238
1046 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1239 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1240 patch_errno ();
1047} 1241}
1048 1242
1049void 1243void
1050max_poll_reqs (int nreqs) 1244max_poll_reqs (int nreqs)
1051 PROTOTYPE: $ 1245 PROTOTYPE: $
… …
1170 1364
1171int 1365int
1172nthreads () 1366nthreads ()
1173 PROTOTYPE: 1367 PROTOTYPE:
1174 CODE: 1368 CODE:
1175 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1369 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1176 RETVAL = started; 1370 RETVAL = started;
1177 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1371 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1178 OUTPUT: 1372 OUTPUT:
1179 RETVAL 1373 RETVAL
1180 1374
1181void 1375void
1182set_sync_prepare (SV *cb) 1376set_sync_prepare (SV *cb)
1183 PROTOTYPE: & 1377 PROTOTYPE: &
1184 CODE: 1378 CODE:
1185 SvREFCNT_dec (prepare_cb); 1379 SvREFCNT_dec (prepare_cb);
1186 prepare_cb = newSVsv (cb); 1380 prepare_cb = newSVsv (cb);
1187 1381
1382char *
1383strerror (int errorno = errno)
1384 PROTOTYPE: ;$
1385 CODE:
1386 RETVAL = db_strerror (errorno);
1387 OUTPUT:
1388 RETVAL
1389
1390void _on_next_submit (SV *cb)
1391 CODE:
1392 SvREFCNT_dec (on_next_submit);
1393 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1188 1394
1189DB_ENV * 1395DB_ENV *
1190db_env_create (U32 env_flags = 0) 1396db_env_create (U32 env_flags = 0)
1191 CODE: 1397 CODE:
1192{ 1398{
1193 errno = db_env_create (&RETVAL, env_flags); 1399 errno = db_env_create (&RETVAL, env_flags);
1194 if (errno) 1400 if (errno)
1195 croak ("db_env_create: %s", db_strerror (errno)); 1401 croak ("db_env_create: %s", db_strerror (errno));
1402
1403 if (0)
1404 {
1405 RETVAL->set_errcall (RETVAL, debug_errcall);
1406 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1407 }
1196} 1408}
1197 OUTPUT: 1409 OUTPUT:
1198 RETVAL 1410 RETVAL
1199 1411
1200void 1412void
1201db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1413db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1202 CODE: 1414 CODE:
1203{ 1415{
1204 env->set_thread_count (env, get_nthreads ());
1205
1206 dREQ (REQ_ENV_OPEN); 1416 dREQ (REQ_ENV_OPEN);
1417
1207 req->env = env; 1418 req->env = env;
1208 req->uint1 = open_flags | DB_THREAD; 1419 req->uint1 = open_flags | DB_THREAD;
1209 req->int1 = mode; 1420 req->int1 = mode;
1210 req->buf1 = strdup_ornull (db_home); 1421 req->buf1 = strdup_ornull (db_home);
1211 REQ_SEND; 1422 REQ_SEND;
… …
1278} 1489}
1279 OUTPUT: 1490 OUTPUT:
1280 RETVAL 1491 RETVAL
1281 1492
1282void 1493void
1283db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1494db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
1284 CODE: 1495 CODE:
1285{ 1496{
1286 dREQ (REQ_DB_OPEN); 1497 dREQ (REQ_DB_OPEN);
1287 req->db = db; 1498 req->db = db;
1288 req->txn = txnid; 1499 req->txn = txnid;
… …
1328 req->uint1 = flags; 1539 req->uint1 = flags;
1329 REQ_SEND; 1540 REQ_SEND;
1330} 1541}
1331 1542
1332void 1543void
1544db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
1545 CODE:
1546{
1547 dREQ (REQ_DB_SYNC);
1548 req->db = db;
1549 req->buf1 = strdup (file);
1550 req->uint1 = flags;
1551 REQ_SEND;
1552}
1553
1554void
1333db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1555db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1334 CODE: 1556 CODE:
1335{ 1557{
1336 dREQ (REQ_DB_KEY_RANGE); 1558 dREQ (REQ_DB_KEY_RANGE);
1337 req->db = db; 1559 req->db = db;
… …
1356} 1578}
1357 1579
1358void 1580void
1359db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1581db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1360 CODE: 1582 CODE:
1583 if (SvREADONLY (data))
1584 croak ("can't modify read-only data scalar in db_get");
1361{ 1585{
1362 dREQ (REQ_DB_GET); 1586 dREQ (REQ_DB_GET);
1363 req->db = db; 1587 req->db = db;
1364 req->txn = txn; 1588 req->txn = txn;
1365 req->uint1 = flags; 1589 req->uint1 = flags;
… …
1370} 1594}
1371 1595
1372void 1596void
1373db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1597db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1374 CODE: 1598 CODE:
1599 if (SvREADONLY (data))
1600 croak ("can't modify read-only data scalar in db_pget");
1375{ 1601{
1376 dREQ (REQ_DB_PGET); 1602 dREQ (REQ_DB_PGET);
1377 req->db = db; 1603 req->db = db;
1378 req->txn = txn; 1604 req->txn = txn;
1379 req->uint1 = flags; 1605 req->uint1 = flags;
… …
1416 REQ_SEND; 1642 REQ_SEND;
1417 ptr_nuke (ST (0)); 1643 ptr_nuke (ST (0));
1418} 1644}
1419 1645
1420void 1646void
1647db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1648 CODE:
1649{
1650 dREQ (REQ_TXN_FINISH);
1651 req->txn = txn;
1652 req->uint1 = flags;
1653 REQ_SEND;
1654 ptr_nuke (ST (0));
1655}
1656
1657void
1421db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1658db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1422 CODE: 1659 CODE:
1423{ 1660{
1424 dREQ (REQ_C_CLOSE); 1661 dREQ (REQ_C_CLOSE);
1425 req->dbc = dbc; 1662 req->dbc = dbc;
… …
1562 1799
1563 1800
1564MODULE = BDB PACKAGE = BDB::Env 1801MODULE = BDB PACKAGE = BDB::Env
1565 1802
1566void 1803void
1567DESTROY (DB_ENV_ornull *env) 1804DESTROY (DB_ENV_ornuked *env)
1568 CODE: 1805 CODE:
1569 if (env) 1806 if (env)
1570 env->close (env, 0); 1807 env->close (env, 0);
1571 1808
1572int set_data_dir (DB_ENV *env, const char *dir) 1809int set_data_dir (DB_ENV *env, const char *dir)
… …
1597 CODE: 1834 CODE:
1598 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1835 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1599 OUTPUT: 1836 OUTPUT:
1600 RETVAL 1837 RETVAL
1601 1838
1602int set_flags (DB_ENV *env, U32 flags, int onoff) 1839int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1603 CODE: 1840 CODE:
1604 RETVAL = env->set_flags (env, flags, onoff); 1841 RETVAL = env->set_flags (env, flags, onoff);
1605 OUTPUT: 1842 OUTPUT:
1606 RETVAL 1843 RETVAL
1607 1844
1845void set_errfile (DB_ENV *env, FILE *errfile = 0)
1846 CODE:
1847 env->set_errfile (env, errfile);
1848
1849void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1850 CODE:
1851 env->set_msgfile (env, msgfile);
1852
1853int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1854 CODE:
1855 RETVAL = env->set_verbose (env, which, onoff);
1856 OUTPUT:
1857 RETVAL
1858
1608int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1859int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1609 CODE: 1860 CODE:
1610 RETVAL = env->set_encrypt (env, password, flags); 1861 RETVAL = env->set_encrypt (env, password, flags);
1611 OUTPUT: 1862 OUTPUT:
1612 RETVAL 1863 RETVAL
1613 1864
1614int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1865int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1615 CODE: 1866 CODE:
1616 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1867 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1617 OUTPUT: 1868 OUTPUT:
1618 RETVAL 1869 RETVAL
1619 1870
… …
1667 1918
1668int set_lg_max (DB_ENV *env, U32 max) 1919int set_lg_max (DB_ENV *env, U32 max)
1669 CODE: 1920 CODE:
1670 RETVAL = env->set_lg_max (env, max); 1921 RETVAL = env->set_lg_max (env, max);
1671 OUTPUT: 1922 OUTPUT:
1923 RETVAL
1924
1925int mutex_set_max (DB_ENV *env, U32 max)
1926 CODE:
1927 RETVAL = env->mutex_set_max (env, max);
1928 OUTPUT:
1929 RETVAL
1930
1931int mutex_set_increment (DB_ENV *env, U32 increment)
1932 CODE:
1933 RETVAL = env->mutex_set_increment (env, increment);
1934 OUTPUT:
1935 RETVAL
1936
1937int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1938 CODE:
1939 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1940 OUTPUT:
1941 RETVAL
1942
1943int mutex_set_align (DB_ENV *env, U32 align)
1944 CODE:
1945 RETVAL = env->mutex_set_align (env, align);
1946 OUTPUT:
1672 RETVAL 1947 RETVAL
1673 1948
1674DB_TXN * 1949DB_TXN *
1675txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1950txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1676 CODE: 1951 CODE:
… …
1681 RETVAL 1956 RETVAL
1682 1957
1683MODULE = BDB PACKAGE = BDB::Db 1958MODULE = BDB PACKAGE = BDB::Db
1684 1959
1685void 1960void
1686DESTROY (DB_ornull *db) 1961DESTROY (DB_ornuked *db)
1687 CODE: 1962 CODE:
1688 if (db) 1963 if (db)
1689 { 1964 {
1690 SV *env = (SV *)db->app_private; 1965 SV *env = (SV *)db->app_private;
1691 db->close (db, 0); 1966 db->close (db, 0);
… …
1696 CODE: 1971 CODE:
1697 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1972 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1698 OUTPUT: 1973 OUTPUT:
1699 RETVAL 1974 RETVAL
1700 1975
1701int set_flags (DB *db, U32 flags); 1976int set_flags (DB *db, U32 flags)
1702 CODE: 1977 CODE:
1703 RETVAL = db->set_flags (db, flags); 1978 RETVAL = db->set_flags (db, flags);
1704 OUTPUT: 1979 OUTPUT:
1705 RETVAL 1980 RETVAL
1706 1981
… …
1720 CODE: 1995 CODE:
1721 RETVAL = db->set_bt_minkey (db, minkey); 1996 RETVAL = db->set_bt_minkey (db, minkey);
1722 OUTPUT: 1997 OUTPUT:
1723 RETVAL 1998 RETVAL
1724 1999
1725int set_re_delim(DB *db, int delim); 2000int set_re_delim (DB *db, int delim)
1726 CODE: 2001 CODE:
1727 RETVAL = db->set_re_delim (db, delim); 2002 RETVAL = db->set_re_delim (db, delim);
1728 OUTPUT: 2003 OUTPUT:
1729 RETVAL 2004 RETVAL
1730 2005
… …
1786 2061
1787 2062
1788MODULE = BDB PACKAGE = BDB::Txn 2063MODULE = BDB PACKAGE = BDB::Txn
1789 2064
1790void 2065void
1791DESTROY (DB_TXN_ornull *txn) 2066DESTROY (DB_TXN_ornuked *txn)
1792 CODE: 2067 CODE:
1793 if (txn) 2068 if (txn)
1794 txn->abort (txn); 2069 txn->abort (txn);
1795 2070
1796int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 2071int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1797 CODE: 2072 CODE:
1798 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 2073 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1799 OUTPUT: 2074 OUTPUT:
1800 RETVAL 2075 RETVAL
1801 2076
2077int failed (DB_TXN *txn)
2078 CODE:
2079 RETVAL = !!(txn->flags & TXN_DEADLOCK);
2080 OUTPUT:
2081 RETVAL
2082
1802 2083
1803MODULE = BDB PACKAGE = BDB::Cursor 2084MODULE = BDB PACKAGE = BDB::Cursor
1804 2085
1805void 2086void
1806DESTROY (DBC_ornull *dbc) 2087DESTROY (DBC_ornuked *dbc)
1807 CODE: 2088 CODE:
1808 if (dbc) 2089 if (dbc)
1809 dbc->c_close (dbc); 2090 dbc->c_close (dbc);
1810 2091
2092#if DB_VERSION_MINOR >= 6
2093
2094int set_priority (DBC *dbc, int priority)
2095 CODE:
2096 dbc->set_priority (dbc, priority);
2097
2098#endif
2099
1811MODULE = BDB PACKAGE = BDB::Sequence 2100MODULE = BDB PACKAGE = BDB::Sequence
1812 2101
1813void 2102void
1814DESTROY (DB_SEQUENCE_ornull *seq) 2103DESTROY (DB_SEQUENCE_ornuked *seq)
1815 CODE: 2104 CODE:
1816 if (seq) 2105 if (seq)
1817 seq->close (seq, 0); 2106 seq->close (seq, 0);
1818 2107
1819int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2108int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
1838 CODE: 2127 CODE:
1839 RETVAL = seq->set_range (seq, min, max); 2128 RETVAL = seq->set_range (seq, min, max);
1840 OUTPUT: 2129 OUTPUT:
1841 RETVAL 2130 RETVAL
1842 2131
2132

Diff Legend

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