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

Comparing BDB/BDB.xs (file contents):
Revision 1.17 by root, Thu Sep 13 21:34:00 2007 UTC vs.
Revision 1.23 by root, Fri Dec 7 13:38:54 2007 UTC

… …
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
… …
741 req->result = req->txn->abort (req->txn); 769 req->result = req->txn->abort (req->txn);
742 break; 770 break;
743 771
744 case REQ_TXN_FINISH: 772 case REQ_TXN_FINISH:
745 if (req->txn->flags & TXN_DEADLOCK) 773 if (req->txn->flags & TXN_DEADLOCK)
746 req->result = req->txn->commit (req->txn, req->uint1);
747 else
748 { 774 {
749 req->result = req->txn->abort (req->txn); 775 req->result = req->txn->abort (req->txn);
750 if (!req->result) 776 if (!req->result)
751 req->result = DB_LOCK_DEADLOCK; 777 req->result = DB_LOCK_DEADLOCK;
752 } 778 }
779 else
780 req->result = req->txn->commit (req->txn, req->uint1);
753 break; 781 break;
754 782
755 case REQ_C_CLOSE: 783 case REQ_C_CLOSE:
756 req->result = req->dbc->c_close (req->dbc); 784 req->result = req->dbc->c_close (req->dbc);
757 break; 785 break;
… …
867 idle = 0; 895 idle = 0;
868 nreqs = 0; 896 nreqs = 0;
869 nready = 0; 897 nready = 0;
870 npending = 0; 898 npending = 0;
871 899
872 respipe_close (respipe [0]);
873 respipe_close (respipe [1]);
874
875 create_pipe (respipe); 900 create_respipe ();
876 901
877 atfork_parent (); 902 atfork_parent ();
878} 903}
879 904
880#define dREQ(reqtype) \ 905#define dREQ(reqtype) \
… …
944 const_iv (INIT_TXN) 969 const_iv (INIT_TXN)
945 const_iv (RECOVER) 970 const_iv (RECOVER)
946 const_iv (INIT_TXN) 971 const_iv (INIT_TXN)
947 const_iv (RECOVER_FATAL) 972 const_iv (RECOVER_FATAL)
948 const_iv (CREATE) 973 const_iv (CREATE)
974 const_iv (RDONLY)
949 const_iv (USE_ENVIRON) 975 const_iv (USE_ENVIRON)
950 const_iv (USE_ENVIRON_ROOT) 976 const_iv (USE_ENVIRON_ROOT)
951 const_iv (LOCKDOWN) 977 const_iv (LOCKDOWN)
952 const_iv (PRIVATE) 978 const_iv (PRIVATE)
953 const_iv (REGISTER) 979 const_iv (REGISTER)
… …
966 const_iv (OVERWRITE) 992 const_iv (OVERWRITE)
967 const_iv (PANIC_ENVIRONMENT) 993 const_iv (PANIC_ENVIRONMENT)
968 const_iv (REGION_INIT) 994 const_iv (REGION_INIT)
969 const_iv (TIME_NOTGRANTED) 995 const_iv (TIME_NOTGRANTED)
970 const_iv (TXN_NOSYNC) 996 const_iv (TXN_NOSYNC)
997 const_iv (TXN_NOT_DURABLE)
971 const_iv (TXN_WRITE_NOSYNC) 998 const_iv (TXN_WRITE_NOSYNC)
972 const_iv (WRITECURSOR) 999 const_iv (WRITECURSOR)
973 const_iv (YIELDCPU) 1000 const_iv (YIELDCPU)
974 const_iv (ENCRYPT_AES) 1001 const_iv (ENCRYPT_AES)
975 const_iv (XA_CREATE) 1002 const_iv (XA_CREATE)
… …
983 const_iv (READ_UNCOMMITTED) 1010 const_iv (READ_UNCOMMITTED)
984 const_iv (TRUNCATE) 1011 const_iv (TRUNCATE)
985 const_iv (NOSYNC) 1012 const_iv (NOSYNC)
986 const_iv (CHKSUM) 1013 const_iv (CHKSUM)
987 const_iv (ENCRYPT) 1014 const_iv (ENCRYPT)
988 const_iv (TXN_NOT_DURABLE)
989 const_iv (DUP) 1015 const_iv (DUP)
990 const_iv (DUPSORT) 1016 const_iv (DUPSORT)
991 const_iv (RECNUM) 1017 const_iv (RECNUM)
992 const_iv (RENUMBER) 1018 const_iv (RENUMBER)
993 const_iv (REVSPLITOFF) 1019 const_iv (REVSPLITOFF)
… …
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, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1120 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1146 newCONSTSUB (stash, "DB_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);
… …
1793 CODE: 1819 CODE:
1794 RETVAL = env->set_lg_max (env, max); 1820 RETVAL = env->set_lg_max (env, max);
1795 OUTPUT: 1821 OUTPUT:
1796 RETVAL 1822 RETVAL
1797 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:
1846 RETVAL
1847
1798DB_TXN * 1848DB_TXN *
1799txn_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)
1800 CODE: 1850 CODE:
1801 errno = env->txn_begin (env, parent, &RETVAL, flags); 1851 errno = env->txn_begin (env, parent, &RETVAL, flags);
1802 if (errno) 1852 if (errno)

Diff Legend

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