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.79 by root, Thu Oct 26 16:28:33 2006 UTC vs.
Revision 1.86 by root, Mon Oct 30 23:30:00 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
… …
92 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
93 REQ_SENDFILE, 96 REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
95 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
97 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 103 REQ_BUSY,
101}; 104};
102 105
103#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
105 108
106typedef struct aio_cb 109typedef struct aio_cb
107{ 110{
108 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
109 112
110 SV *data, *callback; 113 SV *callback, *fh;
111 SV *fh, *fh2; 114 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
113 Stat_t *statdata; 116 Stat_t *statdata;
114 off_t offset; 117 off_t offs;
115 size_t length; 118 size_t size;
116 ssize_t result; 119 ssize_t result;
117 120
118 STRLEN dataoffset; 121 STRLEN stroffset;
119 int type; 122 int type;
120 int fd, fd2; 123 int int1, int2;
121 int errorno; 124 int errorno;
122 mode_t mode; /* open */ 125 mode_t mode; /* open */
123 126
124 unsigned char flags; 127 unsigned char flags;
125 unsigned char pri; 128 unsigned char pri;
… …
127 SV *self; /* the perl counterpart of this request, if any */ 130 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 132} aio_cb;
130 133
131enum { 134enum {
132 FLAG_CANCELLED = 0x01, 135 FLAG_CANCELLED = 0x01,
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */
133}; 137};
134 138
135typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
137 141
… …
142 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 149};
146 150
151#define AIO_TICKS ((1000000 + 1023) >> 10)
152
153static unsigned int max_poll_time = 0;
154static unsigned int max_poll_reqs = 0;
155
156/* calculcate time difference in ~1/AIO_TICKS of a second */
157static int tvdiff (struct timeval *tv1, struct timeval *tv2)
158{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161}
162
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 164
149static unsigned int started, wanted; 165static unsigned int started, idle, wanted;
150static volatile unsigned int nreqs, nready, npending;
151static volatile unsigned int max_outstanding = 0xffffffff;
152static int respipe [2];
153 166
154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
156#else 169#else
157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
198 wrk->prev->next = wrk->next; 211 wrk->prev->next = wrk->next;
199 212
200 free (wrk); 213 free (wrk);
201} 214}
202 215
216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
218static volatile unsigned int max_outstanding = 0xffffffff;
219static int respipe [2];
220
203static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
204static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
224
225#if WORDACCESS_UNSAFE
226
227static unsigned int get_nready ()
228{
229 unsigned int retval;
230
231 LOCK (reqlock);
232 retval = nready;
233 UNLOCK (reqlock);
234
235 return retval;
236}
237
238static unsigned int get_npending ()
239{
240 unsigned int retval;
241
242 LOCK (reslock);
243 retval = npending;
244 UNLOCK (reslock);
245
246 return retval;
247}
248
249static unsigned int get_nthreads ()
250{
251 unsigned int retval;
252
253 LOCK (wrklock);
254 retval = started;
255 UNLOCK (wrklock);
256
257 return retval;
258}
259
260#else
261
262# define get_nready() nready
263# define get_npending() npending
264# define get_nthreads() started
265
266#endif
206 267
207/* 268/*
208 * a somewhat faster data structure might be nice, but 269 * a somewhat faster data structure might be nice, but
209 * with 8 priorities this actually needs <20 insns 270 * with 8 priorities this actually needs <20 insns
210 * per shift, the most expensive operation. 271 * per shift, the most expensive operation.
… …
256 } 317 }
257 318
258 abort (); 319 abort ();
259} 320}
260 321
261static int poll_cb (int max); 322static int poll_cb ();
262static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
263static void req_free (aio_req req); 324static void req_free (aio_req req);
264static void req_cancel (aio_req req); 325static void req_cancel (aio_req req);
265 326
266/* must be called at most once */ 327/* must be called at most once */
… …
287 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
288} 349}
289 350
290static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
291{ 352{
292 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
293 { 354 {
294 int old_len = grp->length; 355 int old_len = grp->size;
295 356
296 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
297 { 358 {
298 dSP; 359 dSP;
299 360
300 ENTER; 361 ENTER;
301 SAVETMPS; 362 SAVETMPS;
302 PUSHMARK (SP); 363 PUSHMARK (SP);
303 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
304 PUTBACK; 365 PUTBACK;
305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
306 SPAGAIN; 367 SPAGAIN;
307 FREETMPS; 368 FREETMPS;
308 LEAVE; 369 LEAVE;
309 } 370 }
310 371
311 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
312 if (old_len == grp->length) 373 if (old_len == grp->size)
313 { 374 {
314 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
315 grp->fh2 = 0; 376 grp->sv2 = 0;
316 break; 377 break;
317 } 378 }
318 } 379 }
319} 380}
320 381
321static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
322{ 383{
323 --grp->length; 384 --grp->size;
324 385
325 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
326 aio_grp_feed (grp); 387 aio_grp_feed (grp);
327 388
328 /* finish, if done */ 389 /* finish, if done */
329 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
330 { 391 {
331 req_invoke (grp); 392 req_invoke (grp);
332 req_free (grp); 393 req_free (grp);
333 } 394 }
334} 395}
335 396
336static void poll_wait ()
337{
338 fd_set rfd;
339
340 while (nreqs)
341 {
342 int size;
343 if (WORDREAD_UNSAFE) LOCK (reslock);
344 size = res_queue.size;
345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
346
347 if (size)
348 return;
349
350 FD_ZERO(&rfd);
351 FD_SET(respipe [0], &rfd);
352
353 select (respipe [0] + 1, &rfd, 0, 0, 0);
354 }
355}
356
357static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
358{ 398{
359 dSP; 399 dSP;
400
401 if (req->flags & FLAG_DATA_RO_OFF)
402 SvREADONLY_off (req->sv1);
403
404 if (req->statdata)
405 {
406 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
407 PL_laststatval = req->result;
408 PL_statcache = *(req->statdata);
409 }
360 410
361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
362 { 412 {
363 ENTER; 413 ENTER;
364 SAVETMPS; 414 SAVETMPS;
… …
372 SV *rv = &PL_sv_undef; 422 SV *rv = &PL_sv_undef;
373 423
374 if (req->result >= 0) 424 if (req->result >= 0)
375 { 425 {
376 int i; 426 int i;
377 char *buf = req->data2ptr; 427 char *buf = req->ptr2;
378 AV *av = newAV (); 428 AV *av = newAV ();
379 429
380 av_extend (av, req->result - 1); 430 av_extend (av, req->result - 1);
381 431
382 for (i = 0; i < req->result; ++i) 432 for (i = 0; i < req->result; ++i)
… …
410 XPUSHs (sv_2mortal (fh)); 460 XPUSHs (sv_2mortal (fh));
411 } 461 }
412 break; 462 break;
413 463
414 case REQ_GROUP: 464 case REQ_GROUP:
415 req->fd = 2; /* mark group as finished */ 465 req->int1 = 2; /* mark group as finished */
416 466
417 if (req->data) 467 if (req->sv1)
418 { 468 {
419 int i; 469 int i;
420 AV *av = (AV *)req->data; 470 AV *av = (AV *)req->sv1;
421 471
422 EXTEND (SP, AvFILL (av) + 1); 472 EXTEND (SP, AvFILL (av) + 1);
423 for (i = 0; i <= AvFILL (av); ++i) 473 for (i = 0; i <= AvFILL (av); ++i)
424 PUSHs (*av_fetch (av, i, 0)); 474 PUSHs (*av_fetch (av, i, 0));
425 } 475 }
… …
427 477
428 case REQ_NOP: 478 case REQ_NOP:
429 case REQ_BUSY: 479 case REQ_BUSY:
430 break; 480 break;
431 481
482 case REQ_READLINK:
483 if (req->result > 0)
484 {
485 SvCUR_set (req->sv1, req->result);
486 *SvEND (req->sv1) = 0;
487 PUSHs (req->sv1);
488 }
489 break;
490
491 case REQ_READ:
492 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
493 *SvEND (req->sv1) = 0;
494 /* fall through */
432 default: 495 default:
433 PUSHs (sv_2mortal (newSViv (req->result))); 496 PUSHs (sv_2mortal (newSViv (req->result)));
434 break; 497 break;
435 } 498 }
436 499
… …
471 { 534 {
472 sv_unmagic (req->self, PERL_MAGIC_ext); 535 sv_unmagic (req->self, PERL_MAGIC_ext);
473 SvREFCNT_dec (req->self); 536 SvREFCNT_dec (req->self);
474 } 537 }
475 538
476 SvREFCNT_dec (req->data);
477 SvREFCNT_dec (req->fh); 539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1);
478 SvREFCNT_dec (req->fh2); 541 SvREFCNT_dec (req->sv2);
479 SvREFCNT_dec (req->callback); 542 SvREFCNT_dec (req->callback);
480 Safefree (req->statdata); 543 Safefree (req->statdata);
481 544
482 if (req->type == REQ_READDIR) 545 if (req->type == REQ_READDIR)
483 free (req->data2ptr); 546 free (req->ptr2);
484 547
485 Safefree (req); 548 Safefree (req);
486} 549}
487 550
488static void req_cancel_subs (aio_req grp) 551static void req_cancel_subs (aio_req grp)
… …
490 aio_req sub; 553 aio_req sub;
491 554
492 if (grp->type != REQ_GROUP) 555 if (grp->type != REQ_GROUP)
493 return; 556 return;
494 557
495 SvREFCNT_dec (grp->fh2); 558 SvREFCNT_dec (grp->sv2);
496 grp->fh2 = 0; 559 grp->sv2 = 0;
497 560
498 for (sub = grp->grp_first; sub; sub = sub->grp_next) 561 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub); 562 req_cancel (sub);
500} 563}
501 564
… …
504 req->flags |= FLAG_CANCELLED; 567 req->flags |= FLAG_CANCELLED;
505 568
506 req_cancel_subs (req); 569 req_cancel_subs (req);
507} 570}
508 571
572static void *aio_proc(void *arg);
573
574static void start_thread (void)
575{
576 sigset_t fullsigset, oldsigset;
577 pthread_attr_t attr;
578
579 worker *wrk = calloc (1, sizeof (worker));
580
581 if (!wrk)
582 croak ("unable to allocate worker thread data");
583
584 pthread_attr_init (&attr);
585 pthread_attr_setstacksize (&attr, STACKSIZE);
586 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
587#ifdef PTHREAD_SCOPE_PROCESS
588 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
589#endif
590
591 sigfillset (&fullsigset);
592
593 LOCK (wrklock);
594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
595
596 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
597 {
598 wrk->prev = &wrk_first;
599 wrk->next = wrk_first.next;
600 wrk_first.next->prev = wrk;
601 wrk_first.next = wrk;
602 ++started;
603 }
604 else
605 free (wrk);
606
607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock);
609}
610
611static void maybe_start_thread ()
612{
613 if (get_nthreads () >= wanted)
614 return;
615
616 /* todo: maybe use idle here, but might be less exact */
617 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
618 return;
619
620 start_thread ();
621}
622
623static void req_send (aio_req req)
624{
625 ++nreqs;
626
627 LOCK (reqlock);
628 ++nready;
629 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait);
631 UNLOCK (reqlock);
632
633 maybe_start_thread ();
634}
635
636static void end_thread (void)
637{
638 aio_req req;
639
640 Newz (0, req, 1, aio_cb);
641
642 req->type = REQ_QUIT;
643 req->pri = PRI_MAX + PRI_BIAS;
644
645 LOCK (reqlock);
646 reqq_push (&req_queue, req);
647 pthread_cond_signal (&reqwait);
648 UNLOCK (reqlock);
649
650 LOCK (wrklock);
651 --started;
652 UNLOCK (wrklock);
653}
654
655static void set_max_idle (int nthreads)
656{
657 if (WORDACCESS_UNSAFE) LOCK (reqlock);
658 max_idle = nthreads <= 0 ? 1 : nthreads;
659 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
660}
661
662static void min_parallel (int nthreads)
663{
664 if (wanted < nthreads)
665 wanted = nthreads;
666}
667
668static void max_parallel (int nthreads)
669{
670 if (wanted > nthreads)
671 wanted = nthreads;
672
673 while (started > wanted)
674 end_thread ();
675}
676
677static void poll_wait ()
678{
679 fd_set rfd;
680
681 while (nreqs)
682 {
683 int size;
684 if (WORDACCESS_UNSAFE) LOCK (reslock);
685 size = res_queue.size;
686 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
687
688 if (size)
689 return;
690
691 maybe_start_thread ();
692
693 FD_ZERO(&rfd);
694 FD_SET(respipe [0], &rfd);
695
696 select (respipe [0] + 1, &rfd, 0, 0, 0);
697 }
698}
699
509static int poll_cb (int max) 700static int poll_cb ()
510{ 701{
511 dSP; 702 dSP;
512 int count = 0; 703 int count = 0;
704 int maxreqs = max_poll_reqs;
513 int do_croak = 0; 705 int do_croak = 0;
706 struct timeval tv_start, tv_now;
514 aio_req req; 707 aio_req req;
515 708
709 if (max_poll_time)
710 gettimeofday (&tv_start, 0);
711
516 for (;;) 712 for (;;)
517 { 713 {
518 while (max <= 0 || count < max) 714 for (;;)
519 { 715 {
716 maybe_start_thread ();
717
520 LOCK (reslock); 718 LOCK (reslock);
521 req = reqq_shift (&res_queue); 719 req = reqq_shift (&res_queue);
522 720
523 if (req) 721 if (req)
524 { 722 {
… …
538 if (!req) 736 if (!req)
539 break; 737 break;
540 738
541 --nreqs; 739 --nreqs;
542 740
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length) 741 if (req->type == REQ_GROUP && req->size)
546 { 742 {
547 req->fd = 1; /* mark request as delayed */ 743 req->int1 = 1; /* mark request as delayed */
548 continue; 744 continue;
549 } 745 }
550 else 746 else
551 { 747 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req); 748 req_invoke (req);
566 749
567 count++; 750 count++;
568 } 751 }
569 752
570 req_free (req); 753 req_free (req);
754
755 if (maxreqs && !--maxreqs)
756 break;
757
758 if (max_poll_time)
759 {
760 gettimeofday (&tv_now, 0);
761
762 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
763 break;
764 }
571 } 765 }
572 766
573 if (nreqs <= max_outstanding) 767 if (nreqs <= max_outstanding)
574 break; 768 break;
575 769
576 poll_wait (); 770 poll_wait ();
577 771
578 max = 0; 772 ++maxreqs;
579 } 773 }
580 774
581 return count; 775 return count;
582}
583
584static void *aio_proc(void *arg);
585
586static void start_thread (void)
587{
588 sigset_t fullsigset, oldsigset;
589 pthread_attr_t attr;
590
591 worker *wrk = calloc (1, sizeof (worker));
592
593 if (!wrk)
594 croak ("unable to allocate worker thread data");
595
596 pthread_attr_init (&attr);
597 pthread_attr_setstacksize (&attr, STACKSIZE);
598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
599
600 sigfillset (&fullsigset);
601
602 LOCK (wrklock);
603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
604
605 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
606 {
607 wrk->prev = &wrk_first;
608 wrk->next = wrk_first.next;
609 wrk_first.next->prev = wrk;
610 wrk_first.next = wrk;
611 ++started;
612 }
613 else
614 free (wrk);
615
616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock);
618}
619
620static void req_send (aio_req req)
621{
622 while (started < wanted && nreqs >= started)
623 start_thread ();
624
625 ++nreqs;
626
627 LOCK (reqlock);
628 ++nready;
629 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait);
631 UNLOCK (reqlock);
632}
633
634static void end_thread (void)
635{
636 aio_req req;
637
638 Newz (0, req, 1, aio_cb);
639
640 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS;
642
643 req_send (req);
644}
645
646static void min_parallel (int nthreads)
647{
648 if (wanted < nthreads)
649 wanted = nthreads;
650}
651
652static void max_parallel (int nthreads)
653{
654 int cur = started;
655
656 if (wanted > nthreads)
657 wanted = nthreads;
658
659 while (cur > wanted)
660 {
661 end_thread ();
662 cur--;
663 }
664
665 while (started > wanted)
666 {
667 poll_wait ();
668 poll_cb (0);
669 }
670} 776}
671 777
672static void create_pipe () 778static void create_pipe ()
673{ 779{
674 if (pipe (respipe)) 780 if (pipe (respipe))
… …
889 int memofs = 0; 995 int memofs = 0;
890 int res = 0; 996 int res = 0;
891 int errorno; 997 int errorno;
892 998
893 LOCK (wrklock); 999 LOCK (wrklock);
894 self->dirp = dirp = opendir (req->dataptr); 1000 self->dirp = dirp = opendir (req->ptr1);
895 self->dbuf = u = malloc (sizeof (*u)); 1001 self->dbuf = u = malloc (sizeof (*u));
896 req->data2ptr = names = malloc (memlen); 1002 req->ptr2 = names = malloc (memlen);
897 UNLOCK (wrklock); 1003 UNLOCK (wrklock);
898 1004
899 if (dirp && u && names) 1005 if (dirp && u && names)
900 for (;;) 1006 for (;;)
901 { 1007 {
… …
915 1021
916 while (memofs + len > memlen) 1022 while (memofs + len > memlen)
917 { 1023 {
918 memlen *= 2; 1024 memlen *= 2;
919 LOCK (wrklock); 1025 LOCK (wrklock);
920 req->data2ptr = names = realloc (names, memlen); 1026 req->ptr2 = names = realloc (names, memlen);
921 UNLOCK (wrklock); 1027 UNLOCK (wrklock);
922 1028
923 if (!names) 1029 if (!names)
924 break; 1030 break;
925 } 1031 }
… …
938/*****************************************************************************/ 1044/*****************************************************************************/
939 1045
940static void *aio_proc (void *thr_arg) 1046static void *aio_proc (void *thr_arg)
941{ 1047{
942 aio_req req; 1048 aio_req req;
943 int type; 1049 struct timespec ts;
944 worker *self = (worker *)thr_arg; 1050 worker *self = (worker *)thr_arg;
945 1051
946 do 1052 /* try to distribute timeouts somewhat evenly */
1053 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1054 * (1000000000UL / 1024UL);
1055
1056 for (;;)
947 { 1057 {
1058 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1059
948 LOCK (reqlock); 1060 LOCK (reqlock);
949 1061
950 for (;;) 1062 for (;;)
951 { 1063 {
952 self->req = req = reqq_shift (&req_queue); 1064 self->req = req = reqq_shift (&req_queue);
953 1065
954 if (req) 1066 if (req)
955 break; 1067 break;
956 1068
1069 ++idle;
1070
1071 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1072 == ETIMEDOUT)
1073 {
1074 if (idle > max_idle)
1075 {
1076 --idle;
1077 UNLOCK (reqlock);
1078 LOCK (wrklock);
1079 --started;
1080 UNLOCK (wrklock);
1081 goto quit;
1082 }
1083
1084 /* we are allowed to idle, so do so without any timeout */
957 pthread_cond_wait (&reqwait, &reqlock); 1085 pthread_cond_wait (&reqwait, &reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 }
1088
1089 --idle;
958 } 1090 }
959 1091
960 --nready; 1092 --nready;
961 1093
962 UNLOCK (reqlock); 1094 UNLOCK (reqlock);
963 1095
964 errno = 0; /* strictly unnecessary */ 1096 errno = 0; /* strictly unnecessary */
965 type = req->type; /* remember type for QUIT check */
966 1097
967 if (!(req->flags & FLAG_CANCELLED)) 1098 if (!(req->flags & FLAG_CANCELLED))
968 switch (type) 1099 switch (req->type)
969 { 1100 {
970 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1101 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
971 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1102 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
972 1103
973 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1104 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
974 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1105 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
975 1106
976 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break;
977 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break;
978 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break;
979 1110
980 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1111 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
981 case REQ_CLOSE: req->result = close (req->fd); break; 1112 case REQ_CLOSE: req->result = close (req->int1); break;
982 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
983 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
984 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1117 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1118 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1119 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
987 1120
988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
989 case REQ_FSYNC: req->result = fsync (req->fd); break; 1122 case REQ_FSYNC: req->result = fsync (req->int1); break;
990 case REQ_READDIR: scandir_ (req, self); break; 1123 case REQ_READDIR: scandir_ (req, self); break;
991 1124
992 case REQ_BUSY: 1125 case REQ_BUSY:
993 { 1126 {
994 struct timeval tv; 1127 struct timeval tv;
995 1128
996 tv.tv_sec = req->fd; 1129 tv.tv_sec = req->int1;
997 tv.tv_usec = req->fd2; 1130 tv.tv_usec = req->int2;
998 1131
999 req->result = select (0, 0, 0, 0, &tv); 1132 req->result = select (0, 0, 0, 0, &tv);
1000 } 1133 }
1001 1134
1002 case REQ_GROUP: 1135 case REQ_GROUP:
1003 case REQ_NOP: 1136 case REQ_NOP:
1137 break;
1138
1004 case REQ_QUIT: 1139 case REQ_QUIT:
1005 break; 1140 goto quit;
1006 1141
1007 default: 1142 default:
1008 req->result = ENOSYS; 1143 req->result = ENOSYS;
1009 break; 1144 break;
1010 } 1145 }
… …
1022 self->req = 0; 1157 self->req = 0;
1023 worker_clear (self); 1158 worker_clear (self);
1024 1159
1025 UNLOCK (reslock); 1160 UNLOCK (reslock);
1026 } 1161 }
1027 while (type != REQ_QUIT);
1028 1162
1163quit:
1029 LOCK (wrklock); 1164 LOCK (wrklock);
1030 worker_free (self); 1165 worker_free (self);
1031 UNLOCK (wrklock); 1166 UNLOCK (wrklock);
1032 1167
1033 return 0; 1168 return 0;
… …
1080 1215
1081 worker_clear (wrk); 1216 worker_clear (wrk);
1082 worker_free (wrk); 1217 worker_free (wrk);
1083 } 1218 }
1084 1219
1085 started = 0; 1220 started = 0;
1221 idle = 0;
1086 nreqs = 0; 1222 nreqs = 0;
1223 nready = 0;
1224 npending = 0;
1087 1225
1088 close (respipe [0]); 1226 close (respipe [0]);
1089 close (respipe [1]); 1227 close (respipe [1]);
1090 create_pipe (); 1228 create_pipe ();
1091 1229
… …
1118PROTOTYPES: ENABLE 1256PROTOTYPES: ENABLE
1119 1257
1120BOOT: 1258BOOT:
1121{ 1259{
1122 HV *stash = gv_stashpv ("IO::AIO", 1); 1260 HV *stash = gv_stashpv ("IO::AIO", 1);
1261
1123 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1262 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1124 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1125 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1264 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1265 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1266 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1267 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1126 1268
1127 create_pipe (); 1269 create_pipe ();
1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1129} 1271}
1130 1272
1131void 1273void
1274max_poll_reqs (int nreqs)
1275 PROTOTYPE: $
1276 CODE:
1277 max_poll_reqs = nreqs;
1278
1279void
1280max_poll_time (double nseconds)
1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_time = nseconds * AIO_TICKS;
1284
1285void
1132min_parallel (int nthreads) 1286min_parallel (int nthreads)
1133 PROTOTYPE: $ 1287 PROTOTYPE: $
1134 1288
1135void 1289void
1136max_parallel (int nthreads) 1290max_parallel (int nthreads)
1137 PROTOTYPE: $ 1291 PROTOTYPE: $
1292
1293void
1294max_idle (int nthreads)
1295 PROTOTYPE: $
1296 CODE:
1297 set_max_idle (nthreads);
1138 1298
1139int 1299int
1140max_outstanding (int maxreqs) 1300max_outstanding (int maxreqs)
1141 PROTOTYPE: $ 1301 PROTOTYPE: $
1142 CODE: 1302 CODE:
… …
1155 PPCODE: 1315 PPCODE:
1156{ 1316{
1157 dREQ; 1317 dREQ;
1158 1318
1159 req->type = REQ_OPEN; 1319 req->type = REQ_OPEN;
1160 req->data = newSVsv (pathname); 1320 req->sv1 = newSVsv (pathname);
1161 req->dataptr = SvPVbyte_nolen (req->data); 1321 req->ptr1 = SvPVbyte_nolen (pathname);
1162 req->fd = flags; 1322 req->int1 = flags;
1163 req->mode = mode; 1323 req->mode = mode;
1164 1324
1165 REQ_SEND; 1325 REQ_SEND;
1166} 1326}
1167 1327
… …
1177 PPCODE: 1337 PPCODE:
1178{ 1338{
1179 dREQ; 1339 dREQ;
1180 1340
1181 req->type = ix; 1341 req->type = ix;
1182 req->fh = newSVsv (fh); 1342 req->fh = newSVsv (fh);
1183 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1184 1344
1185 REQ_SEND (req); 1345 REQ_SEND (req);
1186} 1346}
1187 1347
1188void 1348void
… …
1197 aio_read = REQ_READ 1357 aio_read = REQ_READ
1198 aio_write = REQ_WRITE 1358 aio_write = REQ_WRITE
1199 PROTOTYPE: $$$$$;$ 1359 PROTOTYPE: $$$$$;$
1200 PPCODE: 1360 PPCODE:
1201{ 1361{
1202 aio_req req;
1203 STRLEN svlen; 1362 STRLEN svlen;
1204 char *svptr = SvPVbyte (data, svlen); 1363 char *svptr = SvPVbyte (data, svlen);
1205 1364
1206 SvUPGRADE (data, SVt_PV); 1365 SvUPGRADE (data, SVt_PV);
1207 SvPOK_on (data); 1366 SvPOK_on (data);
… …
1229 1388
1230 { 1389 {
1231 dREQ; 1390 dREQ;
1232 1391
1233 req->type = ix; 1392 req->type = ix;
1234 req->fh = newSVsv (fh); 1393 req->fh = newSVsv (fh);
1235 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1236 : IoOFP (sv_2io (fh))); 1395 : IoOFP (sv_2io (fh)));
1237 req->offset = offset; 1396 req->offs = offset;
1238 req->length = length; 1397 req->size = length;
1239 req->data = SvREFCNT_inc (data); 1398 req->sv1 = SvREFCNT_inc (data);
1240 req->dataptr = (char *)svptr + dataoffset; 1399 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset;
1241 1401
1242 if (!SvREADONLY (data)) 1402 if (!SvREADONLY (data))
1243 { 1403 {
1244 SvREADONLY_on (data); 1404 SvREADONLY_on (data);
1245 req->data2ptr = (void *)data; 1405 req->flags |= FLAG_DATA_RO_OFF;
1246 } 1406 }
1247 1407
1248 REQ_SEND; 1408 REQ_SEND;
1249 } 1409 }
1410}
1411
1412void
1413aio_readlink (path,callback=&PL_sv_undef)
1414 SV * path
1415 SV * callback
1416 PROTOTYPE: $$;$
1417 PPCODE:
1418{
1419 SV *data;
1420 dREQ;
1421
1422 data = newSV (NAME_MAX);
1423 SvPOK_on (data);
1424
1425 req->type = REQ_READLINK;
1426 req->fh = newSVsv (path);
1427 req->ptr2 = SvPVbyte_nolen (path);
1428 req->sv1 = data;
1429 req->ptr1 = SvPVbyte_nolen (data);
1430
1431 REQ_SEND;
1250} 1432}
1251 1433
1252void 1434void
1253aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1435aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1254 SV * out_fh 1436 SV * out_fh
… …
1260 PPCODE: 1442 PPCODE:
1261{ 1443{
1262 dREQ; 1444 dREQ;
1263 1445
1264 req->type = REQ_SENDFILE; 1446 req->type = REQ_SENDFILE;
1265 req->fh = newSVsv (out_fh); 1447 req->fh = newSVsv (out_fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1267 req->fh2 = newSVsv (in_fh); 1449 req->sv2 = newSVsv (in_fh);
1268 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1269 req->offset = in_offset; 1451 req->offs = in_offset;
1270 req->length = length; 1452 req->size = length;
1271 1453
1272 REQ_SEND; 1454 REQ_SEND;
1273} 1455}
1274 1456
1275void 1457void
… …
1282 PPCODE: 1464 PPCODE:
1283{ 1465{
1284 dREQ; 1466 dREQ;
1285 1467
1286 req->type = REQ_READAHEAD; 1468 req->type = REQ_READAHEAD;
1287 req->fh = newSVsv (fh); 1469 req->fh = newSVsv (fh);
1288 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1289 req->offset = offset; 1471 req->offs = offset;
1290 req->length = length; 1472 req->size = length;
1291 1473
1292 REQ_SEND; 1474 REQ_SEND;
1293} 1475}
1294 1476
1295void 1477void
… …
1311 } 1493 }
1312 1494
1313 if (SvPOK (fh_or_path)) 1495 if (SvPOK (fh_or_path))
1314 { 1496 {
1315 req->type = ix; 1497 req->type = ix;
1316 req->data = newSVsv (fh_or_path); 1498 req->sv1 = newSVsv (fh_or_path);
1317 req->dataptr = SvPVbyte_nolen (req->data); 1499 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1318 } 1500 }
1319 else 1501 else
1320 { 1502 {
1321 req->type = REQ_FSTAT; 1503 req->type = REQ_FSTAT;
1322 req->fh = newSVsv (fh_or_path); 1504 req->fh = newSVsv (fh_or_path);
1323 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1324 } 1506 }
1325 1507
1326 REQ_SEND; 1508 REQ_SEND;
1327} 1509}
1328 1510
1329void 1511void
1330aio_unlink (pathname,callback=&PL_sv_undef) 1512aio_unlink (pathname,callback=&PL_sv_undef)
1331 SV * pathname 1513 SV * pathname
1332 SV * callback 1514 SV * callback
1333 ALIAS: 1515 ALIAS:
1334 aio_unlink = REQ_UNLINK 1516 aio_unlink = REQ_UNLINK
1335 aio_rmdir = REQ_RMDIR 1517 aio_rmdir = REQ_RMDIR
1336 aio_readdir = REQ_READDIR 1518 aio_readdir = REQ_READDIR
1337 PPCODE: 1519 PPCODE:
1338{ 1520{
1339 dREQ; 1521 dREQ;
1340 1522
1341 req->type = ix; 1523 req->type = ix;
1342 req->data = newSVsv (pathname); 1524 req->sv1 = newSVsv (pathname);
1343 req->dataptr = SvPVbyte_nolen (req->data); 1525 req->ptr1 = SvPVbyte_nolen (pathname);
1344 1526
1345 REQ_SEND; 1527 REQ_SEND;
1346} 1528}
1347 1529
1348void 1530void
1349aio_link (oldpath,newpath,callback=&PL_sv_undef) 1531aio_link (oldpath,newpath,callback=&PL_sv_undef)
1350 SV * oldpath 1532 SV * oldpath
1351 SV * newpath 1533 SV * newpath
1352 SV * callback 1534 SV * callback
1353 ALIAS: 1535 ALIAS:
1354 aio_link = REQ_LINK 1536 aio_link = REQ_LINK
1355 aio_symlink = REQ_SYMLINK 1537 aio_symlink = REQ_SYMLINK
1356 aio_rename = REQ_RENAME 1538 aio_rename = REQ_RENAME
1357 PPCODE: 1539 PPCODE:
1358{ 1540{
1359 dREQ; 1541 dREQ;
1360 1542
1361 req->type = ix; 1543 req->type = ix;
1362 req->fh = newSVsv (oldpath); 1544 req->fh = newSVsv (oldpath);
1363 req->data2ptr = SvPVbyte_nolen (req->fh); 1545 req->ptr2 = SvPVbyte_nolen (req->fh);
1364 req->data = newSVsv (newpath); 1546 req->sv1 = newSVsv (newpath);
1365 req->dataptr = SvPVbyte_nolen (req->data); 1547 req->ptr1 = SvPVbyte_nolen (newpath);
1366 1548
1367 REQ_SEND; 1549 REQ_SEND;
1368} 1550}
1369 1551
1370void 1552void
1553aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1554 SV * pathname
1555 SV * callback
1556 UV mode
1557 UV dev
1558 PPCODE:
1559{
1560 dREQ;
1561
1562 req->type = REQ_MKNOD;
1563 req->sv1 = newSVsv (pathname);
1564 req->ptr1 = SvPVbyte_nolen (pathname);
1565 req->mode = (mode_t)mode;
1566 req->offs = dev;
1567
1568 REQ_SEND;
1569}
1570
1571void
1371aio_busy (delay,callback=&PL_sv_undef) 1572aio_busy (delay,callback=&PL_sv_undef)
1372 double delay 1573 double delay
1373 SV * callback 1574 SV * callback
1374 PPCODE: 1575 PPCODE:
1375{ 1576{
1376 dREQ; 1577 dREQ;
1377 1578
1378 req->type = REQ_BUSY; 1579 req->type = REQ_BUSY;
1379 req->fd = delay < 0. ? 0 : delay; 1580 req->int1 = delay < 0. ? 0 : delay;
1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1381 1582
1382 REQ_SEND; 1583 REQ_SEND;
1383} 1584}
1384 1585
1385void 1586void
… …
1389 PPCODE: 1590 PPCODE:
1390{ 1591{
1391 dREQ; 1592 dREQ;
1392 1593
1393 req->type = REQ_GROUP; 1594 req->type = REQ_GROUP;
1595
1394 req_send (req); 1596 req_send (req);
1395
1396 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1597 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1397} 1598}
1398 1599
1399void 1600void
1400aio_nop (callback=&PL_sv_undef) 1601aio_nop (callback=&PL_sv_undef)
1401 SV * callback 1602 SV * callback
1402 PPCODE: 1603 PPCODE:
1403{ 1604{
1404 dREQ; 1605 dREQ;
1405 1606
1406 req->type = REQ_NOP; 1607 req->type = REQ_NOP;
… …
1460 1661
1461int 1662int
1462poll_cb(...) 1663poll_cb(...)
1463 PROTOTYPE: 1664 PROTOTYPE:
1464 CODE: 1665 CODE:
1465 RETVAL = poll_cb (0); 1666 RETVAL = poll_cb ();
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1474 OUTPUT: 1667 OUTPUT:
1475 RETVAL 1668 RETVAL
1476 1669
1477void 1670void
1478poll_wait() 1671poll_wait()
… …
1491 1684
1492int 1685int
1493nready() 1686nready()
1494 PROTOTYPE: 1687 PROTOTYPE:
1495 CODE: 1688 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready; 1689 RETVAL = get_nready ();
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT: 1690 OUTPUT:
1500 RETVAL 1691 RETVAL
1501 1692
1502int 1693int
1503npending() 1694npending()
1504 PROTOTYPE: 1695 PROTOTYPE:
1505 CODE: 1696 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending; 1697 RETVAL = get_npending ();
1698 OUTPUT:
1699 RETVAL
1700
1701int
1702nthreads()
1703 PROTOTYPE:
1704 CODE:
1705 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1706 RETVAL = started;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock); 1707 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1509 OUTPUT: 1708 OUTPUT:
1510 RETVAL 1709 RETVAL
1511 1710
1512PROTOTYPES: DISABLE 1711PROTOTYPES: DISABLE
1513 1712
… …
1531 PPCODE: 1730 PPCODE:
1532{ 1731{
1533 int i; 1732 int i;
1534 aio_req req; 1733 aio_req req;
1535 1734
1536 if (grp->fd == 2) 1735 if (grp->int1 == 2)
1537 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1736 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1538 1737
1539 for (i = 1; i < items; ++i ) 1738 for (i = 1; i < items; ++i )
1540 { 1739 {
1541 if (GIMME_V != G_VOID) 1740 if (GIMME_V != G_VOID)
… …
1543 1742
1544 req = SvAIO_REQ (ST (i)); 1743 req = SvAIO_REQ (ST (i));
1545 1744
1546 if (req) 1745 if (req)
1547 { 1746 {
1548 ++grp->length; 1747 ++grp->size;
1549 req->grp = grp; 1748 req->grp = grp;
1550 1749
1551 req->grp_prev = 0; 1750 req->grp_prev = 0;
1552 req->grp_next = grp->grp_first; 1751 req->grp_next = grp->grp_first;
1553 1752
… …
1576 av = newAV (); 1775 av = newAV ();
1577 1776
1578 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1579 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1580 1779
1581 SvREFCNT_dec (grp->data); 1780 SvREFCNT_dec (grp->sv1);
1582 grp->data = (SV *)av; 1781 grp->sv1 = (SV *)av;
1583} 1782}
1584 1783
1585void 1784void
1586errno (aio_req grp, int errorno = errno) 1785errno (aio_req grp, int errorno = errno)
1587 CODE: 1786 CODE:
1588 grp->errorno = errorno; 1787 grp->errorno = errorno;
1589 1788
1590void 1789void
1591limit (aio_req grp, int limit) 1790limit (aio_req grp, int limit)
1592 CODE: 1791 CODE:
1593 grp->fd2 = limit; 1792 grp->int2 = limit;
1594 aio_grp_feed (grp); 1793 aio_grp_feed (grp);
1595 1794
1596void 1795void
1597feed (aio_req grp, SV *callback=&PL_sv_undef) 1796feed (aio_req grp, SV *callback=&PL_sv_undef)
1598 CODE: 1797 CODE:
1599{ 1798{
1600 SvREFCNT_dec (grp->fh2); 1799 SvREFCNT_dec (grp->sv2);
1601 grp->fh2 = newSVsv (callback); 1800 grp->sv2 = newSVsv (callback);
1602 1801
1603 if (grp->fd2 <= 0) 1802 if (grp->int2 <= 0)
1604 grp->fd2 = 2; 1803 grp->int2 = 2;
1605 1804
1606 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1607} 1806}
1608 1807

Diff Legend

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