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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.121 by root, Tue May 13 18:50:27 2008 UTC vs.
Revision 1.126 by root, Thu Sep 25 07:56:07 2008 UTC

… …
65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
… …
85#define EIO_REQ_MEMBERS \ 91#define EIO_REQ_MEMBERS \
86 SV *callback; \ 92 SV *callback; \
87 SV *sv1, *sv2; \ 93 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 94 STRLEN stroffset; \
89 SV *self; 95 SV *self;
96
97#define EIO_NO_WRAPPERS 1
90 98
91#include "libeio/eio.h" 99#include "libeio/eio.h"
92 100
93static int req_invoke (eio_req *req); 101static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 102#define EIO_FINISH(req) req_invoke (req)
… …
410 X_UNLOCK (reslock); 418 X_UNLOCK (reslock);
411 419
412 if (size) 420 if (size)
413 return; 421 return;
414 422
415 maybe_start_thread (); 423 etp_maybe_start_thread ();
416 424
417 FD_ZERO (&rfd); 425 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 426 FD_SET (respipe [0], &rfd);
419 427
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 428 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 429 }
422} 430}
423 431
424static int poll_cb (void) 432static int poll_cb (void)
425{ 433{
426 int res; 434 for (;;)
427
428 do
429 { 435 {
430 res = eio_poll (); 436 int res = eio_poll ();
431 437
432 if (res > 0) 438 if (res > 0)
433 croak (0); 439 croak (0);
440
441 if (!max_outstanding || max_outstanding > eio_nreqs ())
442 return res;
443
444 poll_wait ();
434 } 445 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 446}
439 447
440static void atfork_child (void) 448static void atfork_child (void)
441{ 449{
442 create_respipe (); 450 create_respipe ();
… …
456 \ 464 \
457 req->callback = newSVsv (callback); \ 465 req->callback = newSVsv (callback); \
458 req->pri = req_pri 466 req->pri = req_pri
459 467
460#define REQ_SEND \ 468#define REQ_SEND \
469 PUTBACK; \
461 req_submit (req); \ 470 req_submit (req); \
471 SPAGAIN; \
462 \ 472 \
463 if (GIMME_V != G_VOID) \ 473 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 474 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 475
466MODULE = IO::AIO PACKAGE = IO::AIO 476MODULE = IO::AIO PACKAGE = IO::AIO
… …
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 484 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 485 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 486 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 487 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 488 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
479#ifdef _WIN32 489#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock);
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#endif 491#endif
491 492
492 create_respipe (); 493 create_respipe ();
493 494
… …
1004 1005
1005int 1006int
1006nthreads() 1007nthreads()
1007 PROTOTYPE: 1008 PROTOTYPE:
1008 CODE: 1009 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1010 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1011 OUTPUT:
1013 RETVAL 1012 RETVAL
1014 1013
1015void _on_next_submit (SV *cb) 1014void _on_next_submit (SV *cb)
1016 CODE: 1015 CODE:

Diff Legend

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