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.81 by root, Fri Oct 27 20:10:06 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC

… …
43# else 43# else
44# error sendfile support requested but not available 44# error sendfile support requested but not available
45# endif 45# endif
46#endif 46#endif
47 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
48/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 52#ifndef NAME_MAX
50# define NAME_MAX 4096 53# define NAME_MAX 4096
51#endif 54#endif
52 55
… …
65 68
66/* wether word reads are potentially non-atomic. 69/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs 70 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes. 71 * on have atomic word read/writes.
69 */ 72 */
70#ifndef WORDREAD_UNSAFE 73#ifndef WORDACCESS_UNSAFE
71# if __i386 || __x86_64 74# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0 75# define WORDACCESS_UNSAFE 0
73# else 76# else
74# define WORDREAD_UNSAFE 1 77# define WORDACCESS_UNSAFE 1
75# endif 78# endif
76#endif 79#endif
77 80
78/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
… …
83 LOCK (wrklock); \ 86 LOCK (wrklock); \
84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
86 if (!aio_buf) \ 89 if (!aio_buf) \
87 return -1; 90 return -1;
91
92typedef SV SV8; /* byte-sv, used for argument-checking */
88 93
89enum { 94enum {
90 REQ_QUIT, 95 REQ_QUIT,
91 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
92 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
93 REQ_SENDFILE, 98 REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
95 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
97 REQ_MKNOD, REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 105 REQ_BUSY,
101}; 106};
102 107
103#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
105 110
106typedef struct aio_cb 111typedef struct aio_cb
107{ 112{
108 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
109 114
110 SV *data, *callback; 115 SV *callback, *fh;
111 SV *fh, *fh2; 116 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
113 Stat_t *statdata;
114 off_t offset; 118 off_t offs;
115 size_t length; 119 size_t size;
116 ssize_t result; 120 ssize_t result;
117 121
118 STRLEN dataoffset; 122 STRLEN stroffset;
119 int type; 123 int type;
120 int fd, fd2; 124 int int1, int2;
121 int errorno; 125 int errorno;
122 mode_t mode; /* open */ 126 mode_t mode; /* open */
123 127
124 unsigned char flags; 128 unsigned char flags;
125 unsigned char pri; 129 unsigned char pri;
… …
127 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 133} aio_cb;
130 134
131enum { 135enum {
132 FLAG_CANCELLED = 0x01, 136 FLAG_CANCELLED = 0x01, /* request was cancelled */
137 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
138 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
133}; 139};
134 140
135typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
137 143
… …
142 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 151};
146 152
153#define AIO_TICKS ((1000000 + 1023) >> 10)
154
155static unsigned int max_poll_time = 0;
156static unsigned int max_poll_reqs = 0;
157
158/* calculcate time difference in ~1/AIO_TICKS of a second */
159static int tvdiff (struct timeval *tv1, struct timeval *tv2)
160{
161 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
162 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
163}
164
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 166
149static unsigned int started, wanted; 167static unsigned int started, idle, wanted;
150 168
151#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
152# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
153#else 171#else
154# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
196 214
197 free (wrk); 215 free (wrk);
198} 216}
199 217
200static volatile unsigned int nreqs, nready, npending; 218static volatile unsigned int nreqs, nready, npending;
219static volatile unsigned int max_idle = 4;
201static volatile unsigned int max_outstanding = 0xffffffff; 220static volatile unsigned int max_outstanding = 0xffffffff;
202static int respipe [2]; 221static int respipe [2];
203 222
204static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
205static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
206static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 225static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
207 226
208#if WORDREAD_UNSAFE 227#if WORDACCESS_UNSAFE
209 228
210static unsigned int get_nready () 229static unsigned int get_nready ()
211{ 230{
212 unsigned int retval; 231 unsigned int retval;
213 232
… …
227 UNLOCK (reslock); 246 UNLOCK (reslock);
228 247
229 return retval; 248 return retval;
230} 249}
231 250
251static unsigned int get_nthreads ()
252{
253 unsigned int retval;
254
255 LOCK (wrklock);
256 retval = started;
257 UNLOCK (wrklock);
258
259 return retval;
260}
261
232#else 262#else
233 263
234# define get_nready() nready 264# define get_nready() nready
235# define get_npending() npending 265# define get_npending() npending
266# define get_nthreads() started
236 267
237#endif 268#endif
238 269
239/* 270/*
240 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
… …
288 } 319 }
289 320
290 abort (); 321 abort ();
291} 322}
292 323
293static int poll_cb (int max); 324static int poll_cb ();
294static void req_invoke (aio_req req); 325static void req_invoke (aio_req req);
295static void req_free (aio_req req); 326static void req_free (aio_req req);
296static void req_cancel (aio_req req); 327static void req_cancel (aio_req req);
297 328
298/* must be called at most once */ 329/* must be called at most once */
… …
319 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
320} 351}
321 352
322static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
323{ 354{
324 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
325 { 356 {
326 int old_len = grp->length; 357 int old_len = grp->size;
327 358
328 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
329 { 360 {
330 dSP; 361 dSP;
331 362
332 ENTER; 363 ENTER;
333 SAVETMPS; 364 SAVETMPS;
334 PUSHMARK (SP); 365 PUSHMARK (SP);
335 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
336 PUTBACK; 367 PUTBACK;
337 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
338 SPAGAIN; 369 SPAGAIN;
339 FREETMPS; 370 FREETMPS;
340 LEAVE; 371 LEAVE;
341 } 372 }
342 373
343 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
344 if (old_len == grp->length) 375 if (old_len == grp->size)
345 { 376 {
346 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
347 grp->fh2 = 0; 378 grp->sv2 = 0;
348 break; 379 break;
349 } 380 }
350 } 381 }
351} 382}
352 383
353static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
354{ 385{
355 --grp->length; 386 --grp->size;
356 387
357 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
358 aio_grp_feed (grp); 389 aio_grp_feed (grp);
359 390
360 /* finish, if done */ 391 /* finish, if done */
361 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
362 { 393 {
363 req_invoke (grp); 394 req_invoke (grp);
364 req_free (grp); 395 req_free (grp);
365 } 396 }
366} 397}
367 398
368static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
369{ 400{
370 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
371 405
372 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
373 { 407 {
374 ENTER; 408 ENTER;
375 SAVETMPS; 409 SAVETMPS;
… …
383 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
384 418
385 if (req->result >= 0) 419 if (req->result >= 0)
386 { 420 {
387 int i; 421 int i;
388 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
389 AV *av = newAV (); 423 AV *av = newAV ();
390 424
391 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
392 426
393 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
413 PUSHs (sv_2mortal (newSViv (req->result))); 447 PUSHs (sv_2mortal (newSViv (req->result)));
414 PUTBACK; 448 PUTBACK;
415 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
416 SPAGAIN; 450 SPAGAIN;
417 451
418 fh = SvREFCNT_inc (POPs); 452 fh = POPs;
419
420 PUSHMARK (SP); 453 PUSHMARK (SP);
421 XPUSHs (sv_2mortal (fh)); 454 XPUSHs (fh);
422 } 455 }
423 break; 456 break;
424 457
425 case REQ_GROUP: 458 case REQ_GROUP:
426 req->fd = 2; /* mark group as finished */ 459 req->int1 = 2; /* mark group as finished */
427 460
428 if (req->data) 461 if (req->sv1)
429 { 462 {
430 int i; 463 int i;
431 AV *av = (AV *)req->data; 464 AV *av = (AV *)req->sv1;
432 465
433 EXTEND (SP, AvFILL (av) + 1); 466 EXTEND (SP, AvFILL (av) + 1);
434 for (i = 0; i <= AvFILL (av); ++i) 467 for (i = 0; i <= AvFILL (av); ++i)
435 PUSHs (*av_fetch (av, i, 0)); 468 PUSHs (*av_fetch (av, i, 0));
436 } 469 }
… …
438 471
439 case REQ_NOP: 472 case REQ_NOP:
440 case REQ_BUSY: 473 case REQ_BUSY:
441 break; 474 break;
442 475
476 case REQ_READLINK:
477 if (req->result > 0)
478 {
479 SvCUR_set (req->sv1, req->result);
480 *SvEND (req->sv1) = 0;
481 PUSHs (req->sv1);
482 }
483 break;
484
485 case REQ_STAT:
486 case REQ_LSTAT:
487 case REQ_FSTAT:
488 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
489 PL_laststatval = req->result;
490 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result)));
492 break;
493
494 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result)));
498 break;
499
443 default: 500 default:
444 PUSHs (sv_2mortal (newSViv (req->result))); 501 PUSHs (sv_2mortal (newSViv (req->result)));
445 break; 502 break;
446 } 503 }
447 504
… …
482 { 539 {
483 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
484 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
485 } 542 }
486 543
487 SvREFCNT_dec (req->data);
488 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
489 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
490 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
491 Safefree (req->statdata);
492 548
493 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
494 free (req->data2ptr); 550 free (req->ptr2);
495 551
496 Safefree (req); 552 Safefree (req);
497} 553}
498 554
499static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
501 aio_req sub; 557 aio_req sub;
502 558
503 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
504 return; 560 return;
505 561
506 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
507 grp->fh2 = 0; 563 grp->sv2 = 0;
508 564
509 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
510 req_cancel (sub); 566 req_cancel (sub);
511} 567}
512 568
… …
556 UNLOCK (wrklock); 612 UNLOCK (wrklock);
557} 613}
558 614
559static void maybe_start_thread () 615static void maybe_start_thread ()
560{ 616{
561#if 0 617 if (get_nthreads () >= wanted)
562 static struct timeval last;
563 struct timeval diff, now;
564#endif
565
566 if (started >= wanted)
567 return; 618 return;
568 619
569 if (nready <= nreqs - get_nready () - get_npending ()) 620 /* todo: maybe use idle here, but might be less exact */
621 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 622 return;
571
572#if 0
573 gettimeofday (&now, 0);
574
575 diff.tv_sec = now.tv_sec - last.tv_sec;
576 diff.tv_usec = now.tv_usec - last.tv_usec;
577
578 if (diff.tv_usec < 0)
579 {
580 --diff.tv_sec;
581 diff.tv_usec += 1000000;
582 }
583
584 if (!diff.tv_sec && diff.tv_usec < 10000)
585 return;
586
587 last = now;
588#endif
589 623
590 start_thread (); 624 start_thread ();
591} 625}
592 626
593static void req_send (aio_req req) 627static void req_send (aio_req req)
… …
610 Newz (0, req, 1, aio_cb); 644 Newz (0, req, 1, aio_cb);
611 645
612 req->type = REQ_QUIT; 646 req->type = REQ_QUIT;
613 req->pri = PRI_MAX + PRI_BIAS; 647 req->pri = PRI_MAX + PRI_BIAS;
614 648
615 req_send (req); 649 LOCK (reqlock);
650 reqq_push (&req_queue, req);
651 pthread_cond_signal (&reqwait);
652 UNLOCK (reqlock);
616 653
617 LOCK (wrklock); 654 LOCK (wrklock);
618 --started; 655 --started;
619 UNLOCK (wrklock); 656 UNLOCK (wrklock);
620} 657}
621 658
659static void set_max_idle (int nthreads)
660{
661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
662 max_idle = nthreads <= 0 ? 1 : nthreads;
663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
664}
665
622static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
623{ 667{
624 if (wanted < nthreads) 668 if (wanted < nthreads)
625 wanted = nthreads; 669 wanted = nthreads;
626} 670}
… …
639 fd_set rfd; 683 fd_set rfd;
640 684
641 while (nreqs) 685 while (nreqs)
642 { 686 {
643 int size; 687 int size;
644 if (WORDREAD_UNSAFE) LOCK (reslock); 688 if (WORDACCESS_UNSAFE) LOCK (reslock);
645 size = res_queue.size; 689 size = res_queue.size;
646 if (WORDREAD_UNSAFE) UNLOCK (reslock); 690 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
647 691
648 if (size) 692 if (size)
649 return; 693 return;
650 694
651 maybe_start_thread (); 695 maybe_start_thread ();
… …
655 699
656 select (respipe [0] + 1, &rfd, 0, 0, 0); 700 select (respipe [0] + 1, &rfd, 0, 0, 0);
657 } 701 }
658} 702}
659 703
660static int poll_cb (int max) 704static int poll_cb ()
661{ 705{
662 dSP; 706 dSP;
663 int count = 0; 707 int count = 0;
708 int maxreqs = max_poll_reqs;
664 int do_croak = 0; 709 int do_croak = 0;
710 struct timeval tv_start, tv_now;
665 aio_req req; 711 aio_req req;
712
713 if (max_poll_time)
714 gettimeofday (&tv_start, 0);
666 715
667 for (;;) 716 for (;;)
668 { 717 {
669 while (max <= 0 || count < max) 718 for (;;)
670 { 719 {
671 maybe_start_thread (); 720 maybe_start_thread ();
672 721
673 LOCK (reslock); 722 LOCK (reslock);
674 req = reqq_shift (&res_queue); 723 req = reqq_shift (&res_queue);
… …
691 if (!req) 740 if (!req)
692 break; 741 break;
693 742
694 --nreqs; 743 --nreqs;
695 744
696 if (req->type == REQ_GROUP && req->length) 745 if (req->type == REQ_GROUP && req->size)
697 { 746 {
698 req->fd = 1; /* mark request as delayed */ 747 req->int1 = 1; /* mark request as delayed */
699 continue; 748 continue;
700 } 749 }
701 else 750 else
702 { 751 {
703 if (req->type == REQ_READ)
704 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
705
706 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
707 SvREADONLY_off (req->data);
708
709 if (req->statdata)
710 {
711 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
712 PL_laststatval = req->result;
713 PL_statcache = *(req->statdata);
714 }
715
716 req_invoke (req); 752 req_invoke (req);
717 753
718 count++; 754 count++;
719 } 755 }
720 756
721 req_free (req); 757 req_free (req);
758
759 if (maxreqs && !--maxreqs)
760 break;
761
762 if (max_poll_time)
763 {
764 gettimeofday (&tv_now, 0);
765
766 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
767 break;
768 }
722 } 769 }
723 770
724 if (nreqs <= max_outstanding) 771 if (nreqs <= max_outstanding)
725 break; 772 break;
726 773
727 poll_wait (); 774 poll_wait ();
728 775
729 max = 0; 776 ++maxreqs;
730 } 777 }
731 778
732 return count; 779 return count;
733} 780}
734 781
… …
952 int memofs = 0; 999 int memofs = 0;
953 int res = 0; 1000 int res = 0;
954 int errorno; 1001 int errorno;
955 1002
956 LOCK (wrklock); 1003 LOCK (wrklock);
957 self->dirp = dirp = opendir (req->dataptr); 1004 self->dirp = dirp = opendir (req->ptr1);
958 self->dbuf = u = malloc (sizeof (*u)); 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
959 req->data2ptr = names = malloc (memlen); 1007 req->ptr2 = names = malloc (memlen);
960 UNLOCK (wrklock); 1008 UNLOCK (wrklock);
961 1009
962 if (dirp && u && names) 1010 if (dirp && u && names)
963 for (;;) 1011 for (;;)
964 { 1012 {
… …
978 1026
979 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
980 { 1028 {
981 memlen *= 2; 1029 memlen *= 2;
982 LOCK (wrklock); 1030 LOCK (wrklock);
983 req->data2ptr = names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
984 UNLOCK (wrklock); 1032 UNLOCK (wrklock);
985 1033
986 if (!names) 1034 if (!names)
987 break; 1035 break;
988 } 1036 }
… …
1001/*****************************************************************************/ 1049/*****************************************************************************/
1002 1050
1003static void *aio_proc (void *thr_arg) 1051static void *aio_proc (void *thr_arg)
1004{ 1052{
1005 aio_req req; 1053 aio_req req;
1054 struct timespec ts;
1006 worker *self = (worker *)thr_arg; 1055 worker *self = (worker *)thr_arg;
1056
1057 /* try to distribute timeouts somewhat evenly */
1058 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1059 * (1000000000UL / 1024UL);
1007 1060
1008 for (;;) 1061 for (;;)
1009 { 1062 {
1063 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1064
1010 LOCK (reqlock); 1065 LOCK (reqlock);
1011 1066
1012 for (;;) 1067 for (;;)
1013 { 1068 {
1014 self->req = req = reqq_shift (&req_queue); 1069 self->req = req = reqq_shift (&req_queue);
1015 1070
1016 if (req) 1071 if (req)
1017 break; 1072 break;
1018 1073
1074 ++idle;
1075
1076 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1077 == ETIMEDOUT)
1078 {
1079 if (idle > max_idle)
1080 {
1081 --idle;
1082 UNLOCK (reqlock);
1083 LOCK (wrklock);
1084 --started;
1085 UNLOCK (wrklock);
1086 goto quit;
1087 }
1088
1089 /* we are allowed to idle, so do so without any timeout */
1019 pthread_cond_wait (&reqwait, &reqlock); 1090 pthread_cond_wait (&reqwait, &reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 }
1093
1094 --idle;
1020 } 1095 }
1021 1096
1022 --nready; 1097 --nready;
1023 1098
1024 UNLOCK (reqlock); 1099 UNLOCK (reqlock);
… …
1026 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
1027 1102
1028 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
1029 switch (req->type) 1104 switch (req->type)
1030 { 1105 {
1031 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1032 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1033 1108
1034 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1109 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1035 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1036 1111
1037 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1112 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1038 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1113 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1039 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1040 1115
1041 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1042 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
1043 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1044 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1045 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1046 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1047 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1048 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1049 1125
1050 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1051 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
1052 case REQ_READDIR: scandir_ (req, self); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
1053 1129
1054 case REQ_BUSY: 1130 case REQ_BUSY:
1055 { 1131 {
1056 struct timeval tv; 1132 struct timeval tv;
1057 1133
1058 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
1059 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
1060 1136
1061 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
1062 } 1138 }
1063 1139
1064 case REQ_GROUP: 1140 case REQ_GROUP:
1065 case REQ_NOP: 1141 case REQ_NOP:
1066 break; 1142 break;
1067 1143
1068 case REQ_QUIT: 1144 case REQ_QUIT:
1069 LOCK (wrklock); 1145 goto quit;
1070 worker_free (self);
1071 --started;
1072 UNLOCK (wrklock);
1073 return 0;
1074 1146
1075 default: 1147 default:
1076 req->result = ENOSYS; 1148 req->result = ENOSYS;
1077 break; 1149 break;
1078 } 1150 }
… …
1090 self->req = 0; 1162 self->req = 0;
1091 worker_clear (self); 1163 worker_clear (self);
1092 1164
1093 UNLOCK (reslock); 1165 UNLOCK (reslock);
1094 } 1166 }
1167
1168quit:
1169 LOCK (wrklock);
1170 worker_free (self);
1171 UNLOCK (wrklock);
1172
1173 return 0;
1095} 1174}
1096 1175
1097/*****************************************************************************/ 1176/*****************************************************************************/
1098 1177
1099static void atfork_prepare (void) 1178static void atfork_prepare (void)
… …
1141 1220
1142 worker_clear (wrk); 1221 worker_clear (wrk);
1143 worker_free (wrk); 1222 worker_free (wrk);
1144 } 1223 }
1145 1224
1146 started = 0; 1225 started = 0;
1226 idle = 0;
1147 nreqs = 0; 1227 nreqs = 0;
1228 nready = 0;
1229 npending = 0;
1148 1230
1149 close (respipe [0]); 1231 close (respipe [0]);
1150 close (respipe [1]); 1232 close (respipe [1]);
1151 create_pipe (); 1233 create_pipe ();
1152 1234
… …
1179PROTOTYPES: ENABLE 1261PROTOTYPES: ENABLE
1180 1262
1181BOOT: 1263BOOT:
1182{ 1264{
1183 HV *stash = gv_stashpv ("IO::AIO", 1); 1265 HV *stash = gv_stashpv ("IO::AIO", 1);
1266
1184 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1185 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1186 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1269 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1187 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1270 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1188 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1271 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1272 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1189 1273
1190 create_pipe (); 1274 create_pipe ();
1191 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1192
1193 start_thread ();
1194} 1276}
1277
1278void
1279max_poll_reqs (int nreqs)
1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
1283
1284void
1285max_poll_time (double nseconds)
1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_time = nseconds * AIO_TICKS;
1195 1289
1196void 1290void
1197min_parallel (int nthreads) 1291min_parallel (int nthreads)
1198 PROTOTYPE: $ 1292 PROTOTYPE: $
1199 1293
1200void 1294void
1201max_parallel (int nthreads) 1295max_parallel (int nthreads)
1202 PROTOTYPE: $ 1296 PROTOTYPE: $
1297
1298void
1299max_idle (int nthreads)
1300 PROTOTYPE: $
1301 CODE:
1302 set_max_idle (nthreads);
1203 1303
1204int 1304int
1205max_outstanding (int maxreqs) 1305max_outstanding (int maxreqs)
1206 PROTOTYPE: $ 1306 PROTOTYPE: $
1207 CODE: 1307 CODE:
… …
1210 OUTPUT: 1310 OUTPUT:
1211 RETVAL 1311 RETVAL
1212 1312
1213void 1313void
1214aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1215 SV * pathname 1315 SV8 * pathname
1216 int flags 1316 int flags
1217 int mode 1317 int mode
1218 SV * callback 1318 SV * callback
1219 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1220 PPCODE: 1320 PPCODE:
1221{ 1321{
1222 dREQ; 1322 dREQ;
1223 1323
1224 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1225 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1226 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1227 req->fd = flags; 1327 req->int1 = flags;
1228 req->mode = mode; 1328 req->mode = mode;
1229 1329
1230 REQ_SEND; 1330 REQ_SEND;
1231} 1331}
1232 1332
… …
1242 PPCODE: 1342 PPCODE:
1243{ 1343{
1244 dREQ; 1344 dREQ;
1245 1345
1246 req->type = ix; 1346 req->type = ix;
1247 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1248 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1249 1349
1250 REQ_SEND (req); 1350 REQ_SEND (req);
1251} 1351}
1252 1352
1253void 1353void
1254aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1255 SV * fh 1355 SV * fh
1256 UV offset 1356 UV offset
1257 UV length 1357 UV length
1258 SV * data 1358 SV8 * data
1259 UV dataoffset 1359 UV dataoffset
1260 SV * callback 1360 SV * callback
1261 ALIAS: 1361 ALIAS:
1262 aio_read = REQ_READ 1362 aio_read = REQ_READ
1263 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1264 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1265 PPCODE: 1365 PPCODE:
1266{ 1366{
1267 aio_req req;
1268 STRLEN svlen; 1367 STRLEN svlen;
1269 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1270 1369
1271 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1272 SvPOK_on (data); 1371 SvPOK_on (data);
… …
1294 1393
1295 { 1394 {
1296 dREQ; 1395 dREQ;
1297 1396
1298 req->type = ix; 1397 req->type = ix;
1299 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1300 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1301 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1302 req->offset = offset; 1401 req->offs = offset;
1303 req->length = length; 1402 req->size = length;
1304 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1305 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1306 1406
1307 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1308 { 1408 {
1309 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1310 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1311 } 1411 }
1312 1412
1313 REQ_SEND; 1413 REQ_SEND;
1314 } 1414 }
1415}
1416
1417void
1418aio_readlink (path,callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$
1422 PPCODE:
1423{
1424 SV *data;
1425 dREQ;
1426
1427 data = newSV (NAME_MAX);
1428 SvPOK_on (data);
1429
1430 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh);
1433 req->sv1 = data;
1434 req->ptr1 = SvPVbyte_nolen (data);
1435
1436 REQ_SEND;
1315} 1437}
1316 1438
1317void 1439void
1318aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1319 SV * out_fh 1441 SV * out_fh
… …
1325 PPCODE: 1447 PPCODE:
1326{ 1448{
1327 dREQ; 1449 dREQ;
1328 1450
1329 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1330 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1332 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1333 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1334 req->offset = in_offset; 1456 req->offs = in_offset;
1335 req->length = length; 1457 req->size = length;
1336 1458
1337 REQ_SEND; 1459 REQ_SEND;
1338} 1460}
1339 1461
1340void 1462void
… …
1347 PPCODE: 1469 PPCODE:
1348{ 1470{
1349 dREQ; 1471 dREQ;
1350 1472
1351 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1352 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1353 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1354 req->offset = offset; 1476 req->offs = offset;
1355 req->length = length; 1477 req->size = length;
1356 1478
1357 REQ_SEND; 1479 REQ_SEND;
1358} 1480}
1359 1481
1360void 1482void
1361aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1362 SV * fh_or_path 1484 SV8 * fh_or_path
1363 SV * callback 1485 SV * callback
1364 ALIAS: 1486 ALIAS:
1365 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1366 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1367 PPCODE: 1489 PPCODE:
1368{ 1490{
1369 dREQ; 1491 dREQ;
1370 1492
1371 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1372 if (!req->statdata) 1494 if (!req->ptr2)
1373 { 1495 {
1374 req_free (req); 1496 req_free (req);
1375 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1376 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1377 1501
1378 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1379 { 1503 {
1380 req->type = ix; 1504 req->type = ix;
1381 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1382 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1383 } 1507 }
1384 else 1508 else
1385 { 1509 {
1386 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1387 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1388 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1389 } 1513 }
1390 1514
1391 REQ_SEND; 1515 REQ_SEND;
1392} 1516}
1393 1517
1394void 1518void
1395aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1396 SV * pathname 1520 SV8 * pathname
1397 SV * callback 1521 SV * callback
1398 ALIAS: 1522 ALIAS:
1399 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1400 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1401 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1402 PPCODE: 1526 PPCODE:
1403{ 1527{
1404 dREQ; 1528 dREQ;
1405 1529
1406 req->type = ix; 1530 req->type = ix;
1407 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1408 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1409 1533
1410 REQ_SEND; 1534 REQ_SEND;
1411} 1535}
1412 1536
1413void 1537void
1414aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1415 SV * oldpath 1539 SV8 * oldpath
1416 SV * newpath 1540 SV8 * newpath
1417 SV * callback 1541 SV * callback
1418 ALIAS: 1542 ALIAS:
1419 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1420 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1421 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1422 PPCODE: 1546 PPCODE:
1423{ 1547{
1424 dREQ; 1548 dREQ;
1425 1549
1426 req->type = ix; 1550 req->type = ix;
1427 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1428 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1429 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1430 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1431 1555
1432 REQ_SEND; 1556 REQ_SEND;
1433} 1557}
1434 1558
1435void 1559void
1436aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1437 SV * pathname 1561 SV8 * pathname
1438 SV * callback 1562 SV * callback
1439 UV mode 1563 UV mode
1440 UV dev 1564 UV dev
1441 PPCODE: 1565 PPCODE:
1442{ 1566{
1443 dREQ; 1567 dREQ;
1444 1568
1445 req->type = REQ_MKNOD; 1569 req->type = REQ_MKNOD;
1446 req->data = newSVsv (pathname); 1570 req->sv1 = newSVsv (pathname);
1447 req->dataptr = SvPVbyte_nolen (req->data); 1571 req->ptr1 = SvPVbyte_nolen (req->sv1);
1448 req->mode = (mode_t)mode; 1572 req->mode = (mode_t)mode;
1449 req->offset = dev; 1573 req->offs = dev;
1450 1574
1451 REQ_SEND; 1575 REQ_SEND;
1452} 1576}
1453 1577
1454void 1578void
1455aio_busy (delay,callback=&PL_sv_undef) 1579aio_busy (delay,callback=&PL_sv_undef)
1456 double delay 1580 double delay
1457 SV * callback 1581 SV * callback
1458 PPCODE: 1582 PPCODE:
1459{ 1583{
1460 dREQ; 1584 dREQ;
1461 1585
1462 req->type = REQ_BUSY; 1586 req->type = REQ_BUSY;
1463 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1464 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1465 1589
1466 REQ_SEND; 1590 REQ_SEND;
1467} 1591}
1468 1592
1469void 1593void
… …
1473 PPCODE: 1597 PPCODE:
1474{ 1598{
1475 dREQ; 1599 dREQ;
1476 1600
1477 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1478 req_send (req); 1603 req_send (req);
1479
1480 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1481} 1605}
1482 1606
1483void 1607void
1484aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1485 SV * callback 1609 SV * callback
1486 PPCODE: 1610 PPCODE:
1487{ 1611{
1488 dREQ; 1612 dREQ;
1489 1613
1490 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
… …
1519 PROTOTYPE: 1643 PROTOTYPE:
1520 CODE: 1644 CODE:
1521 while (nreqs) 1645 while (nreqs)
1522 { 1646 {
1523 poll_wait (); 1647 poll_wait ();
1524 poll_cb (0); 1648 poll_cb ();
1525 } 1649 }
1526 1650
1527void 1651int
1528poll() 1652poll()
1529 PROTOTYPE: 1653 PROTOTYPE:
1530 CODE: 1654 CODE:
1531 if (nreqs)
1532 {
1533 poll_wait (); 1655 poll_wait ();
1534 poll_cb (0); 1656 RETVAL = poll_cb ();
1535 } 1657 OUTPUT:
1658 RETVAL
1536 1659
1537int 1660int
1538poll_fileno() 1661poll_fileno()
1539 PROTOTYPE: 1662 PROTOTYPE:
1540 CODE: 1663 CODE:
… …
1544 1667
1545int 1668int
1546poll_cb(...) 1669poll_cb(...)
1547 PROTOTYPE: 1670 PROTOTYPE:
1548 CODE: 1671 CODE:
1549 RETVAL = poll_cb (0); 1672 RETVAL = poll_cb ();
1550 OUTPUT:
1551 RETVAL
1552
1553int
1554poll_some(int max = 0)
1555 PROTOTYPE: $
1556 CODE:
1557 RETVAL = poll_cb (max);
1558 OUTPUT: 1673 OUTPUT:
1559 RETVAL 1674 RETVAL
1560 1675
1561void 1676void
1562poll_wait() 1677poll_wait()
1563 PROTOTYPE: 1678 PROTOTYPE:
1564 CODE: 1679 CODE:
1565 if (nreqs)
1566 poll_wait (); 1680 poll_wait ();
1567 1681
1568int 1682int
1569nreqs() 1683nreqs()
1570 PROTOTYPE: 1684 PROTOTYPE:
1571 CODE: 1685 CODE:
… …
1587 CODE: 1701 CODE:
1588 RETVAL = get_npending (); 1702 RETVAL = get_npending ();
1589 OUTPUT: 1703 OUTPUT:
1590 RETVAL 1704 RETVAL
1591 1705
1706int
1707nthreads()
1708 PROTOTYPE:
1709 CODE:
1710 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1711 RETVAL = started;
1712 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1713 OUTPUT:
1714 RETVAL
1715
1592PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1593 1717
1594MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1718MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1595 1719
1596void 1720void
… …
1611 PPCODE: 1735 PPCODE:
1612{ 1736{
1613 int i; 1737 int i;
1614 aio_req req; 1738 aio_req req;
1615 1739
1616 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1617 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1741 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1618 1742
1619 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1620 { 1744 {
1621 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
… …
1623 1747
1624 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1625 1749
1626 if (req) 1750 if (req)
1627 { 1751 {
1628 ++grp->length; 1752 ++grp->size;
1629 req->grp = grp; 1753 req->grp = grp;
1630 1754
1631 req->grp_prev = 0; 1755 req->grp_prev = 0;
1632 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1633 1757
… …
1656 av = newAV (); 1780 av = newAV ();
1657 1781
1658 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1659 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1660 1784
1661 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1662 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1663} 1787}
1664 1788
1665void 1789void
1666errno (aio_req grp, int errorno = errno) 1790errno (aio_req grp, int errorno = errno)
1667 CODE: 1791 CODE:
1668 grp->errorno = errorno; 1792 grp->errorno = errorno;
1669 1793
1670void 1794void
1671limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1672 CODE: 1796 CODE:
1673 grp->fd2 = limit; 1797 grp->int2 = limit;
1674 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1675 1799
1676void 1800void
1677feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1678 CODE: 1802 CODE:
1679{ 1803{
1680 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1681 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1682 1806
1683 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1684 grp->fd2 = 2; 1808 grp->int2 = 2;
1685 1809
1686 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1687} 1811}
1688 1812

Diff Legend

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