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.69 by root, Wed Jul 15 14:40:00 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
… …
150enum { 152enum {
151 REQ_QUIT, 153 REQ_QUIT,
152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 154 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, 155 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE, 156 REQ_ENV_LOG_ARCHIVE,
155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 157 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, 158 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, 159 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, 160 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, 161 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
160}; 162};
… …
245} 247}
246 248
247static volatile unsigned int nreqs, nready, npending; 249static volatile unsigned int nreqs, nready, npending;
248static volatile unsigned int max_idle = 4; 250static volatile unsigned int max_idle = 4;
249static volatile unsigned int max_outstanding = 0xffffffff; 251static volatile unsigned int max_outstanding = 0xffffffff;
250static int respipe_osf [2], respipe [2] = { -1, -1 }; 252static s_epipe respipe;
251 253
252static mutex_t reslock = X_MUTEX_INIT; 254static mutex_t reslock = X_MUTEX_INIT;
253static mutex_t reqlock = X_MUTEX_INIT; 255static mutex_t reqlock = X_MUTEX_INIT;
254static cond_t reqwait = X_COND_INIT; 256static cond_t reqwait = X_COND_INIT;
255 257
… …
456 free (req->buf3); 458 free (req->buf3);
457 459
458 Safefree (req); 460 Safefree (req);
459} 461}
460 462
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 463static void
555create_respipe (void) 464create_respipe (void)
556{ 465{
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)) 466 if (s_epipe_renew (&respipe))
569#endif 467 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} 468}
594 469
595static void bdb_request (bdb_req req); 470static void bdb_request (bdb_req req);
596X_THREAD_PROC (bdb_proc); 471X_THREAD_PROC (bdb_proc);
597 472
… …
747 if (size) 622 if (size)
748 return; 623 return;
749 624
750 maybe_start_thread (); 625 maybe_start_thread ();
751 626
752 FD_ZERO (&rfd); 627 s_epipe_wait (&respipe);
753 FD_SET (respipe [0], &rfd);
754
755 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
756 } 628 }
757} 629}
758 630
759static int poll_cb (void) 631static int poll_cb (void)
760{ 632{
… …
780 if (req) 652 if (req)
781 { 653 {
782 --npending; 654 --npending;
783 655
784 if (!res_queue.size) 656 if (!res_queue.size)
785 {
786 /* read any signals sent by the worker threads */ 657 /* read any signals sent by the worker threads */
787 char buf [4]; 658 s_epipe_drain (&respipe);
788 while (respipe_read (respipe [0], buf, 4) == 4)
789 ;
790 }
791 } 659 }
792 660
793 X_UNLOCK (reslock); 661 X_UNLOCK (reslock);
794 662
795 if (!req) 663 if (!req)
… …
883 break; 751 break;
884#endif 752#endif
885 753
886 case REQ_DB_SYNC: 754 case REQ_DB_SYNC:
887 req->result = req->db->sync (req->db, req->uint1); 755 req->result = req->db->sync (req->db, req->uint1);
756 break;
757
758 case REQ_DB_VERIFY:
759 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
888 break; 760 break;
889 761
890 case REQ_DB_UPGRADE: 762 case REQ_DB_UPGRADE:
891 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 763 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
892 break; 764 break;
… …
1007 /* try to distribute timeouts somewhat evenly */ 879 /* try to distribute timeouts somewhat evenly */
1008 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 880 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1009 881
1010 for (;;) 882 for (;;)
1011 { 883 {
1012 ts.tv_sec = time (0) + IDLE_TIMEOUT; 884 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1013 885
1014 X_LOCK (reqlock); 886 X_LOCK (reqlock);
1015 887
1016 for (;;) 888 for (;;)
1017 { 889 {
… …
1062 X_LOCK (reslock); 934 X_LOCK (reslock);
1063 935
1064 ++npending; 936 ++npending;
1065 937
1066 if (!reqq_push (&res_queue, req)) 938 if (!reqq_push (&res_queue, req))
1067 /* write a dummy byte to the pipe so fh becomes ready */ 939 s_epipe_signal (&respipe);
1068 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1069 940
1070 self->req = 0; 941 self->req = 0;
1071 worker_clear (self); 942 worker_clear (self);
1072 943
1073 X_UNLOCK (reslock); 944 X_UNLOCK (reslock);
… …
1436 const_iv (REP_UNAVAIL) 1307 const_iv (REP_UNAVAIL)
1437 const_iv (RUNRECOVERY) 1308 const_iv (RUNRECOVERY)
1438 const_iv (SECONDARY_BAD) 1309 const_iv (SECONDARY_BAD)
1439 const_iv (VERIFY_BAD) 1310 const_iv (VERIFY_BAD)
1440 1311
1312 const_iv (SALVAGE)
1313 const_iv (AGGRESSIVE)
1314 const_iv (PRINTABLE)
1315 const_iv (NOORDERCHK)
1316 const_iv (ORDERCHKONLY)
1317
1441 const_iv (ARCH_ABS) 1318 const_iv (ARCH_ABS)
1442 const_iv (ARCH_DATA) 1319 const_iv (ARCH_DATA)
1443 const_iv (ARCH_LOG) 1320 const_iv (ARCH_LOG)
1444 const_iv (ARCH_REMOVE) 1321 const_iv (ARCH_REMOVE)
1445 1322
… …
1602 1479
1603int 1480int
1604poll_fileno () 1481poll_fileno ()
1605 PROTOTYPE: 1482 PROTOTYPE:
1606 CODE: 1483 CODE:
1607 RETVAL = respipe [0]; 1484 RETVAL = s_epipe_fd (&respipe);
1608 OUTPUT: 1485 OUTPUT:
1609 RETVAL 1486 RETVAL
1610 1487
1611int 1488int
1612poll_cb (...) 1489poll_cb (...)
… …
1890 req->uint1 = flags; 1767 req->uint1 = flags;
1891 REQ_SEND; 1768 REQ_SEND;
1892} 1769}
1893 1770
1894void 1771void
1772db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1773 PREINIT:
1774 CALLBACK
1775 CODE:
1776{
1777 dREQ (REQ_DB_VERIFY, 1);
1778 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1779 req->db = db;
1780 req->buf1 = strdup (file);
1781 req->buf2 = strdup_ornull (database);
1782 req->uint1 = flags;
1783 REQ_SEND;
1784}
1785
1786void
1895db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1787db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1896 PREINIT: 1788 PREINIT:
1897 CALLBACK 1789 CALLBACK
1898 CODE: 1790 CODE:
1899{ 1791{
1900 dREQ (REQ_DB_SYNC, 1); 1792 dREQ (REQ_DB_UPGRADE, 1);
1901 req->db = db; 1793 req->db = db;
1902 req->buf1 = strdup (file); 1794 req->buf1 = strdup (file);
1903 req->uint1 = flags; 1795 req->uint1 = flags;
1904 REQ_SEND; 1796 REQ_SEND;
1905} 1797}

Diff Legend

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