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

Comparing BDB/BDB.xs (file contents):
Revision 1.13 by root, Sun Jul 8 11:12:12 2007 UTC vs.
Revision 1.19 by root, Mon Sep 24 18:14:11 2007 UTC

… …
45typedef SV SV8; /* byte-sv, used for argument-checking */ 45typedef SV SV8; /* byte-sv, used for argument-checking */
46typedef char *octetstring; 46typedef char *octetstring;
47 47
48static SV *prepare_cb; 48static SV *prepare_cb;
49 49
50#if DB_VERSION_MINOR >= 6
51# define c_close close
52# define c_count count
53# define c_del del
54# define c_dup dup
55# define c_get get
56# define c_pget pget
57# define c_put put
58#endif
59
60static void
61debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
62{
63 printf ("err[%s]\n", msg);
64}
65
66static void
67debug_msgcall (const DB_ENV *dbenv, const char *msg)
68{
69 printf ("msg[%s]\n", msg);
70}
71
50static char * 72static char *
51strdup_ornull (const char *s) 73strdup_ornull (const char *s)
52{ 74{
53 return s ? strdup (s) : 0; 75 return s ? strdup (s) : 0;
54} 76}
… …
82 REQ_QUIT, 104 REQ_QUIT,
83 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,
84 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
85 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,
86 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,
87 REQ_TXN_COMMIT, REQ_TXN_ABORT, 109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
88 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,
89 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,
90}; 112};
91 113
92typedef struct aio_cb 114typedef struct aio_cb
… …
169} 191}
170 192
171static volatile unsigned int nreqs, nready, npending; 193static volatile unsigned int nreqs, nready, npending;
172static volatile unsigned int max_idle = 4; 194static volatile unsigned int max_idle = 4;
173static volatile unsigned int max_outstanding = 0xffffffff; 195static volatile unsigned int max_outstanding = 0xffffffff;
174static int respipe [2], respipe_osf [2]; 196static int respipe_osf [2], respipe [2] = { -1, -1 };
175 197
176static mutex_t reslock = X_MUTEX_INIT; 198static mutex_t reslock = X_MUTEX_INIT;
177static mutex_t reqlock = X_MUTEX_INIT; 199static mutex_t reqlock = X_MUTEX_INIT;
178static cond_t reqwait = X_COND_INIT; 200static cond_t reqwait = X_COND_INIT;
179 201
… …
357#else 379#else
358# define TO_SOCKET(x) (x) 380# define TO_SOCKET(x) (x)
359#endif 381#endif
360 382
361static void 383static void
362create_pipe (int fd[2]) 384create_respipe ()
363{ 385{
386 int old_readfd = respipe [0];
387
388 if (respipe [1] >= 0)
389 respipe_close (TO_SOCKET (respipe [1]));
390
391#ifdef _WIN32
392 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
393#else
394 if (pipe (respipe))
395#endif
396 croak ("unable to initialize result pipe");
397
398 if (old_readfd >= 0)
399 {
400 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
401 croak ("unable to initialize result pipe(2)");
402
403 respipe_close (respipe [0]);
404 respipe [0] = old_readfd;
405 }
406
364#ifdef _WIN32 407#ifdef _WIN32
365 int arg = 1; 408 int arg = 1;
366 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd)
367 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg) 409 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
368 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg)) 410 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
369#else 411#else
370 if (pipe (fd)
371 || fcntl (fd [0], F_SETFL, O_NONBLOCK) 412 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
372 || fcntl (fd [1], F_SETFL, O_NONBLOCK)) 413 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
373#endif 414#endif
374 croak ("unable to initialize result pipe"); 415 croak ("unable to initialize result pipe(3)");
375 416
376 respipe_osf [0] = TO_SOCKET (respipe [0]); 417 respipe_osf [0] = TO_SOCKET (respipe [0]);
377 respipe_osf [1] = TO_SOCKET (respipe [1]); 418 respipe_osf [1] = TO_SOCKET (respipe [1]);
378} 419}
379 420
… …
646 X_UNLOCK (reqlock); 687 X_UNLOCK (reqlock);
647 688
648 switch (req->type) 689 switch (req->type)
649 { 690 {
650 case REQ_QUIT: 691 case REQ_QUIT:
692 req->result = ENOSYS;
651 goto quit; 693 goto quit;
652 694
653 case REQ_ENV_OPEN: 695 case REQ_ENV_OPEN:
654 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); 696 req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
655 break; 697 break;
… …
714 req->result = req->txn->commit (req->txn, req->uint1); 756 req->result = req->txn->commit (req->txn, req->uint1);
715 break; 757 break;
716 758
717 case REQ_TXN_ABORT: 759 case REQ_TXN_ABORT:
718 req->result = req->txn->abort (req->txn); 760 req->result = req->txn->abort (req->txn);
761 break;
762
763 case REQ_TXN_FINISH:
764 if (req->txn->flags & TXN_DEADLOCK)
765 {
766 req->result = req->txn->abort (req->txn);
767 if (!req->result)
768 req->result = DB_LOCK_DEADLOCK;
769 }
770 else
771 req->result = req->txn->commit (req->txn, req->uint1);
719 break; 772 break;
720 773
721 case REQ_C_CLOSE: 774 case REQ_C_CLOSE:
722 req->result = req->dbc->c_close (req->dbc); 775 req->result = req->dbc->c_close (req->dbc);
723 break; 776 break;
… …
765 default: 818 default:
766 req->result = ENOSYS; 819 req->result = ENOSYS;
767 break; 820 break;
768 } 821 }
769 822
823 if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
824 req->txn->flags |= TXN_DEADLOCK;
825
770 X_LOCK (reslock); 826 X_LOCK (reslock);
771 827
772 ++npending; 828 ++npending;
773 829
774 if (!reqq_push (&res_queue, req)) 830 if (!reqq_push (&res_queue, req))
… …
830 idle = 0; 886 idle = 0;
831 nreqs = 0; 887 nreqs = 0;
832 nready = 0; 888 nready = 0;
833 npending = 0; 889 npending = 0;
834 890
835 respipe_close (respipe [0]);
836 respipe_close (respipe [1]);
837
838 create_pipe (respipe); 891 create_respipe ();
839 892
840 atfork_parent (); 893 atfork_parent ();
841} 894}
842 895
843#define dREQ(reqtype) \ 896#define dREQ(reqtype) \
… …
1018 const_iv (LOCK_YOUNGEST) 1071 const_iv (LOCK_YOUNGEST)
1019 1072
1020 const_iv (SEQ_DEC) 1073 const_iv (SEQ_DEC)
1021 const_iv (SEQ_INC) 1074 const_iv (SEQ_INC)
1022 const_iv (SEQ_WRAP) 1075 const_iv (SEQ_WRAP)
1076
1077 const_iv (BUFFER_SMALL)
1078 const_iv (DONOTINDEX)
1079 const_iv (KEYEMPTY )
1080 const_iv (KEYEXIST )
1081 const_iv (LOCK_DEADLOCK)
1082 const_iv (LOCK_NOTGRANTED)
1083 const_iv (LOG_BUFFER_FULL)
1084 const_iv (NOSERVER)
1085 const_iv (NOSERVER_HOME)
1086 const_iv (NOSERVER_ID)
1087 const_iv (NOTFOUND)
1088 const_iv (OLD_VERSION)
1089 const_iv (PAGE_NOTFOUND)
1090 const_iv (REP_DUPMASTER)
1091 const_iv (REP_HANDLE_DEAD)
1092 const_iv (REP_HOLDELECTION)
1093 const_iv (REP_IGNORE)
1094 const_iv (REP_ISPERM)
1095 const_iv (REP_JOIN_FAILURE)
1096 const_iv (REP_LOCKOUT)
1097 const_iv (REP_NEWMASTER)
1098 const_iv (REP_NEWSITE)
1099 const_iv (REP_NOTPERM)
1100 const_iv (REP_UNAVAIL)
1101 const_iv (RUNRECOVERY)
1102 const_iv (SECONDARY_BAD)
1103 const_iv (VERIFY_BAD)
1104 const_iv (VERSION_MISMATCH)
1105
1106 const_iv (VERB_DEADLOCK)
1107 const_iv (VERB_RECOVERY)
1108 const_iv (VERB_REGISTER)
1109 const_iv (VERB_REPLICATION)
1110 const_iv (VERB_WAITSFOR)
1111
1112 const_iv (VERSION_MAJOR)
1113 const_iv (VERSION_MINOR)
1114 const_iv (VERSION_PATCH)
1023#if DB_VERSION_MINOR >= 5 1115#if DB_VERSION_MINOR >= 5
1024 const_iv (MULTIVERSION) 1116 const_iv (MULTIVERSION)
1025 const_iv (TXN_SNAPSHOT) 1117 const_iv (TXN_SNAPSHOT)
1026#endif 1118#endif
1119#if DB_VERSION_MINOR >= 6
1120 const_iv (PREV_DUP)
1121# if 0
1122 const_iv (PRIORITY_UNCHANGED)
1123 const_iv (PRIORITY_VERY_LOW)
1124 const_iv (PRIORITY_LOW)
1125 const_iv (PRIORITY_DEFAULT)
1126 const_iv (PRIORITY_HIGH)
1127 const_iv (PRIORITY_VERY_HIGH)
1128# endif
1129#endif
1027 }; 1130 };
1028 1131
1029 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1132 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1030 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1133 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1031 1134
1135 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1136 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1137
1032 create_pipe (respipe); 1138 create_respipe ();
1033 1139
1034 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1140 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1035#ifdef _WIN32 1141#ifdef _WIN32
1036 X_MUTEX_CHECK (wrklock); 1142 X_MUTEX_CHECK (wrklock);
1037 X_MUTEX_CHECK (reslock); 1143 X_MUTEX_CHECK (reslock);
… …
1178 PROTOTYPE: & 1284 PROTOTYPE: &
1179 CODE: 1285 CODE:
1180 SvREFCNT_dec (prepare_cb); 1286 SvREFCNT_dec (prepare_cb);
1181 prepare_cb = newSVsv (cb); 1287 prepare_cb = newSVsv (cb);
1182 1288
1289char *
1290strerror (int errorno = errno)
1291 PROTOTYPE: ;$
1292 CODE:
1293 RETVAL = db_strerror (errorno);
1294 OUTPUT:
1295 RETVAL
1183 1296
1184DB_ENV * 1297DB_ENV *
1185db_env_create (U32 env_flags = 0) 1298db_env_create (U32 env_flags = 0)
1186 CODE: 1299 CODE:
1187{ 1300{
1188 errno = db_env_create (&RETVAL, env_flags); 1301 errno = db_env_create (&RETVAL, env_flags);
1189 if (errno) 1302 if (errno)
1190 croak ("db_env_create: %s", db_strerror (errno)); 1303 croak ("db_env_create: %s", db_strerror (errno));
1304
1305 if (0)
1306 {
1307 RETVAL->set_errcall (RETVAL, debug_errcall);
1308 RETVAL->set_msgcall (RETVAL, debug_msgcall);
1309 }
1191} 1310}
1192 OUTPUT: 1311 OUTPUT:
1193 RETVAL 1312 RETVAL
1194 1313
1195void 1314void
1196db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1315db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1197 CODE: 1316 CODE:
1198{ 1317{
1199 dREQ (REQ_ENV_OPEN); 1318 dREQ (REQ_ENV_OPEN);
1200 1319
1201 env->set_thread_count (env, get_nthreads ()); 1320 env->set_thread_count (env, wanted + 2);
1202 1321
1203 req->env = env; 1322 req->env = env;
1204 req->uint1 = open_flags | DB_THREAD; 1323 req->uint1 = open_flags | DB_THREAD;
1205 req->int1 = mode; 1324 req->int1 = mode;
1206 req->buf1 = strdup_ornull (db_home); 1325 req->buf1 = strdup_ornull (db_home);
… …
1412 REQ_SEND; 1531 REQ_SEND;
1413 ptr_nuke (ST (0)); 1532 ptr_nuke (ST (0));
1414} 1533}
1415 1534
1416void 1535void
1536db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
1537 CODE:
1538{
1539 dREQ (REQ_TXN_FINISH);
1540 req->txn = txn;
1541 req->uint1 = flags;
1542 REQ_SEND;
1543 ptr_nuke (ST (0));
1544}
1545
1546void
1417db_c_close (DBC *dbc, SV *callback = &PL_sv_undef) 1547db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
1418 CODE: 1548 CODE:
1419{ 1549{
1420 dREQ (REQ_C_CLOSE); 1550 dREQ (REQ_C_CLOSE);
1421 req->dbc = dbc; 1551 req->dbc = dbc;
… …
1599 CODE: 1729 CODE:
1600 RETVAL = env->set_flags (env, flags, onoff); 1730 RETVAL = env->set_flags (env, flags, onoff);
1601 OUTPUT: 1731 OUTPUT:
1602 RETVAL 1732 RETVAL
1603 1733
1734void set_errfile (DB_ENV *env, FILE *errfile = 0)
1735 CODE:
1736 env->set_errfile (env, errfile);
1737
1738void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1739 CODE:
1740 env->set_msgfile (env, msgfile);
1741
1742int set_verbose (DB_ENV *env, U32 which, int onoff = 1)
1743 CODE:
1744 RETVAL = env->set_verbose (env, which, onoff);
1745 OUTPUT:
1746 RETVAL
1747
1604int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0) 1748int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
1605 CODE: 1749 CODE:
1606 RETVAL = env->set_encrypt (env, password, flags); 1750 RETVAL = env->set_encrypt (env, password, flags);
1607 OUTPUT: 1751 OUTPUT:
1608 RETVAL 1752 RETVAL
1609 1753
1610int set_timeout (DB_ENV *env, NV timeout, U32 flags) 1754int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1611 CODE: 1755 CODE:
1612 RETVAL = env->set_timeout (env, timeout * 1000000, flags); 1756 RETVAL = env->set_timeout (env, timeout * 1000000, flags);
1613 OUTPUT: 1757 OUTPUT:
1614 RETVAL 1758 RETVAL
1615 1759
… …
1692 CODE: 1836 CODE:
1693 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 1837 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
1694 OUTPUT: 1838 OUTPUT:
1695 RETVAL 1839 RETVAL
1696 1840
1697int set_flags (DB *db, U32 flags); 1841int set_flags (DB *db, U32 flags)
1698 CODE: 1842 CODE:
1699 RETVAL = db->set_flags (db, flags); 1843 RETVAL = db->set_flags (db, flags);
1700 OUTPUT: 1844 OUTPUT:
1701 RETVAL 1845 RETVAL
1702 1846
… …
1716 CODE: 1860 CODE:
1717 RETVAL = db->set_bt_minkey (db, minkey); 1861 RETVAL = db->set_bt_minkey (db, minkey);
1718 OUTPUT: 1862 OUTPUT:
1719 RETVAL 1863 RETVAL
1720 1864
1721int set_re_delim(DB *db, int delim); 1865int set_re_delim (DB *db, int delim)
1722 CODE: 1866 CODE:
1723 RETVAL = db->set_re_delim (db, delim); 1867 RETVAL = db->set_re_delim (db, delim);
1724 OUTPUT: 1868 OUTPUT:
1725 RETVAL 1869 RETVAL
1726 1870
… …
1787DESTROY (DB_TXN_ornull *txn) 1931DESTROY (DB_TXN_ornull *txn)
1788 CODE: 1932 CODE:
1789 if (txn) 1933 if (txn)
1790 txn->abort (txn); 1934 txn->abort (txn);
1791 1935
1792int set_timeout (DB_TXN *txn, NV timeout, U32 flags) 1936int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
1793 CODE: 1937 CODE:
1794 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags); 1938 RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
1939 OUTPUT:
1940 RETVAL
1941
1942int failed (DB_TXN *txn)
1943 CODE:
1944 RETVAL = !!(txn->flags & TXN_DEADLOCK);
1795 OUTPUT: 1945 OUTPUT:
1796 RETVAL 1946 RETVAL
1797 1947
1798 1948
1799MODULE = BDB PACKAGE = BDB::Cursor 1949MODULE = BDB PACKAGE = BDB::Cursor

Diff Legend

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