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

Comparing BDB/BDB.xs (file contents):
Revision 1.51 by root, Thu Sep 25 13:28:37 2008 UTC vs.
Revision 1.64 by root, Wed Nov 12 16:52:51 2008 UTC

1#include <sys/user.h>
2#include <sys/ptrace.h>
3
4#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4 1#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4
5 2
6#include "xthread.h" 3#include "xthread.h"
7 4
8#include <errno.h> 5#include <errno.h>
39#endif 36#endif
40 37
41/* number of seconds after which idle threads exit */ 38/* number of seconds after which idle threads exit */
42#define IDLE_TIMEOUT 10 39#define IDLE_TIMEOUT 10
43 40
41typedef SV SV_mutable;
42
44typedef DB_ENV DB_ENV_ornull; 43typedef DB_ENV DB_ENV_ornull;
45typedef DB_TXN DB_TXN_ornull; 44typedef DB_TXN DB_TXN_ornull;
46typedef DBC DBC_ornull; 45typedef DBC DBC_ornull;
47typedef DB DB_ornull; 46typedef DB DB_ornull;
48 47
54#if DB_VERSION_MINOR >= 3 53#if DB_VERSION_MINOR >= 3
55typedef DB_SEQUENCE DB_SEQUENCE_ornull; 54typedef DB_SEQUENCE DB_SEQUENCE_ornull;
56typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 55typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
57#endif 56#endif
58 57
59typedef SV SV8; /* byte-sv, used for argument-checking */
60typedef char *bdb_filename; 58typedef char *bdb_filename;
61 59
62static SV *prepare_cb; 60static SV *prepare_cb;
63 61
64#if DB_VERSION_MINOR >= 6 62#if DB_VERSION_MINOR >= 6
135dbt_to_sv (SV *sv, DBT *dbt) 133dbt_to_sv (SV *sv, DBT *dbt)
136{ 134{
137 if (sv) 135 if (sv)
138 { 136 {
139 SvREADONLY_off (sv); 137 SvREADONLY_off (sv);
140 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef); 138
139 if (dbt->data)
140 sv_setpvn_mg (sv, dbt->data, dbt->size);
141 else
142 sv_setsv_mg (sv, &PL_sv_undef);
143
141 SvREFCNT_dec (sv); 144 SvREFCNT_dec (sv);
142 } 145 }
143 146
144 //assert (dbt->flags & DBT_MALLOC || !dbt->data);
145 free (dbt->data); 147 free (dbt->data);
146} 148}
147 149
148enum { 150enum {
149 REQ_QUIT, 151 REQ_QUIT,
150 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
151 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE,
152 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
153 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
154 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
155 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
156 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
347 abort (); 350 abort ();
348} 351}
349 352
350static int poll_cb (void); 353static int poll_cb (void);
351static void req_free (bdb_req req); 354static void req_free (bdb_req req);
352static void req_cancel (bdb_req req);
353 355
354static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
355{ 357{
356 dSP; 358 switch (req->type)
359 {
360 case REQ_DB_CLOSE:
361 SvREFCNT_dec (req->sv1);
362 break;
363
364 case REQ_DB_GET:
365 case REQ_DB_PGET:
366 case REQ_C_GET:
367 case REQ_C_PGET:
368 case REQ_DB_PUT:
369 case REQ_C_PUT:
370 dbt_to_sv (req->sv1, &req->dbt1);
371 dbt_to_sv (req->sv2, &req->dbt2);
372 dbt_to_sv (req->sv3, &req->dbt3);
373 break;
374
375 case REQ_DB_KEY_RANGE:
376 {
377 AV *av = newAV ();
378
379 av_push (av, newSVnv (req->key_range.less));
380 av_push (av, newSVnv (req->key_range.equal));
381 av_push (av, newSVnv (req->key_range.greater));
382
383 av = (AV *)newRV_noinc ((SV *)av);
384
385 SvREADONLY_off (req->sv1);
386 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
387 SvREFCNT_dec (av);
388 SvREFCNT_dec (req->sv1);
389 }
390 break;
391
392#if DB_VERSION_MINOR >= 3
393 case REQ_SEQ_GET:
394 SvREADONLY_off (req->sv1);
395
396 if (sizeof (IV) > 4)
397 sv_setiv_mg (req->sv1, (IV)req->seq_t);
398 else
399 sv_setnv_mg (req->sv1, (NV)req->seq_t);
400
401 SvREFCNT_dec (req->sv1);
402 break;
403#endif
404
405 case REQ_ENV_LOG_ARCHIVE:
406 {
407 AV *av = newAV ();
408 char **listp = (char **)req->buf1;
409
410 if (listp)
411 while (*listp)
412 av_push (av, newSVpv (*listp, 0)), ++listp;
413
414 av = (AV *)newRV_noinc ((SV *)av);
415
416 SvREADONLY_off (req->sv1);
417 sv_setsv_mg (req->sv1, (SV *)av);
418 SvREFCNT_dec (av);
419 SvREFCNT_dec (req->sv1);
420 }
421 break;
422 }
423
424 errno = req->result;
357 425
358 if (req->callback) 426 if (req->callback)
359 { 427 {
428 dSP;
429
360 ENTER; 430 ENTER;
361 SAVETMPS; 431 SAVETMPS;
362 PUSHMARK (SP); 432 PUSHMARK (SP);
363 433
364 switch (req->type)
365 {
366 case REQ_DB_CLOSE:
367 SvREFCNT_dec (req->sv1);
368 break;
369
370 case REQ_DB_GET:
371 case REQ_DB_PGET:
372 dbt_to_sv (req->sv3, &req->dbt3);
373 break;
374
375 case REQ_C_GET:
376 case REQ_C_PGET:
377 dbt_to_sv (req->sv1, &req->dbt1);
378 dbt_to_sv (req->sv2, &req->dbt2);
379 dbt_to_sv (req->sv3, &req->dbt3);
380 break;
381
382 case REQ_DB_PUT:
383 case REQ_C_PUT:
384 dbt_to_sv (0, &req->dbt1);
385 dbt_to_sv (0, &req->dbt2);
386 break;
387
388 case REQ_DB_KEY_RANGE:
389 {
390 AV *av = newAV ();
391
392 av_push (av, newSVnv (req->key_range.less));
393 av_push (av, newSVnv (req->key_range.equal));
394 av_push (av, newSVnv (req->key_range.greater));
395
396 SvREADONLY_off (req->sv1);
397 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
398 SvREFCNT_dec (req->sv1);
399 }
400 break;
401
402#if DB_VERSION_MINOR >= 3
403 case REQ_SEQ_GET:
404 SvREADONLY_off (req->sv1);
405
406 if (sizeof (IV) > 4)
407 sv_setiv_mg (req->sv1, (IV)req->seq_t);
408 else
409 sv_setnv_mg (req->sv1, (NV)req->seq_t);
410
411 SvREFCNT_dec (req->sv1);
412 break;
413#endif
414 }
415
416 errno = req->result;
417
418 PUTBACK; 434 PUTBACK;
419 call_sv (req->callback, G_VOID | G_EVAL); 435 call_sv (req->callback, G_VOID | G_EVAL);
420 SPAGAIN; 436 SPAGAIN;
421 437
422 FREETMPS; 438 FREETMPS;
423 LEAVE; 439 LEAVE;
440
441 return !SvTRUE (ERRSV);
424 } 442 }
425 443
426 return !SvTRUE (ERRSV); 444 return 1;
427} 445}
428 446
429static void req_free (bdb_req req) 447static void req_free (bdb_req req)
430{ 448{
431 SvREFCNT_dec (req->callback); 449 SvREFCNT_dec (req->callback);
485 503
486 respipe_osf [0] = TO_SOCKET (respipe [0]); 504 respipe_osf [0] = TO_SOCKET (respipe [0]);
487 respipe_osf [1] = TO_SOCKET (respipe [1]); 505 respipe_osf [1] = TO_SOCKET (respipe [1]);
488} 506}
489 507
508static void bdb_request (bdb_req req);
490X_THREAD_PROC (bdb_proc); 509X_THREAD_PROC (bdb_proc);
491 510
492static void start_thread (void) 511static void start_thread (void)
493{ 512{
494 worker *wrk = calloc (1, sizeof (worker)); 513 worker *wrk = calloc (1, sizeof (worker));
541 } 560 }
542 561
543 // synthesize callback if none given 562 // synthesize callback if none given
544 if (!req->callback) 563 if (!req->callback)
545 { 564 {
565 if (SvOK (prepare_cb))
566 {
546 int count; 567 int count;
547 568
548 dSP; 569 dSP;
549 PUSHMARK (SP); 570 PUSHMARK (SP);
550 PUTBACK; 571 PUTBACK;
551 count = call_sv (prepare_cb, G_ARRAY); 572 count = call_sv (prepare_cb, G_ARRAY);
552 SPAGAIN; 573 SPAGAIN;
553 574
554 if (count != 2) 575 if (count != 2)
555 croak ("prepare callback must return exactly two values\n"); 576 croak ("sync prepare callback must return exactly two values\n");
556 577
557 wait_callback = POPs; 578 wait_callback = POPs;
558 req->callback = SvREFCNT_inc (POPs); 579 req->callback = SvREFCNT_inc (POPs);
580 }
581 else
582 {
583 // execute request synchronously
584 bdb_request (req);
585 req_invoke (req);
586 req_free (req);
587 return;
588 }
559 } 589 }
560 590
561 ++nreqs; 591 ++nreqs;
562 592
563 X_LOCK (reqlock); 593 X_LOCK (reqlock);
577 } 607 }
578} 608}
579 609
580static void end_thread (void) 610static void end_thread (void)
581{ 611{
582 bdb_req req; 612 bdb_req req = calloc (1, sizeof (bdb_cb));
583
584 Newz (0, req, 1, bdb_cb);
585 613
586 req->type = REQ_QUIT; 614 req->type = REQ_QUIT;
587 req->pri = PRI_MAX + PRI_BIAS; 615 req->pri = PRI_MAX + PRI_BIAS;
588 616
589 X_LOCK (reqlock); 617 X_LOCK (reqlock);
762 req->result = req->db->close (req->db, req->uint1); 790 req->result = req->db->close (req->db, req->uint1);
763 break; 791 break;
764 792
765#if DB_VERSION_MINOR >= 4 793#if DB_VERSION_MINOR >= 4
766 case REQ_DB_COMPACT: 794 case REQ_DB_COMPACT:
767 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 795 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);
768 break; 796 break;
769#endif 797#endif
770 798
771 case REQ_DB_SYNC: 799 case REQ_DB_SYNC:
772 req->result = req->db->sync (req->db, req->uint1); 800 req->result = req->db->sync (req->db, req->uint1);
863 891
864 case REQ_SEQ_REMOVE: 892 case REQ_SEQ_REMOVE:
865 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 893 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
866 break; 894 break;
867#endif 895#endif
896
897 case REQ_ENV_LOG_ARCHIVE:
898 {
899 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
900 req->result = req->env->log_archive (req->env, &listp, req->uint1);
901 req->buf1 = (char *)listp;
902 }
903 break;
868 904
869 default: 905 default:
870 req->result = ENOSYS; 906 req->result = ENOSYS;
871 break; 907 break;
872 } 908 }
923 --nready; 959 --nready;
924 960
925 X_UNLOCK (reqlock); 961 X_UNLOCK (reqlock);
926 962
927 if (req->type == REQ_QUIT) 963 if (req->type == REQ_QUIT)
964 {
965 X_LOCK (reslock);
966 free (req);
967 self->req = 0;
968 X_UNLOCK (reslock);
969
928 goto quit; 970 goto quit;
971 }
929 972
930 bdb_request (req); 973 bdb_request (req);
931 974
932 X_LOCK (reslock); 975 X_LOCK (reslock);
933 976
1031 } \ 1074 } \
1032 else if (sv_derived_from ((arg), # class)) \ 1075 else if (sv_derived_from ((arg), # class)) \
1033 { \ 1076 { \
1034 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1077 IV tmp = SvIV ((SV*) SvRV (arg)); \
1035 (var) = INT2PTR (type, tmp); \ 1078 (var) = INT2PTR (type, tmp); \
1036 if (!var && nullok != 2) \ 1079 if (!var && nullok != 2) \
1037 croak (# var " is not a valid " # class " object anymore"); \ 1080 croak (# var " is not a valid " # class " object anymore"); \
1038 } \ 1081 } \
1039 else \ 1082 else \
1040 croak (# var " is not of type " # class); 1083 croak (# var " is not of type " # class);
1084
1085#define ARG_MUTABLE(name) \
1086 if (SvREADONLY (name)) \
1087 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1041 1088
1042static void 1089static void
1043ptr_nuke (SV *sv) 1090ptr_nuke (SV *sv)
1044{ 1091{
1045 assert (SvROK (sv)); 1092 assert (SvROK (sv));
1116 } 1163 }
1117 1164
1118 return 0; 1165 return 0;
1119} 1166}
1120 1167
1168/*****************************************************************************/
1169
1170#if 0
1171static int
1172bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1173{
1174 ssize_t size1 = dbt1->size;
1175 ssize_t size2 = dbt2->size;
1176 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1177 size1 <= size2 ? size1 : size2);
1178
1179 if (res)
1180 return res;
1181 else if (size1 - size2)
1182 return size1 - size2;
1183 else
1184 return 0;
1185}
1186
1187static size_t
1188bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1189{
1190 ssize_t size1 = dbt1->size;
1191 ssize_t size2 = dbt2->size;
1192 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1193 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1194 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1195
1196 while (p1 < pe)
1197 if (*p1++ != *p2++)
1198 return p1 - (u_int8_t *)dbt1->data - 1;
1199
1200 if (size1 < size2) return size1 + 1;
1201 if (size1 > size2) return size2 + 1;
1202
1203 return size1;
1204}
1205#endif
1206
1207/*****************************************************************************/
1208
1121/* stupid windoes defined CALLBACK as well */ 1209/* stupid windows defines CALLBACK as well */
1122#undef CALLBACK 1210#undef CALLBACK
1123#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1211#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1124 1212
1125MODULE = BDB PACKAGE = BDB 1213MODULE = BDB PACKAGE = BDB
1126 1214
1179 const_iv (NOSYNC) 1267 const_iv (NOSYNC)
1180 const_iv (CHKSUM) 1268 const_iv (CHKSUM)
1181 const_iv (ENCRYPT) 1269 const_iv (ENCRYPT)
1182 const_iv (DUP) 1270 const_iv (DUP)
1183 const_iv (DUPSORT) 1271 const_iv (DUPSORT)
1184 const_iv (RECNUM) 1272 //const_iv (RECNUM)
1185 const_iv (RENUMBER) 1273 const_iv (RENUMBER)
1186 const_iv (REVSPLITOFF) 1274 const_iv (REVSPLITOFF)
1187 const_iv (CONSUME) 1275 const_iv (CONSUME)
1188 const_iv (CONSUME_WAIT) 1276 const_iv (CONSUME_WAIT)
1189 const_iv (GET_BOTH) 1277 const_iv (GET_BOTH)
1261 const_iv (REP_UNAVAIL) 1349 const_iv (REP_UNAVAIL)
1262 const_iv (RUNRECOVERY) 1350 const_iv (RUNRECOVERY)
1263 const_iv (SECONDARY_BAD) 1351 const_iv (SECONDARY_BAD)
1264 const_iv (VERIFY_BAD) 1352 const_iv (VERIFY_BAD)
1265 1353
1354 const_iv (ARCH_ABS)
1355 const_iv (ARCH_DATA)
1356 const_iv (ARCH_LOG)
1357 const_iv (ARCH_REMOVE)
1358
1266 const_iv (VERB_DEADLOCK) 1359 const_iv (VERB_DEADLOCK)
1267 const_iv (VERB_RECOVERY) 1360 const_iv (VERB_RECOVERY)
1268 const_iv (VERB_REPLICATION) 1361 const_iv (VERB_REPLICATION)
1269 const_iv (VERB_WAITSFOR) 1362 const_iv (VERB_WAITSFOR)
1270 1363
1303 const_iv (PRIORITY_VERY_LOW) 1396 const_iv (PRIORITY_VERY_LOW)
1304 const_iv (PRIORITY_LOW) 1397 const_iv (PRIORITY_LOW)
1305 const_iv (PRIORITY_DEFAULT) 1398 const_iv (PRIORITY_DEFAULT)
1306 const_iv (PRIORITY_HIGH) 1399 const_iv (PRIORITY_HIGH)
1307 const_iv (PRIORITY_VERY_HIGH) 1400 const_iv (PRIORITY_VERY_HIGH)
1401 const_iv (IGNORE_LEASE)
1308#endif 1402#endif
1309#if DB_VERSION_MINOR >= 7 1403#if DB_VERSION_MINOR >= 7
1404 //const_iv (MULTIPLE_KEY)
1310 const_iv (LOG_DIRECT) 1405 const_iv (LOG_DIRECT)
1311 const_iv (LOG_DSYNC) 1406 const_iv (LOG_DSYNC)
1312 const_iv (LOG_AUTO_REMOVE) 1407 const_iv (LOG_AUTO_REMOVE)
1313 const_iv (LOG_IN_MEMORY) 1408 const_iv (LOG_IN_MEMORY)
1314 const_iv (LOG_ZERO) 1409 const_iv (LOG_ZERO)
1323 }; 1418 };
1324 1419
1325 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1420 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1326 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1421 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1327 1422
1423 prepare_cb = &PL_sv_undef;
1424
1328 { 1425 {
1329 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1426 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1330 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH }; 1427 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1331 1428
1332 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1429 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1470 RETVAL = started; 1567 RETVAL = started;
1471 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1568 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1472 OUTPUT: 1569 OUTPUT:
1473 RETVAL 1570 RETVAL
1474 1571
1475void 1572SV *
1476set_sync_prepare (SV *cb) 1573set_sync_prepare (SV *cb)
1477 PROTOTYPE: & 1574 PROTOTYPE: &
1478 CODE: 1575 CODE:
1479 SvREFCNT_dec (prepare_cb); 1576 RETVAL = prepare_cb;
1480 prepare_cb = newSVsv (cb); 1577 prepare_cb = newSVsv (cb);
1578 OUTPUT:
1579 RETVAL
1481 1580
1482char * 1581char *
1483strerror (int errorno = errno) 1582strerror (int errorno = errno)
1484 PROTOTYPE: ;$ 1583 PROTOTYPE: ;$
1485 CODE: 1584 CODE:
1527db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1626db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1528 PREINIT: 1627 PREINIT:
1529 CALLBACK 1628 CALLBACK
1530 CODE: 1629 CODE:
1531{ 1630{
1532 dREQ (REQ_ENV_CLOSE, 1); 1631 dREQ (REQ_ENV_CLOSE, 0);
1632 ptr_nuke (ST (0));
1533 req->env = env; 1633 req->env = env;
1534 req->uint1 = flags; 1634 req->uint1 = flags;
1535 REQ_SEND; 1635 REQ_SEND;
1536 ptr_nuke (ST (0));
1537} 1636}
1538 1637
1539void 1638void
1540db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1639db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1541 PREINIT: 1640 PREINIT:
1610 dREQ (REQ_ENV_DBRENAME, 2); 1709 dREQ (REQ_ENV_DBRENAME, 2);
1611 req->env = env; 1710 req->env = env;
1612 req->buf1 = strdup_ornull (file); 1711 req->buf1 = strdup_ornull (file);
1613 req->buf2 = strdup_ornull (database); 1712 req->buf2 = strdup_ornull (database);
1614 req->buf3 = strdup_ornull (newname); 1713 req->buf3 = strdup_ornull (newname);
1714 req->uint1 = flags;
1715 REQ_SEND;
1716}
1717
1718void
1719db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1720 PREINIT:
1721 CALLBACK
1722 CODE:
1723{
1724 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1725 req->sv1 = SvREFCNT_inc (listp);
1726 req->env = env;
1615 req->uint1 = flags; 1727 req->uint1 = flags;
1616 REQ_SEND; 1728 REQ_SEND;
1617} 1729}
1618 1730
1619DB * 1731DB *
1651db_close (DB *db, U32 flags = 0, SV *callback = 0) 1763db_close (DB *db, U32 flags = 0, SV *callback = 0)
1652 PREINIT: 1764 PREINIT:
1653 CALLBACK 1765 CALLBACK
1654 CODE: 1766 CODE:
1655{ 1767{
1656 dREQ (REQ_DB_CLOSE, 1); 1768 dREQ (REQ_DB_CLOSE, 0);
1769 ptr_nuke (ST (0));
1657 req->db = db; 1770 req->db = db;
1658 req->uint1 = flags; 1771 req->uint1 = flags;
1659 req->sv1 = (SV *)db->app_private; 1772 req->sv1 = (SV *)db->app_private;
1660 REQ_SEND; 1773 REQ_SEND;
1661 ptr_nuke (ST (0));
1662} 1774}
1663 1775
1664#if DB_VERSION_MINOR >= 4 1776#if DB_VERSION_MINOR >= 4
1665 1777
1666void 1778void
1670 CODE: 1782 CODE:
1671{ 1783{
1672 dREQ (REQ_DB_COMPACT, 2); 1784 dREQ (REQ_DB_COMPACT, 2);
1673 req->db = db; 1785 req->db = db;
1674 req->txn = txn; 1786 req->txn = txn;
1675 sv_to_dbt (&req->dbt1, start); 1787 if (start) sv_to_dbt (&req->dbt1, start);
1676 sv_to_dbt (&req->dbt2, stop); 1788 if (stop ) sv_to_dbt (&req->dbt2, stop );
1677 req->uint1 = flags; 1789 req->uint1 = flags;
1678 REQ_SEND; 1790 REQ_SEND;
1679} 1791}
1680 1792
1681#endif 1793#endif
1704 req->uint1 = flags; 1816 req->uint1 = flags;
1705 REQ_SEND; 1817 REQ_SEND;
1706} 1818}
1707 1819
1708void 1820void
1709db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1821db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *key_range, U32 flags = 0, SV *callback = 0)
1710 PREINIT: 1822 PREINIT:
1711 CALLBACK 1823 CALLBACK
1712 CODE: 1824 CODE:
1713{ 1825{
1714 dREQ (REQ_DB_KEY_RANGE, 2); 1826 dREQ (REQ_DB_KEY_RANGE, 2);
1752} 1864}
1753 1865
1754#endif 1866#endif
1755 1867
1756void 1868void
1757db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1869db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1758 PREINIT: 1870 PREINIT:
1759 CALLBACK 1871 CALLBACK
1760 CODE: 1872 CODE:
1761 if (SvREADONLY (data))
1762 croak ("can't modify read-only data scalar in db_get");
1763{ 1873{
1874 //TODO: key is somtimesmutable
1764 dREQ (REQ_DB_GET, 2); 1875 dREQ (REQ_DB_GET, 2);
1765 req->db = db; 1876 req->db = db;
1766 req->txn = txn; 1877 req->txn = txn;
1767 req->uint1 = flags; 1878 req->uint1 = flags;
1768 sv_to_dbt (&req->dbt1, key); 1879 sv_to_dbt (&req->dbt1, key);
1770 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1881 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1771 REQ_SEND; 1882 REQ_SEND;
1772} 1883}
1773 1884
1774void 1885void
1775db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1886db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1776 PREINIT: 1887 PREINIT:
1777 CALLBACK 1888 CALLBACK
1778 CODE: 1889 CODE:
1779 if (SvREADONLY (data))
1780 croak ("can't modify read-only data scalar in db_pget");
1781{ 1890{
1891 //TODO: key is somtimesmutable
1782 dREQ (REQ_DB_PGET, 2); 1892 dREQ (REQ_DB_PGET, 2);
1783 req->db = db; 1893 req->db = db;
1784 req->txn = txn; 1894 req->txn = txn;
1785 req->uint1 = flags; 1895 req->uint1 = flags;
1896
1786 sv_to_dbt (&req->dbt1, key); 1897 sv_to_dbt (&req->dbt1, key);
1787 sv_to_dbt (&req->dbt2, pkey); 1898
1899 req->dbt2.flags = DB_DBT_MALLOC;
1900 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1901
1788 req->dbt3.flags = DB_DBT_MALLOC; 1902 req->dbt3.flags = DB_DBT_MALLOC;
1789 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1903 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1790 REQ_SEND; 1904 REQ_SEND;
1791} 1905}
1792 1906
1808db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1922db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1809 PREINIT: 1923 PREINIT:
1810 CALLBACK 1924 CALLBACK
1811 CODE: 1925 CODE:
1812{ 1926{
1813 dREQ (REQ_TXN_COMMIT, 1); 1927 dREQ (REQ_TXN_COMMIT, 0);
1928 ptr_nuke (ST (0));
1814 req->txn = txn; 1929 req->txn = txn;
1815 req->uint1 = flags; 1930 req->uint1 = flags;
1816 REQ_SEND; 1931 REQ_SEND;
1932}
1933
1934void
1935db_txn_abort (DB_TXN *txn, SV *callback = 0)
1936 PREINIT:
1937 CALLBACK
1938 CODE:
1939{
1940 dREQ (REQ_TXN_ABORT, 0);
1817 ptr_nuke (ST (0)); 1941 ptr_nuke (ST (0));
1818}
1819
1820void
1821db_txn_abort (DB_TXN *txn, SV *callback = 0)
1822 PREINIT:
1823 CALLBACK
1824 CODE:
1825{
1826 dREQ (REQ_TXN_ABORT, 1);
1827 req->txn = txn; 1942 req->txn = txn;
1828 REQ_SEND; 1943 REQ_SEND;
1944}
1945
1946void
1947db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1948 PREINIT:
1949 CALLBACK
1950 CODE:
1951{
1952 dREQ (REQ_TXN_FINISH, 0);
1829 ptr_nuke (ST (0)); 1953 ptr_nuke (ST (0));
1830}
1831
1832void
1833db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1834 PREINIT:
1835 CALLBACK
1836 CODE:
1837{
1838 dREQ (REQ_TXN_FINISH, 1);
1839 req->txn = txn; 1954 req->txn = txn;
1840 req->uint1 = flags; 1955 req->uint1 = flags;
1841 REQ_SEND; 1956 REQ_SEND;
1957}
1958
1959void
1960db_c_close (DBC *dbc, SV *callback = 0)
1961 PREINIT:
1962 CALLBACK
1963 CODE:
1964{
1965 dREQ (REQ_C_CLOSE, 0);
1842 ptr_nuke (ST (0)); 1966 ptr_nuke (ST (0));
1843}
1844
1845void
1846db_c_close (DBC *dbc, SV *callback = 0)
1847 PREINIT:
1848 CALLBACK
1849 CODE:
1850{
1851 dREQ (REQ_C_CLOSE, 1);
1852 req->dbc = dbc; 1967 req->dbc = dbc;
1853 REQ_SEND; 1968 REQ_SEND;
1854 ptr_nuke (ST (0));
1855} 1969}
1856 1970
1857void 1971void
1858db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1972db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1859 PREINIT: 1973 PREINIT:
1879 req->uint1 = flags; 1993 req->uint1 = flags;
1880 REQ_SEND; 1994 REQ_SEND;
1881} 1995}
1882 1996
1883void 1997void
1884db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1998db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1885 PREINIT: 1999 PREINIT:
1886 CALLBACK 2000 CALLBACK
1887 CODE: 2001 CODE:
1888{ 2002{
2003 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
2004 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
2005 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2006 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2007 "key",
2008 "BDB::db_c_get");
2009
2010 {
1889 dREQ (REQ_C_GET, 1); 2011 dREQ (REQ_C_GET, 1);
1890 req->dbc = dbc; 2012 req->dbc = dbc;
1891 req->uint1 = flags; 2013 req->uint1 = flags;
1892 if ((flags & DB_SET) == DB_SET 2014 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1893 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1894 sv_to_dbt (&req->dbt1, key); 2015 sv_to_dbt (&req->dbt1, key);
1895 else 2016 else
2017 {
2018 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
2019 sv_to_dbt (&req->dbt1, key);
2020 else
1896 req->dbt1.flags = DB_DBT_MALLOC; 2021 req->dbt1.flags = DB_DBT_MALLOC;
1897 2022
1898 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2023 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
2024 }
1899 2025
1900 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 2026 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1901 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 2027 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1902 sv_to_dbt (&req->dbt3, data); 2028 sv_to_dbt (&req->dbt3, data);
1903 else 2029 else
1904 req->dbt3.flags = DB_DBT_MALLOC; 2030 req->dbt3.flags = DB_DBT_MALLOC;
1905 2031
1906 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2032 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1907 REQ_SEND; 2033 REQ_SEND;
2034 }
1908} 2035}
1909 2036
1910void 2037void
1911db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 2038db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1912 PREINIT: 2039 PREINIT:
1913 CALLBACK 2040 CALLBACK
1914 CODE: 2041 CODE:
1915{ 2042{
2043 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
2044 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2045 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2046 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2047 "key",
2048 "BDB::db_c_pget");
2049
2050 {
1916 dREQ (REQ_C_PGET, 1); 2051 dREQ (REQ_C_PGET, 1);
1917 req->dbc = dbc; 2052 req->dbc = dbc;
1918 req->uint1 = flags; 2053 req->uint1 = flags;
1919 if ((flags & DB_SET) == DB_SET 2054 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1920 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1921 sv_to_dbt (&req->dbt1, key); 2055 sv_to_dbt (&req->dbt1, key);
1922 else 2056 else
2057 {
2058 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
2059 sv_to_dbt (&req->dbt1, key);
2060 else
2061 req->dbt1.flags = DB_DBT_MALLOC;
2062
2063 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
2064 }
2065
1923 req->dbt1.flags = DB_DBT_MALLOC; 2066 req->dbt2.flags = DB_DBT_MALLOC;
1924
1925 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1926
1927 req->dbt2.flags = DB_DBT_MALLOC;
1928 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2067 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1929 2068
1930 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 2069 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1931 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 2070 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1932 sv_to_dbt (&req->dbt3, data); 2071 sv_to_dbt (&req->dbt3, data);
1933 else 2072 else
1934 req->dbt3.flags = DB_DBT_MALLOC; 2073 req->dbt3.flags = DB_DBT_MALLOC;
1935 2074
1936 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2075 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1937 REQ_SEND; 2076 REQ_SEND;
2077 }
1938} 2078}
1939 2079
1940void 2080void
1941db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 2081db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1942 PREINIT: 2082 PREINIT:
1970db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2110db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1971 PREINIT: 2111 PREINIT:
1972 CALLBACK 2112 CALLBACK
1973 CODE: 2113 CODE:
1974{ 2114{
1975 dREQ (REQ_SEQ_CLOSE, 1); 2115 dREQ (REQ_SEQ_CLOSE, 0);
2116 ptr_nuke (ST (0));
1976 req->seq = seq; 2117 req->seq = seq;
1977 req->uint1 = flags; 2118 req->uint1 = flags;
1978 REQ_SEND; 2119 REQ_SEND;
1979 ptr_nuke (ST (0));
1980} 2120}
1981 2121
1982void 2122void
1983db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 2123db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV_mutable *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1984 PREINIT: 2124 PREINIT:
1985 CALLBACK 2125 CALLBACK
1986 CODE: 2126 CODE:
1987{ 2127{
1988 dREQ (REQ_SEQ_GET, 2); 2128 dREQ (REQ_SEQ_GET, 2);
2217 CODE: 2357 CODE:
2218 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2358 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2219 OUTPUT: 2359 OUTPUT:
2220 RETVAL 2360 RETVAL
2221 2361
2362int set_pagesize (DB *db, U32 pagesize)
2363 CODE:
2364 RETVAL = db->set_pagesize (db, pagesize);
2365 OUTPUT:
2366 RETVAL
2367
2222int set_flags (DB *db, U32 flags) 2368int set_flags (DB *db, U32 flags)
2223 CODE: 2369 CODE:
2224 RETVAL = db->set_flags (db, flags); 2370 RETVAL = db->set_flags (db, flags);
2225 OUTPUT: 2371 OUTPUT:
2226 RETVAL 2372 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines