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

Comparing BDB/BDB.xs (file contents):
Revision 1.16 by root, Mon Aug 13 12:01:45 2007 UTC vs.
Revision 1.22 by root, Fri Dec 7 13:14:54 2007 UTC

… …
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,
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, 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};
113 113
114typedef struct aio_cb 114typedef struct aio_cb
… …
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
… …
344 344
345 case REQ_SEQ_GET: 345 case REQ_SEQ_GET:
346 SvREADONLY_off (req->sv1); 346 SvREADONLY_off (req->sv1);
347 347
348 if (sizeof (IV) > 4) 348 if (sizeof (IV) > 4)
349 sv_setiv_mg (req->sv1, req->seq_t); 349 sv_setiv_mg (req->sv1, (IV)req->seq_t);
350 else 350 else
351 sv_setnv_mg (req->sv1, req->seq_t); 351 sv_setnv_mg (req->sv1, (NV)req->seq_t);
352 352
353 SvREFCNT_dec (req->sv1); 353 SvREFCNT_dec (req->sv1);
354 break; 354 break;
355 } 355 }
356 356
… …
379#else 379#else
380# define TO_SOCKET(x) (x) 380# define TO_SOCKET(x) (x)
381#endif 381#endif
382 382
383static void 383static void
384create_pipe (int fd[2]) 384create_respipe ()
385{ 385{
386#ifdef _WIN32 386#ifdef _WIN32
387 int arg = 1; 387 int arg; /* argg */
388#endif
389 int old_readfd = respipe [0];
390
391 if (respipe [1] >= 0)
392 respipe_close (TO_SOCKET (respipe [1]));
393
394#ifdef _WIN32
388 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd) 395 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 396#else
392 if (pipe (fd) 397 if (pipe (respipe))
393 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
394 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
395#endif 398#endif
396 croak ("unable to initialize result pipe"); 399 croak ("unable to initialize result pipe");
400
401 if (old_readfd >= 0)
402 {
403 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
404 croak ("unable to initialize result pipe(2)");
405
406 respipe_close (respipe [0]);
407 respipe [0] = old_readfd;
408 }
409
410#ifdef _WIN32
411 arg = 1;
412 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
413 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
414#else
415 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
416 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
417#endif
418 croak ("unable to initialize result pipe(3)");
397 419
398 respipe_osf [0] = TO_SOCKET (respipe [0]); 420 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]); 421 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 422}
401 423
… …
668 X_UNLOCK (reqlock); 690 X_UNLOCK (reqlock);
669 691
670 switch (req->type) 692 switch (req->type)
671 { 693 {
672 case REQ_QUIT: 694 case REQ_QUIT:
695 req->result = ENOSYS;
673 goto quit; 696 goto quit;
674 697
675 case REQ_ENV_OPEN: 698 case REQ_ENV_OPEN:
676 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 699 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
677 break; 700 break;
… …
736 req->result = req->txn->commit (req->txn, req->uint1); 759 req->result = req->txn->commit (req->txn, req->uint1);
737 break; 760 break;
738 761
739 case REQ_TXN_ABORT: 762 case REQ_TXN_ABORT:
740 req->result = req->txn->abort (req->txn); 763 req->result = req->txn->abort (req->txn);
764 break;
765
766 case REQ_TXN_FINISH:
767 if (req->txn->flags & TXN_DEADLOCK)
768 {
769 req->result = req->txn->abort (req->txn);
770 if (!req->result)
771 req->result = DB_LOCK_DEADLOCK;
772 }
773 else
774 req->result = req->txn->commit (req->txn, req->uint1);
741 break; 775 break;
742 776
743 case REQ_C_CLOSE: 777 case REQ_C_CLOSE:
744 req->result = req->dbc->c_close (req->dbc); 778 req->result = req->dbc->c_close (req->dbc);
745 break; 779 break;
… …
787 default: 821 default:
788 req->result = ENOSYS; 822 req->result = ENOSYS;
789 break; 823 break;
790 } 824 }
791 825
826 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
827 req->txn->flags |= TXN_DEADLOCK;
828
792 X_LOCK (reslock); 829 X_LOCK (reslock);
793 830
794 ++npending; 831 ++npending;
795 832
796 if (!reqq_push (&res_queue, req)) 833 if (!reqq_push (&res_queue, req))
… …
852 idle = 0; 889 idle = 0;
853 nreqs = 0; 890 nreqs = 0;
854 nready = 0; 891 nready = 0;
855 npending = 0; 892 npending = 0;
856 893
857 respipe_close (respipe [0]);
858 respipe_close (respipe [1]);
859
860 create_pipe (respipe); 894 create_respipe ();
861 895
862 atfork_parent (); 896 atfork_parent ();
863} 897}
864 898
865#define dREQ(reqtype) \ 899#define dREQ(reqtype) \
… …
929 const_iv (INIT_TXN) 963 const_iv (INIT_TXN)
930 const_iv (RECOVER) 964 const_iv (RECOVER)
931 const_iv (INIT_TXN) 965 const_iv (INIT_TXN)
932 const_iv (RECOVER_FATAL) 966 const_iv (RECOVER_FATAL)
933 const_iv (CREATE) 967 const_iv (CREATE)
968 const_iv (RDONLY)
934 const_iv (USE_ENVIRON) 969 const_iv (USE_ENVIRON)
935 const_iv (USE_ENVIRON_ROOT) 970 const_iv (USE_ENVIRON_ROOT)
936 const_iv (LOCKDOWN) 971 const_iv (LOCKDOWN)
937 const_iv (PRIVATE) 972 const_iv (PRIVATE)
938 const_iv (REGISTER) 973 const_iv (REGISTER)
… …
951 const_iv (OVERWRITE) 986 const_iv (OVERWRITE)
952 const_iv (PANIC_ENVIRONMENT) 987 const_iv (PANIC_ENVIRONMENT)
953 const_iv (REGION_INIT) 988 const_iv (REGION_INIT)
954 const_iv (TIME_NOTGRANTED) 989 const_iv (TIME_NOTGRANTED)
955 const_iv (TXN_NOSYNC) 990 const_iv (TXN_NOSYNC)
991 const_iv (TXN_NOT_DURABLE)
956 const_iv (TXN_WRITE_NOSYNC) 992 const_iv (TXN_WRITE_NOSYNC)
957 const_iv (WRITECURSOR) 993 const_iv (WRITECURSOR)
958 const_iv (YIELDCPU) 994 const_iv (YIELDCPU)
959 const_iv (ENCRYPT_AES) 995 const_iv (ENCRYPT_AES)
960 const_iv (XA_CREATE) 996 const_iv (XA_CREATE)
… …
968 const_iv (READ_UNCOMMITTED) 1004 const_iv (READ_UNCOMMITTED)
969 const_iv (TRUNCATE) 1005 const_iv (TRUNCATE)
970 const_iv (NOSYNC) 1006 const_iv (NOSYNC)
971 const_iv (CHKSUM) 1007 const_iv (CHKSUM)
972 const_iv (ENCRYPT) 1008 const_iv (ENCRYPT)
973 const_iv (TXN_NOT_DURABLE)
974 const_iv (DUP) 1009 const_iv (DUP)
975 const_iv (DUPSORT) 1010 const_iv (DUPSORT)
976 const_iv (RECNUM) 1011 const_iv (RECNUM)
977 const_iv (RENUMBER) 1012 const_iv (RENUMBER)
978 const_iv (REVSPLITOFF) 1013 const_iv (REVSPLITOFF)
… …
1102 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1137 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1103 1138
1104 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1139 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1105 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1140 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1106 1141
1107 create_pipe (respipe); 1142 create_respipe ();
1108 1143
1109 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1144 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1110#ifdef _WIN32 1145#ifdef _WIN32
1111 X_MUTEX_CHECK (wrklock); 1146 X_MUTEX_CHECK (wrklock);
1112 X_MUTEX_CHECK (reslock); 1147 X_MUTEX_CHECK (reslock);
… …
1500 REQ_SEND; 1535 REQ_SEND;
1501 ptr_nuke (ST (0)); 1536 ptr_nuke (ST (0));
1502} 1537}
1503 1538
1504void 1539void
1540db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1541 CODE:
1542{
1543 dREQ (REQ_TXN_FINISH);
1544 req->txn = txn;
1545 req->uint1 = flags;
1546 REQ_SEND;
1547 ptr_nuke (ST (0));
1548}
1549
1550void
1505db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1551db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1506 CODE: 1552 CODE:
1507{ 1553{
1508 dREQ (REQ_C_CLOSE); 1554 dREQ (REQ_C_CLOSE);
1509 req->dbc = dbc; 1555 req->dbc = dbc;
… …
1707 CODE: 1753 CODE:
1708 RETVAL = env->set_encrypt (env, password, flags); 1754 RETVAL = env->set_encrypt (env, password, flags);
1709 OUTPUT: 1755 OUTPUT:
1710 RETVAL 1756 RETVAL
1711 1757
1712int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1758int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1713 CODE: 1759 CODE:
1714 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1760 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1715 OUTPUT: 1761 OUTPUT:
1716 RETVAL 1762 RETVAL
1717 1763
… …
1765 1811
1766int set_lg_max (DB_ENV *env, U32 max) 1812int set_lg_max (DB_ENV *env, U32 max)
1767 CODE: 1813 CODE:
1768 RETVAL = env->set_lg_max (env, max); 1814 RETVAL = env->set_lg_max (env, max);
1769 OUTPUT: 1815 OUTPUT:
1816 RETVAL
1817
1818int mutex_set_max (DB_ENV *env, U32 max)
1819 CODE:
1820 RETVAL = env->mutex_set_max (env, max);
1821 OUTPUT:
1822 RETVAL
1823
1824int mutex_set_increment (DB_ENV *env, U32 increment)
1825 CODE:
1826 RETVAL = env->mutex_set_increment (env, increment);
1827 OUTPUT:
1828 RETVAL
1829
1830int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1831 CODE:
1832 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1833 OUTPUT:
1834 RETVAL
1835
1836int mutex_set_align (DB_ENV *env, U32 align)
1837 CODE:
1838 RETVAL = env->mutex_set_align (env, align);
1839 OUTPUT:
1770 RETVAL 1840 RETVAL
1771 1841
1772DB_TXN * 1842DB_TXN *
1773txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1843txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1774 CODE: 1844 CODE:
… …
1889DESTROY (DB_TXN_ornull *txn) 1959DESTROY (DB_TXN_ornull *txn)
1890 CODE: 1960 CODE:
1891 if (txn) 1961 if (txn)
1892 txn->abort (txn); 1962 txn->abort (txn);
1893 1963
1894int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1964int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1895 CODE: 1965 CODE:
1896 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 1966 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1967 OUTPUT:
1968 RETVAL
1969
1970int failed (DB_TXN *txn)
1971 CODE:
1972 RETVAL = !!(txn->flags & TXN_DEADLOCK);
1897 OUTPUT: 1973 OUTPUT:
1898 RETVAL 1974 RETVAL
1899 1975
1900 1976
1901MODULE = BDB PACKAGE = BDB::Cursor 1977MODULE = BDB PACKAGE = BDB::Cursor

Diff Legend

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