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.84 by root, Sat Oct 28 01:24:19 2006 UTC vs.
Revision 1.96 by root, Sat Dec 23 04:49:37 2006 UTC

… …
17#include "autoconf/config.h" 17#include "autoconf/config.h"
18 18
19#include <pthread.h> 19#include <pthread.h>
20 20
21#include <stddef.h> 21#include <stddef.h>
22#include <stdlib.h>
22#include <errno.h> 23#include <errno.h>
23#include <sys/time.h> 24#include <sys/time.h>
24#include <sys/select.h> 25#include <sys/select.h>
25#include <sys/types.h> 26#include <sys/types.h>
26#include <sys/stat.h> 27#include <sys/stat.h>
… …
68 69
69/* wether word reads are potentially non-atomic. 70/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs 71 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes. 72 * on have atomic word read/writes.
72 */ 73 */
73#ifndef WORDREAD_UNSAFE 74#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64 75# if __i386 || __x86_64
75# define WORDREAD_UNSAFE 0 76# define WORDACCESS_UNSAFE 0
76# else 77# else
77# define WORDREAD_UNSAFE 1 78# define WORDACCESS_UNSAFE 1
78# endif 79# endif
79#endif 80#endif
80 81
81/* buffer size for various temporary buffers */ 82/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 83#define AIO_BUFSIZE 65536
… …
86 LOCK (wrklock); \ 87 LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 89 UNLOCK (wrklock); \
89 if (!aio_buf) \ 90 if (!aio_buf) \
90 return -1; 91 return -1;
92
93typedef SV SV8; /* byte-sv, used for argument-checking */
91 94
92enum { 95enum {
93 REQ_QUIT, 96 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 97 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 98 REQ_READ, REQ_WRITE, REQ_READAHEAD,
96 REQ_SENDFILE, 99 REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 100 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
98 REQ_FSYNC, REQ_FDATASYNC, 101 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 102 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 103 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 104 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 105 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 106 REQ_BUSY,
104}; 107};
105 108
106#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 111
109typedef struct aio_cb 112typedef struct aio_cb
110{ 113{
111 struct aio_cb *volatile next; 114 struct aio_cb *volatile next;
112 115
113 SV *data, *callback; 116 SV *callback, *fh;
114 SV *fh, *fh2; 117 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 118 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 119 off_t offs;
118 size_t length; 120 size_t size;
119 ssize_t result; 121 ssize_t result;
120 122
121 STRLEN dataoffset; 123 STRLEN stroffset;
122 int type; 124 int type;
123 int fd, fd2; 125 int int1, int2;
124 int errorno; 126 int errorno;
125 mode_t mode; /* open */ 127 mode_t mode; /* open */
126 128
127 unsigned char flags; 129 unsigned char flags;
128 unsigned char pri; 130 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 132 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 134} aio_cb;
133 135
134enum { 136enum {
135 FLAG_CANCELLED = 0x01, 137 FLAG_CANCELLED = 0x01, /* request was cancelled */
138 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
139 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 140};
137 141
138typedef aio_cb *aio_req; 142typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 143typedef aio_cb *aio_req_ornot;
140 144
… …
144 148
145 DEFAULT_PRI = 0, 149 DEFAULT_PRI = 0,
146 PRI_BIAS = -PRI_MIN, 150 PRI_BIAS = -PRI_MIN,
147 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 151 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
148}; 152};
153
154#define AIO_TICKS ((1000000 + 1023) >> 10)
155
156static unsigned int max_poll_time = 0;
157static unsigned int max_poll_reqs = 0;
158
159/* calculcate time difference in ~1/AIO_TICKS of a second */
160static int tvdiff (struct timeval *tv1, struct timeval *tv2)
161{
162 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
163 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
164}
165
166static pthread_t main_tid;
167static int main_sig;
168static int block_sig_level;
169
170void block_sig ()
171{
172 sigset_t ss;
173
174 if (block_sig_level++)
175 return;
176
177 if (!main_sig)
178 return;
179
180 sigemptyset (&ss);
181 sigaddset (&ss, main_sig);
182 pthread_sigmask (SIG_BLOCK, &ss, 0);
183}
184
185void unblock_sig ()
186{
187 sigset_t ss;
188
189 if (--block_sig_level)
190 return;
191
192 if (!main_sig)
193 return;
194
195 sigemptyset (&ss);
196 sigaddset (&ss, main_sig);
197 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
198}
149 199
150static int next_pri = DEFAULT_PRI + PRI_BIAS; 200static int next_pri = DEFAULT_PRI + PRI_BIAS;
151 201
152static unsigned int started, idle, wanted; 202static unsigned int started, idle, wanted;
153 203
… …
207 257
208static pthread_mutex_t reslock = AIO_MUTEX_INIT; 258static pthread_mutex_t reslock = AIO_MUTEX_INIT;
209static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 259static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
210static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 260static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
211 261
212#if WORDREAD_UNSAFE 262#if WORDACCESS_UNSAFE
213 263
214static unsigned int get_nready () 264static unsigned int get_nready ()
215{ 265{
216 unsigned int retval; 266 unsigned int retval;
217 267
… …
231 UNLOCK (reslock); 281 UNLOCK (reslock);
232 282
233 return retval; 283 return retval;
234} 284}
235 285
286static unsigned int get_nthreads ()
287{
288 unsigned int retval;
289
290 LOCK (wrklock);
291 retval = started;
292 UNLOCK (wrklock);
293
294 return retval;
295}
296
236#else 297#else
237 298
238# define get_nready() nready 299# define get_nready() nready
239# define get_npending() npending 300# define get_npending() npending
301# define get_nthreads() started
240 302
241#endif 303#endif
242 304
243/* 305/*
244 * a somewhat faster data structure might be nice, but 306 * a somewhat faster data structure might be nice, but
… …
292 } 354 }
293 355
294 abort (); 356 abort ();
295} 357}
296 358
297static int poll_cb (int max); 359static int poll_cb ();
298static void req_invoke (aio_req req); 360static int req_invoke (aio_req req);
299static void req_free (aio_req req); 361static void req_free (aio_req req);
300static void req_cancel (aio_req req); 362static void req_cancel (aio_req req);
301 363
302/* must be called at most once */ 364/* must be called at most once */
303static SV *req_sv (aio_req req, const char *klass) 365static SV *req_sv (aio_req req, const char *klass)
… …
323 return mg ? (aio_req)mg->mg_ptr : 0; 385 return mg ? (aio_req)mg->mg_ptr : 0;
324} 386}
325 387
326static void aio_grp_feed (aio_req grp) 388static void aio_grp_feed (aio_req grp)
327{ 389{
390 block_sig ();
391
328 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 392 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
329 { 393 {
330 int old_len = grp->length; 394 int old_len = grp->size;
331 395
332 if (grp->fh2 && SvOK (grp->fh2)) 396 if (grp->sv2 && SvOK (grp->sv2))
333 { 397 {
334 dSP; 398 dSP;
335 399
336 ENTER; 400 ENTER;
337 SAVETMPS; 401 SAVETMPS;
338 PUSHMARK (SP); 402 PUSHMARK (SP);
339 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 403 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
340 PUTBACK; 404 PUTBACK;
341 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 405 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
342 SPAGAIN; 406 SPAGAIN;
343 FREETMPS; 407 FREETMPS;
344 LEAVE; 408 LEAVE;
345 } 409 }
346 410
347 /* stop if no progress has been made */ 411 /* stop if no progress has been made */
348 if (old_len == grp->length) 412 if (old_len == grp->size)
349 { 413 {
350 SvREFCNT_dec (grp->fh2); 414 SvREFCNT_dec (grp->sv2);
351 grp->fh2 = 0; 415 grp->sv2 = 0;
352 break; 416 break;
353 } 417 }
354 } 418 }
419
420 unblock_sig ();
355} 421}
356 422
357static void aio_grp_dec (aio_req grp) 423static void aio_grp_dec (aio_req grp)
358{ 424{
359 --grp->length; 425 --grp->size;
360 426
361 /* call feeder, if applicable */ 427 /* call feeder, if applicable */
362 aio_grp_feed (grp); 428 aio_grp_feed (grp);
363 429
364 /* finish, if done */ 430 /* finish, if done */
365 if (!grp->length && grp->fd) 431 if (!grp->size && grp->int1)
366 { 432 {
433 block_sig ();
434
367 req_invoke (grp); 435 if (!req_invoke (grp))
436 {
437 req_free (grp);
438 unblock_sig ();
439 croak (0);
440 }
441
368 req_free (grp); 442 req_free (grp);
443 unblock_sig ();
369 } 444 }
370} 445}
371 446
372static void req_invoke (aio_req req) 447static int req_invoke (aio_req req)
373{ 448{
374 dSP; 449 dSP;
450
451 if (req->flags & FLAG_SV1_RO_OFF)
452 SvREADONLY_off (req->sv1);
375 453
376 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
377 { 455 {
378 ENTER; 456 ENTER;
379 SAVETMPS; 457 SAVETMPS;
… …
387 SV *rv = &PL_sv_undef; 465 SV *rv = &PL_sv_undef;
388 466
389 if (req->result >= 0) 467 if (req->result >= 0)
390 { 468 {
391 int i; 469 int i;
392 char *buf = req->data2ptr; 470 char *buf = req->ptr2;
393 AV *av = newAV (); 471 AV *av = newAV ();
394 472
395 av_extend (av, req->result - 1); 473 av_extend (av, req->result - 1);
396 474
397 for (i = 0; i < req->result; ++i) 475 for (i = 0; i < req->result; ++i)
… …
417 PUSHs (sv_2mortal (newSViv (req->result))); 495 PUSHs (sv_2mortal (newSViv (req->result)));
418 PUTBACK; 496 PUTBACK;
419 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 497 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
420 SPAGAIN; 498 SPAGAIN;
421 499
422 fh = SvREFCNT_inc (POPs); 500 fh = POPs;
423
424 PUSHMARK (SP); 501 PUSHMARK (SP);
425 XPUSHs (sv_2mortal (fh)); 502 XPUSHs (fh);
426 } 503 }
427 break; 504 break;
428 505
429 case REQ_GROUP: 506 case REQ_GROUP:
430 req->fd = 2; /* mark group as finished */ 507 req->int1 = 2; /* mark group as finished */
431 508
432 if (req->data) 509 if (req->sv1)
433 { 510 {
434 int i; 511 int i;
435 AV *av = (AV *)req->data; 512 AV *av = (AV *)req->sv1;
436 513
437 EXTEND (SP, AvFILL (av) + 1); 514 EXTEND (SP, AvFILL (av) + 1);
438 for (i = 0; i <= AvFILL (av); ++i) 515 for (i = 0; i <= AvFILL (av); ++i)
439 PUSHs (*av_fetch (av, i, 0)); 516 PUSHs (*av_fetch (av, i, 0));
440 } 517 }
… …
442 519
443 case REQ_NOP: 520 case REQ_NOP:
444 case REQ_BUSY: 521 case REQ_BUSY:
445 break; 522 break;
446 523
524 case REQ_READLINK:
525 if (req->result > 0)
526 {
527 SvCUR_set (req->sv1, req->result);
528 *SvEND (req->sv1) = 0;
529 PUSHs (req->sv1);
530 }
531 break;
532
533 case REQ_STAT:
534 case REQ_LSTAT:
535 case REQ_FSTAT:
536 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
537 PL_laststatval = req->result;
538 PL_statcache = *(Stat_t *)(req->ptr2);
539 PUSHs (sv_2mortal (newSViv (req->result)));
540 break;
541
542 case REQ_READ:
543 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
544 *SvEND (req->sv1) = 0;
545 PUSHs (sv_2mortal (newSViv (req->result)));
546 break;
547
447 default: 548 default:
448 PUSHs (sv_2mortal (newSViv (req->result))); 549 PUSHs (sv_2mortal (newSViv (req->result)));
449 break; 550 break;
450 } 551 }
451 552
… …
471 grp->grp_first = req->grp_next; 572 grp->grp_first = req->grp_next;
472 573
473 aio_grp_dec (grp); 574 aio_grp_dec (grp);
474 } 575 }
475 576
476 if (SvTRUE (ERRSV)) 577 return !SvTRUE (ERRSV);
477 {
478 req_free (req);
479 croak (0);
480 }
481} 578}
482 579
483static void req_free (aio_req req) 580static void req_free (aio_req req)
484{ 581{
485 if (req->self) 582 if (req->self)
486 { 583 {
487 sv_unmagic (req->self, PERL_MAGIC_ext); 584 sv_unmagic (req->self, PERL_MAGIC_ext);
488 SvREFCNT_dec (req->self); 585 SvREFCNT_dec (req->self);
489 } 586 }
490 587
491 SvREFCNT_dec (req->data);
492 SvREFCNT_dec (req->fh); 588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1);
493 SvREFCNT_dec (req->fh2); 590 SvREFCNT_dec (req->sv2);
494 SvREFCNT_dec (req->callback); 591 SvREFCNT_dec (req->callback);
495 Safefree (req->statdata);
496 592
497 if (req->type == REQ_READDIR) 593 if (req->flags & FLAG_PTR2_FREE)
498 free (req->data2ptr); 594 free (req->ptr2);
499 595
500 Safefree (req); 596 Safefree (req);
501} 597}
502 598
503static void req_cancel_subs (aio_req grp) 599static void req_cancel_subs (aio_req grp)
… …
505 aio_req sub; 601 aio_req sub;
506 602
507 if (grp->type != REQ_GROUP) 603 if (grp->type != REQ_GROUP)
508 return; 604 return;
509 605
510 SvREFCNT_dec (grp->fh2); 606 SvREFCNT_dec (grp->sv2);
511 grp->fh2 = 0; 607 grp->sv2 = 0;
512 608
513 for (sub = grp->grp_first; sub; sub = sub->grp_next) 609 for (sub = grp->grp_first; sub; sub = sub->grp_next)
514 req_cancel (sub); 610 req_cancel (sub);
515} 611}
516 612
… …
541#endif 637#endif
542 638
543 sigfillset (&fullsigset); 639 sigfillset (&fullsigset);
544 640
545 LOCK (wrklock); 641 LOCK (wrklock);
546 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
547 643
548 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
549 { 645 {
550 wrk->prev = &wrk_first; 646 wrk->prev = &wrk_first;
551 wrk->next = wrk_first.next; 647 wrk->next = wrk_first.next;
… …
554 ++started; 650 ++started;
555 } 651 }
556 else 652 else
557 free (wrk); 653 free (wrk);
558 654
559 sigprocmask (SIG_SETMASK, &oldsigset, 0); 655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
560 UNLOCK (wrklock); 656 UNLOCK (wrklock);
561} 657}
562 658
563static void maybe_start_thread () 659static void maybe_start_thread ()
564{ 660{
565 if (started >= wanted) 661 if (get_nthreads () >= wanted)
566 return; 662 return;
567 663
568 /* todo: maybe use idle here, but might be less exact */ 664 /* todo: maybe use idle here, but might be less exact */
569 if ((int)nready <= (int)started - (int)(nreqs - get_nready () - get_npending ())) 665 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 666 return;
571 667
572 start_thread (); 668 start_thread ();
573} 669}
574 670
575static void req_send (aio_req req) 671static void req_send (aio_req req)
576{ 672{
673 block_sig ();
674
577 ++nreqs; 675 ++nreqs;
578 676
579 LOCK (reqlock); 677 LOCK (reqlock);
580 ++nready; 678 ++nready;
581 reqq_push (&req_queue, req); 679 reqq_push (&req_queue, req);
582 pthread_cond_signal (&reqwait); 680 pthread_cond_signal (&reqwait);
583 UNLOCK (reqlock); 681 UNLOCK (reqlock);
584 682
683 unblock_sig ();
684
585 maybe_start_thread (); 685 maybe_start_thread ();
586} 686}
587 687
588static void end_thread (void) 688static void end_thread (void)
589{ 689{
… …
602 LOCK (wrklock); 702 LOCK (wrklock);
603 --started; 703 --started;
604 UNLOCK (wrklock); 704 UNLOCK (wrklock);
605} 705}
606 706
707static void set_max_idle (int nthreads)
708{
709 if (WORDACCESS_UNSAFE) LOCK (reqlock);
710 max_idle = nthreads <= 0 ? 1 : nthreads;
711 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
712}
713
607static void min_parallel (int nthreads) 714static void min_parallel (int nthreads)
608{ 715{
609 if (wanted < nthreads) 716 if (wanted < nthreads)
610 wanted = nthreads; 717 wanted = nthreads;
611} 718}
… …
624 fd_set rfd; 731 fd_set rfd;
625 732
626 while (nreqs) 733 while (nreqs)
627 { 734 {
628 int size; 735 int size;
629 if (WORDREAD_UNSAFE) LOCK (reslock); 736 if (WORDACCESS_UNSAFE) LOCK (reslock);
630 size = res_queue.size; 737 size = res_queue.size;
631 if (WORDREAD_UNSAFE) UNLOCK (reslock); 738 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
632 739
633 if (size) 740 if (size)
634 return; 741 return;
635 742
636 maybe_start_thread (); 743 maybe_start_thread ();
… …
640 747
641 select (respipe [0] + 1, &rfd, 0, 0, 0); 748 select (respipe [0] + 1, &rfd, 0, 0, 0);
642 } 749 }
643} 750}
644 751
645static int poll_cb (int max) 752static int poll_cb ()
646{ 753{
647 dSP; 754 dSP;
648 int count = 0; 755 int count = 0;
756 int maxreqs = max_poll_reqs;
649 int do_croak = 0; 757 int do_croak = 0;
758 struct timeval tv_start, tv_now;
650 aio_req req; 759 aio_req req;
760
761 if (max_poll_time)
762 gettimeofday (&tv_start, 0);
763
764 block_sig ();
651 765
652 for (;;) 766 for (;;)
653 { 767 {
654 while (max <= 0 || count < max) 768 for (;;)
655 { 769 {
656 maybe_start_thread (); 770 maybe_start_thread ();
657 771
658 LOCK (reslock); 772 LOCK (reslock);
659 req = reqq_shift (&res_queue); 773 req = reqq_shift (&res_queue);
… …
663 --npending; 777 --npending;
664 778
665 if (!res_queue.size) 779 if (!res_queue.size)
666 { 780 {
667 /* read any signals sent by the worker threads */ 781 /* read any signals sent by the worker threads */
668 char buf [32]; 782 char buf [4];
669 while (read (respipe [0], buf, 32) == 32) 783 while (read (respipe [0], buf, 4) == 4)
670 ; 784 ;
671 } 785 }
672 } 786 }
673 787
674 UNLOCK (reslock); 788 UNLOCK (reslock);
… …
676 if (!req) 790 if (!req)
677 break; 791 break;
678 792
679 --nreqs; 793 --nreqs;
680 794
681 if (req->type == REQ_GROUP && req->length) 795 if (req->type == REQ_GROUP && req->size)
682 { 796 {
683 req->fd = 1; /* mark request as delayed */ 797 req->int1 = 1; /* mark request as delayed */
684 continue; 798 continue;
685 } 799 }
686 else 800 else
687 { 801 {
688 if (req->type == REQ_READ) 802 if (!req_invoke (req))
689 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
690
691 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
692 SvREADONLY_off (req->data);
693
694 if (req->statdata)
695 { 803 {
696 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 804 req_free (req);
697 PL_laststatval = req->result; 805 unblock_sig ();
698 PL_statcache = *(req->statdata); 806 croak (0);
699 } 807 }
700
701 req_invoke (req);
702 808
703 count++; 809 count++;
704 } 810 }
705 811
706 req_free (req); 812 req_free (req);
813
814 if (maxreqs && !--maxreqs)
815 break;
816
817 if (max_poll_time)
818 {
819 gettimeofday (&tv_now, 0);
820
821 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
822 break;
823 }
707 } 824 }
708 825
709 if (nreqs <= max_outstanding) 826 if (nreqs <= max_outstanding)
710 break; 827 break;
711 828
712 poll_wait (); 829 poll_wait ();
713 830
714 max = 0; 831 ++maxreqs;
715 } 832 }
716 833
834 unblock_sig ();
717 return count; 835 return count;
718} 836}
719 837
720static void create_pipe () 838static void create_pipe ()
721{ 839{
… …
937 int memofs = 0; 1055 int memofs = 0;
938 int res = 0; 1056 int res = 0;
939 int errorno; 1057 int errorno;
940 1058
941 LOCK (wrklock); 1059 LOCK (wrklock);
942 self->dirp = dirp = opendir (req->dataptr); 1060 self->dirp = dirp = opendir (req->ptr1);
943 self->dbuf = u = malloc (sizeof (*u)); 1061 self->dbuf = u = malloc (sizeof (*u));
1062 req->flags |= FLAG_PTR2_FREE;
944 req->data2ptr = names = malloc (memlen); 1063 req->ptr2 = names = malloc (memlen);
945 UNLOCK (wrklock); 1064 UNLOCK (wrklock);
946 1065
947 if (dirp && u && names) 1066 if (dirp && u && names)
948 for (;;) 1067 for (;;)
949 { 1068 {
… …
963 1082
964 while (memofs + len > memlen) 1083 while (memofs + len > memlen)
965 { 1084 {
966 memlen *= 2; 1085 memlen *= 2;
967 LOCK (wrklock); 1086 LOCK (wrklock);
968 req->data2ptr = names = realloc (names, memlen); 1087 req->ptr2 = names = realloc (names, memlen);
969 UNLOCK (wrklock); 1088 UNLOCK (wrklock);
970 1089
971 if (!names) 1090 if (!names)
972 break; 1091 break;
973 } 1092 }
… …
1038 errno = 0; /* strictly unnecessary */ 1157 errno = 0; /* strictly unnecessary */
1039 1158
1040 if (!(req->flags & FLAG_CANCELLED)) 1159 if (!(req->flags & FLAG_CANCELLED))
1041 switch (req->type) 1160 switch (req->type)
1042 { 1161 {
1043 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1162 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1044 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1163 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1045 1164
1046 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1165 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1047 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1166 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1048 1167
1049 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1168 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1050 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1169 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1051 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1170 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1052 1171
1053 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1172 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1054 case REQ_CLOSE: req->result = close (req->fd); break; 1173 case REQ_CLOSE: req->result = close (req->int1); break;
1055 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1056 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1057 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1176 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1058 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1177 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1059 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1178 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1060 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1179 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1180 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1061 1181
1062 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1182 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1063 case REQ_FSYNC: req->result = fsync (req->fd); break; 1183 case REQ_FSYNC: req->result = fsync (req->int1); break;
1064 case REQ_READDIR: scandir_ (req, self); break; 1184 case REQ_READDIR: scandir_ (req, self); break;
1065 1185
1066 case REQ_BUSY: 1186 case REQ_BUSY:
1067 { 1187 {
1068 struct timeval tv; 1188 struct timeval tv;
1069 1189
1070 tv.tv_sec = req->fd; 1190 tv.tv_sec = req->int1;
1071 tv.tv_usec = req->fd2; 1191 tv.tv_usec = req->int2;
1072 1192
1073 req->result = select (0, 0, 0, 0, &tv); 1193 req->result = select (0, 0, 0, 0, &tv);
1074 } 1194 }
1075 1195
1076 case REQ_GROUP: 1196 case REQ_GROUP:
… …
1090 LOCK (reslock); 1210 LOCK (reslock);
1091 1211
1092 ++npending; 1212 ++npending;
1093 1213
1094 if (!reqq_push (&res_queue, req)) 1214 if (!reqq_push (&res_queue, req))
1215 {
1095 /* write a dummy byte to the pipe so fh becomes ready */ 1216 /* write a dummy byte to the pipe so fh becomes ready */
1096 write (respipe [1], &respipe, 1); 1217 write (respipe [1], &respipe, 1);
1218
1219 /* optionally signal the main thread asynchronously */
1220 if (main_sig)
1221 pthread_kill (main_tid, main_sig);
1222 }
1097 1223
1098 self->req = 0; 1224 self->req = 0;
1099 worker_clear (self); 1225 worker_clear (self);
1100 1226
1101 UNLOCK (reslock); 1227 UNLOCK (reslock);
… …
1204 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1330 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1205 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1331 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1206 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1332 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1207 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1333 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1208 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1334 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1335 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1209 1336
1210 create_pipe (); 1337 create_pipe ();
1211 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1338 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1212} 1339}
1213 1340
1214void 1341void
1342max_poll_reqs (int nreqs)
1343 PROTOTYPE: $
1344 CODE:
1345 max_poll_reqs = nreqs;
1346
1347void
1348max_poll_time (double nseconds)
1349 PROTOTYPE: $
1350 CODE:
1351 max_poll_time = nseconds * AIO_TICKS;
1352
1353void
1215min_parallel (int nthreads) 1354min_parallel (int nthreads)
1216 PROTOTYPE: $ 1355 PROTOTYPE: $
1217 1356
1218void 1357void
1219max_parallel (int nthreads) 1358max_parallel (int nthreads)
1220 PROTOTYPE: $ 1359 PROTOTYPE: $
1360
1361void
1362max_idle (int nthreads)
1363 PROTOTYPE: $
1364 CODE:
1365 set_max_idle (nthreads);
1221 1366
1222int 1367int
1223max_outstanding (int maxreqs) 1368max_outstanding (int maxreqs)
1224 PROTOTYPE: $ 1369 PROTOTYPE: $
1225 CODE: 1370 CODE:
… …
1228 OUTPUT: 1373 OUTPUT:
1229 RETVAL 1374 RETVAL
1230 1375
1231void 1376void
1232aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1377aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1233 SV * pathname 1378 SV8 * pathname
1234 int flags 1379 int flags
1235 int mode 1380 int mode
1236 SV * callback 1381 SV * callback
1237 PROTOTYPE: $$$;$ 1382 PROTOTYPE: $$$;$
1238 PPCODE: 1383 PPCODE:
1239{ 1384{
1240 dREQ; 1385 dREQ;
1241 1386
1242 req->type = REQ_OPEN; 1387 req->type = REQ_OPEN;
1243 req->data = newSVsv (pathname); 1388 req->sv1 = newSVsv (pathname);
1244 req->dataptr = SvPVbyte_nolen (req->data); 1389 req->ptr1 = SvPVbyte_nolen (req->sv1);
1245 req->fd = flags; 1390 req->int1 = flags;
1246 req->mode = mode; 1391 req->mode = mode;
1247 1392
1248 REQ_SEND; 1393 REQ_SEND;
1249} 1394}
1250 1395
… …
1260 PPCODE: 1405 PPCODE:
1261{ 1406{
1262 dREQ; 1407 dREQ;
1263 1408
1264 req->type = ix; 1409 req->type = ix;
1265 req->fh = newSVsv (fh); 1410 req->fh = newSVsv (fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1411 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1267 1412
1268 REQ_SEND (req); 1413 REQ_SEND (req);
1269} 1414}
1270 1415
1271void 1416void
1272aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1417aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1273 SV * fh 1418 SV * fh
1274 UV offset 1419 UV offset
1275 UV length 1420 UV length
1276 SV * data 1421 SV8 * data
1277 UV dataoffset 1422 UV dataoffset
1278 SV * callback 1423 SV * callback
1279 ALIAS: 1424 ALIAS:
1280 aio_read = REQ_READ 1425 aio_read = REQ_READ
1281 aio_write = REQ_WRITE 1426 aio_write = REQ_WRITE
1282 PROTOTYPE: $$$$$;$ 1427 PROTOTYPE: $$$$$;$
1283 PPCODE: 1428 PPCODE:
1284{ 1429{
1285 aio_req req;
1286 STRLEN svlen; 1430 STRLEN svlen;
1287 char *svptr = SvPVbyte (data, svlen); 1431 char *svptr = SvPVbyte (data, svlen);
1288 1432
1289 SvUPGRADE (data, SVt_PV); 1433 SvUPGRADE (data, SVt_PV);
1290 SvPOK_on (data); 1434 SvPOK_on (data);
… …
1302 length = svlen - dataoffset; 1446 length = svlen - dataoffset;
1303 } 1447 }
1304 else 1448 else
1305 { 1449 {
1306 /* read: grow scalar as necessary */ 1450 /* read: grow scalar as necessary */
1307 svptr = SvGROW (data, length + dataoffset); 1451 svptr = SvGROW (data, length + dataoffset + 1);
1308 } 1452 }
1309 1453
1310 if (length < 0) 1454 if (length < 0)
1311 croak ("length must not be negative"); 1455 croak ("length must not be negative");
1312 1456
1313 { 1457 {
1314 dREQ; 1458 dREQ;
1315 1459
1316 req->type = ix; 1460 req->type = ix;
1317 req->fh = newSVsv (fh); 1461 req->fh = newSVsv (fh);
1318 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1462 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1319 : IoOFP (sv_2io (fh))); 1463 : IoOFP (sv_2io (fh)));
1320 req->offset = offset; 1464 req->offs = offset;
1321 req->length = length; 1465 req->size = length;
1322 req->data = SvREFCNT_inc (data); 1466 req->sv1 = SvREFCNT_inc (data);
1323 req->dataptr = (char *)svptr + dataoffset; 1467 req->ptr1 = (char *)svptr + dataoffset;
1468 req->stroffset = dataoffset;
1324 1469
1325 if (!SvREADONLY (data)) 1470 if (!SvREADONLY (data))
1326 { 1471 {
1327 SvREADONLY_on (data); 1472 SvREADONLY_on (data);
1328 req->data2ptr = (void *)data; 1473 req->flags |= FLAG_SV1_RO_OFF;
1329 } 1474 }
1330 1475
1331 REQ_SEND; 1476 REQ_SEND;
1332 } 1477 }
1478}
1479
1480void
1481aio_readlink (path,callback=&PL_sv_undef)
1482 SV8 * path
1483 SV * callback
1484 PROTOTYPE: $$;$
1485 PPCODE:
1486{
1487 SV *data;
1488 dREQ;
1489
1490 data = newSV (NAME_MAX);
1491 SvPOK_on (data);
1492
1493 req->type = REQ_READLINK;
1494 req->fh = newSVsv (path);
1495 req->ptr2 = SvPVbyte_nolen (req->fh);
1496 req->sv1 = data;
1497 req->ptr1 = SvPVbyte_nolen (data);
1498
1499 REQ_SEND;
1333} 1500}
1334 1501
1335void 1502void
1336aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1503aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1337 SV * out_fh 1504 SV * out_fh
… …
1343 PPCODE: 1510 PPCODE:
1344{ 1511{
1345 dREQ; 1512 dREQ;
1346 1513
1347 req->type = REQ_SENDFILE; 1514 req->type = REQ_SENDFILE;
1348 req->fh = newSVsv (out_fh); 1515 req->fh = newSVsv (out_fh);
1349 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1516 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1350 req->fh2 = newSVsv (in_fh); 1517 req->sv2 = newSVsv (in_fh);
1351 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1518 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1352 req->offset = in_offset; 1519 req->offs = in_offset;
1353 req->length = length; 1520 req->size = length;
1354 1521
1355 REQ_SEND; 1522 REQ_SEND;
1356} 1523}
1357 1524
1358void 1525void
… …
1365 PPCODE: 1532 PPCODE:
1366{ 1533{
1367 dREQ; 1534 dREQ;
1368 1535
1369 req->type = REQ_READAHEAD; 1536 req->type = REQ_READAHEAD;
1370 req->fh = newSVsv (fh); 1537 req->fh = newSVsv (fh);
1371 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1538 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1372 req->offset = offset; 1539 req->offs = offset;
1373 req->length = length; 1540 req->size = length;
1374 1541
1375 REQ_SEND; 1542 REQ_SEND;
1376} 1543}
1377 1544
1378void 1545void
1379aio_stat (fh_or_path,callback=&PL_sv_undef) 1546aio_stat (fh_or_path,callback=&PL_sv_undef)
1380 SV * fh_or_path 1547 SV8 * fh_or_path
1381 SV * callback 1548 SV * callback
1382 ALIAS: 1549 ALIAS:
1383 aio_stat = REQ_STAT 1550 aio_stat = REQ_STAT
1384 aio_lstat = REQ_LSTAT 1551 aio_lstat = REQ_LSTAT
1385 PPCODE: 1552 PPCODE:
1386{ 1553{
1387 dREQ; 1554 dREQ;
1388 1555
1389 New (0, req->statdata, 1, Stat_t); 1556 req->ptr2 = malloc (sizeof (Stat_t));
1390 if (!req->statdata) 1557 if (!req->ptr2)
1391 { 1558 {
1392 req_free (req); 1559 req_free (req);
1393 croak ("out of memory during aio_req->statdata allocation"); 1560 croak ("out of memory during aio_stat statdata allocation");
1394 } 1561 }
1562
1563 req->flags |= FLAG_PTR2_FREE;
1395 1564
1396 if (SvPOK (fh_or_path)) 1565 if (SvPOK (fh_or_path))
1397 { 1566 {
1398 req->type = ix; 1567 req->type = ix;
1399 req->data = newSVsv (fh_or_path); 1568 req->sv1 = newSVsv (fh_or_path);
1400 req->dataptr = SvPVbyte_nolen (req->data); 1569 req->ptr1 = SvPVbyte_nolen (req->sv1);
1401 } 1570 }
1402 else 1571 else
1403 { 1572 {
1404 req->type = REQ_FSTAT; 1573 req->type = REQ_FSTAT;
1405 req->fh = newSVsv (fh_or_path); 1574 req->fh = newSVsv (fh_or_path);
1406 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1575 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1407 } 1576 }
1408 1577
1409 REQ_SEND; 1578 REQ_SEND;
1410} 1579}
1411 1580
1412void 1581void
1413aio_unlink (pathname,callback=&PL_sv_undef) 1582aio_unlink (pathname,callback=&PL_sv_undef)
1414 SV * pathname 1583 SV8 * pathname
1415 SV * callback 1584 SV * callback
1416 ALIAS: 1585 ALIAS:
1417 aio_unlink = REQ_UNLINK 1586 aio_unlink = REQ_UNLINK
1418 aio_rmdir = REQ_RMDIR 1587 aio_rmdir = REQ_RMDIR
1419 aio_readdir = REQ_READDIR 1588 aio_readdir = REQ_READDIR
1420 PPCODE: 1589 PPCODE:
1421{ 1590{
1422 dREQ; 1591 dREQ;
1423 1592
1424 req->type = ix; 1593 req->type = ix;
1425 req->data = newSVsv (pathname); 1594 req->sv1 = newSVsv (pathname);
1426 req->dataptr = SvPVbyte_nolen (req->data); 1595 req->ptr1 = SvPVbyte_nolen (req->sv1);
1427 1596
1428 REQ_SEND; 1597 REQ_SEND;
1429} 1598}
1430 1599
1431void 1600void
1432aio_link (oldpath,newpath,callback=&PL_sv_undef) 1601aio_link (oldpath,newpath,callback=&PL_sv_undef)
1433 SV * oldpath 1602 SV8 * oldpath
1434 SV * newpath 1603 SV8 * newpath
1435 SV * callback 1604 SV * callback
1436 ALIAS: 1605 ALIAS:
1437 aio_link = REQ_LINK 1606 aio_link = REQ_LINK
1438 aio_symlink = REQ_SYMLINK 1607 aio_symlink = REQ_SYMLINK
1439 aio_rename = REQ_RENAME 1608 aio_rename = REQ_RENAME
1440 PPCODE: 1609 PPCODE:
1441{ 1610{
1442 dREQ; 1611 dREQ;
1443 1612
1444 req->type = ix; 1613 req->type = ix;
1445 req->fh = newSVsv (oldpath); 1614 req->fh = newSVsv (oldpath);
1446 req->data2ptr = SvPVbyte_nolen (req->fh); 1615 req->ptr2 = SvPVbyte_nolen (req->fh);
1447 req->data = newSVsv (newpath); 1616 req->sv1 = newSVsv (newpath);
1448 req->dataptr = SvPVbyte_nolen (req->data); 1617 req->ptr1 = SvPVbyte_nolen (req->sv1);
1449 1618
1450 REQ_SEND; 1619 REQ_SEND;
1451} 1620}
1452 1621
1453void 1622void
1454aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1623aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1455 SV * pathname 1624 SV8 * pathname
1456 SV * callback 1625 SV * callback
1457 UV mode 1626 UV mode
1458 UV dev 1627 UV dev
1459 PPCODE: 1628 PPCODE:
1460{ 1629{
1461 dREQ; 1630 dREQ;
1462 1631
1463 req->type = REQ_MKNOD; 1632 req->type = REQ_MKNOD;
1464 req->data = newSVsv (pathname); 1633 req->sv1 = newSVsv (pathname);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1634 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 req->mode = (mode_t)mode; 1635 req->mode = (mode_t)mode;
1467 req->offset = dev; 1636 req->offs = dev;
1468 1637
1469 REQ_SEND; 1638 REQ_SEND;
1470} 1639}
1471 1640
1472void 1641void
1473aio_busy (delay,callback=&PL_sv_undef) 1642aio_busy (delay,callback=&PL_sv_undef)
1474 double delay 1643 double delay
1475 SV * callback 1644 SV * callback
1476 PPCODE: 1645 PPCODE:
1477{ 1646{
1478 dREQ; 1647 dREQ;
1479 1648
1480 req->type = REQ_BUSY; 1649 req->type = REQ_BUSY;
1481 req->fd = delay < 0. ? 0 : delay; 1650 req->int1 = delay < 0. ? 0 : delay;
1482 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1651 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1483 1652
1484 REQ_SEND; 1653 REQ_SEND;
1485} 1654}
1486 1655
1487void 1656void
… …
1491 PPCODE: 1660 PPCODE:
1492{ 1661{
1493 dREQ; 1662 dREQ;
1494 1663
1495 req->type = REQ_GROUP; 1664 req->type = REQ_GROUP;
1665
1496 req_send (req); 1666 req_send (req);
1497
1498 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1667 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1499} 1668}
1500 1669
1501void 1670void
1502aio_nop (callback=&PL_sv_undef) 1671aio_nop (callback=&PL_sv_undef)
1503 SV * callback 1672 SV * callback
1504 PPCODE: 1673 PPCODE:
1505{ 1674{
1506 dREQ; 1675 dREQ;
1507 1676
1508 req->type = REQ_NOP; 1677 req->type = REQ_NOP;
… …
1537 PROTOTYPE: 1706 PROTOTYPE:
1538 CODE: 1707 CODE:
1539 while (nreqs) 1708 while (nreqs)
1540 { 1709 {
1541 poll_wait (); 1710 poll_wait ();
1542 poll_cb (0); 1711 poll_cb ();
1543 } 1712 }
1544 1713
1545void 1714int
1546poll() 1715poll()
1547 PROTOTYPE: 1716 PROTOTYPE:
1548 CODE: 1717 CODE:
1549 if (nreqs)
1550 {
1551 poll_wait (); 1718 poll_wait ();
1552 poll_cb (0); 1719 RETVAL = poll_cb ();
1553 } 1720 OUTPUT:
1721 RETVAL
1554 1722
1555int 1723int
1556poll_fileno() 1724poll_fileno()
1557 PROTOTYPE: 1725 PROTOTYPE:
1558 CODE: 1726 CODE:
… …
1562 1730
1563int 1731int
1564poll_cb(...) 1732poll_cb(...)
1565 PROTOTYPE: 1733 PROTOTYPE:
1566 CODE: 1734 CODE:
1567 RETVAL = poll_cb (0); 1735 RETVAL = poll_cb ();
1568 OUTPUT:
1569 RETVAL
1570
1571int
1572poll_some(int max = 0)
1573 PROTOTYPE: $
1574 CODE:
1575 RETVAL = poll_cb (max);
1576 OUTPUT: 1736 OUTPUT:
1577 RETVAL 1737 RETVAL
1578 1738
1579void 1739void
1580poll_wait() 1740poll_wait()
1581 PROTOTYPE: 1741 PROTOTYPE:
1582 CODE: 1742 CODE:
1583 if (nreqs)
1584 poll_wait (); 1743 poll_wait ();
1744
1745void
1746setsig (int signum = SIGIO)
1747 PROTOTYPE: ;$
1748 CODE:
1749{
1750 if (block_sig_level)
1751 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1752
1753 LOCK (reslock);
1754 main_tid = pthread_self ();
1755 main_sig = signum;
1756 UNLOCK (reslock);
1757
1758 if (main_sig && npending)
1759 pthread_kill (main_tid, main_sig);
1760}
1761
1762void
1763aio_block (SV *cb)
1764 PROTOTYPE: &
1765 PPCODE:
1766{
1767 int count;
1768
1769 block_sig ();
1770 PUSHMARK (SP);
1771 PUTBACK;
1772 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1773 SPAGAIN;
1774 unblock_sig ();
1775
1776 if (SvTRUE (ERRSV))
1777 croak (0);
1778
1779 XSRETURN (count);
1780}
1585 1781
1586int 1782int
1587nreqs() 1783nreqs()
1588 PROTOTYPE: 1784 PROTOTYPE:
1589 CODE: 1785 CODE:
… …
1605 CODE: 1801 CODE:
1606 RETVAL = get_npending (); 1802 RETVAL = get_npending ();
1607 OUTPUT: 1803 OUTPUT:
1608 RETVAL 1804 RETVAL
1609 1805
1806int
1807nthreads()
1808 PROTOTYPE:
1809 CODE:
1810 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1811 RETVAL = started;
1812 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1813 OUTPUT:
1814 RETVAL
1815
1610PROTOTYPES: DISABLE 1816PROTOTYPES: DISABLE
1611 1817
1612MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1818MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1613 1819
1614void 1820void
… …
1629 PPCODE: 1835 PPCODE:
1630{ 1836{
1631 int i; 1837 int i;
1632 aio_req req; 1838 aio_req req;
1633 1839
1840 if (main_sig && !block_sig_level)
1841 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1842
1634 if (grp->fd == 2) 1843 if (grp->int1 == 2)
1635 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1844 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1636 1845
1637 for (i = 1; i < items; ++i ) 1846 for (i = 1; i < items; ++i )
1638 { 1847 {
1639 if (GIMME_V != G_VOID) 1848 if (GIMME_V != G_VOID)
… …
1641 1850
1642 req = SvAIO_REQ (ST (i)); 1851 req = SvAIO_REQ (ST (i));
1643 1852
1644 if (req) 1853 if (req)
1645 { 1854 {
1646 ++grp->length; 1855 ++grp->size;
1647 req->grp = grp; 1856 req->grp = grp;
1648 1857
1649 req->grp_prev = 0; 1858 req->grp_prev = 0;
1650 req->grp_next = grp->grp_first; 1859 req->grp_next = grp->grp_first;
1651 1860
… …
1674 av = newAV (); 1883 av = newAV ();
1675 1884
1676 for (i = 1; i < items; ++i ) 1885 for (i = 1; i < items; ++i )
1677 av_push (av, newSVsv (ST (i))); 1886 av_push (av, newSVsv (ST (i)));
1678 1887
1679 SvREFCNT_dec (grp->data); 1888 SvREFCNT_dec (grp->sv1);
1680 grp->data = (SV *)av; 1889 grp->sv1 = (SV *)av;
1681} 1890}
1682 1891
1683void 1892void
1684errno (aio_req grp, int errorno = errno) 1893errno (aio_req grp, int errorno = errno)
1685 CODE: 1894 CODE:
1686 grp->errorno = errorno; 1895 grp->errorno = errorno;
1687 1896
1688void 1897void
1689limit (aio_req grp, int limit) 1898limit (aio_req grp, int limit)
1690 CODE: 1899 CODE:
1691 grp->fd2 = limit; 1900 grp->int2 = limit;
1692 aio_grp_feed (grp); 1901 aio_grp_feed (grp);
1693 1902
1694void 1903void
1695feed (aio_req grp, SV *callback=&PL_sv_undef) 1904feed (aio_req grp, SV *callback=&PL_sv_undef)
1696 CODE: 1905 CODE:
1697{ 1906{
1698 SvREFCNT_dec (grp->fh2); 1907 SvREFCNT_dec (grp->sv2);
1699 grp->fh2 = newSVsv (callback); 1908 grp->sv2 = newSVsv (callback);
1700 1909
1701 if (grp->fd2 <= 0) 1910 if (grp->int2 <= 0)
1702 grp->fd2 = 2; 1911 grp->int2 = 2;
1703 1912
1704 aio_grp_feed (grp); 1913 aio_grp_feed (grp);
1705} 1914}
1706 1915

Diff Legend

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