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

Comparing BDB/BDB.xs (file contents):
Revision 1.16 by root, Mon Aug 13 12:01:45 2007 UTC vs.
Revision 1.30 by root, Sun Jan 13 09:43:21 2008 UTC

… …
39typedef DB_ENV DB_ENV_ornull; 39typedef DB_ENV DB_ENV_ornull;
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
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;
44 50
45typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
46typedef char *octetstring; 52typedef char *octetstring;
47 53
48static SV *prepare_cb; 54static SV *prepare_cb;
… …
102 108
103enum { 109enum {
104 REQ_QUIT, 110 REQ_QUIT,
105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 111 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 112 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 113 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, 114 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
109 REQ_TXN_COMMIT, REQ_TXN_ABORT, 115 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, 116 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, 117 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
112}; 118};
113 119
114typedef struct aio_cb 120typedef struct bdb_cb
115{ 121{
116 struct aio_cb *volatile next; 122 struct bdb_cb *volatile next;
117 SV *callback; 123 SV *callback;
118 int type, pri, result; 124 int type, pri, result;
119 125
120 DB_ENV *env; 126 DB_ENV *env;
121 DB *db; 127 DB *db;
… …
130 136
131 DBT dbt1, dbt2, dbt3; 137 DBT dbt1, dbt2, dbt3;
132 DB_KEY_RANGE key_range; 138 DB_KEY_RANGE key_range;
133 DB_SEQUENCE *seq; 139 DB_SEQUENCE *seq;
134 db_seq_t seq_t; 140 db_seq_t seq_t;
135} aio_cb; 141} bdb_cb;
136 142
137typedef aio_cb *aio_req; 143typedef bdb_cb *bdb_req;
138 144
139enum { 145enum {
140 PRI_MIN = -4, 146 PRI_MIN = -4,
141 PRI_MAX = 4, 147 PRI_MAX = 4,
142 148
… …
169 struct worker *prev, *next; 175 struct worker *prev, *next;
170 176
171 thread_t tid; 177 thread_t tid;
172 178
173 /* locked by reslock, reqlock or wrklock */ 179 /* locked by reslock, reqlock or wrklock */
174 aio_req req; /* currently processed request */ 180 bdb_req req; /* currently processed request */
175 void *dbuf; 181 void *dbuf;
176 DIR *dirp; 182 DIR *dirp;
177} worker; 183} worker;
178 184
179static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 185static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
191} 197}
192 198
193static volatile unsigned int nreqs, nready, npending; 199static volatile unsigned int nreqs, nready, npending;
194static volatile unsigned int max_idle = 4; 200static volatile unsigned int max_idle = 4;
195static volatile unsigned int max_outstanding = 0xffffffff; 201static volatile unsigned int max_outstanding = 0xffffffff;
196static int respipe [2], respipe_osf [2]; 202static int respipe_osf [2], respipe [2] = { -1, -1 };
197 203
198static mutex_t reslock = X_MUTEX_INIT; 204static mutex_t reslock = X_MUTEX_INIT;
199static mutex_t reqlock = X_MUTEX_INIT; 205static mutex_t reqlock = X_MUTEX_INIT;
200static cond_t reqwait = X_COND_INIT; 206static cond_t reqwait = X_COND_INIT;
201 207
… …
246 * a somewhat faster data structure might be nice, but 252 * a somewhat faster data structure might be nice, but
247 * with 8 priorities this actually needs <20 insns 253 * with 8 priorities this actually needs <20 insns
248 * per shift, the most expensive operation. 254 * per shift, the most expensive operation.
249 */ 255 */
250typedef struct { 256typedef struct {
251 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 257 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
252 int size; 258 int size;
253} reqq; 259} reqq;
254 260
255static reqq req_queue; 261static reqq req_queue;
256static reqq res_queue; 262static reqq res_queue;
257 263
258int reqq_push (reqq *q, aio_req req) 264int reqq_push (reqq *q, bdb_req req)
259{ 265{
260 int pri = req->pri; 266 int pri = req->pri;
261 req->next = 0; 267 req->next = 0;
262 268
263 if (q->qe[pri]) 269 if (q->qe[pri])
… …
269 q->qe[pri] = q->qs[pri] = req; 275 q->qe[pri] = q->qs[pri] = req;
270 276
271 return q->size++; 277 return q->size++;
272} 278}
273 279
274aio_req reqq_shift (reqq *q) 280bdb_req reqq_shift (reqq *q)
275{ 281{
276 int pri; 282 int pri;
277 283
278 if (!q->size) 284 if (!q->size)
279 return 0; 285 return 0;
280 286
281 --q->size; 287 --q->size;
282 288
283 for (pri = NUM_PRI; pri--; ) 289 for (pri = NUM_PRI; pri--; )
284 { 290 {
285 aio_req req = q->qs[pri]; 291 bdb_req req = q->qs[pri];
286 292
287 if (req) 293 if (req)
288 { 294 {
289 if (!(q->qs[pri] = req->next)) 295 if (!(q->qs[pri] = req->next))
290 q->qe[pri] = 0; 296 q->qe[pri] = 0;
… …
295 301
296 abort (); 302 abort ();
297} 303}
298 304
299static int poll_cb (); 305static int poll_cb ();
300static void req_free (aio_req req); 306static void req_free (bdb_req req);
301static void req_cancel (aio_req req); 307static void req_cancel (bdb_req req);
302 308
303static int req_invoke (aio_req req) 309static int req_invoke (bdb_req req)
304{ 310{
305 dSP; 311 dSP;
306 312
307 if (SvOK (req->callback)) 313 if (SvOK (req->callback))
308 { 314 {
… …
326 dbt_to_sv (req->sv1, &req->dbt1); 332 dbt_to_sv (req->sv1, &req->dbt1);
327 dbt_to_sv (req->sv2, &req->dbt2); 333 dbt_to_sv (req->sv2, &req->dbt2);
328 dbt_to_sv (req->sv3, &req->dbt3); 334 dbt_to_sv (req->sv3, &req->dbt3);
329 break; 335 break;
330 336
337 case REQ_DB_PUT:
338 case REQ_C_PUT:
339 dbt_to_sv (0, &req->dbt1);
340 dbt_to_sv (0, &req->dbt2);
341 break;
342
331 case REQ_DB_KEY_RANGE: 343 case REQ_DB_KEY_RANGE:
332 { 344 {
333 AV *av = newAV (); 345 AV *av = newAV ();
334 346
335 av_push (av, newSVnv (req->key_range.less)); 347 av_push (av, newSVnv (req->key_range.less));
… …
344 356
345 case REQ_SEQ_GET: 357 case REQ_SEQ_GET:
346 SvREADONLY_off (req->sv1); 358 SvREADONLY_off (req->sv1);
347 359
348 if (sizeof (IV) > 4) 360 if (sizeof (IV) > 4)
349 sv_setiv_mg (req->sv1, req->seq_t); 361 sv_setiv_mg (req->sv1, (IV)req->seq_t);
350 else 362 else
351 sv_setnv_mg (req->sv1, req->seq_t); 363 sv_setnv_mg (req->sv1, (NV)req->seq_t);
352 364
353 SvREFCNT_dec (req->sv1); 365 SvREFCNT_dec (req->sv1);
354 break; 366 break;
355 } 367 }
356 368
… …
365 } 377 }
366 378
367 return !SvTRUE (ERRSV); 379 return !SvTRUE (ERRSV);
368} 380}
369 381
370static void req_free (aio_req req) 382static void req_free (bdb_req req)
371{ 383{
372 free (req->buf1); 384 free (req->buf1);
373 free (req->buf2); 385 free (req->buf2);
374 Safefree (req); 386 Safefree (req);
375} 387}
… …
379#else 391#else
380# define TO_SOCKET(x) (x) 392# define TO_SOCKET(x) (x)
381#endif 393#endif
382 394
383static void 395static void
384create_pipe (int fd[2]) 396create_respipe ()
385{ 397{
386#ifdef _WIN32 398#ifdef _WIN32
387 int arg = 1; 399 int arg; /* argg */
400#endif
401 int old_readfd = respipe [0];
402
403 if (respipe [1] >= 0)
404 respipe_close (TO_SOCKET (respipe [1]));
405
406#ifdef _WIN32
388 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd) 407 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
389 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg)
390 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg))
391#else 408#else
392 if (pipe (fd) 409 if (pipe (respipe))
393 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
394 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
395#endif 410#endif
396 croak ("unable to initialize result pipe"); 411 croak ("unable to initialize result pipe");
412
413 if (old_readfd >= 0)
414 {
415 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
416 croak ("unable to initialize result pipe(2)");
417
418 respipe_close (respipe [0]);
419 respipe [0] = old_readfd;
420 }
421
422#ifdef _WIN32
423 arg = 1;
424 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
425 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
426#else
427 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
428 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
429#endif
430 croak ("unable to initialize result pipe(3)");
397 431
398 respipe_osf [0] = TO_SOCKET (respipe [0]); 432 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]); 433 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 434}
401 435
… …
433 return; 467 return;
434 468
435 start_thread (); 469 start_thread ();
436} 470}
437 471
438static void req_send (aio_req req) 472static void req_send (bdb_req req)
439{ 473{
440 SV *wait_callback = 0; 474 SV *wait_callback = 0;
441 475
442 // synthesize callback if none given 476 // synthesize callback if none given
443 if (!SvOK (req->callback)) 477 if (!SvOK (req->callback))
… …
451 SPAGAIN; 485 SPAGAIN;
452 486
453 if (count != 2) 487 if (count != 2)
454 croak ("prepare callback must return exactly two values\n"); 488 croak ("prepare callback must return exactly two values\n");
455 489
456 wait_callback = SvREFCNT_inc (POPs); 490 wait_callback = POPs;
457 SvREFCNT_dec (req->callback); 491 SvREFCNT_dec (req->callback);
458 req->callback = SvREFCNT_inc (POPs); 492 req->callback = SvREFCNT_inc (POPs);
459 } 493 }
460 494
461 ++nreqs; 495 ++nreqs;
… …
472 { 506 {
473 dSP; 507 dSP;
474 PUSHMARK (SP); 508 PUSHMARK (SP);
475 PUTBACK; 509 PUTBACK;
476 call_sv (wait_callback, G_DISCARD); 510 call_sv (wait_callback, G_DISCARD);
477 SvREFCNT_dec (wait_callback);
478 } 511 }
479} 512}
480 513
481static void end_thread (void) 514static void end_thread (void)
482{ 515{
483 aio_req req; 516 bdb_req req;
484 517
485 Newz (0, req, 1, aio_cb); 518 Newz (0, req, 1, bdb_cb);
486 519
487 req->type = REQ_QUIT; 520 req->type = REQ_QUIT;
488 req->pri = PRI_MAX + PRI_BIAS; 521 req->pri = PRI_MAX + PRI_BIAS;
489 522
490 X_LOCK (reqlock); 523 X_LOCK (reqlock);
… …
547 dSP; 580 dSP;
548 int count = 0; 581 int count = 0;
549 int maxreqs = max_poll_reqs; 582 int maxreqs = max_poll_reqs;
550 int do_croak = 0; 583 int do_croak = 0;
551 struct timeval tv_start, tv_now; 584 struct timeval tv_start, tv_now;
552 aio_req req; 585 bdb_req req;
553 586
554 if (max_poll_time) 587 if (max_poll_time)
555 gettimeofday (&tv_start, 0); 588 gettimeofday (&tv_start, 0);
556 589
557 for (;;) 590 for (;;)
… …
618 651
619/*****************************************************************************/ 652/*****************************************************************************/
620 653
621X_THREAD_PROC (bdb_proc) 654X_THREAD_PROC (bdb_proc)
622{ 655{
623 aio_req req; 656 bdb_req req;
624 struct timespec ts; 657 struct timespec ts;
625 worker *self = (worker *)thr_arg; 658 worker *self = (worker *)thr_arg;
626 659
627 /* try to distribute timeouts somewhat evenly */ 660 /* try to distribute timeouts somewhat evenly */
628 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 661 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
668 X_UNLOCK (reqlock); 701 X_UNLOCK (reqlock);
669 702
670 switch (req->type) 703 switch (req->type)
671 { 704 {
672 case REQ_QUIT: 705 case REQ_QUIT:
706 req->result = ENOSYS;
673 goto quit; 707 goto quit;
674 708
675 case REQ_ENV_OPEN: 709 case REQ_ENV_OPEN:
676 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 710 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
677 break; 711 break;
… …
710 744
711 case REQ_DB_SYNC: 745 case REQ_DB_SYNC:
712 req->result = req->db->sync (req->db, req->uint1); 746 req->result = req->db->sync (req->db, req->uint1);
713 break; 747 break;
714 748
749 case REQ_DB_UPGRADE:
750 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
751 break;
752
715 case REQ_DB_PUT: 753 case REQ_DB_PUT:
716 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 754 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
717 break; 755 break;
718 756
719 case REQ_DB_GET: 757 case REQ_DB_GET:
… …
736 req->result = req->txn->commit (req->txn, req->uint1); 774 req->result = req->txn->commit (req->txn, req->uint1);
737 break; 775 break;
738 776
739 case REQ_TXN_ABORT: 777 case REQ_TXN_ABORT:
740 req->result = req->txn->abort (req->txn); 778 req->result = req->txn->abort (req->txn);
779 break;
780
781 case REQ_TXN_FINISH:
782 if (req->txn->flags & TXN_DEADLOCK)
783 {
784 req->result = req->txn->abort (req->txn);
785 if (!req->result)
786 req->result = DB_LOCK_DEADLOCK;
787 }
788 else
789 req->result = req->txn->commit (req->txn, req->uint1);
741 break; 790 break;
742 791
743 case REQ_C_CLOSE: 792 case REQ_C_CLOSE:
744 req->result = req->dbc->c_close (req->dbc); 793 req->result = req->dbc->c_close (req->dbc);
745 break; 794 break;
… …
787 default: 836 default:
788 req->result = ENOSYS; 837 req->result = ENOSYS;
789 break; 838 break;
790 } 839 }
791 840
841 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
842 req->txn->flags |= TXN_DEADLOCK;
843
792 X_LOCK (reslock); 844 X_LOCK (reslock);
793 845
794 ++npending; 846 ++npending;
795 847
796 if (!reqq_push (&res_queue, req)) 848 if (!reqq_push (&res_queue, req))
… …
827 X_UNLOCK (wrklock); 879 X_UNLOCK (wrklock);
828} 880}
829 881
830static void atfork_child (void) 882static void atfork_child (void)
831{ 883{
832 aio_req prv; 884 bdb_req prv;
833 885
834 while (prv = reqq_shift (&req_queue)) 886 while (prv = reqq_shift (&req_queue))
835 req_free (prv); 887 req_free (prv);
836 888
837 while (prv = reqq_shift (&res_queue)) 889 while (prv = reqq_shift (&res_queue))
… …
852 idle = 0; 904 idle = 0;
853 nreqs = 0; 905 nreqs = 0;
854 nready = 0; 906 nready = 0;
855 npending = 0; 907 npending = 0;
856 908
857 respipe_close (respipe [0]);
858 respipe_close (respipe [1]);
859
860 create_pipe (respipe); 909 create_respipe ();
861 910
862 atfork_parent (); 911 atfork_parent ();
863} 912}
864 913
865#define dREQ(reqtype) \ 914#define dREQ(reqtype) \
866 aio_req req; \ 915 bdb_req req; \
867 int req_pri = next_pri; \ 916 int req_pri = next_pri; \
868 next_pri = DEFAULT_PRI + PRI_BIAS; \ 917 next_pri = DEFAULT_PRI + PRI_BIAS; \
869 \ 918 \
870 if (SvOK (callback) && !SvROK (callback)) \ 919 if (SvOK (callback) && !SvROK (callback)) \
871 croak ("callback must be undef or of reference type"); \ 920 croak ("callback must be undef or of reference type"); \
872 \ 921 \
873 Newz (0, req, 1, aio_cb); \ 922 Newz (0, req, 1, bdb_cb); \
874 if (!req) \ 923 if (!req) \
875 croak ("out of memory during aio_req allocation"); \ 924 croak ("out of memory during bdb_req allocation"); \
876 \ 925 \
877 req->callback = newSVsv (callback); \ 926 req->callback = newSVsv (callback); \
878 req->type = (reqtype); \ 927 req->type = (reqtype); \
879 req->pri = req_pri 928 req->pri = req_pri
880 929
881#define REQ_SEND \ 930#define REQ_SEND \
882 req_send (req) 931 req_send (req)
883 932
884#define SvPTR(var, arg, type, class, nullok) \ 933#define SvPTR(var, arg, type, class, nullok) \
885 if (!SvOK (arg)) \ 934 if (!SvOK (arg)) \
886 { \ 935 { \
887 if (!nullok) \ 936 if (nullok != 1) \
888 croak (# var " must be a " # class " object, not undef"); \ 937 croak (# var " must be a " # class " object, not undef"); \
889 \ 938 \
890 (var) = 0; \ 939 (var) = 0; \
891 } \ 940 } \
892 else if (sv_derived_from ((arg), # class)) \ 941 else if (sv_derived_from ((arg), # class)) \
893 { \ 942 { \
894 IV tmp = SvIV ((SV*) SvRV (arg)); \ 943 IV tmp = SvIV ((SV*) SvRV (arg)); \
895 (var) = INT2PTR (type, tmp); \ 944 (var) = INT2PTR (type, tmp); \
896 if (!var) \ 945 if (!var && nullok != 2) \
897 croak (# var " is not a valid " # class " object anymore"); \ 946 croak (# var " is not a valid " # class " object anymore"); \
898 } \ 947 } \
899 else \ 948 else \
900 croak (# var " is not of type " # class); \ 949 croak (# var " is not of type " # class); \
901 \ 950 \
… …
929 const_iv (INIT_TXN) 978 const_iv (INIT_TXN)
930 const_iv (RECOVER) 979 const_iv (RECOVER)
931 const_iv (INIT_TXN) 980 const_iv (INIT_TXN)
932 const_iv (RECOVER_FATAL) 981 const_iv (RECOVER_FATAL)
933 const_iv (CREATE) 982 const_iv (CREATE)
983 const_iv (RDONLY)
934 const_iv (USE_ENVIRON) 984 const_iv (USE_ENVIRON)
935 const_iv (USE_ENVIRON_ROOT) 985 const_iv (USE_ENVIRON_ROOT)
936 const_iv (LOCKDOWN) 986 const_iv (LOCKDOWN)
937 const_iv (PRIVATE) 987 const_iv (PRIVATE)
938 const_iv (REGISTER) 988 const_iv (REGISTER)
… …
951 const_iv (OVERWRITE) 1001 const_iv (OVERWRITE)
952 const_iv (PANIC_ENVIRONMENT) 1002 const_iv (PANIC_ENVIRONMENT)
953 const_iv (REGION_INIT) 1003 const_iv (REGION_INIT)
954 const_iv (TIME_NOTGRANTED) 1004 const_iv (TIME_NOTGRANTED)
955 const_iv (TXN_NOSYNC) 1005 const_iv (TXN_NOSYNC)
1006 const_iv (TXN_NOT_DURABLE)
956 const_iv (TXN_WRITE_NOSYNC) 1007 const_iv (TXN_WRITE_NOSYNC)
957 const_iv (WRITECURSOR) 1008 const_iv (WRITECURSOR)
958 const_iv (YIELDCPU) 1009 const_iv (YIELDCPU)
959 const_iv (ENCRYPT_AES) 1010 const_iv (ENCRYPT_AES)
960 const_iv (XA_CREATE) 1011 const_iv (XA_CREATE)
… …
968 const_iv (READ_UNCOMMITTED) 1019 const_iv (READ_UNCOMMITTED)
969 const_iv (TRUNCATE) 1020 const_iv (TRUNCATE)
970 const_iv (NOSYNC) 1021 const_iv (NOSYNC)
971 const_iv (CHKSUM) 1022 const_iv (CHKSUM)
972 const_iv (ENCRYPT) 1023 const_iv (ENCRYPT)
973 const_iv (TXN_NOT_DURABLE)
974 const_iv (DUP) 1024 const_iv (DUP)
975 const_iv (DUPSORT) 1025 const_iv (DUPSORT)
976 const_iv (RECNUM) 1026 const_iv (RECNUM)
977 const_iv (RENUMBER) 1027 const_iv (RENUMBER)
978 const_iv (REVSPLITOFF) 1028 const_iv (REVSPLITOFF)
… …
983 const_iv (GET_BOTH_RANGE) 1033 const_iv (GET_BOTH_RANGE)
984 //const_iv (SET_RECNO) 1034 //const_iv (SET_RECNO)
985 //const_iv (MULTIPLE) 1035 //const_iv (MULTIPLE)
986 const_iv (SNAPSHOT) 1036 const_iv (SNAPSHOT)
987 const_iv (JOIN_ITEM) 1037 const_iv (JOIN_ITEM)
1038 const_iv (JOIN_NOSORT)
988 const_iv (RMW) 1039 const_iv (RMW)
989 1040
990 const_iv (NOTFOUND) 1041 const_iv (NOTFOUND)
991 const_iv (KEYEMPTY) 1042 const_iv (KEYEMPTY)
992 const_iv (LOCK_DEADLOCK) 1043 const_iv (LOCK_DEADLOCK)
… …
1008 const_iv (TXN_SYNC) 1059 const_iv (TXN_SYNC)
1009 1060
1010 const_iv (SET_LOCK_TIMEOUT) 1061 const_iv (SET_LOCK_TIMEOUT)
1011 const_iv (SET_TXN_TIMEOUT) 1062 const_iv (SET_TXN_TIMEOUT)
1012 1063
1013 const_iv (JOIN_ITEM)
1014 const_iv (FIRST) 1064 const_iv (FIRST)
1015 const_iv (NEXT) 1065 const_iv (NEXT)
1016 const_iv (NEXT_DUP) 1066 const_iv (NEXT_DUP)
1017 const_iv (NEXT_NODUP) 1067 const_iv (NEXT_NODUP)
1018 const_iv (PREV) 1068 const_iv (PREV)
… …
1052 const_iv (LOG_BUFFER_FULL) 1102 const_iv (LOG_BUFFER_FULL)
1053 const_iv (NOSERVER) 1103 const_iv (NOSERVER)
1054 const_iv (NOSERVER_HOME) 1104 const_iv (NOSERVER_HOME)
1055 const_iv (NOSERVER_ID) 1105 const_iv (NOSERVER_ID)
1056 const_iv (NOTFOUND) 1106 const_iv (NOTFOUND)
1057 const_iv (OLD_VERSION)
1058 const_iv (PAGE_NOTFOUND) 1107 const_iv (PAGE_NOTFOUND)
1059 const_iv (REP_DUPMASTER) 1108 const_iv (REP_DUPMASTER)
1060 const_iv (REP_HANDLE_DEAD) 1109 const_iv (REP_HANDLE_DEAD)
1061 const_iv (REP_HOLDELECTION) 1110 const_iv (REP_HOLDELECTION)
1062 const_iv (REP_IGNORE) 1111 const_iv (REP_IGNORE)
… …
1085 const_iv (MULTIVERSION) 1134 const_iv (MULTIVERSION)
1086 const_iv (TXN_SNAPSHOT) 1135 const_iv (TXN_SNAPSHOT)
1087#endif 1136#endif
1088#if DB_VERSION_MINOR >= 6 1137#if DB_VERSION_MINOR >= 6
1089 const_iv (PREV_DUP) 1138 const_iv (PREV_DUP)
1090# if 0
1091 const_iv (PRIORITY_UNCHANGED) 1139 const_iv (PRIORITY_UNCHANGED)
1092 const_iv (PRIORITY_VERY_LOW) 1140 const_iv (PRIORITY_VERY_LOW)
1093 const_iv (PRIORITY_LOW) 1141 const_iv (PRIORITY_LOW)
1094 const_iv (PRIORITY_DEFAULT) 1142 const_iv (PRIORITY_DEFAULT)
1095 const_iv (PRIORITY_HIGH) 1143 const_iv (PRIORITY_HIGH)
1096 const_iv (PRIORITY_VERY_HIGH) 1144 const_iv (PRIORITY_VERY_HIGH)
1097# endif
1098#endif 1145#endif
1099 }; 1146 };
1100 1147
1101 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1148 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1102 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1149 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1103 1150
1104 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1151 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1105 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1152 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1106 1153
1107 create_pipe (respipe); 1154 create_respipe ();
1108 1155
1109 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1156 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1110#ifdef _WIN32 1157#ifdef _WIN32
1111 X_MUTEX_CHECK (wrklock); 1158 X_MUTEX_CHECK (wrklock);
1112 X_MUTEX_CHECK (reslock); 1159 X_MUTEX_CHECK (reslock);
… …
1283void 1330void
1284db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1331db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1285 CODE: 1332 CODE:
1286{ 1333{
1287 dREQ (REQ_ENV_OPEN); 1334 dREQ (REQ_ENV_OPEN);
1288
1289 env->set_thread_count (env, wanted + 2);
1290 1335
1291 req->env = env; 1336 req->env = env;
1292 req->uint1 = open_flags | DB_THREAD; 1337 req->uint1 = open_flags | DB_THREAD;
1293 req->int1 = mode; 1338 req->int1 = mode;
1294 req->buf1 = strdup_ornull (db_home); 1339 req->buf1 = strdup_ornull (db_home);
… …
1412 req->uint1 = flags; 1457 req->uint1 = flags;
1413 REQ_SEND; 1458 REQ_SEND;
1414} 1459}
1415 1460
1416void 1461void
1462db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
1463 CODE:
1464{
1465 dREQ (REQ_DB_SYNC);
1466 req->db = db;
1467 req->buf1 = strdup (file);
1468 req->uint1 = flags;
1469 REQ_SEND;
1470}
1471
1472void
1417db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1473db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1418 CODE: 1474 CODE:
1419{ 1475{
1420 dREQ (REQ_DB_KEY_RANGE); 1476 dREQ (REQ_DB_KEY_RANGE);
1421 req->db = db; 1477 req->db = db;
… …
1440} 1496}
1441 1497
1442void 1498void
1443db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1499db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1444 CODE: 1500 CODE:
1501 if (SvREADONLY (data))
1502 croak ("can't modify read-only data scalar in db_get");
1445{ 1503{
1446 dREQ (REQ_DB_GET); 1504 dREQ (REQ_DB_GET);
1447 req->db = db; 1505 req->db = db;
1448 req->txn = txn; 1506 req->txn = txn;
1449 req->uint1 = flags; 1507 req->uint1 = flags;
… …
1454} 1512}
1455 1513
1456void 1514void
1457db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1515db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1458 CODE: 1516 CODE:
1517 if (SvREADONLY (data))
1518 croak ("can't modify read-only data scalar in db_pget");
1459{ 1519{
1460 dREQ (REQ_DB_PGET); 1520 dREQ (REQ_DB_PGET);
1461 req->db = db; 1521 req->db = db;
1462 req->txn = txn; 1522 req->txn = txn;
1463 req->uint1 = flags; 1523 req->uint1 = flags;
… …
1500 REQ_SEND; 1560 REQ_SEND;
1501 ptr_nuke (ST (0)); 1561 ptr_nuke (ST (0));
1502} 1562}
1503 1563
1504void 1564void
1565db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1566 CODE:
1567{
1568 dREQ (REQ_TXN_FINISH);
1569 req->txn = txn;
1570 req->uint1 = flags;
1571 REQ_SEND;
1572 ptr_nuke (ST (0));
1573}
1574
1575void
1505db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1576db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1506 CODE: 1577 CODE:
1507{ 1578{
1508 dREQ (REQ_C_CLOSE); 1579 dREQ (REQ_C_CLOSE);
1509 req->dbc = dbc; 1580 req->dbc = dbc;
… …
1646 1717
1647 1718
1648MODULE = BDB PACKAGE = BDB::Env 1719MODULE = BDB PACKAGE = BDB::Env
1649 1720
1650void 1721void
1651DESTROY (DB_ENV_ornull *env) 1722DESTROY (DB_ENV_ornuked *env)
1652 CODE: 1723 CODE:
1653 if (env) 1724 if (env)
1654 env->close (env, 0); 1725 env->close (env, 0);
1655 1726
1656int set_data_dir (DB_ENV *env, const char *dir) 1727int set_data_dir (DB_ENV *env, const char *dir)
… …
1681 CODE: 1752 CODE:
1682 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1753 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1683 OUTPUT: 1754 OUTPUT:
1684 RETVAL 1755 RETVAL
1685 1756
1686int set_flags (DB_ENV *env, U32 flags, int onoff) 1757int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1687 CODE: 1758 CODE:
1688 RETVAL = env->set_flags (env, flags, onoff); 1759 RETVAL = env->set_flags (env, flags, onoff);
1689 OUTPUT: 1760 OUTPUT:
1690 RETVAL 1761 RETVAL
1691 1762
… …
1695 1766
1696void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1767void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1697 CODE: 1768 CODE:
1698 env->set_msgfile (env, msgfile); 1769 env->set_msgfile (env, msgfile);
1699 1770
1700int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1771int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1701 CODE: 1772 CODE:
1702 RETVAL = env->set_verbose (env, which, onoff); 1773 RETVAL = env->set_verbose (env, which, onoff);
1703 OUTPUT: 1774 OUTPUT:
1704 RETVAL 1775 RETVAL
1705 1776
… …
1707 CODE: 1778 CODE:
1708 RETVAL = env->set_encrypt (env, password, flags); 1779 RETVAL = env->set_encrypt (env, password, flags);
1709 OUTPUT: 1780 OUTPUT:
1710 RETVAL 1781 RETVAL
1711 1782
1712int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1783int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1713 CODE: 1784 CODE:
1714 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1785 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1715 OUTPUT: 1786 OUTPUT:
1716 RETVAL 1787 RETVAL
1717 1788
… …
1765 1836
1766int set_lg_max (DB_ENV *env, U32 max) 1837int set_lg_max (DB_ENV *env, U32 max)
1767 CODE: 1838 CODE:
1768 RETVAL = env->set_lg_max (env, max); 1839 RETVAL = env->set_lg_max (env, max);
1769 OUTPUT: 1840 OUTPUT:
1841 RETVAL
1842
1843int mutex_set_max (DB_ENV *env, U32 max)
1844 CODE:
1845 RETVAL = env->mutex_set_max (env, max);
1846 OUTPUT:
1847 RETVAL
1848
1849int mutex_set_increment (DB_ENV *env, U32 increment)
1850 CODE:
1851 RETVAL = env->mutex_set_increment (env, increment);
1852 OUTPUT:
1853 RETVAL
1854
1855int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1856 CODE:
1857 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1858 OUTPUT:
1859 RETVAL
1860
1861int mutex_set_align (DB_ENV *env, U32 align)
1862 CODE:
1863 RETVAL = env->mutex_set_align (env, align);
1864 OUTPUT:
1770 RETVAL 1865 RETVAL
1771 1866
1772DB_TXN * 1867DB_TXN *
1773txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1868txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1774 CODE: 1869 CODE:
… …
1779 RETVAL 1874 RETVAL
1780 1875
1781MODULE = BDB PACKAGE = BDB::Db 1876MODULE = BDB PACKAGE = BDB::Db
1782 1877
1783void 1878void
1784DESTROY (DB_ornull *db) 1879DESTROY (DB_ornuked *db)
1785 CODE: 1880 CODE:
1786 if (db) 1881 if (db)
1787 { 1882 {
1788 SV *env = (SV *)db->app_private; 1883 SV *env = (SV *)db->app_private;
1789 db->close (db, 0); 1884 db->close (db, 0);
… …
1884 1979
1885 1980
1886MODULE = BDB PACKAGE = BDB::Txn 1981MODULE = BDB PACKAGE = BDB::Txn
1887 1982
1888void 1983void
1889DESTROY (DB_TXN_ornull *txn) 1984DESTROY (DB_TXN_ornuked *txn)
1890 CODE: 1985 CODE:
1891 if (txn) 1986 if (txn)
1892 txn->abort (txn); 1987 txn->abort (txn);
1893 1988
1894int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1989int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1895 CODE: 1990 CODE:
1896 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 1991 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1897 OUTPUT: 1992 OUTPUT:
1898 RETVAL 1993 RETVAL
1899 1994
1995int failed (DB_TXN *txn)
1996 CODE:
1997 RETVAL = !!(txn->flags & TXN_DEADLOCK);
1998 OUTPUT:
1999 RETVAL
2000
1900 2001
1901MODULE = BDB PACKAGE = BDB::Cursor 2002MODULE = BDB PACKAGE = BDB::Cursor
1902 2003
1903void 2004void
1904DESTROY (DBC_ornull *dbc) 2005DESTROY (DBC_ornuked *dbc)
1905 CODE: 2006 CODE:
1906 if (dbc) 2007 if (dbc)
1907 dbc->c_close (dbc); 2008 dbc->c_close (dbc);
1908 2009
2010#if DB_VERSION_MINOR >= 6
2011
2012int set_priority (DBC *dbc, int priority)
2013 CODE:
2014 dbc->set_priority (dbc, priority);
2015
2016#endif
2017
1909MODULE = BDB PACKAGE = BDB::Sequence 2018MODULE = BDB PACKAGE = BDB::Sequence
1910 2019
1911void 2020void
1912DESTROY (DB_SEQUENCE_ornull *seq) 2021DESTROY (DB_SEQUENCE_ornuked *seq)
1913 CODE: 2022 CODE:
1914 if (seq) 2023 if (seq)
1915 seq->close (seq, 0); 2024 seq->close (seq, 0);
1916 2025
1917int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2026int initial_value (DB_SEQUENCE *seq, db_seq_t value)

Diff Legend

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