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.23 by root, Fri Dec 7 13:38: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
… …
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
… …
668 X_UNLOCK (reqlock); 696 X_UNLOCK (reqlock);
669 697
670 switch (req->type) 698 switch (req->type)
671 { 699 {
672 case REQ_QUIT: 700 case REQ_QUIT:
701 req->result = ENOSYS;
673 goto quit; 702 goto quit;
674 703
675 case REQ_ENV_OPEN: 704 case REQ_ENV_OPEN:
676 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 705 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
677 break; 706 break;
… …
736 req->result = req->txn->commit (req->txn, req->uint1); 765 req->result = req->txn->commit (req->txn, req->uint1);
737 break; 766 break;
738 767
739 case REQ_TXN_ABORT: 768 case REQ_TXN_ABORT:
740 req->result = req->txn->abort (req->txn); 769 req->result = req->txn->abort (req->txn);
770 break;
771
772 case REQ_TXN_FINISH:
773 if (req->txn->flags & TXN_DEADLOCK)
774 {
775 req->result = req->txn->abort (req->txn);
776 if (!req->result)
777 req->result = DB_LOCK_DEADLOCK;
778 }
779 else
780 req->result = req->txn->commit (req->txn, req->uint1);
741 break; 781 break;
742 782
743 case REQ_C_CLOSE: 783 case REQ_C_CLOSE:
744 req->result = req->dbc->c_close (req->dbc); 784 req->result = req->dbc->c_close (req->dbc);
745 break; 785 break;
… …
787 default: 827 default:
788 req->result = ENOSYS; 828 req->result = ENOSYS;
789 break; 829 break;
790 } 830 }
791 831
832 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
833 req->txn->flags |= TXN_DEADLOCK;
834
792 X_LOCK (reslock); 835 X_LOCK (reslock);
793 836
794 ++npending; 837 ++npending;
795 838
796 if (!reqq_push (&res_queue, req)) 839 if (!reqq_push (&res_queue, req))
… …
852 idle = 0; 895 idle = 0;
853 nreqs = 0; 896 nreqs = 0;
854 nready = 0; 897 nready = 0;
855 npending = 0; 898 npending = 0;
856 899
857 respipe_close (respipe [0]);
858 respipe_close (respipe [1]);
859
860 create_pipe (respipe); 900 create_respipe ();
861 901
862 atfork_parent (); 902 atfork_parent ();
863} 903}
864 904
865#define dREQ(reqtype) \ 905#define dREQ(reqtype) \
… …
929 const_iv (INIT_TXN) 969 const_iv (INIT_TXN)
930 const_iv (RECOVER) 970 const_iv (RECOVER)
931 const_iv (INIT_TXN) 971 const_iv (INIT_TXN)
932 const_iv (RECOVER_FATAL) 972 const_iv (RECOVER_FATAL)
933 const_iv (CREATE) 973 const_iv (CREATE)
974 const_iv (RDONLY)
934 const_iv (USE_ENVIRON) 975 const_iv (USE_ENVIRON)
935 const_iv (USE_ENVIRON_ROOT) 976 const_iv (USE_ENVIRON_ROOT)
936 const_iv (LOCKDOWN) 977 const_iv (LOCKDOWN)
937 const_iv (PRIVATE) 978 const_iv (PRIVATE)
938 const_iv (REGISTER) 979 const_iv (REGISTER)
… …
951 const_iv (OVERWRITE) 992 const_iv (OVERWRITE)
952 const_iv (PANIC_ENVIRONMENT) 993 const_iv (PANIC_ENVIRONMENT)
953 const_iv (REGION_INIT) 994 const_iv (REGION_INIT)
954 const_iv (TIME_NOTGRANTED) 995 const_iv (TIME_NOTGRANTED)
955 const_iv (TXN_NOSYNC) 996 const_iv (TXN_NOSYNC)
997 const_iv (TXN_NOT_DURABLE)
956 const_iv (TXN_WRITE_NOSYNC) 998 const_iv (TXN_WRITE_NOSYNC)
957 const_iv (WRITECURSOR) 999 const_iv (WRITECURSOR)
958 const_iv (YIELDCPU) 1000 const_iv (YIELDCPU)
959 const_iv (ENCRYPT_AES) 1001 const_iv (ENCRYPT_AES)
960 const_iv (XA_CREATE) 1002 const_iv (XA_CREATE)
… …
968 const_iv (READ_UNCOMMITTED) 1010 const_iv (READ_UNCOMMITTED)
969 const_iv (TRUNCATE) 1011 const_iv (TRUNCATE)
970 const_iv (NOSYNC) 1012 const_iv (NOSYNC)
971 const_iv (CHKSUM) 1013 const_iv (CHKSUM)
972 const_iv (ENCRYPT) 1014 const_iv (ENCRYPT)
973 const_iv (TXN_NOT_DURABLE)
974 const_iv (DUP) 1015 const_iv (DUP)
975 const_iv (DUPSORT) 1016 const_iv (DUPSORT)
976 const_iv (RECNUM) 1017 const_iv (RECNUM)
977 const_iv (RENUMBER) 1018 const_iv (RENUMBER)
978 const_iv (REVSPLITOFF) 1019 const_iv (REVSPLITOFF)
… …
1102 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1143 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1103 1144
1104 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1145 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1105 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1146 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1106 1147
1107 create_pipe (respipe); 1148 create_respipe ();
1108 1149
1109 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1150 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1110#ifdef _WIN32 1151#ifdef _WIN32
1111 X_MUTEX_CHECK (wrklock); 1152 X_MUTEX_CHECK (wrklock);
1112 X_MUTEX_CHECK (reslock); 1153 X_MUTEX_CHECK (reslock);
… …
1500 REQ_SEND; 1541 REQ_SEND;
1501 ptr_nuke (ST (0)); 1542 ptr_nuke (ST (0));
1502} 1543}
1503 1544
1504void 1545void
1546db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1547 CODE:
1548{
1549 dREQ (REQ_TXN_FINISH);
1550 req->txn = txn;
1551 req->uint1 = flags;
1552 REQ_SEND;
1553 ptr_nuke (ST (0));
1554}
1555
1556void
1505db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1557db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1506 CODE: 1558 CODE:
1507{ 1559{
1508 dREQ (REQ_C_CLOSE); 1560 dREQ (REQ_C_CLOSE);
1509 req->dbc = dbc; 1561 req->dbc = dbc;
… …
1707 CODE: 1759 CODE:
1708 RETVAL = env->set_encrypt (env, password, flags); 1760 RETVAL = env->set_encrypt (env, password, flags);
1709 OUTPUT: 1761 OUTPUT:
1710 RETVAL 1762 RETVAL
1711 1763
1712int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1764int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1713 CODE: 1765 CODE:
1714 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1766 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1715 OUTPUT: 1767 OUTPUT:
1716 RETVAL 1768 RETVAL
1717 1769
… …
1765 1817
1766int set_lg_max (DB_ENV *env, U32 max) 1818int set_lg_max (DB_ENV *env, U32 max)
1767 CODE: 1819 CODE:
1768 RETVAL = env->set_lg_max (env, max); 1820 RETVAL = env->set_lg_max (env, max);
1769 OUTPUT: 1821 OUTPUT:
1822 RETVAL
1823
1824int mutex_set_max (DB_ENV *env, U32 max)
1825 CODE:
1826 RETVAL = env->mutex_set_max (env, max);
1827 OUTPUT:
1828 RETVAL
1829
1830int mutex_set_increment (DB_ENV *env, U32 increment)
1831 CODE:
1832 RETVAL = env->mutex_set_increment (env, increment);
1833 OUTPUT:
1834 RETVAL
1835
1836int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1837 CODE:
1838 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1839 OUTPUT:
1840 RETVAL
1841
1842int mutex_set_align (DB_ENV *env, U32 align)
1843 CODE:
1844 RETVAL = env->mutex_set_align (env, align);
1845 OUTPUT:
1770 RETVAL 1846 RETVAL
1771 1847
1772DB_TXN * 1848DB_TXN *
1773txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1849txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1774 CODE: 1850 CODE:
… …
1889DESTROY (DB_TXN_ornull *txn) 1965DESTROY (DB_TXN_ornull *txn)
1890 CODE: 1966 CODE:
1891 if (txn) 1967 if (txn)
1892 txn->abort (txn); 1968 txn->abort (txn);
1893 1969
1894int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1970int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1895 CODE: 1971 CODE:
1896 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 1972 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1973 OUTPUT:
1974 RETVAL
1975
1976int failed (DB_TXN *txn)
1977 CODE:
1978 RETVAL = !!(txn->flags & TXN_DEADLOCK);
1897 OUTPUT: 1979 OUTPUT:
1898 RETVAL 1980 RETVAL
1899 1981
1900 1982
1901MODULE = BDB PACKAGE = BDB::Cursor 1983MODULE = BDB PACKAGE = BDB::Cursor

Diff Legend

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