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.78 by root, Thu Oct 26 14:35:34 2006 UTC vs.
Revision 1.92 by root, Wed Nov 8 01:59:59 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
… …
61# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
62#else 65#else
63# define STACKSIZE 16384 66# define STACKSIZE 16384
64#endif 67#endif
65 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
79#endif
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
69#define dBUF \ 84#define dBUF \
70 char *aio_buf; \ 85 char *aio_buf; \
71 LOCK (wrklock); \ 86 LOCK (wrklock); \
72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
74 if (!aio_buf) \ 89 if (!aio_buf) \
75 return -1; 90 return -1;
91
92typedef SV SV8; /* byte-sv, used for argument-checking */
76 93
77enum { 94enum {
78 REQ_QUIT, 95 REQ_QUIT,
79 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
80 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
81 REQ_SENDFILE, 98 REQ_SENDFILE,
82 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
83 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
85 REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
86 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
87 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
88 REQ_BUSY, 105 REQ_BUSY,
89}; 106};
90 107
91#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
93 110
94typedef struct aio_cb 111typedef struct aio_cb
95{ 112{
96 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
97 114
98 SV *data, *callback; 115 SV *callback, *fh;
99 SV *fh, *fh2; 116 SV *sv1, *sv2;
100 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
101 Stat_t *statdata;
102 off_t offset; 118 off_t offs;
103 size_t length; 119 size_t size;
104 ssize_t result; 120 ssize_t result;
105 121
106 STRLEN dataoffset; 122 STRLEN stroffset;
107 int type; 123 int type;
108 int fd, fd2; 124 int int1, int2;
109 int errorno; 125 int errorno;
110 mode_t mode; /* open */ 126 mode_t mode; /* open */
111 127
112 unsigned char flags; 128 unsigned char flags;
113 unsigned char pri; 129 unsigned char pri;
… …
115 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
116 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
117} aio_cb; 133} aio_cb;
118 134
119enum { 135enum {
120 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) */
121}; 139};
122 140
123typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
124typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
125 143
… …
130 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
131 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
133}; 151};
134 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
135static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
136 166
137static unsigned int started, wanted; 167static unsigned int started, idle, wanted;
138static volatile unsigned int nreqs;
139static volatile unsigned int max_outstanding = 0xffffffff;
140static int respipe [2];
141 168
142#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
143# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
144#else 171#else
145# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
186 wrk->prev->next = wrk->next; 213 wrk->prev->next = wrk->next;
187 214
188 free (wrk); 215 free (wrk);
189} 216}
190 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
191static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
192static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
193static 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
194 269
195/* 270/*
196 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
197 * with 8 priorities this actually needs <20 insns 272 * with 8 priorities this actually needs <20 insns
198 * per shift, the most expensive operation. 273 * per shift, the most expensive operation.
… …
244 } 319 }
245 320
246 abort (); 321 abort ();
247} 322}
248 323
249static int poll_cb (int max); 324static int poll_cb ();
250static void req_invoke (aio_req req); 325static void req_invoke (aio_req req);
251static void req_free (aio_req req); 326static void req_free (aio_req req);
252static void req_cancel (aio_req req); 327static void req_cancel (aio_req req);
253 328
254/* must be called at most once */ 329/* must be called at most once */
… …
275 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
276} 351}
277 352
278static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
279{ 354{
280 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
281 { 356 {
282 int old_len = grp->length; 357 int old_len = grp->size;
283 358
284 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
285 { 360 {
286 dSP; 361 dSP;
287 362
288 ENTER; 363 ENTER;
289 SAVETMPS; 364 SAVETMPS;
290 PUSHMARK (SP); 365 PUSHMARK (SP);
291 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
292 PUTBACK; 367 PUTBACK;
293 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
294 SPAGAIN; 369 SPAGAIN;
295 FREETMPS; 370 FREETMPS;
296 LEAVE; 371 LEAVE;
297 } 372 }
298 373
299 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
300 if (old_len == grp->length) 375 if (old_len == grp->size)
301 { 376 {
302 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
303 grp->fh2 = 0; 378 grp->sv2 = 0;
304 break; 379 break;
305 } 380 }
306 } 381 }
307} 382}
308 383
309static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
310{ 385{
311 --grp->length; 386 --grp->size;
312 387
313 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
314 aio_grp_feed (grp); 389 aio_grp_feed (grp);
315 390
316 /* finish, if done */ 391 /* finish, if done */
317 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
318 { 393 {
319 req_invoke (grp); 394 req_invoke (grp);
320 req_free (grp); 395 req_free (grp);
321 } 396 }
322} 397}
323 398
324static void poll_wait ()
325{
326 fd_set rfd;
327
328 while (nreqs)
329 {
330 int size;
331#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
332 LOCK (reslock);
333#endif
334 size = res_queue.size;
335#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
336 UNLOCK (reslock);
337#endif
338
339 if (size)
340 return;
341
342 FD_ZERO(&rfd);
343 FD_SET(respipe [0], &rfd);
344
345 select (respipe [0] + 1, &rfd, 0, 0, 0);
346 }
347}
348
349static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
350{ 400{
351 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
352 405
353 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
354 { 407 {
355 errno = req->errorno;
356
357 ENTER; 408 ENTER;
358 SAVETMPS; 409 SAVETMPS;
359 PUSHMARK (SP); 410 PUSHMARK (SP);
360 EXTEND (SP, 1); 411 EXTEND (SP, 1);
361 412
… …
366 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
367 418
368 if (req->result >= 0) 419 if (req->result >= 0)
369 { 420 {
370 int i; 421 int i;
371 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
372 AV *av = newAV (); 423 AV *av = newAV ();
373 424
374 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
375 426
376 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
404 XPUSHs (sv_2mortal (fh)); 455 XPUSHs (sv_2mortal (fh));
405 } 456 }
406 break; 457 break;
407 458
408 case REQ_GROUP: 459 case REQ_GROUP:
409 req->fd = 2; /* mark group as finished */ 460 req->int1 = 2; /* mark group as finished */
410 461
411 if (req->data) 462 if (req->sv1)
412 { 463 {
413 int i; 464 int i;
414 AV *av = (AV *)req->data; 465 AV *av = (AV *)req->sv1;
415 466
416 EXTEND (SP, AvFILL (av) + 1); 467 EXTEND (SP, AvFILL (av) + 1);
417 for (i = 0; i <= AvFILL (av); ++i) 468 for (i = 0; i <= AvFILL (av); ++i)
418 PUSHs (*av_fetch (av, i, 0)); 469 PUSHs (*av_fetch (av, i, 0));
419 } 470 }
… …
421 472
422 case REQ_NOP: 473 case REQ_NOP:
423 case REQ_BUSY: 474 case REQ_BUSY:
424 break; 475 break;
425 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
426 default: 501 default:
427 PUSHs (sv_2mortal (newSViv (req->result))); 502 PUSHs (sv_2mortal (newSViv (req->result)));
428 break; 503 break;
429 } 504 }
430 505
506 errno = req->errorno;
431 507
432 PUTBACK; 508 PUTBACK;
433 call_sv (req->callback, G_VOID | G_EVAL); 509 call_sv (req->callback, G_VOID | G_EVAL);
434 SPAGAIN; 510 SPAGAIN;
435 511
… …
464 { 540 {
465 sv_unmagic (req->self, PERL_MAGIC_ext); 541 sv_unmagic (req->self, PERL_MAGIC_ext);
466 SvREFCNT_dec (req->self); 542 SvREFCNT_dec (req->self);
467 } 543 }
468 544
469 SvREFCNT_dec (req->data);
470 SvREFCNT_dec (req->fh); 545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1);
471 SvREFCNT_dec (req->fh2); 547 SvREFCNT_dec (req->sv2);
472 SvREFCNT_dec (req->callback); 548 SvREFCNT_dec (req->callback);
473 Safefree (req->statdata);
474 549
475 if (req->type == REQ_READDIR) 550 if (req->flags & FLAG_PTR2_FREE)
476 free (req->data2ptr); 551 free (req->ptr2);
477 552
478 Safefree (req); 553 Safefree (req);
479} 554}
480 555
481static void req_cancel_subs (aio_req grp) 556static void req_cancel_subs (aio_req grp)
… …
483 aio_req sub; 558 aio_req sub;
484 559
485 if (grp->type != REQ_GROUP) 560 if (grp->type != REQ_GROUP)
486 return; 561 return;
487 562
488 SvREFCNT_dec (grp->fh2); 563 SvREFCNT_dec (grp->sv2);
489 grp->fh2 = 0; 564 grp->sv2 = 0;
490 565
491 for (sub = grp->grp_first; sub; sub = sub->grp_next) 566 for (sub = grp->grp_first; sub; sub = sub->grp_next)
492 req_cancel (sub); 567 req_cancel (sub);
493} 568}
494 569
495static void req_cancel (aio_req req) 570static void req_cancel (aio_req req)
496{ 571{
497 req->flags |= FLAG_CANCELLED; 572 req->flags |= FLAG_CANCELLED;
498 573
499 req_cancel_subs (req); 574 req_cancel_subs (req);
500}
501
502static int poll_cb (int max)
503{
504 dSP;
505 int count = 0;
506 int do_croak = 0;
507 aio_req req;
508
509 for (;;)
510 {
511 while (max <= 0 || count < max)
512 {
513 LOCK (reslock);
514 req = reqq_shift (&res_queue);
515
516 if (req)
517 {
518 if (!res_queue.size)
519 {
520 /* read any signals sent by the worker threads */
521 char buf [32];
522 while (read (respipe [0], buf, 32) == 32)
523 ;
524 }
525 }
526
527 UNLOCK (reslock);
528
529 if (!req)
530 break;
531
532 --nreqs;
533
534 if (req->type == REQ_QUIT)
535 --started;
536 else if (req->type == REQ_GROUP && req->length)
537 {
538 req->fd = 1; /* mark request as delayed */
539 continue;
540 }
541 else
542 {
543 if (req->type == REQ_READ)
544 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
545
546 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
547 SvREADONLY_off (req->data);
548
549 if (req->statdata)
550 {
551 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
552 PL_laststatval = req->result;
553 PL_statcache = *(req->statdata);
554 }
555
556 req_invoke (req);
557
558 count++;
559 }
560
561 req_free (req);
562 }
563
564 if (nreqs <= max_outstanding)
565 break;
566
567 poll_wait ();
568
569 max = 0;
570 }
571
572 return count;
573} 575}
574 576
575static void *aio_proc(void *arg); 577static void *aio_proc(void *arg);
576 578
577static void start_thread (void) 579static void start_thread (void)
… …
585 croak ("unable to allocate worker thread data"); 587 croak ("unable to allocate worker thread data");
586 588
587 pthread_attr_init (&attr); 589 pthread_attr_init (&attr);
588 pthread_attr_setstacksize (&attr, STACKSIZE); 590 pthread_attr_setstacksize (&attr, STACKSIZE);
589 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
590 595
591 sigfillset (&fullsigset); 596 sigfillset (&fullsigset);
592 597
593 LOCK (wrklock); 598 LOCK (wrklock);
594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 599 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
606 611
607 sigprocmask (SIG_SETMASK, &oldsigset, 0); 612 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock); 613 UNLOCK (wrklock);
609} 614}
610 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
611static void req_send (aio_req req) 628static void req_send (aio_req req)
612{ 629{
613 while (started < wanted && nreqs >= started)
614 start_thread ();
615
616 ++nreqs; 630 ++nreqs;
631
632 LOCK (reqlock);
633 ++nready;
634 reqq_push (&req_queue, req);
635 pthread_cond_signal (&reqwait);
636 UNLOCK (reqlock);
637
638 maybe_start_thread ();
639}
640
641static void end_thread (void)
642{
643 aio_req req;
644
645 Newz (0, req, 1, aio_cb);
646
647 req->type = REQ_QUIT;
648 req->pri = PRI_MAX + PRI_BIAS;
617 649
618 LOCK (reqlock); 650 LOCK (reqlock);
619 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
620 pthread_cond_signal (&reqwait); 652 pthread_cond_signal (&reqwait);
621 UNLOCK (reqlock); 653 UNLOCK (reqlock);
622}
623 654
624static void end_thread (void) 655 LOCK (wrklock);
625{ 656 --started;
626 aio_req req; 657 UNLOCK (wrklock);
658}
627 659
628 Newz (0, req, 1, aio_cb); 660static void set_max_idle (int nthreads)
629 661{
630 req->type = REQ_QUIT; 662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
631 req->pri = PRI_MAX + PRI_BIAS; 663 max_idle = nthreads <= 0 ? 1 : nthreads;
632 664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
633 req_send (req);
634} 665}
635 666
636static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
637{ 668{
638 if (wanted < nthreads) 669 if (wanted < nthreads)
639 wanted = nthreads; 670 wanted = nthreads;
640} 671}
641 672
642static void max_parallel (int nthreads) 673static void max_parallel (int nthreads)
643{ 674{
644 int cur = started;
645
646 if (wanted > nthreads) 675 if (wanted > nthreads)
647 wanted = nthreads; 676 wanted = nthreads;
648 677
649 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)
650 { 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
651 end_thread (); 696 maybe_start_thread ();
652 cur--; 697
698 FD_ZERO(&rfd);
699 FD_SET(respipe [0], &rfd);
700
701 select (respipe [0] + 1, &rfd, 0, 0, 0);
653 } 702 }
703}
654 704
655 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 (;;)
656 { 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
657 poll_wait (); 775 poll_wait ();
658 poll_cb (0); 776
777 ++maxreqs;
659 } 778 }
779
780 return count;
660} 781}
661 782
662static void create_pipe () 783static void create_pipe ()
663{ 784{
664 if (pipe (respipe)) 785 if (pipe (respipe))
… …
879 int memofs = 0; 1000 int memofs = 0;
880 int res = 0; 1001 int res = 0;
881 int errorno; 1002 int errorno;
882 1003
883 LOCK (wrklock); 1004 LOCK (wrklock);
884 self->dirp = dirp = opendir (req->dataptr); 1005 self->dirp = dirp = opendir (req->ptr1);
885 self->dbuf = u = malloc (sizeof (*u)); 1006 self->dbuf = u = malloc (sizeof (*u));
1007 req->flags |= FLAG_PTR2_FREE;
886 req->data2ptr = names = malloc (memlen); 1008 req->ptr2 = names = malloc (memlen);
887 UNLOCK (wrklock); 1009 UNLOCK (wrklock);
888 1010
889 if (dirp && u && names) 1011 if (dirp && u && names)
890 for (;;) 1012 for (;;)
891 { 1013 {
… …
905 1027
906 while (memofs + len > memlen) 1028 while (memofs + len > memlen)
907 { 1029 {
908 memlen *= 2; 1030 memlen *= 2;
909 LOCK (wrklock); 1031 LOCK (wrklock);
910 req->data2ptr = names = realloc (names, memlen); 1032 req->ptr2 = names = realloc (names, memlen);
911 UNLOCK (wrklock); 1033 UNLOCK (wrklock);
912 1034
913 if (!names) 1035 if (!names)
914 break; 1036 break;
915 } 1037 }
… …
928/*****************************************************************************/ 1050/*****************************************************************************/
929 1051
930static void *aio_proc (void *thr_arg) 1052static void *aio_proc (void *thr_arg)
931{ 1053{
932 aio_req req; 1054 aio_req req;
933 int type; 1055 struct timespec ts;
934 worker *self = (worker *)thr_arg; 1056 worker *self = (worker *)thr_arg;
935 1057
936 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 (;;)
937 { 1063 {
1064 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1065
938 LOCK (reqlock); 1066 LOCK (reqlock);
939 1067
940 for (;;) 1068 for (;;)
941 { 1069 {
942 self->req = req = reqq_shift (&req_queue); 1070 self->req = req = reqq_shift (&req_queue);
943 1071
944 if (req) 1072 if (req)
945 break; 1073 break;
946 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 */
947 pthread_cond_wait (&reqwait, &reqlock); 1091 pthread_cond_wait (&reqwait, &reqlock);
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 }
1094
1095 --idle;
948 } 1096 }
1097
1098 --nready;
949 1099
950 UNLOCK (reqlock); 1100 UNLOCK (reqlock);
951 1101
952 errno = 0; /* strictly unnecessary */ 1102 errno = 0; /* strictly unnecessary */
953 type = req->type; /* remember type for QUIT check */
954 1103
955 if (!(req->flags & FLAG_CANCELLED)) 1104 if (!(req->flags & FLAG_CANCELLED))
956 switch (type) 1105 switch (req->type)
957 { 1106 {
958 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;
959 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;
960 1109
961 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;
962 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;
963 1112
964 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;
965 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;
966 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;
967 1116
968 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;
969 case REQ_CLOSE: req->result = close (req->fd); break; 1118 case REQ_CLOSE: req->result = close (req->int1); break;
970 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
971 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
972 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
973 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
974 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;
975 1126
976 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
977 case REQ_FSYNC: req->result = fsync (req->fd); break; 1128 case REQ_FSYNC: req->result = fsync (req->int1); break;
978 case REQ_READDIR: scandir_ (req, self); break; 1129 case REQ_READDIR: scandir_ (req, self); break;
979 1130
980 case REQ_BUSY: 1131 case REQ_BUSY:
981 { 1132 {
982 struct timeval tv; 1133 struct timeval tv;
983 1134
984 tv.tv_sec = req->fd; 1135 tv.tv_sec = req->int1;
985 tv.tv_usec = req->fd2; 1136 tv.tv_usec = req->int2;
986 1137
987 req->result = select (0, 0, 0, 0, &tv); 1138 req->result = select (0, 0, 0, 0, &tv);
988 } 1139 }
989 1140
990 case REQ_GROUP: 1141 case REQ_GROUP:
991 case REQ_NOP: 1142 case REQ_NOP:
1143 break;
1144
992 case REQ_QUIT: 1145 case REQ_QUIT:
993 break; 1146 goto quit;
994 1147
995 default: 1148 default:
996 req->result = ENOSYS; 1149 req->result = ENOSYS;
997 break; 1150 break;
998 } 1151 }
999 1152
1000 req->errorno = errno; 1153 req->errorno = errno;
1001 1154
1002 LOCK (reslock); 1155 LOCK (reslock);
1003 1156
1157 ++npending;
1158
1004 if (!reqq_push (&res_queue, req)) 1159 if (!reqq_push (&res_queue, req))
1005 /* write a dummy byte to the pipe so fh becomes ready */ 1160 /* write a dummy byte to the pipe so fh becomes ready */
1006 write (respipe [1], &respipe, 1); 1161 write (respipe [1], &respipe, 1);
1007 1162
1008 self->req = 0; 1163 self->req = 0;
1009 worker_clear (self); 1164 worker_clear (self);
1010 1165
1011 UNLOCK (reslock); 1166 UNLOCK (reslock);
1012 } 1167 }
1013 while (type != REQ_QUIT);
1014 1168
1169quit:
1015 LOCK (wrklock); 1170 LOCK (wrklock);
1016 worker_free (self); 1171 worker_free (self);
1017 UNLOCK (wrklock); 1172 UNLOCK (wrklock);
1018 1173
1019 return 0; 1174 return 0;
… …
1066 1221
1067 worker_clear (wrk); 1222 worker_clear (wrk);
1068 worker_free (wrk); 1223 worker_free (wrk);
1069 } 1224 }
1070 1225
1071 started = 0; 1226 started = 0;
1227 idle = 0;
1072 nreqs = 0; 1228 nreqs = 0;
1229 nready = 0;
1230 npending = 0;
1073 1231
1074 close (respipe [0]); 1232 close (respipe [0]);
1075 close (respipe [1]); 1233 close (respipe [1]);
1076 create_pipe (); 1234 create_pipe ();
1077 1235
… …
1104PROTOTYPES: ENABLE 1262PROTOTYPES: ENABLE
1105 1263
1106BOOT: 1264BOOT:
1107{ 1265{
1108 HV *stash = gv_stashpv ("IO::AIO", 1); 1266 HV *stash = gv_stashpv ("IO::AIO", 1);
1267
1109 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1268 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1110 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1269 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1111 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));
1112 1274
1113 create_pipe (); 1275 create_pipe ();
1114 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1115} 1277}
1116 1278
1117void 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
1118min_parallel (int nthreads) 1292min_parallel (int nthreads)
1119 PROTOTYPE: $ 1293 PROTOTYPE: $
1120 1294
1121void 1295void
1122max_parallel (int nthreads) 1296max_parallel (int nthreads)
1123 PROTOTYPE: $ 1297 PROTOTYPE: $
1298
1299void
1300max_idle (int nthreads)
1301 PROTOTYPE: $
1302 CODE:
1303 set_max_idle (nthreads);
1124 1304
1125int 1305int
1126max_outstanding (int maxreqs) 1306max_outstanding (int maxreqs)
1127 PROTOTYPE: $ 1307 PROTOTYPE: $
1128 CODE: 1308 CODE:
… …
1131 OUTPUT: 1311 OUTPUT:
1132 RETVAL 1312 RETVAL
1133 1313
1134void 1314void
1135aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1315aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1136 SV * pathname 1316 SV8 * pathname
1137 int flags 1317 int flags
1138 int mode 1318 int mode
1139 SV * callback 1319 SV * callback
1140 PROTOTYPE: $$$;$ 1320 PROTOTYPE: $$$;$
1141 PPCODE: 1321 PPCODE:
1142{ 1322{
1143 dREQ; 1323 dREQ;
1144 1324
1145 req->type = REQ_OPEN; 1325 req->type = REQ_OPEN;
1146 req->data = newSVsv (pathname); 1326 req->sv1 = newSVsv (pathname);
1147 req->dataptr = SvPVbyte_nolen (req->data); 1327 req->ptr1 = SvPVbyte_nolen (req->sv1);
1148 req->fd = flags; 1328 req->int1 = flags;
1149 req->mode = mode; 1329 req->mode = mode;
1150 1330
1151 REQ_SEND; 1331 REQ_SEND;
1152} 1332}
1153 1333
… …
1163 PPCODE: 1343 PPCODE:
1164{ 1344{
1165 dREQ; 1345 dREQ;
1166 1346
1167 req->type = ix; 1347 req->type = ix;
1168 req->fh = newSVsv (fh); 1348 req->fh = newSVsv (fh);
1169 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1170 1350
1171 REQ_SEND (req); 1351 REQ_SEND (req);
1172} 1352}
1173 1353
1174void 1354void
1175aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1176 SV * fh 1356 SV * fh
1177 UV offset 1357 UV offset
1178 UV length 1358 UV length
1179 SV * data 1359 SV8 * data
1180 UV dataoffset 1360 UV dataoffset
1181 SV * callback 1361 SV * callback
1182 ALIAS: 1362 ALIAS:
1183 aio_read = REQ_READ 1363 aio_read = REQ_READ
1184 aio_write = REQ_WRITE 1364 aio_write = REQ_WRITE
1185 PROTOTYPE: $$$$$;$ 1365 PROTOTYPE: $$$$$;$
1186 PPCODE: 1366 PPCODE:
1187{ 1367{
1188 aio_req req;
1189 STRLEN svlen; 1368 STRLEN svlen;
1190 char *svptr = SvPVbyte (data, svlen); 1369 char *svptr = SvPVbyte (data, svlen);
1191 1370
1192 SvUPGRADE (data, SVt_PV); 1371 SvUPGRADE (data, SVt_PV);
1193 SvPOK_on (data); 1372 SvPOK_on (data);
… …
1215 1394
1216 { 1395 {
1217 dREQ; 1396 dREQ;
1218 1397
1219 req->type = ix; 1398 req->type = ix;
1220 req->fh = newSVsv (fh); 1399 req->fh = newSVsv (fh);
1221 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1222 : IoOFP (sv_2io (fh))); 1401 : IoOFP (sv_2io (fh)));
1223 req->offset = offset; 1402 req->offs = offset;
1224 req->length = length; 1403 req->size = length;
1225 req->data = SvREFCNT_inc (data); 1404 req->sv1 = SvREFCNT_inc (data);
1226 req->dataptr = (char *)svptr + dataoffset; 1405 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset;
1227 1407
1228 if (!SvREADONLY (data)) 1408 if (!SvREADONLY (data))
1229 { 1409 {
1230 SvREADONLY_on (data); 1410 SvREADONLY_on (data);
1231 req->data2ptr = (void *)data; 1411 req->flags |= FLAG_SV1_RO_OFF;
1232 } 1412 }
1233 1413
1234 REQ_SEND; 1414 REQ_SEND;
1235 } 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;
1236} 1438}
1237 1439
1238void 1440void
1239aio_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)
1240 SV * out_fh 1442 SV * out_fh
… …
1246 PPCODE: 1448 PPCODE:
1247{ 1449{
1248 dREQ; 1450 dREQ;
1249 1451
1250 req->type = REQ_SENDFILE; 1452 req->type = REQ_SENDFILE;
1251 req->fh = newSVsv (out_fh); 1453 req->fh = newSVsv (out_fh);
1252 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1253 req->fh2 = newSVsv (in_fh); 1455 req->sv2 = newSVsv (in_fh);
1254 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1255 req->offset = in_offset; 1457 req->offs = in_offset;
1256 req->length = length; 1458 req->size = length;
1257 1459
1258 REQ_SEND; 1460 REQ_SEND;
1259} 1461}
1260 1462
1261void 1463void
… …
1268 PPCODE: 1470 PPCODE:
1269{ 1471{
1270 dREQ; 1472 dREQ;
1271 1473
1272 req->type = REQ_READAHEAD; 1474 req->type = REQ_READAHEAD;
1273 req->fh = newSVsv (fh); 1475 req->fh = newSVsv (fh);
1274 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1275 req->offset = offset; 1477 req->offs = offset;
1276 req->length = length; 1478 req->size = length;
1277 1479
1278 REQ_SEND; 1480 REQ_SEND;
1279} 1481}
1280 1482
1281void 1483void
1282aio_stat (fh_or_path,callback=&PL_sv_undef) 1484aio_stat (fh_or_path,callback=&PL_sv_undef)
1283 SV * fh_or_path 1485 SV8 * fh_or_path
1284 SV * callback 1486 SV * callback
1285 ALIAS: 1487 ALIAS:
1286 aio_stat = REQ_STAT 1488 aio_stat = REQ_STAT
1287 aio_lstat = REQ_LSTAT 1489 aio_lstat = REQ_LSTAT
1288 PPCODE: 1490 PPCODE:
1289{ 1491{
1290 dREQ; 1492 dREQ;
1291 1493
1292 New (0, req->statdata, 1, Stat_t); 1494 req->ptr2 = malloc (sizeof (Stat_t));
1293 if (!req->statdata) 1495 if (!req->ptr2)
1294 { 1496 {
1295 req_free (req); 1497 req_free (req);
1296 croak ("out of memory during aio_req->statdata allocation"); 1498 croak ("out of memory during aio_stat statdata allocation");
1297 } 1499 }
1500
1501 req->flags |= FLAG_PTR2_FREE;
1298 1502
1299 if (SvPOK (fh_or_path)) 1503 if (SvPOK (fh_or_path))
1300 { 1504 {
1301 req->type = ix; 1505 req->type = ix;
1302 req->data = newSVsv (fh_or_path); 1506 req->sv1 = newSVsv (fh_or_path);
1303 req->dataptr = SvPVbyte_nolen (req->data); 1507 req->ptr1 = SvPVbyte_nolen (req->sv1);
1304 } 1508 }
1305 else 1509 else
1306 { 1510 {
1307 req->type = REQ_FSTAT; 1511 req->type = REQ_FSTAT;
1308 req->fh = newSVsv (fh_or_path); 1512 req->fh = newSVsv (fh_or_path);
1309 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1310 } 1514 }
1311 1515
1312 REQ_SEND; 1516 REQ_SEND;
1313} 1517}
1314 1518
1315void 1519void
1316aio_unlink (pathname,callback=&PL_sv_undef) 1520aio_unlink (pathname,callback=&PL_sv_undef)
1317 SV * pathname 1521 SV8 * pathname
1318 SV * callback 1522 SV * callback
1319 ALIAS: 1523 ALIAS:
1320 aio_unlink = REQ_UNLINK 1524 aio_unlink = REQ_UNLINK
1321 aio_rmdir = REQ_RMDIR 1525 aio_rmdir = REQ_RMDIR
1322 aio_readdir = REQ_READDIR 1526 aio_readdir = REQ_READDIR
1323 PPCODE: 1527 PPCODE:
1324{ 1528{
1325 dREQ; 1529 dREQ;
1326 1530
1327 req->type = ix; 1531 req->type = ix;
1328 req->data = newSVsv (pathname); 1532 req->sv1 = newSVsv (pathname);
1329 req->dataptr = SvPVbyte_nolen (req->data); 1533 req->ptr1 = SvPVbyte_nolen (req->sv1);
1330 1534
1331 REQ_SEND; 1535 REQ_SEND;
1332} 1536}
1333 1537
1334void 1538void
1335aio_link (oldpath,newpath,callback=&PL_sv_undef) 1539aio_link (oldpath,newpath,callback=&PL_sv_undef)
1336 SV * oldpath 1540 SV8 * oldpath
1337 SV * newpath 1541 SV8 * newpath
1338 SV * callback 1542 SV * callback
1339 ALIAS: 1543 ALIAS:
1340 aio_link = REQ_LINK 1544 aio_link = REQ_LINK
1341 aio_symlink = REQ_SYMLINK 1545 aio_symlink = REQ_SYMLINK
1342 aio_rename = REQ_RENAME 1546 aio_rename = REQ_RENAME
1343 PPCODE: 1547 PPCODE:
1344{ 1548{
1345 dREQ; 1549 dREQ;
1346 1550
1347 req->type = ix; 1551 req->type = ix;
1348 req->fh = newSVsv (oldpath); 1552 req->fh = newSVsv (oldpath);
1349 req->data2ptr = SvPVbyte_nolen (req->fh); 1553 req->ptr2 = SvPVbyte_nolen (req->fh);
1350 req->data = newSVsv (newpath); 1554 req->sv1 = newSVsv (newpath);
1351 req->dataptr = SvPVbyte_nolen (req->data); 1555 req->ptr1 = SvPVbyte_nolen (req->sv1);
1352 1556
1353 REQ_SEND; 1557 REQ_SEND;
1354} 1558}
1355 1559
1356void 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
1357aio_busy (delay,callback=&PL_sv_undef) 1580aio_busy (delay,callback=&PL_sv_undef)
1358 double delay 1581 double delay
1359 SV * callback 1582 SV * callback
1360 PPCODE: 1583 PPCODE:
1361{ 1584{
1362 dREQ; 1585 dREQ;
1363 1586
1364 req->type = REQ_BUSY; 1587 req->type = REQ_BUSY;
1365 req->fd = delay < 0. ? 0 : delay; 1588 req->int1 = delay < 0. ? 0 : delay;
1366 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1367 1590
1368 REQ_SEND; 1591 REQ_SEND;
1369} 1592}
1370 1593
1371void 1594void
… …
1375 PPCODE: 1598 PPCODE:
1376{ 1599{
1377 dREQ; 1600 dREQ;
1378 1601
1379 req->type = REQ_GROUP; 1602 req->type = REQ_GROUP;
1603
1380 req_send (req); 1604 req_send (req);
1381
1382 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1605 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1383} 1606}
1384 1607
1385void 1608void
1386aio_nop (callback=&PL_sv_undef) 1609aio_nop (callback=&PL_sv_undef)
1387 SV * callback 1610 SV * callback
1388 PPCODE: 1611 PPCODE:
1389{ 1612{
1390 dREQ; 1613 dREQ;
1391 1614
1392 req->type = REQ_NOP; 1615 req->type = REQ_NOP;
1393 1616
1394 REQ_SEND; 1617 REQ_SEND;
1395} 1618}
1396 1619
1397void 1620int
1398aioreq_pri (int pri = DEFAULT_PRI) 1621aioreq_pri (int pri = 0)
1399 CODE: 1622 PROTOTYPE: ;$
1623 CODE:
1624 RETVAL = next_pri - PRI_BIAS;
1625 if (items > 0)
1626 {
1400 if (pri < PRI_MIN) pri = PRI_MIN; 1627 if (pri < PRI_MIN) pri = PRI_MIN;
1401 if (pri > PRI_MAX) pri = PRI_MAX; 1628 if (pri > PRI_MAX) pri = PRI_MAX;
1402 next_pri = pri + PRI_BIAS; 1629 next_pri = pri + PRI_BIAS;
1630 }
1631 OUTPUT:
1632 RETVAL
1403 1633
1404void 1634void
1405aioreq_nice (int nice = 0) 1635aioreq_nice (int nice = 0)
1406 CODE: 1636 CODE:
1407 nice = next_pri - nice; 1637 nice = next_pri - nice;
1408 if (nice < PRI_MIN) nice = PRI_MIN; 1638 if (nice < PRI_MIN) nice = PRI_MIN;
1409 if (nice > PRI_MAX) nice = PRI_MAX; 1639 if (nice > PRI_MAX) nice = PRI_MAX;
1410 next_pri = nice + PRI_BIAS; 1640 next_pri = nice + PRI_BIAS;
1411 1641
1412void 1642void
1413flush () 1643flush ()
1414 PROTOTYPE: 1644 PROTOTYPE:
1415 CODE: 1645 CODE:
1416 while (nreqs) 1646 while (nreqs)
1417 { 1647 {
1418 poll_wait (); 1648 poll_wait ();
1419 poll_cb (0); 1649 poll_cb ();
1420 } 1650 }
1421 1651
1422void 1652int
1423poll() 1653poll()
1424 PROTOTYPE: 1654 PROTOTYPE:
1425 CODE: 1655 CODE:
1426 if (nreqs)
1427 {
1428 poll_wait (); 1656 poll_wait ();
1429 poll_cb (0); 1657 RETVAL = poll_cb ();
1430 } 1658 OUTPUT:
1659 RETVAL
1431 1660
1432int 1661int
1433poll_fileno() 1662poll_fileno()
1434 PROTOTYPE: 1663 PROTOTYPE:
1435 CODE: 1664 CODE:
… …
1439 1668
1440int 1669int
1441poll_cb(...) 1670poll_cb(...)
1442 PROTOTYPE: 1671 PROTOTYPE:
1443 CODE: 1672 CODE:
1444 RETVAL = poll_cb (0); 1673 RETVAL = poll_cb ();
1445 OUTPUT:
1446 RETVAL
1447
1448int
1449poll_some(int max = 0)
1450 PROTOTYPE: $
1451 CODE:
1452 RETVAL = poll_cb (max);
1453 OUTPUT: 1674 OUTPUT:
1454 RETVAL 1675 RETVAL
1455 1676
1456void 1677void
1457poll_wait() 1678poll_wait()
1458 PROTOTYPE: 1679 PROTOTYPE:
1459 CODE: 1680 CODE:
1460 if (nreqs)
1461 poll_wait (); 1681 poll_wait ();
1462 1682
1463int 1683int
1464nreqs() 1684nreqs()
1465 PROTOTYPE: 1685 PROTOTYPE:
1466 CODE: 1686 CODE:
1467 RETVAL = nreqs; 1687 RETVAL = nreqs;
1468 OUTPUT: 1688 OUTPUT:
1469 RETVAL 1689 RETVAL
1470 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
1471PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1472 1718
1473MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1474 1720
1475void 1721void
… …
1490 PPCODE: 1736 PPCODE:
1491{ 1737{
1492 int i; 1738 int i;
1493 aio_req req; 1739 aio_req req;
1494 1740
1495 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1496 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");
1497 1743
1498 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1499 { 1745 {
1500 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
… …
1502 1748
1503 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1504 1750
1505 if (req) 1751 if (req)
1506 { 1752 {
1507 ++grp->length; 1753 ++grp->size;
1508 req->grp = grp; 1754 req->grp = grp;
1509 1755
1510 req->grp_prev = 0; 1756 req->grp_prev = 0;
1511 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1512 1758
… …
1526void 1772void
1527result (aio_req grp, ...) 1773result (aio_req grp, ...)
1528 CODE: 1774 CODE:
1529{ 1775{
1530 int i; 1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1531 AV *av = newAV (); 1781 av = newAV ();
1532 1782
1533 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1534 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1535 1785
1536 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1537 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1538} 1788}
1789
1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1539 1794
1540void 1795void
1541limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1542 CODE: 1797 CODE:
1543 grp->fd2 = limit; 1798 grp->int2 = limit;
1544 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1545 1800
1546void 1801void
1547feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1548 CODE: 1803 CODE:
1549{ 1804{
1550 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1551 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1552 1807
1553 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1554 grp->fd2 = 2; 1809 grp->int2 = 2;
1555 1810
1556 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1557} 1812}
1558 1813

Diff Legend

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