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

Comparing BDB/BDB.xs (file contents):
Revision 1.65 by root, Fri Jan 2 22:37:51 2009 UTC vs.
Revision 1.72 by root, Fri Dec 4 15:04:06 2009 UTC

… …
6 6
7#include "EXTERN.h" 7#include "EXTERN.h"
8#include "perl.h" 8#include "perl.h"
9#include "XSUB.h" 9#include "XSUB.h"
10 10
11#include "schmorp.h"
12
11// perl stupidly defines these as macros, breaking 13// perl stupidly defines these as argument-less macros, breaking
12// lots and lots of code. 14// lots and lots of code.
13#undef open 15#undef open
14#undef close 16#undef close
15#undef abort 17#undef abort
16#undef malloc 18#undef malloc
… …
56#endif 58#endif
57 59
58typedef char *bdb_filename; 60typedef char *bdb_filename;
59 61
60static SV *prepare_cb; 62static SV *prepare_cb;
63
64static HV
65 *bdb_stash,
66 *bdb_env_stash,
67 *bdb_txn_stash,
68 *bdb_cursor_stash,
69 *bdb_db_stash,
70 *bdb_sequence_stash;
61 71
62#if DB_VERSION_MINOR >= 6 72#if DB_VERSION_MINOR >= 6
63# define c_close close 73# define c_close close
64# define c_count count 74# define c_count count
65# define c_del del 75# define c_del del
… …
150enum { 160enum {
151 REQ_QUIT, 161 REQ_QUIT,
152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 162 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 163 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE, 164 REQ_ENV_LOG_ARCHIVE,
155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 165 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_VERIFY, REQ_DB_UPGRADE,
156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 166 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 167 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 168 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 169 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
160}; 170};
… …
245} 255}
246 256
247static volatile unsigned int nreqs, nready, npending; 257static volatile unsigned int nreqs, nready, npending;
248static volatile unsigned int max_idle = 4; 258static volatile unsigned int max_idle = 4;
249static volatile unsigned int max_outstanding = 0xffffffff; 259static volatile unsigned int max_outstanding = 0xffffffff;
250static int respipe_osf [2], respipe [2] = { -1, -1 }; 260static s_epipe respipe;
251 261
252static mutex_t reslock = X_MUTEX_INIT; 262static mutex_t reslock = X_MUTEX_INIT;
253static mutex_t reqlock = X_MUTEX_INIT; 263static mutex_t reqlock = X_MUTEX_INIT;
254static cond_t reqwait = X_COND_INIT; 264static cond_t reqwait = X_COND_INIT;
255 265
… …
456 free (req->buf3); 466 free (req->buf3);
457 467
458 Safefree (req); 468 Safefree (req);
459} 469}
460 470
461#ifdef USE_SOCKETS_AS_HANDLES
462# define TO_SOCKET(x) (win32_get_osfhandle (x))
463#else
464# define EV_SELECT_IS_WINSOCKET 1
465# define TO_SOCKET(x) (x)
466#endif
467
468#ifdef _WIN32
469/* taken verbatim from libev's ev_win32.c */
470/* oh, the humanity! */
471static int
472ev_pipe (int filedes [2])
473{
474 struct sockaddr_in addr = { 0 };
475 int addr_size = sizeof (addr);
476 struct sockaddr_in adr2;
477 int adr2_size;
478 SOCKET listener;
479 SOCKET sock [2] = { -1, -1 };
480
481 if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
482 return -1;
483
484 addr.sin_family = AF_INET;
485 addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
486 addr.sin_port = 0;
487
488 if (bind (listener, (struct sockaddr *)&addr, addr_size))
489 goto fail;
490
491 if (getsockname (listener, (struct sockaddr *)&addr, &addr_size))
492 goto fail;
493
494 if (listen (listener, 1))
495 goto fail;
496
497 if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
498 goto fail;
499
500 if (connect (sock [0], (struct sockaddr *)&addr, addr_size))
501 goto fail;
502
503 if ((sock [1] = accept (listener, 0, 0)) < 0)
504 goto fail;
505
506 /* windows vista returns fantasy port numbers for getpeername.
507 * example for two interconnected tcp sockets:
508 *
509 * (Socket::unpack_sockaddr_in getsockname $sock0)[0] == 53364
510 * (Socket::unpack_sockaddr_in getpeername $sock0)[0] == 53363
511 * (Socket::unpack_sockaddr_in getsockname $sock1)[0] == 53363
512 * (Socket::unpack_sockaddr_in getpeername $sock1)[0] == 53365
513 *
514 * wow! tridirectional sockets!
515 *
516 * this way of checking ports seems to work:
517 */
518 if (getpeername (sock [0], (struct sockaddr *)&addr, &addr_size))
519 goto fail;
520
521 if (getsockname (sock [1], (struct sockaddr *)&adr2, &adr2_size))
522 goto fail;
523
524 errno = WSAEINVAL;
525 if (addr_size != adr2_size
526 || addr.sin_addr.s_addr != adr2.sin_addr.s_addr /* just to be sure, I mean, it's windows */
527 || addr.sin_port != adr2.sin_port)
528 goto fail;
529
530 closesocket (listener);
531
532#if EV_SELECT_IS_WINSOCKET
533 filedes [0] = _open_osfhandle (sock [0], 0);
534 filedes [1] = _open_osfhandle (sock [1], 0);
535#else
536 /* when select isn't winsocket, we also expect socket, connect, accept etc.
537 * to work on fds */
538 filedes [0] = sock [0];
539 filedes [1] = sock [1];
540#endif
541
542 return 0;
543
544fail:
545 closesocket (listener);
546
547 if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
548 if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
549
550 return -1;
551}
552#endif
553
554static void 471static void
555create_respipe (void) 472create_respipe (void)
556{ 473{
557#ifdef _WIN32
558 int arg; /* argg */
559#endif
560 int old_readfd = respipe [0];
561
562 if (respipe [1] >= 0)
563 respipe_close (TO_SOCKET (respipe [1]));
564
565#ifdef _WIN32
566 if (ev_pipe (respipe))
567#else
568 if (pipe (respipe)) 474 if (s_epipe_renew (&respipe))
569#endif 475 croak ("BDB: unable to create event pipe");
570 croak ("unable to initialize result pipe");
571
572 if (old_readfd >= 0)
573 {
574 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
575 croak ("unable to initialize result pipe(2)");
576
577 respipe_close (respipe [0]);
578 respipe [0] = old_readfd;
579 }
580
581#ifdef _WIN32
582 arg = 1;
583 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
584 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
585#else
586 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
587 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
588#endif
589 croak ("unable to initialize result pipe(3)");
590
591 respipe_osf [0] = TO_SOCKET (respipe [0]);
592 respipe_osf [1] = TO_SOCKET (respipe [1]);
593} 476}
594 477
595static void bdb_request (bdb_req req); 478static void bdb_request (bdb_req req);
596X_THREAD_PROC (bdb_proc); 479X_THREAD_PROC (bdb_proc);
597 480
… …
733 end_thread (); 616 end_thread ();
734} 617}
735 618
736static void poll_wait (void) 619static void poll_wait (void)
737{ 620{
738 fd_set rfd;
739
740 while (nreqs) 621 while (nreqs)
741 { 622 {
742 int size; 623 int size;
743 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 624 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
744 size = res_queue.size; 625 size = res_queue.size;
… …
747 if (size) 628 if (size)
748 return; 629 return;
749 630
750 maybe_start_thread (); 631 maybe_start_thread ();
751 632
752 FD_ZERO (&rfd); 633 s_epipe_wait (&respipe);
753 FD_SET (respipe [0], &rfd);
754
755 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
756 } 634 }
757} 635}
758 636
759static int poll_cb (void) 637static int poll_cb (void)
760{ 638{
… …
780 if (req) 658 if (req)
781 { 659 {
782 --npending; 660 --npending;
783 661
784 if (!res_queue.size) 662 if (!res_queue.size)
785 {
786 /* read any signals sent by the worker threads */ 663 /* read any signals sent by the worker threads */
787 char buf [4]; 664 s_epipe_drain (&respipe);
788 while (respipe_read (respipe [0], buf, 4) == 4)
789 ;
790 }
791 } 665 }
792 666
793 X_UNLOCK (reslock); 667 X_UNLOCK (reslock);
794 668
795 if (!req) 669 if (!req)
… …
883 break; 757 break;
884#endif 758#endif
885 759
886 case REQ_DB_SYNC: 760 case REQ_DB_SYNC:
887 req->result = req->db->sync (req->db, req->uint1); 761 req->result = req->db->sync (req->db, req->uint1);
762 break;
763
764 case REQ_DB_VERIFY:
765 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
888 break; 766 break;
889 767
890 case REQ_DB_UPGRADE: 768 case REQ_DB_UPGRADE:
891 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 769 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
892 break; 770 break;
… …
1007 /* try to distribute timeouts somewhat evenly */ 885 /* try to distribute timeouts somewhat evenly */
1008 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 886 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1009 887
1010 for (;;) 888 for (;;)
1011 { 889 {
1012 ts.tv_sec = time (0) + IDLE_TIMEOUT; 890 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1013 891
1014 X_LOCK (reqlock); 892 X_LOCK (reqlock);
1015 893
1016 for (;;) 894 for (;;)
1017 { 895 {
… …
1062 X_LOCK (reslock); 940 X_LOCK (reslock);
1063 941
1064 ++npending; 942 ++npending;
1065 943
1066 if (!reqq_push (&res_queue, req)) 944 if (!reqq_push (&res_queue, req))
1067 /* write a dummy byte to the pipe so fh becomes ready */ 945 s_epipe_signal (&respipe);
1068 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1069 946
1070 self->req = 0; 947 self->req = 0;
1071 worker_clear (self); 948 worker_clear (self);
1072 949
1073 X_UNLOCK (reslock); 950 X_UNLOCK (reslock);
… …
1149 (void)0; 1026 (void)0;
1150 1027
1151#define REQ_SEND \ 1028#define REQ_SEND \
1152 req_send (req) 1029 req_send (req)
1153 1030
1154#define SvPTR(var, arg, type, class, nullok) \ 1031#define SvPTR(var, arg, type, stash, class, nullok) \
1155 if (!SvOK (arg)) \ 1032 if (!SvOK (arg)) \
1156 { \ 1033 { \
1157 if (nullok != 1) \ 1034 if (nullok != 1) \
1158 croak (# var " must be a " # class " object, not undef"); \ 1035 croak (# var " must be a " # class " object, not undef"); \
1159 \ 1036 \
1160 (var) = 0; \ 1037 (var) = 0; \
1161 } \ 1038 } \
1162 else if (sv_derived_from ((arg), # class)) \ 1039 else if (SvSTASH (SvRV (arg)) == stash || sv_derived_from ((arg), # class)) \
1163 { \ 1040 { \
1164 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1041 IV tmp = SvIV ((SV*) SvRV (arg)); \
1165 (var) = INT2PTR (type, tmp); \ 1042 (var) = INT2PTR (type, tmp); \
1166 if (!var && nullok != 2) \ 1043 if (!var && nullok != 2) \
1167 croak (# var " is not a valid " # class " object anymore"); \ 1044 croak (# var " is not a valid " # class " object anymore"); \
… …
1170 croak (# var " is not of type " # class); 1047 croak (# var " is not of type " # class);
1171 1048
1172#define ARG_MUTABLE(name) \ 1049#define ARG_MUTABLE(name) \
1173 if (SvREADONLY (name)) \ 1050 if (SvREADONLY (name)) \
1174 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable"); 1051 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1052
1053static SV *
1054newSVptr (void *ptr, HV *stash)
1055{
1056 SV *rv = NEWSV (0, 0);
1057 sv_upgrade (rv, SVt_PVMG);
1058 sv_setiv (rv, PTR2IV (ptr));
1059
1060 return sv_bless (newRV_noinc (rv), stash);
1061}
1175 1062
1176static void 1063static void
1177ptr_nuke (SV *sv) 1064ptr_nuke (SV *sv)
1178{ 1065{
1179 assert (SvROK (sv)); 1066 assert (SvROK (sv));
… …
1301 1188
1302PROTOTYPES: ENABLE 1189PROTOTYPES: ENABLE
1303 1190
1304BOOT: 1191BOOT:
1305{ 1192{
1306 HV *stash = gv_stashpv ("BDB", 1);
1307
1308 static const struct { 1193 static const struct {
1309 const char *name; 1194 const char *name;
1310 IV iv; 1195 IV iv;
1311 } *civ, const_iv[] = { 1196 } *civ, const_iv[] = {
1312#define const_iv(name) { # name, (IV)DB_ ## name }, 1197#define const_iv(name) { # name, (IV)DB_ ## name },
… …
1436 const_iv (REP_UNAVAIL) 1321 const_iv (REP_UNAVAIL)
1437 const_iv (RUNRECOVERY) 1322 const_iv (RUNRECOVERY)
1438 const_iv (SECONDARY_BAD) 1323 const_iv (SECONDARY_BAD)
1439 const_iv (VERIFY_BAD) 1324 const_iv (VERIFY_BAD)
1440 1325
1326 const_iv (SALVAGE)
1327 const_iv (AGGRESSIVE)
1328 const_iv (PRINTABLE)
1329 const_iv (NOORDERCHK)
1330 const_iv (ORDERCHKONLY)
1331
1441 const_iv (ARCH_ABS) 1332 const_iv (ARCH_ABS)
1442 const_iv (ARCH_DATA) 1333 const_iv (ARCH_DATA)
1443 const_iv (ARCH_LOG) 1334 const_iv (ARCH_LOG)
1444 const_iv (ARCH_REMOVE) 1335 const_iv (ARCH_REMOVE)
1445 1336
… …
1502 const_iv (LOG_INMEMORY) 1393 const_iv (LOG_INMEMORY)
1503# endif 1394# endif
1504#endif 1395#endif
1505 }; 1396 };
1506 1397
1398 bdb_stash = gv_stashpv ("BDB" , 1);
1399 bdb_env_stash = gv_stashpv ("BDB::Env" , 1);
1400 bdb_txn_stash = gv_stashpv ("BDB::Txn" , 1);
1401 bdb_cursor_stash = gv_stashpv ("BDB::Cursor" , 1);
1402 bdb_db_stash = gv_stashpv ("BDB::Db" , 1);
1403 bdb_sequence_stash = gv_stashpv ("BDB::Sequence", 1);
1404
1507 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1405 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1508 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1406 newCONSTSUB (bdb_stash, (char *)civ->name, newSViv (civ->iv));
1509 1407
1510 prepare_cb = &PL_sv_undef; 1408 prepare_cb = &PL_sv_undef;
1511 1409
1512 { 1410 {
1513 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1411 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1514 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH }; 1412 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1515 1413
1516 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1414 newCONSTSUB (bdb_stash, "VERSION_v", newSVpvn (vstring, 3));
1517 } 1415 }
1518 1416
1519 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1417 newCONSTSUB (bdb_stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1520 1418
1521 create_respipe (); 1419 create_respipe ();
1522 1420
1523 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1421 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1524 patch_errno (); 1422 patch_errno ();
… …
1602 1500
1603int 1501int
1604poll_fileno () 1502poll_fileno ()
1605 PROTOTYPE: 1503 PROTOTYPE:
1606 CODE: 1504 CODE:
1607 RETVAL = respipe [0]; 1505 RETVAL = s_epipe_fd (&respipe);
1608 OUTPUT: 1506 OUTPUT:
1609 RETVAL 1507 RETVAL
1610 1508
1611int 1509int
1612poll_cb (...) 1510poll_cb (...)
… …
1890 req->uint1 = flags; 1788 req->uint1 = flags;
1891 REQ_SEND; 1789 REQ_SEND;
1892} 1790}
1893 1791
1894void 1792void
1793db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1794 PREINIT:
1795 CALLBACK
1796 CODE:
1797{
1798 dREQ (REQ_DB_VERIFY, 1);
1799 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1800 req->db = db;
1801 req->buf1 = strdup (file);
1802 req->buf2 = strdup_ornull (database);
1803 req->uint1 = flags;
1804 REQ_SEND;
1805}
1806
1807void
1895db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1808db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1896 PREINIT: 1809 PREINIT:
1897 CALLBACK 1810 CALLBACK
1898 CODE: 1811 CODE:
1899{ 1812{
1900 dREQ (REQ_DB_SYNC, 1); 1813 dREQ (REQ_DB_UPGRADE, 1);
1901 req->db = db; 1814 req->db = db;
1902 req->buf1 = strdup (file); 1815 req->buf1 = strdup (file);
1903 req->uint1 = flags; 1816 req->uint1 = flags;
1904 REQ_SEND; 1817 REQ_SEND;
1905} 1818}

Diff Legend

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