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

Comparing BDB/BDB.xs (file contents):
Revision 1.26 by root, Mon Dec 10 21:19:07 2007 UTC vs.
Revision 1.30 by root, Sun Jan 13 09:43:21 2008 UTC

… …
39typedef DB_ENV DB_ENV_ornull; 39typedef DB_ENV DB_ENV_ornull;
40typedef DB_TXN DB_TXN_ornull; 40typedef DB_TXN DB_TXN_ornull;
41typedef DBC DBC_ornull; 41typedef DBC DBC_ornull;
42typedef DB DB_ornull; 42typedef DB DB_ornull;
43typedef DB_SEQUENCE DB_SEQUENCE_ornull; 43typedef DB_SEQUENCE DB_SEQUENCE_ornull;
44
45typedef DB_ENV DB_ENV_ornuked;
46typedef DB_TXN DB_TXN_ornuked;
47typedef DBC DBC_ornuked;
48typedef DB DB_ornuked;
49typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
44 50
45typedef SV SV8; /* byte-sv, used for argument-checking */ 51typedef SV SV8; /* byte-sv, used for argument-checking */
46typedef char *octetstring; 52typedef char *octetstring;
47 53
48static SV *prepare_cb; 54static SV *prepare_cb;
… …
109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 115 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, 116 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, 117 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
112}; 118};
113 119
114typedef struct aio_cb 120typedef struct bdb_cb
115{ 121{
116 struct aio_cb *volatile next; 122 struct bdb_cb *volatile next;
117 SV *callback; 123 SV *callback;
118 int type, pri, result; 124 int type, pri, result;
119 125
120 DB_ENV *env; 126 DB_ENV *env;
121 DB *db; 127 DB *db;
… …
130 136
131 DBT dbt1, dbt2, dbt3; 137 DBT dbt1, dbt2, dbt3;
132 DB_KEY_RANGE key_range; 138 DB_KEY_RANGE key_range;
133 DB_SEQUENCE *seq; 139 DB_SEQUENCE *seq;
134 db_seq_t seq_t; 140 db_seq_t seq_t;
135} aio_cb; 141} bdb_cb;
136 142
137typedef aio_cb *aio_req; 143typedef bdb_cb *bdb_req;
138 144
139enum { 145enum {
140 PRI_MIN = -4, 146 PRI_MIN = -4,
141 PRI_MAX = 4, 147 PRI_MAX = 4,
142 148
… …
169 struct worker *prev, *next; 175 struct worker *prev, *next;
170 176
171 thread_t tid; 177 thread_t tid;
172 178
173 /* locked by reslock, reqlock or wrklock */ 179 /* locked by reslock, reqlock or wrklock */
174 aio_req req; /* currently processed request */ 180 bdb_req req; /* currently processed request */
175 void *dbuf; 181 void *dbuf;
176 DIR *dirp; 182 DIR *dirp;
177} worker; 183} worker;
178 184
179static worker wrk_first = { &wrk_first, &wrk_first, 0 }; 185static worker wrk_first = { &wrk_first, &wrk_first, 0 };
… …
246 * a somewhat faster data structure might be nice, but 252 * a somewhat faster data structure might be nice, but
247 * with 8 priorities this actually needs <20 insns 253 * with 8 priorities this actually needs <20 insns
248 * per shift, the most expensive operation. 254 * per shift, the most expensive operation.
249 */ 255 */
250typedef struct { 256typedef struct {
251 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ 257 bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
252 int size; 258 int size;
253} reqq; 259} reqq;
254 260
255static reqq req_queue; 261static reqq req_queue;
256static reqq res_queue; 262static reqq res_queue;
257 263
258int reqq_push (reqq *q, aio_req req) 264int reqq_push (reqq *q, bdb_req req)
259{ 265{
260 int pri = req->pri; 266 int pri = req->pri;
261 req->next = 0; 267 req->next = 0;
262 268
263 if (q->qe[pri]) 269 if (q->qe[pri])
… …
269 q->qe[pri] = q->qs[pri] = req; 275 q->qe[pri] = q->qs[pri] = req;
270 276
271 return q->size++; 277 return q->size++;
272} 278}
273 279
274aio_req reqq_shift (reqq *q) 280bdb_req reqq_shift (reqq *q)
275{ 281{
276 int pri; 282 int pri;
277 283
278 if (!q->size) 284 if (!q->size)
279 return 0; 285 return 0;
280 286
281 --q->size; 287 --q->size;
282 288
283 for (pri = NUM_PRI; pri--; ) 289 for (pri = NUM_PRI; pri--; )
284 { 290 {
285 aio_req req = q->qs[pri]; 291 bdb_req req = q->qs[pri];
286 292
287 if (req) 293 if (req)
288 { 294 {
289 if (!(q->qs[pri] = req->next)) 295 if (!(q->qs[pri] = req->next))
290 q->qe[pri] = 0; 296 q->qe[pri] = 0;
… …
295 301
296 abort (); 302 abort ();
297} 303}
298 304
299static int poll_cb (); 305static int poll_cb ();
300static void req_free (aio_req req); 306static void req_free (bdb_req req);
301static void req_cancel (aio_req req); 307static void req_cancel (bdb_req req);
302 308
303static int req_invoke (aio_req req) 309static int req_invoke (bdb_req req)
304{ 310{
305 dSP; 311 dSP;
306 312
307 if (SvOK (req->callback)) 313 if (SvOK (req->callback))
308 { 314 {
… …
371 } 377 }
372 378
373 return !SvTRUE (ERRSV); 379 return !SvTRUE (ERRSV);
374} 380}
375 381
376static void req_free (aio_req req) 382static void req_free (bdb_req req)
377{ 383{
378 free (req->buf1); 384 free (req->buf1);
379 free (req->buf2); 385 free (req->buf2);
380 Safefree (req); 386 Safefree (req);
381} 387}
… …
461 return; 467 return;
462 468
463 start_thread (); 469 start_thread ();
464} 470}
465 471
466static void req_send (aio_req req) 472static void req_send (bdb_req req)
467{ 473{
468 SV *wait_callback = 0; 474 SV *wait_callback = 0;
469 475
470 // synthesize callback if none given 476 // synthesize callback if none given
471 if (!SvOK (req->callback)) 477 if (!SvOK (req->callback))
… …
479 SPAGAIN; 485 SPAGAIN;
480 486
481 if (count != 2) 487 if (count != 2)
482 croak ("prepare callback must return exactly two values\n"); 488 croak ("prepare callback must return exactly two values\n");
483 489
484 wait_callback = SvREFCNT_inc (POPs); 490 wait_callback = POPs;
485 SvREFCNT_dec (req->callback); 491 SvREFCNT_dec (req->callback);
486 req->callback = SvREFCNT_inc (POPs); 492 req->callback = SvREFCNT_inc (POPs);
487 } 493 }
488 494
489 ++nreqs; 495 ++nreqs;
… …
500 { 506 {
501 dSP; 507 dSP;
502 PUSHMARK (SP); 508 PUSHMARK (SP);
503 PUTBACK; 509 PUTBACK;
504 call_sv (wait_callback, G_DISCARD); 510 call_sv (wait_callback, G_DISCARD);
505 SvREFCNT_dec (wait_callback);
506 } 511 }
507} 512}
508 513
509static void end_thread (void) 514static void end_thread (void)
510{ 515{
511 aio_req req; 516 bdb_req req;
512 517
513 Newz (0, req, 1, aio_cb); 518 Newz (0, req, 1, bdb_cb);
514 519
515 req->type = REQ_QUIT; 520 req->type = REQ_QUIT;
516 req->pri = PRI_MAX + PRI_BIAS; 521 req->pri = PRI_MAX + PRI_BIAS;
517 522
518 X_LOCK (reqlock); 523 X_LOCK (reqlock);
… …
575 dSP; 580 dSP;
576 int count = 0; 581 int count = 0;
577 int maxreqs = max_poll_reqs; 582 int maxreqs = max_poll_reqs;
578 int do_croak = 0; 583 int do_croak = 0;
579 struct timeval tv_start, tv_now; 584 struct timeval tv_start, tv_now;
580 aio_req req; 585 bdb_req req;
581 586
582 if (max_poll_time) 587 if (max_poll_time)
583 gettimeofday (&tv_start, 0); 588 gettimeofday (&tv_start, 0);
584 589
585 for (;;) 590 for (;;)
… …
646 651
647/*****************************************************************************/ 652/*****************************************************************************/
648 653
649X_THREAD_PROC (bdb_proc) 654X_THREAD_PROC (bdb_proc)
650{ 655{
651 aio_req req; 656 bdb_req req;
652 struct timespec ts; 657 struct timespec ts;
653 worker *self = (worker *)thr_arg; 658 worker *self = (worker *)thr_arg;
654 659
655 /* try to distribute timeouts somewhat evenly */ 660 /* try to distribute timeouts somewhat evenly */
656 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 661 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
874 X_UNLOCK (wrklock); 879 X_UNLOCK (wrklock);
875} 880}
876 881
877static void atfork_child (void) 882static void atfork_child (void)
878{ 883{
879 aio_req prv; 884 bdb_req prv;
880 885
881 while (prv = reqq_shift (&req_queue)) 886 while (prv = reqq_shift (&req_queue))
882 req_free (prv); 887 req_free (prv);
883 888
884 while (prv = reqq_shift (&res_queue)) 889 while (prv = reqq_shift (&res_queue))
… …
905 910
906 atfork_parent (); 911 atfork_parent ();
907} 912}
908 913
909#define dREQ(reqtype) \ 914#define dREQ(reqtype) \
910 aio_req req; \ 915 bdb_req req; \
911 int req_pri = next_pri; \ 916 int req_pri = next_pri; \
912 next_pri = DEFAULT_PRI + PRI_BIAS; \ 917 next_pri = DEFAULT_PRI + PRI_BIAS; \
913 \ 918 \
914 if (SvOK (callback) && !SvROK (callback)) \ 919 if (SvOK (callback) && !SvROK (callback)) \
915 croak ("callback must be undef or of reference type"); \ 920 croak ("callback must be undef or of reference type"); \
916 \ 921 \
917 Newz (0, req, 1, aio_cb); \ 922 Newz (0, req, 1, bdb_cb); \
918 if (!req) \ 923 if (!req) \
919 croak ("out of memory during aio_req allocation"); \ 924 croak ("out of memory during bdb_req allocation"); \
920 \ 925 \
921 req->callback = newSVsv (callback); \ 926 req->callback = newSVsv (callback); \
922 req->type = (reqtype); \ 927 req->type = (reqtype); \
923 req->pri = req_pri 928 req->pri = req_pri
924 929
925#define REQ_SEND \ 930#define REQ_SEND \
926 req_send (req) 931 req_send (req)
927 932
928#define SvPTR(var, arg, type, class, nullok) \ 933#define SvPTR(var, arg, type, class, nullok) \
929 if (!SvOK (arg)) \ 934 if (!SvOK (arg)) \
930 { \ 935 { \
931 if (!nullok) \ 936 if (nullok != 1) \
932 croak (# var " must be a " # class " object, not undef"); \ 937 croak (# var " must be a " # class " object, not undef"); \
933 \ 938 \
934 (var) = 0; \ 939 (var) = 0; \
935 } \ 940 } \
936 else if (sv_derived_from ((arg), # class)) \ 941 else if (sv_derived_from ((arg), # class)) \
937 { \ 942 { \
938 IV tmp = SvIV ((SV*) SvRV (arg)); \ 943 IV tmp = SvIV ((SV*) SvRV (arg)); \
939 (var) = INT2PTR (type, tmp); \ 944 (var) = INT2PTR (type, tmp); \
940 if (!var) \ 945 if (!var && nullok != 2) \
941 croak (# var " is not a valid " # class " object anymore"); \ 946 croak (# var " is not a valid " # class " object anymore"); \
942 } \ 947 } \
943 else \ 948 else \
944 croak (# var " is not of type " # class); \ 949 croak (# var " is not of type " # class); \
945 \ 950 \
… …
1028 const_iv (GET_BOTH_RANGE) 1033 const_iv (GET_BOTH_RANGE)
1029 //const_iv (SET_RECNO) 1034 //const_iv (SET_RECNO)
1030 //const_iv (MULTIPLE) 1035 //const_iv (MULTIPLE)
1031 const_iv (SNAPSHOT) 1036 const_iv (SNAPSHOT)
1032 const_iv (JOIN_ITEM) 1037 const_iv (JOIN_ITEM)
1038 const_iv (JOIN_NOSORT)
1033 const_iv (RMW) 1039 const_iv (RMW)
1034 1040
1035 const_iv (NOTFOUND) 1041 const_iv (NOTFOUND)
1036 const_iv (KEYEMPTY) 1042 const_iv (KEYEMPTY)
1037 const_iv (LOCK_DEADLOCK) 1043 const_iv (LOCK_DEADLOCK)
… …
1053 const_iv (TXN_SYNC) 1059 const_iv (TXN_SYNC)
1054 1060
1055 const_iv (SET_LOCK_TIMEOUT) 1061 const_iv (SET_LOCK_TIMEOUT)
1056 const_iv (SET_TXN_TIMEOUT) 1062 const_iv (SET_TXN_TIMEOUT)
1057 1063
1058 const_iv (JOIN_ITEM)
1059 const_iv (FIRST) 1064 const_iv (FIRST)
1060 const_iv (NEXT) 1065 const_iv (NEXT)
1061 const_iv (NEXT_DUP) 1066 const_iv (NEXT_DUP)
1062 const_iv (NEXT_NODUP) 1067 const_iv (NEXT_NODUP)
1063 const_iv (PREV) 1068 const_iv (PREV)
… …
1129 const_iv (MULTIVERSION) 1134 const_iv (MULTIVERSION)
1130 const_iv (TXN_SNAPSHOT) 1135 const_iv (TXN_SNAPSHOT)
1131#endif 1136#endif
1132#if DB_VERSION_MINOR >= 6 1137#if DB_VERSION_MINOR >= 6
1133 const_iv (PREV_DUP) 1138 const_iv (PREV_DUP)
1134# if 0
1135 const_iv (PRIORITY_UNCHANGED) 1139 const_iv (PRIORITY_UNCHANGED)
1136 const_iv (PRIORITY_VERY_LOW) 1140 const_iv (PRIORITY_VERY_LOW)
1137 const_iv (PRIORITY_LOW) 1141 const_iv (PRIORITY_LOW)
1138 const_iv (PRIORITY_DEFAULT) 1142 const_iv (PRIORITY_DEFAULT)
1139 const_iv (PRIORITY_HIGH) 1143 const_iv (PRIORITY_HIGH)
1140 const_iv (PRIORITY_VERY_HIGH) 1144 const_iv (PRIORITY_VERY_HIGH)
1141# endif
1142#endif 1145#endif
1143 }; 1146 };
1144 1147
1145 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1148 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1146 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1149 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1327void 1330void
1328db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef) 1331db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
1329 CODE: 1332 CODE:
1330{ 1333{
1331 dREQ (REQ_ENV_OPEN); 1334 dREQ (REQ_ENV_OPEN);
1332
1333 env->set_thread_count (env, wanted + 2);
1334 1335
1335 req->env = env; 1336 req->env = env;
1336 req->uint1 = open_flags | DB_THREAD; 1337 req->uint1 = open_flags | DB_THREAD;
1337 req->int1 = mode; 1338 req->int1 = mode;
1338 req->buf1 = strdup_ornull (db_home); 1339 req->buf1 = strdup_ornull (db_home);
… …
1495} 1496}
1496 1497
1497void 1498void
1498db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1499db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1499 CODE: 1500 CODE:
1501 if (SvREADONLY (data))
1502 croak ("can't modify read-only data scalar in db_get");
1500{ 1503{
1501 dREQ (REQ_DB_GET); 1504 dREQ (REQ_DB_GET);
1502 req->db = db; 1505 req->db = db;
1503 req->txn = txn; 1506 req->txn = txn;
1504 req->uint1 = flags; 1507 req->uint1 = flags;
… …
1509} 1512}
1510 1513
1511void 1514void
1512db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef) 1515db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
1513 CODE: 1516 CODE:
1517 if (SvREADONLY (data))
1518 croak ("can't modify read-only data scalar in db_pget");
1514{ 1519{
1515 dREQ (REQ_DB_PGET); 1520 dREQ (REQ_DB_PGET);
1516 req->db = db; 1521 req->db = db;
1517 req->txn = txn; 1522 req->txn = txn;
1518 req->uint1 = flags; 1523 req->uint1 = flags;
… …
1712 1717
1713 1718
1714MODULE = BDB PACKAGE = BDB::Env 1719MODULE = BDB PACKAGE = BDB::Env
1715 1720
1716void 1721void
1717DESTROY (DB_ENV_ornull *env) 1722DESTROY (DB_ENV_ornuked *env)
1718 CODE: 1723 CODE:
1719 if (env) 1724 if (env)
1720 env->close (env, 0); 1725 env->close (env, 0);
1721 1726
1722int set_data_dir (DB_ENV *env, const char *dir) 1727int set_data_dir (DB_ENV *env, const char *dir)
… …
1869 RETVAL 1874 RETVAL
1870 1875
1871MODULE = BDB PACKAGE = BDB::Db 1876MODULE = BDB PACKAGE = BDB::Db
1872 1877
1873void 1878void
1874DESTROY (DB_ornull *db) 1879DESTROY (DB_ornuked *db)
1875 CODE: 1880 CODE:
1876 if (db) 1881 if (db)
1877 { 1882 {
1878 SV *env = (SV *)db->app_private; 1883 SV *env = (SV *)db->app_private;
1879 db->close (db, 0); 1884 db->close (db, 0);
… …
1974 1979
1975 1980
1976MODULE = BDB PACKAGE = BDB::Txn 1981MODULE = BDB PACKAGE = BDB::Txn
1977 1982
1978void 1983void
1979DESTROY (DB_TXN_ornull *txn) 1984DESTROY (DB_TXN_ornuked *txn)
1980 CODE: 1985 CODE:
1981 if (txn) 1986 if (txn)
1982 txn->abort (txn); 1987 txn->abort (txn);
1983 1988
1984int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT) 1989int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
… …
1995 2000
1996 2001
1997MODULE = BDB PACKAGE = BDB::Cursor 2002MODULE = BDB PACKAGE = BDB::Cursor
1998 2003
1999void 2004void
2000DESTROY (DBC_ornull *dbc) 2005DESTROY (DBC_ornuked *dbc)
2001 CODE: 2006 CODE:
2002 if (dbc) 2007 if (dbc)
2003 dbc->c_close (dbc); 2008 dbc->c_close (dbc);
2004 2009
2010#if DB_VERSION_MINOR >= 6
2011
2012int set_priority (DBC *dbc, int priority)
2013 CODE:
2014 dbc->set_priority (dbc, priority);
2015
2016#endif
2017
2005MODULE = BDB PACKAGE = BDB::Sequence 2018MODULE = BDB PACKAGE = BDB::Sequence
2006 2019
2007void 2020void
2008DESTROY (DB_SEQUENCE_ornull *seq) 2021DESTROY (DB_SEQUENCE_ornuked *seq)
2009 CODE: 2022 CODE:
2010 if (seq) 2023 if (seq)
2011 seq->close (seq, 0); 2024 seq->close (seq, 0);
2012 2025
2013int initial_value (DB_SEQUENCE *seq, db_seq_t value) 2026int initial_value (DB_SEQUENCE *seq, db_seq_t value)

Diff Legend

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