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.28 by root, Sat Dec 22 07:33:48 2007 UTC

… …
102 102
103enum { 103enum {
104 REQ_QUIT, 104 REQ_QUIT,
105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 107 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, 108 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
109 REQ_TXN_COMMIT, REQ_TXN_ABORT, 109 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, 110 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, 111 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
112}; 112};
113 113
114typedef struct aio_cb 114typedef struct bdb_cb
115{ 115{
116 struct aio_cb *volatile next; 116 struct bdb_cb *volatile next;
117 SV *callback; 117 SV *callback;
118 int type, pri, result; 118 int type, pri, result;
119 119
120 DB_ENV *env; 120 DB_ENV *env;
121 DB *db; 121 DB *db;
… …
130 130
131 DBT dbt1, dbt2, dbt3; 131 DBT dbt1, dbt2, dbt3;
132 DB_KEY_RANGE key_range; 132 DB_KEY_RANGE key_range;
133 DB_SEQUENCE *seq; 133 DB_SEQUENCE *seq;
134 db_seq_t seq_t; 134 db_seq_t seq_t;
135} aio_cb; 135} bdb_cb;
136 136
137typedef aio_cb *aio_req; 137typedef bdb_cb *bdb_req;
138 138
139enum { 139enum {
140 PRI_MIN = -4, 140 PRI_MIN = -4,
141 PRI_MAX = 4, 141 PRI_MAX = 4,
142 142
… …
169 struct worker *prev, *next; 169 struct worker *prev, *next;
170 170
171 thread_t tid; 171 thread_t tid;
172 172
173 /* locked by reslock, reqlock or wrklock */ 173 /* locked by reslock, reqlock or wrklock */
174 aio_req req; /* currently processed request */ 174 bdb_req req; /* currently processed request */
175 void *dbuf; 175 void *dbuf;
176 DIR *dirp; 176 DIR *dirp;
177} worker; 177} worker;
178 178
179static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 179static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
191} 191}
192 192
193static volatile unsigned int nreqs, nready, npending; 193static volatile unsigned int nreqs, nready, npending;
194static volatile unsigned int max_idle = 4; 194static volatile unsigned int max_idle = 4;
195static volatile unsigned int max_outstanding = 0xffffffff; 195static volatile unsigned int max_outstanding = 0xffffffff;
196static int respipe [2], respipe_osf [2]; 196static int respipe_osf [2], respipe [2] = { -1, -1 };
197 197
198static mutex_t reslock = X_MUTEX_INIT; 198static mutex_t reslock = X_MUTEX_INIT;
199static mutex_t reqlock = X_MUTEX_INIT; 199static mutex_t reqlock = X_MUTEX_INIT;
200static cond_t reqwait = X_COND_INIT; 200static cond_t reqwait = X_COND_INIT;
201 201
… …
246 * a somewhat faster data structure might be nice, but 246 * a somewhat faster data structure might be nice, but
247 * with 8 priorities this actually needs <20 insns 247 * with 8 priorities this actually needs <20 insns
248 * per shift, the most expensive operation. 248 * per shift, the most expensive operation.
249 */ 249 */
250typedef struct { 250typedef struct {
251 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 251 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
252 int size; 252 int size;
253} reqq; 253} reqq;
254 254
255static reqq req_queue; 255static reqq req_queue;
256static reqq res_queue; 256static reqq res_queue;
257 257
258int reqq_push (reqq *q, aio_req req) 258int reqq_push (reqq *q, bdb_req req)
259{ 259{
260 int pri = req->pri; 260 int pri = req->pri;
261 req->next = 0; 261 req->next = 0;
262 262
263 if (q->qe[pri]) 263 if (q->qe[pri])
… …
269 q->qe[pri] = q->qs[pri] = req; 269 q->qe[pri] = q->qs[pri] = req;
270 270
271 return q->size++; 271 return q->size++;
272} 272}
273 273
274aio_req reqq_shift (reqq *q) 274bdb_req reqq_shift (reqq *q)
275{ 275{
276 int pri; 276 int pri;
277 277
278 if (!q->size) 278 if (!q->size)
279 return 0; 279 return 0;
280 280
281 --q->size; 281 --q->size;
282 282
283 for (pri = NUM_PRI; pri--; ) 283 for (pri = NUM_PRI; pri--; )
284 { 284 {
285 aio_req req = q->qs[pri]; 285 bdb_req req = q->qs[pri];
286 286
287 if (req) 287 if (req)
288 { 288 {
289 if (!(q->qs[pri] = req->next)) 289 if (!(q->qs[pri] = req->next))
290 q->qe[pri] = 0; 290 q->qe[pri] = 0;
… …
295 295
296 abort (); 296 abort ();
297} 297}
298 298
299static int poll_cb (); 299static int poll_cb ();
300static void req_free (aio_req req); 300static void req_free (bdb_req req);
301static void req_cancel (aio_req req); 301static void req_cancel (bdb_req req);
302 302
303static int req_invoke (aio_req req) 303static int req_invoke (bdb_req req)
304{ 304{
305 dSP; 305 dSP;
306 306
307 if (SvOK (req->callback)) 307 if (SvOK (req->callback))
308 { 308 {
… …
326 dbt_to_sv (req->sv1, &req->dbt1); 326 dbt_to_sv (req->sv1, &req->dbt1);
327 dbt_to_sv (req->sv2, &req->dbt2); 327 dbt_to_sv (req->sv2, &req->dbt2);
328 dbt_to_sv (req->sv3, &req->dbt3); 328 dbt_to_sv (req->sv3, &req->dbt3);
329 break; 329 break;
330 330
331 case REQ_DB_PUT:
332 case REQ_C_PUT:
333 dbt_to_sv (0, &req->dbt1);
334 dbt_to_sv (0, &req->dbt2);
335 break;
336
331 case REQ_DB_KEY_RANGE: 337 case REQ_DB_KEY_RANGE:
332 { 338 {
333 AV *av = newAV (); 339 AV *av = newAV ();
334 340
335 av_push (av, newSVnv (req->key_range.less)); 341 av_push (av, newSVnv (req->key_range.less));
… …
344 350
345 case REQ_SEQ_GET: 351 case REQ_SEQ_GET:
346 SvREADONLY_off (req->sv1); 352 SvREADONLY_off (req->sv1);
347 353
348 if (sizeof (IV) > 4) 354 if (sizeof (IV) > 4)
349 sv_setiv_mg (req->sv1, req->seq_t); 355 sv_setiv_mg (req->sv1, (IV)req->seq_t);
350 else 356 else
351 sv_setnv_mg (req->sv1, req->seq_t); 357 sv_setnv_mg (req->sv1, (NV)req->seq_t);
352 358
353 SvREFCNT_dec (req->sv1); 359 SvREFCNT_dec (req->sv1);
354 break; 360 break;
355 } 361 }
356 362
… …
365 } 371 }
366 372
367 return !SvTRUE (ERRSV); 373 return !SvTRUE (ERRSV);
368} 374}
369 375
370static void req_free (aio_req req) 376static void req_free (bdb_req req)
371{ 377{
372 free (req->buf1); 378 free (req->buf1);
373 free (req->buf2); 379 free (req->buf2);
374 Safefree (req); 380 Safefree (req);
375} 381}
… …
379#else 385#else
380# define TO_SOCKET(x) (x) 386# define TO_SOCKET(x) (x)
381#endif 387#endif
382 388
383static void 389static void
384create_pipe (int fd[2]) 390create_respipe ()
385{ 391{
386#ifdef _WIN32 392#ifdef _WIN32
387 int arg = 1; 393 int arg; /* argg */
394#endif
395 int old_readfd = respipe [0];
396
397 if (respipe [1] >= 0)
398 respipe_close (TO_SOCKET (respipe [1]));
399
400#ifdef _WIN32
388 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd) 401 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 402#else
392 if (pipe (fd) 403 if (pipe (respipe))
393 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
394 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
395#endif 404#endif
396 croak ("unable to initialize result pipe"); 405 croak ("unable to initialize result pipe");
406
407 if (old_readfd >= 0)
408 {
409 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
410 croak ("unable to initialize result pipe(2)");
411
412 respipe_close (respipe [0]);
413 respipe [0] = old_readfd;
414 }
415
416#ifdef _WIN32
417 arg = 1;
418 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
419 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
420#else
421 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
422 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
423#endif
424 croak ("unable to initialize result pipe(3)");
397 425
398 respipe_osf [0] = TO_SOCKET (respipe [0]); 426 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]); 427 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 428}
401 429
… …
433 return; 461 return;
434 462
435 start_thread (); 463 start_thread ();
436} 464}
437 465
438static void req_send (aio_req req) 466static void req_send (bdb_req req)
439{ 467{
440 SV *wait_callback = 0; 468 SV *wait_callback = 0;
441 469
442 // synthesize callback if none given 470 // synthesize callback if none given
443 if (!SvOK (req->callback)) 471 if (!SvOK (req->callback))
… …
451 SPAGAIN; 479 SPAGAIN;
452 480
453 if (count != 2) 481 if (count != 2)
454 croak ("prepare callback must return exactly two values\n"); 482 croak ("prepare callback must return exactly two values\n");
455 483
456 wait_callback = SvREFCNT_inc (POPs); 484 wait_callback = POPs;
457 SvREFCNT_dec (req->callback); 485 SvREFCNT_dec (req->callback);
458 req->callback = SvREFCNT_inc (POPs); 486 req->callback = SvREFCNT_inc (POPs);
459 } 487 }
460 488
461 ++nreqs; 489 ++nreqs;
… …
472 { 500 {
473 dSP; 501 dSP;
474 PUSHMARK (SP); 502 PUSHMARK (SP);
475 PUTBACK; 503 PUTBACK;
476 call_sv (wait_callback, G_DISCARD); 504 call_sv (wait_callback, G_DISCARD);
477 SvREFCNT_dec (wait_callback);
478 } 505 }
479} 506}
480 507
481static void end_thread (void) 508static void end_thread (void)
482{ 509{
483 aio_req req; 510 bdb_req req;
484 511
485 Newz (0, req, 1, aio_cb); 512 Newz (0, req, 1, bdb_cb);
486 513
487 req->type = REQ_QUIT; 514 req->type = REQ_QUIT;
488 req->pri = PRI_MAX + PRI_BIAS; 515 req->pri = PRI_MAX + PRI_BIAS;
489 516
490 X_LOCK (reqlock); 517 X_LOCK (reqlock);
… …
547 dSP; 574 dSP;
548 int count = 0; 575 int count = 0;
549 int maxreqs = max_poll_reqs; 576 int maxreqs = max_poll_reqs;
550 int do_croak = 0; 577 int do_croak = 0;
551 struct timeval tv_start, tv_now; 578 struct timeval tv_start, tv_now;
552 aio_req req; 579 bdb_req req;
553 580
554 if (max_poll_time) 581 if (max_poll_time)
555 gettimeofday (&tv_start, 0); 582 gettimeofday (&tv_start, 0);
556 583
557 for (;;) 584 for (;;)
… …
618 645
619/*****************************************************************************/ 646/*****************************************************************************/
620 647
621X_THREAD_PROC (bdb_proc) 648X_THREAD_PROC (bdb_proc)
622{ 649{
623 aio_req req; 650 bdb_req req;
624 struct timespec ts; 651 struct timespec ts;
625 worker *self = (worker *)thr_arg; 652 worker *self = (worker *)thr_arg;
626 653
627 /* try to distribute timeouts somewhat evenly */ 654 /* try to distribute timeouts somewhat evenly */
628 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 655 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
668 X_UNLOCK (reqlock); 695 X_UNLOCK (reqlock);
669 696
670 switch (req->type) 697 switch (req->type)
671 { 698 {
672 case REQ_QUIT: 699 case REQ_QUIT:
700 req->result = ENOSYS;
673 goto quit; 701 goto quit;
674 702
675 case REQ_ENV_OPEN: 703 case REQ_ENV_OPEN:
676 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 704 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
677 break; 705 break;
… …
710 738
711 case REQ_DB_SYNC: 739 case REQ_DB_SYNC:
712 req->result = req->db->sync (req->db, req->uint1); 740 req->result = req->db->sync (req->db, req->uint1);
713 break; 741 break;
714 742
743 case REQ_DB_UPGRADE:
744 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
745 break;
746
715 case REQ_DB_PUT: 747 case REQ_DB_PUT:
716 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 748 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
717 break; 749 break;
718 750
719 case REQ_DB_GET: 751 case REQ_DB_GET:
… …
736 req->result = req->txn->commit (req->txn, req->uint1); 768 req->result = req->txn->commit (req->txn, req->uint1);
737 break; 769 break;
738 770
739 case REQ_TXN_ABORT: 771 case REQ_TXN_ABORT:
740 req->result = req->txn->abort (req->txn); 772 req->result = req->txn->abort (req->txn);
773 break;
774
775 case REQ_TXN_FINISH:
776 if (req->txn->flags & TXN_DEADLOCK)
777 {
778 req->result = req->txn->abort (req->txn);
779 if (!req->result)
780 req->result = DB_LOCK_DEADLOCK;
781 }
782 else
783 req->result = req->txn->commit (req->txn, req->uint1);
741 break; 784 break;
742 785
743 case REQ_C_CLOSE: 786 case REQ_C_CLOSE:
744 req->result = req->dbc->c_close (req->dbc); 787 req->result = req->dbc->c_close (req->dbc);
745 break; 788 break;
… …
787 default: 830 default:
788 req->result = ENOSYS; 831 req->result = ENOSYS;
789 break; 832 break;
790 } 833 }
791 834
835 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
836 req->txn->flags |= TXN_DEADLOCK;
837
792 X_LOCK (reslock); 838 X_LOCK (reslock);
793 839
794 ++npending; 840 ++npending;
795 841
796 if (!reqq_push (&res_queue, req)) 842 if (!reqq_push (&res_queue, req))
… …
827 X_UNLOCK (wrklock); 873 X_UNLOCK (wrklock);
828} 874}
829 875
830static void atfork_child (void) 876static void atfork_child (void)
831{ 877{
832 aio_req prv; 878 bdb_req prv;
833 879
834 while (prv = reqq_shift (&req_queue)) 880 while (prv = reqq_shift (&req_queue))
835 req_free (prv); 881 req_free (prv);
836 882
837 while (prv = reqq_shift (&res_queue)) 883 while (prv = reqq_shift (&res_queue))
… …
852 idle = 0; 898 idle = 0;
853 nreqs = 0; 899 nreqs = 0;
854 nready = 0; 900 nready = 0;
855 npending = 0; 901 npending = 0;
856 902
857 respipe_close (respipe [0]);
858 respipe_close (respipe [1]);
859
860 create_pipe (respipe); 903 create_respipe ();
861 904
862 atfork_parent (); 905 atfork_parent ();
863} 906}
864 907
865#define dREQ(reqtype) \ 908#define dREQ(reqtype) \
866 aio_req req; \ 909 bdb_req req; \
867 int req_pri = next_pri; \ 910 int req_pri = next_pri; \
868 next_pri = DEFAULT_PRI + PRI_BIAS; \ 911 next_pri = DEFAULT_PRI + PRI_BIAS; \
869 \ 912 \
870 if (SvOK (callback) && !SvROK (callback)) \ 913 if (SvOK (callback) && !SvROK (callback)) \
871 croak ("callback must be undef or of reference type"); \ 914 croak ("callback must be undef or of reference type"); \
872 \ 915 \
873 Newz (0, req, 1, aio_cb); \ 916 Newz (0, req, 1, bdb_cb); \
874 if (!req) \ 917 if (!req) \
875 croak ("out of memory during aio_req allocation"); \ 918 croak ("out of memory during bdb_req allocation"); \
876 \ 919 \
877 req->callback = newSVsv (callback); \ 920 req->callback = newSVsv (callback); \
878 req->type = (reqtype); \ 921 req->type = (reqtype); \
879 req->pri = req_pri 922 req->pri = req_pri
880 923
… …
929 const_iv (INIT_TXN) 972 const_iv (INIT_TXN)
930 const_iv (RECOVER) 973 const_iv (RECOVER)
931 const_iv (INIT_TXN) 974 const_iv (INIT_TXN)
932 const_iv (RECOVER_FATAL) 975 const_iv (RECOVER_FATAL)
933 const_iv (CREATE) 976 const_iv (CREATE)
977 const_iv (RDONLY)
934 const_iv (USE_ENVIRON) 978 const_iv (USE_ENVIRON)
935 const_iv (USE_ENVIRON_ROOT) 979 const_iv (USE_ENVIRON_ROOT)
936 const_iv (LOCKDOWN) 980 const_iv (LOCKDOWN)
937 const_iv (PRIVATE) 981 const_iv (PRIVATE)
938 const_iv (REGISTER) 982 const_iv (REGISTER)
… …
951 const_iv (OVERWRITE) 995 const_iv (OVERWRITE)
952 const_iv (PANIC_ENVIRONMENT) 996 const_iv (PANIC_ENVIRONMENT)
953 const_iv (REGION_INIT) 997 const_iv (REGION_INIT)
954 const_iv (TIME_NOTGRANTED) 998 const_iv (TIME_NOTGRANTED)
955 const_iv (TXN_NOSYNC) 999 const_iv (TXN_NOSYNC)
1000 const_iv (TXN_NOT_DURABLE)
956 const_iv (TXN_WRITE_NOSYNC) 1001 const_iv (TXN_WRITE_NOSYNC)
957 const_iv (WRITECURSOR) 1002 const_iv (WRITECURSOR)
958 const_iv (YIELDCPU) 1003 const_iv (YIELDCPU)
959 const_iv (ENCRYPT_AES) 1004 const_iv (ENCRYPT_AES)
960 const_iv (XA_CREATE) 1005 const_iv (XA_CREATE)
… …
968 const_iv (READ_UNCOMMITTED) 1013 const_iv (READ_UNCOMMITTED)
969 const_iv (TRUNCATE) 1014 const_iv (TRUNCATE)
970 const_iv (NOSYNC) 1015 const_iv (NOSYNC)
971 const_iv (CHKSUM) 1016 const_iv (CHKSUM)
972 const_iv (ENCRYPT) 1017 const_iv (ENCRYPT)
973 const_iv (TXN_NOT_DURABLE)
974 const_iv (DUP) 1018 const_iv (DUP)
975 const_iv (DUPSORT) 1019 const_iv (DUPSORT)
976 const_iv (RECNUM) 1020 const_iv (RECNUM)
977 const_iv (RENUMBER) 1021 const_iv (RENUMBER)
978 const_iv (REVSPLITOFF) 1022 const_iv (REVSPLITOFF)
… …
983 const_iv (GET_BOTH_RANGE) 1027 const_iv (GET_BOTH_RANGE)
984 //const_iv (SET_RECNO) 1028 //const_iv (SET_RECNO)
985 //const_iv (MULTIPLE) 1029 //const_iv (MULTIPLE)
986 const_iv (SNAPSHOT) 1030 const_iv (SNAPSHOT)
987 const_iv (JOIN_ITEM) 1031 const_iv (JOIN_ITEM)
1032 const_iv (JOIN_NOSORT)
988 const_iv (RMW) 1033 const_iv (RMW)
989 1034
990 const_iv (NOTFOUND) 1035 const_iv (NOTFOUND)
991 const_iv (KEYEMPTY) 1036 const_iv (KEYEMPTY)
992 const_iv (LOCK_DEADLOCK) 1037 const_iv (LOCK_DEADLOCK)
… …
1008 const_iv (TXN_SYNC) 1053 const_iv (TXN_SYNC)
1009 1054
1010 const_iv (SET_LOCK_TIMEOUT) 1055 const_iv (SET_LOCK_TIMEOUT)
1011 const_iv (SET_TXN_TIMEOUT) 1056 const_iv (SET_TXN_TIMEOUT)
1012 1057
1013 const_iv (JOIN_ITEM)
1014 const_iv (FIRST) 1058 const_iv (FIRST)
1015 const_iv (NEXT) 1059 const_iv (NEXT)
1016 const_iv (NEXT_DUP) 1060 const_iv (NEXT_DUP)
1017 const_iv (NEXT_NODUP) 1061 const_iv (NEXT_NODUP)
1018 const_iv (PREV) 1062 const_iv (PREV)
… …
1052 const_iv (LOG_BUFFER_FULL) 1096 const_iv (LOG_BUFFER_FULL)
1053 const_iv (NOSERVER) 1097 const_iv (NOSERVER)
1054 const_iv (NOSERVER_HOME) 1098 const_iv (NOSERVER_HOME)
1055 const_iv (NOSERVER_ID) 1099 const_iv (NOSERVER_ID)
1056 const_iv (NOTFOUND) 1100 const_iv (NOTFOUND)
1057 const_iv (OLD_VERSION)
1058 const_iv (PAGE_NOTFOUND) 1101 const_iv (PAGE_NOTFOUND)
1059 const_iv (REP_DUPMASTER) 1102 const_iv (REP_DUPMASTER)
1060 const_iv (REP_HANDLE_DEAD) 1103 const_iv (REP_HANDLE_DEAD)
1061 const_iv (REP_HOLDELECTION) 1104 const_iv (REP_HOLDELECTION)
1062 const_iv (REP_IGNORE) 1105 const_iv (REP_IGNORE)
… …
1085 const_iv (MULTIVERSION) 1128 const_iv (MULTIVERSION)
1086 const_iv (TXN_SNAPSHOT) 1129 const_iv (TXN_SNAPSHOT)
1087#endif 1130#endif
1088#if DB_VERSION_MINOR >= 6 1131#if DB_VERSION_MINOR >= 6
1089 const_iv (PREV_DUP) 1132 const_iv (PREV_DUP)
1090# if 0
1091 const_iv (PRIORITY_UNCHANGED) 1133 const_iv (PRIORITY_UNCHANGED)
1092 const_iv (PRIORITY_VERY_LOW) 1134 const_iv (PRIORITY_VERY_LOW)
1093 const_iv (PRIORITY_LOW) 1135 const_iv (PRIORITY_LOW)
1094 const_iv (PRIORITY_DEFAULT) 1136 const_iv (PRIORITY_DEFAULT)
1095 const_iv (PRIORITY_HIGH) 1137 const_iv (PRIORITY_HIGH)
1096 const_iv (PRIORITY_VERY_HIGH) 1138 const_iv (PRIORITY_VERY_HIGH)
1097# endif
1098#endif 1139#endif
1099 }; 1140 };
1100 1141
1101 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1142 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1102 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1143 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1103 1144
1104 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1145 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1105 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1146 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1106 1147
1107 create_pipe (respipe); 1148 create_respipe ();
1108 1149
1109 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1150 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1110#ifdef _WIN32 1151#ifdef _WIN32
1111 X_MUTEX_CHECK (wrklock); 1152 X_MUTEX_CHECK (wrklock);
1112 X_MUTEX_CHECK (reslock); 1153 X_MUTEX_CHECK (reslock);
… …
1412 req->uint1 = flags; 1453 req->uint1 = flags;
1413 REQ_SEND; 1454 REQ_SEND;
1414} 1455}
1415 1456
1416void 1457void
1458db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
1459 CODE:
1460{
1461 dREQ (REQ_DB_SYNC);
1462 req->db = db;
1463 req->buf1 = strdup (file);
1464 req->uint1 = flags;
1465 REQ_SEND;
1466}
1467
1468void
1417db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1469db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1418 CODE: 1470 CODE:
1419{ 1471{
1420 dREQ (REQ_DB_KEY_RANGE); 1472 dREQ (REQ_DB_KEY_RANGE);
1421 req->db = db; 1473 req->db = db;
… …
1440} 1492}
1441 1493
1442void 1494void
1443db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1495db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1444 CODE: 1496 CODE:
1497 if (SvREADONLY (data))
1498 croak ("can't modify read-only data scalar in db_get");
1445{ 1499{
1446 dREQ (REQ_DB_GET); 1500 dREQ (REQ_DB_GET);
1447 req->db = db; 1501 req->db = db;
1448 req->txn = txn; 1502 req->txn = txn;
1449 req->uint1 = flags; 1503 req->uint1 = flags;
… …
1454} 1508}
1455 1509
1456void 1510void
1457db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1511db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1458 CODE: 1512 CODE:
1513 if (SvREADONLY (data))
1514 croak ("can't modify read-only data scalar in db_pget");
1459{ 1515{
1460 dREQ (REQ_DB_PGET); 1516 dREQ (REQ_DB_PGET);
1461 req->db = db; 1517 req->db = db;
1462 req->txn = txn; 1518 req->txn = txn;
1463 req->uint1 = flags; 1519 req->uint1 = flags;
… …
1500 REQ_SEND; 1556 REQ_SEND;
1501 ptr_nuke (ST (0)); 1557 ptr_nuke (ST (0));
1502} 1558}
1503 1559
1504void 1560void
1561db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1562 CODE:
1563{
1564 dREQ (REQ_TXN_FINISH);
1565 req->txn = txn;
1566 req->uint1 = flags;
1567 REQ_SEND;
1568 ptr_nuke (ST (0));
1569}
1570
1571void
1505db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1572db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1506 CODE: 1573 CODE:
1507{ 1574{
1508 dREQ (REQ_C_CLOSE); 1575 dREQ (REQ_C_CLOSE);
1509 req->dbc = dbc; 1576 req->dbc = dbc;
… …
1681 CODE: 1748 CODE:
1682 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1749 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1683 OUTPUT: 1750 OUTPUT:
1684 RETVAL 1751 RETVAL
1685 1752
1686int set_flags (DB_ENV *env, U32 flags, int onoff) 1753int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1687 CODE: 1754 CODE:
1688 RETVAL = env->set_flags (env, flags, onoff); 1755 RETVAL = env->set_flags (env, flags, onoff);
1689 OUTPUT: 1756 OUTPUT:
1690 RETVAL 1757 RETVAL
1691 1758
… …
1695 1762
1696void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1763void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1697 CODE: 1764 CODE:
1698 env->set_msgfile (env, msgfile); 1765 env->set_msgfile (env, msgfile);
1699 1766
1700int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1767int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1701 CODE: 1768 CODE:
1702 RETVAL = env->set_verbose (env, which, onoff); 1769 RETVAL = env->set_verbose (env, which, onoff);
1703 OUTPUT: 1770 OUTPUT:
1704 RETVAL 1771 RETVAL
1705 1772
… …
1707 CODE: 1774 CODE:
1708 RETVAL = env->set_encrypt (env, password, flags); 1775 RETVAL = env->set_encrypt (env, password, flags);
1709 OUTPUT: 1776 OUTPUT:
1710 RETVAL 1777 RETVAL
1711 1778
1712int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1779int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1713 CODE: 1780 CODE:
1714 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1781 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1715 OUTPUT: 1782 OUTPUT:
1716 RETVAL 1783 RETVAL
1717 1784
… …
1765 1832
1766int set_lg_max (DB_ENV *env, U32 max) 1833int set_lg_max (DB_ENV *env, U32 max)
1767 CODE: 1834 CODE:
1768 RETVAL = env->set_lg_max (env, max); 1835 RETVAL = env->set_lg_max (env, max);
1769 OUTPUT: 1836 OUTPUT:
1837 RETVAL
1838
1839int mutex_set_max (DB_ENV *env, U32 max)
1840 CODE:
1841 RETVAL = env->mutex_set_max (env, max);
1842 OUTPUT:
1843 RETVAL
1844
1845int mutex_set_increment (DB_ENV *env, U32 increment)
1846 CODE:
1847 RETVAL = env->mutex_set_increment (env, increment);
1848 OUTPUT:
1849 RETVAL
1850
1851int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1852 CODE:
1853 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1854 OUTPUT:
1855 RETVAL
1856
1857int mutex_set_align (DB_ENV *env, U32 align)
1858 CODE:
1859 RETVAL = env->mutex_set_align (env, align);
1860 OUTPUT:
1770 RETVAL 1861 RETVAL
1771 1862
1772DB_TXN * 1863DB_TXN *
1773txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1864txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1774 CODE: 1865 CODE:
… …
1889DESTROY (DB_TXN_ornull *txn) 1980DESTROY (DB_TXN_ornull *txn)
1890 CODE: 1981 CODE:
1891 if (txn) 1982 if (txn)
1892 txn->abort (txn); 1983 txn->abort (txn);
1893 1984
1894int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1985int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1895 CODE: 1986 CODE:
1896 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 1987 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1988 OUTPUT:
1989 RETVAL
1990
1991int failed (DB_TXN *txn)
1992 CODE:
1993 RETVAL = !!(txn->flags & TXN_DEADLOCK);
1897 OUTPUT: 1994 OUTPUT:
1898 RETVAL 1995 RETVAL
1899 1996
1900 1997
1901MODULE = BDB PACKAGE = BDB::Cursor 1998MODULE = BDB PACKAGE = BDB::Cursor
… …
1904DESTROY (DBC_ornull *dbc) 2001DESTROY (DBC_ornull *dbc)
1905 CODE: 2002 CODE:
1906 if (dbc) 2003 if (dbc)
1907 dbc->c_close (dbc); 2004 dbc->c_close (dbc);
1908 2005
2006#if DB_VERSION_MINOR >= 6
2007
2008int set_priority (DBC *dbc, int priority)
2009 CODE:
2010 dbc->set_priority (dbc, priority);
2011
2012#endif
2013
1909MODULE = BDB PACKAGE = BDB::Sequence 2014MODULE = BDB PACKAGE = BDB::Sequence
1910 2015
1911void 2016void
1912DESTROY (DB_SEQUENCE_ornull *seq) 2017DESTROY (DB_SEQUENCE_ornull *seq)
1913 CODE: 2018 CODE:

Diff Legend

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