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

Comparing BDB/BDB.xs (file contents):
Revision 1.18 by root, Sun Sep 16 18:15:34 2007 UTC vs.
Revision 1.27 by root, Mon Dec 17 06:31:43 2007 UTC

… …
102 102
103enum { 103enum {
104 REQ_QUIT, 104 REQ_QUIT,
105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
108 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 108 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
110 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 110 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
111 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 111 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
112}; 112};
… …
191} 191}
192 192
193static volatile unsigned int nreqs, nready, npending; 193static volatile unsigned int nreqs, nready, npending;
194static volatile unsigned int max_idle = 4; 194static volatile unsigned int max_idle = 4;
195static volatile unsigned int max_outstanding = 0xffffffff; 195static volatile unsigned int max_outstanding = 0xffffffff;
196static int respipe [2], respipe_osf [2]; 196static int respipe_osf [2], respipe [2] = { -1, -1 };
197 197
198static mutex_t reslock = X_MUTEX_INIT; 198static mutex_t reslock = X_MUTEX_INIT;
199static mutex_t reqlock = X_MUTEX_INIT; 199static mutex_t reqlock = X_MUTEX_INIT;
200static cond_t reqwait = X_COND_INIT; 200static cond_t reqwait = X_COND_INIT;
201 201
… …
326 dbt_to_sv (req->sv1, &req->dbt1); 326 dbt_to_sv (req->sv1, &req->dbt1);
327 dbt_to_sv (req->sv2, &req->dbt2); 327 dbt_to_sv (req->sv2, &req->dbt2);
328 dbt_to_sv (req->sv3, &req->dbt3); 328 dbt_to_sv (req->sv3, &req->dbt3);
329 break; 329 break;
330 330
331 case REQ_DB_PUT:
332 case REQ_C_PUT:
333 dbt_to_sv (0, &req->dbt1);
334 dbt_to_sv (0, &req->dbt2);
335 break;
336
331 case REQ_DB_KEY_RANGE: 337 case REQ_DB_KEY_RANGE:
332 { 338 {
333 AV *av = newAV (); 339 AV *av = newAV ();
334 340
335 av_push (av, newSVnv (req->key_range.less)); 341 av_push (av, newSVnv (req->key_range.less));
… …
344 350
345 case REQ_SEQ_GET: 351 case REQ_SEQ_GET:
346 SvREADONLY_off (req->sv1); 352 SvREADONLY_off (req->sv1);
347 353
348 if (sizeof (IV) > 4) 354 if (sizeof (IV) > 4)
349 sv_setiv_mg (req->sv1, req->seq_t); 355 sv_setiv_mg (req->sv1, (IV)req->seq_t);
350 else 356 else
351 sv_setnv_mg (req->sv1, req->seq_t); 357 sv_setnv_mg (req->sv1, (NV)req->seq_t);
352 358
353 SvREFCNT_dec (req->sv1); 359 SvREFCNT_dec (req->sv1);
354 break; 360 break;
355 } 361 }
356 362
… …
379#else 385#else
380# define TO_SOCKET(x) (x) 386# define TO_SOCKET(x) (x)
381#endif 387#endif
382 388
383static void 389static void
384create_pipe (int fd[2]) 390create_respipe ()
385{ 391{
386#ifdef _WIN32 392#ifdef _WIN32
387 int arg = 1; 393 int arg; /* argg */
394#endif
395 int old_readfd = respipe [0];
396
397 if (respipe [1] >= 0)
398 respipe_close (TO_SOCKET (respipe [1]));
399
400#ifdef _WIN32
388 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd) 401 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
389 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg)
390 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg))
391#else 402#else
392 if (pipe (fd) 403 if (pipe (respipe))
393 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
394 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
395#endif 404#endif
396 croak ("unable to initialize result pipe"); 405 croak ("unable to initialize result pipe");
406
407 if (old_readfd >= 0)
408 {
409 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
410 croak ("unable to initialize result pipe(2)");
411
412 respipe_close (respipe [0]);
413 respipe [0] = old_readfd;
414 }
415
416#ifdef _WIN32
417 arg = 1;
418 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
419 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
420#else
421 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
422 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
423#endif
424 croak ("unable to initialize result pipe(3)");
397 425
398 respipe_osf [0] = TO_SOCKET (respipe [0]); 426 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]); 427 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 428}
401 429
… …
451 SPAGAIN; 479 SPAGAIN;
452 480
453 if (count != 2) 481 if (count != 2)
454 croak ("prepare callback must return exactly two values\n"); 482 croak ("prepare callback must return exactly two values\n");
455 483
456 wait_callback = SvREFCNT_inc (POPs); 484 wait_callback = POPs;
457 SvREFCNT_dec (req->callback); 485 SvREFCNT_dec (req->callback);
458 req->callback = SvREFCNT_inc (POPs); 486 req->callback = SvREFCNT_inc (POPs);
459 } 487 }
460 488
461 ++nreqs; 489 ++nreqs;
… …
472 { 500 {
473 dSP; 501 dSP;
474 PUSHMARK (SP); 502 PUSHMARK (SP);
475 PUTBACK; 503 PUTBACK;
476 call_sv (wait_callback, G_DISCARD); 504 call_sv (wait_callback, G_DISCARD);
477 SvREFCNT_dec (wait_callback);
478 } 505 }
479} 506}
480 507
481static void end_thread (void) 508static void end_thread (void)
482{ 509{
… …
711 738
712 case REQ_DB_SYNC: 739 case REQ_DB_SYNC:
713 req->result = req->db->sync (req->db, req->uint1); 740 req->result = req->db->sync (req->db, req->uint1);
714 break; 741 break;
715 742
743 case REQ_DB_UPGRADE:
744 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
745 break;
746
716 case REQ_DB_PUT: 747 case REQ_DB_PUT:
717 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 748 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
718 break; 749 break;
719 750
720 case REQ_DB_GET: 751 case REQ_DB_GET:
… …
867 idle = 0; 898 idle = 0;
868 nreqs = 0; 899 nreqs = 0;
869 nready = 0; 900 nready = 0;
870 npending = 0; 901 npending = 0;
871 902
872 respipe_close (respipe [0]);
873 respipe_close (respipe [1]);
874
875 create_pipe (respipe); 903 create_respipe ();
876 904
877 atfork_parent (); 905 atfork_parent ();
878} 906}
879 907
880#define dREQ(reqtype) \ 908#define dREQ(reqtype) \
… …
944 const_iv (INIT_TXN) 972 const_iv (INIT_TXN)
945 const_iv (RECOVER) 973 const_iv (RECOVER)
946 const_iv (INIT_TXN) 974 const_iv (INIT_TXN)
947 const_iv (RECOVER_FATAL) 975 const_iv (RECOVER_FATAL)
948 const_iv (CREATE) 976 const_iv (CREATE)
977 const_iv (RDONLY)
949 const_iv (USE_ENVIRON) 978 const_iv (USE_ENVIRON)
950 const_iv (USE_ENVIRON_ROOT) 979 const_iv (USE_ENVIRON_ROOT)
951 const_iv (LOCKDOWN) 980 const_iv (LOCKDOWN)
952 const_iv (PRIVATE) 981 const_iv (PRIVATE)
953 const_iv (REGISTER) 982 const_iv (REGISTER)
… …
966 const_iv (OVERWRITE) 995 const_iv (OVERWRITE)
967 const_iv (PANIC_ENVIRONMENT) 996 const_iv (PANIC_ENVIRONMENT)
968 const_iv (REGION_INIT) 997 const_iv (REGION_INIT)
969 const_iv (TIME_NOTGRANTED) 998 const_iv (TIME_NOTGRANTED)
970 const_iv (TXN_NOSYNC) 999 const_iv (TXN_NOSYNC)
1000 const_iv (TXN_NOT_DURABLE)
971 const_iv (TXN_WRITE_NOSYNC) 1001 const_iv (TXN_WRITE_NOSYNC)
972 const_iv (WRITECURSOR) 1002 const_iv (WRITECURSOR)
973 const_iv (YIELDCPU) 1003 const_iv (YIELDCPU)
974 const_iv (ENCRYPT_AES) 1004 const_iv (ENCRYPT_AES)
975 const_iv (XA_CREATE) 1005 const_iv (XA_CREATE)
… …
983 const_iv (READ_UNCOMMITTED) 1013 const_iv (READ_UNCOMMITTED)
984 const_iv (TRUNCATE) 1014 const_iv (TRUNCATE)
985 const_iv (NOSYNC) 1015 const_iv (NOSYNC)
986 const_iv (CHKSUM) 1016 const_iv (CHKSUM)
987 const_iv (ENCRYPT) 1017 const_iv (ENCRYPT)
988 const_iv (TXN_NOT_DURABLE)
989 const_iv (DUP) 1018 const_iv (DUP)
990 const_iv (DUPSORT) 1019 const_iv (DUPSORT)
991 const_iv (RECNUM) 1020 const_iv (RECNUM)
992 const_iv (RENUMBER) 1021 const_iv (RENUMBER)
993 const_iv (REVSPLITOFF) 1022 const_iv (REVSPLITOFF)
… …
998 const_iv (GET_BOTH_RANGE) 1027 const_iv (GET_BOTH_RANGE)
999 //const_iv (SET_RECNO) 1028 //const_iv (SET_RECNO)
1000 //const_iv (MULTIPLE) 1029 //const_iv (MULTIPLE)
1001 const_iv (SNAPSHOT) 1030 const_iv (SNAPSHOT)
1002 const_iv (JOIN_ITEM) 1031 const_iv (JOIN_ITEM)
1032 const_iv (JOIN_NOSORT)
1003 const_iv (RMW) 1033 const_iv (RMW)
1004 1034
1005 const_iv (NOTFOUND) 1035 const_iv (NOTFOUND)
1006 const_iv (KEYEMPTY) 1036 const_iv (KEYEMPTY)
1007 const_iv (LOCK_DEADLOCK) 1037 const_iv (LOCK_DEADLOCK)
… …
1023 const_iv (TXN_SYNC) 1053 const_iv (TXN_SYNC)
1024 1054
1025 const_iv (SET_LOCK_TIMEOUT) 1055 const_iv (SET_LOCK_TIMEOUT)
1026 const_iv (SET_TXN_TIMEOUT) 1056 const_iv (SET_TXN_TIMEOUT)
1027 1057
1028 const_iv (JOIN_ITEM)
1029 const_iv (FIRST) 1058 const_iv (FIRST)
1030 const_iv (NEXT) 1059 const_iv (NEXT)
1031 const_iv (NEXT_DUP) 1060 const_iv (NEXT_DUP)
1032 const_iv (NEXT_NODUP) 1061 const_iv (NEXT_NODUP)
1033 const_iv (PREV) 1062 const_iv (PREV)
… …
1067 const_iv (LOG_BUFFER_FULL) 1096 const_iv (LOG_BUFFER_FULL)
1068 const_iv (NOSERVER) 1097 const_iv (NOSERVER)
1069 const_iv (NOSERVER_HOME) 1098 const_iv (NOSERVER_HOME)
1070 const_iv (NOSERVER_ID) 1099 const_iv (NOSERVER_ID)
1071 const_iv (NOTFOUND) 1100 const_iv (NOTFOUND)
1072 const_iv (OLD_VERSION)
1073 const_iv (PAGE_NOTFOUND) 1101 const_iv (PAGE_NOTFOUND)
1074 const_iv (REP_DUPMASTER) 1102 const_iv (REP_DUPMASTER)
1075 const_iv (REP_HANDLE_DEAD) 1103 const_iv (REP_HANDLE_DEAD)
1076 const_iv (REP_HOLDELECTION) 1104 const_iv (REP_HOLDELECTION)
1077 const_iv (REP_IGNORE) 1105 const_iv (REP_IGNORE)
… …
1100 const_iv (MULTIVERSION) 1128 const_iv (MULTIVERSION)
1101 const_iv (TXN_SNAPSHOT) 1129 const_iv (TXN_SNAPSHOT)
1102#endif 1130#endif
1103#if DB_VERSION_MINOR >= 6 1131#if DB_VERSION_MINOR >= 6
1104 const_iv (PREV_DUP) 1132 const_iv (PREV_DUP)
1105# if 0
1106 const_iv (PRIORITY_UNCHANGED) 1133 const_iv (PRIORITY_UNCHANGED)
1107 const_iv (PRIORITY_VERY_LOW) 1134 const_iv (PRIORITY_VERY_LOW)
1108 const_iv (PRIORITY_LOW) 1135 const_iv (PRIORITY_LOW)
1109 const_iv (PRIORITY_DEFAULT) 1136 const_iv (PRIORITY_DEFAULT)
1110 const_iv (PRIORITY_HIGH) 1137 const_iv (PRIORITY_HIGH)
1111 const_iv (PRIORITY_VERY_HIGH) 1138 const_iv (PRIORITY_VERY_HIGH)
1112# endif
1113#endif 1139#endif
1114 }; 1140 };
1115 1141
1116 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1142 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1117 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1143 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1118 1144
1119 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1145 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1120 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1146 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1121 1147
1122 create_pipe (respipe); 1148 create_respipe ();
1123 1149
1124 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1150 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1125#ifdef _WIN32 1151#ifdef _WIN32
1126 X_MUTEX_CHECK (wrklock); 1152 X_MUTEX_CHECK (wrklock);
1127 X_MUTEX_CHECK (reslock); 1153 X_MUTEX_CHECK (reslock);
… …
1427 req->uint1 = flags; 1453 req->uint1 = flags;
1428 REQ_SEND; 1454 REQ_SEND;
1429} 1455}
1430 1456
1431void 1457void
1458db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
1459 CODE:
1460{
1461 dREQ (REQ_DB_SYNC);
1462 req->db = db;
1463 req->buf1 = strdup (file);
1464 req->uint1 = flags;
1465 REQ_SEND;
1466}
1467
1468void
1432db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1469db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1433 CODE: 1470 CODE:
1434{ 1471{
1435 dREQ (REQ_DB_KEY_RANGE); 1472 dREQ (REQ_DB_KEY_RANGE);
1436 req->db = db; 1473 req->db = db;
… …
1456 1493
1457void 1494void
1458db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1495db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1459 CODE: 1496 CODE:
1460{ 1497{
1498 if (SvREADONLY (data))
1499 croak ("can't modify read-only data scalar in db_get");
1500
1461 dREQ (REQ_DB_GET); 1501 dREQ (REQ_DB_GET);
1462 req->db = db; 1502 req->db = db;
1463 req->txn = txn; 1503 req->txn = txn;
1464 req->uint1 = flags; 1504 req->uint1 = flags;
1465 sv_to_dbt (&req->dbt1, key); 1505 sv_to_dbt (&req->dbt1, key);
… …
1470 1510
1471void 1511void
1472db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1512db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1473 CODE: 1513 CODE:
1474{ 1514{
1515 if (SvREADONLY (data))
1516 croak ("can't modify read-only data scalar in db_pget");
1517
1475 dREQ (REQ_DB_PGET); 1518 dREQ (REQ_DB_PGET);
1476 req->db = db; 1519 req->db = db;
1477 req->txn = txn; 1520 req->txn = txn;
1478 req->uint1 = flags; 1521 req->uint1 = flags;
1479 sv_to_dbt (&req->dbt1, key); 1522 sv_to_dbt (&req->dbt1, key);
… …
1707 CODE: 1750 CODE:
1708 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1751 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1709 OUTPUT: 1752 OUTPUT:
1710 RETVAL 1753 RETVAL
1711 1754
1712int set_flags (DB_ENV *env, U32 flags, int onoff) 1755int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1713 CODE: 1756 CODE:
1714 RETVAL = env->set_flags (env, flags, onoff); 1757 RETVAL = env->set_flags (env, flags, onoff);
1715 OUTPUT: 1758 OUTPUT:
1716 RETVAL 1759 RETVAL
1717 1760
… …
1721 1764
1722void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1765void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1723 CODE: 1766 CODE:
1724 env->set_msgfile (env, msgfile); 1767 env->set_msgfile (env, msgfile);
1725 1768
1726int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1769int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1727 CODE: 1770 CODE:
1728 RETVAL = env->set_verbose (env, which, onoff); 1771 RETVAL = env->set_verbose (env, which, onoff);
1729 OUTPUT: 1772 OUTPUT:
1730 RETVAL 1773 RETVAL
1731 1774
… …
1791 1834
1792int set_lg_max (DB_ENV *env, U32 max) 1835int set_lg_max (DB_ENV *env, U32 max)
1793 CODE: 1836 CODE:
1794 RETVAL = env->set_lg_max (env, max); 1837 RETVAL = env->set_lg_max (env, max);
1795 OUTPUT: 1838 OUTPUT:
1839 RETVAL
1840
1841int mutex_set_max (DB_ENV *env, U32 max)
1842 CODE:
1843 RETVAL = env->mutex_set_max (env, max);
1844 OUTPUT:
1845 RETVAL
1846
1847int mutex_set_increment (DB_ENV *env, U32 increment)
1848 CODE:
1849 RETVAL = env->mutex_set_increment (env, increment);
1850 OUTPUT:
1851 RETVAL
1852
1853int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1854 CODE:
1855 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1856 OUTPUT:
1857 RETVAL
1858
1859int mutex_set_align (DB_ENV *env, U32 align)
1860 CODE:
1861 RETVAL = env->mutex_set_align (env, align);
1862 OUTPUT:
1796 RETVAL 1863 RETVAL
1797 1864
1798DB_TXN * 1865DB_TXN *
1799txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1866txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1800 CODE: 1867 CODE:
… …
1936DESTROY (DBC_ornull *dbc) 2003DESTROY (DBC_ornull *dbc)
1937 CODE: 2004 CODE:
1938 if (dbc) 2005 if (dbc)
1939 dbc->c_close (dbc); 2006 dbc->c_close (dbc);
1940 2007
2008#if DB_VERSION_MINOR >= 6
2009
2010int set_priority (DBC *dbc, int priority)
2011 CODE:
2012 dbc->set_priority (dbc, priority);
2013
2014#endif
2015
1941MODULE = BDB PACKAGE = BDB::Sequence 2016MODULE = BDB PACKAGE = BDB::Sequence
1942 2017
1943void 2018void
1944DESTROY (DB_SEQUENCE_ornull *seq) 2019DESTROY (DB_SEQUENCE_ornull *seq)
1945 CODE: 2020 CODE:

Diff Legend

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