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

Comparing BDB/BDB.xs (file contents):
Revision 1.64 by root, Wed Nov 12 16:52:51 2008 UTC vs.
Revision 1.67 by root, Fri Jan 9 22:32:12 2009 UTC

… …
150enum { 150enum {
151 REQ_QUIT, 151 REQ_QUIT,
152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 152 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, 153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE, 154 REQ_ENV_LOG_ARCHIVE,
155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 155 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, 156 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, 157 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, 158 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, 159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
160}; 160};
… …
459} 459}
460 460
461#ifdef USE_SOCKETS_AS_HANDLES 461#ifdef USE_SOCKETS_AS_HANDLES
462# define TO_SOCKET(x) (win32_get_osfhandle (x)) 462# define TO_SOCKET(x) (win32_get_osfhandle (x))
463#else 463#else
464# define EV_SELECT_IS_WINSOCKET 1
464# define TO_SOCKET(x) (x) 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
553#define pipe(filedes) ev_pipe(filedes)
465#endif 554#endif
466 555
467static void 556static void
468create_respipe (void) 557create_respipe (void)
469{ 558{
… …
473 int old_readfd = respipe [0]; 562 int old_readfd = respipe [0];
474 563
475 if (respipe [1] >= 0) 564 if (respipe [1] >= 0)
476 respipe_close (TO_SOCKET (respipe [1])); 565 respipe_close (TO_SOCKET (respipe [1]));
477 566
478#ifdef _WIN32
479 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
480#else
481 if (pipe (respipe)) 567 if (pipe (respipe))
482#endif
483 croak ("unable to initialize result pipe"); 568 croak ("unable to initialize result pipe");
484 569
485 if (old_readfd >= 0) 570 if (old_readfd >= 0)
486 { 571 {
487 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0) 572 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
… …
796 break; 881 break;
797#endif 882#endif
798 883
799 case REQ_DB_SYNC: 884 case REQ_DB_SYNC:
800 req->result = req->db->sync (req->db, req->uint1); 885 req->result = req->db->sync (req->db, req->uint1);
886 break;
887
888 case REQ_DB_VERIFY:
889 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
801 break; 890 break;
802 891
803 case REQ_DB_UPGRADE: 892 case REQ_DB_UPGRADE:
804 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 893 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
805 break; 894 break;
… …
1349 const_iv (REP_UNAVAIL) 1438 const_iv (REP_UNAVAIL)
1350 const_iv (RUNRECOVERY) 1439 const_iv (RUNRECOVERY)
1351 const_iv (SECONDARY_BAD) 1440 const_iv (SECONDARY_BAD)
1352 const_iv (VERIFY_BAD) 1441 const_iv (VERIFY_BAD)
1353 1442
1443 const_iv (SALVAGE)
1444 const_iv (AGGRESSIVE)
1445 const_iv (PRINTABLE)
1446 const_iv (NOORDERCHK)
1447 const_iv (ORDERCHKONLY)
1448
1354 const_iv (ARCH_ABS) 1449 const_iv (ARCH_ABS)
1355 const_iv (ARCH_DATA) 1450 const_iv (ARCH_DATA)
1356 const_iv (ARCH_LOG) 1451 const_iv (ARCH_LOG)
1357 const_iv (ARCH_REMOVE) 1452 const_iv (ARCH_REMOVE)
1358 1453
… …
1803 req->uint1 = flags; 1898 req->uint1 = flags;
1804 REQ_SEND; 1899 REQ_SEND;
1805} 1900}
1806 1901
1807void 1902void
1903db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1904 PREINIT:
1905 CALLBACK
1906 CODE:
1907{
1908 dREQ (REQ_DB_VERIFY, 1);
1909 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1910 req->db = db;
1911 req->buf1 = strdup (file);
1912 req->buf2 = strdup_ornull (database);
1913 req->uint1 = flags;
1914 REQ_SEND;
1915}
1916
1917void
1808db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1918db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1809 PREINIT: 1919 PREINIT:
1810 CALLBACK 1920 CALLBACK
1811 CODE: 1921 CODE:
1812{ 1922{
1813 dREQ (REQ_DB_SYNC, 1); 1923 dREQ (REQ_DB_UPGRADE, 1);
1814 req->db = db; 1924 req->db = db;
1815 req->buf1 = strdup (file); 1925 req->buf1 = strdup (file);
1816 req->uint1 = flags; 1926 req->uint1 = flags;
1817 REQ_SEND; 1927 REQ_SEND;
1818} 1928}

Diff Legend

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