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

Comparing BDB/BDB.xs (file contents):
Revision 1.26 by root, Mon Dec 10 21:19:07 2007 UTC vs.
Revision 1.40 by root, Tue Jul 8 08:25:31 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}
… …
101} 137}
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, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 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;
… …
123 DBC *dbc; 159 DBC *dbc;
124 160
125 UV uv1; 161 UV uv1;
126 int int1, int2; 162 int int1, int2;
127 U32 uint1, uint2; 163 U32 uint1, uint2;
128 char *buf1, *buf2; 164 char *buf1, *buf2, *buf3;
129 SV *sv1, *sv2, *sv3; 165 SV *sv1, *sv2, *sv3;
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 {
… …
371 } 409 }
372 410
373 return !SvTRUE (ERRSV); 411 return !SvTRUE (ERRSV);
374} 412}
375 413
376static void req_free (aio_req req) 414static void req_free (bdb_req req)
377{ 415{
378 free (req->buf1); 416 free (req->buf1);
379 free (req->buf2); 417 free (req->buf2);
418 free (req->buf3);
380 Safefree (req); 419 Safefree (req);
381} 420}
382 421
383#ifdef USE_SOCKETS_AS_HANDLES 422#ifdef USE_SOCKETS_AS_HANDLES
384# define TO_SOCKET(x) (win32_get_osfhandle (x)) 423# define TO_SOCKET(x) (win32_get_osfhandle (x))
385#else 424#else
386# define TO_SOCKET(x) (x) 425# define TO_SOCKET(x) (x)
387#endif 426#endif
388 427
389static void 428static void
390create_respipe () 429create_respipe (void)
391{ 430{
392#ifdef _WIN32 431#ifdef _WIN32
393 int arg; /* argg */ 432 int arg; /* argg */
394#endif 433#endif
395 int old_readfd = respipe [0]; 434 int old_readfd = respipe [0];
… …
449 free (wrk); 488 free (wrk);
450 489
451 X_UNLOCK (wrklock); 490 X_UNLOCK (wrklock);
452} 491}
453 492
454static void maybe_start_thread () 493static void maybe_start_thread (void)
455{ 494{
456 if (get_nthreads () >= wanted) 495 if (get_nthreads () >= wanted)
457 return; 496 return;
458 497
459 /* todo: maybe use idle here, but might be less exact */ 498 /* todo: maybe use idle here, but might be less exact */
… …
461 return; 500 return;
462 501
463 start_thread (); 502 start_thread ();
464} 503}
465 504
466static void req_send (aio_req req) 505static void req_send (bdb_req req)
467{ 506{
468 SV *wait_callback = 0; 507 SV *wait_callback = 0;
508
509 if (on_next_submit)
510 {
511 dSP;
512 SV *cb = sv_2mortal (on_next_submit);
513
514 on_next_submit = 0;
515
516 PUSHMARK (SP);
517 PUTBACK;
518 call_sv (cb, G_DISCARD | G_EVAL);
519 }
469 520
470 // synthesize callback if none given 521 // synthesize callback if none given
471 if (!SvOK (req->callback)) 522 if (!SvOK (req->callback))
472 { 523 {
473 int count; 524 int count;
… …
479 SPAGAIN; 530 SPAGAIN;
480 531
481 if (count != 2) 532 if (count != 2)
482 croak ("prepare callback must return exactly two values\n"); 533 croak ("prepare callback must return exactly two values\n");
483 534
484 wait_callback = SvREFCNT_inc (POPs); 535 wait_callback = POPs;
485 SvREFCNT_dec (req->callback); 536 SvREFCNT_dec (req->callback);
486 req->callback = SvREFCNT_inc (POPs); 537 req->callback = SvREFCNT_inc (POPs);
487 } 538 }
488 539
489 ++nreqs; 540 ++nreqs;
… …
500 { 551 {
501 dSP; 552 dSP;
502 PUSHMARK (SP); 553 PUSHMARK (SP);
503 PUTBACK; 554 PUTBACK;
504 call_sv (wait_callback, G_DISCARD); 555 call_sv (wait_callback, G_DISCARD);
505 SvREFCNT_dec (wait_callback);
506 } 556 }
507} 557}
508 558
509static void end_thread (void) 559static void end_thread (void)
510{ 560{
511 aio_req req; 561 bdb_req req;
512 562
513 Newz (0, req, 1, aio_cb); 563 Newz (0, req, 1, bdb_cb);
514 564
515 req->type = REQ_QUIT; 565 req->type = REQ_QUIT;
516 req->pri = PRI_MAX + PRI_BIAS; 566 req->pri = PRI_MAX + PRI_BIAS;
517 567
518 X_LOCK (reqlock); 568 X_LOCK (reqlock);
… …
545 595
546 while (started > wanted) 596 while (started > wanted)
547 end_thread (); 597 end_thread ();
548} 598}
549 599
550static void poll_wait () 600static void poll_wait (void)
551{ 601{
552 fd_set rfd; 602 fd_set rfd;
553 603
554 while (nreqs) 604 while (nreqs)
555 { 605 {
… …
568 618
569 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 619 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
570 } 620 }
571} 621}
572 622
573static int poll_cb () 623static int poll_cb (void)
574{ 624{
575 dSP; 625 dSP;
576 int count = 0; 626 int count = 0;
577 int maxreqs = max_poll_reqs; 627 int maxreqs = max_poll_reqs;
578 int do_croak = 0; 628 int do_croak = 0;
579 struct timeval tv_start, tv_now; 629 struct timeval tv_start, tv_now;
580 aio_req req; 630 bdb_req req;
581 631
582 if (max_poll_time) 632 if (max_poll_time)
583 gettimeofday (&tv_start, 0); 633 gettimeofday (&tv_start, 0);
584 634
585 for (;;) 635 for (;;)
… …
646 696
647/*****************************************************************************/ 697/*****************************************************************************/
648 698
649X_THREAD_PROC (bdb_proc) 699X_THREAD_PROC (bdb_proc)
650{ 700{
651 aio_req req; 701 bdb_req req;
652 struct timespec ts; 702 struct timespec ts;
653 worker *self = (worker *)thr_arg; 703 worker *self = (worker *)thr_arg;
654 704
655 /* try to distribute timeouts somewhat evenly */ 705 /* try to distribute timeouts somewhat evenly */
656 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 706 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
723 773
724 case REQ_ENV_MEMP_TRICKLE: 774 case REQ_ENV_MEMP_TRICKLE:
725 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2); 775 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
726 break; 776 break;
727 777
778 case REQ_ENV_DBREMOVE:
779 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
780 break;
781
782 case REQ_ENV_DBRENAME:
783 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
784 break;
785
728 case REQ_DB_OPEN: 786 case REQ_DB_OPEN:
729 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2); 787 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
730 break; 788 break;
731 789
732 case REQ_DB_CLOSE: 790 case REQ_DB_CLOSE:
… …
874 X_UNLOCK (wrklock); 932 X_UNLOCK (wrklock);
875} 933}
876 934
877static void atfork_child (void) 935static void atfork_child (void)
878{ 936{
879 aio_req prv; 937 bdb_req prv;
880 938
881 while (prv = reqq_shift (&req_queue)) 939 while (prv = reqq_shift (&req_queue))
882 req_free (prv); 940 req_free (prv);
883 941
884 while (prv = reqq_shift (&res_queue)) 942 while (prv = reqq_shift (&res_queue))
… …
905 963
906 atfork_parent (); 964 atfork_parent ();
907} 965}
908 966
909#define dREQ(reqtype) \ 967#define dREQ(reqtype) \
910 aio_req req; \ 968 bdb_req req; \
911 int req_pri = next_pri; \ 969 int req_pri = next_pri; \
912 next_pri = DEFAULT_PRI + PRI_BIAS; \ 970 next_pri = DEFAULT_PRI + PRI_BIAS; \
913 \ 971 \
914 if (SvOK (callback) && !SvROK (callback)) \ 972 if (SvOK (callback) && !SvROK (callback)) \
915 croak ("callback must be undef or of reference type"); \ 973 croak ("callback must be undef or of reference type"); \
916 \ 974 \
917 Newz (0, req, 1, aio_cb); \ 975 Newz (0, req, 1, bdb_cb); \
918 if (!req) \ 976 if (!req) \
919 croak ("out of memory during aio_req allocation"); \ 977 croak ("out of memory during bdb_req allocation"); \
920 \ 978 \
921 req->callback = newSVsv (callback); \ 979 req->callback = newSVsv (callback); \
922 req->type = (reqtype); \ 980 req->type = (reqtype); \
923 req->pri = req_pri 981 req->pri = req_pri
924 982
925#define REQ_SEND \ 983#define REQ_SEND \
926 req_send (req) 984 req_send (req)
927 985
928#define SvPTR(var, arg, type, class, nullok) \ 986#define SvPTR(var, arg, type, class, nullok) \
929 if (!SvOK (arg)) \ 987 if (!SvOK (arg)) \
930 { \ 988 { \
931 if (!nullok) \ 989 if (nullok != 1) \
932 croak (# var " must be a " # class " object, not undef"); \ 990 croak (# var " must be a " # class " object, not undef"); \
933 \ 991 \
934 (var) = 0; \ 992 (var) = 0; \
935 } \ 993 } \
936 else if (sv_derived_from ((arg), # class)) \ 994 else if (sv_derived_from ((arg), # class)) \
937 { \ 995 { \
938 IV tmp = SvIV ((SV*) SvRV (arg)); \ 996 IV tmp = SvIV ((SV*) SvRV (arg)); \
939 (var) = INT2PTR (type, tmp); \ 997 (var) = INT2PTR (type, tmp); \
940 if (!var) \ 998 if (!var && nullok != 2) \
941 croak (# var " is not a valid " # class " object anymore"); \ 999 croak (# var " is not a valid " # class " object anymore"); \
942 } \ 1000 } \
943 else \ 1001 else \
944 croak (# var " is not of type " # class); \ 1002 croak (# var " is not of type " # class); \
945 \ 1003 \
… …
947static void 1005static void
948ptr_nuke (SV *sv) 1006ptr_nuke (SV *sv)
949{ 1007{
950 assert (SvROK (sv)); 1008 assert (SvROK (sv));
951 sv_setiv (SvRV (sv), 0); 1009 sv_setiv (SvRV (sv), 0);
1010}
1011
1012static int
1013errno_get (pTHX_ SV *sv, MAGIC *mg)
1014{
1015 if (*mg->mg_ptr == '!') // should always be the case
1016 if (-30999 <= errno && errno <= -30800)
1017 {
1018 sv_setnv (sv, (NV)errno);
1019 sv_setpv (sv, db_strerror (errno));
1020 SvNOK_on (sv); /* what a wonderful hack! */
1021 // ^^^ copied from perl sources
1022 return 0;
1023 }
1024
1025 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
1026}
1027
1028static MGVTBL vtbl_errno;
1029
1030// this wonderful hack :( patches perl's $! variable to support our errno values
1031static void
1032patch_errno (void)
1033{
1034 SV *sv;
1035 MAGIC *mg;
1036
1037 if (!(sv = get_sv ("!", 1)))
1038 return;
1039
1040 if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
1041 return;
1042
1043 if (mg->mg_virtual != &PL_vtbl_sv)
1044 return;
1045
1046 vtbl_errno = PL_vtbl_sv;
1047 vtbl_errno.svt_get = errno_get;
1048 mg->mg_virtual = &vtbl_errno;
952} 1049}
953 1050
954MODULE = BDB PACKAGE = BDB 1051MODULE = BDB PACKAGE = BDB
955 1052
956PROTOTYPES: ENABLE 1053PROTOTYPES: ENABLE
… …
983 const_iv (REGISTER) 1080 const_iv (REGISTER)
984 const_iv (SYSTEM_MEM) 1081 const_iv (SYSTEM_MEM)
985 const_iv (AUTO_COMMIT) 1082 const_iv (AUTO_COMMIT)
986 const_iv (CDB_ALLDB) 1083 const_iv (CDB_ALLDB)
987 const_iv (DIRECT_DB) 1084 const_iv (DIRECT_DB)
988 const_iv (DIRECT_LOG)
989 const_iv (DSYNC_DB) 1085 const_iv (DSYNC_DB)
990 const_iv (DSYNC_LOG)
991 const_iv (LOG_AUTOREMOVE)
992 const_iv (LOG_INMEMORY)
993 const_iv (NOLOCKING) 1086 const_iv (NOLOCKING)
994 const_iv (NOMMAP) 1087 const_iv (NOMMAP)
995 const_iv (NOPANIC) 1088 const_iv (NOPANIC)
996 const_iv (OVERWRITE) 1089 const_iv (OVERWRITE)
997 const_iv (PANIC_ENVIRONMENT) 1090 const_iv (PANIC_ENVIRONMENT)
… …
1028 const_iv (GET_BOTH_RANGE) 1121 const_iv (GET_BOTH_RANGE)
1029 //const_iv (SET_RECNO) 1122 //const_iv (SET_RECNO)
1030 //const_iv (MULTIPLE) 1123 //const_iv (MULTIPLE)
1031 const_iv (SNAPSHOT) 1124 const_iv (SNAPSHOT)
1032 const_iv (JOIN_ITEM) 1125 const_iv (JOIN_ITEM)
1126 const_iv (JOIN_NOSORT)
1033 const_iv (RMW) 1127 const_iv (RMW)
1034 1128
1035 const_iv (NOTFOUND) 1129 const_iv (NOTFOUND)
1036 const_iv (KEYEMPTY) 1130 const_iv (KEYEMPTY)
1037 const_iv (LOCK_DEADLOCK) 1131 const_iv (LOCK_DEADLOCK)
… …
1053 const_iv (TXN_SYNC) 1147 const_iv (TXN_SYNC)
1054 1148
1055 const_iv (SET_LOCK_TIMEOUT) 1149 const_iv (SET_LOCK_TIMEOUT)
1056 const_iv (SET_TXN_TIMEOUT) 1150 const_iv (SET_TXN_TIMEOUT)
1057 1151
1058 const_iv (JOIN_ITEM)
1059 const_iv (FIRST) 1152 const_iv (FIRST)
1060 const_iv (NEXT) 1153 const_iv (NEXT)
1061 const_iv (NEXT_DUP) 1154 const_iv (NEXT_DUP)
1062 const_iv (NEXT_NODUP) 1155 const_iv (NEXT_NODUP)
1063 const_iv (PREV) 1156 const_iv (PREV)
… …
1129 const_iv (MULTIVERSION) 1222 const_iv (MULTIVERSION)
1130 const_iv (TXN_SNAPSHOT) 1223 const_iv (TXN_SNAPSHOT)
1131#endif 1224#endif
1132#if DB_VERSION_MINOR >= 6 1225#if DB_VERSION_MINOR >= 6
1133 const_iv (PREV_DUP) 1226 const_iv (PREV_DUP)
1134# if 0
1135 const_iv (PRIORITY_UNCHANGED) 1227 const_iv (PRIORITY_UNCHANGED)
1136 const_iv (PRIORITY_VERY_LOW) 1228 const_iv (PRIORITY_VERY_LOW)
1137 const_iv (PRIORITY_LOW) 1229 const_iv (PRIORITY_LOW)
1138 const_iv (PRIORITY_DEFAULT) 1230 const_iv (PRIORITY_DEFAULT)
1139 const_iv (PRIORITY_HIGH) 1231 const_iv (PRIORITY_HIGH)
1140 const_iv (PRIORITY_VERY_HIGH) 1232 const_iv (PRIORITY_VERY_HIGH)
1141# endif 1233#endif
1234#if DB_VERSION_MINOR >= 7
1235 const_iv (LOG_DIRECT)
1236 const_iv (LOG_DSYNC)
1237 const_iv (LOG_AUTO_REMOVE)
1238 const_iv (LOG_IN_MEMORY)
1239 const_iv (LOG_ZERO)
1240#else
1241 const_iv (DIRECT_LOG)
1242 const_iv (DSYNC_LOG)
1243 const_iv (LOG_AUTOREMOVE)
1244 const_iv (LOG_INMEMORY)
1142#endif 1245#endif
1143 }; 1246 };
1144 1247
1145 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1248 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1146 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1249 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1147 1250
1148 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1251 {
1252 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1253 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1254
1255 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1256 }
1257
1149 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1258 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1150 1259
1151 create_respipe (); 1260 create_respipe ();
1152 1261
1153 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1262 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1154#ifdef _WIN32 1263 patch_errno ();
1155 X_MUTEX_CHECK (wrklock);
1156 X_MUTEX_CHECK (reslock);
1157 X_MUTEX_CHECK (reqlock);
1158
1159 X_COND_CHECK (reqwait);
1160#endif
1161} 1264}
1162 1265
1163void 1266void
1164max_poll_reqs (int nreqs) 1267max_poll_reqs (int nreqs)
1165 PROTOTYPE: $ 1268 PROTOTYPE: $
… …
1305 CODE: 1408 CODE:
1306 RETVAL = db_strerror (errorno); 1409 RETVAL = db_strerror (errorno);
1307 OUTPUT: 1410 OUTPUT:
1308 RETVAL 1411 RETVAL
1309 1412
1413void _on_next_submit (SV *cb)
1414 CODE:
1415 SvREFCNT_dec (on_next_submit);
1416 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1417
1310DB_ENV * 1418DB_ENV *
1311db_env_create (U32 env_flags = 0) 1419db_env_create (U32 env_flags = 0)
1312 CODE: 1420 CODE:
1313{ 1421{
1314 errno = db_env_create (&RETVAL, env_flags); 1422 errno = db_env_create (&RETVAL, env_flags);
… …
1323} 1431}
1324 OUTPUT: 1432 OUTPUT:
1325 RETVAL 1433 RETVAL
1326 1434
1327void 1435void
1328db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1436db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1329 CODE: 1437 CODE:
1330{ 1438{
1331 dREQ (REQ_ENV_OPEN); 1439 dREQ (REQ_ENV_OPEN);
1332
1333 env->set_thread_count (env, wanted + 2);
1334 1440
1335 req->env = env; 1441 req->env = env;
1336 req->uint1 = open_flags | DB_THREAD; 1442 req->uint1 = open_flags | DB_THREAD;
1337 req->int1 = mode; 1443 req->int1 = mode;
1338 req->buf1 = strdup_ornull (db_home); 1444 req->buf1 = strdup_ornull (db_home);
… …
1390 req->env = env; 1496 req->env = env;
1391 req->int1 = percent; 1497 req->int1 = percent;
1392 REQ_SEND; 1498 REQ_SEND;
1393} 1499}
1394 1500
1501void
1502db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = &PL_sv_undef)
1503 CODE:
1504{
1505 dREQ (REQ_ENV_DBREMOVE);
1506 req->env = env;
1507 req->buf1 = strdup_ornull (file);
1508 req->buf2 = strdup_ornull (database);
1509 req->uint1 = flags;
1510 REQ_SEND;
1511}
1512
1513void
1514db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = &PL_sv_undef)
1515 CODE:
1516{
1517 dREQ (REQ_ENV_DBRENAME);
1518 req->env = env;
1519 req->buf1 = strdup_ornull (file);
1520 req->buf2 = strdup_ornull (database);
1521 req->buf3 = strdup_ornull (newname);
1522 req->uint1 = flags;
1523 REQ_SEND;
1524}
1395 1525
1396DB * 1526DB *
1397db_create (DB_ENV *env = 0, U32 flags = 0) 1527db_create (DB_ENV *env = 0, U32 flags = 0)
1398 CODE: 1528 CODE:
1399{ 1529{
… …
1406} 1536}
1407 OUTPUT: 1537 OUTPUT:
1408 RETVAL 1538 RETVAL
1409 1539
1410void 1540void
1411db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1541db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
1412 CODE: 1542 CODE:
1413{ 1543{
1414 dREQ (REQ_DB_OPEN); 1544 dREQ (REQ_DB_OPEN);
1415 req->db = db; 1545 req->db = db;
1416 req->txn = txnid; 1546 req->txn = txnid;
… …
1456 req->uint1 = flags; 1586 req->uint1 = flags;
1457 REQ_SEND; 1587 REQ_SEND;
1458} 1588}
1459 1589
1460void 1590void
1461db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef) 1591db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
1462 CODE: 1592 CODE:
1463{ 1593{
1464 dREQ (REQ_DB_SYNC); 1594 dREQ (REQ_DB_SYNC);
1465 req->db = db; 1595 req->db = db;
1466 req->buf1 = strdup (file); 1596 req->buf1 = strdup (file);
… …
1495} 1625}
1496 1626
1497void 1627void
1498db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1628db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1499 CODE: 1629 CODE:
1630 if (SvREADONLY (data))
1631 croak ("can't modify read-only data scalar in db_get");
1500{ 1632{
1501 dREQ (REQ_DB_GET); 1633 dREQ (REQ_DB_GET);
1502 req->db = db; 1634 req->db = db;
1503 req->txn = txn; 1635 req->txn = txn;
1504 req->uint1 = flags; 1636 req->uint1 = flags;
… …
1509} 1641}
1510 1642
1511void 1643void
1512db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1644db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1513 CODE: 1645 CODE:
1646 if (SvREADONLY (data))
1647 croak ("can't modify read-only data scalar in db_pget");
1514{ 1648{
1515 dREQ (REQ_DB_PGET); 1649 dREQ (REQ_DB_PGET);
1516 req->db = db; 1650 req->db = db;
1517 req->txn = txn; 1651 req->txn = txn;
1518 req->uint1 = flags; 1652 req->uint1 = flags;
… …
1712 1846
1713 1847
1714MODULE = BDB PACKAGE = BDB::Env 1848MODULE = BDB PACKAGE = BDB::Env
1715 1849
1716void 1850void
1717DESTROY (DB_ENV_ornull *env) 1851DESTROY (DB_ENV_ornuked *env)
1718 CODE: 1852 CODE:
1719 if (env) 1853 if (env)
1720 env->close (env, 0); 1854 env->close (env, 0);
1721 1855
1722int set_data_dir (DB_ENV *env, const char *dir) 1856int set_data_dir (DB_ENV *env, const char *dir)
… …
1752int set_flags (DB_ENV *env, U32 flags, int onoff = 1) 1886int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1753 CODE: 1887 CODE:
1754 RETVAL = env->set_flags (env, flags, onoff); 1888 RETVAL = env->set_flags (env, flags, onoff);
1755 OUTPUT: 1889 OUTPUT:
1756 RETVAL 1890 RETVAL
1891
1892#if DB_VERSION_MINOR >= 7
1893
1894int set_intermediate_dir_mode (DB_ENV *env, const char *mode)
1895 CODE:
1896 RETVAL = env->set_intermediate_dir_mode (env, mode);
1897 OUTPUT:
1898 RETVAL
1899
1900int log_set_config (DB_ENV *env, U32 flags, int onoff = 1)
1901 CODE:
1902 RETVAL = env->log_set_config (env, flags, onoff);
1903 OUTPUT:
1904 RETVAL
1905
1906#endif
1907
1757 1908
1758void set_errfile (DB_ENV *env, FILE *errfile = 0) 1909void set_errfile (DB_ENV *env, FILE *errfile = 0)
1759 CODE: 1910 CODE:
1760 env->set_errfile (env, errfile); 1911 env->set_errfile (env, errfile);
1761 1912
… …
1869 RETVAL 2020 RETVAL
1870 2021
1871MODULE = BDB PACKAGE = BDB::Db 2022MODULE = BDB PACKAGE = BDB::Db
1872 2023
1873void 2024void
1874DESTROY (DB_ornull *db) 2025DESTROY (DB_ornuked *db)
1875 CODE: 2026 CODE:
1876 if (db) 2027 if (db)
1877 { 2028 {
1878 SV *env = (SV *)db->app_private; 2029 SV *env = (SV *)db->app_private;
1879 db->close (db, 0); 2030 db->close (db, 0);
… …
1974 2125
1975 2126
1976MODULE = BDB PACKAGE = BDB::Txn 2127MODULE = BDB PACKAGE = BDB::Txn
1977 2128
1978void 2129void
1979DESTROY (DB_TXN_ornull *txn) 2130DESTROY (DB_TXN_ornuked *txn)
1980 CODE: 2131 CODE:
1981 if (txn) 2132 if (txn)
1982 txn->abort (txn); 2133 txn->abort (txn);
1983 2134
1984int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT) 2135int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
… …
1995 2146
1996 2147
1997MODULE = BDB PACKAGE = BDB::Cursor 2148MODULE = BDB PACKAGE = BDB::Cursor
1998 2149
1999void 2150void
2000DESTROY (DBC_ornull *dbc) 2151DESTROY (DBC_ornuked *dbc)
2001 CODE: 2152 CODE:
2002 if (dbc) 2153 if (dbc)
2003 dbc->c_close (dbc); 2154 dbc->c_close (dbc);
2004 2155
2156#if DB_VERSION_MINOR >= 6
2157
2158int set_priority (DBC *dbc, int priority)
2159 CODE:
2160 dbc->set_priority (dbc, priority);
2161
2162#endif
2163
2005MODULE = BDB PACKAGE = BDB::Sequence 2164MODULE = BDB PACKAGE = BDB::Sequence
2006 2165
2007void 2166void
2008DESTROY (DB_SEQUENCE_ornull *seq) 2167DESTROY (DB_SEQUENCE_ornuked *seq)
2009 CODE: 2168 CODE:
2010 if (seq) 2169 if (seq)
2011 seq->close (seq, 0); 2170 seq->close (seq, 0);
2012 2171
2013int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2172int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
2032 CODE: 2191 CODE:
2033 RETVAL = seq->set_range (seq, min, max); 2192 RETVAL = seq->set_range (seq, min, max);
2034 OUTPUT: 2193 OUTPUT:
2035 RETVAL 2194 RETVAL
2036 2195
2196

Diff Legend

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