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

Comparing BDB/BDB.xs (file contents):
Revision 1.60 by root, Mon Oct 20 02:58:42 2008 UTC vs.
Revision 1.73 by root, Tue Dec 8 17:09:06 2009 UTC

… …
6 6
7#include "EXTERN.h" 7#include "EXTERN.h"
8#include "perl.h" 8#include "perl.h"
9#include "XSUB.h" 9#include "XSUB.h"
10 10
11#include "schmorp.h"
12
11// perl stupidly defines these as macros, breaking 13// perl stupidly defines these as argument-less macros, breaking
12// lots and lots of code. 14// lots and lots of code.
13#undef open 15#undef open
14#undef close 16#undef close
15#undef abort 17#undef abort
16#undef malloc 18#undef malloc
… …
56#endif 58#endif
57 59
58typedef char *bdb_filename; 60typedef char *bdb_filename;
59 61
60static SV *prepare_cb; 62static SV *prepare_cb;
63
64static HV
65 *bdb_stash,
66 *bdb_env_stash,
67 *bdb_txn_stash,
68 *bdb_cursor_stash,
69 *bdb_db_stash,
70 *bdb_sequence_stash;
61 71
62#if DB_VERSION_MINOR >= 6 72#if DB_VERSION_MINOR >= 6
63# define c_close close 73# define c_close close
64# define c_count count 74# define c_count count
65# define c_del del 75# define c_del del
… …
149 159
150enum { 160enum {
151 REQ_QUIT, 161 REQ_QUIT,
152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 162 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 163 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
164 REQ_ENV_LOG_ARCHIVE,
154 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 165 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_VERIFY, REQ_DB_UPGRADE,
155 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 166 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
156 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 167 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
157 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 168 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
158 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 169 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
159}; 170};
… …
244} 255}
245 256
246static volatile unsigned int nreqs, nready, npending; 257static volatile unsigned int nreqs, nready, npending;
247static volatile unsigned int max_idle = 4; 258static volatile unsigned int max_idle = 4;
248static volatile unsigned int max_outstanding = 0xffffffff; 259static volatile unsigned int max_outstanding = 0xffffffff;
249static int respipe_osf [2], respipe [2] = { -1, -1 }; 260static s_epipe respipe;
250 261
251static mutex_t reslock = X_MUTEX_INIT; 262static mutex_t reslock = X_MUTEX_INIT;
252static mutex_t reqlock = X_MUTEX_INIT; 263static mutex_t reqlock = X_MUTEX_INIT;
253static cond_t reqwait = X_COND_INIT; 264static cond_t reqwait = X_COND_INIT;
254 265
… …
377 388
378 av_push (av, newSVnv (req->key_range.less)); 389 av_push (av, newSVnv (req->key_range.less));
379 av_push (av, newSVnv (req->key_range.equal)); 390 av_push (av, newSVnv (req->key_range.equal));
380 av_push (av, newSVnv (req->key_range.greater)); 391 av_push (av, newSVnv (req->key_range.greater));
381 392
393 av = (AV *)newRV_noinc ((SV *)av);
394
382 SvREADONLY_off (req->sv1); 395 SvREADONLY_off (req->sv1);
383 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 396 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
397 SvREFCNT_dec (av);
384 SvREFCNT_dec (req->sv1); 398 SvREFCNT_dec (req->sv1);
385 } 399 }
386 break; 400 break;
387 401
388#if DB_VERSION_MINOR >= 3 402#if DB_VERSION_MINOR >= 3
… …
395 sv_setnv_mg (req->sv1, (NV)req->seq_t); 409 sv_setnv_mg (req->sv1, (NV)req->seq_t);
396 410
397 SvREFCNT_dec (req->sv1); 411 SvREFCNT_dec (req->sv1);
398 break; 412 break;
399#endif 413#endif
414
415 case REQ_ENV_LOG_ARCHIVE:
416 {
417 AV *av = newAV ();
418 char **listp = (char **)req->buf1;
419
420 if (listp)
421 while (*listp)
422 av_push (av, newSVpv (*listp, 0)), ++listp;
423
424 av = (AV *)newRV_noinc ((SV *)av);
425
426 SvREADONLY_off (req->sv1);
427 sv_setsv_mg (req->sv1, (SV *)av);
428 SvREFCNT_dec (av);
429 SvREFCNT_dec (req->sv1);
430 }
431 break;
400 } 432 }
401 433
402 errno = req->result; 434 errno = req->result;
403 435
404 if (req->callback) 436 if (req->callback)
… …
434 free (req->buf3); 466 free (req->buf3);
435 467
436 Safefree (req); 468 Safefree (req);
437} 469}
438 470
439#ifdef USE_SOCKETS_AS_HANDLES
440# define TO_SOCKET(x) (win32_get_osfhandle (x))
441#else
442# define TO_SOCKET(x) (x)
443#endif
444
445static void 471static void
446create_respipe (void) 472create_respipe (void)
447{ 473{
448#ifdef _WIN32
449 int arg; /* argg */
450#endif
451 int old_readfd = respipe [0];
452
453 if (respipe [1] >= 0)
454 respipe_close (TO_SOCKET (respipe [1]));
455
456#ifdef _WIN32
457 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
458#else
459 if (pipe (respipe)) 474 if (s_epipe_renew (&respipe))
460#endif 475 croak ("BDB: unable to create event pipe");
461 croak ("unable to initialize result pipe");
462
463 if (old_readfd >= 0)
464 {
465 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
466 croak ("unable to initialize result pipe(2)");
467
468 respipe_close (respipe [0]);
469 respipe [0] = old_readfd;
470 }
471
472#ifdef _WIN32
473 arg = 1;
474 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
475 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
476#else
477 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
478 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
479#endif
480 croak ("unable to initialize result pipe(3)");
481
482 respipe_osf [0] = TO_SOCKET (respipe [0]);
483 respipe_osf [1] = TO_SOCKET (respipe [1]);
484} 476}
485 477
486static void bdb_request (bdb_req req); 478static void bdb_request (bdb_req req);
487X_THREAD_PROC (bdb_proc); 479X_THREAD_PROC (bdb_proc);
488 480
… …
624 end_thread (); 616 end_thread ();
625} 617}
626 618
627static void poll_wait (void) 619static void poll_wait (void)
628{ 620{
629 fd_set rfd;
630
631 while (nreqs) 621 while (nreqs)
632 { 622 {
633 int size; 623 int size;
634 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 624 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
635 size = res_queue.size; 625 size = res_queue.size;
… …
638 if (size) 628 if (size)
639 return; 629 return;
640 630
641 maybe_start_thread (); 631 maybe_start_thread ();
642 632
643 FD_ZERO (&rfd); 633 s_epipe_wait (&respipe);
644 FD_SET (respipe [0], &rfd);
645
646 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
647 } 634 }
648} 635}
649 636
650static int poll_cb (void) 637static int poll_cb (void)
651{ 638{
… …
671 if (req) 658 if (req)
672 { 659 {
673 --npending; 660 --npending;
674 661
675 if (!res_queue.size) 662 if (!res_queue.size)
676 {
677 /* read any signals sent by the worker threads */ 663 /* read any signals sent by the worker threads */
678 char buf [4]; 664 s_epipe_drain (&respipe);
679 while (respipe_read (respipe [0], buf, 4) == 4)
680 ;
681 }
682 } 665 }
683 666
684 X_UNLOCK (reslock); 667 X_UNLOCK (reslock);
685 668
686 if (!req) 669 if (!req)
… …
768 req->result = req->db->close (req->db, req->uint1); 751 req->result = req->db->close (req->db, req->uint1);
769 break; 752 break;
770 753
771#if DB_VERSION_MINOR >= 4 754#if DB_VERSION_MINOR >= 4
772 case REQ_DB_COMPACT: 755 case REQ_DB_COMPACT:
773 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 756 req->result = req->db->compact (req->db, req->txn, req->dbt1.data ? &req->dbt1 : 0, req->dbt2.data ? &req->dbt2 : 0, 0, req->uint1, 0);
774 break; 757 break;
775#endif 758#endif
776 759
777 case REQ_DB_SYNC: 760 case REQ_DB_SYNC:
778 req->result = req->db->sync (req->db, req->uint1); 761 req->result = req->db->sync (req->db, req->uint1);
762 break;
763
764 case REQ_DB_VERIFY:
765 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
779 break; 766 break;
780 767
781 case REQ_DB_UPGRADE: 768 case REQ_DB_UPGRADE:
782 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 769 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
783 break; 770 break;
… …
870 case REQ_SEQ_REMOVE: 857 case REQ_SEQ_REMOVE:
871 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 858 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
872 break; 859 break;
873#endif 860#endif
874 861
862 case REQ_ENV_LOG_ARCHIVE:
863 {
864 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
865 req->result = req->env->log_archive (req->env, &listp, req->uint1);
866 req->buf1 = (char *)listp;
867 }
868 break;
869
875 default: 870 default:
876 req->result = ENOSYS; 871 req->result = ENOSYS;
877 break; 872 break;
878 } 873 }
879 874
… …
890 /* try to distribute timeouts somewhat evenly */ 885 /* try to distribute timeouts somewhat evenly */
891 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 886 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
892 887
893 for (;;) 888 for (;;)
894 { 889 {
895 ts.tv_sec = time (0) + IDLE_TIMEOUT; 890 ts.tv_sec = time (0) + IDLE_TIMEOUT;
896 891
897 X_LOCK (reqlock); 892 X_LOCK (reqlock);
898 893
899 for (;;) 894 for (;;)
900 { 895 {
… …
945 X_LOCK (reslock); 940 X_LOCK (reslock);
946 941
947 ++npending; 942 ++npending;
948 943
949 if (!reqq_push (&res_queue, req)) 944 if (!reqq_push (&res_queue, req))
950 /* write a dummy byte to the pipe so fh becomes ready */ 945 s_epipe_signal (&respipe);
951 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
952 946
953 self->req = 0; 947 self->req = 0;
954 worker_clear (self); 948 worker_clear (self);
955 949
956 X_UNLOCK (reslock); 950 X_UNLOCK (reslock);
… …
1032 (void)0; 1026 (void)0;
1033 1027
1034#define REQ_SEND \ 1028#define REQ_SEND \
1035 req_send (req) 1029 req_send (req)
1036 1030
1037#define SvPTR(var, arg, type, class, nullok) \ 1031#define SvPTR(var, arg, type, stash, class, nullok) \
1038 if (!SvOK (arg)) \ 1032 if (!SvOK (arg)) \
1039 { \ 1033 { \
1040 if (nullok != 1) \ 1034 if (nullok != 1) \
1041 croak (# var " must be a " # class " object, not undef"); \ 1035 croak (# var " must be a " # class " object, not undef"); \
1042 \ 1036 \
1043 (var) = 0; \ 1037 (var) = 0; \
1044 } \ 1038 } \
1045 else if (sv_derived_from ((arg), # class)) \ 1039 else if (SvSTASH (SvRV (arg)) == stash || sv_derived_from ((arg), # class)) \
1046 { \ 1040 { \
1047 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1041 IV tmp = SvIV ((SV*) SvRV (arg)); \
1048 (var) = INT2PTR (type, tmp); \ 1042 (var) = INT2PTR (type, tmp); \
1049 if (!var && nullok != 2) \ 1043 if (!var && nullok != 2) \
1050 croak (# var " is not a valid " # class " object anymore"); \ 1044 croak (# var " is not a valid " # class " object anymore"); \
… …
1053 croak (# var " is not of type " # class); 1047 croak (# var " is not of type " # class);
1054 1048
1055#define ARG_MUTABLE(name) \ 1049#define ARG_MUTABLE(name) \
1056 if (SvREADONLY (name)) \ 1050 if (SvREADONLY (name)) \
1057 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable"); 1051 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1052
1053static SV *
1054newSVptr (void *ptr, HV *stash)
1055{
1056 SV *rv = NEWSV (0, 0);
1057 sv_upgrade (rv, SVt_PVMG);
1058 sv_setiv (rv, PTR2IV (ptr));
1059
1060 return sv_bless (newRV_noinc (rv), stash);
1061}
1058 1062
1059static void 1063static void
1060ptr_nuke (SV *sv) 1064ptr_nuke (SV *sv)
1061{ 1065{
1062 assert (SvROK (sv)); 1066 assert (SvROK (sv));
… …
1133 } 1137 }
1134 1138
1135 return 0; 1139 return 0;
1136} 1140}
1137 1141
1142/*****************************************************************************/
1143
1144#if 0
1145static int
1146bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1147{
1148 ssize_t size1 = dbt1->size;
1149 ssize_t size2 = dbt2->size;
1150 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1151 size1 <= size2 ? size1 : size2);
1152
1153 if (res)
1154 return res;
1155 else if (size1 - size2)
1156 return size1 - size2;
1157 else
1158 return 0;
1159}
1160
1161static size_t
1162bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1163{
1164 ssize_t size1 = dbt1->size;
1165 ssize_t size2 = dbt2->size;
1166 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1167 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1168 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1169
1170 while (p1 < pe)
1171 if (*p1++ != *p2++)
1172 return p1 - (u_int8_t *)dbt1->data - 1;
1173
1174 if (size1 < size2) return size1 + 1;
1175 if (size1 > size2) return size2 + 1;
1176
1177 return size1;
1178}
1179#endif
1180
1181/*****************************************************************************/
1182
1138/* stupid windows defines CALLBACK as well */ 1183/* stupid windows defines CALLBACK as well */
1139#undef CALLBACK 1184#undef CALLBACK
1140#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1185#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1141 1186
1142MODULE = BDB PACKAGE = BDB 1187MODULE = BDB PACKAGE = BDB
1143 1188
1144PROTOTYPES: ENABLE 1189PROTOTYPES: ENABLE
1145 1190
1146BOOT: 1191BOOT:
1147{ 1192{
1148 HV *stash = gv_stashpv ("BDB", 1);
1149
1150 static const struct { 1193 static const struct {
1151 const char *name; 1194 const char *name;
1152 IV iv; 1195 IV iv;
1153 } *civ, const_iv[] = { 1196 } *civ, const_iv[] = {
1154#define const_iv(name) { # name, (IV)DB_ ## name }, 1197#define const_iv(name) { # name, (IV)DB_ ## name },
… …
1183 const_iv (TXN_NOT_DURABLE) 1226 const_iv (TXN_NOT_DURABLE)
1184 const_iv (TXN_WRITE_NOSYNC) 1227 const_iv (TXN_WRITE_NOSYNC)
1185 const_iv (WRITECURSOR) 1228 const_iv (WRITECURSOR)
1186 const_iv (YIELDCPU) 1229 const_iv (YIELDCPU)
1187 const_iv (ENCRYPT_AES) 1230 const_iv (ENCRYPT_AES)
1231#if DB_VERSION_MINOR < 8
1188 const_iv (XA_CREATE) 1232 const_iv (XA_CREATE)
1233#endif
1189 const_iv (BTREE) 1234 const_iv (BTREE)
1190 const_iv (HASH) 1235 const_iv (HASH)
1191 const_iv (QUEUE) 1236 const_iv (QUEUE)
1192 const_iv (RECNO) 1237 const_iv (RECNO)
1193 const_iv (UNKNOWN) 1238 const_iv (UNKNOWN)
… …
1196 const_iv (NOSYNC) 1241 const_iv (NOSYNC)
1197 const_iv (CHKSUM) 1242 const_iv (CHKSUM)
1198 const_iv (ENCRYPT) 1243 const_iv (ENCRYPT)
1199 const_iv (DUP) 1244 const_iv (DUP)
1200 const_iv (DUPSORT) 1245 const_iv (DUPSORT)
1201 const_iv (RECNUM) 1246 //const_iv (RECNUM)
1202 const_iv (RENUMBER) 1247 const_iv (RENUMBER)
1203 const_iv (REVSPLITOFF) 1248 const_iv (REVSPLITOFF)
1204 const_iv (CONSUME) 1249 const_iv (CONSUME)
1205 const_iv (CONSUME_WAIT) 1250 const_iv (CONSUME_WAIT)
1206 const_iv (GET_BOTH) 1251 const_iv (GET_BOTH)
… …
1257 const_iv (LOCK_OLDEST) 1302 const_iv (LOCK_OLDEST)
1258 const_iv (LOCK_RANDOM) 1303 const_iv (LOCK_RANDOM)
1259 const_iv (LOCK_YOUNGEST) 1304 const_iv (LOCK_YOUNGEST)
1260 1305
1261 const_iv (DONOTINDEX) 1306 const_iv (DONOTINDEX)
1262 const_iv (KEYEMPTY ) 1307 const_iv (KEYEMPTY)
1263 const_iv (KEYEXIST ) 1308 const_iv (KEYEXIST)
1264 const_iv (LOCK_DEADLOCK) 1309 const_iv (LOCK_DEADLOCK)
1265 const_iv (LOCK_NOTGRANTED) 1310 const_iv (LOCK_NOTGRANTED)
1266 const_iv (NOSERVER) 1311 const_iv (NOSERVER)
1267 const_iv (NOSERVER_HOME) 1312 const_iv (NOSERVER_HOME)
1268 const_iv (NOSERVER_ID) 1313 const_iv (NOSERVER_ID)
… …
1278 const_iv (REP_UNAVAIL) 1323 const_iv (REP_UNAVAIL)
1279 const_iv (RUNRECOVERY) 1324 const_iv (RUNRECOVERY)
1280 const_iv (SECONDARY_BAD) 1325 const_iv (SECONDARY_BAD)
1281 const_iv (VERIFY_BAD) 1326 const_iv (VERIFY_BAD)
1282 1327
1328 const_iv (SALVAGE)
1329 const_iv (AGGRESSIVE)
1330 const_iv (PRINTABLE)
1331 const_iv (NOORDERCHK)
1332 const_iv (ORDERCHKONLY)
1333
1334 const_iv (ARCH_ABS)
1335 const_iv (ARCH_DATA)
1336 const_iv (ARCH_LOG)
1337 const_iv (ARCH_REMOVE)
1338
1283 const_iv (VERB_DEADLOCK) 1339 const_iv (VERB_DEADLOCK)
1284 const_iv (VERB_RECOVERY) 1340 const_iv (VERB_RECOVERY)
1285 const_iv (VERB_REPLICATION) 1341 const_iv (VERB_REPLICATION)
1286 const_iv (VERB_WAITSFOR) 1342 const_iv (VERB_WAITSFOR)
1287 1343
1288 const_iv (VERSION_MAJOR) 1344 const_iv (VERSION_MAJOR)
1289 const_iv (VERSION_MINOR) 1345 const_iv (VERSION_MINOR)
1290 const_iv (VERSION_PATCH) 1346 const_iv (VERSION_PATCH)
1347 const_iv (LOGVERSION)
1348 const_iv (LOGOLDVER)
1291#if DB_VERSION_MINOR >= 3 1349#if DB_VERSION_MINOR >= 3
1292 const_iv (INORDER) 1350 const_iv (INORDER)
1293 const_iv (LOCK_MAXWRITE) 1351 const_iv (LOCK_MAXWRITE)
1294 const_iv (SEQ_DEC) 1352 const_iv (SEQ_DEC)
1295 const_iv (SEQ_INC) 1353 const_iv (SEQ_INC)
… …
1320 const_iv (PRIORITY_VERY_LOW) 1378 const_iv (PRIORITY_VERY_LOW)
1321 const_iv (PRIORITY_LOW) 1379 const_iv (PRIORITY_LOW)
1322 const_iv (PRIORITY_DEFAULT) 1380 const_iv (PRIORITY_DEFAULT)
1323 const_iv (PRIORITY_HIGH) 1381 const_iv (PRIORITY_HIGH)
1324 const_iv (PRIORITY_VERY_HIGH) 1382 const_iv (PRIORITY_VERY_HIGH)
1383 const_iv (IGNORE_LEASE)
1325#endif 1384#endif
1326#if DB_VERSION_MINOR >= 7 1385#if DB_VERSION_MINOR >= 7
1386 //const_iv (MULTIPLE_KEY)
1327 const_iv (LOG_DIRECT) 1387 const_iv (LOG_DIRECT)
1328 const_iv (LOG_DSYNC) 1388 const_iv (LOG_DSYNC)
1329 const_iv (LOG_AUTO_REMOVE) 1389 const_iv (LOG_AUTO_REMOVE)
1330 const_iv (LOG_IN_MEMORY) 1390 const_iv (LOG_IN_MEMORY)
1331 const_iv (LOG_ZERO) 1391 const_iv (LOG_ZERO)
… …
1334 const_iv (LOG_AUTOREMOVE) 1394 const_iv (LOG_AUTOREMOVE)
1335# if DB_VERSION_MINOR >= 3 1395# if DB_VERSION_MINOR >= 3
1336 const_iv (DSYNC_LOG) 1396 const_iv (DSYNC_LOG)
1337 const_iv (LOG_INMEMORY) 1397 const_iv (LOG_INMEMORY)
1338# endif 1398# endif
1399#if DB_VERSION_MINOR >= 8
1400 const_iv (LOGVERSION_LATCHING)
1401#endif
1339#endif 1402#endif
1340 }; 1403 };
1341 1404
1405 bdb_stash = gv_stashpv ("BDB" , 1);
1406 bdb_env_stash = gv_stashpv ("BDB::Env" , 1);
1407 bdb_txn_stash = gv_stashpv ("BDB::Txn" , 1);
1408 bdb_cursor_stash = gv_stashpv ("BDB::Cursor" , 1);
1409 bdb_db_stash = gv_stashpv ("BDB::Db" , 1);
1410 bdb_sequence_stash = gv_stashpv ("BDB::Sequence", 1);
1411
1342 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1412 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1343 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1413 newCONSTSUB (bdb_stash, (char *)civ->name, newSViv (civ->iv));
1344 1414
1345 prepare_cb = &PL_sv_undef; 1415 prepare_cb = &PL_sv_undef;
1346 1416
1347 { 1417 {
1348 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1418 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1349 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH }; 1419 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1350 1420
1351 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1421 newCONSTSUB (bdb_stash, "VERSION_v", newSVpvn (vstring, 3));
1352 } 1422 }
1353 1423
1354 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1424 newCONSTSUB (bdb_stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1355 1425
1356 create_respipe (); 1426 create_respipe ();
1357 1427
1358 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1428 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1359 patch_errno (); 1429 patch_errno ();
… …
1437 1507
1438int 1508int
1439poll_fileno () 1509poll_fileno ()
1440 PROTOTYPE: 1510 PROTOTYPE:
1441 CODE: 1511 CODE:
1442 RETVAL = respipe [0]; 1512 RETVAL = s_epipe_fd (&respipe);
1443 OUTPUT: 1513 OUTPUT:
1444 RETVAL 1514 RETVAL
1445 1515
1446int 1516int
1447poll_cb (...) 1517poll_cb (...)
… …
1631 dREQ (REQ_ENV_DBRENAME, 2); 1701 dREQ (REQ_ENV_DBRENAME, 2);
1632 req->env = env; 1702 req->env = env;
1633 req->buf1 = strdup_ornull (file); 1703 req->buf1 = strdup_ornull (file);
1634 req->buf2 = strdup_ornull (database); 1704 req->buf2 = strdup_ornull (database);
1635 req->buf3 = strdup_ornull (newname); 1705 req->buf3 = strdup_ornull (newname);
1706 req->uint1 = flags;
1707 REQ_SEND;
1708}
1709
1710void
1711db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1712 PREINIT:
1713 CALLBACK
1714 CODE:
1715{
1716 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1717 req->sv1 = SvREFCNT_inc (listp);
1718 req->env = env;
1636 req->uint1 = flags; 1719 req->uint1 = flags;
1637 REQ_SEND; 1720 REQ_SEND;
1638} 1721}
1639 1722
1640DB * 1723DB *
… …
1691 CODE: 1774 CODE:
1692{ 1775{
1693 dREQ (REQ_DB_COMPACT, 2); 1776 dREQ (REQ_DB_COMPACT, 2);
1694 req->db = db; 1777 req->db = db;
1695 req->txn = txn; 1778 req->txn = txn;
1696 sv_to_dbt (&req->dbt1, start); 1779 if (start) sv_to_dbt (&req->dbt1, start);
1697 sv_to_dbt (&req->dbt2, stop); 1780 if (stop ) sv_to_dbt (&req->dbt2, stop );
1698 req->uint1 = flags; 1781 req->uint1 = flags;
1699 REQ_SEND; 1782 REQ_SEND;
1700} 1783}
1701 1784
1702#endif 1785#endif
… …
1712 req->uint1 = flags; 1795 req->uint1 = flags;
1713 REQ_SEND; 1796 REQ_SEND;
1714} 1797}
1715 1798
1716void 1799void
1800db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1801 PREINIT:
1802 CALLBACK
1803 CODE:
1804{
1805 dREQ (REQ_DB_VERIFY, 1);
1806 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1807 req->db = db;
1808 req->buf1 = strdup (file);
1809 req->buf2 = strdup_ornull (database);
1810 req->uint1 = flags;
1811 REQ_SEND;
1812}
1813
1814void
1717db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1815db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1718 PREINIT: 1816 PREINIT:
1719 CALLBACK 1817 CALLBACK
1720 CODE: 1818 CODE:
1721{ 1819{
1722 dREQ (REQ_DB_SYNC, 1); 1820 dREQ (REQ_DB_UPGRADE, 1);
1723 req->db = db; 1821 req->db = db;
1724 req->buf1 = strdup (file); 1822 req->buf1 = strdup (file);
1725 req->uint1 = flags; 1823 req->uint1 = flags;
1726 REQ_SEND; 1824 REQ_SEND;
1727} 1825}
… …
1907db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2005db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1908 PREINIT: 2006 PREINIT:
1909 CALLBACK 2007 CALLBACK
1910 CODE: 2008 CODE:
1911{ 2009{
1912 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2010 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1913 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2011 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1914 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 2012 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1915 croak ("argument \"%s\" must be byte/octet-encoded in %s", 2013 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1916 "key", 2014 "key",
1917 "BDB::db_c_get"); 2015 "BDB::db_c_get");
1918 2016
1919 { 2017 {
1920 dREQ (REQ_C_GET, 1); 2018 dREQ (REQ_C_GET, 1);
1921 req->dbc = dbc; 2019 req->dbc = dbc;
1922 req->uint1 = flags; 2020 req->uint1 = flags;
1923 if (flags & DB_OPFLAGS_MASK == DB_SET) 2021 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1924 sv_to_dbt (&req->dbt1, key); 2022 sv_to_dbt (&req->dbt1, key);
1925 else 2023 else
1926 { 2024 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2025 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key); 2026 sv_to_dbt (&req->dbt1, key);
1929 else 2027 else
1930 req->dbt1.flags = DB_DBT_MALLOC; 2028 req->dbt1.flags = DB_DBT_MALLOC;
1931 2029
1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2030 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 } 2031 }
1934 2032
1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2033 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2034 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1937 sv_to_dbt (&req->dbt3, data); 2035 sv_to_dbt (&req->dbt3, data);
1938 else 2036 else
1939 req->dbt3.flags = DB_DBT_MALLOC; 2037 req->dbt3.flags = DB_DBT_MALLOC;
1940 2038
1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2039 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
1947db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2045db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1948 PREINIT: 2046 PREINIT:
1949 CALLBACK 2047 CALLBACK
1950 CODE: 2048 CODE:
1951{ 2049{
1952 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2050 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1953 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2051 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
1954 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 2052 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1955 croak ("argument \"%s\" must be byte/octet-encoded in %s", 2053 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1956 "key", 2054 "key",
1957 "BDB::db_c_pget"); 2055 "BDB::db_c_pget");
1958 2056
1959 { 2057 {
1960 dREQ (REQ_C_PGET, 1); 2058 dREQ (REQ_C_PGET, 1);
1961 req->dbc = dbc; 2059 req->dbc = dbc;
1962 req->uint1 = flags; 2060 req->uint1 = flags;
1963 if (flags & DB_OPFLAGS_MASK == DB_SET) 2061 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1964 sv_to_dbt (&req->dbt1, key); 2062 sv_to_dbt (&req->dbt1, key);
1965 else 2063 else
1966 { 2064 {
1967 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2065 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1968 sv_to_dbt (&req->dbt1, key); 2066 sv_to_dbt (&req->dbt1, key);
1969 else 2067 else
1970 req->dbt1.flags = DB_DBT_MALLOC; 2068 req->dbt1.flags = DB_DBT_MALLOC;
1971 2069
1972 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2070 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1973 } 2071 }
1974 2072
1975 req->dbt2.flags = DB_DBT_MALLOC; 2073 req->dbt2.flags = DB_DBT_MALLOC;
1976 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2074 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1977 2075
1978 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2076 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1979 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2077 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1980 sv_to_dbt (&req->dbt3, data); 2078 sv_to_dbt (&req->dbt3, data);
1981 else 2079 else
1982 req->dbt3.flags = DB_DBT_MALLOC; 2080 req->dbt3.flags = DB_DBT_MALLOC;
1983 2081
1984 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2082 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);

Diff Legend

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