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

Comparing BDB/BDB.xs (file contents):
Revision 1.30 by root, Sun Jan 13 09:43:21 2008 UTC vs.
Revision 1.41 by root, Wed Jul 9 12:15:36 2008 UTC

… …
47typedef DBC DBC_ornuked; 47typedef DBC DBC_ornuked;
48typedef DB DB_ornuked; 48typedef DB DB_ornuked;
49typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 49typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
50 50
51typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
52typedef char *octetstring; 52typedef char *bdb_filename;
53 53
54static SV *prepare_cb; 54static SV *prepare_cb;
55 55
56#if DB_VERSION_MINOR >= 6 56#if DB_VERSION_MINOR >= 6
57# define c_close close 57# define c_close close
… …
61# define c_get get 61# define c_get get
62# define c_pget pget 62# define c_pget pget
63# define c_put put 63# define c_put put
64#endif 64#endif
65 65
66static char *
67get_bdb_filename (SV *sv)
68{
69 if (!SvOK (sv))
70 return 0;
71
72#if _WIN32
73 /* win32 madness + win32 perl absolutely brokenness make for horrible hacks */
74 {
75 STRLEN len;
76 char *src = SvPVbyte (sv, len);
77 SV *t1 = sv_newmortal ();
78 SV *t2 = sv_newmortal ();
79
80 sv_upgrade (t1, SVt_PV); SvPOK_only (t1); SvGROW (t1, len * 16 + 1);
81 sv_upgrade (t2, SVt_PV); SvPOK_only (t2); SvGROW (t2, len * 16 + 1);
82
83 len = MultiByteToWideChar (CP_ACP, 0, src, len, (WCHAR *)SvPVX (t1), SvLEN (t1) / sizeof (WCHAR));
84 len = WideCharToMultiByte (CP_UTF8, 0, (WCHAR *)SvPVX (t1), len, SvPVX (t2), SvLEN (t2), 0, 0);
85 SvPOK_only (t2);
86 SvPVX (t2)[len] = 0;
87 SvCUR_set (t2, len);
88
89 return SvPVX (t2);
90 }
91#else
92 return SvPVbyte_nolen (sv);
93#endif
94}
95
66static void 96static void
67debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg) 97debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
68{ 98{
69 printf ("err[%s]\n", msg); 99 printf ("err[%s]\n", msg);
70} 100}
… …
107} 137}
108 138
109enum { 139enum {
110 REQ_QUIT, 140 REQ_QUIT,
111 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,
112 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 142 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
113 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,
114 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,
115 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 145 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
116 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,
117 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,
… …
129 DBC *dbc; 159 DBC *dbc;
130 160
131 UV uv1; 161 UV uv1;
132 int int1, int2; 162 int int1, int2;
133 U32 uint1, uint2; 163 U32 uint1, uint2;
134 char *buf1, *buf2; 164 char *buf1, *buf2, *buf3;
135 SV *sv1, *sv2, *sv3; 165 SV *sv1, *sv2, *sv3;
136 166
137 DBT dbt1, dbt2, dbt3; 167 DBT dbt1, dbt2, dbt3;
138 DB_KEY_RANGE key_range; 168 DB_KEY_RANGE key_range;
139 DB_SEQUENCE *seq; 169 DB_SEQUENCE *seq;
… …
151 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 181 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
152}; 182};
153 183
154#define AIO_TICKS ((1000000 + 1023) >> 10) 184#define AIO_TICKS ((1000000 + 1023) >> 10)
155 185
186static SV *on_next_submit;
187
156static unsigned int max_poll_time = 0; 188static unsigned int max_poll_time = 0;
157static unsigned int max_poll_reqs = 0; 189static unsigned int max_poll_reqs = 0;
158 190
159/* calculcate time difference in ~1/AIO_TICKS of a second */ 191/* calculcate time difference in ~1/AIO_TICKS of a second */
160static int tvdiff (struct timeval *tv1, struct timeval *tv2) 192static int tvdiff (struct timeval *tv1, struct timeval *tv2)
… …
205static mutex_t reqlock = X_MUTEX_INIT; 237static mutex_t reqlock = X_MUTEX_INIT;
206static cond_t reqwait = X_COND_INIT; 238static cond_t reqwait = X_COND_INIT;
207 239
208#if WORDACCESS_UNSAFE 240#if WORDACCESS_UNSAFE
209 241
210static unsigned int get_nready () 242static unsigned int get_nready (void)
211{ 243{
212 unsigned int retval; 244 unsigned int retval;
213 245
214 X_LOCK (reqlock); 246 X_LOCK (reqlock);
215 retval = nready; 247 retval = nready;
216 X_UNLOCK (reqlock); 248 X_UNLOCK (reqlock);
217 249
218 return retval; 250 return retval;
219} 251}
220 252
221static unsigned int get_npending () 253static unsigned int get_npending (void)
222{ 254{
223 unsigned int retval; 255 unsigned int retval;
224 256
225 X_LOCK (reslock); 257 X_LOCK (reslock);
226 retval = npending; 258 retval = npending;
227 X_UNLOCK (reslock); 259 X_UNLOCK (reslock);
228 260
229 return retval; 261 return retval;
230} 262}
231 263
232static unsigned int get_nthreads () 264static unsigned int get_nthreads (void)
233{ 265{
234 unsigned int retval; 266 unsigned int retval;
235 267
236 X_LOCK (wrklock); 268 X_LOCK (wrklock);
237 retval = started; 269 retval = started;
… …
300 } 332 }
301 333
302 abort (); 334 abort ();
303} 335}
304 336
305static int poll_cb (); 337static int poll_cb (void);
306static void req_free (bdb_req req); 338static void req_free (bdb_req req);
307static void req_cancel (bdb_req req); 339static void req_cancel (bdb_req req);
308 340
309static int req_invoke (bdb_req req) 341static int req_invoke (bdb_req req)
310{ 342{
311 dSP; 343 dSP;
312 344
313 if (SvOK (req->callback)) 345 if (req->callback)
314 { 346 {
315 ENTER; 347 ENTER;
316 SAVETMPS; 348 SAVETMPS;
317 PUSHMARK (SP); 349 PUSHMARK (SP);
318 350
… …
381 413
382static void req_free (bdb_req req) 414static void req_free (bdb_req req)
383{ 415{
384 free (req->buf1); 416 free (req->buf1);
385 free (req->buf2); 417 free (req->buf2);
418 free (req->buf3);
386 Safefree (req); 419 Safefree (req);
387} 420}
388 421
389#ifdef USE_SOCKETS_AS_HANDLES 422#ifdef USE_SOCKETS_AS_HANDLES
390# define TO_SOCKET(x) (win32_get_osfhandle (x)) 423# define TO_SOCKET(x) (win32_get_osfhandle (x))
391#else 424#else
392# define TO_SOCKET(x) (x) 425# define TO_SOCKET(x) (x)
393#endif 426#endif
394 427
395static void 428static void
396create_respipe () 429create_respipe (void)
397{ 430{
398#ifdef _WIN32 431#ifdef _WIN32
399 int arg; /* argg */ 432 int arg; /* argg */
400#endif 433#endif
401 int old_readfd = respipe [0]; 434 int old_readfd = respipe [0];
… …
455 free (wrk); 488 free (wrk);
456 489
457 X_UNLOCK (wrklock); 490 X_UNLOCK (wrklock);
458} 491}
459 492
460static void maybe_start_thread () 493static void maybe_start_thread (void)
461{ 494{
462 if (get_nthreads () >= wanted) 495 if (get_nthreads () >= wanted)
463 return; 496 return;
464 497
465 /* todo: maybe use idle here, but might be less exact */ 498 /* todo: maybe use idle here, but might be less exact */
… …
471 504
472static void req_send (bdb_req req) 505static void req_send (bdb_req req)
473{ 506{
474 SV *wait_callback = 0; 507 SV *wait_callback = 0;
475 508
509 if (on_next_submit)
510 {
511 dSP;
512 SV *cb = sv_2mortal (on_next_submit);
513
514 on_next_submit = 0;
515
516 PUSHMARK (SP);
517 PUTBACK;
518 call_sv (cb, G_DISCARD | G_EVAL);
519 }
520
476 // synthesize callback if none given 521 // synthesize callback if none given
477 if (!SvOK (req->callback)) 522 if (!req->callback)
478 { 523 {
479 int count; 524 int count;
480 525
481 dSP; 526 dSP;
482 PUSHMARK (SP); 527 PUSHMARK (SP);
… …
550 595
551 while (started > wanted) 596 while (started > wanted)
552 end_thread (); 597 end_thread ();
553} 598}
554 599
555static void poll_wait () 600static void poll_wait (void)
556{ 601{
557 fd_set rfd; 602 fd_set rfd;
558 603
559 while (nreqs) 604 while (nreqs)
560 { 605 {
… …
573 618
574 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 619 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
575 } 620 }
576} 621}
577 622
578static int poll_cb () 623static int poll_cb (void)
579{ 624{
580 dSP; 625 dSP;
581 int count = 0; 626 int count = 0;
582 int maxreqs = max_poll_reqs; 627 int maxreqs = max_poll_reqs;
583 int do_croak = 0; 628 int do_croak = 0;
… …
728 773
729 case REQ_ENV_MEMP_TRICKLE: 774 case REQ_ENV_MEMP_TRICKLE:
730 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);
731 break; 776 break;
732 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
733 case REQ_DB_OPEN: 786 case REQ_DB_OPEN:
734 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);
735 break; 788 break;
736 789
737 case REQ_DB_CLOSE: 790 case REQ_DB_CLOSE:
… …
914#define dREQ(reqtype) \ 967#define dREQ(reqtype) \
915 bdb_req req; \ 968 bdb_req req; \
916 int req_pri = next_pri; \ 969 int req_pri = next_pri; \
917 next_pri = DEFAULT_PRI + PRI_BIAS; \ 970 next_pri = DEFAULT_PRI + PRI_BIAS; \
918 \ 971 \
919 if (SvOK (callback) && !SvROK (callback)) \ 972 if (callback && SvOK (callback)) \
920 croak ("callback must be undef or of reference type"); \ 973 croak ("callback has illegal type or extra arguments"); \
921 \ 974 \
922 Newz (0, req, 1, bdb_cb); \ 975 Newz (0, req, 1, bdb_cb); \
923 if (!req) \ 976 if (!req) \
924 croak ("out of memory during bdb_req allocation"); \ 977 croak ("out of memory during bdb_req allocation"); \
925 \ 978 \
926 req->callback = newSVsv (callback); \ 979 req->callback = cb ? SvREFCNT_inc (cb) : 0; \
927 req->type = (reqtype); \ 980 req->type = (reqtype); \
928 req->pri = req_pri 981 req->pri = req_pri
929 982
930#define REQ_SEND \ 983#define REQ_SEND \
931 req_send (req) 984 req_send (req)
… …
953ptr_nuke (SV *sv) 1006ptr_nuke (SV *sv)
954{ 1007{
955 assert (SvROK (sv)); 1008 assert (SvROK (sv));
956 sv_setiv (SvRV (sv), 0); 1009 sv_setiv (SvRV (sv), 0);
957} 1010}
1011
1012static int
1013errno_get (pTHX_ SV *sv, MAGIC *mg)
1014{
1015 if (*mg->mg_ptr == '!') // should always be the case
1016 if (-30999 <= errno && errno <= -30800)
1017 {
1018 sv_setnv (sv, (NV)errno);
1019 sv_setpv (sv, db_strerror (errno));
1020 SvNOK_on (sv); /* what a wonderful hack! */
1021 // ^^^ copied from perl sources
1022 return 0;
1023 }
1024
1025 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
1026}
1027
1028static MGVTBL vtbl_errno;
1029
1030// this wonderful hack :( patches perl's $! variable to support our errno values
1031static void
1032patch_errno (void)
1033{
1034 SV *sv;
1035 MAGIC *mg;
1036
1037 if (!(sv = get_sv ("!", 1)))
1038 return;
1039
1040 if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
1041 return;
1042
1043 if (mg->mg_virtual != &PL_vtbl_sv)
1044 return;
1045
1046 vtbl_errno = PL_vtbl_sv;
1047 vtbl_errno.svt_get = errno_get;
1048 mg->mg_virtual = &vtbl_errno;
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));
958 1071
959MODULE = BDB PACKAGE = BDB 1072MODULE = BDB PACKAGE = BDB
960 1073
961PROTOTYPES: ENABLE 1074PROTOTYPES: ENABLE
962 1075
… …
988 const_iv (REGISTER) 1101 const_iv (REGISTER)
989 const_iv (SYSTEM_MEM) 1102 const_iv (SYSTEM_MEM)
990 const_iv (AUTO_COMMIT) 1103 const_iv (AUTO_COMMIT)
991 const_iv (CDB_ALLDB) 1104 const_iv (CDB_ALLDB)
992 const_iv (DIRECT_DB) 1105 const_iv (DIRECT_DB)
993 const_iv (DIRECT_LOG)
994 const_iv (DSYNC_DB) 1106 const_iv (DSYNC_DB)
995 const_iv (DSYNC_LOG)
996 const_iv (LOG_AUTOREMOVE)
997 const_iv (LOG_INMEMORY)
998 const_iv (NOLOCKING) 1107 const_iv (NOLOCKING)
999 const_iv (NOMMAP) 1108 const_iv (NOMMAP)
1000 const_iv (NOPANIC) 1109 const_iv (NOPANIC)
1001 const_iv (OVERWRITE) 1110 const_iv (OVERWRITE)
1002 const_iv (PANIC_ENVIRONMENT) 1111 const_iv (PANIC_ENVIRONMENT)
… …
1141 const_iv (PRIORITY_LOW) 1250 const_iv (PRIORITY_LOW)
1142 const_iv (PRIORITY_DEFAULT) 1251 const_iv (PRIORITY_DEFAULT)
1143 const_iv (PRIORITY_HIGH) 1252 const_iv (PRIORITY_HIGH)
1144 const_iv (PRIORITY_VERY_HIGH) 1253 const_iv (PRIORITY_VERY_HIGH)
1145#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
1146 }; 1267 };
1147 1268
1148 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; )
1149 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1270 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1150 1271
1151 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
1152 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1279 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1153 1280
1154 create_respipe (); 1281 create_respipe ();
1155 1282
1156 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1283 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1157#ifdef _WIN32 1284 patch_errno ();
1158 X_MUTEX_CHECK (wrklock);
1159 X_MUTEX_CHECK (reslock);
1160 X_MUTEX_CHECK (reqlock);
1161
1162 X_COND_CHECK (reqwait);
1163#endif
1164} 1285}
1165 1286
1166void 1287void
1167max_poll_reqs (int nreqs) 1288max_poll_reqs (int nreqs)
1168 PROTOTYPE: $ 1289 PROTOTYPE: $
… …
1308 CODE: 1429 CODE:
1309 RETVAL = db_strerror (errorno); 1430 RETVAL = db_strerror (errorno);
1310 OUTPUT: 1431 OUTPUT:
1311 RETVAL 1432 RETVAL
1312 1433
1434void _on_next_submit (SV *cb)
1435 CODE:
1436 SvREFCNT_dec (on_next_submit);
1437 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1438
1313DB_ENV * 1439DB_ENV *
1314db_env_create (U32 env_flags = 0) 1440db_env_create (U32 env_flags = 0)
1315 CODE: 1441 CODE:
1316{ 1442{
1317 errno = db_env_create (&RETVAL, env_flags); 1443 errno = db_env_create (&RETVAL, env_flags);
… …
1326} 1452}
1327 OUTPUT: 1453 OUTPUT:
1328 RETVAL 1454 RETVAL
1329 1455
1330void 1456void
1331db_env_open (DB_ENV *env, octetstring 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
1332 CODE: 1460 CODE:
1333{ 1461{
1334 dREQ (REQ_ENV_OPEN); 1462 dREQ (REQ_ENV_OPEN);
1335
1336 req->env = env; 1463 req->env = env;
1337 req->uint1 = open_flags | DB_THREAD; 1464 req->uint1 = open_flags | DB_THREAD;
1338 req->int1 = mode; 1465 req->int1 = mode;
1339 req->buf1 = strdup_ornull (db_home); 1466 req->buf1 = strdup_ornull (db_home);
1340 REQ_SEND; 1467 REQ_SEND;
1341} 1468}
1342 1469
1343void 1470void
1344db_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
1345 CODE: 1474 CODE:
1346{ 1475{
1347 dREQ (REQ_ENV_CLOSE); 1476 dREQ (REQ_ENV_CLOSE);
1348 req->env = env; 1477 req->env = env;
1349 req->uint1 = flags; 1478 req->uint1 = flags;
1350 REQ_SEND; 1479 REQ_SEND;
1351 ptr_nuke (ST (0)); 1480 ptr_nuke (ST (0));
1352} 1481}
1353 1482
1354void 1483void
1355db_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
1356 CODE: 1487 CODE:
1357{ 1488{
1358 dREQ (REQ_ENV_TXN_CHECKPOINT); 1489 dREQ (REQ_ENV_TXN_CHECKPOINT);
1359 req->env = env; 1490 req->env = env;
1360 req->uint1 = kbyte; 1491 req->uint1 = kbyte;
… …
1362 req->uint2 = flags; 1493 req->uint2 = flags;
1363 REQ_SEND; 1494 REQ_SEND;
1364} 1495}
1365 1496
1366void 1497void
1367db_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
1368 CODE: 1501 CODE:
1369{ 1502{
1370 dREQ (REQ_ENV_LOCK_DETECT); 1503 dREQ (REQ_ENV_LOCK_DETECT);
1371 req->env = env; 1504 req->env = env;
1372 req->uint1 = flags; 1505 req->uint1 = flags;
1373 req->uint2 = atype; 1506 req->uint2 = atype;
1507 /* req->int2 = 0; dummy */
1374 REQ_SEND; 1508 REQ_SEND;
1375} 1509}
1376 1510
1377void 1511void
1378db_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
1379 CODE: 1515 CODE:
1380{ 1516{
1381 dREQ (REQ_ENV_MEMP_SYNC); 1517 dREQ (REQ_ENV_MEMP_SYNC);
1382 req->env = env; 1518 req->env = env;
1383 REQ_SEND; 1519 REQ_SEND;
1384} 1520}
1385 1521
1386void 1522void
1387db_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
1388 CODE: 1526 CODE:
1389{ 1527{
1390 dREQ (REQ_ENV_MEMP_TRICKLE); 1528 dREQ (REQ_ENV_MEMP_TRICKLE);
1391 req->env = env; 1529 req->env = env;
1392 req->int1 = percent; 1530 req->int1 = percent;
1393 REQ_SEND; 1531 REQ_SEND;
1394} 1532}
1395 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}
1396 1562
1397DB * 1563DB *
1398db_create (DB_ENV *env = 0, U32 flags = 0) 1564db_create (DB_ENV *env = 0, U32 flags = 0)
1399 CODE: 1565 CODE:
1400{ 1566{
… …
1407} 1573}
1408 OUTPUT: 1574 OUTPUT:
1409 RETVAL 1575 RETVAL
1410 1576
1411void 1577void
1412db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring 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
1413 CODE: 1581 CODE:
1414{ 1582{
1415 dREQ (REQ_DB_OPEN); 1583 dREQ (REQ_DB_OPEN);
1416 req->db = db; 1584 req->db = db;
1417 req->txn = txnid; 1585 req->txn = txnid;
… …
1422 req->int2 = mode; 1590 req->int2 = mode;
1423 REQ_SEND; 1591 REQ_SEND;
1424} 1592}
1425 1593
1426void 1594void
1427db_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
1428 CODE: 1598 CODE:
1429{ 1599{
1430 dREQ (REQ_DB_CLOSE); 1600 dREQ (REQ_DB_CLOSE);
1431 req->db = db; 1601 req->db = db;
1432 req->uint1 = flags; 1602 req->uint1 = flags;
… …
1434 REQ_SEND; 1604 REQ_SEND;
1435 ptr_nuke (ST (0)); 1605 ptr_nuke (ST (0));
1436} 1606}
1437 1607
1438void 1608void
1439db_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
1440 CODE: 1612 CODE:
1441{ 1613{
1442 dREQ (REQ_DB_COMPACT); 1614 dREQ (REQ_DB_COMPACT);
1443 req->db = db; 1615 req->db = db;
1444 req->txn = txn; 1616 req->txn = txn;
… …
1447 req->uint1 = flags; 1619 req->uint1 = flags;
1448 REQ_SEND; 1620 REQ_SEND;
1449} 1621}
1450 1622
1451void 1623void
1452db_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
1453 CODE: 1627 CODE:
1454{ 1628{
1455 dREQ (REQ_DB_SYNC); 1629 dREQ (REQ_DB_SYNC);
1456 req->db = db; 1630 req->db = db;
1457 req->uint1 = flags; 1631 req->uint1 = flags;
1458 REQ_SEND; 1632 REQ_SEND;
1459} 1633}
1460 1634
1461void 1635void
1462db_upgrade (DB *db, octetstring 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
1463 CODE: 1639 CODE:
1464{ 1640{
1465 dREQ (REQ_DB_SYNC); 1641 dREQ (REQ_DB_SYNC);
1466 req->db = db; 1642 req->db = db;
1467 req->buf1 = strdup (file); 1643 req->buf1 = strdup (file);
1468 req->uint1 = flags; 1644 req->uint1 = flags;
1469 REQ_SEND; 1645 REQ_SEND;
1470} 1646}
1471 1647
1472void 1648void
1473db_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
1474 CODE: 1652 CODE:
1475{ 1653{
1476 dREQ (REQ_DB_KEY_RANGE); 1654 dREQ (REQ_DB_KEY_RANGE);
1477 req->db = db; 1655 req->db = db;
1478 req->txn = txn; 1656 req->txn = txn;
… …
1481 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1659 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
1482 REQ_SEND; 1660 REQ_SEND;
1483} 1661}
1484 1662
1485void 1663void
1486db_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
1487 CODE: 1667 CODE:
1488{ 1668{
1489 dREQ (REQ_DB_PUT); 1669 dREQ (REQ_DB_PUT);
1490 req->db = db; 1670 req->db = db;
1491 req->txn = txn; 1671 req->txn = txn;
… …
1494 req->uint1 = flags; 1674 req->uint1 = flags;
1495 REQ_SEND; 1675 REQ_SEND;
1496} 1676}
1497 1677
1498void 1678void
1499db_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
1500 CODE: 1682 CODE:
1501 if (SvREADONLY (data)) 1683 if (SvREADONLY (data))
1502 croak ("can't modify read-only data scalar in db_get"); 1684 croak ("can't modify read-only data scalar in db_get");
1503{ 1685{
1504 dREQ (REQ_DB_GET); 1686 dREQ (REQ_DB_GET);
… …
1510 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1692 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1511 REQ_SEND; 1693 REQ_SEND;
1512} 1694}
1513 1695
1514void 1696void
1515db_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
1516 CODE: 1700 CODE:
1517 if (SvREADONLY (data)) 1701 if (SvREADONLY (data))
1518 croak ("can't modify read-only data scalar in db_pget"); 1702 croak ("can't modify read-only data scalar in db_pget");
1519{ 1703{
1520 dREQ (REQ_DB_PGET); 1704 dREQ (REQ_DB_PGET);
… …
1527 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1711 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1528 REQ_SEND; 1712 REQ_SEND;
1529} 1713}
1530 1714
1531void 1715void
1532db_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
1533 CODE: 1719 CODE:
1534{ 1720{
1535 dREQ (REQ_DB_DEL); 1721 dREQ (REQ_DB_DEL);
1536 req->db = db; 1722 req->db = db;
1537 req->txn = txn; 1723 req->txn = txn;
… …
1539 sv_to_dbt (&req->dbt1, key); 1725 sv_to_dbt (&req->dbt1, key);
1540 REQ_SEND; 1726 REQ_SEND;
1541} 1727}
1542 1728
1543void 1729void
1544db_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
1545 CODE: 1733 CODE:
1546{ 1734{
1547 dREQ (REQ_TXN_COMMIT); 1735 dREQ (REQ_TXN_COMMIT);
1548 req->txn = txn; 1736 req->txn = txn;
1549 req->uint1 = flags; 1737 req->uint1 = flags;
1550 REQ_SEND; 1738 REQ_SEND;
1551 ptr_nuke (ST (0)); 1739 ptr_nuke (ST (0));
1552} 1740}
1553 1741
1554void 1742void
1555db_txn_abort (DB_TXN *txn, SV *callback = &PL_sv_undef) 1743db_txn_abort (DB_TXN *txn, SV *callback = 0)
1744 PREINIT:
1745 CALLBACK
1556 CODE: 1746 CODE:
1557{ 1747{
1558 dREQ (REQ_TXN_ABORT); 1748 dREQ (REQ_TXN_ABORT);
1559 req->txn = txn; 1749 req->txn = txn;
1560 REQ_SEND; 1750 REQ_SEND;
1561 ptr_nuke (ST (0)); 1751 ptr_nuke (ST (0));
1562} 1752}
1563 1753
1564void 1754void
1565db_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
1566 CODE: 1758 CODE:
1567{ 1759{
1568 dREQ (REQ_TXN_FINISH); 1760 dREQ (REQ_TXN_FINISH);
1569 req->txn = txn; 1761 req->txn = txn;
1570 req->uint1 = flags; 1762 req->uint1 = flags;
1571 REQ_SEND; 1763 REQ_SEND;
1572 ptr_nuke (ST (0)); 1764 ptr_nuke (ST (0));
1573} 1765}
1574 1766
1575void 1767void
1576db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1768db_c_close (DBC *dbc, SV *callback = 0)
1769 PREINIT:
1770 CALLBACK
1577 CODE: 1771 CODE:
1578{ 1772{
1579 dREQ (REQ_C_CLOSE); 1773 dREQ (REQ_C_CLOSE);
1580 req->dbc = dbc; 1774 req->dbc = dbc;
1581 REQ_SEND; 1775 REQ_SEND;
1582 ptr_nuke (ST (0)); 1776 ptr_nuke (ST (0));
1583} 1777}
1584 1778
1585void 1779void
1586db_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
1587 CODE: 1783 CODE:
1588{ 1784{
1589 dREQ (REQ_C_COUNT); 1785 dREQ (REQ_C_COUNT);
1590 req->dbc = dbc; 1786 req->dbc = dbc;
1591 req->sv1 = SvREFCNT_inc (count); 1787 req->sv1 = SvREFCNT_inc (count);
1592 REQ_SEND; 1788 REQ_SEND;
1593} 1789}
1594 1790
1595void 1791void
1596db_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
1597 CODE: 1795 CODE:
1598{ 1796{
1599 dREQ (REQ_C_PUT); 1797 dREQ (REQ_C_PUT);
1600 req->dbc = dbc; 1798 req->dbc = dbc;
1601 sv_to_dbt (&req->dbt1, key); 1799 sv_to_dbt (&req->dbt1, key);
… …
1603 req->uint1 = flags; 1801 req->uint1 = flags;
1604 REQ_SEND; 1802 REQ_SEND;
1605} 1803}
1606 1804
1607void 1805void
1608db_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
1609 CODE: 1809 CODE:
1610{ 1810{
1611 dREQ (REQ_C_GET); 1811 dREQ (REQ_C_GET);
1612 req->dbc = dbc; 1812 req->dbc = dbc;
1613 req->uint1 = flags; 1813 req->uint1 = flags;
… …
1628 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1828 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1629 REQ_SEND; 1829 REQ_SEND;
1630} 1830}
1631 1831
1632void 1832void
1633db_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
1634 CODE: 1836 CODE:
1635{ 1837{
1636 dREQ (REQ_C_PGET); 1838 dREQ (REQ_C_PGET);
1637 req->dbc = dbc; 1839 req->dbc = dbc;
1638 req->uint1 = flags; 1840 req->uint1 = flags;
… …
1656 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1858 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1657 REQ_SEND; 1859 REQ_SEND;
1658} 1860}
1659 1861
1660void 1862void
1661db_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
1662 CODE: 1866 CODE:
1663{ 1867{
1664 dREQ (REQ_C_DEL); 1868 dREQ (REQ_C_DEL);
1665 req->dbc = dbc; 1869 req->dbc = dbc;
1666 req->uint1 = flags; 1870 req->uint1 = flags;
1667 REQ_SEND; 1871 REQ_SEND;
1668} 1872}
1669 1873
1670 1874
1671void 1875void
1672db_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
1673 CODE: 1879 CODE:
1674{ 1880{
1675 dREQ (REQ_SEQ_OPEN); 1881 dREQ (REQ_SEQ_OPEN);
1676 req->seq = seq; 1882 req->seq = seq;
1677 req->txn = txnid; 1883 req->txn = txnid;
… …
1679 sv_to_dbt (&req->dbt1, key); 1885 sv_to_dbt (&req->dbt1, key);
1680 REQ_SEND; 1886 REQ_SEND;
1681} 1887}
1682 1888
1683void 1889void
1684db_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
1685 CODE: 1893 CODE:
1686{ 1894{
1687 dREQ (REQ_SEQ_CLOSE); 1895 dREQ (REQ_SEQ_CLOSE);
1688 req->seq = seq; 1896 req->seq = seq;
1689 req->uint1 = flags; 1897 req->uint1 = flags;
1690 REQ_SEND; 1898 REQ_SEND;
1691 ptr_nuke (ST (0)); 1899 ptr_nuke (ST (0));
1692} 1900}
1693 1901
1694void 1902void
1695db_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
1696 CODE: 1906 CODE:
1697{ 1907{
1698 dREQ (REQ_SEQ_GET); 1908 dREQ (REQ_SEQ_GET);
1699 req->seq = seq; 1909 req->seq = seq;
1700 req->txn = txnid; 1910 req->txn = txnid;
… …
1703 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1913 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
1704 REQ_SEND; 1914 REQ_SEND;
1705} 1915}
1706 1916
1707void 1917void
1708db_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
1709 CODE: 1921 CODE:
1710{ 1922{
1711 dREQ (REQ_SEQ_REMOVE); 1923 dREQ (REQ_SEQ_REMOVE);
1712 req->seq = seq; 1924 req->seq = seq;
1713 req->txn = txnid; 1925 req->txn = txnid;
… …
1757int set_flags (DB_ENV *env, U32 flags, int onoff = 1) 1969int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1758 CODE: 1970 CODE:
1759 RETVAL = env->set_flags (env, flags, onoff); 1971 RETVAL = env->set_flags (env, flags, onoff);
1760 OUTPUT: 1972 OUTPUT:
1761 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
1762 1991
1763void set_errfile (DB_ENV *env, FILE *errfile = 0) 1992void set_errfile (DB_ENV *env, FILE *errfile = 0)
1764 CODE: 1993 CODE:
1765 env->set_errfile (env, errfile); 1994 env->set_errfile (env, errfile);
1766 1995
… …
2045 CODE: 2274 CODE:
2046 RETVAL = seq->set_range (seq, min, max); 2275 RETVAL = seq->set_range (seq, min, max);
2047 OUTPUT: 2276 OUTPUT:
2048 RETVAL 2277 RETVAL
2049 2278
2279

Diff Legend

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