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

Comparing BDB/BDB.xs (file contents):
Revision 1.22 by root, Fri Dec 7 13:14:54 2007 UTC vs.
Revision 1.34 by root, Sun Mar 30 06:28:08 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 return !SvOK (sv)
70 ? 0
71 :
72#if WIN32
73 SvPVutf8_nolen (sv)
74#else
75 SvPVbyte_nolen (sv)
76#endif
77 ;
78}
79
60static void 80static void
61debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg) 81debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
62{ 82{
63 printf ("err[%s]\n", msg); 83 printf ("err[%s]\n", msg);
64} 84}
… …
102 122
103enum { 123enum {
104 REQ_QUIT, 124 REQ_QUIT,
105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 125 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 126 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 127 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, 128 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, 129 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, 130 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, 131 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
112}; 132};
113 133
114typedef struct aio_cb 134typedef struct bdb_cb
115{ 135{
116 struct aio_cb *volatile next; 136 struct bdb_cb *volatile next;
117 SV *callback; 137 SV *callback;
118 int type, pri, result; 138 int type, pri, result;
119 139
120 DB_ENV *env; 140 DB_ENV *env;
121 DB *db; 141 DB *db;
… …
130 150
131 DBT dbt1, dbt2, dbt3; 151 DBT dbt1, dbt2, dbt3;
132 DB_KEY_RANGE key_range; 152 DB_KEY_RANGE key_range;
133 DB_SEQUENCE *seq; 153 DB_SEQUENCE *seq;
134 db_seq_t seq_t; 154 db_seq_t seq_t;
135} aio_cb; 155} bdb_cb;
136 156
137typedef aio_cb *aio_req; 157typedef bdb_cb *bdb_req;
138 158
139enum { 159enum {
140 PRI_MIN = -4, 160 PRI_MIN = -4,
141 PRI_MAX = 4, 161 PRI_MAX = 4,
142 162
… …
169 struct worker *prev, *next; 189 struct worker *prev, *next;
170 190
171 thread_t tid; 191 thread_t tid;
172 192
173 /* locked by reslock, reqlock or wrklock */ 193 /* locked by reslock, reqlock or wrklock */
174 aio_req req; /* currently processed request */ 194 bdb_req req; /* currently processed request */
175 void *dbuf; 195 void *dbuf;
176 DIR *dirp; 196 DIR *dirp;
177} worker; 197} worker;
178 198
179static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 199static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
199static mutex_t reqlock = X_MUTEX_INIT; 219static mutex_t reqlock = X_MUTEX_INIT;
200static cond_t reqwait = X_COND_INIT; 220static cond_t reqwait = X_COND_INIT;
201 221
202#if WORDACCESS_UNSAFE 222#if WORDACCESS_UNSAFE
203 223
204static unsigned int get_nready () 224static unsigned int get_nready (void)
205{ 225{
206 unsigned int retval; 226 unsigned int retval;
207 227
208 X_LOCK (reqlock); 228 X_LOCK (reqlock);
209 retval = nready; 229 retval = nready;
210 X_UNLOCK (reqlock); 230 X_UNLOCK (reqlock);
211 231
212 return retval; 232 return retval;
213} 233}
214 234
215static unsigned int get_npending () 235static unsigned int get_npending (void)
216{ 236{
217 unsigned int retval; 237 unsigned int retval;
218 238
219 X_LOCK (reslock); 239 X_LOCK (reslock);
220 retval = npending; 240 retval = npending;
221 X_UNLOCK (reslock); 241 X_UNLOCK (reslock);
222 242
223 return retval; 243 return retval;
224} 244}
225 245
226static unsigned int get_nthreads () 246static unsigned int get_nthreads (void)
227{ 247{
228 unsigned int retval; 248 unsigned int retval;
229 249
230 X_LOCK (wrklock); 250 X_LOCK (wrklock);
231 retval = started; 251 retval = started;
… …
246 * a somewhat faster data structure might be nice, but 266 * a somewhat faster data structure might be nice, but
247 * with 8 priorities this actually needs <20 insns 267 * with 8 priorities this actually needs <20 insns
248 * per shift, the most expensive operation. 268 * per shift, the most expensive operation.
249 */ 269 */
250typedef struct { 270typedef struct {
251 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 271 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
252 int size; 272 int size;
253} reqq; 273} reqq;
254 274
255static reqq req_queue; 275static reqq req_queue;
256static reqq res_queue; 276static reqq res_queue;
257 277
258int reqq_push (reqq *q, aio_req req) 278int reqq_push (reqq *q, bdb_req req)
259{ 279{
260 int pri = req->pri; 280 int pri = req->pri;
261 req->next = 0; 281 req->next = 0;
262 282
263 if (q->qe[pri]) 283 if (q->qe[pri])
… …
269 q->qe[pri] = q->qs[pri] = req; 289 q->qe[pri] = q->qs[pri] = req;
270 290
271 return q->size++; 291 return q->size++;
272} 292}
273 293
274aio_req reqq_shift (reqq *q) 294bdb_req reqq_shift (reqq *q)
275{ 295{
276 int pri; 296 int pri;
277 297
278 if (!q->size) 298 if (!q->size)
279 return 0; 299 return 0;
280 300
281 --q->size; 301 --q->size;
282 302
283 for (pri = NUM_PRI; pri--; ) 303 for (pri = NUM_PRI; pri--; )
284 { 304 {
285 aio_req req = q->qs[pri]; 305 bdb_req req = q->qs[pri];
286 306
287 if (req) 307 if (req)
288 { 308 {
289 if (!(q->qs[pri] = req->next)) 309 if (!(q->qs[pri] = req->next))
290 q->qe[pri] = 0; 310 q->qe[pri] = 0;
… …
294 } 314 }
295 315
296 abort (); 316 abort ();
297} 317}
298 318
299static int poll_cb (); 319static int poll_cb (void);
300static void req_free (aio_req req); 320static void req_free (bdb_req req);
301static void req_cancel (aio_req req); 321static void req_cancel (bdb_req req);
302 322
303static int req_invoke (aio_req req) 323static int req_invoke (bdb_req req)
304{ 324{
305 dSP; 325 dSP;
306 326
307 if (SvOK (req->callback)) 327 if (SvOK (req->callback))
308 { 328 {
… …
326 dbt_to_sv (req->sv1, &req->dbt1); 346 dbt_to_sv (req->sv1, &req->dbt1);
327 dbt_to_sv (req->sv2, &req->dbt2); 347 dbt_to_sv (req->sv2, &req->dbt2);
328 dbt_to_sv (req->sv3, &req->dbt3); 348 dbt_to_sv (req->sv3, &req->dbt3);
329 break; 349 break;
330 350
351 case REQ_DB_PUT:
352 case REQ_C_PUT:
353 dbt_to_sv (0, &req->dbt1);
354 dbt_to_sv (0, &req->dbt2);
355 break;
356
331 case REQ_DB_KEY_RANGE: 357 case REQ_DB_KEY_RANGE:
332 { 358 {
333 AV *av = newAV (); 359 AV *av = newAV ();
334 360
335 av_push (av, newSVnv (req->key_range.less)); 361 av_push (av, newSVnv (req->key_range.less));
… …
365 } 391 }
366 392
367 return !SvTRUE (ERRSV); 393 return !SvTRUE (ERRSV);
368} 394}
369 395
370static void req_free (aio_req req) 396static void req_free (bdb_req req)
371{ 397{
372 free (req->buf1); 398 free (req->buf1);
373 free (req->buf2); 399 free (req->buf2);
374 Safefree (req); 400 Safefree (req);
375} 401}
… …
379#else 405#else
380# define TO_SOCKET(x) (x) 406# define TO_SOCKET(x) (x)
381#endif 407#endif
382 408
383static void 409static void
384create_respipe () 410create_respipe (void)
385{ 411{
386#ifdef _WIN32 412#ifdef _WIN32
387 int arg; /* argg */ 413 int arg; /* argg */
388#endif 414#endif
389 int old_readfd = respipe [0]; 415 int old_readfd = respipe [0];
… …
443 free (wrk); 469 free (wrk);
444 470
445 X_UNLOCK (wrklock); 471 X_UNLOCK (wrklock);
446} 472}
447 473
448static void maybe_start_thread () 474static void maybe_start_thread (void)
449{ 475{
450 if (get_nthreads () >= wanted) 476 if (get_nthreads () >= wanted)
451 return; 477 return;
452 478
453 /* todo: maybe use idle here, but might be less exact */ 479 /* todo: maybe use idle here, but might be less exact */
… …
455 return; 481 return;
456 482
457 start_thread (); 483 start_thread ();
458} 484}
459 485
460static void req_send (aio_req req) 486static void req_send (bdb_req req)
461{ 487{
462 SV *wait_callback = 0; 488 SV *wait_callback = 0;
463 489
464 // synthesize callback if none given 490 // synthesize callback if none given
465 if (!SvOK (req->callback)) 491 if (!SvOK (req->callback))
… …
473 SPAGAIN; 499 SPAGAIN;
474 500
475 if (count != 2) 501 if (count != 2)
476 croak ("prepare callback must return exactly two values\n"); 502 croak ("prepare callback must return exactly two values\n");
477 503
478 wait_callback = SvREFCNT_inc (POPs); 504 wait_callback = POPs;
479 SvREFCNT_dec (req->callback); 505 SvREFCNT_dec (req->callback);
480 req->callback = SvREFCNT_inc (POPs); 506 req->callback = SvREFCNT_inc (POPs);
481 } 507 }
482 508
483 ++nreqs; 509 ++nreqs;
… …
494 { 520 {
495 dSP; 521 dSP;
496 PUSHMARK (SP); 522 PUSHMARK (SP);
497 PUTBACK; 523 PUTBACK;
498 call_sv (wait_callback, G_DISCARD); 524 call_sv (wait_callback, G_DISCARD);
499 SvREFCNT_dec (wait_callback);
500 } 525 }
501} 526}
502 527
503static void end_thread (void) 528static void end_thread (void)
504{ 529{
505 aio_req req; 530 bdb_req req;
506 531
507 Newz (0, req, 1, aio_cb); 532 Newz (0, req, 1, bdb_cb);
508 533
509 req->type = REQ_QUIT; 534 req->type = REQ_QUIT;
510 req->pri = PRI_MAX + PRI_BIAS; 535 req->pri = PRI_MAX + PRI_BIAS;
511 536
512 X_LOCK (reqlock); 537 X_LOCK (reqlock);
… …
539 564
540 while (started > wanted) 565 while (started > wanted)
541 end_thread (); 566 end_thread ();
542} 567}
543 568
544static void poll_wait () 569static void poll_wait (void)
545{ 570{
546 fd_set rfd; 571 fd_set rfd;
547 572
548 while (nreqs) 573 while (nreqs)
549 { 574 {
… …
562 587
563 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 588 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
564 } 589 }
565} 590}
566 591
567static int poll_cb () 592static int poll_cb (void)
568{ 593{
569 dSP; 594 dSP;
570 int count = 0; 595 int count = 0;
571 int maxreqs = max_poll_reqs; 596 int maxreqs = max_poll_reqs;
572 int do_croak = 0; 597 int do_croak = 0;
573 struct timeval tv_start, tv_now; 598 struct timeval tv_start, tv_now;
574 aio_req req; 599 bdb_req req;
575 600
576 if (max_poll_time) 601 if (max_poll_time)
577 gettimeofday (&tv_start, 0); 602 gettimeofday (&tv_start, 0);
578 603
579 for (;;) 604 for (;;)
… …
640 665
641/*****************************************************************************/ 666/*****************************************************************************/
642 667
643X_THREAD_PROC (bdb_proc) 668X_THREAD_PROC (bdb_proc)
644{ 669{
645 aio_req req; 670 bdb_req req;
646 struct timespec ts; 671 struct timespec ts;
647 worker *self = (worker *)thr_arg; 672 worker *self = (worker *)thr_arg;
648 673
649 /* try to distribute timeouts somewhat evenly */ 674 /* try to distribute timeouts somewhat evenly */
650 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 675 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
733 758
734 case REQ_DB_SYNC: 759 case REQ_DB_SYNC:
735 req->result = req->db->sync (req->db, req->uint1); 760 req->result = req->db->sync (req->db, req->uint1);
736 break; 761 break;
737 762
763 case REQ_DB_UPGRADE:
764 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
765 break;
766
738 case REQ_DB_PUT: 767 case REQ_DB_PUT:
739 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 768 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
740 break; 769 break;
741 770
742 case REQ_DB_GET: 771 case REQ_DB_GET:
… …
864 X_UNLOCK (wrklock); 893 X_UNLOCK (wrklock);
865} 894}
866 895
867static void atfork_child (void) 896static void atfork_child (void)
868{ 897{
869 aio_req prv; 898 bdb_req prv;
870 899
871 while (prv = reqq_shift (&req_queue)) 900 while (prv = reqq_shift (&req_queue))
872 req_free (prv); 901 req_free (prv);
873 902
874 while (prv = reqq_shift (&res_queue)) 903 while (prv = reqq_shift (&res_queue))
… …
895 924
896 atfork_parent (); 925 atfork_parent ();
897} 926}
898 927
899#define dREQ(reqtype) \ 928#define dREQ(reqtype) \
900 aio_req req; \ 929 bdb_req req; \
901 int req_pri = next_pri; \ 930 int req_pri = next_pri; \
902 next_pri = DEFAULT_PRI + PRI_BIAS; \ 931 next_pri = DEFAULT_PRI + PRI_BIAS; \
903 \ 932 \
904 if (SvOK (callback) && !SvROK (callback)) \ 933 if (SvOK (callback) && !SvROK (callback)) \
905 croak ("callback must be undef or of reference type"); \ 934 croak ("callback must be undef or of reference type"); \
906 \ 935 \
907 Newz (0, req, 1, aio_cb); \ 936 Newz (0, req, 1, bdb_cb); \
908 if (!req) \ 937 if (!req) \
909 croak ("out of memory during aio_req allocation"); \ 938 croak ("out of memory during bdb_req allocation"); \
910 \ 939 \
911 req->callback = newSVsv (callback); \ 940 req->callback = newSVsv (callback); \
912 req->type = (reqtype); \ 941 req->type = (reqtype); \
913 req->pri = req_pri 942 req->pri = req_pri
914 943
915#define REQ_SEND \ 944#define REQ_SEND \
916 req_send (req) 945 req_send (req)
917 946
918#define SvPTR(var, arg, type, class, nullok) \ 947#define SvPTR(var, arg, type, class, nullok) \
919 if (!SvOK (arg)) \ 948 if (!SvOK (arg)) \
920 { \ 949 { \
921 if (!nullok) \ 950 if (nullok != 1) \
922 croak (# var " must be a " # class " object, not undef"); \ 951 croak (# var " must be a " # class " object, not undef"); \
923 \ 952 \
924 (var) = 0; \ 953 (var) = 0; \
925 } \ 954 } \
926 else if (sv_derived_from ((arg), # class)) \ 955 else if (sv_derived_from ((arg), # class)) \
927 { \ 956 { \
928 IV tmp = SvIV ((SV*) SvRV (arg)); \ 957 IV tmp = SvIV ((SV*) SvRV (arg)); \
929 (var) = INT2PTR (type, tmp); \ 958 (var) = INT2PTR (type, tmp); \
930 if (!var) \ 959 if (!var && nullok != 2) \
931 croak (# var " is not a valid " # class " object anymore"); \ 960 croak (# var " is not a valid " # class " object anymore"); \
932 } \ 961 } \
933 else \ 962 else \
934 croak (# var " is not of type " # class); \ 963 croak (# var " is not of type " # class); \
935 \ 964 \
… …
937static void 966static void
938ptr_nuke (SV *sv) 967ptr_nuke (SV *sv)
939{ 968{
940 assert (SvROK (sv)); 969 assert (SvROK (sv));
941 sv_setiv (SvRV (sv), 0); 970 sv_setiv (SvRV (sv), 0);
971}
972
973static int
974errno_get (pTHX_ SV *sv, MAGIC *mg)
975{
976 if (*mg->mg_ptr == '!') // should always be the case
977 if (-30999 <= errno && errno <= -30800)
978 {
979 sv_setnv (sv, (NV)errno);
980 sv_setpv (sv, db_strerror (errno));
981 SvNOK_on (sv); /* what a wonderful hack! */
982 // ^^^ copied from perl sources
983 return 0;
984 }
985
986 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
987}
988
989static MGVTBL vtbl_errno;
990
991// this wonderful hack :( patches perl's $! variable to support our errno values
992static void
993patch_errno (void)
994{
995 SV *sv;
996 MAGIC *mg;
997
998 if (!(sv = get_sv ("!", 1)))
999 return;
1000
1001 if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
1002 return;
1003
1004 if (mg->mg_virtual != &PL_vtbl_sv)
1005 return;
1006
1007 vtbl_errno = PL_vtbl_sv;
1008 vtbl_errno.svt_get = errno_get;
1009 mg->mg_virtual = &vtbl_errno;
942} 1010}
943 1011
944MODULE = BDB PACKAGE = BDB 1012MODULE = BDB PACKAGE = BDB
945 1013
946PROTOTYPES: ENABLE 1014PROTOTYPES: ENABLE
… …
1018 const_iv (GET_BOTH_RANGE) 1086 const_iv (GET_BOTH_RANGE)
1019 //const_iv (SET_RECNO) 1087 //const_iv (SET_RECNO)
1020 //const_iv (MULTIPLE) 1088 //const_iv (MULTIPLE)
1021 const_iv (SNAPSHOT) 1089 const_iv (SNAPSHOT)
1022 const_iv (JOIN_ITEM) 1090 const_iv (JOIN_ITEM)
1091 const_iv (JOIN_NOSORT)
1023 const_iv (RMW) 1092 const_iv (RMW)
1024 1093
1025 const_iv (NOTFOUND) 1094 const_iv (NOTFOUND)
1026 const_iv (KEYEMPTY) 1095 const_iv (KEYEMPTY)
1027 const_iv (LOCK_DEADLOCK) 1096 const_iv (LOCK_DEADLOCK)
… …
1043 const_iv (TXN_SYNC) 1112 const_iv (TXN_SYNC)
1044 1113
1045 const_iv (SET_LOCK_TIMEOUT) 1114 const_iv (SET_LOCK_TIMEOUT)
1046 const_iv (SET_TXN_TIMEOUT) 1115 const_iv (SET_TXN_TIMEOUT)
1047 1116
1048 const_iv (JOIN_ITEM)
1049 const_iv (FIRST) 1117 const_iv (FIRST)
1050 const_iv (NEXT) 1118 const_iv (NEXT)
1051 const_iv (NEXT_DUP) 1119 const_iv (NEXT_DUP)
1052 const_iv (NEXT_NODUP) 1120 const_iv (NEXT_NODUP)
1053 const_iv (PREV) 1121 const_iv (PREV)
… …
1087 const_iv (LOG_BUFFER_FULL) 1155 const_iv (LOG_BUFFER_FULL)
1088 const_iv (NOSERVER) 1156 const_iv (NOSERVER)
1089 const_iv (NOSERVER_HOME) 1157 const_iv (NOSERVER_HOME)
1090 const_iv (NOSERVER_ID) 1158 const_iv (NOSERVER_ID)
1091 const_iv (NOTFOUND) 1159 const_iv (NOTFOUND)
1092 const_iv (OLD_VERSION)
1093 const_iv (PAGE_NOTFOUND) 1160 const_iv (PAGE_NOTFOUND)
1094 const_iv (REP_DUPMASTER) 1161 const_iv (REP_DUPMASTER)
1095 const_iv (REP_HANDLE_DEAD) 1162 const_iv (REP_HANDLE_DEAD)
1096 const_iv (REP_HOLDELECTION) 1163 const_iv (REP_HOLDELECTION)
1097 const_iv (REP_IGNORE) 1164 const_iv (REP_IGNORE)
… …
1120 const_iv (MULTIVERSION) 1187 const_iv (MULTIVERSION)
1121 const_iv (TXN_SNAPSHOT) 1188 const_iv (TXN_SNAPSHOT)
1122#endif 1189#endif
1123#if DB_VERSION_MINOR >= 6 1190#if DB_VERSION_MINOR >= 6
1124 const_iv (PREV_DUP) 1191 const_iv (PREV_DUP)
1125# if 0
1126 const_iv (PRIORITY_UNCHANGED) 1192 const_iv (PRIORITY_UNCHANGED)
1127 const_iv (PRIORITY_VERY_LOW) 1193 const_iv (PRIORITY_VERY_LOW)
1128 const_iv (PRIORITY_LOW) 1194 const_iv (PRIORITY_LOW)
1129 const_iv (PRIORITY_DEFAULT) 1195 const_iv (PRIORITY_DEFAULT)
1130 const_iv (PRIORITY_HIGH) 1196 const_iv (PRIORITY_HIGH)
1131 const_iv (PRIORITY_VERY_HIGH) 1197 const_iv (PRIORITY_VERY_HIGH)
1132# endif
1133#endif 1198#endif
1134 }; 1199 };
1135 1200
1136 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1201 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1137 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1202 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1138 1203
1139 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1204 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1140 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1205 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1141 1206
1142 create_respipe (); 1207 create_respipe ();
1143 1208
1144 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1209 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1145#ifdef _WIN32 1210#ifdef _WIN32
… …
1147 X_MUTEX_CHECK (reslock); 1212 X_MUTEX_CHECK (reslock);
1148 X_MUTEX_CHECK (reqlock); 1213 X_MUTEX_CHECK (reqlock);
1149 1214
1150 X_COND_CHECK (reqwait); 1215 X_COND_CHECK (reqwait);
1151#endif 1216#endif
1217 patch_errno ();
1152} 1218}
1153 1219
1154void 1220void
1155max_poll_reqs (int nreqs) 1221max_poll_reqs (int nreqs)
1156 PROTOTYPE: $ 1222 PROTOTYPE: $
… …
1314} 1380}
1315 OUTPUT: 1381 OUTPUT:
1316 RETVAL 1382 RETVAL
1317 1383
1318void 1384void
1319db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1385db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1320 CODE: 1386 CODE:
1321{ 1387{
1322 dREQ (REQ_ENV_OPEN); 1388 dREQ (REQ_ENV_OPEN);
1323
1324 env->set_thread_count (env, wanted + 2);
1325 1389
1326 req->env = env; 1390 req->env = env;
1327 req->uint1 = open_flags | DB_THREAD; 1391 req->uint1 = open_flags | DB_THREAD;
1328 req->int1 = mode; 1392 req->int1 = mode;
1329 req->buf1 = strdup_ornull (db_home); 1393 req->buf1 = strdup_ornull (db_home);
… …
1397} 1461}
1398 OUTPUT: 1462 OUTPUT:
1399 RETVAL 1463 RETVAL
1400 1464
1401void 1465void
1402db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1466db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
1403 CODE: 1467 CODE:
1404{ 1468{
1405 dREQ (REQ_DB_OPEN); 1469 dREQ (REQ_DB_OPEN);
1406 req->db = db; 1470 req->db = db;
1407 req->txn = txnid; 1471 req->txn = txnid;
… …
1447 req->uint1 = flags; 1511 req->uint1 = flags;
1448 REQ_SEND; 1512 REQ_SEND;
1449} 1513}
1450 1514
1451void 1515void
1516db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
1517 CODE:
1518{
1519 dREQ (REQ_DB_SYNC);
1520 req->db = db;
1521 req->buf1 = strdup (file);
1522 req->uint1 = flags;
1523 REQ_SEND;
1524}
1525
1526void
1452db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1527db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1453 CODE: 1528 CODE:
1454{ 1529{
1455 dREQ (REQ_DB_KEY_RANGE); 1530 dREQ (REQ_DB_KEY_RANGE);
1456 req->db = db; 1531 req->db = db;
… …
1475} 1550}
1476 1551
1477void 1552void
1478db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1553db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1479 CODE: 1554 CODE:
1555 if (SvREADONLY (data))
1556 croak ("can't modify read-only data scalar in db_get");
1480{ 1557{
1481 dREQ (REQ_DB_GET); 1558 dREQ (REQ_DB_GET);
1482 req->db = db; 1559 req->db = db;
1483 req->txn = txn; 1560 req->txn = txn;
1484 req->uint1 = flags; 1561 req->uint1 = flags;
… …
1489} 1566}
1490 1567
1491void 1568void
1492db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1569db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1493 CODE: 1570 CODE:
1571 if (SvREADONLY (data))
1572 croak ("can't modify read-only data scalar in db_pget");
1494{ 1573{
1495 dREQ (REQ_DB_PGET); 1574 dREQ (REQ_DB_PGET);
1496 req->db = db; 1575 req->db = db;
1497 req->txn = txn; 1576 req->txn = txn;
1498 req->uint1 = flags; 1577 req->uint1 = flags;
… …
1692 1771
1693 1772
1694MODULE = BDB PACKAGE = BDB::Env 1773MODULE = BDB PACKAGE = BDB::Env
1695 1774
1696void 1775void
1697DESTROY (DB_ENV_ornull *env) 1776DESTROY (DB_ENV_ornuked *env)
1698 CODE: 1777 CODE:
1699 if (env) 1778 if (env)
1700 env->close (env, 0); 1779 env->close (env, 0);
1701 1780
1702int set_data_dir (DB_ENV *env, const char *dir) 1781int set_data_dir (DB_ENV *env, const char *dir)
… …
1727 CODE: 1806 CODE:
1728 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1807 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1729 OUTPUT: 1808 OUTPUT:
1730 RETVAL 1809 RETVAL
1731 1810
1732int set_flags (DB_ENV *env, U32 flags, int onoff) 1811int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1733 CODE: 1812 CODE:
1734 RETVAL = env->set_flags (env, flags, onoff); 1813 RETVAL = env->set_flags (env, flags, onoff);
1735 OUTPUT: 1814 OUTPUT:
1736 RETVAL 1815 RETVAL
1737 1816
… …
1741 1820
1742void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1821void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1743 CODE: 1822 CODE:
1744 env->set_msgfile (env, msgfile); 1823 env->set_msgfile (env, msgfile);
1745 1824
1746int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1825int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1747 CODE: 1826 CODE:
1748 RETVAL = env->set_verbose (env, which, onoff); 1827 RETVAL = env->set_verbose (env, which, onoff);
1749 OUTPUT: 1828 OUTPUT:
1750 RETVAL 1829 RETVAL
1751 1830
… …
1849 RETVAL 1928 RETVAL
1850 1929
1851MODULE = BDB PACKAGE = BDB::Db 1930MODULE = BDB PACKAGE = BDB::Db
1852 1931
1853void 1932void
1854DESTROY (DB_ornull *db) 1933DESTROY (DB_ornuked *db)
1855 CODE: 1934 CODE:
1856 if (db) 1935 if (db)
1857 { 1936 {
1858 SV *env = (SV *)db->app_private; 1937 SV *env = (SV *)db->app_private;
1859 db->close (db, 0); 1938 db->close (db, 0);
… …
1954 2033
1955 2034
1956MODULE = BDB PACKAGE = BDB::Txn 2035MODULE = BDB PACKAGE = BDB::Txn
1957 2036
1958void 2037void
1959DESTROY (DB_TXN_ornull *txn) 2038DESTROY (DB_TXN_ornuked *txn)
1960 CODE: 2039 CODE:
1961 if (txn) 2040 if (txn)
1962 txn->abort (txn); 2041 txn->abort (txn);
1963 2042
1964int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT) 2043int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
… …
1975 2054
1976 2055
1977MODULE = BDB PACKAGE = BDB::Cursor 2056MODULE = BDB PACKAGE = BDB::Cursor
1978 2057
1979void 2058void
1980DESTROY (DBC_ornull *dbc) 2059DESTROY (DBC_ornuked *dbc)
1981 CODE: 2060 CODE:
1982 if (dbc) 2061 if (dbc)
1983 dbc->c_close (dbc); 2062 dbc->c_close (dbc);
1984 2063
2064#if DB_VERSION_MINOR >= 6
2065
2066int set_priority (DBC *dbc, int priority)
2067 CODE:
2068 dbc->set_priority (dbc, priority);
2069
2070#endif
2071
1985MODULE = BDB PACKAGE = BDB::Sequence 2072MODULE = BDB PACKAGE = BDB::Sequence
1986 2073
1987void 2074void
1988DESTROY (DB_SEQUENCE_ornull *seq) 2075DESTROY (DB_SEQUENCE_ornuked *seq)
1989 CODE: 2076 CODE:
1990 if (seq) 2077 if (seq)
1991 seq->close (seq, 0); 2078 seq->close (seq, 0);
1992 2079
1993int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2080int initial_value (DB_SEQUENCE *seq, db_seq_t value)
… …
2012 CODE: 2099 CODE:
2013 RETVAL = seq->set_range (seq, min, max); 2100 RETVAL = seq->set_range (seq, min, max);
2014 OUTPUT: 2101 OUTPUT:
2015 RETVAL 2102 RETVAL
2016 2103
2104

Diff Legend

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