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

Comparing BDB/BDB.xs (file contents):
Revision 1.15 by root, Mon Aug 13 11:16:22 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;
55
56#if DB_VERSION_MINOR >= 6
57# define c_close close
58# define c_count count
59# define c_del del
60# define c_dup dup
61# define c_get get
62# define c_pget pget
63# define c_put put
64#endif
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}
49 79
50static void 80static void
51debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg) 81debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
52{ 82{
53 printf ("err[%s]\n", msg); 83 printf ("err[%s]\n", msg);
92 122
93enum { 123enum {
94 REQ_QUIT, 124 REQ_QUIT,
95 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,
96 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 126 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
97 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,
98 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,
99 REQ_TXN_COMMIT, REQ_TXN_ABORT, 129 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
100 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,
101 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,
102}; 132};
103 133
104typedef struct aio_cb 134typedef struct bdb_cb
105{ 135{
106 struct aio_cb *volatile next; 136 struct bdb_cb *volatile next;
107 SV *callback; 137 SV *callback;
108 int type, pri, result; 138 int type, pri, result;
109 139
110 DB_ENV *env; 140 DB_ENV *env;
111 DB *db; 141 DB *db;
120 150
121 DBT dbt1, dbt2, dbt3; 151 DBT dbt1, dbt2, dbt3;
122 DB_KEY_RANGE key_range; 152 DB_KEY_RANGE key_range;
123 DB_SEQUENCE *seq; 153 DB_SEQUENCE *seq;
124 db_seq_t seq_t; 154 db_seq_t seq_t;
125} aio_cb; 155} bdb_cb;
126 156
127typedef aio_cb *aio_req; 157typedef bdb_cb *bdb_req;
128 158
129enum { 159enum {
130 PRI_MIN = -4, 160 PRI_MIN = -4,
131 PRI_MAX = 4, 161 PRI_MAX = 4,
132 162
159 struct worker *prev, *next; 189 struct worker *prev, *next;
160 190
161 thread_t tid; 191 thread_t tid;
162 192
163 /* locked by reslock, reqlock or wrklock */ 193 /* locked by reslock, reqlock or wrklock */
164 aio_req req; /* currently processed request */ 194 bdb_req req; /* currently processed request */
165 void *dbuf; 195 void *dbuf;
166 DIR *dirp; 196 DIR *dirp;
167} worker; 197} worker;
168 198
169static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 199static worker wrk_first = { &wrk_first, &wrk_first, 0 };
181} 211}
182 212
183static volatile unsigned int nreqs, nready, npending; 213static volatile unsigned int nreqs, nready, npending;
184static volatile unsigned int max_idle = 4; 214static volatile unsigned int max_idle = 4;
185static volatile unsigned int max_outstanding = 0xffffffff; 215static volatile unsigned int max_outstanding = 0xffffffff;
186static int respipe [2], respipe_osf [2]; 216static int respipe_osf [2], respipe [2] = { -1, -1 };
187 217
188static mutex_t reslock = X_MUTEX_INIT; 218static mutex_t reslock = X_MUTEX_INIT;
189static mutex_t reqlock = X_MUTEX_INIT; 219static mutex_t reqlock = X_MUTEX_INIT;
190static cond_t reqwait = X_COND_INIT; 220static cond_t reqwait = X_COND_INIT;
191 221
192#if WORDACCESS_UNSAFE 222#if WORDACCESS_UNSAFE
193 223
194static unsigned int get_nready () 224static unsigned int get_nready (void)
195{ 225{
196 unsigned int retval; 226 unsigned int retval;
197 227
198 X_LOCK (reqlock); 228 X_LOCK (reqlock);
199 retval = nready; 229 retval = nready;
200 X_UNLOCK (reqlock); 230 X_UNLOCK (reqlock);
201 231
202 return retval; 232 return retval;
203} 233}
204 234
205static unsigned int get_npending () 235static unsigned int get_npending (void)
206{ 236{
207 unsigned int retval; 237 unsigned int retval;
208 238
209 X_LOCK (reslock); 239 X_LOCK (reslock);
210 retval = npending; 240 retval = npending;
211 X_UNLOCK (reslock); 241 X_UNLOCK (reslock);
212 242
213 return retval; 243 return retval;
214} 244}
215 245
216static unsigned int get_nthreads () 246static unsigned int get_nthreads (void)
217{ 247{
218 unsigned int retval; 248 unsigned int retval;
219 249
220 X_LOCK (wrklock); 250 X_LOCK (wrklock);
221 retval = started; 251 retval = started;
236 * a somewhat faster data structure might be nice, but 266 * a somewhat faster data structure might be nice, but
237 * with 8 priorities this actually needs <20 insns 267 * with 8 priorities this actually needs <20 insns
238 * per shift, the most expensive operation. 268 * per shift, the most expensive operation.
239 */ 269 */
240typedef struct { 270typedef struct {
241 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 271 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
242 int size; 272 int size;
243} reqq; 273} reqq;
244 274
245static reqq req_queue; 275static reqq req_queue;
246static reqq res_queue; 276static reqq res_queue;
247 277
248int reqq_push (reqq *q, aio_req req) 278int reqq_push (reqq *q, bdb_req req)
249{ 279{
250 int pri = req->pri; 280 int pri = req->pri;
251 req->next = 0; 281 req->next = 0;
252 282
253 if (q->qe[pri]) 283 if (q->qe[pri])
259 q->qe[pri] = q->qs[pri] = req; 289 q->qe[pri] = q->qs[pri] = req;
260 290
261 return q->size++; 291 return q->size++;
262} 292}
263 293
264aio_req reqq_shift (reqq *q) 294bdb_req reqq_shift (reqq *q)
265{ 295{
266 int pri; 296 int pri;
267 297
268 if (!q->size) 298 if (!q->size)
269 return 0; 299 return 0;
270 300
271 --q->size; 301 --q->size;
272 302
273 for (pri = NUM_PRI; pri--; ) 303 for (pri = NUM_PRI; pri--; )
274 { 304 {
275 aio_req req = q->qs[pri]; 305 bdb_req req = q->qs[pri];
276 306
277 if (req) 307 if (req)
278 { 308 {
279 if (!(q->qs[pri] = req->next)) 309 if (!(q->qs[pri] = req->next))
280 q->qe[pri] = 0; 310 q->qe[pri] = 0;
284 } 314 }
285 315
286 abort (); 316 abort ();
287} 317}
288 318
289static int poll_cb (); 319static int poll_cb (void);
290static void req_free (aio_req req); 320static void req_free (bdb_req req);
291static void req_cancel (aio_req req); 321static void req_cancel (bdb_req req);
292 322
293static int req_invoke (aio_req req) 323static int req_invoke (bdb_req req)
294{ 324{
295 dSP; 325 dSP;
296 326
297 if (SvOK (req->callback)) 327 if (SvOK (req->callback))
298 { 328 {
316 dbt_to_sv (req->sv1, &req->dbt1); 346 dbt_to_sv (req->sv1, &req->dbt1);
317 dbt_to_sv (req->sv2, &req->dbt2); 347 dbt_to_sv (req->sv2, &req->dbt2);
318 dbt_to_sv (req->sv3, &req->dbt3); 348 dbt_to_sv (req->sv3, &req->dbt3);
319 break; 349 break;
320 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
321 case REQ_DB_KEY_RANGE: 357 case REQ_DB_KEY_RANGE:
322 { 358 {
323 AV *av = newAV (); 359 AV *av = newAV ();
324 360
325 av_push (av, newSVnv (req->key_range.less)); 361 av_push (av, newSVnv (req->key_range.less));
334 370
335 case REQ_SEQ_GET: 371 case REQ_SEQ_GET:
336 SvREADONLY_off (req->sv1); 372 SvREADONLY_off (req->sv1);
337 373
338 if (sizeof (IV) > 4) 374 if (sizeof (IV) > 4)
339 sv_setiv_mg (req->sv1, req->seq_t); 375 sv_setiv_mg (req->sv1, (IV)req->seq_t);
340 else 376 else
341 sv_setnv_mg (req->sv1, req->seq_t); 377 sv_setnv_mg (req->sv1, (NV)req->seq_t);
342 378
343 SvREFCNT_dec (req->sv1); 379 SvREFCNT_dec (req->sv1);
344 break; 380 break;
345 } 381 }
346 382
355 } 391 }
356 392
357 return !SvTRUE (ERRSV); 393 return !SvTRUE (ERRSV);
358} 394}
359 395
360static void req_free (aio_req req) 396static void req_free (bdb_req req)
361{ 397{
362 free (req->buf1); 398 free (req->buf1);
363 free (req->buf2); 399 free (req->buf2);
364 Safefree (req); 400 Safefree (req);
365} 401}
369#else 405#else
370# define TO_SOCKET(x) (x) 406# define TO_SOCKET(x) (x)
371#endif 407#endif
372 408
373static void 409static void
374create_pipe (int fd[2]) 410create_respipe (void)
375{ 411{
376#ifdef _WIN32 412#ifdef _WIN32
377 int arg = 1; 413 int arg; /* argg */
414#endif
415 int old_readfd = respipe [0];
416
417 if (respipe [1] >= 0)
418 respipe_close (TO_SOCKET (respipe [1]));
419
420#ifdef _WIN32
378 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd) 421 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
379 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg)
380 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg))
381#else 422#else
382 if (pipe (fd) 423 if (pipe (respipe))
383 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
384 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
385#endif 424#endif
386 croak ("unable to initialize result pipe"); 425 croak ("unable to initialize result pipe");
426
427 if (old_readfd >= 0)
428 {
429 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
430 croak ("unable to initialize result pipe(2)");
431
432 respipe_close (respipe [0]);
433 respipe [0] = old_readfd;
434 }
435
436#ifdef _WIN32
437 arg = 1;
438 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
439 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
440#else
441 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
442 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
443#endif
444 croak ("unable to initialize result pipe(3)");
387 445
388 respipe_osf [0] = TO_SOCKET (respipe [0]); 446 respipe_osf [0] = TO_SOCKET (respipe [0]);
389 respipe_osf [1] = TO_SOCKET (respipe [1]); 447 respipe_osf [1] = TO_SOCKET (respipe [1]);
390} 448}
391 449
411 free (wrk); 469 free (wrk);
412 470
413 X_UNLOCK (wrklock); 471 X_UNLOCK (wrklock);
414} 472}
415 473
416static void maybe_start_thread () 474static void maybe_start_thread (void)
417{ 475{
418 if (get_nthreads () >= wanted) 476 if (get_nthreads () >= wanted)
419 return; 477 return;
420 478
421 /* todo: maybe use idle here, but might be less exact */ 479 /* todo: maybe use idle here, but might be less exact */
423 return; 481 return;
424 482
425 start_thread (); 483 start_thread ();
426} 484}
427 485
428static void req_send (aio_req req) 486static void req_send (bdb_req req)
429{ 487{
430 SV *wait_callback = 0; 488 SV *wait_callback = 0;
431 489
432 // synthesize callback if none given 490 // synthesize callback if none given
433 if (!SvOK (req->callback)) 491 if (!SvOK (req->callback))
441 SPAGAIN; 499 SPAGAIN;
442 500
443 if (count != 2) 501 if (count != 2)
444 croak ("prepare callback must return exactly two values\n"); 502 croak ("prepare callback must return exactly two values\n");
445 503
446 wait_callback = SvREFCNT_inc (POPs); 504 wait_callback = POPs;
447 SvREFCNT_dec (req->callback); 505 SvREFCNT_dec (req->callback);
448 req->callback = SvREFCNT_inc (POPs); 506 req->callback = SvREFCNT_inc (POPs);
449 } 507 }
450 508
451 ++nreqs; 509 ++nreqs;
462 { 520 {
463 dSP; 521 dSP;
464 PUSHMARK (SP); 522 PUSHMARK (SP);
465 PUTBACK; 523 PUTBACK;
466 call_sv (wait_callback, G_DISCARD); 524 call_sv (wait_callback, G_DISCARD);
467 SvREFCNT_dec (wait_callback);
468 } 525 }
469} 526}
470 527
471static void end_thread (void) 528static void end_thread (void)
472{ 529{
473 aio_req req; 530 bdb_req req;
474 531
475 Newz (0, req, 1, aio_cb); 532 Newz (0, req, 1, bdb_cb);
476 533
477 req->type = REQ_QUIT; 534 req->type = REQ_QUIT;
478 req->pri = PRI_MAX + PRI_BIAS; 535 req->pri = PRI_MAX + PRI_BIAS;
479 536
480 X_LOCK (reqlock); 537 X_LOCK (reqlock);
507 564
508 while (started > wanted) 565 while (started > wanted)
509 end_thread (); 566 end_thread ();
510} 567}
511 568
512static void poll_wait () 569static void poll_wait (void)
513{ 570{
514 fd_set rfd; 571 fd_set rfd;
515 572
516 while (nreqs) 573 while (nreqs)
517 { 574 {
530 587
531 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 588 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
532 } 589 }
533} 590}
534 591
535static int poll_cb () 592static int poll_cb (void)
536{ 593{
537 dSP; 594 dSP;
538 int count = 0; 595 int count = 0;
539 int maxreqs = max_poll_reqs; 596 int maxreqs = max_poll_reqs;
540 int do_croak = 0; 597 int do_croak = 0;
541 struct timeval tv_start, tv_now; 598 struct timeval tv_start, tv_now;
542 aio_req req; 599 bdb_req req;
543 600
544 if (max_poll_time) 601 if (max_poll_time)
545 gettimeofday (&tv_start, 0); 602 gettimeofday (&tv_start, 0);
546 603
547 for (;;) 604 for (;;)
608 665
609/*****************************************************************************/ 666/*****************************************************************************/
610 667
611X_THREAD_PROC (bdb_proc) 668X_THREAD_PROC (bdb_proc)
612{ 669{
613 aio_req req; 670 bdb_req req;
614 struct timespec ts; 671 struct timespec ts;
615 worker *self = (worker *)thr_arg; 672 worker *self = (worker *)thr_arg;
616 673
617 /* try to distribute timeouts somewhat evenly */ 674 /* try to distribute timeouts somewhat evenly */
618 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 675 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
658 X_UNLOCK (reqlock); 715 X_UNLOCK (reqlock);
659 716
660 switch (req->type) 717 switch (req->type)
661 { 718 {
662 case REQ_QUIT: 719 case REQ_QUIT:
720 req->result = ENOSYS;
663 goto quit; 721 goto quit;
664 722
665 case REQ_ENV_OPEN: 723 case REQ_ENV_OPEN:
666 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 724 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
667 break; 725 break;
700 758
701 case REQ_DB_SYNC: 759 case REQ_DB_SYNC:
702 req->result = req->db->sync (req->db, req->uint1); 760 req->result = req->db->sync (req->db, req->uint1);
703 break; 761 break;
704 762
763 case REQ_DB_UPGRADE:
764 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
765 break;
766
705 case REQ_DB_PUT: 767 case REQ_DB_PUT:
706 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);
707 break; 769 break;
708 770
709 case REQ_DB_GET: 771 case REQ_DB_GET:
726 req->result = req->txn->commit (req->txn, req->uint1); 788 req->result = req->txn->commit (req->txn, req->uint1);
727 break; 789 break;
728 790
729 case REQ_TXN_ABORT: 791 case REQ_TXN_ABORT:
730 req->result = req->txn->abort (req->txn); 792 req->result = req->txn->abort (req->txn);
793 break;
794
795 case REQ_TXN_FINISH:
796 if (req->txn->flags & TXN_DEADLOCK)
797 {
798 req->result = req->txn->abort (req->txn);
799 if (!req->result)
800 req->result = DB_LOCK_DEADLOCK;
801 }
802 else
803 req->result = req->txn->commit (req->txn, req->uint1);
731 break; 804 break;
732 805
733 case REQ_C_CLOSE: 806 case REQ_C_CLOSE:
734 req->result = req->dbc->c_close (req->dbc); 807 req->result = req->dbc->c_close (req->dbc);
735 break; 808 break;
777 default: 850 default:
778 req->result = ENOSYS; 851 req->result = ENOSYS;
779 break; 852 break;
780 } 853 }
781 854
855 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
856 req->txn->flags |= TXN_DEADLOCK;
857
782 X_LOCK (reslock); 858 X_LOCK (reslock);
783 859
784 ++npending; 860 ++npending;
785 861
786 if (!reqq_push (&res_queue, req)) 862 if (!reqq_push (&res_queue, req))
817 X_UNLOCK (wrklock); 893 X_UNLOCK (wrklock);
818} 894}
819 895
820static void atfork_child (void) 896static void atfork_child (void)
821{ 897{
822 aio_req prv; 898 bdb_req prv;
823 899
824 while (prv = reqq_shift (&req_queue)) 900 while (prv = reqq_shift (&req_queue))
825 req_free (prv); 901 req_free (prv);
826 902
827 while (prv = reqq_shift (&res_queue)) 903 while (prv = reqq_shift (&res_queue))
842 idle = 0; 918 idle = 0;
843 nreqs = 0; 919 nreqs = 0;
844 nready = 0; 920 nready = 0;
845 npending = 0; 921 npending = 0;
846 922
847 respipe_close (respipe [0]);
848 respipe_close (respipe [1]);
849
850 create_pipe (respipe); 923 create_respipe ();
851 924
852 atfork_parent (); 925 atfork_parent ();
853} 926}
854 927
855#define dREQ(reqtype) \ 928#define dREQ(reqtype) \
856 aio_req req; \ 929 bdb_req req; \
857 int req_pri = next_pri; \ 930 int req_pri = next_pri; \
858 next_pri = DEFAULT_PRI + PRI_BIAS; \ 931 next_pri = DEFAULT_PRI + PRI_BIAS; \
859 \ 932 \
860 if (SvOK (callback) && !SvROK (callback)) \ 933 if (SvOK (callback) && !SvROK (callback)) \
861 croak ("callback must be undef or of reference type"); \ 934 croak ("callback must be undef or of reference type"); \
862 \ 935 \
863 Newz (0, req, 1, aio_cb); \ 936 Newz (0, req, 1, bdb_cb); \
864 if (!req) \ 937 if (!req) \
865 croak ("out of memory during aio_req allocation"); \ 938 croak ("out of memory during bdb_req allocation"); \
866 \ 939 \
867 req->callback = newSVsv (callback); \ 940 req->callback = newSVsv (callback); \
868 req->type = (reqtype); \ 941 req->type = (reqtype); \
869 req->pri = req_pri 942 req->pri = req_pri
870 943
871#define REQ_SEND \ 944#define REQ_SEND \
872 req_send (req) 945 req_send (req)
873 946
874#define SvPTR(var, arg, type, class, nullok) \ 947#define SvPTR(var, arg, type, class, nullok) \
875 if (!SvOK (arg)) \ 948 if (!SvOK (arg)) \
876 { \ 949 { \
877 if (!nullok) \ 950 if (nullok != 1) \
878 croak (# var " must be a " # class " object, not undef"); \ 951 croak (# var " must be a " # class " object, not undef"); \
879 \ 952 \
880 (var) = 0; \ 953 (var) = 0; \
881 } \ 954 } \
882 else if (sv_derived_from ((arg), # class)) \ 955 else if (sv_derived_from ((arg), # class)) \
883 { \ 956 { \
884 IV tmp = SvIV ((SV*) SvRV (arg)); \ 957 IV tmp = SvIV ((SV*) SvRV (arg)); \
885 (var) = INT2PTR (type, tmp); \ 958 (var) = INT2PTR (type, tmp); \
886 if (!var) \ 959 if (!var && nullok != 2) \
887 croak (# var " is not a valid " # class " object anymore"); \ 960 croak (# var " is not a valid " # class " object anymore"); \
888 } \ 961 } \
889 else \ 962 else \
890 croak (# var " is not of type " # class); \ 963 croak (# var " is not of type " # class); \
891 \ 964 \
893static void 966static void
894ptr_nuke (SV *sv) 967ptr_nuke (SV *sv)
895{ 968{
896 assert (SvROK (sv)); 969 assert (SvROK (sv));
897 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;
898} 1010}
899 1011
900MODULE = BDB PACKAGE = BDB 1012MODULE = BDB PACKAGE = BDB
901 1013
902PROTOTYPES: ENABLE 1014PROTOTYPES: ENABLE
919 const_iv (INIT_TXN) 1031 const_iv (INIT_TXN)
920 const_iv (RECOVER) 1032 const_iv (RECOVER)
921 const_iv (INIT_TXN) 1033 const_iv (INIT_TXN)
922 const_iv (RECOVER_FATAL) 1034 const_iv (RECOVER_FATAL)
923 const_iv (CREATE) 1035 const_iv (CREATE)
1036 const_iv (RDONLY)
924 const_iv (USE_ENVIRON) 1037 const_iv (USE_ENVIRON)
925 const_iv (USE_ENVIRON_ROOT) 1038 const_iv (USE_ENVIRON_ROOT)
926 const_iv (LOCKDOWN) 1039 const_iv (LOCKDOWN)
927 const_iv (PRIVATE) 1040 const_iv (PRIVATE)
928 const_iv (REGISTER) 1041 const_iv (REGISTER)
941 const_iv (OVERWRITE) 1054 const_iv (OVERWRITE)
942 const_iv (PANIC_ENVIRONMENT) 1055 const_iv (PANIC_ENVIRONMENT)
943 const_iv (REGION_INIT) 1056 const_iv (REGION_INIT)
944 const_iv (TIME_NOTGRANTED) 1057 const_iv (TIME_NOTGRANTED)
945 const_iv (TXN_NOSYNC) 1058 const_iv (TXN_NOSYNC)
1059 const_iv (TXN_NOT_DURABLE)
946 const_iv (TXN_WRITE_NOSYNC) 1060 const_iv (TXN_WRITE_NOSYNC)
947 const_iv (WRITECURSOR) 1061 const_iv (WRITECURSOR)
948 const_iv (YIELDCPU) 1062 const_iv (YIELDCPU)
949 const_iv (ENCRYPT_AES) 1063 const_iv (ENCRYPT_AES)
950 const_iv (XA_CREATE) 1064 const_iv (XA_CREATE)
958 const_iv (READ_UNCOMMITTED) 1072 const_iv (READ_UNCOMMITTED)
959 const_iv (TRUNCATE) 1073 const_iv (TRUNCATE)
960 const_iv (NOSYNC) 1074 const_iv (NOSYNC)
961 const_iv (CHKSUM) 1075 const_iv (CHKSUM)
962 const_iv (ENCRYPT) 1076 const_iv (ENCRYPT)
963 const_iv (TXN_NOT_DURABLE)
964 const_iv (DUP) 1077 const_iv (DUP)
965 const_iv (DUPSORT) 1078 const_iv (DUPSORT)
966 const_iv (RECNUM) 1079 const_iv (RECNUM)
967 const_iv (RENUMBER) 1080 const_iv (RENUMBER)
968 const_iv (REVSPLITOFF) 1081 const_iv (REVSPLITOFF)
973 const_iv (GET_BOTH_RANGE) 1086 const_iv (GET_BOTH_RANGE)
974 //const_iv (SET_RECNO) 1087 //const_iv (SET_RECNO)
975 //const_iv (MULTIPLE) 1088 //const_iv (MULTIPLE)
976 const_iv (SNAPSHOT) 1089 const_iv (SNAPSHOT)
977 const_iv (JOIN_ITEM) 1090 const_iv (JOIN_ITEM)
1091 const_iv (JOIN_NOSORT)
978 const_iv (RMW) 1092 const_iv (RMW)
979 1093
980 const_iv (NOTFOUND) 1094 const_iv (NOTFOUND)
981 const_iv (KEYEMPTY) 1095 const_iv (KEYEMPTY)
982 const_iv (LOCK_DEADLOCK) 1096 const_iv (LOCK_DEADLOCK)
998 const_iv (TXN_SYNC) 1112 const_iv (TXN_SYNC)
999 1113
1000 const_iv (SET_LOCK_TIMEOUT) 1114 const_iv (SET_LOCK_TIMEOUT)
1001 const_iv (SET_TXN_TIMEOUT) 1115 const_iv (SET_TXN_TIMEOUT)
1002 1116
1003 const_iv (JOIN_ITEM)
1004 const_iv (FIRST) 1117 const_iv (FIRST)
1005 const_iv (NEXT) 1118 const_iv (NEXT)
1006 const_iv (NEXT_DUP) 1119 const_iv (NEXT_DUP)
1007 const_iv (NEXT_NODUP) 1120 const_iv (NEXT_NODUP)
1008 const_iv (PREV) 1121 const_iv (PREV)
1042 const_iv (LOG_BUFFER_FULL) 1155 const_iv (LOG_BUFFER_FULL)
1043 const_iv (NOSERVER) 1156 const_iv (NOSERVER)
1044 const_iv (NOSERVER_HOME) 1157 const_iv (NOSERVER_HOME)
1045 const_iv (NOSERVER_ID) 1158 const_iv (NOSERVER_ID)
1046 const_iv (NOTFOUND) 1159 const_iv (NOTFOUND)
1047 const_iv (OLD_VERSION)
1048 const_iv (PAGE_NOTFOUND) 1160 const_iv (PAGE_NOTFOUND)
1049 const_iv (REP_DUPMASTER) 1161 const_iv (REP_DUPMASTER)
1050 const_iv (REP_HANDLE_DEAD) 1162 const_iv (REP_HANDLE_DEAD)
1051 const_iv (REP_HOLDELECTION) 1163 const_iv (REP_HOLDELECTION)
1052 const_iv (REP_IGNORE) 1164 const_iv (REP_IGNORE)
1074#if DB_VERSION_MINOR >= 5 1186#if DB_VERSION_MINOR >= 5
1075 const_iv (MULTIVERSION) 1187 const_iv (MULTIVERSION)
1076 const_iv (TXN_SNAPSHOT) 1188 const_iv (TXN_SNAPSHOT)
1077#endif 1189#endif
1078#if DB_VERSION_MINOR >= 6 1190#if DB_VERSION_MINOR >= 6
1079 const_iv (DB_PREV_DUP) 1191 const_iv (PREV_DUP)
1192 const_iv (PRIORITY_UNCHANGED)
1193 const_iv (PRIORITY_VERY_LOW)
1194 const_iv (PRIORITY_LOW)
1195 const_iv (PRIORITY_DEFAULT)
1196 const_iv (PRIORITY_HIGH)
1197 const_iv (PRIORITY_VERY_HIGH)
1080#endif 1198#endif
1081 }; 1199 };
1082 1200
1083 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; )
1084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1202 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1085 1203
1086 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1204 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1087 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1205 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1088 1206
1089 create_pipe (respipe); 1207 create_respipe ();
1090 1208
1091 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1209 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1092#ifdef _WIN32 1210#ifdef _WIN32
1093 X_MUTEX_CHECK (wrklock); 1211 X_MUTEX_CHECK (wrklock);
1094 X_MUTEX_CHECK (reslock); 1212 X_MUTEX_CHECK (reslock);
1095 X_MUTEX_CHECK (reqlock); 1213 X_MUTEX_CHECK (reqlock);
1096 1214
1097 X_COND_CHECK (reqwait); 1215 X_COND_CHECK (reqwait);
1098#endif 1216#endif
1217 patch_errno ();
1099} 1218}
1100 1219
1101void 1220void
1102max_poll_reqs (int nreqs) 1221max_poll_reqs (int nreqs)
1103 PROTOTYPE: $ 1222 PROTOTYPE: $
1261} 1380}
1262 OUTPUT: 1381 OUTPUT:
1263 RETVAL 1382 RETVAL
1264 1383
1265void 1384void
1266db_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)
1267 CODE: 1386 CODE:
1268{ 1387{
1269 dREQ (REQ_ENV_OPEN); 1388 dREQ (REQ_ENV_OPEN);
1270
1271 env->set_thread_count (env, wanted + 2);
1272 1389
1273 req->env = env; 1390 req->env = env;
1274 req->uint1 = open_flags | DB_THREAD; 1391 req->uint1 = open_flags | DB_THREAD;
1275 req->int1 = mode; 1392 req->int1 = mode;
1276 req->buf1 = strdup_ornull (db_home); 1393 req->buf1 = strdup_ornull (db_home);
1344} 1461}
1345 OUTPUT: 1462 OUTPUT:
1346 RETVAL 1463 RETVAL
1347 1464
1348void 1465void
1349db_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)
1350 CODE: 1467 CODE:
1351{ 1468{
1352 dREQ (REQ_DB_OPEN); 1469 dREQ (REQ_DB_OPEN);
1353 req->db = db; 1470 req->db = db;
1354 req->txn = txnid; 1471 req->txn = txnid;
1394 req->uint1 = flags; 1511 req->uint1 = flags;
1395 REQ_SEND; 1512 REQ_SEND;
1396} 1513}
1397 1514
1398void 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
1399db_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)
1400 CODE: 1528 CODE:
1401{ 1529{
1402 dREQ (REQ_DB_KEY_RANGE); 1530 dREQ (REQ_DB_KEY_RANGE);
1403 req->db = db; 1531 req->db = db;
1422} 1550}
1423 1551
1424void 1552void
1425db_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)
1426 CODE: 1554 CODE:
1555 if (SvREADONLY (data))
1556 croak ("can't modify read-only data scalar in db_get");
1427{ 1557{
1428 dREQ (REQ_DB_GET); 1558 dREQ (REQ_DB_GET);
1429 req->db = db; 1559 req->db = db;
1430 req->txn = txn; 1560 req->txn = txn;
1431 req->uint1 = flags; 1561 req->uint1 = flags;
1436} 1566}
1437 1567
1438void 1568void
1439db_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)
1440 CODE: 1570 CODE:
1571 if (SvREADONLY (data))
1572 croak ("can't modify read-only data scalar in db_pget");
1441{ 1573{
1442 dREQ (REQ_DB_PGET); 1574 dREQ (REQ_DB_PGET);
1443 req->db = db; 1575 req->db = db;
1444 req->txn = txn; 1576 req->txn = txn;
1445 req->uint1 = flags; 1577 req->uint1 = flags;
1482 REQ_SEND; 1614 REQ_SEND;
1483 ptr_nuke (ST (0)); 1615 ptr_nuke (ST (0));
1484} 1616}
1485 1617
1486void 1618void
1619db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1620 CODE:
1621{
1622 dREQ (REQ_TXN_FINISH);
1623 req->txn = txn;
1624 req->uint1 = flags;
1625 REQ_SEND;
1626 ptr_nuke (ST (0));
1627}
1628
1629void
1487db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1630db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1488 CODE: 1631 CODE:
1489{ 1632{
1490 dREQ (REQ_C_CLOSE); 1633 dREQ (REQ_C_CLOSE);
1491 req->dbc = dbc; 1634 req->dbc = dbc;
1628 1771
1629 1772
1630MODULE = BDB PACKAGE = BDB::Env 1773MODULE = BDB PACKAGE = BDB::Env
1631 1774
1632void 1775void
1633DESTROY (DB_ENV_ornull *env) 1776DESTROY (DB_ENV_ornuked *env)
1634 CODE: 1777 CODE:
1635 if (env) 1778 if (env)
1636 env->close (env, 0); 1779 env->close (env, 0);
1637 1780
1638int set_data_dir (DB_ENV *env, const char *dir) 1781int set_data_dir (DB_ENV *env, const char *dir)
1663 CODE: 1806 CODE:
1664 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1807 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1665 OUTPUT: 1808 OUTPUT:
1666 RETVAL 1809 RETVAL
1667 1810
1668int set_flags (DB_ENV *env, U32 flags, int onoff) 1811int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1669 CODE: 1812 CODE:
1670 RETVAL = env->set_flags (env, flags, onoff); 1813 RETVAL = env->set_flags (env, flags, onoff);
1671 OUTPUT: 1814 OUTPUT:
1672 RETVAL 1815 RETVAL
1673 1816
1674void set_errfile (DB_ENV *env, FILE *errfile) 1817void set_errfile (DB_ENV *env, FILE *errfile = 0)
1675 CODE: 1818 CODE:
1676 env->set_errfile (env, errfile); 1819 env->set_errfile (env, errfile);
1677 1820
1678void set_msgfile (DB_ENV *env, FILE *msgfile) 1821void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1679 CODE: 1822 CODE:
1680 env->set_msgfile (env, msgfile); 1823 env->set_msgfile (env, msgfile);
1681 1824
1682int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1825int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1683 CODE: 1826 CODE:
1684 RETVAL = env->set_verbose (env, which, onoff); 1827 RETVAL = env->set_verbose (env, which, onoff);
1685 OUTPUT: 1828 OUTPUT:
1686 RETVAL 1829 RETVAL
1687 1830
1689 CODE: 1832 CODE:
1690 RETVAL = env->set_encrypt (env, password, flags); 1833 RETVAL = env->set_encrypt (env, password, flags);
1691 OUTPUT: 1834 OUTPUT:
1692 RETVAL 1835 RETVAL
1693 1836
1694int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1837int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1695 CODE: 1838 CODE:
1696 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1839 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1697 OUTPUT: 1840 OUTPUT:
1698 RETVAL 1841 RETVAL
1699 1842
1747 1890
1748int set_lg_max (DB_ENV *env, U32 max) 1891int set_lg_max (DB_ENV *env, U32 max)
1749 CODE: 1892 CODE:
1750 RETVAL = env->set_lg_max (env, max); 1893 RETVAL = env->set_lg_max (env, max);
1751 OUTPUT: 1894 OUTPUT:
1895 RETVAL
1896
1897int mutex_set_max (DB_ENV *env, U32 max)
1898 CODE:
1899 RETVAL = env->mutex_set_max (env, max);
1900 OUTPUT:
1901 RETVAL
1902
1903int mutex_set_increment (DB_ENV *env, U32 increment)
1904 CODE:
1905 RETVAL = env->mutex_set_increment (env, increment);
1906 OUTPUT:
1907 RETVAL
1908
1909int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1910 CODE:
1911 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1912 OUTPUT:
1913 RETVAL
1914
1915int mutex_set_align (DB_ENV *env, U32 align)
1916 CODE:
1917 RETVAL = env->mutex_set_align (env, align);
1918 OUTPUT:
1752 RETVAL 1919 RETVAL
1753 1920
1754DB_TXN * 1921DB_TXN *
1755txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1922txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1756 CODE: 1923 CODE:
1761 RETVAL 1928 RETVAL
1762 1929
1763MODULE = BDB PACKAGE = BDB::Db 1930MODULE = BDB PACKAGE = BDB::Db
1764 1931
1765void 1932void
1766DESTROY (DB_ornull *db) 1933DESTROY (DB_ornuked *db)
1767 CODE: 1934 CODE:
1768 if (db) 1935 if (db)
1769 { 1936 {
1770 SV *env = (SV *)db->app_private; 1937 SV *env = (SV *)db->app_private;
1771 db->close (db, 0); 1938 db->close (db, 0);
1776 CODE: 1943 CODE:
1777 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1944 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1778 OUTPUT: 1945 OUTPUT:
1779 RETVAL 1946 RETVAL
1780 1947
1781int set_flags (DB *db, U32 flags); 1948int set_flags (DB *db, U32 flags)
1782 CODE: 1949 CODE:
1783 RETVAL = db->set_flags (db, flags); 1950 RETVAL = db->set_flags (db, flags);
1784 OUTPUT: 1951 OUTPUT:
1785 RETVAL 1952 RETVAL
1786 1953
1800 CODE: 1967 CODE:
1801 RETVAL = db->set_bt_minkey (db, minkey); 1968 RETVAL = db->set_bt_minkey (db, minkey);
1802 OUTPUT: 1969 OUTPUT:
1803 RETVAL 1970 RETVAL
1804 1971
1805int set_re_delim(DB *db, int delim); 1972int set_re_delim (DB *db, int delim)
1806 CODE: 1973 CODE:
1807 RETVAL = db->set_re_delim (db, delim); 1974 RETVAL = db->set_re_delim (db, delim);
1808 OUTPUT: 1975 OUTPUT:
1809 RETVAL 1976 RETVAL
1810 1977
1866 2033
1867 2034
1868MODULE = BDB PACKAGE = BDB::Txn 2035MODULE = BDB PACKAGE = BDB::Txn
1869 2036
1870void 2037void
1871DESTROY (DB_TXN_ornull *txn) 2038DESTROY (DB_TXN_ornuked *txn)
1872 CODE: 2039 CODE:
1873 if (txn) 2040 if (txn)
1874 txn->abort (txn); 2041 txn->abort (txn);
1875 2042
1876int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 2043int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1877 CODE: 2044 CODE:
1878 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 2045 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1879 OUTPUT: 2046 OUTPUT:
1880 RETVAL 2047 RETVAL
1881 2048
2049int failed (DB_TXN *txn)
2050 CODE:
2051 RETVAL = !!(txn->flags & TXN_DEADLOCK);
2052 OUTPUT:
2053 RETVAL
2054
1882 2055
1883MODULE = BDB PACKAGE = BDB::Cursor 2056MODULE = BDB PACKAGE = BDB::Cursor
1884 2057
1885void 2058void
1886DESTROY (DBC_ornull *dbc) 2059DESTROY (DBC_ornuked *dbc)
1887 CODE: 2060 CODE:
1888 if (dbc) 2061 if (dbc)
1889 dbc->c_close (dbc); 2062 dbc->c_close (dbc);
1890 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
1891MODULE = BDB PACKAGE = BDB::Sequence 2072MODULE = BDB PACKAGE = BDB::Sequence
1892 2073
1893void 2074void
1894DESTROY (DB_SEQUENCE_ornull *seq) 2075DESTROY (DB_SEQUENCE_ornuked *seq)
1895 CODE: 2076 CODE:
1896 if (seq) 2077 if (seq)
1897 seq->close (seq, 0); 2078 seq->close (seq, 0);
1898 2079
1899int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2080int initial_value (DB_SEQUENCE *seq, db_seq_t value)
1918 CODE: 2099 CODE:
1919 RETVAL = seq->set_range (seq, min, max); 2100 RETVAL = seq->set_range (seq, min, max);
1920 OUTPUT: 2101 OUTPUT:
1921 RETVAL 2102 RETVAL
1922 2103
2104

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines