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

Comparing BDB/BDB.xs (file contents):
Revision 1.31 by root, Sun Mar 30 04:34:20 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)
… …
960errno_get (pTHX_ SV *sv, MAGIC *mg) 1013errno_get (pTHX_ SV *sv, MAGIC *mg)
961{ 1014{
962 if (*mg->mg_ptr == '!') // should always be the case 1015 if (*mg->mg_ptr == '!') // should always be the case
963 if (-30999 <= errno && errno <= -30800) 1016 if (-30999 <= errno && errno <= -30800)
964 { 1017 {
1018 sv_setnv (sv, (NV)errno);
965 sv_setpv (sv, db_strerror (errno)); 1019 sv_setpv (sv, db_strerror (errno));
1020 SvNOK_on (sv); /* what a wonderful hack! */
1021 // ^^^ copied from perl sources
966 return 0; 1022 return 0;
967 } 1023 }
968 1024
969 return PL_vtbl_sv.svt_get (aTHX_ sv, mg); 1025 return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
970} 1026}
… …
989 1045
990 vtbl_errno = PL_vtbl_sv; 1046 vtbl_errno = PL_vtbl_sv;
991 vtbl_errno.svt_get = errno_get; 1047 vtbl_errno.svt_get = errno_get;
992 mg->mg_virtual = &vtbl_errno; 1048 mg->mg_virtual = &vtbl_errno;
993} 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));
994 1071
995MODULE = BDB PACKAGE = BDB 1072MODULE = BDB PACKAGE = BDB
996 1073
997PROTOTYPES: ENABLE 1074PROTOTYPES: ENABLE
998 1075
… …
1024 const_iv (REGISTER) 1101 const_iv (REGISTER)
1025 const_iv (SYSTEM_MEM) 1102 const_iv (SYSTEM_MEM)
1026 const_iv (AUTO_COMMIT) 1103 const_iv (AUTO_COMMIT)
1027 const_iv (CDB_ALLDB) 1104 const_iv (CDB_ALLDB)
1028 const_iv (DIRECT_DB) 1105 const_iv (DIRECT_DB)
1029 const_iv (DIRECT_LOG)
1030 const_iv (DSYNC_DB) 1106 const_iv (DSYNC_DB)
1031 const_iv (DSYNC_LOG)
1032 const_iv (LOG_AUTOREMOVE)
1033 const_iv (LOG_INMEMORY)
1034 const_iv (NOLOCKING) 1107 const_iv (NOLOCKING)
1035 const_iv (NOMMAP) 1108 const_iv (NOMMAP)
1036 const_iv (NOPANIC) 1109 const_iv (NOPANIC)
1037 const_iv (OVERWRITE) 1110 const_iv (OVERWRITE)
1038 const_iv (PANIC_ENVIRONMENT) 1111 const_iv (PANIC_ENVIRONMENT)
… …
1177 const_iv (PRIORITY_LOW) 1250 const_iv (PRIORITY_LOW)
1178 const_iv (PRIORITY_DEFAULT) 1251 const_iv (PRIORITY_DEFAULT)
1179 const_iv (PRIORITY_HIGH) 1252 const_iv (PRIORITY_HIGH)
1180 const_iv (PRIORITY_VERY_HIGH) 1253 const_iv (PRIORITY_VERY_HIGH)
1181#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
1182 }; 1267 };
1183 1268
1184 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; )
1185 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1270 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1186 1271
1187 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
1188 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1279 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1189 1280
1190 create_respipe (); 1281 create_respipe ();
1191 1282
1192 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1283 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1193#ifdef _WIN32
1194 X_MUTEX_CHECK (wrklock);
1195 X_MUTEX_CHECK (reslock);
1196 X_MUTEX_CHECK (reqlock);
1197
1198 X_COND_CHECK (reqwait);
1199#endif
1200 patch_errno (); 1284 patch_errno ();
1201} 1285}
1202 1286
1203void 1287void
1204max_poll_reqs (int nreqs) 1288max_poll_reqs (int nreqs)
… …
1345 CODE: 1429 CODE:
1346 RETVAL = db_strerror (errorno); 1430 RETVAL = db_strerror (errorno);
1347 OUTPUT: 1431 OUTPUT:
1348 RETVAL 1432 RETVAL
1349 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
1350DB_ENV * 1439DB_ENV *
1351db_env_create (U32 env_flags = 0) 1440db_env_create (U32 env_flags = 0)
1352 CODE: 1441 CODE:
1353{ 1442{
1354 errno = db_env_create (&RETVAL, env_flags); 1443 errno = db_env_create (&RETVAL, env_flags);
… …
1363} 1452}
1364 OUTPUT: 1453 OUTPUT:
1365 RETVAL 1454 RETVAL
1366 1455
1367void 1456void
1368db_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
1369 CODE: 1460 CODE:
1370{ 1461{
1371 dREQ (REQ_ENV_OPEN); 1462 dREQ (REQ_ENV_OPEN);
1372
1373 req->env = env; 1463 req->env = env;
1374 req->uint1 = open_flags | DB_THREAD; 1464 req->uint1 = open_flags | DB_THREAD;
1375 req->int1 = mode; 1465 req->int1 = mode;
1376 req->buf1 = strdup_ornull (db_home); 1466 req->buf1 = strdup_ornull (db_home);
1377 REQ_SEND; 1467 REQ_SEND;
1378} 1468}
1379 1469
1380void 1470void
1381db_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
1382 CODE: 1474 CODE:
1383{ 1475{
1384 dREQ (REQ_ENV_CLOSE); 1476 dREQ (REQ_ENV_CLOSE);
1385 req->env = env; 1477 req->env = env;
1386 req->uint1 = flags; 1478 req->uint1 = flags;
1387 REQ_SEND; 1479 REQ_SEND;
1388 ptr_nuke (ST (0)); 1480 ptr_nuke (ST (0));
1389} 1481}
1390 1482
1391void 1483void
1392db_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
1393 CODE: 1487 CODE:
1394{ 1488{
1395 dREQ (REQ_ENV_TXN_CHECKPOINT); 1489 dREQ (REQ_ENV_TXN_CHECKPOINT);
1396 req->env = env; 1490 req->env = env;
1397 req->uint1 = kbyte; 1491 req->uint1 = kbyte;
… …
1399 req->uint2 = flags; 1493 req->uint2 = flags;
1400 REQ_SEND; 1494 REQ_SEND;
1401} 1495}
1402 1496
1403void 1497void
1404db_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
1405 CODE: 1501 CODE:
1406{ 1502{
1407 dREQ (REQ_ENV_LOCK_DETECT); 1503 dREQ (REQ_ENV_LOCK_DETECT);
1408 req->env = env; 1504 req->env = env;
1409 req->uint1 = flags; 1505 req->uint1 = flags;
1410 req->uint2 = atype; 1506 req->uint2 = atype;
1507 /* req->int2 = 0; dummy */
1411 REQ_SEND; 1508 REQ_SEND;
1412} 1509}
1413 1510
1414void 1511void
1415db_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
1416 CODE: 1515 CODE:
1417{ 1516{
1418 dREQ (REQ_ENV_MEMP_SYNC); 1517 dREQ (REQ_ENV_MEMP_SYNC);
1419 req->env = env; 1518 req->env = env;
1420 REQ_SEND; 1519 REQ_SEND;
1421} 1520}
1422 1521
1423void 1522void
1424db_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
1425 CODE: 1526 CODE:
1426{ 1527{
1427 dREQ (REQ_ENV_MEMP_TRICKLE); 1528 dREQ (REQ_ENV_MEMP_TRICKLE);
1428 req->env = env; 1529 req->env = env;
1429 req->int1 = percent; 1530 req->int1 = percent;
1430 REQ_SEND; 1531 REQ_SEND;
1431} 1532}
1432 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}
1433 1562
1434DB * 1563DB *
1435db_create (DB_ENV *env = 0, U32 flags = 0) 1564db_create (DB_ENV *env = 0, U32 flags = 0)
1436 CODE: 1565 CODE:
1437{ 1566{
… …
1444} 1573}
1445 OUTPUT: 1574 OUTPUT:
1446 RETVAL 1575 RETVAL
1447 1576
1448void 1577void
1449db_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
1450 CODE: 1581 CODE:
1451{ 1582{
1452 dREQ (REQ_DB_OPEN); 1583 dREQ (REQ_DB_OPEN);
1453 req->db = db; 1584 req->db = db;
1454 req->txn = txnid; 1585 req->txn = txnid;
… …
1459 req->int2 = mode; 1590 req->int2 = mode;
1460 REQ_SEND; 1591 REQ_SEND;
1461} 1592}
1462 1593
1463void 1594void
1464db_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
1465 CODE: 1598 CODE:
1466{ 1599{
1467 dREQ (REQ_DB_CLOSE); 1600 dREQ (REQ_DB_CLOSE);
1468 req->db = db; 1601 req->db = db;
1469 req->uint1 = flags; 1602 req->uint1 = flags;
… …
1471 REQ_SEND; 1604 REQ_SEND;
1472 ptr_nuke (ST (0)); 1605 ptr_nuke (ST (0));
1473} 1606}
1474 1607
1475void 1608void
1476db_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
1477 CODE: 1612 CODE:
1478{ 1613{
1479 dREQ (REQ_DB_COMPACT); 1614 dREQ (REQ_DB_COMPACT);
1480 req->db = db; 1615 req->db = db;
1481 req->txn = txn; 1616 req->txn = txn;
… …
1484 req->uint1 = flags; 1619 req->uint1 = flags;
1485 REQ_SEND; 1620 REQ_SEND;
1486} 1621}
1487 1622
1488void 1623void
1489db_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
1490 CODE: 1627 CODE:
1491{ 1628{
1492 dREQ (REQ_DB_SYNC); 1629 dREQ (REQ_DB_SYNC);
1493 req->db = db; 1630 req->db = db;
1494 req->uint1 = flags; 1631 req->uint1 = flags;
1495 REQ_SEND; 1632 REQ_SEND;
1496} 1633}
1497 1634
1498void 1635void
1499db_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
1500 CODE: 1639 CODE:
1501{ 1640{
1502 dREQ (REQ_DB_SYNC); 1641 dREQ (REQ_DB_SYNC);
1503 req->db = db; 1642 req->db = db;
1504 req->buf1 = strdup (file); 1643 req->buf1 = strdup (file);
1505 req->uint1 = flags; 1644 req->uint1 = flags;
1506 REQ_SEND; 1645 REQ_SEND;
1507} 1646}
1508 1647
1509void 1648void
1510db_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
1511 CODE: 1652 CODE:
1512{ 1653{
1513 dREQ (REQ_DB_KEY_RANGE); 1654 dREQ (REQ_DB_KEY_RANGE);
1514 req->db = db; 1655 req->db = db;
1515 req->txn = txn; 1656 req->txn = txn;
… …
1518 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range); 1659 req->sv1 = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
1519 REQ_SEND; 1660 REQ_SEND;
1520} 1661}
1521 1662
1522void 1663void
1523db_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
1524 CODE: 1667 CODE:
1525{ 1668{
1526 dREQ (REQ_DB_PUT); 1669 dREQ (REQ_DB_PUT);
1527 req->db = db; 1670 req->db = db;
1528 req->txn = txn; 1671 req->txn = txn;
… …
1531 req->uint1 = flags; 1674 req->uint1 = flags;
1532 REQ_SEND; 1675 REQ_SEND;
1533} 1676}
1534 1677
1535void 1678void
1536db_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
1537 CODE: 1682 CODE:
1538 if (SvREADONLY (data)) 1683 if (SvREADONLY (data))
1539 croak ("can't modify read-only data scalar in db_get"); 1684 croak ("can't modify read-only data scalar in db_get");
1540{ 1685{
1541 dREQ (REQ_DB_GET); 1686 dREQ (REQ_DB_GET);
… …
1547 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1692 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1548 REQ_SEND; 1693 REQ_SEND;
1549} 1694}
1550 1695
1551void 1696void
1552db_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
1553 CODE: 1700 CODE:
1554 if (SvREADONLY (data)) 1701 if (SvREADONLY (data))
1555 croak ("can't modify read-only data scalar in db_pget"); 1702 croak ("can't modify read-only data scalar in db_pget");
1556{ 1703{
1557 dREQ (REQ_DB_PGET); 1704 dREQ (REQ_DB_PGET);
… …
1564 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1711 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1565 REQ_SEND; 1712 REQ_SEND;
1566} 1713}
1567 1714
1568void 1715void
1569db_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
1570 CODE: 1719 CODE:
1571{ 1720{
1572 dREQ (REQ_DB_DEL); 1721 dREQ (REQ_DB_DEL);
1573 req->db = db; 1722 req->db = db;
1574 req->txn = txn; 1723 req->txn = txn;
… …
1576 sv_to_dbt (&req->dbt1, key); 1725 sv_to_dbt (&req->dbt1, key);
1577 REQ_SEND; 1726 REQ_SEND;
1578} 1727}
1579 1728
1580void 1729void
1581db_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
1582 CODE: 1733 CODE:
1583{ 1734{
1584 dREQ (REQ_TXN_COMMIT); 1735 dREQ (REQ_TXN_COMMIT);
1585 req->txn = txn; 1736 req->txn = txn;
1586 req->uint1 = flags; 1737 req->uint1 = flags;
1587 REQ_SEND; 1738 REQ_SEND;
1588 ptr_nuke (ST (0)); 1739 ptr_nuke (ST (0));
1589} 1740}
1590 1741
1591void 1742void
1592db_txn_abort (DB_TXN *txn, SV *callback = &PL_sv_undef) 1743db_txn_abort (DB_TXN *txn, SV *callback = 0)
1744 PREINIT:
1745 CALLBACK
1593 CODE: 1746 CODE:
1594{ 1747{
1595 dREQ (REQ_TXN_ABORT); 1748 dREQ (REQ_TXN_ABORT);
1596 req->txn = txn; 1749 req->txn = txn;
1597 REQ_SEND; 1750 REQ_SEND;
1598 ptr_nuke (ST (0)); 1751 ptr_nuke (ST (0));
1599} 1752}
1600 1753
1601void 1754void
1602db_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
1603 CODE: 1758 CODE:
1604{ 1759{
1605 dREQ (REQ_TXN_FINISH); 1760 dREQ (REQ_TXN_FINISH);
1606 req->txn = txn; 1761 req->txn = txn;
1607 req->uint1 = flags; 1762 req->uint1 = flags;
1608 REQ_SEND; 1763 REQ_SEND;
1609 ptr_nuke (ST (0)); 1764 ptr_nuke (ST (0));
1610} 1765}
1611 1766
1612void 1767void
1613db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1768db_c_close (DBC *dbc, SV *callback = 0)
1769 PREINIT:
1770 CALLBACK
1614 CODE: 1771 CODE:
1615{ 1772{
1616 dREQ (REQ_C_CLOSE); 1773 dREQ (REQ_C_CLOSE);
1617 req->dbc = dbc; 1774 req->dbc = dbc;
1618 REQ_SEND; 1775 REQ_SEND;
1619 ptr_nuke (ST (0)); 1776 ptr_nuke (ST (0));
1620} 1777}
1621 1778
1622void 1779void
1623db_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
1624 CODE: 1783 CODE:
1625{ 1784{
1626 dREQ (REQ_C_COUNT); 1785 dREQ (REQ_C_COUNT);
1627 req->dbc = dbc; 1786 req->dbc = dbc;
1628 req->sv1 = SvREFCNT_inc (count); 1787 req->sv1 = SvREFCNT_inc (count);
1629 REQ_SEND; 1788 REQ_SEND;
1630} 1789}
1631 1790
1632void 1791void
1633db_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
1634 CODE: 1795 CODE:
1635{ 1796{
1636 dREQ (REQ_C_PUT); 1797 dREQ (REQ_C_PUT);
1637 req->dbc = dbc; 1798 req->dbc = dbc;
1638 sv_to_dbt (&req->dbt1, key); 1799 sv_to_dbt (&req->dbt1, key);
… …
1640 req->uint1 = flags; 1801 req->uint1 = flags;
1641 REQ_SEND; 1802 REQ_SEND;
1642} 1803}
1643 1804
1644void 1805void
1645db_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
1646 CODE: 1809 CODE:
1647{ 1810{
1648 dREQ (REQ_C_GET); 1811 dREQ (REQ_C_GET);
1649 req->dbc = dbc; 1812 req->dbc = dbc;
1650 req->uint1 = flags; 1813 req->uint1 = flags;
… …
1665 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1828 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1666 REQ_SEND; 1829 REQ_SEND;
1667} 1830}
1668 1831
1669void 1832void
1670db_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
1671 CODE: 1836 CODE:
1672{ 1837{
1673 dREQ (REQ_C_PGET); 1838 dREQ (REQ_C_PGET);
1674 req->dbc = dbc; 1839 req->dbc = dbc;
1675 req->uint1 = flags; 1840 req->uint1 = flags;
… …
1693 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1858 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1694 REQ_SEND; 1859 REQ_SEND;
1695} 1860}
1696 1861
1697void 1862void
1698db_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
1699 CODE: 1866 CODE:
1700{ 1867{
1701 dREQ (REQ_C_DEL); 1868 dREQ (REQ_C_DEL);
1702 req->dbc = dbc; 1869 req->dbc = dbc;
1703 req->uint1 = flags; 1870 req->uint1 = flags;
1704 REQ_SEND; 1871 REQ_SEND;
1705} 1872}
1706 1873
1707 1874
1708void 1875void
1709db_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
1710 CODE: 1879 CODE:
1711{ 1880{
1712 dREQ (REQ_SEQ_OPEN); 1881 dREQ (REQ_SEQ_OPEN);
1713 req->seq = seq; 1882 req->seq = seq;
1714 req->txn = txnid; 1883 req->txn = txnid;
… …
1716 sv_to_dbt (&req->dbt1, key); 1885 sv_to_dbt (&req->dbt1, key);
1717 REQ_SEND; 1886 REQ_SEND;
1718} 1887}
1719 1888
1720void 1889void
1721db_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
1722 CODE: 1893 CODE:
1723{ 1894{
1724 dREQ (REQ_SEQ_CLOSE); 1895 dREQ (REQ_SEQ_CLOSE);
1725 req->seq = seq; 1896 req->seq = seq;
1726 req->uint1 = flags; 1897 req->uint1 = flags;
1727 REQ_SEND; 1898 REQ_SEND;
1728 ptr_nuke (ST (0)); 1899 ptr_nuke (ST (0));
1729} 1900}
1730 1901
1731void 1902void
1732db_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
1733 CODE: 1906 CODE:
1734{ 1907{
1735 dREQ (REQ_SEQ_GET); 1908 dREQ (REQ_SEQ_GET);
1736 req->seq = seq; 1909 req->seq = seq;
1737 req->txn = txnid; 1910 req->txn = txnid;
… …
1740 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value); 1913 req->sv1 = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
1741 REQ_SEND; 1914 REQ_SEND;
1742} 1915}
1743 1916
1744void 1917void
1745db_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
1746 CODE: 1921 CODE:
1747{ 1922{
1748 dREQ (REQ_SEQ_REMOVE); 1923 dREQ (REQ_SEQ_REMOVE);
1749 req->seq = seq; 1924 req->seq = seq;
1750 req->txn = txnid; 1925 req->txn = txnid;
… …
1794int set_flags (DB_ENV *env, U32 flags, int onoff = 1) 1969int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1795 CODE: 1970 CODE:
1796 RETVAL = env->set_flags (env, flags, onoff); 1971 RETVAL = env->set_flags (env, flags, onoff);
1797 OUTPUT: 1972 OUTPUT:
1798 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
1799 1991
1800void set_errfile (DB_ENV *env, FILE *errfile = 0) 1992void set_errfile (DB_ENV *env, FILE *errfile = 0)
1801 CODE: 1993 CODE:
1802 env->set_errfile (env, errfile); 1994 env->set_errfile (env, errfile);
1803 1995

Diff Legend

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