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.26 by root, Mon Dec 10 21:19:07 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
… …
711 739
712 case REQ_DB_SYNC: 740 case REQ_DB_SYNC:
713 req->result = req->db->sync (req->db, req->uint1); 741 req->result = req->db->sync (req->db, req->uint1);
714 break; 742 break;
715 743
744 case REQ_DB_UPGRADE:
745 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
746 break;
747
716 case REQ_DB_PUT: 748 case REQ_DB_PUT:
717 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 749 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
718 break; 750 break;
719 751
720 case REQ_DB_GET: 752 case REQ_DB_GET:
… …
741 req->result = req->txn->abort (req->txn); 773 req->result = req->txn->abort (req->txn);
742 break; 774 break;
743 775
744 case REQ_TXN_FINISH: 776 case REQ_TXN_FINISH:
745 if (req->txn->flags & TXN_DEADLOCK) 777 if (req->txn->flags & TXN_DEADLOCK)
746 req->result = req->txn->commit (req->txn, req->uint1);
747 else
748 { 778 {
749 req->result = req->txn->abort (req->txn); 779 req->result = req->txn->abort (req->txn);
750 if (!req->result) 780 if (!req->result)
751 req->result = DB_LOCK_DEADLOCK; 781 req->result = DB_LOCK_DEADLOCK;
752 } 782 }
783 else
784 req->result = req->txn->commit (req->txn, req->uint1);
753 break; 785 break;
754 786
755 case REQ_C_CLOSE: 787 case REQ_C_CLOSE:
756 req->result = req->dbc->c_close (req->dbc); 788 req->result = req->dbc->c_close (req->dbc);
757 break; 789 break;
… …
867 idle = 0; 899 idle = 0;
868 nreqs = 0; 900 nreqs = 0;
869 nready = 0; 901 nready = 0;
870 npending = 0; 902 npending = 0;
871 903
872 respipe_close (respipe [0]);
873 respipe_close (respipe [1]);
874
875 create_pipe (respipe); 904 create_respipe ();
876 905
877 atfork_parent (); 906 atfork_parent ();
878} 907}
879 908
880#define dREQ(reqtype) \ 909#define dREQ(reqtype) \
… …
944 const_iv (INIT_TXN) 973 const_iv (INIT_TXN)
945 const_iv (RECOVER) 974 const_iv (RECOVER)
946 const_iv (INIT_TXN) 975 const_iv (INIT_TXN)
947 const_iv (RECOVER_FATAL) 976 const_iv (RECOVER_FATAL)
948 const_iv (CREATE) 977 const_iv (CREATE)
978 const_iv (RDONLY)
949 const_iv (USE_ENVIRON) 979 const_iv (USE_ENVIRON)
950 const_iv (USE_ENVIRON_ROOT) 980 const_iv (USE_ENVIRON_ROOT)
951 const_iv (LOCKDOWN) 981 const_iv (LOCKDOWN)
952 const_iv (PRIVATE) 982 const_iv (PRIVATE)
953 const_iv (REGISTER) 983 const_iv (REGISTER)
… …
966 const_iv (OVERWRITE) 996 const_iv (OVERWRITE)
967 const_iv (PANIC_ENVIRONMENT) 997 const_iv (PANIC_ENVIRONMENT)
968 const_iv (REGION_INIT) 998 const_iv (REGION_INIT)
969 const_iv (TIME_NOTGRANTED) 999 const_iv (TIME_NOTGRANTED)
970 const_iv (TXN_NOSYNC) 1000 const_iv (TXN_NOSYNC)
1001 const_iv (TXN_NOT_DURABLE)
971 const_iv (TXN_WRITE_NOSYNC) 1002 const_iv (TXN_WRITE_NOSYNC)
972 const_iv (WRITECURSOR) 1003 const_iv (WRITECURSOR)
973 const_iv (YIELDCPU) 1004 const_iv (YIELDCPU)
974 const_iv (ENCRYPT_AES) 1005 const_iv (ENCRYPT_AES)
975 const_iv (XA_CREATE) 1006 const_iv (XA_CREATE)
… …
983 const_iv (READ_UNCOMMITTED) 1014 const_iv (READ_UNCOMMITTED)
984 const_iv (TRUNCATE) 1015 const_iv (TRUNCATE)
985 const_iv (NOSYNC) 1016 const_iv (NOSYNC)
986 const_iv (CHKSUM) 1017 const_iv (CHKSUM)
987 const_iv (ENCRYPT) 1018 const_iv (ENCRYPT)
988 const_iv (TXN_NOT_DURABLE)
989 const_iv (DUP) 1019 const_iv (DUP)
990 const_iv (DUPSORT) 1020 const_iv (DUPSORT)
991 const_iv (RECNUM) 1021 const_iv (RECNUM)
992 const_iv (RENUMBER) 1022 const_iv (RENUMBER)
993 const_iv (REVSPLITOFF) 1023 const_iv (REVSPLITOFF)
… …
1067 const_iv (LOG_BUFFER_FULL) 1097 const_iv (LOG_BUFFER_FULL)
1068 const_iv (NOSERVER) 1098 const_iv (NOSERVER)
1069 const_iv (NOSERVER_HOME) 1099 const_iv (NOSERVER_HOME)
1070 const_iv (NOSERVER_ID) 1100 const_iv (NOSERVER_ID)
1071 const_iv (NOTFOUND) 1101 const_iv (NOTFOUND)
1072 const_iv (OLD_VERSION)
1073 const_iv (PAGE_NOTFOUND) 1102 const_iv (PAGE_NOTFOUND)
1074 const_iv (REP_DUPMASTER) 1103 const_iv (REP_DUPMASTER)
1075 const_iv (REP_HANDLE_DEAD) 1104 const_iv (REP_HANDLE_DEAD)
1076 const_iv (REP_HOLDELECTION) 1105 const_iv (REP_HOLDELECTION)
1077 const_iv (REP_IGNORE) 1106 const_iv (REP_IGNORE)
… …
1114 }; 1143 };
1115 1144
1116 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1145 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1117 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1146 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1118 1147
1119 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1148 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1120 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1149 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1121 1150
1122 create_pipe (respipe); 1151 create_respipe ();
1123 1152
1124 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1153 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1125#ifdef _WIN32 1154#ifdef _WIN32
1126 X_MUTEX_CHECK (wrklock); 1155 X_MUTEX_CHECK (wrklock);
1127 X_MUTEX_CHECK (reslock); 1156 X_MUTEX_CHECK (reslock);
… …
1427 req->uint1 = flags; 1456 req->uint1 = flags;
1428 REQ_SEND; 1457 REQ_SEND;
1429} 1458}
1430 1459
1431void 1460void
1461db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
1462 CODE:
1463{
1464 dREQ (REQ_DB_SYNC);
1465 req->db = db;
1466 req->buf1 = strdup (file);
1467 req->uint1 = flags;
1468 REQ_SEND;
1469}
1470
1471void
1432db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1472db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1433 CODE: 1473 CODE:
1434{ 1474{
1435 dREQ (REQ_DB_KEY_RANGE); 1475 dREQ (REQ_DB_KEY_RANGE);
1436 req->db = db; 1476 req->db = db;
… …
1707 CODE: 1747 CODE:
1708 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1748 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1709 OUTPUT: 1749 OUTPUT:
1710 RETVAL 1750 RETVAL
1711 1751
1712int set_flags (DB_ENV *env, U32 flags, int onoff) 1752int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1713 CODE: 1753 CODE:
1714 RETVAL = env->set_flags (env, flags, onoff); 1754 RETVAL = env->set_flags (env, flags, onoff);
1715 OUTPUT: 1755 OUTPUT:
1716 RETVAL 1756 RETVAL
1717 1757
… …
1721 1761
1722void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1762void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1723 CODE: 1763 CODE:
1724 env->set_msgfile (env, msgfile); 1764 env->set_msgfile (env, msgfile);
1725 1765
1726int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1766int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1727 CODE: 1767 CODE:
1728 RETVAL = env->set_verbose (env, which, onoff); 1768 RETVAL = env->set_verbose (env, which, onoff);
1729 OUTPUT: 1769 OUTPUT:
1730 RETVAL 1770 RETVAL
1731 1771
… …
1791 1831
1792int set_lg_max (DB_ENV *env, U32 max) 1832int set_lg_max (DB_ENV *env, U32 max)
1793 CODE: 1833 CODE:
1794 RETVAL = env->set_lg_max (env, max); 1834 RETVAL = env->set_lg_max (env, max);
1795 OUTPUT: 1835 OUTPUT:
1836 RETVAL
1837
1838int mutex_set_max (DB_ENV *env, U32 max)
1839 CODE:
1840 RETVAL = env->mutex_set_max (env, max);
1841 OUTPUT:
1842 RETVAL
1843
1844int mutex_set_increment (DB_ENV *env, U32 increment)
1845 CODE:
1846 RETVAL = env->mutex_set_increment (env, increment);
1847 OUTPUT:
1848 RETVAL
1849
1850int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1851 CODE:
1852 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1853 OUTPUT:
1854 RETVAL
1855
1856int mutex_set_align (DB_ENV *env, U32 align)
1857 CODE:
1858 RETVAL = env->mutex_set_align (env, align);
1859 OUTPUT:
1796 RETVAL 1860 RETVAL
1797 1861
1798DB_TXN * 1862DB_TXN *
1799txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1863txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1800 CODE: 1864 CODE:

Diff Legend

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