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.82 by root, Fri Oct 27 20:11:58 2006 UTC vs.
Revision 1.91 by root, Wed Nov 8 01:57:43 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)
… …
421 XPUSHs (sv_2mortal (fh)); 455 XPUSHs (sv_2mortal (fh));
422 } 456 }
423 break; 457 break;
424 458
425 case REQ_GROUP: 459 case REQ_GROUP:
426 req->fd = 2; /* mark group as finished */ 460 req->int1 = 2; /* mark group as finished */
427 461
428 if (req->data) 462 if (req->sv1)
429 { 463 {
430 int i; 464 int i;
431 AV *av = (AV *)req->data; 465 AV *av = (AV *)req->sv1;
432 466
433 EXTEND (SP, AvFILL (av) + 1); 467 EXTEND (SP, AvFILL (av) + 1);
434 for (i = 0; i <= AvFILL (av); ++i) 468 for (i = 0; i <= AvFILL (av); ++i)
435 PUSHs (*av_fetch (av, i, 0)); 469 PUSHs (*av_fetch (av, i, 0));
436 } 470 }
… …
438 472
439 case REQ_NOP: 473 case REQ_NOP:
440 case REQ_BUSY: 474 case REQ_BUSY:
441 break; 475 break;
442 476
477 case REQ_READLINK:
478 if (req->result > 0)
479 {
480 SvCUR_set (req->sv1, req->result);
481 *SvEND (req->sv1) = 0;
482 PUSHs (req->sv1);
483 }
484 break;
485
486 case REQ_STAT:
487 case REQ_LSTAT:
488 case REQ_FSTAT:
489 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
490 PL_laststatval = req->result;
491 PL_statcache = *(Stat_t *)(req->ptr2);
492 PUSHs (sv_2mortal (newSViv (req->result)));
493 break;
494
495 case REQ_READ:
496 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
497 *SvEND (req->sv1) = 0;
498 PUSHs (sv_2mortal (newSViv (req->result)));
499 break;
500
443 default: 501 default:
444 PUSHs (sv_2mortal (newSViv (req->result))); 502 PUSHs (sv_2mortal (newSViv (req->result)));
445 break; 503 break;
446 } 504 }
447 505
… …
482 { 540 {
483 sv_unmagic (req->self, PERL_MAGIC_ext); 541 sv_unmagic (req->self, PERL_MAGIC_ext);
484 SvREFCNT_dec (req->self); 542 SvREFCNT_dec (req->self);
485 } 543 }
486 544
487 SvREFCNT_dec (req->data);
488 SvREFCNT_dec (req->fh); 545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1);
489 SvREFCNT_dec (req->fh2); 547 SvREFCNT_dec (req->sv2);
490 SvREFCNT_dec (req->callback); 548 SvREFCNT_dec (req->callback);
491 Safefree (req->statdata);
492 549
493 if (req->type == REQ_READDIR) 550 if (req->flags & FLAG_PTR2_FREE)
494 free (req->data2ptr); 551 free (req->ptr2);
495 552
496 Safefree (req); 553 Safefree (req);
497} 554}
498 555
499static void req_cancel_subs (aio_req grp) 556static void req_cancel_subs (aio_req grp)
… …
501 aio_req sub; 558 aio_req sub;
502 559
503 if (grp->type != REQ_GROUP) 560 if (grp->type != REQ_GROUP)
504 return; 561 return;
505 562
506 SvREFCNT_dec (grp->fh2); 563 SvREFCNT_dec (grp->sv2);
507 grp->fh2 = 0; 564 grp->sv2 = 0;
508 565
509 for (sub = grp->grp_first; sub; sub = sub->grp_next) 566 for (sub = grp->grp_first; sub; sub = sub->grp_next)
510 req_cancel (sub); 567 req_cancel (sub);
511} 568}
512 569
… …
556 UNLOCK (wrklock); 613 UNLOCK (wrklock);
557} 614}
558 615
559static void maybe_start_thread () 616static void maybe_start_thread ()
560{ 617{
561#if 0 618 if (get_nthreads () >= wanted)
562 static struct timeval last;
563 struct timeval diff, now;
564#endif
565
566 if (started >= wanted)
567 return; 619 return;
568 620
569 if (nready <= nreqs - get_nready () - get_npending ()) 621 /* todo: maybe use idle here, but might be less exact */
622 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 623 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 624
590 start_thread (); 625 start_thread ();
591} 626}
592 627
593static void req_send (aio_req req) 628static void req_send (aio_req req)
… …
610 Newz (0, req, 1, aio_cb); 645 Newz (0, req, 1, aio_cb);
611 646
612 req->type = REQ_QUIT; 647 req->type = REQ_QUIT;
613 req->pri = PRI_MAX + PRI_BIAS; 648 req->pri = PRI_MAX + PRI_BIAS;
614 649
615 req_send (req); 650 LOCK (reqlock);
651 reqq_push (&req_queue, req);
652 pthread_cond_signal (&reqwait);
653 UNLOCK (reqlock);
616 654
617 LOCK (wrklock); 655 LOCK (wrklock);
618 --started; 656 --started;
619 UNLOCK (wrklock); 657 UNLOCK (wrklock);
620} 658}
621 659
660static void set_max_idle (int nthreads)
661{
662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
663 max_idle = nthreads <= 0 ? 1 : nthreads;
664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
665}
666
622static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
623{ 668{
624 if (wanted < nthreads) 669 if (wanted < nthreads)
625 wanted = nthreads; 670 wanted = nthreads;
626} 671}
… …
639 fd_set rfd; 684 fd_set rfd;
640 685
641 while (nreqs) 686 while (nreqs)
642 { 687 {
643 int size; 688 int size;
644 if (WORDREAD_UNSAFE) LOCK (reslock); 689 if (WORDACCESS_UNSAFE) LOCK (reslock);
645 size = res_queue.size; 690 size = res_queue.size;
646 if (WORDREAD_UNSAFE) UNLOCK (reslock); 691 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
647 692
648 if (size) 693 if (size)
649 return; 694 return;
650 695
651 maybe_start_thread (); 696 maybe_start_thread ();
… …
655 700
656 select (respipe [0] + 1, &rfd, 0, 0, 0); 701 select (respipe [0] + 1, &rfd, 0, 0, 0);
657 } 702 }
658} 703}
659 704
660static int poll_cb (int max) 705static int poll_cb ()
661{ 706{
662 dSP; 707 dSP;
663 int count = 0; 708 int count = 0;
709 int maxreqs = max_poll_reqs;
664 int do_croak = 0; 710 int do_croak = 0;
711 struct timeval tv_start, tv_now;
665 aio_req req; 712 aio_req req;
713
714 if (max_poll_time)
715 gettimeofday (&tv_start, 0);
666 716
667 for (;;) 717 for (;;)
668 { 718 {
669 while (max <= 0 || count < max) 719 for (;;)
670 { 720 {
671 maybe_start_thread (); 721 maybe_start_thread ();
672 722
673 LOCK (reslock); 723 LOCK (reslock);
674 req = reqq_shift (&res_queue); 724 req = reqq_shift (&res_queue);
… …
691 if (!req) 741 if (!req)
692 break; 742 break;
693 743
694 --nreqs; 744 --nreqs;
695 745
696 if (req->type == REQ_GROUP && req->length) 746 if (req->type == REQ_GROUP && req->size)
697 { 747 {
698 req->fd = 1; /* mark request as delayed */ 748 req->int1 = 1; /* mark request as delayed */
699 continue; 749 continue;
700 } 750 }
701 else 751 else
702 { 752 {
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); 753 req_invoke (req);
717 754
718 count++; 755 count++;
719 } 756 }
720 757
721 req_free (req); 758 req_free (req);
759
760 if (maxreqs && !--maxreqs)
761 break;
762
763 if (max_poll_time)
764 {
765 gettimeofday (&tv_now, 0);
766
767 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
768 break;
769 }
722 } 770 }
723 771
724 if (nreqs <= max_outstanding) 772 if (nreqs <= max_outstanding)
725 break; 773 break;
726 774
727 poll_wait (); 775 poll_wait ();
728 776
729 max = 0; 777 ++maxreqs;
730 } 778 }
731 779
732 return count; 780 return count;
733} 781}
734 782
… …
952 int memofs = 0; 1000 int memofs = 0;
953 int res = 0; 1001 int res = 0;
954 int errorno; 1002 int errorno;
955 1003
956 LOCK (wrklock); 1004 LOCK (wrklock);
957 self->dirp = dirp = opendir (req->dataptr); 1005 self->dirp = dirp = opendir (req->ptr1);
958 self->dbuf = u = malloc (sizeof (*u)); 1006 self->dbuf = u = malloc (sizeof (*u));
1007 req->flags |= FLAG_PTR2_FREE;
959 req->data2ptr = names = malloc (memlen); 1008 req->ptr2 = names = malloc (memlen);
960 UNLOCK (wrklock); 1009 UNLOCK (wrklock);
961 1010
962 if (dirp && u && names) 1011 if (dirp && u && names)
963 for (;;) 1012 for (;;)
964 { 1013 {
… …
978 1027
979 while (memofs + len > memlen) 1028 while (memofs + len > memlen)
980 { 1029 {
981 memlen *= 2; 1030 memlen *= 2;
982 LOCK (wrklock); 1031 LOCK (wrklock);
983 req->data2ptr = names = realloc (names, memlen); 1032 req->ptr2 = names = realloc (names, memlen);
984 UNLOCK (wrklock); 1033 UNLOCK (wrklock);
985 1034
986 if (!names) 1035 if (!names)
987 break; 1036 break;
988 } 1037 }
… …
1001/*****************************************************************************/ 1050/*****************************************************************************/
1002 1051
1003static void *aio_proc (void *thr_arg) 1052static void *aio_proc (void *thr_arg)
1004{ 1053{
1005 aio_req req; 1054 aio_req req;
1055 struct timespec ts;
1006 worker *self = (worker *)thr_arg; 1056 worker *self = (worker *)thr_arg;
1057
1058 /* try to distribute timeouts somewhat evenly */
1059 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1060 * (1000000000UL / 1024UL);
1007 1061
1008 for (;;) 1062 for (;;)
1009 { 1063 {
1064 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1065
1010 LOCK (reqlock); 1066 LOCK (reqlock);
1011 1067
1012 for (;;) 1068 for (;;)
1013 { 1069 {
1014 self->req = req = reqq_shift (&req_queue); 1070 self->req = req = reqq_shift (&req_queue);
1015 1071
1016 if (req) 1072 if (req)
1017 break; 1073 break;
1018 1074
1075 ++idle;
1076
1077 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1078 == ETIMEDOUT)
1079 {
1080 if (idle > max_idle)
1081 {
1082 --idle;
1083 UNLOCK (reqlock);
1084 LOCK (wrklock);
1085 --started;
1086 UNLOCK (wrklock);
1087 goto quit;
1088 }
1089
1090 /* we are allowed to idle, so do so without any timeout */
1019 pthread_cond_wait (&reqwait, &reqlock); 1091 pthread_cond_wait (&reqwait, &reqlock);
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 }
1094
1095 --idle;
1020 } 1096 }
1021 1097
1022 --nready; 1098 --nready;
1023 1099
1024 UNLOCK (reqlock); 1100 UNLOCK (reqlock);
… …
1026 errno = 0; /* strictly unnecessary */ 1102 errno = 0; /* strictly unnecessary */
1027 1103
1028 if (!(req->flags & FLAG_CANCELLED)) 1104 if (!(req->flags & FLAG_CANCELLED))
1029 switch (req->type) 1105 switch (req->type)
1030 { 1106 {
1031 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1107 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; 1108 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1033 1109
1034 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1110 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; 1111 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1036 1112
1037 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1113 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; 1114 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; 1115 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1040 1116
1041 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1117 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1042 case REQ_CLOSE: req->result = close (req->fd); break; 1118 case REQ_CLOSE: req->result = close (req->int1); break;
1043 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1044 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1045 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1046 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1047 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1123 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; 1124 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1125 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1049 1126
1050 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1051 case REQ_FSYNC: req->result = fsync (req->fd); break; 1128 case REQ_FSYNC: req->result = fsync (req->int1); break;
1052 case REQ_READDIR: scandir_ (req, self); break; 1129 case REQ_READDIR: scandir_ (req, self); break;
1053 1130
1054 case REQ_BUSY: 1131 case REQ_BUSY:
1055 { 1132 {
1056 struct timeval tv; 1133 struct timeval tv;
1057 1134
1058 tv.tv_sec = req->fd; 1135 tv.tv_sec = req->int1;
1059 tv.tv_usec = req->fd2; 1136 tv.tv_usec = req->int2;
1060 1137
1061 req->result = select (0, 0, 0, 0, &tv); 1138 req->result = select (0, 0, 0, 0, &tv);
1062 } 1139 }
1063 1140
1064 case REQ_GROUP: 1141 case REQ_GROUP:
1065 case REQ_NOP: 1142 case REQ_NOP:
1066 break; 1143 break;
1067 1144
1068 case REQ_QUIT: 1145 case REQ_QUIT:
1069 LOCK (wrklock); 1146 goto quit;
1070 worker_free (self);
1071 --started;
1072 UNLOCK (wrklock);
1073 return 0;
1074 1147
1075 default: 1148 default:
1076 req->result = ENOSYS; 1149 req->result = ENOSYS;
1077 break; 1150 break;
1078 } 1151 }
… …
1090 self->req = 0; 1163 self->req = 0;
1091 worker_clear (self); 1164 worker_clear (self);
1092 1165
1093 UNLOCK (reslock); 1166 UNLOCK (reslock);
1094 } 1167 }
1168
1169quit:
1170 LOCK (wrklock);
1171 worker_free (self);
1172 UNLOCK (wrklock);
1173
1174 return 0;
1095} 1175}
1096 1176
1097/*****************************************************************************/ 1177/*****************************************************************************/
1098 1178
1099static void atfork_prepare (void) 1179static void atfork_prepare (void)
… …
1141 1221
1142 worker_clear (wrk); 1222 worker_clear (wrk);
1143 worker_free (wrk); 1223 worker_free (wrk);
1144 } 1224 }
1145 1225
1146 started = 0; 1226 started = 0;
1227 idle = 0;
1147 nreqs = 0; 1228 nreqs = 0;
1229 nready = 0;
1230 npending = 0;
1148 1231
1149 close (respipe [0]); 1232 close (respipe [0]);
1150 close (respipe [1]); 1233 close (respipe [1]);
1151 create_pipe (); 1234 create_pipe ();
1152 1235
… …
1189 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1272 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1190 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1273 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1191 1274
1192 create_pipe (); 1275 create_pipe ();
1193 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1194
1195 start_thread ();
1196} 1277}
1278
1279void
1280max_poll_reqs (int nreqs)
1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_reqs = nreqs;
1284
1285void
1286max_poll_time (double nseconds)
1287 PROTOTYPE: $
1288 CODE:
1289 max_poll_time = nseconds * AIO_TICKS;
1197 1290
1198void 1291void
1199min_parallel (int nthreads) 1292min_parallel (int nthreads)
1200 PROTOTYPE: $ 1293 PROTOTYPE: $
1201 1294
1202void 1295void
1203max_parallel (int nthreads) 1296max_parallel (int nthreads)
1204 PROTOTYPE: $ 1297 PROTOTYPE: $
1298
1299void
1300max_idle (int nthreads)
1301 PROTOTYPE: $
1302 CODE:
1303 set_max_idle (nthreads);
1205 1304
1206int 1305int
1207max_outstanding (int maxreqs) 1306max_outstanding (int maxreqs)
1208 PROTOTYPE: $ 1307 PROTOTYPE: $
1209 CODE: 1308 CODE:
… …
1212 OUTPUT: 1311 OUTPUT:
1213 RETVAL 1312 RETVAL
1214 1313
1215void 1314void
1216aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1315aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1217 SV * pathname 1316 SV8 * pathname
1218 int flags 1317 int flags
1219 int mode 1318 int mode
1220 SV * callback 1319 SV * callback
1221 PROTOTYPE: $$$;$ 1320 PROTOTYPE: $$$;$
1222 PPCODE: 1321 PPCODE:
1223{ 1322{
1224 dREQ; 1323 dREQ;
1225 1324
1226 req->type = REQ_OPEN; 1325 req->type = REQ_OPEN;
1227 req->data = newSVsv (pathname); 1326 req->sv1 = newSVsv (pathname);
1228 req->dataptr = SvPVbyte_nolen (req->data); 1327 req->ptr1 = SvPVbyte_nolen (req->sv1);
1229 req->fd = flags; 1328 req->int1 = flags;
1230 req->mode = mode; 1329 req->mode = mode;
1231 1330
1232 REQ_SEND; 1331 REQ_SEND;
1233} 1332}
1234 1333
… …
1244 PPCODE: 1343 PPCODE:
1245{ 1344{
1246 dREQ; 1345 dREQ;
1247 1346
1248 req->type = ix; 1347 req->type = ix;
1249 req->fh = newSVsv (fh); 1348 req->fh = newSVsv (fh);
1250 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1251 1350
1252 REQ_SEND (req); 1351 REQ_SEND (req);
1253} 1352}
1254 1353
1255void 1354void
1256aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1257 SV * fh 1356 SV * fh
1258 UV offset 1357 UV offset
1259 UV length 1358 UV length
1260 SV * data 1359 SV8 * data
1261 UV dataoffset 1360 UV dataoffset
1262 SV * callback 1361 SV * callback
1263 ALIAS: 1362 ALIAS:
1264 aio_read = REQ_READ 1363 aio_read = REQ_READ
1265 aio_write = REQ_WRITE 1364 aio_write = REQ_WRITE
1266 PROTOTYPE: $$$$$;$ 1365 PROTOTYPE: $$$$$;$
1267 PPCODE: 1366 PPCODE:
1268{ 1367{
1269 aio_req req;
1270 STRLEN svlen; 1368 STRLEN svlen;
1271 char *svptr = SvPVbyte (data, svlen); 1369 char *svptr = SvPVbyte (data, svlen);
1272 1370
1273 SvUPGRADE (data, SVt_PV); 1371 SvUPGRADE (data, SVt_PV);
1274 SvPOK_on (data); 1372 SvPOK_on (data);
… …
1296 1394
1297 { 1395 {
1298 dREQ; 1396 dREQ;
1299 1397
1300 req->type = ix; 1398 req->type = ix;
1301 req->fh = newSVsv (fh); 1399 req->fh = newSVsv (fh);
1302 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1303 : IoOFP (sv_2io (fh))); 1401 : IoOFP (sv_2io (fh)));
1304 req->offset = offset; 1402 req->offs = offset;
1305 req->length = length; 1403 req->size = length;
1306 req->data = SvREFCNT_inc (data); 1404 req->sv1 = SvREFCNT_inc (data);
1307 req->dataptr = (char *)svptr + dataoffset; 1405 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset;
1308 1407
1309 if (!SvREADONLY (data)) 1408 if (!SvREADONLY (data))
1310 { 1409 {
1311 SvREADONLY_on (data); 1410 SvREADONLY_on (data);
1312 req->data2ptr = (void *)data; 1411 req->flags |= FLAG_SV1_RO_OFF;
1313 } 1412 }
1314 1413
1315 REQ_SEND; 1414 REQ_SEND;
1316 } 1415 }
1416}
1417
1418void
1419aio_readlink (path,callback=&PL_sv_undef)
1420 SV8 * path
1421 SV * callback
1422 PROTOTYPE: $$;$
1423 PPCODE:
1424{
1425 SV *data;
1426 dREQ;
1427
1428 data = newSV (NAME_MAX);
1429 SvPOK_on (data);
1430
1431 req->type = REQ_READLINK;
1432 req->fh = newSVsv (path);
1433 req->ptr2 = SvPVbyte_nolen (req->fh);
1434 req->sv1 = data;
1435 req->ptr1 = SvPVbyte_nolen (data);
1436
1437 REQ_SEND;
1317} 1438}
1318 1439
1319void 1440void
1320aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1441aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1321 SV * out_fh 1442 SV * out_fh
… …
1327 PPCODE: 1448 PPCODE:
1328{ 1449{
1329 dREQ; 1450 dREQ;
1330 1451
1331 req->type = REQ_SENDFILE; 1452 req->type = REQ_SENDFILE;
1332 req->fh = newSVsv (out_fh); 1453 req->fh = newSVsv (out_fh);
1333 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1334 req->fh2 = newSVsv (in_fh); 1455 req->sv2 = newSVsv (in_fh);
1335 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1336 req->offset = in_offset; 1457 req->offs = in_offset;
1337 req->length = length; 1458 req->size = length;
1338 1459
1339 REQ_SEND; 1460 REQ_SEND;
1340} 1461}
1341 1462
1342void 1463void
… …
1349 PPCODE: 1470 PPCODE:
1350{ 1471{
1351 dREQ; 1472 dREQ;
1352 1473
1353 req->type = REQ_READAHEAD; 1474 req->type = REQ_READAHEAD;
1354 req->fh = newSVsv (fh); 1475 req->fh = newSVsv (fh);
1355 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1356 req->offset = offset; 1477 req->offs = offset;
1357 req->length = length; 1478 req->size = length;
1358 1479
1359 REQ_SEND; 1480 REQ_SEND;
1360} 1481}
1361 1482
1362void 1483void
1363aio_stat (fh_or_path,callback=&PL_sv_undef) 1484aio_stat (fh_or_path,callback=&PL_sv_undef)
1364 SV * fh_or_path 1485 SV8 * fh_or_path
1365 SV * callback 1486 SV * callback
1366 ALIAS: 1487 ALIAS:
1367 aio_stat = REQ_STAT 1488 aio_stat = REQ_STAT
1368 aio_lstat = REQ_LSTAT 1489 aio_lstat = REQ_LSTAT
1369 PPCODE: 1490 PPCODE:
1370{ 1491{
1371 dREQ; 1492 dREQ;
1372 1493
1373 New (0, req->statdata, 1, Stat_t); 1494 req->ptr2 = malloc (sizeof (Stat_t));
1374 if (!req->statdata) 1495 if (!req->ptr2)
1375 { 1496 {
1376 req_free (req); 1497 req_free (req);
1377 croak ("out of memory during aio_req->statdata allocation"); 1498 croak ("out of memory during aio_stat statdata allocation");
1378 } 1499 }
1500
1501 req->flags |= FLAG_PTR2_FREE;
1379 1502
1380 if (SvPOK (fh_or_path)) 1503 if (SvPOK (fh_or_path))
1381 { 1504 {
1382 req->type = ix; 1505 req->type = ix;
1383 req->data = newSVsv (fh_or_path); 1506 req->sv1 = newSVsv (fh_or_path);
1384 req->dataptr = SvPVbyte_nolen (req->data); 1507 req->ptr1 = SvPVbyte_nolen (req->sv1);
1385 } 1508 }
1386 else 1509 else
1387 { 1510 {
1388 req->type = REQ_FSTAT; 1511 req->type = REQ_FSTAT;
1389 req->fh = newSVsv (fh_or_path); 1512 req->fh = newSVsv (fh_or_path);
1390 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1391 } 1514 }
1392 1515
1393 REQ_SEND; 1516 REQ_SEND;
1394} 1517}
1395 1518
1396void 1519void
1397aio_unlink (pathname,callback=&PL_sv_undef) 1520aio_unlink (pathname,callback=&PL_sv_undef)
1398 SV * pathname 1521 SV8 * pathname
1399 SV * callback 1522 SV * callback
1400 ALIAS: 1523 ALIAS:
1401 aio_unlink = REQ_UNLINK 1524 aio_unlink = REQ_UNLINK
1402 aio_rmdir = REQ_RMDIR 1525 aio_rmdir = REQ_RMDIR
1403 aio_readdir = REQ_READDIR 1526 aio_readdir = REQ_READDIR
1404 PPCODE: 1527 PPCODE:
1405{ 1528{
1406 dREQ; 1529 dREQ;
1407 1530
1408 req->type = ix; 1531 req->type = ix;
1409 req->data = newSVsv (pathname); 1532 req->sv1 = newSVsv (pathname);
1410 req->dataptr = SvPVbyte_nolen (req->data); 1533 req->ptr1 = SvPVbyte_nolen (req->sv1);
1411 1534
1412 REQ_SEND; 1535 REQ_SEND;
1413} 1536}
1414 1537
1415void 1538void
1416aio_link (oldpath,newpath,callback=&PL_sv_undef) 1539aio_link (oldpath,newpath,callback=&PL_sv_undef)
1417 SV * oldpath 1540 SV8 * oldpath
1418 SV * newpath 1541 SV8 * newpath
1419 SV * callback 1542 SV * callback
1420 ALIAS: 1543 ALIAS:
1421 aio_link = REQ_LINK 1544 aio_link = REQ_LINK
1422 aio_symlink = REQ_SYMLINK 1545 aio_symlink = REQ_SYMLINK
1423 aio_rename = REQ_RENAME 1546 aio_rename = REQ_RENAME
1424 PPCODE: 1547 PPCODE:
1425{ 1548{
1426 dREQ; 1549 dREQ;
1427 1550
1428 req->type = ix; 1551 req->type = ix;
1429 req->fh = newSVsv (oldpath); 1552 req->fh = newSVsv (oldpath);
1430 req->data2ptr = SvPVbyte_nolen (req->fh); 1553 req->ptr2 = SvPVbyte_nolen (req->fh);
1431 req->data = newSVsv (newpath); 1554 req->sv1 = newSVsv (newpath);
1432 req->dataptr = SvPVbyte_nolen (req->data); 1555 req->ptr1 = SvPVbyte_nolen (req->sv1);
1433 1556
1434 REQ_SEND; 1557 REQ_SEND;
1435} 1558}
1436 1559
1437void 1560void
1438aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1561aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1439 SV * pathname 1562 SV8 * pathname
1440 SV * callback 1563 SV * callback
1441 UV mode 1564 UV mode
1442 UV dev 1565 UV dev
1443 PPCODE: 1566 PPCODE:
1444{ 1567{
1445 dREQ; 1568 dREQ;
1446 1569
1447 req->type = REQ_MKNOD; 1570 req->type = REQ_MKNOD;
1448 req->data = newSVsv (pathname); 1571 req->sv1 = newSVsv (pathname);
1449 req->dataptr = SvPVbyte_nolen (req->data); 1572 req->ptr1 = SvPVbyte_nolen (req->sv1);
1450 req->mode = (mode_t)mode; 1573 req->mode = (mode_t)mode;
1451 req->offset = dev; 1574 req->offs = dev;
1452 1575
1453 REQ_SEND; 1576 REQ_SEND;
1454} 1577}
1455 1578
1456void 1579void
1457aio_busy (delay,callback=&PL_sv_undef) 1580aio_busy (delay,callback=&PL_sv_undef)
1458 double delay 1581 double delay
1459 SV * callback 1582 SV * callback
1460 PPCODE: 1583 PPCODE:
1461{ 1584{
1462 dREQ; 1585 dREQ;
1463 1586
1464 req->type = REQ_BUSY; 1587 req->type = REQ_BUSY;
1465 req->fd = delay < 0. ? 0 : delay; 1588 req->int1 = delay < 0. ? 0 : delay;
1466 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1467 1590
1468 REQ_SEND; 1591 REQ_SEND;
1469} 1592}
1470 1593
1471void 1594void
… …
1475 PPCODE: 1598 PPCODE:
1476{ 1599{
1477 dREQ; 1600 dREQ;
1478 1601
1479 req->type = REQ_GROUP; 1602 req->type = REQ_GROUP;
1603
1480 req_send (req); 1604 req_send (req);
1481
1482 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1605 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1483} 1606}
1484 1607
1485void 1608void
1486aio_nop (callback=&PL_sv_undef) 1609aio_nop (callback=&PL_sv_undef)
1487 SV * callback 1610 SV * callback
1488 PPCODE: 1611 PPCODE:
1489{ 1612{
1490 dREQ; 1613 dREQ;
1491 1614
1492 req->type = REQ_NOP; 1615 req->type = REQ_NOP;
… …
1521 PROTOTYPE: 1644 PROTOTYPE:
1522 CODE: 1645 CODE:
1523 while (nreqs) 1646 while (nreqs)
1524 { 1647 {
1525 poll_wait (); 1648 poll_wait ();
1526 poll_cb (0); 1649 poll_cb ();
1527 } 1650 }
1528 1651
1529void 1652int
1530poll() 1653poll()
1531 PROTOTYPE: 1654 PROTOTYPE:
1532 CODE: 1655 CODE:
1533 if (nreqs) 1656 if (nreqs)
1534 { 1657 {
1535 poll_wait (); 1658 poll_wait ();
1536 poll_cb (0); 1659 RETVAL = poll_cb ();
1537 } 1660 }
1661 else
1662 RETVAL = 0;
1663 OUTPUT:
1664 RETVAL
1538 1665
1539int 1666int
1540poll_fileno() 1667poll_fileno()
1541 PROTOTYPE: 1668 PROTOTYPE:
1542 CODE: 1669 CODE:
… …
1546 1673
1547int 1674int
1548poll_cb(...) 1675poll_cb(...)
1549 PROTOTYPE: 1676 PROTOTYPE:
1550 CODE: 1677 CODE:
1551 RETVAL = poll_cb (0); 1678 RETVAL = poll_cb ();
1552 OUTPUT:
1553 RETVAL
1554
1555int
1556poll_some(int max = 0)
1557 PROTOTYPE: $
1558 CODE:
1559 RETVAL = poll_cb (max);
1560 OUTPUT: 1679 OUTPUT:
1561 RETVAL 1680 RETVAL
1562 1681
1563void 1682void
1564poll_wait() 1683poll_wait()
… …
1589 CODE: 1708 CODE:
1590 RETVAL = get_npending (); 1709 RETVAL = get_npending ();
1591 OUTPUT: 1710 OUTPUT:
1592 RETVAL 1711 RETVAL
1593 1712
1713int
1714nthreads()
1715 PROTOTYPE:
1716 CODE:
1717 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1718 RETVAL = started;
1719 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1720 OUTPUT:
1721 RETVAL
1722
1594PROTOTYPES: DISABLE 1723PROTOTYPES: DISABLE
1595 1724
1596MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1725MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1597 1726
1598void 1727void
… …
1613 PPCODE: 1742 PPCODE:
1614{ 1743{
1615 int i; 1744 int i;
1616 aio_req req; 1745 aio_req req;
1617 1746
1618 if (grp->fd == 2) 1747 if (grp->int1 == 2)
1619 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1748 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1620 1749
1621 for (i = 1; i < items; ++i ) 1750 for (i = 1; i < items; ++i )
1622 { 1751 {
1623 if (GIMME_V != G_VOID) 1752 if (GIMME_V != G_VOID)
… …
1625 1754
1626 req = SvAIO_REQ (ST (i)); 1755 req = SvAIO_REQ (ST (i));
1627 1756
1628 if (req) 1757 if (req)
1629 { 1758 {
1630 ++grp->length; 1759 ++grp->size;
1631 req->grp = grp; 1760 req->grp = grp;
1632 1761
1633 req->grp_prev = 0; 1762 req->grp_prev = 0;
1634 req->grp_next = grp->grp_first; 1763 req->grp_next = grp->grp_first;
1635 1764
… …
1658 av = newAV (); 1787 av = newAV ();
1659 1788
1660 for (i = 1; i < items; ++i ) 1789 for (i = 1; i < items; ++i )
1661 av_push (av, newSVsv (ST (i))); 1790 av_push (av, newSVsv (ST (i)));
1662 1791
1663 SvREFCNT_dec (grp->data); 1792 SvREFCNT_dec (grp->sv1);
1664 grp->data = (SV *)av; 1793 grp->sv1 = (SV *)av;
1665} 1794}
1666 1795
1667void 1796void
1668errno (aio_req grp, int errorno = errno) 1797errno (aio_req grp, int errorno = errno)
1669 CODE: 1798 CODE:
1670 grp->errorno = errorno; 1799 grp->errorno = errorno;
1671 1800
1672void 1801void
1673limit (aio_req grp, int limit) 1802limit (aio_req grp, int limit)
1674 CODE: 1803 CODE:
1675 grp->fd2 = limit; 1804 grp->int2 = limit;
1676 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1677 1806
1678void 1807void
1679feed (aio_req grp, SV *callback=&PL_sv_undef) 1808feed (aio_req grp, SV *callback=&PL_sv_undef)
1680 CODE: 1809 CODE:
1681{ 1810{
1682 SvREFCNT_dec (grp->fh2); 1811 SvREFCNT_dec (grp->sv2);
1683 grp->fh2 = newSVsv (callback); 1812 grp->sv2 = newSVsv (callback);
1684 1813
1685 if (grp->fd2 <= 0) 1814 if (grp->int2 <= 0)
1686 grp->fd2 = 2; 1815 grp->int2 = 2;
1687 1816
1688 aio_grp_feed (grp); 1817 aio_grp_feed (grp);
1689} 1818}
1690 1819

Diff Legend

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