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.90 by root, Tue Oct 31 00:32:19 2006 UTC

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

Diff Legend

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