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

Comparing BDB/BDB.xs (file contents):
Revision 1.20 by root, Tue Dec 4 10:13:50 2007 UTC vs.
Revision 1.38 by root, Wed May 21 19:13:43 2008 UTC

… …
40typedef DB_TXN DB_TXN_ornull; 40typedef DB_TXN DB_TXN_ornull;
41typedef DBC DBC_ornull; 41typedef DBC DBC_ornull;
42typedef DB DB_ornull; 42typedef DB DB_ornull;
43typedef DB_SEQUENCE DB_SEQUENCE_ornull; 43typedef DB_SEQUENCE DB_SEQUENCE_ornull;
44 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
45typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
46typedef char *octetstring; 52typedef char *bdb_filename;
47 53
48static SV *prepare_cb; 54static SV *prepare_cb;
49 55
50#if DB_VERSION_MINOR >= 6 56#if DB_VERSION_MINOR >= 6
51# define c_close close 57# define c_close close
… …
55# define c_get get 61# define c_get get
56# define c_pget pget 62# define c_pget pget
57# define c_put put 63# define c_put put
58#endif 64#endif
59 65
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
60static void 96static void
61debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg) 97debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
62{ 98{
63 printf ("err[%s]\n", msg); 99 printf ("err[%s]\n", msg);
64} 100}
… …
102 138
103enum { 139enum {
104 REQ_QUIT, 140 REQ_QUIT,
105 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,
106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
107 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,
108 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,
109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 145 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
110 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,
111 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,
112}; 148};
113 149
114typedef struct aio_cb 150typedef struct bdb_cb
115{ 151{
116 struct aio_cb *volatile next; 152 struct bdb_cb *volatile next;
117 SV *callback; 153 SV *callback;
118 int type, pri, result; 154 int type, pri, result;
119 155
120 DB_ENV *env; 156 DB_ENV *env;
121 DB *db; 157 DB *db;
… …
130 166
131 DBT dbt1, dbt2, dbt3; 167 DBT dbt1, dbt2, dbt3;
132 DB_KEY_RANGE key_range; 168 DB_KEY_RANGE key_range;
133 DB_SEQUENCE *seq; 169 DB_SEQUENCE *seq;
134 db_seq_t seq_t; 170 db_seq_t seq_t;
135} aio_cb; 171} bdb_cb;
136 172
137typedef aio_cb *aio_req; 173typedef bdb_cb *bdb_req;
138 174
139enum { 175enum {
140 PRI_MIN = -4, 176 PRI_MIN = -4,
141 PRI_MAX = 4, 177 PRI_MAX = 4,
142 178
… …
145 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 181 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
146}; 182};
147 183
148#define AIO_TICKS ((1000000 + 1023) >> 10) 184#define AIO_TICKS ((1000000 + 1023) >> 10)
149 185
186static SV *on_next_submit;
187
150static unsigned int max_poll_time = 0; 188static unsigned int max_poll_time = 0;
151static unsigned int max_poll_reqs = 0; 189static unsigned int max_poll_reqs = 0;
152 190
153/* calculcate time difference in ~1/AIO_TICKS of a second */ 191/* calculcate time difference in ~1/AIO_TICKS of a second */
154static int tvdiff (struct timeval *tv1, struct timeval *tv2) 192static int tvdiff (struct timeval *tv1, struct timeval *tv2)
… …
169 struct worker *prev, *next; 207 struct worker *prev, *next;
170 208
171 thread_t tid; 209 thread_t tid;
172 210
173 /* locked by reslock, reqlock or wrklock */ 211 /* locked by reslock, reqlock or wrklock */
174 aio_req req; /* currently processed request */ 212 bdb_req req; /* currently processed request */
175 void *dbuf; 213 void *dbuf;
176 DIR *dirp; 214 DIR *dirp;
177} worker; 215} worker;
178 216
179static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 217static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
199static mutex_t reqlock = X_MUTEX_INIT; 237static mutex_t reqlock = X_MUTEX_INIT;
200static cond_t reqwait = X_COND_INIT; 238static cond_t reqwait = X_COND_INIT;
201 239
202#if WORDACCESS_UNSAFE 240#if WORDACCESS_UNSAFE
203 241
204static unsigned int get_nready () 242static unsigned int get_nready (void)
205{ 243{
206 unsigned int retval; 244 unsigned int retval;
207 245
208 X_LOCK (reqlock); 246 X_LOCK (reqlock);
209 retval = nready; 247 retval = nready;
210 X_UNLOCK (reqlock); 248 X_UNLOCK (reqlock);
211 249
212 return retval; 250 return retval;
213} 251}
214 252
215static unsigned int get_npending () 253static unsigned int get_npending (void)
216{ 254{
217 unsigned int retval; 255 unsigned int retval;
218 256
219 X_LOCK (reslock); 257 X_LOCK (reslock);
220 retval = npending; 258 retval = npending;
221 X_UNLOCK (reslock); 259 X_UNLOCK (reslock);
222 260
223 return retval; 261 return retval;
224} 262}
225 263
226static unsigned int get_nthreads () 264static unsigned int get_nthreads (void)
227{ 265{
228 unsigned int retval; 266 unsigned int retval;
229 267
230 X_LOCK (wrklock); 268 X_LOCK (wrklock);
231 retval = started; 269 retval = started;
… …
246 * a somewhat faster data structure might be nice, but 284 * a somewhat faster data structure might be nice, but
247 * with 8 priorities this actually needs <20 insns 285 * with 8 priorities this actually needs <20 insns
248 * per shift, the most expensive operation. 286 * per shift, the most expensive operation.
249 */ 287 */
250typedef struct { 288typedef struct {
251 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 289 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
252 int size; 290 int size;
253} reqq; 291} reqq;
254 292
255static reqq req_queue; 293static reqq req_queue;
256static reqq res_queue; 294static reqq res_queue;
257 295
258int reqq_push (reqq *q, aio_req req) 296int reqq_push (reqq *q, bdb_req req)
259{ 297{
260 int pri = req->pri; 298 int pri = req->pri;
261 req->next = 0; 299 req->next = 0;
262 300
263 if (q->qe[pri]) 301 if (q->qe[pri])
… …
269 q->qe[pri] = q->qs[pri] = req; 307 q->qe[pri] = q->qs[pri] = req;
270 308
271 return q->size++; 309 return q->size++;
272} 310}
273 311
274aio_req reqq_shift (reqq *q) 312bdb_req reqq_shift (reqq *q)
275{ 313{
276 int pri; 314 int pri;
277 315
278 if (!q->size) 316 if (!q->size)
279 return 0; 317 return 0;
280 318
281 --q->size; 319 --q->size;
282 320
283 for (pri = NUM_PRI; pri--; ) 321 for (pri = NUM_PRI; pri--; )
284 { 322 {
285 aio_req req = q->qs[pri]; 323 bdb_req req = q->qs[pri];
286 324
287 if (req) 325 if (req)
288 { 326 {
289 if (!(q->qs[pri] = req->next)) 327 if (!(q->qs[pri] = req->next))
290 q->qe[pri] = 0; 328 q->qe[pri] = 0;
… …
294 } 332 }
295 333
296 abort (); 334 abort ();
297} 335}
298 336
299static int poll_cb (); 337static int poll_cb (void);
300static void req_free (aio_req req); 338static void req_free (bdb_req req);
301static void req_cancel (aio_req req); 339static void req_cancel (bdb_req req);
302 340
303static int req_invoke (aio_req req) 341static int req_invoke (bdb_req req)
304{ 342{
305 dSP; 343 dSP;
306 344
307 if (SvOK (req->callback)) 345 if (SvOK (req->callback))
308 { 346 {
… …
326 dbt_to_sv (req->sv1, &req->dbt1); 364 dbt_to_sv (req->sv1, &req->dbt1);
327 dbt_to_sv (req->sv2, &req->dbt2); 365 dbt_to_sv (req->sv2, &req->dbt2);
328 dbt_to_sv (req->sv3, &req->dbt3); 366 dbt_to_sv (req->sv3, &req->dbt3);
329 break; 367 break;
330 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
331 case REQ_DB_KEY_RANGE: 375 case REQ_DB_KEY_RANGE:
332 { 376 {
333 AV *av = newAV (); 377 AV *av = newAV ();
334 378
335 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
… …
344 388
345 case REQ_SEQ_GET: 389 case REQ_SEQ_GET:
346 SvREADONLY_off (req->sv1); 390 SvREADONLY_off (req->sv1);
347 391
348 if (sizeof (IV) > 4) 392 if (sizeof (IV) > 4)
349 sv_setiv_mg (req->sv1, req->seq_t); 393 sv_setiv_mg (req->sv1, (IV)req->seq_t);
350 else 394 else
351 sv_setnv_mg (req->sv1, req->seq_t); 395 sv_setnv_mg (req->sv1, (NV)req->seq_t);
352 396
353 SvREFCNT_dec (req->sv1); 397 SvREFCNT_dec (req->sv1);
354 break; 398 break;
355 } 399 }
356 400
… …
365 } 409 }
366 410
367 return !SvTRUE (ERRSV); 411 return !SvTRUE (ERRSV);
368} 412}
369 413
370static void req_free (aio_req req) 414static void req_free (bdb_req req)
371{ 415{
372 free (req->buf1); 416 free (req->buf1);
373 free (req->buf2); 417 free (req->buf2);
374 Safefree (req); 418 Safefree (req);
375} 419}
… …
379#else 423#else
380# define TO_SOCKET(x) (x) 424# define TO_SOCKET(x) (x)
381#endif 425#endif
382 426
383static void 427static void
384create_respipe () 428create_respipe (void)
385{ 429{
430#ifdef _WIN32
431 int arg; /* argg */
432#endif
386 int old_readfd = respipe [0]; 433 int old_readfd = respipe [0];
387 434
388 if (respipe [1] >= 0) 435 if (respipe [1] >= 0)
389 respipe_close (TO_SOCKET (respipe [1])); 436 respipe_close (TO_SOCKET (respipe [1]));
390 437
… …
403 respipe_close (respipe [0]); 450 respipe_close (respipe [0]);
404 respipe [0] = old_readfd; 451 respipe [0] = old_readfd;
405 } 452 }
406 453
407#ifdef _WIN32 454#ifdef _WIN32
408 int arg = 1; 455 arg = 1;
409 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) 456 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
410 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) 457 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
411#else 458#else
412 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) 459 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
413 || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 460 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
… …
440 free (wrk); 487 free (wrk);
441 488
442 X_UNLOCK (wrklock); 489 X_UNLOCK (wrklock);
443} 490}
444 491
445static void maybe_start_thread () 492static void maybe_start_thread (void)
446{ 493{
447 if (get_nthreads () >= wanted) 494 if (get_nthreads () >= wanted)
448 return; 495 return;
449 496
450 /* todo: maybe use idle here, but might be less exact */ 497 /* todo: maybe use idle here, but might be less exact */
… …
452 return; 499 return;
453 500
454 start_thread (); 501 start_thread ();
455} 502}
456 503
457static void req_send (aio_req req) 504static void req_send (bdb_req req)
458{ 505{
459 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 }
460 519
461 // synthesize callback if none given 520 // synthesize callback if none given
462 if (!SvOK (req->callback)) 521 if (!SvOK (req->callback))
463 { 522 {
464 int count; 523 int count;
… …
470 SPAGAIN; 529 SPAGAIN;
471 530
472 if (count != 2) 531 if (count != 2)
473 croak ("prepare callback must return exactly two values\n"); 532 croak ("prepare callback must return exactly two values\n");
474 533
475 wait_callback = SvREFCNT_inc (POPs); 534 wait_callback = POPs;
476 SvREFCNT_dec (req->callback); 535 SvREFCNT_dec (req->callback);
477 req->callback = SvREFCNT_inc (POPs); 536 req->callback = SvREFCNT_inc (POPs);
478 } 537 }
479 538
480 ++nreqs; 539 ++nreqs;
… …
491 { 550 {
492 dSP; 551 dSP;
493 PUSHMARK (SP); 552 PUSHMARK (SP);
494 PUTBACK; 553 PUTBACK;
495 call_sv (wait_callback, G_DISCARD); 554 call_sv (wait_callback, G_DISCARD);
496 SvREFCNT_dec (wait_callback);
497 } 555 }
498} 556}
499 557
500static void end_thread (void) 558static void end_thread (void)
501{ 559{
502 aio_req req; 560 bdb_req req;
503 561
504 Newz (0, req, 1, aio_cb); 562 Newz (0, req, 1, bdb_cb);
505 563
506 req->type = REQ_QUIT; 564 req->type = REQ_QUIT;
507 req->pri = PRI_MAX + PRI_BIAS; 565 req->pri = PRI_MAX + PRI_BIAS;
508 566
509 X_LOCK (reqlock); 567 X_LOCK (reqlock);
… …
536 594
537 while (started > wanted) 595 while (started > wanted)
538 end_thread (); 596 end_thread ();
539} 597}
540 598
541static void poll_wait () 599static void poll_wait (void)
542{ 600{
543 fd_set rfd; 601 fd_set rfd;
544 602
545 while (nreqs) 603 while (nreqs)
546 { 604 {
… …
559 617
560 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 618 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
561 } 619 }
562} 620}
563 621
564static int poll_cb () 622static int poll_cb (void)
565{ 623{
566 dSP; 624 dSP;
567 int count = 0; 625 int count = 0;
568 int maxreqs = max_poll_reqs; 626 int maxreqs = max_poll_reqs;
569 int do_croak = 0; 627 int do_croak = 0;
570 struct timeval tv_start, tv_now; 628 struct timeval tv_start, tv_now;
571 aio_req req; 629 bdb_req req;
572 630
573 if (max_poll_time) 631 if (max_poll_time)
574 gettimeofday (&tv_start, 0); 632 gettimeofday (&tv_start, 0);
575 633
576 for (;;) 634 for (;;)
… …
637 695
638/*****************************************************************************/ 696/*****************************************************************************/
639 697
640X_THREAD_PROC (bdb_proc) 698X_THREAD_PROC (bdb_proc)
641{ 699{
642 aio_req req; 700 bdb_req req;
643 struct timespec ts; 701 struct timespec ts;
644 worker *self = (worker *)thr_arg; 702 worker *self = (worker *)thr_arg;
645 703
646 /* try to distribute timeouts somewhat evenly */ 704 /* try to distribute timeouts somewhat evenly */
647 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 705 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
730 788
731 case REQ_DB_SYNC: 789 case REQ_DB_SYNC:
732 req->result = req->db->sync (req->db, req->uint1); 790 req->result = req->db->sync (req->db, req->uint1);
733 break; 791 break;
734 792
793 case REQ_DB_UPGRADE:
794 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
795 break;
796
735 case REQ_DB_PUT: 797 case REQ_DB_PUT:
736 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);
737 break; 799 break;
738 800
739 case REQ_DB_GET: 801 case REQ_DB_GET:
… …
861 X_UNLOCK (wrklock); 923 X_UNLOCK (wrklock);
862} 924}
863 925
864static void atfork_child (void) 926static void atfork_child (void)
865{ 927{
866 aio_req prv; 928 bdb_req prv;
867 929
868 while (prv = reqq_shift (&req_queue)) 930 while (prv = reqq_shift (&req_queue))
869 req_free (prv); 931 req_free (prv);
870 932
871 while (prv = reqq_shift (&res_queue)) 933 while (prv = reqq_shift (&res_queue))
… …
892 954
893 atfork_parent (); 955 atfork_parent ();
894} 956}
895 957
896#define dREQ(reqtype) \ 958#define dREQ(reqtype) \
897 aio_req req; \ 959 bdb_req req; \
898 int req_pri = next_pri; \ 960 int req_pri = next_pri; \
899 next_pri = DEFAULT_PRI + PRI_BIAS; \ 961 next_pri = DEFAULT_PRI + PRI_BIAS; \
900 \ 962 \
901 if (SvOK (callback) && !SvROK (callback)) \ 963 if (SvOK (callback) && !SvROK (callback)) \
902 croak ("callback must be undef or of reference type"); \ 964 croak ("callback must be undef or of reference type"); \
903 \ 965 \
904 Newz (0, req, 1, aio_cb); \ 966 Newz (0, req, 1, bdb_cb); \
905 if (!req) \ 967 if (!req) \
906 croak ("out of memory during aio_req allocation"); \ 968 croak ("out of memory during bdb_req allocation"); \
907 \ 969 \
908 req->callback = newSVsv (callback); \ 970 req->callback = newSVsv (callback); \
909 req->type = (reqtype); \ 971 req->type = (reqtype); \
910 req->pri = req_pri 972 req->pri = req_pri
911 973
912#define REQ_SEND \ 974#define REQ_SEND \
913 req_send (req) 975 req_send (req)
914 976
915#define SvPTR(var, arg, type, class, nullok) \ 977#define SvPTR(var, arg, type, class, nullok) \
916 if (!SvOK (arg)) \ 978 if (!SvOK (arg)) \
917 { \ 979 { \
918 if (!nullok) \ 980 if (nullok != 1) \
919 croak (# var " must be a " # class " object, not undef"); \ 981 croak (# var " must be a " # class " object, not undef"); \
920 \ 982 \
921 (var) = 0; \ 983 (var) = 0; \
922 } \ 984 } \
923 else if (sv_derived_from ((arg), # class)) \ 985 else if (sv_derived_from ((arg), # class)) \
924 { \ 986 { \
925 IV tmp = SvIV ((SV*) SvRV (arg)); \ 987 IV tmp = SvIV ((SV*) SvRV (arg)); \
926 (var) = INT2PTR (type, tmp); \ 988 (var) = INT2PTR (type, tmp); \
927 if (!var) \ 989 if (!var && nullok != 2) \
928 croak (# var " is not a valid " # class " object anymore"); \ 990 croak (# var " is not a valid " # class " object anymore"); \
929 } \ 991 } \
930 else \ 992 else \
931 croak (# var " is not of type " # class); \ 993 croak (# var " is not of type " # class); \
932 \ 994 \
… …
934static void 996static void
935ptr_nuke (SV *sv) 997ptr_nuke (SV *sv)
936{ 998{
937 assert (SvROK (sv)); 999 assert (SvROK (sv));
938 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;
939} 1040}
940 1041
941MODULE = BDB PACKAGE = BDB 1042MODULE = BDB PACKAGE = BDB
942 1043
943PROTOTYPES: ENABLE 1044PROTOTYPES: ENABLE
… …
1015 const_iv (GET_BOTH_RANGE) 1116 const_iv (GET_BOTH_RANGE)
1016 //const_iv (SET_RECNO) 1117 //const_iv (SET_RECNO)
1017 //const_iv (MULTIPLE) 1118 //const_iv (MULTIPLE)
1018 const_iv (SNAPSHOT) 1119 const_iv (SNAPSHOT)
1019 const_iv (JOIN_ITEM) 1120 const_iv (JOIN_ITEM)
1121 const_iv (JOIN_NOSORT)
1020 const_iv (RMW) 1122 const_iv (RMW)
1021 1123
1022 const_iv (NOTFOUND) 1124 const_iv (NOTFOUND)
1023 const_iv (KEYEMPTY) 1125 const_iv (KEYEMPTY)
1024 const_iv (LOCK_DEADLOCK) 1126 const_iv (LOCK_DEADLOCK)
… …
1040 const_iv (TXN_SYNC) 1142 const_iv (TXN_SYNC)
1041 1143
1042 const_iv (SET_LOCK_TIMEOUT) 1144 const_iv (SET_LOCK_TIMEOUT)
1043 const_iv (SET_TXN_TIMEOUT) 1145 const_iv (SET_TXN_TIMEOUT)
1044 1146
1045 const_iv (JOIN_ITEM)
1046 const_iv (FIRST) 1147 const_iv (FIRST)
1047 const_iv (NEXT) 1148 const_iv (NEXT)
1048 const_iv (NEXT_DUP) 1149 const_iv (NEXT_DUP)
1049 const_iv (NEXT_NODUP) 1150 const_iv (NEXT_NODUP)
1050 const_iv (PREV) 1151 const_iv (PREV)
… …
1084 const_iv (LOG_BUFFER_FULL) 1185 const_iv (LOG_BUFFER_FULL)
1085 const_iv (NOSERVER) 1186 const_iv (NOSERVER)
1086 const_iv (NOSERVER_HOME) 1187 const_iv (NOSERVER_HOME)
1087 const_iv (NOSERVER_ID) 1188 const_iv (NOSERVER_ID)
1088 const_iv (NOTFOUND) 1189 const_iv (NOTFOUND)
1089 const_iv (OLD_VERSION)
1090 const_iv (PAGE_NOTFOUND) 1190 const_iv (PAGE_NOTFOUND)
1091 const_iv (REP_DUPMASTER) 1191 const_iv (REP_DUPMASTER)
1092 const_iv (REP_HANDLE_DEAD) 1192 const_iv (REP_HANDLE_DEAD)
1093 const_iv (REP_HOLDELECTION) 1193 const_iv (REP_HOLDELECTION)
1094 const_iv (REP_IGNORE) 1194 const_iv (REP_IGNORE)
… …
1117 const_iv (MULTIVERSION) 1217 const_iv (MULTIVERSION)
1118 const_iv (TXN_SNAPSHOT) 1218 const_iv (TXN_SNAPSHOT)
1119#endif 1219#endif
1120#if DB_VERSION_MINOR >= 6 1220#if DB_VERSION_MINOR >= 6
1121 const_iv (PREV_DUP) 1221 const_iv (PREV_DUP)
1122# if 0
1123 const_iv (PRIORITY_UNCHANGED) 1222 const_iv (PRIORITY_UNCHANGED)
1124 const_iv (PRIORITY_VERY_LOW) 1223 const_iv (PRIORITY_VERY_LOW)
1125 const_iv (PRIORITY_LOW) 1224 const_iv (PRIORITY_LOW)
1126 const_iv (PRIORITY_DEFAULT) 1225 const_iv (PRIORITY_DEFAULT)
1127 const_iv (PRIORITY_HIGH) 1226 const_iv (PRIORITY_HIGH)
1128 const_iv (PRIORITY_VERY_HIGH) 1227 const_iv (PRIORITY_VERY_HIGH)
1129# endif
1130#endif 1228#endif
1131 }; 1229 };
1132 1230
1133 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; )
1134 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1232 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1135 1233
1136 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1234 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1137 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1235 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1138 1236
1139 create_respipe (); 1237 create_respipe ();
1140 1238
1141 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1239 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1142#ifdef _WIN32 1240 patch_errno ();
1143 X_MUTEX_CHECK (wrklock);
1144 X_MUTEX_CHECK (reslock);
1145 X_MUTEX_CHECK (reqlock);
1146
1147 X_COND_CHECK (reqwait);
1148#endif
1149} 1241}
1150 1242
1151void 1243void
1152max_poll_reqs (int nreqs) 1244max_poll_reqs (int nreqs)
1153 PROTOTYPE: $ 1245 PROTOTYPE: $
… …
1293 CODE: 1385 CODE:
1294 RETVAL = db_strerror (errorno); 1386 RETVAL = db_strerror (errorno);
1295 OUTPUT: 1387 OUTPUT:
1296 RETVAL 1388 RETVAL
1297 1389
1390void _on_next_submit (SV *cb)
1391 CODE:
1392 SvREFCNT_dec (on_next_submit);
1393 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1394
1298DB_ENV * 1395DB_ENV *
1299db_env_create (U32 env_flags = 0) 1396db_env_create (U32 env_flags = 0)
1300 CODE: 1397 CODE:
1301{ 1398{
1302 errno = db_env_create (&RETVAL, env_flags); 1399 errno = db_env_create (&RETVAL, env_flags);
… …
1311} 1408}
1312 OUTPUT: 1409 OUTPUT:
1313 RETVAL 1410 RETVAL
1314 1411
1315void 1412void
1316db_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)
1317 CODE: 1414 CODE:
1318{ 1415{
1319 dREQ (REQ_ENV_OPEN); 1416 dREQ (REQ_ENV_OPEN);
1320
1321 env->set_thread_count (env, wanted + 2);
1322 1417
1323 req->env = env; 1418 req->env = env;
1324 req->uint1 = open_flags | DB_THREAD; 1419 req->uint1 = open_flags | DB_THREAD;
1325 req->int1 = mode; 1420 req->int1 = mode;
1326 req->buf1 = strdup_ornull (db_home); 1421 req->buf1 = strdup_ornull (db_home);
… …
1394} 1489}
1395 OUTPUT: 1490 OUTPUT:
1396 RETVAL 1491 RETVAL
1397 1492
1398void 1493void
1399db_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)
1400 CODE: 1495 CODE:
1401{ 1496{
1402 dREQ (REQ_DB_OPEN); 1497 dREQ (REQ_DB_OPEN);
1403 req->db = db; 1498 req->db = db;
1404 req->txn = txnid; 1499 req->txn = txnid;
… …
1444 req->uint1 = flags; 1539 req->uint1 = flags;
1445 REQ_SEND; 1540 REQ_SEND;
1446} 1541}
1447 1542
1448void 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
1449db_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)
1450 CODE: 1556 CODE:
1451{ 1557{
1452 dREQ (REQ_DB_KEY_RANGE); 1558 dREQ (REQ_DB_KEY_RANGE);
1453 req->db = db; 1559 req->db = db;
… …
1472} 1578}
1473 1579
1474void 1580void
1475db_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)
1476 CODE: 1582 CODE:
1583 if (SvREADONLY (data))
1584 croak ("can't modify read-only data scalar in db_get");
1477{ 1585{
1478 dREQ (REQ_DB_GET); 1586 dREQ (REQ_DB_GET);
1479 req->db = db; 1587 req->db = db;
1480 req->txn = txn; 1588 req->txn = txn;
1481 req->uint1 = flags; 1589 req->uint1 = flags;
… …
1486} 1594}
1487 1595
1488void 1596void
1489db_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)
1490 CODE: 1598 CODE:
1599 if (SvREADONLY (data))
1600 croak ("can't modify read-only data scalar in db_pget");
1491{ 1601{
1492 dREQ (REQ_DB_PGET); 1602 dREQ (REQ_DB_PGET);
1493 req->db = db; 1603 req->db = db;
1494 req->txn = txn; 1604 req->txn = txn;
1495 req->uint1 = flags; 1605 req->uint1 = flags;
… …
1689 1799
1690 1800
1691MODULE = BDB PACKAGE = BDB::Env 1801MODULE = BDB PACKAGE = BDB::Env
1692 1802
1693void 1803void
1694DESTROY (DB_ENV_ornull *env) 1804DESTROY (DB_ENV_ornuked *env)
1695 CODE: 1805 CODE:
1696 if (env) 1806 if (env)
1697 env->close (env, 0); 1807 env->close (env, 0);
1698 1808
1699int set_data_dir (DB_ENV *env, const char *dir) 1809int set_data_dir (DB_ENV *env, const char *dir)
… …
1724 CODE: 1834 CODE:
1725 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1835 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1726 OUTPUT: 1836 OUTPUT:
1727 RETVAL 1837 RETVAL
1728 1838
1729int set_flags (DB_ENV *env, U32 flags, int onoff) 1839int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1730 CODE: 1840 CODE:
1731 RETVAL = env->set_flags (env, flags, onoff); 1841 RETVAL = env->set_flags (env, flags, onoff);
1732 OUTPUT: 1842 OUTPUT:
1733 RETVAL 1843 RETVAL
1734 1844
… …
1738 1848
1739void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1849void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1740 CODE: 1850 CODE:
1741 env->set_msgfile (env, msgfile); 1851 env->set_msgfile (env, msgfile);
1742 1852
1743int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1853int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1744 CODE: 1854 CODE:
1745 RETVAL = env->set_verbose (env, which, onoff); 1855 RETVAL = env->set_verbose (env, which, onoff);
1746 OUTPUT: 1856 OUTPUT:
1747 RETVAL 1857 RETVAL
1748 1858
… …
1808 1918
1809int set_lg_max (DB_ENV *env, U32 max) 1919int set_lg_max (DB_ENV *env, U32 max)
1810 CODE: 1920 CODE:
1811 RETVAL = env->set_lg_max (env, max); 1921 RETVAL = env->set_lg_max (env, max);
1812 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:
1813 RETVAL 1947 RETVAL
1814 1948
1815DB_TXN * 1949DB_TXN *
1816txn_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)
1817 CODE: 1951 CODE:
… …
1822 RETVAL 1956 RETVAL
1823 1957
1824MODULE = BDB PACKAGE = BDB::Db 1958MODULE = BDB PACKAGE = BDB::Db
1825 1959
1826void 1960void
1827DESTROY (DB_ornull *db) 1961DESTROY (DB_ornuked *db)
1828 CODE: 1962 CODE:
1829 if (db) 1963 if (db)
1830 { 1964 {
1831 SV *env = (SV *)db->app_private; 1965 SV *env = (SV *)db->app_private;
1832 db->close (db, 0); 1966 db->close (db, 0);
… …
1927 2061
1928 2062
1929MODULE = BDB PACKAGE = BDB::Txn 2063MODULE = BDB PACKAGE = BDB::Txn
1930 2064
1931void 2065void
1932DESTROY (DB_TXN_ornull *txn) 2066DESTROY (DB_TXN_ornuked *txn)
1933 CODE: 2067 CODE:
1934 if (txn) 2068 if (txn)
1935 txn->abort (txn); 2069 txn->abort (txn);
1936 2070
1937int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT) 2071int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
… …
1948 2082
1949 2083
1950MODULE = BDB PACKAGE = BDB::Cursor 2084MODULE = BDB PACKAGE = BDB::Cursor
1951 2085
1952void 2086void
1953DESTROY (DBC_ornull *dbc) 2087DESTROY (DBC_ornuked *dbc)
1954 CODE: 2088 CODE:
1955 if (dbc) 2089 if (dbc)
1956 dbc->c_close (dbc); 2090 dbc->c_close (dbc);
1957 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
1958MODULE = BDB PACKAGE = BDB::Sequence 2100MODULE = BDB PACKAGE = BDB::Sequence
1959 2101
1960void 2102void
1961DESTROY (DB_SEQUENCE_ornull *seq) 2103DESTROY (DB_SEQUENCE_ornuked *seq)
1962 CODE: 2104 CODE:
1963 if (seq) 2105 if (seq)
1964 seq->close (seq, 0); 2106 seq->close (seq, 0);
1965 2107
1966int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2108int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
1985 CODE: 2127 CODE:
1986 RETVAL = seq->set_range (seq, min, max); 2128 RETVAL = seq->set_range (seq, min, max);
1987 OUTPUT: 2129 OUTPUT:
1988 RETVAL 2130 RETVAL
1989 2131
2132

Diff Legend

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