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

Comparing BDB/BDB.xs (file contents):
Revision 1.27 by root, Mon Dec 17 06:31:43 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))
… …
505 } 511 }
506} 512}
507 513
508static void end_thread (void) 514static void end_thread (void)
509{ 515{
510 aio_req req; 516 bdb_req req;
511 517
512 Newz (0, req, 1, aio_cb); 518 Newz (0, req, 1, bdb_cb);
513 519
514 req->type = REQ_QUIT; 520 req->type = REQ_QUIT;
515 req->pri = PRI_MAX + PRI_BIAS; 521 req->pri = PRI_MAX + PRI_BIAS;
516 522
517 X_LOCK (reqlock); 523 X_LOCK (reqlock);
… …
574 dSP; 580 dSP;
575 int count = 0; 581 int count = 0;
576 int maxreqs = max_poll_reqs; 582 int maxreqs = max_poll_reqs;
577 int do_croak = 0; 583 int do_croak = 0;
578 struct timeval tv_start, tv_now; 584 struct timeval tv_start, tv_now;
579 aio_req req; 585 bdb_req req;
580 586
581 if (max_poll_time) 587 if (max_poll_time)
582 gettimeofday (&tv_start, 0); 588 gettimeofday (&tv_start, 0);
583 589
584 for (;;) 590 for (;;)
… …
645 651
646/*****************************************************************************/ 652/*****************************************************************************/
647 653
648X_THREAD_PROC (bdb_proc) 654X_THREAD_PROC (bdb_proc)
649{ 655{
650 aio_req req; 656 bdb_req req;
651 struct timespec ts; 657 struct timespec ts;
652 worker *self = (worker *)thr_arg; 658 worker *self = (worker *)thr_arg;
653 659
654 /* try to distribute timeouts somewhat evenly */ 660 /* try to distribute timeouts somewhat evenly */
655 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 661 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
… …
873 X_UNLOCK (wrklock); 879 X_UNLOCK (wrklock);
874} 880}
875 881
876static void atfork_child (void) 882static void atfork_child (void)
877{ 883{
878 aio_req prv; 884 bdb_req prv;
879 885
880 while (prv = reqq_shift (&req_queue)) 886 while (prv = reqq_shift (&req_queue))
881 req_free (prv); 887 req_free (prv);
882 888
883 while (prv = reqq_shift (&res_queue)) 889 while (prv = reqq_shift (&res_queue))
… …
904 910
905 atfork_parent (); 911 atfork_parent ();
906} 912}
907 913
908#define dREQ(reqtype) \ 914#define dREQ(reqtype) \
909 aio_req req; \ 915 bdb_req req; \
910 int req_pri = next_pri; \ 916 int req_pri = next_pri; \
911 next_pri = DEFAULT_PRI + PRI_BIAS; \ 917 next_pri = DEFAULT_PRI + PRI_BIAS; \
912 \ 918 \
913 if (SvOK (callback) && !SvROK (callback)) \ 919 if (SvOK (callback) && !SvROK (callback)) \
914 croak ("callback must be undef or of reference type"); \ 920 croak ("callback must be undef or of reference type"); \
915 \ 921 \
916 Newz (0, req, 1, aio_cb); \ 922 Newz (0, req, 1, bdb_cb); \
917 if (!req) \ 923 if (!req) \
918 croak ("out of memory during aio_req allocation"); \ 924 croak ("out of memory during bdb_req allocation"); \
919 \ 925 \
920 req->callback = newSVsv (callback); \ 926 req->callback = newSVsv (callback); \
921 req->type = (reqtype); \ 927 req->type = (reqtype); \
922 req->pri = req_pri 928 req->pri = req_pri
923 929
924#define REQ_SEND \ 930#define REQ_SEND \
925 req_send (req) 931 req_send (req)
926 932
927#define SvPTR(var, arg, type, class, nullok) \ 933#define SvPTR(var, arg, type, class, nullok) \
928 if (!SvOK (arg)) \ 934 if (!SvOK (arg)) \
929 { \ 935 { \
930 if (!nullok) \ 936 if (nullok != 1) \
931 croak (# var " must be a " # class " object, not undef"); \ 937 croak (# var " must be a " # class " object, not undef"); \
932 \ 938 \
933 (var) = 0; \ 939 (var) = 0; \
934 } \ 940 } \
935 else if (sv_derived_from ((arg), # class)) \ 941 else if (sv_derived_from ((arg), # class)) \
936 { \ 942 { \
937 IV tmp = SvIV ((SV*) SvRV (arg)); \ 943 IV tmp = SvIV ((SV*) SvRV (arg)); \
938 (var) = INT2PTR (type, tmp); \ 944 (var) = INT2PTR (type, tmp); \
939 if (!var) \ 945 if (!var && nullok != 2) \
940 croak (# var " is not a valid " # class " object anymore"); \ 946 croak (# var " is not a valid " # class " object anymore"); \
941 } \ 947 } \
942 else \ 948 else \
943 croak (# var " is not of type " # class); \ 949 croak (# var " is not of type " # class); \
944 \ 950 \
… …
1325db_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)
1326 CODE: 1332 CODE:
1327{ 1333{
1328 dREQ (REQ_ENV_OPEN); 1334 dREQ (REQ_ENV_OPEN);
1329 1335
1330 env->set_thread_count (env, wanted + 2);
1331
1332 req->env = env; 1336 req->env = env;
1333 req->uint1 = open_flags | DB_THREAD; 1337 req->uint1 = open_flags | DB_THREAD;
1334 req->int1 = mode; 1338 req->int1 = mode;
1335 req->buf1 = strdup_ornull (db_home); 1339 req->buf1 = strdup_ornull (db_home);
1336 REQ_SEND; 1340 REQ_SEND;
… …
1492} 1496}
1493 1497
1494void 1498void
1495db_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)
1496 CODE: 1500 CODE:
1497{
1498 if (SvREADONLY (data)) 1501 if (SvREADONLY (data))
1499 croak ("can't modify read-only data scalar in db_get"); 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;
1505 sv_to_dbt (&req->dbt1, key); 1508 sv_to_dbt (&req->dbt1, key);
… …
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:
1514{
1515 if (SvREADONLY (data)) 1517 if (SvREADONLY (data))
1516 croak ("can't modify read-only data scalar in db_pget"); 1518 croak ("can't modify read-only data scalar in db_pget");
1517 1519{
1518 dREQ (REQ_DB_PGET); 1520 dREQ (REQ_DB_PGET);
1519 req->db = db; 1521 req->db = db;
1520 req->txn = txn; 1522 req->txn = txn;
1521 req->uint1 = flags; 1523 req->uint1 = flags;
1522 sv_to_dbt (&req->dbt1, key); 1524 sv_to_dbt (&req->dbt1, key);
… …
1715 1717
1716 1718
1717MODULE = BDB PACKAGE = BDB::Env 1719MODULE = BDB PACKAGE = BDB::Env
1718 1720
1719void 1721void
1720DESTROY (DB_ENV_ornull *env) 1722DESTROY (DB_ENV_ornuked *env)
1721 CODE: 1723 CODE:
1722 if (env) 1724 if (env)
1723 env->close (env, 0); 1725 env->close (env, 0);
1724 1726
1725int set_data_dir (DB_ENV *env, const char *dir) 1727int set_data_dir (DB_ENV *env, const char *dir)
… …
1872 RETVAL 1874 RETVAL
1873 1875
1874MODULE = BDB PACKAGE = BDB::Db 1876MODULE = BDB PACKAGE = BDB::Db
1875 1877
1876void 1878void
1877DESTROY (DB_ornull *db) 1879DESTROY (DB_ornuked *db)
1878 CODE: 1880 CODE:
1879 if (db) 1881 if (db)
1880 { 1882 {
1881 SV *env = (SV *)db->app_private; 1883 SV *env = (SV *)db->app_private;
1882 db->close (db, 0); 1884 db->close (db, 0);
… …
1977 1979
1978 1980
1979MODULE = BDB PACKAGE = BDB::Txn 1981MODULE = BDB PACKAGE = BDB::Txn
1980 1982
1981void 1983void
1982DESTROY (DB_TXN_ornull *txn) 1984DESTROY (DB_TXN_ornuked *txn)
1983 CODE: 1985 CODE:
1984 if (txn) 1986 if (txn)
1985 txn->abort (txn); 1987 txn->abort (txn);
1986 1988
1987int 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)
… …
1998 2000
1999 2001
2000MODULE = BDB PACKAGE = BDB::Cursor 2002MODULE = BDB PACKAGE = BDB::Cursor
2001 2003
2002void 2004void
2003DESTROY (DBC_ornull *dbc) 2005DESTROY (DBC_ornuked *dbc)
2004 CODE: 2006 CODE:
2005 if (dbc) 2007 if (dbc)
2006 dbc->c_close (dbc); 2008 dbc->c_close (dbc);
2007 2009
2008#if DB_VERSION_MINOR >= 6 2010#if DB_VERSION_MINOR >= 6
… …
2014#endif 2016#endif
2015 2017
2016MODULE = BDB PACKAGE = BDB::Sequence 2018MODULE = BDB PACKAGE = BDB::Sequence
2017 2019
2018void 2020void
2019DESTROY (DB_SEQUENCE_ornull *seq) 2021DESTROY (DB_SEQUENCE_ornuked *seq)
2020 CODE: 2022 CODE:
2021 if (seq) 2023 if (seq)
2022 seq->close (seq, 0); 2024 seq->close (seq, 0);
2023 2025
2024int 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