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

Comparing BDB/BDB.xs (file contents):
Revision 1.56 by root, Mon Sep 29 02:59:08 2008 UTC vs.
Revision 1.63 by root, Tue Oct 21 02:21:25 2008 UTC

… …
53#if DB_VERSION_MINOR >= 3 53#if DB_VERSION_MINOR >= 3
54typedef DB_SEQUENCE DB_SEQUENCE_ornull; 54typedef DB_SEQUENCE DB_SEQUENCE_ornull;
55typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 55typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
56#endif 56#endif
57 57
58typedef SV SV8; /* byte-sv, used for argument-checking */
59typedef char *bdb_filename; 58typedef char *bdb_filename;
60 59
61static SV *prepare_cb; 60static SV *prepare_cb;
62 61
63#if DB_VERSION_MINOR >= 6 62#if DB_VERSION_MINOR >= 6
… …
150 149
151enum { 150enum {
152 REQ_QUIT, 151 REQ_QUIT,
153 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,
154 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,
155 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,
156 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,
157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
158 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,
159 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,
… …
350 abort (); 350 abort ();
351} 351}
352 352
353static int poll_cb (void); 353static int poll_cb (void);
354static void req_free (bdb_req req); 354static void req_free (bdb_req req);
355static void req_cancel (bdb_req req);
356 355
357static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
358{ 357{
359 switch (req->type) 358 switch (req->type)
360 { 359 {
… …
379 378
380 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
381 av_push (av, newSVnv (req->key_range.equal)); 380 av_push (av, newSVnv (req->key_range.equal));
382 av_push (av, newSVnv (req->key_range.greater)); 381 av_push (av, newSVnv (req->key_range.greater));
383 382
383 av = (AV *)newRV_noinc ((SV *)av);
384
384 SvREADONLY_off (req->sv1); 385 SvREADONLY_off (req->sv1);
385 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 386 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
387 SvREFCNT_dec (av);
386 SvREFCNT_dec (req->sv1); 388 SvREFCNT_dec (req->sv1);
387 } 389 }
388 break; 390 break;
389 391
390#if DB_VERSION_MINOR >= 3 392#if DB_VERSION_MINOR >= 3
… …
397 sv_setnv_mg (req->sv1, (NV)req->seq_t); 399 sv_setnv_mg (req->sv1, (NV)req->seq_t);
398 400
399 SvREFCNT_dec (req->sv1); 401 SvREFCNT_dec (req->sv1);
400 break; 402 break;
401#endif 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;
402 } 422 }
403 423
404 errno = req->result; 424 errno = req->result;
405 425
406 if (req->callback) 426 if (req->callback)
… …
770 req->result = req->db->close (req->db, req->uint1); 790 req->result = req->db->close (req->db, req->uint1);
771 break; 791 break;
772 792
773#if DB_VERSION_MINOR >= 4 793#if DB_VERSION_MINOR >= 4
774 case REQ_DB_COMPACT: 794 case REQ_DB_COMPACT:
775 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);
776 break; 796 break;
777#endif 797#endif
778 798
779 case REQ_DB_SYNC: 799 case REQ_DB_SYNC:
780 req->result = req->db->sync (req->db, req->uint1); 800 req->result = req->db->sync (req->db, req->uint1);
… …
871 891
872 case REQ_SEQ_REMOVE: 892 case REQ_SEQ_REMOVE:
873 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 893 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
874 break; 894 break;
875#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;
876 904
877 default: 905 default:
878 req->result = ENOSYS; 906 req->result = ENOSYS;
879 break; 907 break;
880 } 908 }
… …
1135 } 1163 }
1136 1164
1137 return 0; 1165 return 0;
1138} 1166}
1139 1167
1140/* stupid windoes defined CALLBACK as well */ 1168/* stupid windows defines CALLBACK as well */
1141#undef CALLBACK 1169#undef CALLBACK
1142#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1170#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1143 1171
1144MODULE = BDB PACKAGE = BDB 1172MODULE = BDB PACKAGE = BDB
1145 1173
… …
1198 const_iv (NOSYNC) 1226 const_iv (NOSYNC)
1199 const_iv (CHKSUM) 1227 const_iv (CHKSUM)
1200 const_iv (ENCRYPT) 1228 const_iv (ENCRYPT)
1201 const_iv (DUP) 1229 const_iv (DUP)
1202 const_iv (DUPSORT) 1230 const_iv (DUPSORT)
1203 const_iv (RECNUM) 1231 //const_iv (RECNUM)
1204 const_iv (RENUMBER) 1232 const_iv (RENUMBER)
1205 const_iv (REVSPLITOFF) 1233 const_iv (REVSPLITOFF)
1206 const_iv (CONSUME) 1234 const_iv (CONSUME)
1207 const_iv (CONSUME_WAIT) 1235 const_iv (CONSUME_WAIT)
1208 const_iv (GET_BOTH) 1236 const_iv (GET_BOTH)
… …
1280 const_iv (REP_UNAVAIL) 1308 const_iv (REP_UNAVAIL)
1281 const_iv (RUNRECOVERY) 1309 const_iv (RUNRECOVERY)
1282 const_iv (SECONDARY_BAD) 1310 const_iv (SECONDARY_BAD)
1283 const_iv (VERIFY_BAD) 1311 const_iv (VERIFY_BAD)
1284 1312
1313 const_iv (ARCH_ABS)
1314 const_iv (ARCH_DATA)
1315 const_iv (ARCH_LOG)
1316 const_iv (ARCH_REMOVE)
1317
1285 const_iv (VERB_DEADLOCK) 1318 const_iv (VERB_DEADLOCK)
1286 const_iv (VERB_RECOVERY) 1319 const_iv (VERB_RECOVERY)
1287 const_iv (VERB_REPLICATION) 1320 const_iv (VERB_REPLICATION)
1288 const_iv (VERB_WAITSFOR) 1321 const_iv (VERB_WAITSFOR)
1289 1322
… …
1322 const_iv (PRIORITY_VERY_LOW) 1355 const_iv (PRIORITY_VERY_LOW)
1323 const_iv (PRIORITY_LOW) 1356 const_iv (PRIORITY_LOW)
1324 const_iv (PRIORITY_DEFAULT) 1357 const_iv (PRIORITY_DEFAULT)
1325 const_iv (PRIORITY_HIGH) 1358 const_iv (PRIORITY_HIGH)
1326 const_iv (PRIORITY_VERY_HIGH) 1359 const_iv (PRIORITY_VERY_HIGH)
1360 const_iv (IGNORE_LEASE)
1327#endif 1361#endif
1328#if DB_VERSION_MINOR >= 7 1362#if DB_VERSION_MINOR >= 7
1363 //const_iv (MULTIPLE_KEY)
1329 const_iv (LOG_DIRECT) 1364 const_iv (LOG_DIRECT)
1330 const_iv (LOG_DSYNC) 1365 const_iv (LOG_DSYNC)
1331 const_iv (LOG_AUTO_REMOVE) 1366 const_iv (LOG_AUTO_REMOVE)
1332 const_iv (LOG_IN_MEMORY) 1367 const_iv (LOG_IN_MEMORY)
1333 const_iv (LOG_ZERO) 1368 const_iv (LOG_ZERO)
… …
1637 req->buf3 = strdup_ornull (newname); 1672 req->buf3 = strdup_ornull (newname);
1638 req->uint1 = flags; 1673 req->uint1 = flags;
1639 REQ_SEND; 1674 REQ_SEND;
1640} 1675}
1641 1676
1677void
1678db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1679 PREINIT:
1680 CALLBACK
1681 CODE:
1682{
1683 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1684 req->sv1 = SvREFCNT_inc (listp);
1685 req->env = env;
1686 req->uint1 = flags;
1687 REQ_SEND;
1688}
1689
1642DB * 1690DB *
1643db_create (DB_ENV *env = 0, U32 flags = 0) 1691db_create (DB_ENV *env = 0, U32 flags = 0)
1644 CODE: 1692 CODE:
1645{ 1693{
1646 errno = db_create (&RETVAL, env, flags); 1694 errno = db_create (&RETVAL, env, flags);
… …
1693 CODE: 1741 CODE:
1694{ 1742{
1695 dREQ (REQ_DB_COMPACT, 2); 1743 dREQ (REQ_DB_COMPACT, 2);
1696 req->db = db; 1744 req->db = db;
1697 req->txn = txn; 1745 req->txn = txn;
1698 sv_to_dbt (&req->dbt1, start); 1746 if (start) sv_to_dbt (&req->dbt1, start);
1699 sv_to_dbt (&req->dbt2, stop); 1747 if (stop ) sv_to_dbt (&req->dbt2, stop );
1700 req->uint1 = flags; 1748 req->uint1 = flags;
1701 REQ_SEND; 1749 REQ_SEND;
1702} 1750}
1703 1751
1704#endif 1752#endif
… …
1909db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1957db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1910 PREINIT: 1958 PREINIT:
1911 CALLBACK 1959 CALLBACK
1912 CODE: 1960 CODE:
1913{ 1961{
1914 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 1962 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1915 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 1963 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1964 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1965 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1966 "key",
1967 "BDB::db_c_get");
1916 1968
1969 {
1917 dREQ (REQ_C_GET, 1); 1970 dREQ (REQ_C_GET, 1);
1918 req->dbc = dbc; 1971 req->dbc = dbc;
1919 req->uint1 = flags; 1972 req->uint1 = flags;
1920 if (flags & DB_OPFLAGS_MASK == DB_SET) 1973 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1921 sv_to_dbt (&req->dbt1, key); 1974 sv_to_dbt (&req->dbt1, key);
1922 else 1975 else
1923 { 1976 {
1924 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 1977 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1925 sv_to_dbt (&req->dbt1, key); 1978 sv_to_dbt (&req->dbt1, key);
1926 else 1979 else
1927 req->dbt1.flags = DB_DBT_MALLOC; 1980 req->dbt1.flags = DB_DBT_MALLOC;
1928 1981
1929 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1982 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1930 } 1983 }
1931 1984
1932 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 1985 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1933 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 1986 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1934 sv_to_dbt (&req->dbt3, data); 1987 sv_to_dbt (&req->dbt3, data);
1935 else 1988 else
1936 req->dbt3.flags = DB_DBT_MALLOC; 1989 req->dbt3.flags = DB_DBT_MALLOC;
1937 1990
1938 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1991 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1939 REQ_SEND; 1992 REQ_SEND;
1993 }
1940} 1994}
1941 1995
1942void 1996void
1943db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1997db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1944 PREINIT: 1998 PREINIT:
1945 CALLBACK 1999 CALLBACK
1946 CODE: 2000 CODE:
1947{ 2001{
1948 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2002 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1949 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2003 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2004 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2005 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2006 "key",
2007 "BDB::db_c_pget");
1950 2008
2009 {
1951 dREQ (REQ_C_PGET, 1); 2010 dREQ (REQ_C_PGET, 1);
1952 req->dbc = dbc; 2011 req->dbc = dbc;
1953 req->uint1 = flags; 2012 req->uint1 = flags;
1954 if (flags & DB_OPFLAGS_MASK == DB_SET) 2013 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1955 sv_to_dbt (&req->dbt1, key); 2014 sv_to_dbt (&req->dbt1, key);
1956 else 2015 else
1957 { 2016 {
1958 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2017 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1959 sv_to_dbt (&req->dbt1, key); 2018 sv_to_dbt (&req->dbt1, key);
1960 else 2019 else
1961 req->dbt1.flags = DB_DBT_MALLOC; 2020 req->dbt1.flags = DB_DBT_MALLOC;
1962 2021
1963 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2022 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1964 } 2023 }
1965 2024
1966 req->dbt2.flags = DB_DBT_MALLOC; 2025 req->dbt2.flags = DB_DBT_MALLOC;
1967 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2026 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1968 2027
1969 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2028 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1970 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2029 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1971 sv_to_dbt (&req->dbt3, data); 2030 sv_to_dbt (&req->dbt3, data);
1972 else 2031 else
1973 req->dbt3.flags = DB_DBT_MALLOC; 2032 req->dbt3.flags = DB_DBT_MALLOC;
1974 2033
1975 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2034 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1976 REQ_SEND; 2035 REQ_SEND;
2036 }
1977} 2037}
1978 2038
1979void 2039void
1980db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 2040db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1981 PREINIT: 2041 PREINIT:
… …
2256 CODE: 2316 CODE:
2257 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2317 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2258 OUTPUT: 2318 OUTPUT:
2259 RETVAL 2319 RETVAL
2260 2320
2321int set_pagesize (DB *db, U32 pagesize)
2322 CODE:
2323 RETVAL = db->set_pagesize (db, pagesize);
2324 OUTPUT:
2325 RETVAL
2326
2261int set_flags (DB *db, U32 flags) 2327int set_flags (DB *db, U32 flags)
2262 CODE: 2328 CODE:
2263 RETVAL = db->set_flags (db, flags); 2329 RETVAL = db->set_flags (db, flags);
2264 OUTPUT: 2330 OUTPUT:
2265 RETVAL 2331 RETVAL

Diff Legend

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