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

Comparing BDB/BDB.xs (file contents):
Revision 1.62 by root, Mon Oct 20 04:21:53 2008 UTC vs.
Revision 1.68 by root, Tue Jul 14 19:29:23 2009 UTC

… …
5#include <errno.h> 5#include <errno.h>
6 6
7#include "EXTERN.h" 7#include "EXTERN.h"
8#include "perl.h" 8#include "perl.h"
9#include "XSUB.h" 9#include "XSUB.h"
10
11#include "schmorp.h"
10 12
11// perl stupidly defines these as macros, breaking 13// perl stupidly defines these as macros, breaking
12// lots and lots of code. 14// lots and lots of code.
13#undef open 15#undef open
14#undef close 16#undef close
… …
149 151
150enum { 152enum {
151 REQ_QUIT, 153 REQ_QUIT,
152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 154 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 155 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
156 REQ_ENV_LOG_ARCHIVE,
154 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 157 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_VERIFY, REQ_DB_UPGRADE,
155 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 158 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
156 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 159 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
157 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 160 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
158 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 161 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
159}; 162};
… …
377 380
378 av_push (av, newSVnv (req->key_range.less)); 381 av_push (av, newSVnv (req->key_range.less));
379 av_push (av, newSVnv (req->key_range.equal)); 382 av_push (av, newSVnv (req->key_range.equal));
380 av_push (av, newSVnv (req->key_range.greater)); 383 av_push (av, newSVnv (req->key_range.greater));
381 384
385 av = (AV *)newRV_noinc ((SV *)av);
386
382 SvREADONLY_off (req->sv1); 387 SvREADONLY_off (req->sv1);
383 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 388 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
389 SvREFCNT_dec (av);
384 SvREFCNT_dec (req->sv1); 390 SvREFCNT_dec (req->sv1);
385 } 391 }
386 break; 392 break;
387 393
388#if DB_VERSION_MINOR >= 3 394#if DB_VERSION_MINOR >= 3
… …
395 sv_setnv_mg (req->sv1, (NV)req->seq_t); 401 sv_setnv_mg (req->sv1, (NV)req->seq_t);
396 402
397 SvREFCNT_dec (req->sv1); 403 SvREFCNT_dec (req->sv1);
398 break; 404 break;
399#endif 405#endif
406
407 case REQ_ENV_LOG_ARCHIVE:
408 {
409 AV *av = newAV ();
410 char **listp = (char **)req->buf1;
411
412 if (listp)
413 while (*listp)
414 av_push (av, newSVpv (*listp, 0)), ++listp;
415
416 av = (AV *)newRV_noinc ((SV *)av);
417
418 SvREADONLY_off (req->sv1);
419 sv_setsv_mg (req->sv1, (SV *)av);
420 SvREFCNT_dec (av);
421 SvREFCNT_dec (req->sv1);
422 }
423 break;
400 } 424 }
401 425
402 errno = req->result; 426 errno = req->result;
403 427
404 if (req->callback) 428 if (req->callback)
… …
434 free (req->buf3); 458 free (req->buf3);
435 459
436 Safefree (req); 460 Safefree (req);
437} 461}
438 462
439#ifdef USE_SOCKETS_AS_HANDLES
440# define TO_SOCKET(x) (win32_get_osfhandle (x))
441#else
442# define TO_SOCKET(x) (x)
443#endif
444
445static void 463static void
446create_respipe (void) 464create_respipe (void)
447{ 465{
448#ifdef _WIN32 466#ifdef _WIN32
449 int arg; /* argg */ 467 int arg; /* argg */
450#endif 468#endif
451 int old_readfd = respipe [0]; 469 int old_readfd = respipe [0];
452 470
453 if (respipe [1] >= 0) 471 if (respipe [1] >= 0)
454 respipe_close (TO_SOCKET (respipe [1])); 472 respipe_close (S_TO_SOCKET (respipe [1]));
455 473
456#ifdef _WIN32
457 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
458#else
459 if (pipe (respipe)) 474 if (s_pipe (respipe))
460#endif
461 croak ("unable to initialize result pipe"); 475 croak ("unable to initialize result pipe");
462 476
463 if (old_readfd >= 0) 477 if (old_readfd >= 0)
464 { 478 {
465 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0) 479 if (dup2 (S_TO_SOCKET (respipe [0]), S_TO_SOCKET (old_readfd)) < 0)
466 croak ("unable to initialize result pipe(2)"); 480 croak ("unable to initialize result pipe(2)");
467 481
468 respipe_close (respipe [0]); 482 respipe_close (respipe [0]);
469 respipe [0] = old_readfd; 483 respipe [0] = old_readfd;
470 } 484 }
471 485
472#ifdef _WIN32 486#ifdef _WIN32
473 arg = 1; 487 arg = 1;
474 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) 488 if (ioctlsocket (S_TO_SOCKET (respipe [0]), FIONBIO, &arg)
475 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) 489 || ioctlsocket (S_TO_SOCKET (respipe [1]), FIONBIO, &arg))
476#else 490#else
477 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) 491 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
478 || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 492 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
479#endif 493#endif
480 croak ("unable to initialize result pipe(3)"); 494 croak ("unable to initialize result pipe(3)");
481 495
482 respipe_osf [0] = TO_SOCKET (respipe [0]); 496 respipe_osf [0] = S_TO_SOCKET (respipe [0]);
483 respipe_osf [1] = TO_SOCKET (respipe [1]); 497 respipe_osf [1] = S_TO_SOCKET (respipe [1]);
484} 498}
485 499
486static void bdb_request (bdb_req req); 500static void bdb_request (bdb_req req);
487X_THREAD_PROC (bdb_proc); 501X_THREAD_PROC (bdb_proc);
488 502
… …
776 790
777 case REQ_DB_SYNC: 791 case REQ_DB_SYNC:
778 req->result = req->db->sync (req->db, req->uint1); 792 req->result = req->db->sync (req->db, req->uint1);
779 break; 793 break;
780 794
795 case REQ_DB_VERIFY:
796 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
797 break;
798
781 case REQ_DB_UPGRADE: 799 case REQ_DB_UPGRADE:
782 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 800 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
783 break; 801 break;
784 802
785 case REQ_DB_PUT: 803 case REQ_DB_PUT:
… …
869 887
870 case REQ_SEQ_REMOVE: 888 case REQ_SEQ_REMOVE:
871 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 889 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
872 break; 890 break;
873#endif 891#endif
892
893 case REQ_ENV_LOG_ARCHIVE:
894 {
895 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
896 req->result = req->env->log_archive (req->env, &listp, req->uint1);
897 req->buf1 = (char *)listp;
898 }
899 break;
874 900
875 default: 901 default:
876 req->result = ENOSYS; 902 req->result = ENOSYS;
877 break; 903 break;
878 } 904 }
… …
1132 } 1158 }
1133 } 1159 }
1134 1160
1135 return 0; 1161 return 0;
1136} 1162}
1163
1164/*****************************************************************************/
1165
1166#if 0
1167static int
1168bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1169{
1170 ssize_t size1 = dbt1->size;
1171 ssize_t size2 = dbt2->size;
1172 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1173 size1 <= size2 ? size1 : size2);
1174
1175 if (res)
1176 return res;
1177 else if (size1 - size2)
1178 return size1 - size2;
1179 else
1180 return 0;
1181}
1182
1183static size_t
1184bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1185{
1186 ssize_t size1 = dbt1->size;
1187 ssize_t size2 = dbt2->size;
1188 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1189 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1190 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1191
1192 while (p1 < pe)
1193 if (*p1++ != *p2++)
1194 return p1 - (u_int8_t *)dbt1->data - 1;
1195
1196 if (size1 < size2) return size1 + 1;
1197 if (size1 > size2) return size2 + 1;
1198
1199 return size1;
1200}
1201#endif
1202
1203/*****************************************************************************/
1137 1204
1138/* stupid windows defines CALLBACK as well */ 1205/* stupid windows defines CALLBACK as well */
1139#undef CALLBACK 1206#undef CALLBACK
1140#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1207#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1141 1208
… …
1278 const_iv (REP_UNAVAIL) 1345 const_iv (REP_UNAVAIL)
1279 const_iv (RUNRECOVERY) 1346 const_iv (RUNRECOVERY)
1280 const_iv (SECONDARY_BAD) 1347 const_iv (SECONDARY_BAD)
1281 const_iv (VERIFY_BAD) 1348 const_iv (VERIFY_BAD)
1282 1349
1350 const_iv (SALVAGE)
1351 const_iv (AGGRESSIVE)
1352 const_iv (PRINTABLE)
1353 const_iv (NOORDERCHK)
1354 const_iv (ORDERCHKONLY)
1355
1356 const_iv (ARCH_ABS)
1357 const_iv (ARCH_DATA)
1358 const_iv (ARCH_LOG)
1359 const_iv (ARCH_REMOVE)
1360
1283 const_iv (VERB_DEADLOCK) 1361 const_iv (VERB_DEADLOCK)
1284 const_iv (VERB_RECOVERY) 1362 const_iv (VERB_RECOVERY)
1285 const_iv (VERB_REPLICATION) 1363 const_iv (VERB_REPLICATION)
1286 const_iv (VERB_WAITSFOR) 1364 const_iv (VERB_WAITSFOR)
1287 1365
… …
1320 const_iv (PRIORITY_VERY_LOW) 1398 const_iv (PRIORITY_VERY_LOW)
1321 const_iv (PRIORITY_LOW) 1399 const_iv (PRIORITY_LOW)
1322 const_iv (PRIORITY_DEFAULT) 1400 const_iv (PRIORITY_DEFAULT)
1323 const_iv (PRIORITY_HIGH) 1401 const_iv (PRIORITY_HIGH)
1324 const_iv (PRIORITY_VERY_HIGH) 1402 const_iv (PRIORITY_VERY_HIGH)
1403 const_iv (IGNORE_LEASE)
1325#endif 1404#endif
1326#if DB_VERSION_MINOR >= 7 1405#if DB_VERSION_MINOR >= 7
1327 const_iv (IGNORE_LEASE)
1328 //const_iv (MULTIPLE_KEY) 1406 //const_iv (MULTIPLE_KEY)
1329 const_iv (LOG_DIRECT) 1407 const_iv (LOG_DIRECT)
1330 const_iv (LOG_DSYNC) 1408 const_iv (LOG_DSYNC)
1331 const_iv (LOG_AUTO_REMOVE) 1409 const_iv (LOG_AUTO_REMOVE)
1332 const_iv (LOG_IN_MEMORY) 1410 const_iv (LOG_IN_MEMORY)
… …
1637 req->buf3 = strdup_ornull (newname); 1715 req->buf3 = strdup_ornull (newname);
1638 req->uint1 = flags; 1716 req->uint1 = flags;
1639 REQ_SEND; 1717 REQ_SEND;
1640} 1718}
1641 1719
1720void
1721db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1722 PREINIT:
1723 CALLBACK
1724 CODE:
1725{
1726 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1727 req->sv1 = SvREFCNT_inc (listp);
1728 req->env = env;
1729 req->uint1 = flags;
1730 REQ_SEND;
1731}
1732
1642DB * 1733DB *
1643db_create (DB_ENV *env = 0, U32 flags = 0) 1734db_create (DB_ENV *env = 0, U32 flags = 0)
1644 CODE: 1735 CODE:
1645{ 1736{
1646 errno = db_create (&RETVAL, env, flags); 1737 errno = db_create (&RETVAL, env, flags);
… …
1714 req->uint1 = flags; 1805 req->uint1 = flags;
1715 REQ_SEND; 1806 REQ_SEND;
1716} 1807}
1717 1808
1718void 1809void
1810db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1811 PREINIT:
1812 CALLBACK
1813 CODE:
1814{
1815 dREQ (REQ_DB_VERIFY, 1);
1816 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1817 req->db = db;
1818 req->buf1 = strdup (file);
1819 req->buf2 = strdup_ornull (database);
1820 req->uint1 = flags;
1821 REQ_SEND;
1822}
1823
1824void
1719db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1825db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1720 PREINIT: 1826 PREINIT:
1721 CALLBACK 1827 CALLBACK
1722 CODE: 1828 CODE:
1723{ 1829{
1724 dREQ (REQ_DB_SYNC, 1); 1830 dREQ (REQ_DB_UPGRADE, 1);
1725 req->db = db; 1831 req->db = db;
1726 req->buf1 = strdup (file); 1832 req->buf1 = strdup (file);
1727 req->uint1 = flags; 1833 req->uint1 = flags;
1728 REQ_SEND; 1834 REQ_SEND;
1729} 1835}

Diff Legend

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