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

Comparing BDB/BDB.xs (file contents):
Revision 1.37 by root, Sat May 10 20:23:06 2008 UTC vs.
Revision 1.41 by root, Wed Jul 9 12:15:36 2008 UTC

… …
137} 137}
138 138
139enum { 139enum {
140 REQ_QUIT, 140 REQ_QUIT,
141 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 141 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
143 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 143 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
144 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 144 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
145 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 145 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
146 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 146 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
147 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 147 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
… …
159 DBC *dbc; 159 DBC *dbc;
160 160
161 UV uv1; 161 UV uv1;
162 int int1, int2; 162 int int1, int2;
163 U32 uint1, uint2; 163 U32 uint1, uint2;
164 char *buf1, *buf2; 164 char *buf1, *buf2, *buf3;
165 SV *sv1, *sv2, *sv3; 165 SV *sv1, *sv2, *sv3;
166 166
167 DBT dbt1, dbt2, dbt3; 167 DBT dbt1, dbt2, dbt3;
168 DB_KEY_RANGE key_range; 168 DB_KEY_RANGE key_range;
169 DB_SEQUENCE *seq; 169 DB_SEQUENCE *seq;
… …
340 340
341static int req_invoke (bdb_req req) 341static int req_invoke (bdb_req req)
342{ 342{
343 dSP; 343 dSP;
344 344
345 if (SvOK (req->callback)) 345 if (req->callback)
346 { 346 {
347 ENTER; 347 ENTER;
348 SAVETMPS; 348 SAVETMPS;
349 PUSHMARK (SP); 349 PUSHMARK (SP);
350 350
… …
413 413
414static void req_free (bdb_req req) 414static void req_free (bdb_req req)
415{ 415{
416 free (req->buf1); 416 free (req->buf1);
417 free (req->buf2); 417 free (req->buf2);
418 free (req->buf3);
418 Safefree (req); 419 Safefree (req);
419} 420}
420 421
421#ifdef USE_SOCKETS_AS_HANDLES 422#ifdef USE_SOCKETS_AS_HANDLES
422# define TO_SOCKET(x) (win32_get_osfhandle (x)) 423# define TO_SOCKET(x) (win32_get_osfhandle (x))
… …
516 PUTBACK; 517 PUTBACK;
517 call_sv (cb, G_DISCARD | G_EVAL); 518 call_sv (cb, G_DISCARD | G_EVAL);
518 } 519 }
519 520
520 // synthesize callback if none given 521 // synthesize callback if none given
521 if (!SvOK (req->callback)) 522 if (!req->callback)
522 { 523 {
523 int count; 524 int count;
524 525
525 dSP; 526 dSP;
526 PUSHMARK (SP); 527 PUSHMARK (SP);
… …
772 773
773 case REQ_ENV_MEMP_TRICKLE: 774 case REQ_ENV_MEMP_TRICKLE:
774 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2); 775 req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
775 break; 776 break;
776 777
778 case REQ_ENV_DBREMOVE:
779 req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
780 break;
781
782 case REQ_ENV_DBRENAME:
783 req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
784 break;
785
777 case REQ_DB_OPEN: 786 case REQ_DB_OPEN:
778 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2); 787 req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
779 break; 788 break;
780 789
781 case REQ_DB_CLOSE: 790 case REQ_DB_CLOSE:
… …
958#define dREQ(reqtype) \ 967#define dREQ(reqtype) \
959 bdb_req req; \ 968 bdb_req req; \
960 int req_pri = next_pri; \ 969 int req_pri = next_pri; \
961 next_pri = DEFAULT_PRI + PRI_BIAS; \ 970 next_pri = DEFAULT_PRI + PRI_BIAS; \
962 \ 971 \
963 if (SvOK (callback) && !SvROK (callback)) \ 972 if (callback && SvOK (callback)) \
964 croak ("callback must be undef or of reference type"); \ 973 croak ("callback has illegal type or extra arguments"); \
965 \ 974 \
966 Newz (0, req, 1, bdb_cb); \ 975 Newz (0, req, 1, bdb_cb); \
967 if (!req) \ 976 if (!req) \
968 croak ("out of memory during bdb_req allocation"); \ 977 croak ("out of memory during bdb_req allocation"); \
969 \ 978 \
970 req->callback = newSVsv (callback); \ 979 req->callback = cb ? SvREFCNT_inc (cb) : 0; \
971 req->type = (reqtype); \ 980 req->type = (reqtype); \
972 req->pri = req_pri 981 req->pri = req_pri
973 982
974#define REQ_SEND \ 983#define REQ_SEND \
975 req_send (req) 984 req_send (req)
… …
1036 1045
1037 vtbl_errno = PL_vtbl_sv; 1046 vtbl_errno = PL_vtbl_sv;
1038 vtbl_errno.svt_get = errno_get; 1047 vtbl_errno.svt_get = errno_get;
1039 mg->mg_virtual = &vtbl_errno; 1048 mg->mg_virtual = &vtbl_errno;
1040} 1049}
1050
1051static SV *
1052pop_callback (I32 *ritems, SV *sv)
1053{
1054 if (SvROK (sv))
1055 {
1056 HV *st;
1057 GV *gvp;
1058 CV *cv = sv_2cv (sv, &st, &gvp, 0);
1059
1060 if (cv)
1061 {
1062 --*ritems;
1063 return (SV *)cv;
1064 }
1065 }
1066
1067 return 0;
1068}
1069
1070#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1041 1071
1042MODULE = BDB PACKAGE = BDB 1072MODULE = BDB PACKAGE = BDB
1043 1073
1044PROTOTYPES: ENABLE 1074PROTOTYPES: ENABLE
1045 1075
… …
1071 const_iv (REGISTER) 1101 const_iv (REGISTER)
1072 const_iv (SYSTEM_MEM) 1102 const_iv (SYSTEM_MEM)
1073 const_iv (AUTO_COMMIT) 1103 const_iv (AUTO_COMMIT)
1074 const_iv (CDB_ALLDB) 1104 const_iv (CDB_ALLDB)
1075 const_iv (DIRECT_DB) 1105 const_iv (DIRECT_DB)
1076 const_iv (DIRECT_LOG)
1077 const_iv (DSYNC_DB) 1106 const_iv (DSYNC_DB)
1078 const_iv (DSYNC_LOG)
1079 const_iv (LOG_AUTOREMOVE)
1080 const_iv (LOG_INMEMORY)
1081 const_iv (NOLOCKING) 1107 const_iv (NOLOCKING)
1082 const_iv (NOMMAP) 1108 const_iv (NOMMAP)
1083 const_iv (NOPANIC) 1109 const_iv (NOPANIC)
1084 const_iv (OVERWRITE) 1110 const_iv (OVERWRITE)
1085 const_iv (PANIC_ENVIRONMENT) 1111 const_iv (PANIC_ENVIRONMENT)
… …
1224 const_iv (PRIORITY_LOW) 1250 const_iv (PRIORITY_LOW)
1225 const_iv (PRIORITY_DEFAULT) 1251 const_iv (PRIORITY_DEFAULT)
1226 const_iv (PRIORITY_HIGH) 1252 const_iv (PRIORITY_HIGH)
1227 const_iv (PRIORITY_VERY_HIGH) 1253 const_iv (PRIORITY_VERY_HIGH)
1228#endif 1254#endif
1255#if DB_VERSION_MINOR >= 7
1256 const_iv (LOG_DIRECT)
1257 const_iv (LOG_DSYNC)
1258 const_iv (LOG_AUTO_REMOVE)
1259 const_iv (LOG_IN_MEMORY)
1260 const_iv (LOG_ZERO)
1261#else
1262 const_iv (DIRECT_LOG)
1263 const_iv (DSYNC_LOG)
1264 const_iv (LOG_AUTOREMOVE)
1265 const_iv (LOG_INMEMORY)
1266#endif
1229 }; 1267 };
1230 1268
1231 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1269 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1232 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1270 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1233 1271
1234 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1272 {
1273 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1274 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1275
1276 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1277 }
1278
1235 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1279 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1236 1280
1237 create_respipe (); 1281 create_respipe ();
1238 1282
1239 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1283 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1240#ifdef _WIN32
1241 X_MUTEX_CHECK (wrklock);
1242 X_MUTEX_CHECK (reslock);
1243 X_MUTEX_CHECK (reqlock);
1244
1245 X_COND_CHECK (reqwait);
1246#endif
1247 patch_errno (); 1284 patch_errno ();
1248} 1285}
1249 1286
1250void 1287void
1251max_poll_reqs (int nreqs) 1288max_poll_reqs (int nreqs)
… …
1415} 1452}
1416 OUTPUT: 1453 OUTPUT:
1417 RETVAL 1454 RETVAL
1418 1455
1419void 1456void
1420db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1457db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
1458 PREINIT:
1459 CALLBACK
1421 CODE: 1460 CODE:
1422{ 1461{
1423 dREQ (REQ_ENV_OPEN); 1462 dREQ (REQ_ENV_OPEN);
1424
1425 req->env = env; 1463 req->env = env;
1426 req->uint1 = open_flags | DB_THREAD; 1464 req->uint1 = open_flags | DB_THREAD;
1427 req->int1 = mode; 1465 req->int1 = mode;
1428 req->buf1 = strdup_ornull (db_home); 1466 req->buf1 = strdup_ornull (db_home);
1429 REQ_SEND; 1467 REQ_SEND;
1430} 1468}
1431 1469
1432void 1470void
1433db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = &PL_sv_undef) 1471db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1472 PREINIT:
1473 CALLBACK
1434 CODE: 1474 CODE:
1435{ 1475{
1436 dREQ (REQ_ENV_CLOSE); 1476 dREQ (REQ_ENV_CLOSE);
1437 req->env = env; 1477 req->env = env;
1438 req->uint1 = flags; 1478 req->uint1 = flags;
1439 REQ_SEND; 1479 REQ_SEND;
1440 ptr_nuke (ST (0)); 1480 ptr_nuke (ST (0));
1441} 1481}
1442 1482
1443void 1483void
1444db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = &PL_sv_undef) 1484db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1485 PREINIT:
1486 CALLBACK
1445 CODE: 1487 CODE:
1446{ 1488{
1447 dREQ (REQ_ENV_TXN_CHECKPOINT); 1489 dREQ (REQ_ENV_TXN_CHECKPOINT);
1448 req->env = env; 1490 req->env = env;
1449 req->uint1 = kbyte; 1491 req->uint1 = kbyte;
… …
1451 req->uint2 = flags; 1493 req->uint2 = flags;
1452 REQ_SEND; 1494 REQ_SEND;
1453} 1495}
1454 1496
1455void 1497void
1456db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = &PL_sv_undef) 1498db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0)
1499 PREINIT:
1500 CALLBACK
1457 CODE: 1501 CODE:
1458{ 1502{
1459 dREQ (REQ_ENV_LOCK_DETECT); 1503 dREQ (REQ_ENV_LOCK_DETECT);
1460 req->env = env; 1504 req->env = env;
1461 req->uint1 = flags; 1505 req->uint1 = flags;
1462 req->uint2 = atype; 1506 req->uint2 = atype;
1507 /* req->int2 = 0; dummy */
1463 REQ_SEND; 1508 REQ_SEND;
1464} 1509}
1465 1510
1466void 1511void
1467db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = &PL_sv_undef) 1512db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0)
1513 PREINIT:
1514 CALLBACK
1468 CODE: 1515 CODE:
1469{ 1516{
1470 dREQ (REQ_ENV_MEMP_SYNC); 1517 dREQ (REQ_ENV_MEMP_SYNC);
1471 req->env = env; 1518 req->env = env;
1472 REQ_SEND; 1519 REQ_SEND;
1473} 1520}
1474 1521
1475void 1522void
1476db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = &PL_sv_undef) 1523db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0)
1524 PREINIT:
1525 CALLBACK
1477 CODE: 1526 CODE:
1478{ 1527{
1479 dREQ (REQ_ENV_MEMP_TRICKLE); 1528 dREQ (REQ_ENV_MEMP_TRICKLE);
1480 req->env = env; 1529 req->env = env;
1481 req->int1 = percent; 1530 req->int1 = percent;
1482 REQ_SEND; 1531 REQ_SEND;
1483} 1532}
1484 1533
1534void
1535db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0)
1536 PREINIT:
1537 CALLBACK
1538 CODE:
1539{
1540 dREQ (REQ_ENV_DBREMOVE);
1541 req->env = env;
1542 req->buf1 = strdup_ornull (file);
1543 req->buf2 = strdup_ornull (database);
1544 req->uint1 = flags;
1545 REQ_SEND;
1546}
1547
1548void
1549db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = 0)
1550 PREINIT:
1551 CALLBACK
1552 CODE:
1553{
1554 dREQ (REQ_ENV_DBRENAME);
1555 req->env = env;
1556 req->buf1 = strdup_ornull (file);
1557 req->buf2 = strdup_ornull (database);
1558 req->buf3 = strdup_ornull (newname);
1559 req->uint1 = flags;
1560 REQ_SEND;
1561}
1485 1562
1486DB * 1563DB *
1487db_create (DB_ENV *env = 0, U32 flags = 0) 1564db_create (DB_ENV *env = 0, U32 flags = 0)
1488 CODE: 1565 CODE:
1489{ 1566{
… …
1496} 1573}
1497 OUTPUT: 1574 OUTPUT:
1498 RETVAL 1575 RETVAL
1499 1576
1500void 1577void
1501db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef) 1578db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
1579 PREINIT:
1580 CALLBACK
1502 CODE: 1581 CODE:
1503{ 1582{
1504 dREQ (REQ_DB_OPEN); 1583 dREQ (REQ_DB_OPEN);
1505 req->db = db; 1584 req->db = db;
1506 req->txn = txnid; 1585 req->txn = txnid;
… …
1511 req->int2 = mode; 1590 req->int2 = mode;
1512 REQ_SEND; 1591 REQ_SEND;
1513} 1592}
1514 1593
1515void 1594void
1516db_close (DB *db, U32 flags = 0, SV *callback = &PL_sv_undef) 1595db_close (DB *db, U32 flags = 0, SV *callback = 0)
1596 PREINIT:
1597 CALLBACK
1517 CODE: 1598 CODE:
1518{ 1599{
1519 dREQ (REQ_DB_CLOSE); 1600 dREQ (REQ_DB_CLOSE);
1520 req->db = db; 1601 req->db = db;
1521 req->uint1 = flags; 1602 req->uint1 = flags;
… …
1523 REQ_SEND; 1604 REQ_SEND;
1524 ptr_nuke (ST (0)); 1605 ptr_nuke (ST (0));
1525} 1606}
1526 1607
1527void 1608void
1528db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = &PL_sv_undef) 1609db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = 0)
1610 PREINIT:
1611 CALLBACK
1529 CODE: 1612 CODE:
1530{ 1613{
1531 dREQ (REQ_DB_COMPACT); 1614 dREQ (REQ_DB_COMPACT);
1532 req->db = db; 1615 req->db = db;
1533 req->txn = txn; 1616 req->txn = txn;
… …
1536 req->uint1 = flags; 1619 req->uint1 = flags;
1537 REQ_SEND; 1620 REQ_SEND;
1538} 1621}
1539 1622
1540void 1623void
1541db_sync (DB *db, U32 flags = 0, SV *callback = &PL_sv_undef) 1624db_sync (DB *db, U32 flags = 0, SV *callback = 0)
1625 PREINIT:
1626 CALLBACK
1542 CODE: 1627 CODE:
1543{ 1628{
1544 dREQ (REQ_DB_SYNC); 1629 dREQ (REQ_DB_SYNC);
1545 req->db = db; 1630 req->db = db;
1546 req->uint1 = flags; 1631 req->uint1 = flags;
1547 REQ_SEND; 1632 REQ_SEND;
1548} 1633}
1549 1634
1550void 1635void
1551db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef) 1636db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1637 PREINIT:
1638 CALLBACK
1552 CODE: 1639 CODE:
1553{ 1640{
1554 dREQ (REQ_DB_SYNC); 1641 dREQ (REQ_DB_SYNC);
1555 req->db = db; 1642 req->db = db;
1556 req->buf1 = strdup (file); 1643 req->buf1 = strdup (file);
1557 req->uint1 = flags; 1644 req->uint1 = flags;
1558 REQ_SEND; 1645 REQ_SEND;
1559} 1646}
1560 1647
1561void 1648void
1562db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1649db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0)
1650 PREINIT:
1651 CALLBACK
1563 CODE: 1652 CODE:
1564{ 1653{
1565 dREQ (REQ_DB_KEY_RANGE); 1654 dREQ (REQ_DB_KEY_RANGE);
1566 req->db = db; 1655 req->db = db;
1567 req->txn = txn; 1656 req->txn = txn;
… …
1570 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1659 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
1571 REQ_SEND; 1660 REQ_SEND;
1572} 1661}
1573 1662
1574void 1663void
1575db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1664db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1665 PREINIT:
1666 CALLBACK
1576 CODE: 1667 CODE:
1577{ 1668{
1578 dREQ (REQ_DB_PUT); 1669 dREQ (REQ_DB_PUT);
1579 req->db = db; 1670 req->db = db;
1580 req->txn = txn; 1671 req->txn = txn;
… …
1583 req->uint1 = flags; 1674 req->uint1 = flags;
1584 REQ_SEND; 1675 REQ_SEND;
1585} 1676}
1586 1677
1587void 1678void
1588db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1679db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1680 PREINIT:
1681 CALLBACK
1589 CODE: 1682 CODE:
1590 if (SvREADONLY (data)) 1683 if (SvREADONLY (data))
1591 croak ("can't modify read-only data scalar in db_get"); 1684 croak ("can't modify read-only data scalar in db_get");
1592{ 1685{
1593 dREQ (REQ_DB_GET); 1686 dREQ (REQ_DB_GET);
… …
1599 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1692 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1600 REQ_SEND; 1693 REQ_SEND;
1601} 1694}
1602 1695
1603void 1696void
1604db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1697db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
1698 PREINIT:
1699 CALLBACK
1605 CODE: 1700 CODE:
1606 if (SvREADONLY (data)) 1701 if (SvREADONLY (data))
1607 croak ("can't modify read-only data scalar in db_pget"); 1702 croak ("can't modify read-only data scalar in db_pget");
1608{ 1703{
1609 dREQ (REQ_DB_PGET); 1704 dREQ (REQ_DB_PGET);
… …
1616 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1711 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1617 REQ_SEND; 1712 REQ_SEND;
1618} 1713}
1619 1714
1620void 1715void
1621db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = &PL_sv_undef) 1716db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
1717 PREINIT:
1718 CALLBACK
1622 CODE: 1719 CODE:
1623{ 1720{
1624 dREQ (REQ_DB_DEL); 1721 dREQ (REQ_DB_DEL);
1625 req->db = db; 1722 req->db = db;
1626 req->txn = txn; 1723 req->txn = txn;
… …
1628 sv_to_dbt (&req->dbt1, key); 1725 sv_to_dbt (&req->dbt1, key);
1629 REQ_SEND; 1726 REQ_SEND;
1630} 1727}
1631 1728
1632void 1729void
1633db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef) 1730db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1731 PREINIT:
1732 CALLBACK
1634 CODE: 1733 CODE:
1635{ 1734{
1636 dREQ (REQ_TXN_COMMIT); 1735 dREQ (REQ_TXN_COMMIT);
1637 req->txn = txn; 1736 req->txn = txn;
1638 req->uint1 = flags; 1737 req->uint1 = flags;
1639 REQ_SEND; 1738 REQ_SEND;
1640 ptr_nuke (ST (0)); 1739 ptr_nuke (ST (0));
1641} 1740}
1642 1741
1643void 1742void
1644db_txn_abort (DB_TXN *txn, SV *callback = &PL_sv_undef) 1743db_txn_abort (DB_TXN *txn, SV *callback = 0)
1744 PREINIT:
1745 CALLBACK
1645 CODE: 1746 CODE:
1646{ 1747{
1647 dREQ (REQ_TXN_ABORT); 1748 dREQ (REQ_TXN_ABORT);
1648 req->txn = txn; 1749 req->txn = txn;
1649 REQ_SEND; 1750 REQ_SEND;
1650 ptr_nuke (ST (0)); 1751 ptr_nuke (ST (0));
1651} 1752}
1652 1753
1653void 1754void
1654db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef) 1755db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1756 PREINIT:
1757 CALLBACK
1655 CODE: 1758 CODE:
1656{ 1759{
1657 dREQ (REQ_TXN_FINISH); 1760 dREQ (REQ_TXN_FINISH);
1658 req->txn = txn; 1761 req->txn = txn;
1659 req->uint1 = flags; 1762 req->uint1 = flags;
1660 REQ_SEND; 1763 REQ_SEND;
1661 ptr_nuke (ST (0)); 1764 ptr_nuke (ST (0));
1662} 1765}
1663 1766
1664void 1767void
1665db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1768db_c_close (DBC *dbc, SV *callback = 0)
1769 PREINIT:
1770 CALLBACK
1666 CODE: 1771 CODE:
1667{ 1772{
1668 dREQ (REQ_C_CLOSE); 1773 dREQ (REQ_C_CLOSE);
1669 req->dbc = dbc; 1774 req->dbc = dbc;
1670 REQ_SEND; 1775 REQ_SEND;
1671 ptr_nuke (ST (0)); 1776 ptr_nuke (ST (0));
1672} 1777}
1673 1778
1674void 1779void
1675db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = &PL_sv_undef) 1780db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1781 PREINIT:
1782 CALLBACK
1676 CODE: 1783 CODE:
1677{ 1784{
1678 dREQ (REQ_C_COUNT); 1785 dREQ (REQ_C_COUNT);
1679 req->dbc = dbc; 1786 req->dbc = dbc;
1680 req->sv1 = SvREFCNT_inc (count); 1787 req->sv1 = SvREFCNT_inc (count);
1681 REQ_SEND; 1788 REQ_SEND;
1682} 1789}
1683 1790
1684void 1791void
1685db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1792db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1793 PREINIT:
1794 CALLBACK
1686 CODE: 1795 CODE:
1687{ 1796{
1688 dREQ (REQ_C_PUT); 1797 dREQ (REQ_C_PUT);
1689 req->dbc = dbc; 1798 req->dbc = dbc;
1690 sv_to_dbt (&req->dbt1, key); 1799 sv_to_dbt (&req->dbt1, key);
… …
1692 req->uint1 = flags; 1801 req->uint1 = flags;
1693 REQ_SEND; 1802 REQ_SEND;
1694} 1803}
1695 1804
1696void 1805void
1697db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1806db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
1807 PREINIT:
1808 CALLBACK
1698 CODE: 1809 CODE:
1699{ 1810{
1700 dREQ (REQ_C_GET); 1811 dREQ (REQ_C_GET);
1701 req->dbc = dbc; 1812 req->dbc = dbc;
1702 req->uint1 = flags; 1813 req->uint1 = flags;
… …
1717 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1828 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1718 REQ_SEND; 1829 REQ_SEND;
1719} 1830}
1720 1831
1721void 1832void
1722db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1833db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
1834 PREINIT:
1835 CALLBACK
1723 CODE: 1836 CODE:
1724{ 1837{
1725 dREQ (REQ_C_PGET); 1838 dREQ (REQ_C_PGET);
1726 req->dbc = dbc; 1839 req->dbc = dbc;
1727 req->uint1 = flags; 1840 req->uint1 = flags;
… …
1745 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1858 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1746 REQ_SEND; 1859 REQ_SEND;
1747} 1860}
1748 1861
1749void 1862void
1750db_c_del (DBC *dbc, U32 flags = 0, SV *callback = &PL_sv_undef) 1863db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1864 PREINIT:
1865 CALLBACK
1751 CODE: 1866 CODE:
1752{ 1867{
1753 dREQ (REQ_C_DEL); 1868 dREQ (REQ_C_DEL);
1754 req->dbc = dbc; 1869 req->dbc = dbc;
1755 req->uint1 = flags; 1870 req->uint1 = flags;
1756 REQ_SEND; 1871 REQ_SEND;
1757} 1872}
1758 1873
1759 1874
1760void 1875void
1761db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = &PL_sv_undef) 1876db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0)
1877 PREINIT:
1878 CALLBACK
1762 CODE: 1879 CODE:
1763{ 1880{
1764 dREQ (REQ_SEQ_OPEN); 1881 dREQ (REQ_SEQ_OPEN);
1765 req->seq = seq; 1882 req->seq = seq;
1766 req->txn = txnid; 1883 req->txn = txnid;
… …
1768 sv_to_dbt (&req->dbt1, key); 1885 sv_to_dbt (&req->dbt1, key);
1769 REQ_SEND; 1886 REQ_SEND;
1770} 1887}
1771 1888
1772void 1889void
1773db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = &PL_sv_undef) 1890db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1891 PREINIT:
1892 CALLBACK
1774 CODE: 1893 CODE:
1775{ 1894{
1776 dREQ (REQ_SEQ_CLOSE); 1895 dREQ (REQ_SEQ_CLOSE);
1777 req->seq = seq; 1896 req->seq = seq;
1778 req->uint1 = flags; 1897 req->uint1 = flags;
1779 REQ_SEND; 1898 REQ_SEND;
1780 ptr_nuke (ST (0)); 1899 ptr_nuke (ST (0));
1781} 1900}
1782 1901
1783void 1902void
1784db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = &PL_sv_undef) 1903db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1904 PREINIT:
1905 CALLBACK
1785 CODE: 1906 CODE:
1786{ 1907{
1787 dREQ (REQ_SEQ_GET); 1908 dREQ (REQ_SEQ_GET);
1788 req->seq = seq; 1909 req->seq = seq;
1789 req->txn = txnid; 1910 req->txn = txnid;
… …
1792 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1913 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
1793 REQ_SEND; 1914 REQ_SEND;
1794} 1915}
1795 1916
1796void 1917void
1797db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = &PL_sv_undef) 1918db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
1919 PREINIT:
1920 CALLBACK
1798 CODE: 1921 CODE:
1799{ 1922{
1800 dREQ (REQ_SEQ_REMOVE); 1923 dREQ (REQ_SEQ_REMOVE);
1801 req->seq = seq; 1924 req->seq = seq;
1802 req->txn = txnid; 1925 req->txn = txnid;
… …
1846int set_flags (DB_ENV *env, U32 flags, int onoff = 1) 1969int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1847 CODE: 1970 CODE:
1848 RETVAL = env->set_flags (env, flags, onoff); 1971 RETVAL = env->set_flags (env, flags, onoff);
1849 OUTPUT: 1972 OUTPUT:
1850 RETVAL 1973 RETVAL
1974
1975#if DB_VERSION_MINOR >= 7
1976
1977int set_intermediate_dir_mode (DB_ENV *env, const char *mode)
1978 CODE:
1979 RETVAL = env->set_intermediate_dir_mode (env, mode);
1980 OUTPUT:
1981 RETVAL
1982
1983int log_set_config (DB_ENV *env, U32 flags, int onoff = 1)
1984 CODE:
1985 RETVAL = env->log_set_config (env, flags, onoff);
1986 OUTPUT:
1987 RETVAL
1988
1989#endif
1990
1851 1991
1852void set_errfile (DB_ENV *env, FILE *errfile = 0) 1992void set_errfile (DB_ENV *env, FILE *errfile = 0)
1853 CODE: 1993 CODE:
1854 env->set_errfile (env, errfile); 1994 env->set_errfile (env, errfile);
1855 1995

Diff Legend

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