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.77 by root, Thu Oct 26 13:25:40 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
… …
59# define STACKSIZE 65536 62# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
62#else 65#else
63# define STACKSIZE 16384 66# define STACKSIZE 16384
67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
64#endif 79#endif
65 80
66/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
67#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
68 83
… …
80 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
81 REQ_SENDFILE, 96 REQ_SENDFILE,
82 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
83 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
85 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
86 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
87 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
88 REQ_BUSY, 103 REQ_BUSY,
89}; 104};
90 105
91#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
93 108
94typedef struct aio_cb 109typedef struct aio_cb
95{ 110{
96 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
97 112
98 SV *data, *callback; 113 SV *callback, *fh;
99 SV *fh, *fh2; 114 SV *sv1, *sv2;
100 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
101 Stat_t *statdata; 116 Stat_t *statdata;
102 off_t offset; 117 off_t offs;
103 size_t length; 118 size_t size;
104 ssize_t result; 119 ssize_t result;
105 120
106 STRLEN dataoffset; 121 STRLEN stroffset;
107 int type; 122 int type;
108 int fd, fd2; 123 int int1, int2;
109 int errorno; 124 int errorno;
110 mode_t mode; /* open */ 125 mode_t mode; /* open */
111 126
112 unsigned char flags; 127 unsigned char flags;
113 unsigned char pri; 128 unsigned char pri;
… …
115 SV *self; /* the perl counterpart of this request, if any */ 130 SV *self; /* the perl counterpart of this request, if any */
116 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
117} aio_cb; 132} aio_cb;
118 133
119enum { 134enum {
120 FLAG_CANCELLED = 0x01, 135 FLAG_CANCELLED = 0x01,
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */
121}; 137};
122 138
123typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
124typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
125 141
… …
130 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
131 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
133}; 149};
134 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
135static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
136 164
137static int started, wanted; 165static unsigned int started, idle, wanted;
138static volatile int nreqs;
139static int respipe [2];
140 166
141#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
142# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
143#else 169#else
144# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
185 wrk->prev->next = wrk->next; 211 wrk->prev->next = wrk->next;
186 212
187 free (wrk); 213 free (wrk);
188} 214}
189 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
190static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
191static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
192static 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
193 267
194/* 268/*
195 * a somewhat faster data structure might be nice, but 269 * a somewhat faster data structure might be nice, but
196 * with 8 priorities this actually needs <20 insns 270 * with 8 priorities this actually needs <20 insns
197 * per shift, the most expensive operation. 271 * per shift, the most expensive operation.
… …
243 } 317 }
244 318
245 abort (); 319 abort ();
246} 320}
247 321
248static int poll_cb (int max); 322static int poll_cb ();
249static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
250static void req_free (aio_req req); 324static void req_free (aio_req req);
251static void req_cancel (aio_req req); 325static void req_cancel (aio_req req);
252 326
253/* must be called at most once */ 327/* must be called at most once */
… …
274 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
275} 349}
276 350
277static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
278{ 352{
279 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
280 { 354 {
281 int old_len = grp->length; 355 int old_len = grp->size;
282 356
283 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
284 { 358 {
285 dSP; 359 dSP;
286 360
287 ENTER; 361 ENTER;
288 SAVETMPS; 362 SAVETMPS;
289 PUSHMARK (SP); 363 PUSHMARK (SP);
290 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
291 PUTBACK; 365 PUTBACK;
292 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
293 SPAGAIN; 367 SPAGAIN;
294 FREETMPS; 368 FREETMPS;
295 LEAVE; 369 LEAVE;
296 } 370 }
297 371
298 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
299 if (old_len == grp->length) 373 if (old_len == grp->size)
300 { 374 {
301 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
302 grp->fh2 = 0; 376 grp->sv2 = 0;
303 break; 377 break;
304 } 378 }
305 } 379 }
306} 380}
307 381
308static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
309{ 383{
310 --grp->length; 384 --grp->size;
311 385
312 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
313 aio_grp_feed (grp); 387 aio_grp_feed (grp);
314 388
315 /* finish, if done */ 389 /* finish, if done */
316 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
317 { 391 {
318 req_invoke (grp); 392 req_invoke (grp);
319 req_free (grp); 393 req_free (grp);
320 } 394 }
321} 395}
322 396
323static void poll_wait ()
324{
325 fd_set rfd;
326
327 while (nreqs)
328 {
329 int size;
330#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
331 LOCK (reslock);
332#endif
333 size = res_queue.size;
334#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
335 UNLOCK (reslock);
336#endif
337
338 if (size)
339 return;
340
341 FD_ZERO(&rfd);
342 FD_SET(respipe [0], &rfd);
343
344 select (respipe [0] + 1, &rfd, 0, 0, 0);
345 }
346}
347
348static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
349{ 398{
350 dSP; 399 dSP;
351 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 }
410
352 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
353 { 412 {
354 errno = req->errorno;
355
356 ENTER; 413 ENTER;
357 SAVETMPS; 414 SAVETMPS;
358 PUSHMARK (SP); 415 PUSHMARK (SP);
359 EXTEND (SP, 1); 416 EXTEND (SP, 1);
360 417
… …
365 SV *rv = &PL_sv_undef; 422 SV *rv = &PL_sv_undef;
366 423
367 if (req->result >= 0) 424 if (req->result >= 0)
368 { 425 {
369 int i; 426 int i;
370 char *buf = req->data2ptr; 427 char *buf = req->ptr2;
371 AV *av = newAV (); 428 AV *av = newAV ();
372 429
373 av_extend (av, req->result - 1); 430 av_extend (av, req->result - 1);
374 431
375 for (i = 0; i < req->result; ++i) 432 for (i = 0; i < req->result; ++i)
… …
403 XPUSHs (sv_2mortal (fh)); 460 XPUSHs (sv_2mortal (fh));
404 } 461 }
405 break; 462 break;
406 463
407 case REQ_GROUP: 464 case REQ_GROUP:
408 req->fd = 2; /* mark group as finished */ 465 req->int1 = 2; /* mark group as finished */
409 466
410 if (req->data) 467 if (req->sv1)
411 { 468 {
412 int i; 469 int i;
413 AV *av = (AV *)req->data; 470 AV *av = (AV *)req->sv1;
414 471
415 EXTEND (SP, AvFILL (av) + 1); 472 EXTEND (SP, AvFILL (av) + 1);
416 for (i = 0; i <= AvFILL (av); ++i) 473 for (i = 0; i <= AvFILL (av); ++i)
417 PUSHs (*av_fetch (av, i, 0)); 474 PUSHs (*av_fetch (av, i, 0));
418 } 475 }
… …
420 477
421 case REQ_NOP: 478 case REQ_NOP:
422 case REQ_BUSY: 479 case REQ_BUSY:
423 break; 480 break;
424 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 */
425 default: 495 default:
426 PUSHs (sv_2mortal (newSViv (req->result))); 496 PUSHs (sv_2mortal (newSViv (req->result)));
427 break; 497 break;
428 } 498 }
429 499
500 errno = req->errorno;
430 501
431 PUTBACK; 502 PUTBACK;
432 call_sv (req->callback, G_VOID | G_EVAL); 503 call_sv (req->callback, G_VOID | G_EVAL);
433 SPAGAIN; 504 SPAGAIN;
434 505
… …
463 { 534 {
464 sv_unmagic (req->self, PERL_MAGIC_ext); 535 sv_unmagic (req->self, PERL_MAGIC_ext);
465 SvREFCNT_dec (req->self); 536 SvREFCNT_dec (req->self);
466 } 537 }
467 538
468 SvREFCNT_dec (req->data);
469 SvREFCNT_dec (req->fh); 539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1);
470 SvREFCNT_dec (req->fh2); 541 SvREFCNT_dec (req->sv2);
471 SvREFCNT_dec (req->callback); 542 SvREFCNT_dec (req->callback);
472 Safefree (req->statdata); 543 Safefree (req->statdata);
473 544
474 if (req->type == REQ_READDIR) 545 if (req->type == REQ_READDIR)
475 free (req->data2ptr); 546 free (req->ptr2);
476 547
477 Safefree (req); 548 Safefree (req);
478} 549}
479 550
480static void req_cancel_subs (aio_req grp) 551static void req_cancel_subs (aio_req grp)
… …
482 aio_req sub; 553 aio_req sub;
483 554
484 if (grp->type != REQ_GROUP) 555 if (grp->type != REQ_GROUP)
485 return; 556 return;
486 557
487 SvREFCNT_dec (grp->fh2); 558 SvREFCNT_dec (grp->sv2);
488 grp->fh2 = 0; 559 grp->sv2 = 0;
489 560
490 for (sub = grp->grp_first; sub; sub = sub->grp_next) 561 for (sub = grp->grp_first; sub; sub = sub->grp_next)
491 req_cancel (sub); 562 req_cancel (sub);
492} 563}
493 564
494static void req_cancel (aio_req req) 565static void req_cancel (aio_req req)
495{ 566{
496 req->flags |= FLAG_CANCELLED; 567 req->flags |= FLAG_CANCELLED;
497 568
498 req_cancel_subs (req); 569 req_cancel_subs (req);
499}
500
501static int poll_cb (int max)
502{
503 dSP;
504 int count = 0;
505 int do_croak = 0;
506 aio_req req;
507
508 while (max <= 0 || count < max)
509 {
510 LOCK (reslock);
511 req = reqq_shift (&res_queue);
512
513 if (req)
514 {
515 if (!res_queue.size)
516 {
517 /* read any signals sent by the worker threads */
518 char buf [32];
519 while (read (respipe [0], buf, 32) == 32)
520 ;
521 }
522 }
523
524 UNLOCK (reslock);
525
526 if (!req)
527 break;
528
529 --nreqs;
530
531 if (req->type == REQ_QUIT)
532 started--;
533 else if (req->type == REQ_GROUP && req->length)
534 {
535 req->fd = 1; /* mark request as delayed */
536 continue;
537 }
538 else
539 {
540 if (req->type == REQ_READ)
541 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
542
543 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
544 SvREADONLY_off (req->data);
545
546 if (req->statdata)
547 {
548 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
549 PL_laststatval = req->result;
550 PL_statcache = *(req->statdata);
551 }
552
553 req_invoke (req);
554
555 count++;
556 }
557
558 req_free (req);
559 }
560
561 return count;
562} 570}
563 571
564static void *aio_proc(void *arg); 572static void *aio_proc(void *arg);
565 573
566static void start_thread (void) 574static void start_thread (void)
… …
574 croak ("unable to allocate worker thread data"); 582 croak ("unable to allocate worker thread data");
575 583
576 pthread_attr_init (&attr); 584 pthread_attr_init (&attr);
577 pthread_attr_setstacksize (&attr, STACKSIZE); 585 pthread_attr_setstacksize (&attr, STACKSIZE);
578 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 586 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
587#ifdef PTHREAD_SCOPE_PROCESS
588 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
589#endif
579 590
580 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
581 592
582 LOCK (wrklock); 593 LOCK (wrklock);
583 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
586 { 597 {
587 wrk->prev = &wrk_first; 598 wrk->prev = &wrk_first;
588 wrk->next = wrk_first.next; 599 wrk->next = wrk_first.next;
589 wrk_first.next->prev = wrk; 600 wrk_first.next->prev = wrk;
590 wrk_first.next = wrk; 601 wrk_first.next = wrk;
591 started++; 602 ++started;
592 } 603 }
593 else 604 else
594 free (wrk); 605 free (wrk);
595 606
596 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
597 UNLOCK (wrklock); 608 UNLOCK (wrklock);
598} 609}
599 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
600static void req_send (aio_req req) 623static void req_send (aio_req req)
601{ 624{
602 while (started < wanted && nreqs >= started)
603 start_thread ();
604
605 ++nreqs; 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;
606 644
607 LOCK (reqlock); 645 LOCK (reqlock);
608 reqq_push (&req_queue, req); 646 reqq_push (&req_queue, req);
609 pthread_cond_signal (&reqwait); 647 pthread_cond_signal (&reqwait);
610 UNLOCK (reqlock); 648 UNLOCK (reqlock);
611}
612 649
613static void end_thread (void) 650 LOCK (wrklock);
614{ 651 --started;
615 aio_req req; 652 UNLOCK (wrklock);
653}
616 654
617 Newz (0, req, 1, aio_cb); 655static void set_max_idle (int nthreads)
618 656{
619 req->type = REQ_QUIT; 657 if (WORDACCESS_UNSAFE) LOCK (reqlock);
620 req->pri = PRI_MAX + PRI_BIAS; 658 max_idle = nthreads <= 0 ? 1 : nthreads;
621 659 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
622 req_send (req);
623} 660}
624 661
625static void min_parallel (int nthreads) 662static void min_parallel (int nthreads)
626{ 663{
627 if (wanted < nthreads) 664 if (wanted < nthreads)
628 wanted = nthreads; 665 wanted = nthreads;
629} 666}
630 667
631static void max_parallel (int nthreads) 668static void max_parallel (int nthreads)
632{ 669{
633 int cur = started;
634
635 if (wanted > nthreads) 670 if (wanted > nthreads)
636 wanted = nthreads; 671 wanted = nthreads;
637 672
638 while (cur > wanted)
639 {
640 end_thread ();
641 cur--;
642 }
643
644 while (started > wanted) 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);
645 { 697 }
698}
699
700static int poll_cb ()
701{
702 dSP;
703 int count = 0;
704 int maxreqs = max_poll_reqs;
705 int do_croak = 0;
706 struct timeval tv_start, tv_now;
707 aio_req req;
708
709 if (max_poll_time)
710 gettimeofday (&tv_start, 0);
711
712 for (;;)
713 {
714 for (;;)
715 {
716 maybe_start_thread ();
717
718 LOCK (reslock);
719 req = reqq_shift (&res_queue);
720
721 if (req)
722 {
723 --npending;
724
725 if (!res_queue.size)
726 {
727 /* read any signals sent by the worker threads */
728 char buf [32];
729 while (read (respipe [0], buf, 32) == 32)
730 ;
731 }
732 }
733
734 UNLOCK (reslock);
735
736 if (!req)
737 break;
738
739 --nreqs;
740
741 if (req->type == REQ_GROUP && req->size)
742 {
743 req->int1 = 1; /* mark request as delayed */
744 continue;
745 }
746 else
747 {
748 req_invoke (req);
749
750 count++;
751 }
752
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 }
765 }
766
767 if (nreqs <= max_outstanding)
768 break;
769
646 poll_wait (); 770 poll_wait ();
647 poll_cb (0); 771
772 ++maxreqs;
648 } 773 }
774
775 return count;
649} 776}
650 777
651static void create_pipe () 778static void create_pipe ()
652{ 779{
653 if (pipe (respipe)) 780 if (pipe (respipe))
… …
868 int memofs = 0; 995 int memofs = 0;
869 int res = 0; 996 int res = 0;
870 int errorno; 997 int errorno;
871 998
872 LOCK (wrklock); 999 LOCK (wrklock);
873 self->dirp = dirp = opendir (req->dataptr); 1000 self->dirp = dirp = opendir (req->ptr1);
874 self->dbuf = u = malloc (sizeof (*u)); 1001 self->dbuf = u = malloc (sizeof (*u));
875 req->data2ptr = names = malloc (memlen); 1002 req->ptr2 = names = malloc (memlen);
876 UNLOCK (wrklock); 1003 UNLOCK (wrklock);
877 1004
878 if (dirp && u && names) 1005 if (dirp && u && names)
879 for (;;) 1006 for (;;)
880 { 1007 {
… …
894 1021
895 while (memofs + len > memlen) 1022 while (memofs + len > memlen)
896 { 1023 {
897 memlen *= 2; 1024 memlen *= 2;
898 LOCK (wrklock); 1025 LOCK (wrklock);
899 req->data2ptr = names = realloc (names, memlen); 1026 req->ptr2 = names = realloc (names, memlen);
900 UNLOCK (wrklock); 1027 UNLOCK (wrklock);
901 1028
902 if (!names) 1029 if (!names)
903 break; 1030 break;
904 } 1031 }
… …
917/*****************************************************************************/ 1044/*****************************************************************************/
918 1045
919static void *aio_proc (void *thr_arg) 1046static void *aio_proc (void *thr_arg)
920{ 1047{
921 aio_req req; 1048 aio_req req;
922 int type; 1049 struct timespec ts;
923 worker *self = (worker *)thr_arg; 1050 worker *self = (worker *)thr_arg;
924 1051
925 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 (;;)
926 { 1057 {
1058 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1059
927 LOCK (reqlock); 1060 LOCK (reqlock);
928 1061
929 for (;;) 1062 for (;;)
930 { 1063 {
931 self->req = req = reqq_shift (&req_queue); 1064 self->req = req = reqq_shift (&req_queue);
932 1065
933 if (req) 1066 if (req)
934 break; 1067 break;
935 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 */
936 pthread_cond_wait (&reqwait, &reqlock); 1085 pthread_cond_wait (&reqwait, &reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 }
1088
1089 --idle;
937 } 1090 }
1091
1092 --nready;
938 1093
939 UNLOCK (reqlock); 1094 UNLOCK (reqlock);
940 1095
941 errno = 0; /* strictly unnecessary */ 1096 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
943 1097
944 if (!(req->flags & FLAG_CANCELLED)) 1098 if (!(req->flags & FLAG_CANCELLED))
945 switch (type) 1099 switch (req->type)
946 { 1100 {
947 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;
948 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;
949 1103
950 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;
951 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;
952 1106
953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break;
954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break;
955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break;
956 1110
957 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;
958 case REQ_CLOSE: req->result = close (req->fd); break; 1112 case REQ_CLOSE: req->result = close (req->int1); break;
959 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
960 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
961 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
963 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;
964 1120
965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
966 case REQ_FSYNC: req->result = fsync (req->fd); break; 1122 case REQ_FSYNC: req->result = fsync (req->int1); break;
967 case REQ_READDIR: scandir_ (req, self); break; 1123 case REQ_READDIR: scandir_ (req, self); break;
968 1124
969 case REQ_BUSY: 1125 case REQ_BUSY:
970 { 1126 {
971 struct timeval tv; 1127 struct timeval tv;
972 1128
973 tv.tv_sec = req->fd; 1129 tv.tv_sec = req->int1;
974 tv.tv_usec = req->fd2; 1130 tv.tv_usec = req->int2;
975 1131
976 req->result = select (0, 0, 0, 0, &tv); 1132 req->result = select (0, 0, 0, 0, &tv);
977 } 1133 }
978 1134
979 case REQ_GROUP: 1135 case REQ_GROUP:
980 case REQ_NOP: 1136 case REQ_NOP:
1137 break;
1138
981 case REQ_QUIT: 1139 case REQ_QUIT:
982 break; 1140 goto quit;
983 1141
984 default: 1142 default:
985 req->result = ENOSYS; 1143 req->result = ENOSYS;
986 break; 1144 break;
987 } 1145 }
988 1146
989 req->errorno = errno; 1147 req->errorno = errno;
990 1148
991 LOCK (reslock); 1149 LOCK (reslock);
992 1150
1151 ++npending;
1152
993 if (!reqq_push (&res_queue, req)) 1153 if (!reqq_push (&res_queue, req))
994 /* write a dummy byte to the pipe so fh becomes ready */ 1154 /* write a dummy byte to the pipe so fh becomes ready */
995 write (respipe [1], &respipe, 1); 1155 write (respipe [1], &respipe, 1);
996 1156
997 self->req = 0; 1157 self->req = 0;
998 worker_clear (self); 1158 worker_clear (self);
999 1159
1000 UNLOCK (reslock); 1160 UNLOCK (reslock);
1001 } 1161 }
1002 while (type != REQ_QUIT);
1003 1162
1163quit:
1004 LOCK (wrklock); 1164 LOCK (wrklock);
1005 worker_free (self); 1165 worker_free (self);
1006 UNLOCK (wrklock); 1166 UNLOCK (wrklock);
1007 1167
1008 return 0; 1168 return 0;
… …
1055 1215
1056 worker_clear (wrk); 1216 worker_clear (wrk);
1057 worker_free (wrk); 1217 worker_free (wrk);
1058 } 1218 }
1059 1219
1060 started = 0; 1220 started = 0;
1221 idle = 0;
1061 nreqs = 0; 1222 nreqs = 0;
1223 nready = 0;
1224 npending = 0;
1062 1225
1063 close (respipe [0]); 1226 close (respipe [0]);
1064 close (respipe [1]); 1227 close (respipe [1]);
1065 create_pipe (); 1228 create_pipe ();
1066 1229
… …
1093PROTOTYPES: ENABLE 1256PROTOTYPES: ENABLE
1094 1257
1095BOOT: 1258BOOT:
1096{ 1259{
1097 HV *stash = gv_stashpv ("IO::AIO", 1); 1260 HV *stash = gv_stashpv ("IO::AIO", 1);
1261
1098 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1262 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1099 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1100 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));
1101 1268
1102 create_pipe (); 1269 create_pipe ();
1103 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1104} 1271}
1105 1272
1106void 1273void
1107min_parallel (nthreads) 1274max_poll_reqs (int nreqs)
1108 int nthreads
1109 PROTOTYPE: $ 1275 PROTOTYPE: $
1276 CODE:
1277 max_poll_reqs = nreqs;
1110 1278
1111void 1279void
1112max_parallel (nthreads) 1280max_poll_time (double nseconds)
1113 int nthreads
1114 PROTOTYPE: $ 1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_time = nseconds * AIO_TICKS;
1284
1285void
1286min_parallel (int nthreads)
1287 PROTOTYPE: $
1288
1289void
1290max_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_idle (int nthreads)
1295 PROTOTYPE: $
1296 CODE:
1297 set_max_idle (nthreads);
1298
1299int
1300max_outstanding (int maxreqs)
1301 PROTOTYPE: $
1302 CODE:
1303 RETVAL = max_outstanding;
1304 max_outstanding = maxreqs;
1305 OUTPUT:
1306 RETVAL
1115 1307
1116void 1308void
1117aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1309aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1118 SV * pathname 1310 SV * pathname
1119 int flags 1311 int flags
… …
1123 PPCODE: 1315 PPCODE:
1124{ 1316{
1125 dREQ; 1317 dREQ;
1126 1318
1127 req->type = REQ_OPEN; 1319 req->type = REQ_OPEN;
1128 req->data = newSVsv (pathname); 1320 req->sv1 = newSVsv (pathname);
1129 req->dataptr = SvPVbyte_nolen (req->data); 1321 req->ptr1 = SvPVbyte_nolen (pathname);
1130 req->fd = flags; 1322 req->int1 = flags;
1131 req->mode = mode; 1323 req->mode = mode;
1132 1324
1133 REQ_SEND; 1325 REQ_SEND;
1134} 1326}
1135 1327
… …
1145 PPCODE: 1337 PPCODE:
1146{ 1338{
1147 dREQ; 1339 dREQ;
1148 1340
1149 req->type = ix; 1341 req->type = ix;
1150 req->fh = newSVsv (fh); 1342 req->fh = newSVsv (fh);
1151 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1152 1344
1153 REQ_SEND (req); 1345 REQ_SEND (req);
1154} 1346}
1155 1347
1156void 1348void
… …
1165 aio_read = REQ_READ 1357 aio_read = REQ_READ
1166 aio_write = REQ_WRITE 1358 aio_write = REQ_WRITE
1167 PROTOTYPE: $$$$$;$ 1359 PROTOTYPE: $$$$$;$
1168 PPCODE: 1360 PPCODE:
1169{ 1361{
1170 aio_req req;
1171 STRLEN svlen; 1362 STRLEN svlen;
1172 char *svptr = SvPVbyte (data, svlen); 1363 char *svptr = SvPVbyte (data, svlen);
1173 1364
1174 SvUPGRADE (data, SVt_PV); 1365 SvUPGRADE (data, SVt_PV);
1175 SvPOK_on (data); 1366 SvPOK_on (data);
… …
1197 1388
1198 { 1389 {
1199 dREQ; 1390 dREQ;
1200 1391
1201 req->type = ix; 1392 req->type = ix;
1202 req->fh = newSVsv (fh); 1393 req->fh = newSVsv (fh);
1203 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1204 : IoOFP (sv_2io (fh))); 1395 : IoOFP (sv_2io (fh)));
1205 req->offset = offset; 1396 req->offs = offset;
1206 req->length = length; 1397 req->size = length;
1207 req->data = SvREFCNT_inc (data); 1398 req->sv1 = SvREFCNT_inc (data);
1208 req->dataptr = (char *)svptr + dataoffset; 1399 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset;
1209 1401
1210 if (!SvREADONLY (data)) 1402 if (!SvREADONLY (data))
1211 { 1403 {
1212 SvREADONLY_on (data); 1404 SvREADONLY_on (data);
1213 req->data2ptr = (void *)data; 1405 req->flags |= FLAG_DATA_RO_OFF;
1214 } 1406 }
1215 1407
1216 REQ_SEND; 1408 REQ_SEND;
1217 } 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;
1218} 1432}
1219 1433
1220void 1434void
1221aio_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)
1222 SV * out_fh 1436 SV * out_fh
… …
1228 PPCODE: 1442 PPCODE:
1229{ 1443{
1230 dREQ; 1444 dREQ;
1231 1445
1232 req->type = REQ_SENDFILE; 1446 req->type = REQ_SENDFILE;
1233 req->fh = newSVsv (out_fh); 1447 req->fh = newSVsv (out_fh);
1234 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1235 req->fh2 = newSVsv (in_fh); 1449 req->sv2 = newSVsv (in_fh);
1236 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1237 req->offset = in_offset; 1451 req->offs = in_offset;
1238 req->length = length; 1452 req->size = length;
1239 1453
1240 REQ_SEND; 1454 REQ_SEND;
1241} 1455}
1242 1456
1243void 1457void
… …
1250 PPCODE: 1464 PPCODE:
1251{ 1465{
1252 dREQ; 1466 dREQ;
1253 1467
1254 req->type = REQ_READAHEAD; 1468 req->type = REQ_READAHEAD;
1255 req->fh = newSVsv (fh); 1469 req->fh = newSVsv (fh);
1256 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1257 req->offset = offset; 1471 req->offs = offset;
1258 req->length = length; 1472 req->size = length;
1259 1473
1260 REQ_SEND; 1474 REQ_SEND;
1261} 1475}
1262 1476
1263void 1477void
… …
1279 } 1493 }
1280 1494
1281 if (SvPOK (fh_or_path)) 1495 if (SvPOK (fh_or_path))
1282 { 1496 {
1283 req->type = ix; 1497 req->type = ix;
1284 req->data = newSVsv (fh_or_path); 1498 req->sv1 = newSVsv (fh_or_path);
1285 req->dataptr = SvPVbyte_nolen (req->data); 1499 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1286 } 1500 }
1287 else 1501 else
1288 { 1502 {
1289 req->type = REQ_FSTAT; 1503 req->type = REQ_FSTAT;
1290 req->fh = newSVsv (fh_or_path); 1504 req->fh = newSVsv (fh_or_path);
1291 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 } 1506 }
1293 1507
1294 REQ_SEND; 1508 REQ_SEND;
1295} 1509}
1296 1510
1297void 1511void
1298aio_unlink (pathname,callback=&PL_sv_undef) 1512aio_unlink (pathname,callback=&PL_sv_undef)
1299 SV * pathname 1513 SV * pathname
1300 SV * callback 1514 SV * callback
1301 ALIAS: 1515 ALIAS:
1302 aio_unlink = REQ_UNLINK 1516 aio_unlink = REQ_UNLINK
1303 aio_rmdir = REQ_RMDIR 1517 aio_rmdir = REQ_RMDIR
1304 aio_readdir = REQ_READDIR 1518 aio_readdir = REQ_READDIR
1305 PPCODE: 1519 PPCODE:
1306{ 1520{
1307 dREQ; 1521 dREQ;
1308 1522
1309 req->type = ix; 1523 req->type = ix;
1310 req->data = newSVsv (pathname); 1524 req->sv1 = newSVsv (pathname);
1311 req->dataptr = SvPVbyte_nolen (req->data); 1525 req->ptr1 = SvPVbyte_nolen (pathname);
1312 1526
1313 REQ_SEND; 1527 REQ_SEND;
1314} 1528}
1315 1529
1316void 1530void
1317aio_link (oldpath,newpath,callback=&PL_sv_undef) 1531aio_link (oldpath,newpath,callback=&PL_sv_undef)
1318 SV * oldpath 1532 SV * oldpath
1319 SV * newpath 1533 SV * newpath
1320 SV * callback 1534 SV * callback
1321 ALIAS: 1535 ALIAS:
1322 aio_link = REQ_LINK 1536 aio_link = REQ_LINK
1323 aio_symlink = REQ_SYMLINK 1537 aio_symlink = REQ_SYMLINK
1324 aio_rename = REQ_RENAME 1538 aio_rename = REQ_RENAME
1325 PPCODE: 1539 PPCODE:
1326{ 1540{
1327 dREQ; 1541 dREQ;
1328 1542
1329 req->type = ix; 1543 req->type = ix;
1330 req->fh = newSVsv (oldpath); 1544 req->fh = newSVsv (oldpath);
1331 req->data2ptr = SvPVbyte_nolen (req->fh); 1545 req->ptr2 = SvPVbyte_nolen (req->fh);
1332 req->data = newSVsv (newpath); 1546 req->sv1 = newSVsv (newpath);
1333 req->dataptr = SvPVbyte_nolen (req->data); 1547 req->ptr1 = SvPVbyte_nolen (newpath);
1334 1548
1335 REQ_SEND; 1549 REQ_SEND;
1336} 1550}
1337 1551
1338void 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
1339aio_busy (delay,callback=&PL_sv_undef) 1572aio_busy (delay,callback=&PL_sv_undef)
1340 double delay 1573 double delay
1341 SV * callback 1574 SV * callback
1342 PPCODE: 1575 PPCODE:
1343{ 1576{
1344 dREQ; 1577 dREQ;
1345 1578
1346 req->type = REQ_BUSY; 1579 req->type = REQ_BUSY;
1347 req->fd = delay < 0. ? 0 : delay; 1580 req->int1 = delay < 0. ? 0 : delay;
1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1349 1582
1350 REQ_SEND; 1583 REQ_SEND;
1351} 1584}
1352 1585
1353void 1586void
… …
1357 PPCODE: 1590 PPCODE:
1358{ 1591{
1359 dREQ; 1592 dREQ;
1360 1593
1361 req->type = REQ_GROUP; 1594 req->type = REQ_GROUP;
1595
1362 req_send (req); 1596 req_send (req);
1363
1364 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1597 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1365} 1598}
1366 1599
1367void 1600void
1368aio_nop (callback=&PL_sv_undef) 1601aio_nop (callback=&PL_sv_undef)
1369 SV * callback 1602 SV * callback
1370 PPCODE: 1603 PPCODE:
1371{ 1604{
1372 dREQ; 1605 dREQ;
1373 1606
1374 req->type = REQ_NOP; 1607 req->type = REQ_NOP;
1375 1608
1376 REQ_SEND; 1609 REQ_SEND;
1377} 1610}
1378 1611
1379void 1612int
1380aioreq_pri (int pri = DEFAULT_PRI) 1613aioreq_pri (int pri = 0)
1381 CODE: 1614 PROTOTYPE: ;$
1615 CODE:
1616 RETVAL = next_pri - PRI_BIAS;
1617 if (items > 0)
1618 {
1382 if (pri < PRI_MIN) pri = PRI_MIN; 1619 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX; 1620 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS; 1621 next_pri = pri + PRI_BIAS;
1622 }
1623 OUTPUT:
1624 RETVAL
1385 1625
1386void 1626void
1387aioreq_nice (int nice = 0) 1627aioreq_nice (int nice = 0)
1388 CODE: 1628 CODE:
1389 nice = next_pri - nice; 1629 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN; 1630 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX; 1631 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS; 1632 next_pri = nice + PRI_BIAS;
1393 1633
1394void 1634void
1395flush () 1635flush ()
1396 PROTOTYPE: 1636 PROTOTYPE:
1397 CODE: 1637 CODE:
… …
1421 1661
1422int 1662int
1423poll_cb(...) 1663poll_cb(...)
1424 PROTOTYPE: 1664 PROTOTYPE:
1425 CODE: 1665 CODE:
1426 RETVAL = poll_cb (0); 1666 RETVAL = poll_cb ();
1427 OUTPUT:
1428 RETVAL
1429
1430int
1431poll_some(int max = 0)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = poll_cb (max);
1435 OUTPUT: 1667 OUTPUT:
1436 RETVAL 1668 RETVAL
1437 1669
1438void 1670void
1439poll_wait() 1671poll_wait()
… …
1448 CODE: 1680 CODE:
1449 RETVAL = nreqs; 1681 RETVAL = nreqs;
1450 OUTPUT: 1682 OUTPUT:
1451 RETVAL 1683 RETVAL
1452 1684
1685int
1686nready()
1687 PROTOTYPE:
1688 CODE:
1689 RETVAL = get_nready ();
1690 OUTPUT:
1691 RETVAL
1692
1693int
1694npending()
1695 PROTOTYPE:
1696 CODE:
1697 RETVAL = get_npending ();
1698 OUTPUT:
1699 RETVAL
1700
1701int
1702nthreads()
1703 PROTOTYPE:
1704 CODE:
1705 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1706 RETVAL = started;
1707 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1708 OUTPUT:
1709 RETVAL
1710
1453PROTOTYPES: DISABLE 1711PROTOTYPES: DISABLE
1454 1712
1455MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1713MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1456 1714
1457void 1715void
… …
1472 PPCODE: 1730 PPCODE:
1473{ 1731{
1474 int i; 1732 int i;
1475 aio_req req; 1733 aio_req req;
1476 1734
1477 if (grp->fd == 2) 1735 if (grp->int1 == 2)
1478 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");
1479 1737
1480 for (i = 1; i < items; ++i ) 1738 for (i = 1; i < items; ++i )
1481 { 1739 {
1482 if (GIMME_V != G_VOID) 1740 if (GIMME_V != G_VOID)
… …
1484 1742
1485 req = SvAIO_REQ (ST (i)); 1743 req = SvAIO_REQ (ST (i));
1486 1744
1487 if (req) 1745 if (req)
1488 { 1746 {
1489 ++grp->length; 1747 ++grp->size;
1490 req->grp = grp; 1748 req->grp = grp;
1491 1749
1492 req->grp_prev = 0; 1750 req->grp_prev = 0;
1493 req->grp_next = grp->grp_first; 1751 req->grp_next = grp->grp_first;
1494 1752
… …
1508void 1766void
1509result (aio_req grp, ...) 1767result (aio_req grp, ...)
1510 CODE: 1768 CODE:
1511{ 1769{
1512 int i; 1770 int i;
1771 AV *av;
1772
1773 grp->errorno = errno;
1774
1513 AV *av = newAV (); 1775 av = newAV ();
1514 1776
1515 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1516 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1517 1779
1518 SvREFCNT_dec (grp->data); 1780 SvREFCNT_dec (grp->sv1);
1519 grp->data = (SV *)av; 1781 grp->sv1 = (SV *)av;
1520} 1782}
1783
1784void
1785errno (aio_req grp, int errorno = errno)
1786 CODE:
1787 grp->errorno = errorno;
1521 1788
1522void 1789void
1523limit (aio_req grp, int limit) 1790limit (aio_req grp, int limit)
1524 CODE: 1791 CODE:
1525 grp->fd2 = limit; 1792 grp->int2 = limit;
1526 aio_grp_feed (grp); 1793 aio_grp_feed (grp);
1527 1794
1528void 1795void
1529feed (aio_req grp, SV *callback=&PL_sv_undef) 1796feed (aio_req grp, SV *callback=&PL_sv_undef)
1530 CODE: 1797 CODE:
1531{ 1798{
1532 SvREFCNT_dec (grp->fh2); 1799 SvREFCNT_dec (grp->sv2);
1533 grp->fh2 = newSVsv (callback); 1800 grp->sv2 = newSVsv (callback);
1534 1801
1535 if (grp->fd2 <= 0) 1802 if (grp->int2 <= 0)
1536 grp->fd2 = 2; 1803 grp->int2 = 2;
1537 1804
1538 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1539} 1806}
1540 1807

Diff Legend

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