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.88 by root, Mon Oct 30 23:43:17 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;
102 off_t offset; 116 off_t offs;
103 size_t length; 117 size_t size;
104 ssize_t result; 118 ssize_t result;
105 119
106 STRLEN dataoffset; 120 STRLEN stroffset;
107 int type; 121 int type;
108 int fd, fd2; 122 int int1, int2;
109 int errorno; 123 int errorno;
110 mode_t mode; /* open */ 124 mode_t mode; /* open */
111 125
112 unsigned char flags; 126 unsigned char flags;
113 unsigned char pri; 127 unsigned char pri;
… …
115 SV *self; /* the perl counterpart of this request, if any */ 129 SV *self; /* the perl counterpart of this request, if any */
116 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 130 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
117} aio_cb; 131} aio_cb;
118 132
119enum { 133enum {
120 FLAG_CANCELLED = 0x01, 134 FLAG_CANCELLED = 0x01,
135 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
136 FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */
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;
400
401 if (req->flags & FLAG_SV1_RO_OFF)
402 SvREADONLY_off (req->sv1);
351 403
352 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 404 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
353 { 405 {
354 errno = req->errorno;
355
356 ENTER; 406 ENTER;
357 SAVETMPS; 407 SAVETMPS;
358 PUSHMARK (SP); 408 PUSHMARK (SP);
359 EXTEND (SP, 1); 409 EXTEND (SP, 1);
360 410
… …
365 SV *rv = &PL_sv_undef; 415 SV *rv = &PL_sv_undef;
366 416
367 if (req->result >= 0) 417 if (req->result >= 0)
368 { 418 {
369 int i; 419 int i;
370 char *buf = req->data2ptr; 420 char *buf = req->ptr2;
371 AV *av = newAV (); 421 AV *av = newAV ();
372 422
373 av_extend (av, req->result - 1); 423 av_extend (av, req->result - 1);
374 424
375 for (i = 0; i < req->result; ++i) 425 for (i = 0; i < req->result; ++i)
… …
403 XPUSHs (sv_2mortal (fh)); 453 XPUSHs (sv_2mortal (fh));
404 } 454 }
405 break; 455 break;
406 456
407 case REQ_GROUP: 457 case REQ_GROUP:
408 req->fd = 2; /* mark group as finished */ 458 req->int1 = 2; /* mark group as finished */
409 459
410 if (req->data) 460 if (req->sv1)
411 { 461 {
412 int i; 462 int i;
413 AV *av = (AV *)req->data; 463 AV *av = (AV *)req->sv1;
414 464
415 EXTEND (SP, AvFILL (av) + 1); 465 EXTEND (SP, AvFILL (av) + 1);
416 for (i = 0; i <= AvFILL (av); ++i) 466 for (i = 0; i <= AvFILL (av); ++i)
417 PUSHs (*av_fetch (av, i, 0)); 467 PUSHs (*av_fetch (av, i, 0));
418 } 468 }
… …
420 470
421 case REQ_NOP: 471 case REQ_NOP:
422 case REQ_BUSY: 472 case REQ_BUSY:
423 break; 473 break;
424 474
475 case REQ_READLINK:
476 if (req->result > 0)
477 {
478 SvCUR_set (req->sv1, req->result);
479 *SvEND (req->sv1) = 0;
480 PUSHs (req->sv1);
481 }
482 break;
483
484 case REQ_STAT:
485 case REQ_LSTAT:
486 case REQ_FSTAT:
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(Stat_t *)(req->ptr2);
490 PUSHs (sv_2mortal (newSViv (req->result)));
491 break;
492
493 case REQ_READ:
494 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
495 *SvEND (req->sv1) = 0;
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
498
425 default: 499 default:
426 PUSHs (sv_2mortal (newSViv (req->result))); 500 PUSHs (sv_2mortal (newSViv (req->result)));
427 break; 501 break;
428 } 502 }
429 503
504 errno = req->errorno;
430 505
431 PUTBACK; 506 PUTBACK;
432 call_sv (req->callback, G_VOID | G_EVAL); 507 call_sv (req->callback, G_VOID | G_EVAL);
433 SPAGAIN; 508 SPAGAIN;
434 509
… …
463 { 538 {
464 sv_unmagic (req->self, PERL_MAGIC_ext); 539 sv_unmagic (req->self, PERL_MAGIC_ext);
465 SvREFCNT_dec (req->self); 540 SvREFCNT_dec (req->self);
466 } 541 }
467 542
468 SvREFCNT_dec (req->data);
469 SvREFCNT_dec (req->fh); 543 SvREFCNT_dec (req->fh);
544 SvREFCNT_dec (req->sv1);
470 SvREFCNT_dec (req->fh2); 545 SvREFCNT_dec (req->sv2);
471 SvREFCNT_dec (req->callback); 546 SvREFCNT_dec (req->callback);
472 Safefree (req->statdata);
473 547
474 if (req->type == REQ_READDIR) 548 if (req->flags & FLAG_PTR2_FREE)
475 free (req->data2ptr); 549 free (req->ptr2);
476 550
477 Safefree (req); 551 Safefree (req);
478} 552}
479 553
480static void req_cancel_subs (aio_req grp) 554static void req_cancel_subs (aio_req grp)
… …
482 aio_req sub; 556 aio_req sub;
483 557
484 if (grp->type != REQ_GROUP) 558 if (grp->type != REQ_GROUP)
485 return; 559 return;
486 560
487 SvREFCNT_dec (grp->fh2); 561 SvREFCNT_dec (grp->sv2);
488 grp->fh2 = 0; 562 grp->sv2 = 0;
489 563
490 for (sub = grp->grp_first; sub; sub = sub->grp_next) 564 for (sub = grp->grp_first; sub; sub = sub->grp_next)
491 req_cancel (sub); 565 req_cancel (sub);
492} 566}
493 567
494static void req_cancel (aio_req req) 568static void req_cancel (aio_req req)
495{ 569{
496 req->flags |= FLAG_CANCELLED; 570 req->flags |= FLAG_CANCELLED;
497 571
498 req_cancel_subs (req); 572 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} 573}
563 574
564static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
565 576
566static void start_thread (void) 577static void start_thread (void)
… …
574 croak ("unable to allocate worker thread data"); 585 croak ("unable to allocate worker thread data");
575 586
576 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
577 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
578 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
590#ifdef PTHREAD_SCOPE_PROCESS
591 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
592#endif
579 593
580 sigfillset (&fullsigset); 594 sigfillset (&fullsigset);
581 595
582 LOCK (wrklock); 596 LOCK (wrklock);
583 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 597 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
586 { 600 {
587 wrk->prev = &wrk_first; 601 wrk->prev = &wrk_first;
588 wrk->next = wrk_first.next; 602 wrk->next = wrk_first.next;
589 wrk_first.next->prev = wrk; 603 wrk_first.next->prev = wrk;
590 wrk_first.next = wrk; 604 wrk_first.next = wrk;
591 started++; 605 ++started;
592 } 606 }
593 else 607 else
594 free (wrk); 608 free (wrk);
595 609
596 sigprocmask (SIG_SETMASK, &oldsigset, 0); 610 sigprocmask (SIG_SETMASK, &oldsigset, 0);
597 UNLOCK (wrklock); 611 UNLOCK (wrklock);
598} 612}
599 613
614static void maybe_start_thread ()
615{
616 if (get_nthreads () >= wanted)
617 return;
618
619 /* todo: maybe use idle here, but might be less exact */
620 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
621 return;
622
623 start_thread ();
624}
625
600static void req_send (aio_req req) 626static void req_send (aio_req req)
601{ 627{
602 while (started < wanted && nreqs >= started)
603 start_thread ();
604
605 ++nreqs; 628 ++nreqs;
629
630 LOCK (reqlock);
631 ++nready;
632 reqq_push (&req_queue, req);
633 pthread_cond_signal (&reqwait);
634 UNLOCK (reqlock);
635
636 maybe_start_thread ();
637}
638
639static void end_thread (void)
640{
641 aio_req req;
642
643 Newz (0, req, 1, aio_cb);
644
645 req->type = REQ_QUIT;
646 req->pri = PRI_MAX + PRI_BIAS;
606 647
607 LOCK (reqlock); 648 LOCK (reqlock);
608 reqq_push (&req_queue, req); 649 reqq_push (&req_queue, req);
609 pthread_cond_signal (&reqwait); 650 pthread_cond_signal (&reqwait);
610 UNLOCK (reqlock); 651 UNLOCK (reqlock);
611}
612 652
613static void end_thread (void) 653 LOCK (wrklock);
614{ 654 --started;
615 aio_req req; 655 UNLOCK (wrklock);
656}
616 657
617 Newz (0, req, 1, aio_cb); 658static void set_max_idle (int nthreads)
618 659{
619 req->type = REQ_QUIT; 660 if (WORDACCESS_UNSAFE) LOCK (reqlock);
620 req->pri = PRI_MAX + PRI_BIAS; 661 max_idle = nthreads <= 0 ? 1 : nthreads;
621 662 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
622 req_send (req);
623} 663}
624 664
625static void min_parallel (int nthreads) 665static void min_parallel (int nthreads)
626{ 666{
627 if (wanted < nthreads) 667 if (wanted < nthreads)
628 wanted = nthreads; 668 wanted = nthreads;
629} 669}
630 670
631static void max_parallel (int nthreads) 671static void max_parallel (int nthreads)
632{ 672{
633 int cur = started;
634
635 if (wanted > nthreads) 673 if (wanted > nthreads)
636 wanted = nthreads; 674 wanted = nthreads;
637 675
638 while (cur > wanted) 676 while (started > wanted)
677 end_thread ();
678}
679
680static void poll_wait ()
681{
682 fd_set rfd;
683
684 while (nreqs)
639 { 685 {
686 int size;
687 if (WORDACCESS_UNSAFE) LOCK (reslock);
688 size = res_queue.size;
689 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
690
691 if (size)
692 return;
693
640 end_thread (); 694 maybe_start_thread ();
641 cur--; 695
696 FD_ZERO(&rfd);
697 FD_SET(respipe [0], &rfd);
698
699 select (respipe [0] + 1, &rfd, 0, 0, 0);
642 } 700 }
701}
643 702
644 while (started > wanted) 703static int poll_cb ()
704{
705 dSP;
706 int count = 0;
707 int maxreqs = max_poll_reqs;
708 int do_croak = 0;
709 struct timeval tv_start, tv_now;
710 aio_req req;
711
712 if (max_poll_time)
713 gettimeofday (&tv_start, 0);
714
715 for (;;)
645 { 716 {
717 for (;;)
718 {
719 maybe_start_thread ();
720
721 LOCK (reslock);
722 req = reqq_shift (&res_queue);
723
724 if (req)
725 {
726 --npending;
727
728 if (!res_queue.size)
729 {
730 /* read any signals sent by the worker threads */
731 char buf [32];
732 while (read (respipe [0], buf, 32) == 32)
733 ;
734 }
735 }
736
737 UNLOCK (reslock);
738
739 if (!req)
740 break;
741
742 --nreqs;
743
744 if (req->type == REQ_GROUP && req->size)
745 {
746 req->int1 = 1; /* mark request as delayed */
747 continue;
748 }
749 else
750 {
751 req_invoke (req);
752
753 count++;
754 }
755
756 req_free (req);
757
758 if (maxreqs && !--maxreqs)
759 break;
760
761 if (max_poll_time)
762 {
763 gettimeofday (&tv_now, 0);
764
765 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
766 break;
767 }
768 }
769
770 if (nreqs <= max_outstanding)
771 break;
772
646 poll_wait (); 773 poll_wait ();
647 poll_cb (0); 774
775 ++maxreqs;
648 } 776 }
777
778 return count;
649} 779}
650 780
651static void create_pipe () 781static void create_pipe ()
652{ 782{
653 if (pipe (respipe)) 783 if (pipe (respipe))
… …
868 int memofs = 0; 998 int memofs = 0;
869 int res = 0; 999 int res = 0;
870 int errorno; 1000 int errorno;
871 1001
872 LOCK (wrklock); 1002 LOCK (wrklock);
873 self->dirp = dirp = opendir (req->dataptr); 1003 self->dirp = dirp = opendir (req->ptr1);
874 self->dbuf = u = malloc (sizeof (*u)); 1004 self->dbuf = u = malloc (sizeof (*u));
1005 req->flags |= FLAG_PTR2_FREE;
875 req->data2ptr = names = malloc (memlen); 1006 req->ptr2 = names = malloc (memlen);
876 UNLOCK (wrklock); 1007 UNLOCK (wrklock);
877 1008
878 if (dirp && u && names) 1009 if (dirp && u && names)
879 for (;;) 1010 for (;;)
880 { 1011 {
… …
894 1025
895 while (memofs + len > memlen) 1026 while (memofs + len > memlen)
896 { 1027 {
897 memlen *= 2; 1028 memlen *= 2;
898 LOCK (wrklock); 1029 LOCK (wrklock);
899 req->data2ptr = names = realloc (names, memlen); 1030 req->ptr2 = names = realloc (names, memlen);
900 UNLOCK (wrklock); 1031 UNLOCK (wrklock);
901 1032
902 if (!names) 1033 if (!names)
903 break; 1034 break;
904 } 1035 }
… …
917/*****************************************************************************/ 1048/*****************************************************************************/
918 1049
919static void *aio_proc (void *thr_arg) 1050static void *aio_proc (void *thr_arg)
920{ 1051{
921 aio_req req; 1052 aio_req req;
922 int type; 1053 struct timespec ts;
923 worker *self = (worker *)thr_arg; 1054 worker *self = (worker *)thr_arg;
924 1055
925 do 1056 /* try to distribute timeouts somewhat evenly */
1057 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1058 * (1000000000UL / 1024UL);
1059
1060 for (;;)
926 { 1061 {
1062 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1063
927 LOCK (reqlock); 1064 LOCK (reqlock);
928 1065
929 for (;;) 1066 for (;;)
930 { 1067 {
931 self->req = req = reqq_shift (&req_queue); 1068 self->req = req = reqq_shift (&req_queue);
932 1069
933 if (req) 1070 if (req)
934 break; 1071 break;
935 1072
1073 ++idle;
1074
1075 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1076 == ETIMEDOUT)
1077 {
1078 if (idle > max_idle)
1079 {
1080 --idle;
1081 UNLOCK (reqlock);
1082 LOCK (wrklock);
1083 --started;
1084 UNLOCK (wrklock);
1085 goto quit;
1086 }
1087
1088 /* we are allowed to idle, so do so without any timeout */
936 pthread_cond_wait (&reqwait, &reqlock); 1089 pthread_cond_wait (&reqwait, &reqlock);
1090 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1091 }
1092
1093 --idle;
937 } 1094 }
1095
1096 --nready;
938 1097
939 UNLOCK (reqlock); 1098 UNLOCK (reqlock);
940 1099
941 errno = 0; /* strictly unnecessary */ 1100 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
943 1101
944 if (!(req->flags & FLAG_CANCELLED)) 1102 if (!(req->flags & FLAG_CANCELLED))
945 switch (type) 1103 switch (req->type)
946 { 1104 {
947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1105 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; 1106 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
949 1107
950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1108 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; 1109 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
952 1110
953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1111 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1112 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1113 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
956 1114
957 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1115 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
958 case REQ_CLOSE: req->result = close (req->fd); break; 1116 case REQ_CLOSE: req->result = close (req->int1); break;
959 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1117 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
960 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1118 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
961 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
964 1124
965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
966 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
967 case REQ_READDIR: scandir_ (req, self); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
968 1128
969 case REQ_BUSY: 1129 case REQ_BUSY:
970 { 1130 {
971 struct timeval tv; 1131 struct timeval tv;
972 1132
973 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
974 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
975 1135
976 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
977 } 1137 }
978 1138
979 case REQ_GROUP: 1139 case REQ_GROUP:
980 case REQ_NOP: 1140 case REQ_NOP:
1141 break;
1142
981 case REQ_QUIT: 1143 case REQ_QUIT:
982 break; 1144 goto quit;
983 1145
984 default: 1146 default:
985 req->result = ENOSYS; 1147 req->result = ENOSYS;
986 break; 1148 break;
987 } 1149 }
988 1150
989 req->errorno = errno; 1151 req->errorno = errno;
990 1152
991 LOCK (reslock); 1153 LOCK (reslock);
992 1154
1155 ++npending;
1156
993 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
994 /* write a dummy byte to the pipe so fh becomes ready */ 1158 /* write a dummy byte to the pipe so fh becomes ready */
995 write (respipe [1], &respipe, 1); 1159 write (respipe [1], &respipe, 1);
996 1160
997 self->req = 0; 1161 self->req = 0;
998 worker_clear (self); 1162 worker_clear (self);
999 1163
1000 UNLOCK (reslock); 1164 UNLOCK (reslock);
1001 } 1165 }
1002 while (type != REQ_QUIT);
1003 1166
1167quit:
1004 LOCK (wrklock); 1168 LOCK (wrklock);
1005 worker_free (self); 1169 worker_free (self);
1006 UNLOCK (wrklock); 1170 UNLOCK (wrklock);
1007 1171
1008 return 0; 1172 return 0;
… …
1055 1219
1056 worker_clear (wrk); 1220 worker_clear (wrk);
1057 worker_free (wrk); 1221 worker_free (wrk);
1058 } 1222 }
1059 1223
1060 started = 0; 1224 started = 0;
1225 idle = 0;
1061 nreqs = 0; 1226 nreqs = 0;
1227 nready = 0;
1228 npending = 0;
1062 1229
1063 close (respipe [0]); 1230 close (respipe [0]);
1064 close (respipe [1]); 1231 close (respipe [1]);
1065 create_pipe (); 1232 create_pipe ();
1066 1233
… …
1093PROTOTYPES: ENABLE 1260PROTOTYPES: ENABLE
1094 1261
1095BOOT: 1262BOOT:
1096{ 1263{
1097 HV *stash = gv_stashpv ("IO::AIO", 1); 1264 HV *stash = gv_stashpv ("IO::AIO", 1);
1265
1098 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1266 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1099 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1267 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1100 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1268 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1269 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1270 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1271 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1101 1272
1102 create_pipe (); 1273 create_pipe ();
1103 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1274 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1104} 1275}
1105 1276
1106void 1277void
1107min_parallel (nthreads) 1278max_poll_reqs (int nreqs)
1108 int nthreads
1109 PROTOTYPE: $ 1279 PROTOTYPE: $
1280 CODE:
1281 max_poll_reqs = nreqs;
1110 1282
1111void 1283void
1112max_parallel (nthreads) 1284max_poll_time (double nseconds)
1113 int nthreads
1114 PROTOTYPE: $ 1285 PROTOTYPE: $
1286 CODE:
1287 max_poll_time = nseconds * AIO_TICKS;
1288
1289void
1290min_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_parallel (int nthreads)
1295 PROTOTYPE: $
1296
1297void
1298max_idle (int nthreads)
1299 PROTOTYPE: $
1300 CODE:
1301 set_max_idle (nthreads);
1302
1303int
1304max_outstanding (int maxreqs)
1305 PROTOTYPE: $
1306 CODE:
1307 RETVAL = max_outstanding;
1308 max_outstanding = maxreqs;
1309 OUTPUT:
1310 RETVAL
1115 1311
1116void 1312void
1117aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1313aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1118 SV * pathname 1314 SV * pathname
1119 int flags 1315 int flags
… …
1123 PPCODE: 1319 PPCODE:
1124{ 1320{
1125 dREQ; 1321 dREQ;
1126 1322
1127 req->type = REQ_OPEN; 1323 req->type = REQ_OPEN;
1128 req->data = newSVsv (pathname); 1324 req->sv1 = newSVsv (pathname);
1129 req->dataptr = SvPVbyte_nolen (req->data); 1325 req->ptr1 = SvPVbyte_nolen (pathname);
1130 req->fd = flags; 1326 req->int1 = flags;
1131 req->mode = mode; 1327 req->mode = mode;
1132 1328
1133 REQ_SEND; 1329 REQ_SEND;
1134} 1330}
1135 1331
… …
1145 PPCODE: 1341 PPCODE:
1146{ 1342{
1147 dREQ; 1343 dREQ;
1148 1344
1149 req->type = ix; 1345 req->type = ix;
1150 req->fh = newSVsv (fh); 1346 req->fh = newSVsv (fh);
1151 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1347 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1152 1348
1153 REQ_SEND (req); 1349 REQ_SEND (req);
1154} 1350}
1155 1351
1156void 1352void
… …
1165 aio_read = REQ_READ 1361 aio_read = REQ_READ
1166 aio_write = REQ_WRITE 1362 aio_write = REQ_WRITE
1167 PROTOTYPE: $$$$$;$ 1363 PROTOTYPE: $$$$$;$
1168 PPCODE: 1364 PPCODE:
1169{ 1365{
1170 aio_req req;
1171 STRLEN svlen; 1366 STRLEN svlen;
1172 char *svptr = SvPVbyte (data, svlen); 1367 char *svptr = SvPVbyte (data, svlen);
1173 1368
1174 SvUPGRADE (data, SVt_PV); 1369 SvUPGRADE (data, SVt_PV);
1175 SvPOK_on (data); 1370 SvPOK_on (data);
… …
1197 1392
1198 { 1393 {
1199 dREQ; 1394 dREQ;
1200 1395
1201 req->type = ix; 1396 req->type = ix;
1202 req->fh = newSVsv (fh); 1397 req->fh = newSVsv (fh);
1203 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1398 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1204 : IoOFP (sv_2io (fh))); 1399 : IoOFP (sv_2io (fh)));
1205 req->offset = offset; 1400 req->offs = offset;
1206 req->length = length; 1401 req->size = length;
1207 req->data = SvREFCNT_inc (data); 1402 req->sv1 = SvREFCNT_inc (data);
1208 req->dataptr = (char *)svptr + dataoffset; 1403 req->ptr1 = (char *)svptr + dataoffset;
1404 req->stroffset = dataoffset;
1209 1405
1210 if (!SvREADONLY (data)) 1406 if (!SvREADONLY (data))
1211 { 1407 {
1212 SvREADONLY_on (data); 1408 SvREADONLY_on (data);
1213 req->data2ptr = (void *)data; 1409 req->flags |= FLAG_SV1_RO_OFF;
1214 } 1410 }
1215 1411
1216 REQ_SEND; 1412 REQ_SEND;
1217 } 1413 }
1414}
1415
1416void
1417aio_readlink (path,callback=&PL_sv_undef)
1418 SV * path
1419 SV * callback
1420 PROTOTYPE: $$;$
1421 PPCODE:
1422{
1423 SV *data;
1424 dREQ;
1425
1426 data = newSV (NAME_MAX);
1427 SvPOK_on (data);
1428
1429 req->type = REQ_READLINK;
1430 req->fh = newSVsv (path);
1431 req->ptr2 = SvPVbyte_nolen (path);
1432 req->sv1 = data;
1433 req->ptr1 = SvPVbyte_nolen (data);
1434
1435 REQ_SEND;
1218} 1436}
1219 1437
1220void 1438void
1221aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1439aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1222 SV * out_fh 1440 SV * out_fh
… …
1228 PPCODE: 1446 PPCODE:
1229{ 1447{
1230 dREQ; 1448 dREQ;
1231 1449
1232 req->type = REQ_SENDFILE; 1450 req->type = REQ_SENDFILE;
1233 req->fh = newSVsv (out_fh); 1451 req->fh = newSVsv (out_fh);
1234 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1452 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1235 req->fh2 = newSVsv (in_fh); 1453 req->sv2 = newSVsv (in_fh);
1236 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1454 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1237 req->offset = in_offset; 1455 req->offs = in_offset;
1238 req->length = length; 1456 req->size = length;
1239 1457
1240 REQ_SEND; 1458 REQ_SEND;
1241} 1459}
1242 1460
1243void 1461void
… …
1250 PPCODE: 1468 PPCODE:
1251{ 1469{
1252 dREQ; 1470 dREQ;
1253 1471
1254 req->type = REQ_READAHEAD; 1472 req->type = REQ_READAHEAD;
1255 req->fh = newSVsv (fh); 1473 req->fh = newSVsv (fh);
1256 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1474 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1257 req->offset = offset; 1475 req->offs = offset;
1258 req->length = length; 1476 req->size = length;
1259 1477
1260 REQ_SEND; 1478 REQ_SEND;
1261} 1479}
1262 1480
1263void 1481void
… …
1269 aio_lstat = REQ_LSTAT 1487 aio_lstat = REQ_LSTAT
1270 PPCODE: 1488 PPCODE:
1271{ 1489{
1272 dREQ; 1490 dREQ;
1273 1491
1274 New (0, req->statdata, 1, Stat_t); 1492 req->ptr2 = malloc (sizeof (Stat_t));
1275 if (!req->statdata) 1493 if (!req->ptr2)
1276 { 1494 {
1277 req_free (req); 1495 req_free (req);
1278 croak ("out of memory during aio_req->statdata allocation"); 1496 croak ("out of memory during aio_stat statdata allocation");
1279 } 1497 }
1498
1499 req->flags |= FLAG_PTR2_FREE;
1280 1500
1281 if (SvPOK (fh_or_path)) 1501 if (SvPOK (fh_or_path))
1282 { 1502 {
1283 req->type = ix; 1503 req->type = ix;
1284 req->data = newSVsv (fh_or_path); 1504 req->sv1 = newSVsv (fh_or_path);
1285 req->dataptr = SvPVbyte_nolen (req->data); 1505 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1286 } 1506 }
1287 else 1507 else
1288 { 1508 {
1289 req->type = REQ_FSTAT; 1509 req->type = REQ_FSTAT;
1290 req->fh = newSVsv (fh_or_path); 1510 req->fh = newSVsv (fh_or_path);
1291 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1511 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 } 1512 }
1293 1513
1294 REQ_SEND; 1514 REQ_SEND;
1295} 1515}
1296 1516
1297void 1517void
1298aio_unlink (pathname,callback=&PL_sv_undef) 1518aio_unlink (pathname,callback=&PL_sv_undef)
1299 SV * pathname 1519 SV * pathname
1300 SV * callback 1520 SV * callback
1301 ALIAS: 1521 ALIAS:
1302 aio_unlink = REQ_UNLINK 1522 aio_unlink = REQ_UNLINK
1303 aio_rmdir = REQ_RMDIR 1523 aio_rmdir = REQ_RMDIR
1304 aio_readdir = REQ_READDIR 1524 aio_readdir = REQ_READDIR
1305 PPCODE: 1525 PPCODE:
1306{ 1526{
1307 dREQ; 1527 dREQ;
1308 1528
1309 req->type = ix; 1529 req->type = ix;
1310 req->data = newSVsv (pathname); 1530 req->sv1 = newSVsv (pathname);
1311 req->dataptr = SvPVbyte_nolen (req->data); 1531 req->ptr1 = SvPVbyte_nolen (pathname);
1312 1532
1313 REQ_SEND; 1533 REQ_SEND;
1314} 1534}
1315 1535
1316void 1536void
1317aio_link (oldpath,newpath,callback=&PL_sv_undef) 1537aio_link (oldpath,newpath,callback=&PL_sv_undef)
1318 SV * oldpath 1538 SV * oldpath
1319 SV * newpath 1539 SV * newpath
1320 SV * callback 1540 SV * callback
1321 ALIAS: 1541 ALIAS:
1322 aio_link = REQ_LINK 1542 aio_link = REQ_LINK
1323 aio_symlink = REQ_SYMLINK 1543 aio_symlink = REQ_SYMLINK
1324 aio_rename = REQ_RENAME 1544 aio_rename = REQ_RENAME
1325 PPCODE: 1545 PPCODE:
1326{ 1546{
1327 dREQ; 1547 dREQ;
1328 1548
1329 req->type = ix; 1549 req->type = ix;
1330 req->fh = newSVsv (oldpath); 1550 req->fh = newSVsv (oldpath);
1331 req->data2ptr = SvPVbyte_nolen (req->fh); 1551 req->ptr2 = SvPVbyte_nolen (req->fh);
1332 req->data = newSVsv (newpath); 1552 req->sv1 = newSVsv (newpath);
1333 req->dataptr = SvPVbyte_nolen (req->data); 1553 req->ptr1 = SvPVbyte_nolen (newpath);
1334 1554
1335 REQ_SEND; 1555 REQ_SEND;
1336} 1556}
1337 1557
1338void 1558void
1559aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1560 SV * pathname
1561 SV * callback
1562 UV mode
1563 UV dev
1564 PPCODE:
1565{
1566 dREQ;
1567
1568 req->type = REQ_MKNOD;
1569 req->sv1 = newSVsv (pathname);
1570 req->ptr1 = SvPVbyte_nolen (pathname);
1571 req->mode = (mode_t)mode;
1572 req->offs = dev;
1573
1574 REQ_SEND;
1575}
1576
1577void
1339aio_busy (delay,callback=&PL_sv_undef) 1578aio_busy (delay,callback=&PL_sv_undef)
1340 double delay 1579 double delay
1341 SV * callback 1580 SV * callback
1342 PPCODE: 1581 PPCODE:
1343{ 1582{
1344 dREQ; 1583 dREQ;
1345 1584
1346 req->type = REQ_BUSY; 1585 req->type = REQ_BUSY;
1347 req->fd = delay < 0. ? 0 : delay; 1586 req->int1 = delay < 0. ? 0 : delay;
1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1587 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1349 1588
1350 REQ_SEND; 1589 REQ_SEND;
1351} 1590}
1352 1591
1353void 1592void
… …
1357 PPCODE: 1596 PPCODE:
1358{ 1597{
1359 dREQ; 1598 dREQ;
1360 1599
1361 req->type = REQ_GROUP; 1600 req->type = REQ_GROUP;
1601
1362 req_send (req); 1602 req_send (req);
1363
1364 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1603 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1365} 1604}
1366 1605
1367void 1606void
1368aio_nop (callback=&PL_sv_undef) 1607aio_nop (callback=&PL_sv_undef)
1369 SV * callback 1608 SV * callback
1370 PPCODE: 1609 PPCODE:
1371{ 1610{
1372 dREQ; 1611 dREQ;
1373 1612
1374 req->type = REQ_NOP; 1613 req->type = REQ_NOP;
1375 1614
1376 REQ_SEND; 1615 REQ_SEND;
1377} 1616}
1378 1617
1379void 1618int
1380aioreq_pri (int pri = DEFAULT_PRI) 1619aioreq_pri (int pri = 0)
1381 CODE: 1620 PROTOTYPE: ;$
1621 CODE:
1622 RETVAL = next_pri - PRI_BIAS;
1623 if (items > 0)
1624 {
1382 if (pri < PRI_MIN) pri = PRI_MIN; 1625 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX; 1626 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS; 1627 next_pri = pri + PRI_BIAS;
1628 }
1629 OUTPUT:
1630 RETVAL
1385 1631
1386void 1632void
1387aioreq_nice (int nice = 0) 1633aioreq_nice (int nice = 0)
1388 CODE: 1634 CODE:
1389 nice = next_pri - nice; 1635 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN; 1636 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX; 1637 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS; 1638 next_pri = nice + PRI_BIAS;
1393 1639
1394void 1640void
1395flush () 1641flush ()
1396 PROTOTYPE: 1642 PROTOTYPE:
1397 CODE: 1643 CODE:
… …
1421 1667
1422int 1668int
1423poll_cb(...) 1669poll_cb(...)
1424 PROTOTYPE: 1670 PROTOTYPE:
1425 CODE: 1671 CODE:
1426 RETVAL = poll_cb (0); 1672 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: 1673 OUTPUT:
1436 RETVAL 1674 RETVAL
1437 1675
1438void 1676void
1439poll_wait() 1677poll_wait()
… …
1448 CODE: 1686 CODE:
1449 RETVAL = nreqs; 1687 RETVAL = nreqs;
1450 OUTPUT: 1688 OUTPUT:
1451 RETVAL 1689 RETVAL
1452 1690
1691int
1692nready()
1693 PROTOTYPE:
1694 CODE:
1695 RETVAL = get_nready ();
1696 OUTPUT:
1697 RETVAL
1698
1699int
1700npending()
1701 PROTOTYPE:
1702 CODE:
1703 RETVAL = get_npending ();
1704 OUTPUT:
1705 RETVAL
1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1453PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1454 1718
1455MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1456 1720
1457void 1721void
… …
1472 PPCODE: 1736 PPCODE:
1473{ 1737{
1474 int i; 1738 int i;
1475 aio_req req; 1739 aio_req req;
1476 1740
1477 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1478 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1479 1743
1480 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1481 { 1745 {
1482 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
… …
1484 1748
1485 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1486 1750
1487 if (req) 1751 if (req)
1488 { 1752 {
1489 ++grp->length; 1753 ++grp->size;
1490 req->grp = grp; 1754 req->grp = grp;
1491 1755
1492 req->grp_prev = 0; 1756 req->grp_prev = 0;
1493 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1494 1758
… …
1508void 1772void
1509result (aio_req grp, ...) 1773result (aio_req grp, ...)
1510 CODE: 1774 CODE:
1511{ 1775{
1512 int i; 1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1513 AV *av = newAV (); 1781 av = newAV ();
1514 1782
1515 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1516 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1517 1785
1518 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1519 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1520} 1788}
1789
1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1521 1794
1522void 1795void
1523limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1524 CODE: 1797 CODE:
1525 grp->fd2 = limit; 1798 grp->int2 = limit;
1526 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1527 1800
1528void 1801void
1529feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1530 CODE: 1803 CODE:
1531{ 1804{
1532 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1533 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1534 1807
1535 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1536 grp->fd2 = 2; 1809 grp->int2 = 2;
1537 1810
1538 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1539} 1812}
1540 1813

Diff Legend

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