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.81 by root, Fri Oct 27 20:10:06 2006 UTC vs.
Revision 1.97 by root, Sun Jan 7 22:59:57 2007 UTC

… …
17#include "autoconf/config.h" 17#include "autoconf/config.h"
18 18
19#include <pthread.h> 19#include <pthread.h>
20 20
21#include <stddef.h> 21#include <stddef.h>
22#include <stdlib.h>
22#include <errno.h> 23#include <errno.h>
23#include <sys/time.h> 24#include <sys/time.h>
24#include <sys/select.h> 25#include <sys/select.h>
25#include <sys/types.h> 26#include <sys/types.h>
26#include <sys/stat.h> 27#include <sys/stat.h>
… …
43# else 44# else
44# error sendfile support requested but not available 45# error sendfile support requested but not available
45# endif 46# endif
46#endif 47#endif
47 48
49/* number of seconds after which idle threads exit */
50#define IDLE_TIMEOUT 10
51
48/* used for struct dirent, AIX doesn't provide it */ 52/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 53#ifndef NAME_MAX
50# define NAME_MAX 4096 54# define NAME_MAX 4096
51#endif 55#endif
52 56
… …
65 69
66/* wether word reads are potentially non-atomic. 70/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs 71 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes. 72 * on have atomic word read/writes.
69 */ 73 */
70#ifndef WORDREAD_UNSAFE 74#ifndef WORDACCESS_UNSAFE
71# if __i386 || __x86_64 75# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0 76# define WORDACCESS_UNSAFE 0
73# else 77# else
74# define WORDREAD_UNSAFE 1 78# define WORDACCESS_UNSAFE 1
75# endif 79# endif
76#endif 80#endif
77 81
78/* buffer size for various temporary buffers */ 82/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536 83#define AIO_BUFSIZE 65536
… …
84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \ 89 UNLOCK (wrklock); \
86 if (!aio_buf) \ 90 if (!aio_buf) \
87 return -1; 91 return -1;
88 92
93typedef SV SV8; /* byte-sv, used for argument-checking */
94
89enum { 95enum {
90 REQ_QUIT, 96 REQ_QUIT,
91 REQ_OPEN, REQ_CLOSE, 97 REQ_OPEN, REQ_CLOSE,
92 REQ_READ, REQ_WRITE, REQ_READAHEAD, 98 REQ_READ, REQ_WRITE, REQ_READAHEAD,
93 REQ_SENDFILE, 99 REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 100 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
95 REQ_FSYNC, REQ_FDATASYNC, 101 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 102 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
97 REQ_MKNOD, REQ_READDIR, 103 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 104 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 105 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 106 REQ_BUSY,
101}; 107};
102 108
103#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
105 111
106typedef struct aio_cb 112typedef struct aio_cb
107{ 113{
108 struct aio_cb *volatile next; 114 struct aio_cb *volatile next;
109 115
110 SV *data, *callback; 116 SV *callback, *fh;
111 SV *fh, *fh2; 117 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 118 void *ptr1, *ptr2;
113 Stat_t *statdata;
114 off_t offset; 119 off_t offs;
115 size_t length; 120 size_t size;
116 ssize_t result; 121 ssize_t result;
117 122
118 STRLEN dataoffset; 123 STRLEN stroffset;
119 int type; 124 int type;
120 int fd, fd2; 125 int int1, int2;
121 int errorno; 126 int errorno;
122 mode_t mode; /* open */ 127 mode_t mode; /* open */
123 128
124 unsigned char flags; 129 unsigned char flags;
125 unsigned char pri; 130 unsigned char pri;
… …
127 SV *self; /* the perl counterpart of this request, if any */ 132 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 134} aio_cb;
130 135
131enum { 136enum {
132 FLAG_CANCELLED = 0x01, 137 FLAG_CANCELLED = 0x01, /* request was cancelled */
138 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
139 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
133}; 140};
134 141
135typedef aio_cb *aio_req; 142typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 143typedef aio_cb *aio_req_ornot;
137 144
… …
142 DEFAULT_PRI = 0, 149 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 150 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 151 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 152};
146 153
154#define AIO_TICKS ((1000000 + 1023) >> 10)
155
156static unsigned int max_poll_time = 0;
157static unsigned int max_poll_reqs = 0;
158
159/* calculcate time difference in ~1/AIO_TICKS of a second */
160static int tvdiff (struct timeval *tv1, struct timeval *tv2)
161{
162 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
163 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
164}
165
166static pthread_t main_tid;
167static int main_sig;
168static int block_sig_level;
169
170void block_sig ()
171{
172 sigset_t ss;
173
174 if (block_sig_level++)
175 return;
176
177 if (!main_sig)
178 return;
179
180 sigemptyset (&ss);
181 sigaddset (&ss, main_sig);
182 pthread_sigmask (SIG_BLOCK, &ss, 0);
183}
184
185void unblock_sig ()
186{
187 sigset_t ss;
188
189 if (--block_sig_level)
190 return;
191
192 if (!main_sig)
193 return;
194
195 sigemptyset (&ss);
196 sigaddset (&ss, main_sig);
197 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
198}
199
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 200static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 201
149static unsigned int started, wanted; 202static unsigned int started, idle, wanted;
150 203
151#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 204#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
152# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 205# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
153#else 206#else
154# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 207# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
196 249
197 free (wrk); 250 free (wrk);
198} 251}
199 252
200static volatile unsigned int nreqs, nready, npending; 253static volatile unsigned int nreqs, nready, npending;
254static volatile unsigned int max_idle = 4;
201static volatile unsigned int max_outstanding = 0xffffffff; 255static volatile unsigned int max_outstanding = 0xffffffff;
202static int respipe [2]; 256static int respipe [2];
203 257
204static pthread_mutex_t reslock = AIO_MUTEX_INIT; 258static pthread_mutex_t reslock = AIO_MUTEX_INIT;
205static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 259static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
206static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 260static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
207 261
208#if WORDREAD_UNSAFE 262#if WORDACCESS_UNSAFE
209 263
210static unsigned int get_nready () 264static unsigned int get_nready ()
211{ 265{
212 unsigned int retval; 266 unsigned int retval;
213 267
… …
227 UNLOCK (reslock); 281 UNLOCK (reslock);
228 282
229 return retval; 283 return retval;
230} 284}
231 285
286static unsigned int get_nthreads ()
287{
288 unsigned int retval;
289
290 LOCK (wrklock);
291 retval = started;
292 UNLOCK (wrklock);
293
294 return retval;
295}
296
232#else 297#else
233 298
234# define get_nready() nready 299# define get_nready() nready
235# define get_npending() npending 300# define get_npending() npending
301# define get_nthreads() started
236 302
237#endif 303#endif
238 304
239/* 305/*
240 * a somewhat faster data structure might be nice, but 306 * a somewhat faster data structure might be nice, but
… …
288 } 354 }
289 355
290 abort (); 356 abort ();
291} 357}
292 358
293static int poll_cb (int max); 359static int poll_cb ();
294static void req_invoke (aio_req req); 360static int req_invoke (aio_req req);
295static void req_free (aio_req req); 361static void req_free (aio_req req);
296static void req_cancel (aio_req req); 362static void req_cancel (aio_req req);
297 363
298/* must be called at most once */ 364/* must be called at most once */
299static SV *req_sv (aio_req req, const char *klass) 365static SV *req_sv (aio_req req, const char *klass)
… …
319 return mg ? (aio_req)mg->mg_ptr : 0; 385 return mg ? (aio_req)mg->mg_ptr : 0;
320} 386}
321 387
322static void aio_grp_feed (aio_req grp) 388static void aio_grp_feed (aio_req grp)
323{ 389{
390 block_sig ();
391
324 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 392 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
325 { 393 {
326 int old_len = grp->length; 394 int old_len = grp->size;
327 395
328 if (grp->fh2 && SvOK (grp->fh2)) 396 if (grp->sv2 && SvOK (grp->sv2))
329 { 397 {
330 dSP; 398 dSP;
331 399
332 ENTER; 400 ENTER;
333 SAVETMPS; 401 SAVETMPS;
334 PUSHMARK (SP); 402 PUSHMARK (SP);
335 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 403 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
336 PUTBACK; 404 PUTBACK;
337 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 405 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
338 SPAGAIN; 406 SPAGAIN;
339 FREETMPS; 407 FREETMPS;
340 LEAVE; 408 LEAVE;
341 } 409 }
342 410
343 /* stop if no progress has been made */ 411 /* stop if no progress has been made */
344 if (old_len == grp->length) 412 if (old_len == grp->size)
345 { 413 {
346 SvREFCNT_dec (grp->fh2); 414 SvREFCNT_dec (grp->sv2);
347 grp->fh2 = 0; 415 grp->sv2 = 0;
348 break; 416 break;
349 } 417 }
350 } 418 }
419
420 unblock_sig ();
351} 421}
352 422
353static void aio_grp_dec (aio_req grp) 423static void aio_grp_dec (aio_req grp)
354{ 424{
355 --grp->length; 425 --grp->size;
356 426
357 /* call feeder, if applicable */ 427 /* call feeder, if applicable */
358 aio_grp_feed (grp); 428 aio_grp_feed (grp);
359 429
360 /* finish, if done */ 430 /* finish, if done */
361 if (!grp->length && grp->fd) 431 if (!grp->size && grp->int1)
362 { 432 {
433 block_sig ();
434
363 req_invoke (grp); 435 if (!req_invoke (grp))
436 {
437 req_free (grp);
438 unblock_sig ();
439 croak (0);
440 }
441
364 req_free (grp); 442 req_free (grp);
443 unblock_sig ();
365 } 444 }
366} 445}
367 446
368static void req_invoke (aio_req req) 447static int req_invoke (aio_req req)
369{ 448{
370 dSP; 449 dSP;
450
451 if (req->flags & FLAG_SV1_RO_OFF)
452 SvREADONLY_off (req->sv1);
371 453
372 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
373 { 455 {
374 ENTER; 456 ENTER;
375 SAVETMPS; 457 SAVETMPS;
… …
383 SV *rv = &PL_sv_undef; 465 SV *rv = &PL_sv_undef;
384 466
385 if (req->result >= 0) 467 if (req->result >= 0)
386 { 468 {
387 int i; 469 int i;
388 char *buf = req->data2ptr; 470 char *buf = req->ptr2;
389 AV *av = newAV (); 471 AV *av = newAV ();
390 472
391 av_extend (av, req->result - 1); 473 av_extend (av, req->result - 1);
392 474
393 for (i = 0; i < req->result; ++i) 475 for (i = 0; i < req->result; ++i)
… …
413 PUSHs (sv_2mortal (newSViv (req->result))); 495 PUSHs (sv_2mortal (newSViv (req->result)));
414 PUTBACK; 496 PUTBACK;
415 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 497 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
416 SPAGAIN; 498 SPAGAIN;
417 499
418 fh = SvREFCNT_inc (POPs); 500 fh = POPs;
419
420 PUSHMARK (SP); 501 PUSHMARK (SP);
421 XPUSHs (sv_2mortal (fh)); 502 XPUSHs (fh);
422 } 503 }
423 break; 504 break;
424 505
425 case REQ_GROUP: 506 case REQ_GROUP:
426 req->fd = 2; /* mark group as finished */ 507 req->int1 = 2; /* mark group as finished */
427 508
428 if (req->data) 509 if (req->sv1)
429 { 510 {
430 int i; 511 int i;
431 AV *av = (AV *)req->data; 512 AV *av = (AV *)req->sv1;
432 513
433 EXTEND (SP, AvFILL (av) + 1); 514 EXTEND (SP, AvFILL (av) + 1);
434 for (i = 0; i <= AvFILL (av); ++i) 515 for (i = 0; i <= AvFILL (av); ++i)
435 PUSHs (*av_fetch (av, i, 0)); 516 PUSHs (*av_fetch (av, i, 0));
436 } 517 }
… …
438 519
439 case REQ_NOP: 520 case REQ_NOP:
440 case REQ_BUSY: 521 case REQ_BUSY:
441 break; 522 break;
442 523
524 case REQ_READLINK:
525 if (req->result > 0)
526 {
527 SvCUR_set (req->sv1, req->result);
528 *SvEND (req->sv1) = 0;
529 PUSHs (req->sv1);
530 }
531 break;
532
533 case REQ_STAT:
534 case REQ_LSTAT:
535 case REQ_FSTAT:
536 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
537 PL_laststatval = req->result;
538 PL_statcache = *(Stat_t *)(req->ptr2);
539 PUSHs (sv_2mortal (newSViv (req->result)));
540 break;
541
542 case REQ_READ:
543 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
544 *SvEND (req->sv1) = 0;
545 PUSHs (sv_2mortal (newSViv (req->result)));
546 break;
547
443 default: 548 default:
444 PUSHs (sv_2mortal (newSViv (req->result))); 549 PUSHs (sv_2mortal (newSViv (req->result)));
445 break; 550 break;
446 } 551 }
447 552
… …
467 grp->grp_first = req->grp_next; 572 grp->grp_first = req->grp_next;
468 573
469 aio_grp_dec (grp); 574 aio_grp_dec (grp);
470 } 575 }
471 576
472 if (SvTRUE (ERRSV)) 577 return !SvTRUE (ERRSV);
473 {
474 req_free (req);
475 croak (0);
476 }
477} 578}
478 579
479static void req_free (aio_req req) 580static void req_free (aio_req req)
480{ 581{
481 if (req->self) 582 if (req->self)
482 { 583 {
483 sv_unmagic (req->self, PERL_MAGIC_ext); 584 sv_unmagic (req->self, PERL_MAGIC_ext);
484 SvREFCNT_dec (req->self); 585 SvREFCNT_dec (req->self);
485 } 586 }
486 587
487 SvREFCNT_dec (req->data);
488 SvREFCNT_dec (req->fh); 588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1);
489 SvREFCNT_dec (req->fh2); 590 SvREFCNT_dec (req->sv2);
490 SvREFCNT_dec (req->callback); 591 SvREFCNT_dec (req->callback);
491 Safefree (req->statdata);
492 592
493 if (req->type == REQ_READDIR) 593 if (req->flags & FLAG_PTR2_FREE)
494 free (req->data2ptr); 594 free (req->ptr2);
495 595
496 Safefree (req); 596 Safefree (req);
497} 597}
498 598
499static void req_cancel_subs (aio_req grp) 599static void req_cancel_subs (aio_req grp)
… …
501 aio_req sub; 601 aio_req sub;
502 602
503 if (grp->type != REQ_GROUP) 603 if (grp->type != REQ_GROUP)
504 return; 604 return;
505 605
506 SvREFCNT_dec (grp->fh2); 606 SvREFCNT_dec (grp->sv2);
507 grp->fh2 = 0; 607 grp->sv2 = 0;
508 608
509 for (sub = grp->grp_first; sub; sub = sub->grp_next) 609 for (sub = grp->grp_first; sub; sub = sub->grp_next)
510 req_cancel (sub); 610 req_cancel (sub);
511} 611}
512 612
… …
537#endif 637#endif
538 638
539 sigfillset (&fullsigset); 639 sigfillset (&fullsigset);
540 640
541 LOCK (wrklock); 641 LOCK (wrklock);
542 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
543 643
544 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
545 { 645 {
546 wrk->prev = &wrk_first; 646 wrk->prev = &wrk_first;
547 wrk->next = wrk_first.next; 647 wrk->next = wrk_first.next;
… …
550 ++started; 650 ++started;
551 } 651 }
552 else 652 else
553 free (wrk); 653 free (wrk);
554 654
555 sigprocmask (SIG_SETMASK, &oldsigset, 0); 655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
556 UNLOCK (wrklock); 656 UNLOCK (wrklock);
557} 657}
558 658
559static void maybe_start_thread () 659static void maybe_start_thread ()
560{ 660{
561#if 0 661 if (get_nthreads () >= wanted)
562 static struct timeval last;
563 struct timeval diff, now;
564#endif
565
566 if (started >= wanted)
567 return; 662 return;
568 663
569 if (nready <= nreqs - get_nready () - get_npending ()) 664 /* todo: maybe use idle here, but might be less exact */
665 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 666 return;
571 667
572#if 0
573 gettimeofday (&now, 0);
574
575 diff.tv_sec = now.tv_sec - last.tv_sec;
576 diff.tv_usec = now.tv_usec - last.tv_usec;
577
578 if (diff.tv_usec < 0)
579 {
580 --diff.tv_sec;
581 diff.tv_usec += 1000000;
582 }
583
584 if (!diff.tv_sec && diff.tv_usec < 10000)
585 return;
586
587 last = now;
588#endif
589
590 start_thread (); 668 start_thread ();
591} 669}
592 670
593static void req_send (aio_req req) 671static void req_send (aio_req req)
594{ 672{
673 block_sig ();
674
595 ++nreqs; 675 ++nreqs;
596 676
597 LOCK (reqlock); 677 LOCK (reqlock);
598 ++nready; 678 ++nready;
599 reqq_push (&req_queue, req); 679 reqq_push (&req_queue, req);
600 pthread_cond_signal (&reqwait); 680 pthread_cond_signal (&reqwait);
601 UNLOCK (reqlock); 681 UNLOCK (reqlock);
602 682
683 unblock_sig ();
684
603 maybe_start_thread (); 685 maybe_start_thread ();
604} 686}
605 687
606static void end_thread (void) 688static void end_thread (void)
607{ 689{
… …
610 Newz (0, req, 1, aio_cb); 692 Newz (0, req, 1, aio_cb);
611 693
612 req->type = REQ_QUIT; 694 req->type = REQ_QUIT;
613 req->pri = PRI_MAX + PRI_BIAS; 695 req->pri = PRI_MAX + PRI_BIAS;
614 696
615 req_send (req); 697 LOCK (reqlock);
698 reqq_push (&req_queue, req);
699 pthread_cond_signal (&reqwait);
700 UNLOCK (reqlock);
616 701
617 LOCK (wrklock); 702 LOCK (wrklock);
618 --started; 703 --started;
619 UNLOCK (wrklock); 704 UNLOCK (wrklock);
620} 705}
621 706
707static void set_max_idle (int nthreads)
708{
709 if (WORDACCESS_UNSAFE) LOCK (reqlock);
710 max_idle = nthreads <= 0 ? 1 : nthreads;
711 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
712}
713
622static void min_parallel (int nthreads) 714static void min_parallel (int nthreads)
623{ 715{
624 if (wanted < nthreads) 716 if (wanted < nthreads)
625 wanted = nthreads; 717 wanted = nthreads;
626} 718}
… …
639 fd_set rfd; 731 fd_set rfd;
640 732
641 while (nreqs) 733 while (nreqs)
642 { 734 {
643 int size; 735 int size;
644 if (WORDREAD_UNSAFE) LOCK (reslock); 736 if (WORDACCESS_UNSAFE) LOCK (reslock);
645 size = res_queue.size; 737 size = res_queue.size;
646 if (WORDREAD_UNSAFE) UNLOCK (reslock); 738 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
647 739
648 if (size) 740 if (size)
649 return; 741 return;
650 742
651 maybe_start_thread (); 743 maybe_start_thread ();
… …
655 747
656 select (respipe [0] + 1, &rfd, 0, 0, 0); 748 select (respipe [0] + 1, &rfd, 0, 0, 0);
657 } 749 }
658} 750}
659 751
660static int poll_cb (int max) 752static int poll_cb ()
661{ 753{
662 dSP; 754 dSP;
663 int count = 0; 755 int count = 0;
756 int maxreqs = max_poll_reqs;
664 int do_croak = 0; 757 int do_croak = 0;
758 struct timeval tv_start, tv_now;
665 aio_req req; 759 aio_req req;
760
761 if (max_poll_time)
762 gettimeofday (&tv_start, 0);
763
764 block_sig ();
666 765
667 for (;;) 766 for (;;)
668 { 767 {
669 while (max <= 0 || count < max) 768 for (;;)
670 { 769 {
671 maybe_start_thread (); 770 maybe_start_thread ();
672 771
673 LOCK (reslock); 772 LOCK (reslock);
674 req = reqq_shift (&res_queue); 773 req = reqq_shift (&res_queue);
… …
678 --npending; 777 --npending;
679 778
680 if (!res_queue.size) 779 if (!res_queue.size)
681 { 780 {
682 /* read any signals sent by the worker threads */ 781 /* read any signals sent by the worker threads */
683 char buf [32]; 782 char buf [4];
684 while (read (respipe [0], buf, 32) == 32) 783 while (read (respipe [0], buf, 4) == 4)
685 ; 784 ;
686 } 785 }
687 } 786 }
688 787
689 UNLOCK (reslock); 788 UNLOCK (reslock);
… …
691 if (!req) 790 if (!req)
692 break; 791 break;
693 792
694 --nreqs; 793 --nreqs;
695 794
696 if (req->type == REQ_GROUP && req->length) 795 if (req->type == REQ_GROUP && req->size)
697 { 796 {
698 req->fd = 1; /* mark request as delayed */ 797 req->int1 = 1; /* mark request as delayed */
699 continue; 798 continue;
700 } 799 }
701 else 800 else
702 { 801 {
703 if (req->type == REQ_READ) 802 if (!req_invoke (req))
704 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
705
706 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
707 SvREADONLY_off (req->data);
708
709 if (req->statdata)
710 { 803 {
711 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 804 req_free (req);
712 PL_laststatval = req->result; 805 unblock_sig ();
713 PL_statcache = *(req->statdata); 806 croak (0);
714 } 807 }
715
716 req_invoke (req);
717 808
718 count++; 809 count++;
719 } 810 }
720 811
721 req_free (req); 812 req_free (req);
813
814 if (maxreqs && !--maxreqs)
815 break;
816
817 if (max_poll_time)
818 {
819 gettimeofday (&tv_now, 0);
820
821 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
822 break;
823 }
722 } 824 }
723 825
724 if (nreqs <= max_outstanding) 826 if (nreqs <= max_outstanding)
725 break; 827 break;
726 828
727 poll_wait (); 829 poll_wait ();
728 830
729 max = 0; 831 ++maxreqs;
730 } 832 }
731 833
834 unblock_sig ();
732 return count; 835 return count;
733} 836}
734 837
735static void create_pipe () 838static void create_pipe ()
736{ 839{
… …
952 int memofs = 0; 1055 int memofs = 0;
953 int res = 0; 1056 int res = 0;
954 int errorno; 1057 int errorno;
955 1058
956 LOCK (wrklock); 1059 LOCK (wrklock);
957 self->dirp = dirp = opendir (req->dataptr); 1060 self->dirp = dirp = opendir (req->ptr1);
958 self->dbuf = u = malloc (sizeof (*u)); 1061 self->dbuf = u = malloc (sizeof (*u));
1062 req->flags |= FLAG_PTR2_FREE;
959 req->data2ptr = names = malloc (memlen); 1063 req->ptr2 = names = malloc (memlen);
960 UNLOCK (wrklock); 1064 UNLOCK (wrklock);
961 1065
962 if (dirp && u && names) 1066 if (dirp && u && names)
963 for (;;) 1067 for (;;)
964 { 1068 {
… …
978 1082
979 while (memofs + len > memlen) 1083 while (memofs + len > memlen)
980 { 1084 {
981 memlen *= 2; 1085 memlen *= 2;
982 LOCK (wrklock); 1086 LOCK (wrklock);
983 req->data2ptr = names = realloc (names, memlen); 1087 req->ptr2 = names = realloc (names, memlen);
984 UNLOCK (wrklock); 1088 UNLOCK (wrklock);
985 1089
986 if (!names) 1090 if (!names)
987 break; 1091 break;
988 } 1092 }
… …
1001/*****************************************************************************/ 1105/*****************************************************************************/
1002 1106
1003static void *aio_proc (void *thr_arg) 1107static void *aio_proc (void *thr_arg)
1004{ 1108{
1005 aio_req req; 1109 aio_req req;
1110 struct timespec ts;
1006 worker *self = (worker *)thr_arg; 1111 worker *self = (worker *)thr_arg;
1112
1113 /* try to distribute timeouts somewhat evenly */
1114 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1115 * (1000000000UL / 1024UL);
1007 1116
1008 for (;;) 1117 for (;;)
1009 { 1118 {
1119 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1120
1010 LOCK (reqlock); 1121 LOCK (reqlock);
1011 1122
1012 for (;;) 1123 for (;;)
1013 { 1124 {
1014 self->req = req = reqq_shift (&req_queue); 1125 self->req = req = reqq_shift (&req_queue);
1015 1126
1016 if (req) 1127 if (req)
1017 break; 1128 break;
1018 1129
1130 ++idle;
1131
1132 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1133 == ETIMEDOUT)
1134 {
1135 if (idle > max_idle)
1136 {
1137 --idle;
1138 UNLOCK (reqlock);
1139 LOCK (wrklock);
1140 --started;
1141 UNLOCK (wrklock);
1142 goto quit;
1143 }
1144
1145 /* we are allowed to idle, so do so without any timeout */
1019 pthread_cond_wait (&reqwait, &reqlock); 1146 pthread_cond_wait (&reqwait, &reqlock);
1147 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1148 }
1149
1150 --idle;
1020 } 1151 }
1021 1152
1022 --nready; 1153 --nready;
1023 1154
1024 UNLOCK (reqlock); 1155 UNLOCK (reqlock);
… …
1026 errno = 0; /* strictly unnecessary */ 1157 errno = 0; /* strictly unnecessary */
1027 1158
1028 if (!(req->flags & FLAG_CANCELLED)) 1159 if (!(req->flags & FLAG_CANCELLED))
1029 switch (req->type) 1160 switch (req->type)
1030 { 1161 {
1031 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1162 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1032 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1163 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1033 1164
1034 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1165 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1035 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1166 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1036 1167
1037 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1168 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1038 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1169 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1039 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1170 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1040 1171
1041 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1172 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1042 case REQ_CLOSE: req->result = close (req->fd); break; 1173 case REQ_CLOSE: req->result = close (req->int1); break;
1043 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1044 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1176 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1045 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1177 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1046 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1178 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1047 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1179 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1048 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1180 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1181 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1049 1182
1050 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1183 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1051 case REQ_FSYNC: req->result = fsync (req->fd); break; 1184 case REQ_FSYNC: req->result = fsync (req->int1); break;
1052 case REQ_READDIR: scandir_ (req, self); break; 1185 case REQ_READDIR: scandir_ (req, self); break;
1053 1186
1054 case REQ_BUSY: 1187 case REQ_BUSY:
1055 { 1188 {
1056 struct timeval tv; 1189 struct timeval tv;
1057 1190
1058 tv.tv_sec = req->fd; 1191 tv.tv_sec = req->int1;
1059 tv.tv_usec = req->fd2; 1192 tv.tv_usec = req->int2;
1060 1193
1061 req->result = select (0, 0, 0, 0, &tv); 1194 req->result = select (0, 0, 0, 0, &tv);
1062 } 1195 }
1063 1196
1064 case REQ_GROUP: 1197 case REQ_GROUP:
1065 case REQ_NOP: 1198 case REQ_NOP:
1066 break; 1199 break;
1067 1200
1068 case REQ_QUIT: 1201 case REQ_QUIT:
1069 LOCK (wrklock); 1202 goto quit;
1070 worker_free (self);
1071 --started;
1072 UNLOCK (wrklock);
1073 return 0;
1074 1203
1075 default: 1204 default:
1076 req->result = ENOSYS; 1205 req->result = ENOSYS;
1077 break; 1206 break;
1078 } 1207 }
… …
1082 LOCK (reslock); 1211 LOCK (reslock);
1083 1212
1084 ++npending; 1213 ++npending;
1085 1214
1086 if (!reqq_push (&res_queue, req)) 1215 if (!reqq_push (&res_queue, req))
1216 {
1087 /* write a dummy byte to the pipe so fh becomes ready */ 1217 /* write a dummy byte to the pipe so fh becomes ready */
1088 write (respipe [1], &respipe, 1); 1218 write (respipe [1], &respipe, 1);
1219
1220 /* optionally signal the main thread asynchronously */
1221 if (main_sig)
1222 pthread_kill (main_tid, main_sig);
1223 }
1089 1224
1090 self->req = 0; 1225 self->req = 0;
1091 worker_clear (self); 1226 worker_clear (self);
1092 1227
1093 UNLOCK (reslock); 1228 UNLOCK (reslock);
1094 } 1229 }
1230
1231quit:
1232 LOCK (wrklock);
1233 worker_free (self);
1234 UNLOCK (wrklock);
1235
1236 return 0;
1095} 1237}
1096 1238
1097/*****************************************************************************/ 1239/*****************************************************************************/
1098 1240
1099static void atfork_prepare (void) 1241static void atfork_prepare (void)
… …
1141 1283
1142 worker_clear (wrk); 1284 worker_clear (wrk);
1143 worker_free (wrk); 1285 worker_free (wrk);
1144 } 1286 }
1145 1287
1146 started = 0; 1288 started = 0;
1289 idle = 0;
1147 nreqs = 0; 1290 nreqs = 0;
1291 nready = 0;
1292 npending = 0;
1148 1293
1149 close (respipe [0]); 1294 close (respipe [0]);
1150 close (respipe [1]); 1295 close (respipe [1]);
1151 create_pipe (); 1296 create_pipe ();
1152 1297
… …
1179PROTOTYPES: ENABLE 1324PROTOTYPES: ENABLE
1180 1325
1181BOOT: 1326BOOT:
1182{ 1327{
1183 HV *stash = gv_stashpv ("IO::AIO", 1); 1328 HV *stash = gv_stashpv ("IO::AIO", 1);
1329
1184 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1330 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1185 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1331 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1186 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1332 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1187 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1333 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1188 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1334 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1335 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1336 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1189 1337
1190 create_pipe (); 1338 create_pipe ();
1191 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1339 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1192
1193 start_thread ();
1194} 1340}
1341
1342void
1343max_poll_reqs (int nreqs)
1344 PROTOTYPE: $
1345 CODE:
1346 max_poll_reqs = nreqs;
1347
1348void
1349max_poll_time (double nseconds)
1350 PROTOTYPE: $
1351 CODE:
1352 max_poll_time = nseconds * AIO_TICKS;
1195 1353
1196void 1354void
1197min_parallel (int nthreads) 1355min_parallel (int nthreads)
1198 PROTOTYPE: $ 1356 PROTOTYPE: $
1199 1357
1200void 1358void
1201max_parallel (int nthreads) 1359max_parallel (int nthreads)
1202 PROTOTYPE: $ 1360 PROTOTYPE: $
1361
1362void
1363max_idle (int nthreads)
1364 PROTOTYPE: $
1365 CODE:
1366 set_max_idle (nthreads);
1203 1367
1204int 1368int
1205max_outstanding (int maxreqs) 1369max_outstanding (int maxreqs)
1206 PROTOTYPE: $ 1370 PROTOTYPE: $
1207 CODE: 1371 CODE:
… …
1210 OUTPUT: 1374 OUTPUT:
1211 RETVAL 1375 RETVAL
1212 1376
1213void 1377void
1214aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1378aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1215 SV * pathname 1379 SV8 * pathname
1216 int flags 1380 int flags
1217 int mode 1381 int mode
1218 SV * callback 1382 SV * callback
1219 PROTOTYPE: $$$;$ 1383 PROTOTYPE: $$$;$
1220 PPCODE: 1384 PPCODE:
1221{ 1385{
1222 dREQ; 1386 dREQ;
1223 1387
1224 req->type = REQ_OPEN; 1388 req->type = REQ_OPEN;
1225 req->data = newSVsv (pathname); 1389 req->sv1 = newSVsv (pathname);
1226 req->dataptr = SvPVbyte_nolen (req->data); 1390 req->ptr1 = SvPVbyte_nolen (req->sv1);
1227 req->fd = flags; 1391 req->int1 = flags;
1228 req->mode = mode; 1392 req->mode = mode;
1229 1393
1230 REQ_SEND; 1394 REQ_SEND;
1231} 1395}
1232 1396
… …
1242 PPCODE: 1406 PPCODE:
1243{ 1407{
1244 dREQ; 1408 dREQ;
1245 1409
1246 req->type = ix; 1410 req->type = ix;
1247 req->fh = newSVsv (fh); 1411 req->fh = newSVsv (fh);
1248 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1412 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1249 1413
1250 REQ_SEND (req); 1414 REQ_SEND (req);
1251} 1415}
1252 1416
1253void 1417void
1254aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1418aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1255 SV * fh 1419 SV * fh
1256 UV offset 1420 UV offset
1257 UV length 1421 UV length
1258 SV * data 1422 SV8 * data
1259 UV dataoffset 1423 UV dataoffset
1260 SV * callback 1424 SV * callback
1261 ALIAS: 1425 ALIAS:
1262 aio_read = REQ_READ 1426 aio_read = REQ_READ
1263 aio_write = REQ_WRITE 1427 aio_write = REQ_WRITE
1264 PROTOTYPE: $$$$$;$ 1428 PROTOTYPE: $$$$$;$
1265 PPCODE: 1429 PPCODE:
1266{ 1430{
1267 aio_req req;
1268 STRLEN svlen; 1431 STRLEN svlen;
1269 char *svptr = SvPVbyte (data, svlen); 1432 char *svptr = SvPVbyte (data, svlen);
1270 1433
1271 SvUPGRADE (data, SVt_PV); 1434 SvUPGRADE (data, SVt_PV);
1272 SvPOK_on (data); 1435 SvPOK_on (data);
… …
1284 length = svlen - dataoffset; 1447 length = svlen - dataoffset;
1285 } 1448 }
1286 else 1449 else
1287 { 1450 {
1288 /* read: grow scalar as necessary */ 1451 /* read: grow scalar as necessary */
1289 svptr = SvGROW (data, length + dataoffset); 1452 svptr = SvGROW (data, length + dataoffset + 1);
1290 } 1453 }
1291 1454
1292 if (length < 0) 1455 if (length < 0)
1293 croak ("length must not be negative"); 1456 croak ("length must not be negative");
1294 1457
1295 { 1458 {
1296 dREQ; 1459 dREQ;
1297 1460
1298 req->type = ix; 1461 req->type = ix;
1299 req->fh = newSVsv (fh); 1462 req->fh = newSVsv (fh);
1300 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1463 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1301 : IoOFP (sv_2io (fh))); 1464 : IoOFP (sv_2io (fh)));
1302 req->offset = offset; 1465 req->offs = offset;
1303 req->length = length; 1466 req->size = length;
1304 req->data = SvREFCNT_inc (data); 1467 req->sv1 = SvREFCNT_inc (data);
1305 req->dataptr = (char *)svptr + dataoffset; 1468 req->ptr1 = (char *)svptr + dataoffset;
1469 req->stroffset = dataoffset;
1306 1470
1307 if (!SvREADONLY (data)) 1471 if (!SvREADONLY (data))
1308 { 1472 {
1309 SvREADONLY_on (data); 1473 SvREADONLY_on (data);
1310 req->data2ptr = (void *)data; 1474 req->flags |= FLAG_SV1_RO_OFF;
1311 } 1475 }
1312 1476
1313 REQ_SEND; 1477 REQ_SEND;
1314 } 1478 }
1479}
1480
1481void
1482aio_readlink (path,callback=&PL_sv_undef)
1483 SV8 * path
1484 SV * callback
1485 PROTOTYPE: $$;$
1486 PPCODE:
1487{
1488 SV *data;
1489 dREQ;
1490
1491 data = newSV (NAME_MAX);
1492 SvPOK_on (data);
1493
1494 req->type = REQ_READLINK;
1495 req->fh = newSVsv (path);
1496 req->ptr2 = SvPVbyte_nolen (req->fh);
1497 req->sv1 = data;
1498 req->ptr1 = SvPVbyte_nolen (data);
1499
1500 REQ_SEND;
1315} 1501}
1316 1502
1317void 1503void
1318aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1504aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1319 SV * out_fh 1505 SV * out_fh
… …
1325 PPCODE: 1511 PPCODE:
1326{ 1512{
1327 dREQ; 1513 dREQ;
1328 1514
1329 req->type = REQ_SENDFILE; 1515 req->type = REQ_SENDFILE;
1330 req->fh = newSVsv (out_fh); 1516 req->fh = newSVsv (out_fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1517 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1332 req->fh2 = newSVsv (in_fh); 1518 req->sv2 = newSVsv (in_fh);
1333 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1519 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1334 req->offset = in_offset; 1520 req->offs = in_offset;
1335 req->length = length; 1521 req->size = length;
1336 1522
1337 REQ_SEND; 1523 REQ_SEND;
1338} 1524}
1339 1525
1340void 1526void
… …
1347 PPCODE: 1533 PPCODE:
1348{ 1534{
1349 dREQ; 1535 dREQ;
1350 1536
1351 req->type = REQ_READAHEAD; 1537 req->type = REQ_READAHEAD;
1352 req->fh = newSVsv (fh); 1538 req->fh = newSVsv (fh);
1353 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1539 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1354 req->offset = offset; 1540 req->offs = offset;
1355 req->length = length; 1541 req->size = length;
1356 1542
1357 REQ_SEND; 1543 REQ_SEND;
1358} 1544}
1359 1545
1360void 1546void
1361aio_stat (fh_or_path,callback=&PL_sv_undef) 1547aio_stat (fh_or_path,callback=&PL_sv_undef)
1362 SV * fh_or_path 1548 SV8 * fh_or_path
1363 SV * callback 1549 SV * callback
1364 ALIAS: 1550 ALIAS:
1365 aio_stat = REQ_STAT 1551 aio_stat = REQ_STAT
1366 aio_lstat = REQ_LSTAT 1552 aio_lstat = REQ_LSTAT
1367 PPCODE: 1553 PPCODE:
1368{ 1554{
1369 dREQ; 1555 dREQ;
1370 1556
1371 New (0, req->statdata, 1, Stat_t); 1557 req->ptr2 = malloc (sizeof (Stat_t));
1372 if (!req->statdata) 1558 if (!req->ptr2)
1373 { 1559 {
1374 req_free (req); 1560 req_free (req);
1375 croak ("out of memory during aio_req->statdata allocation"); 1561 croak ("out of memory during aio_stat statdata allocation");
1376 } 1562 }
1563
1564 req->flags |= FLAG_PTR2_FREE;
1377 1565
1378 if (SvPOK (fh_or_path)) 1566 if (SvPOK (fh_or_path))
1379 { 1567 {
1380 req->type = ix; 1568 req->type = ix;
1381 req->data = newSVsv (fh_or_path); 1569 req->sv1 = newSVsv (fh_or_path);
1382 req->dataptr = SvPVbyte_nolen (req->data); 1570 req->ptr1 = SvPVbyte_nolen (req->sv1);
1383 } 1571 }
1384 else 1572 else
1385 { 1573 {
1386 req->type = REQ_FSTAT; 1574 req->type = REQ_FSTAT;
1387 req->fh = newSVsv (fh_or_path); 1575 req->fh = newSVsv (fh_or_path);
1388 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1576 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1389 } 1577 }
1390 1578
1391 REQ_SEND; 1579 REQ_SEND;
1392} 1580}
1393 1581
1394void 1582void
1395aio_unlink (pathname,callback=&PL_sv_undef) 1583aio_unlink (pathname,callback=&PL_sv_undef)
1396 SV * pathname 1584 SV8 * pathname
1397 SV * callback 1585 SV * callback
1398 ALIAS: 1586 ALIAS:
1399 aio_unlink = REQ_UNLINK 1587 aio_unlink = REQ_UNLINK
1400 aio_rmdir = REQ_RMDIR 1588 aio_rmdir = REQ_RMDIR
1401 aio_readdir = REQ_READDIR 1589 aio_readdir = REQ_READDIR
1402 PPCODE: 1590 PPCODE:
1403{ 1591{
1404 dREQ; 1592 dREQ;
1405 1593
1406 req->type = ix; 1594 req->type = ix;
1407 req->data = newSVsv (pathname); 1595 req->sv1 = newSVsv (pathname);
1408 req->dataptr = SvPVbyte_nolen (req->data); 1596 req->ptr1 = SvPVbyte_nolen (req->sv1);
1597
1598 REQ_SEND;
1599}
1600
1601void
1602aio_mkdir (pathname,mode,callback=&PL_sv_undef)
1603 SV8 * pathname
1604 UV mode
1605 SV * callback
1606 PPCODE:
1607{
1608 dREQ;
1409 1609
1610 req->type = REQ_MKDIR;
1611 req->sv1 = newSVsv (pathname);
1612 req->ptr1 = SvPVbyte_nolen (req->sv1);
1613 req->mode = mode;
1614
1410 REQ_SEND; 1615 REQ_SEND;
1411} 1616}
1412 1617
1413void 1618void
1414aio_link (oldpath,newpath,callback=&PL_sv_undef) 1619aio_link (oldpath,newpath,callback=&PL_sv_undef)
1415 SV * oldpath 1620 SV8 * oldpath
1416 SV * newpath 1621 SV8 * newpath
1417 SV * callback 1622 SV * callback
1418 ALIAS: 1623 ALIAS:
1419 aio_link = REQ_LINK 1624 aio_link = REQ_LINK
1420 aio_symlink = REQ_SYMLINK 1625 aio_symlink = REQ_SYMLINK
1421 aio_rename = REQ_RENAME 1626 aio_rename = REQ_RENAME
1422 PPCODE: 1627 PPCODE:
1423{ 1628{
1424 dREQ; 1629 dREQ;
1425 1630
1426 req->type = ix; 1631 req->type = ix;
1427 req->fh = newSVsv (oldpath); 1632 req->fh = newSVsv (oldpath);
1428 req->data2ptr = SvPVbyte_nolen (req->fh); 1633 req->ptr2 = SvPVbyte_nolen (req->fh);
1429 req->data = newSVsv (newpath); 1634 req->sv1 = newSVsv (newpath);
1430 req->dataptr = SvPVbyte_nolen (req->data); 1635 req->ptr1 = SvPVbyte_nolen (req->sv1);
1431 1636
1432 REQ_SEND; 1637 REQ_SEND;
1433} 1638}
1434 1639
1435void 1640void
1436aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1641aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1437 SV * pathname 1642 SV8 * pathname
1438 SV * callback
1439 UV mode 1643 UV mode
1440 UV dev 1644 UV dev
1645 SV * callback
1441 PPCODE: 1646 PPCODE:
1442{ 1647{
1443 dREQ; 1648 dREQ;
1444 1649
1445 req->type = REQ_MKNOD; 1650 req->type = REQ_MKNOD;
1446 req->data = newSVsv (pathname); 1651 req->sv1 = newSVsv (pathname);
1447 req->dataptr = SvPVbyte_nolen (req->data); 1652 req->ptr1 = SvPVbyte_nolen (req->sv1);
1448 req->mode = (mode_t)mode; 1653 req->mode = (mode_t)mode;
1449 req->offset = dev; 1654 req->offs = dev;
1450 1655
1451 REQ_SEND; 1656 REQ_SEND;
1452} 1657}
1453 1658
1454void 1659void
1455aio_busy (delay,callback=&PL_sv_undef) 1660aio_busy (delay,callback=&PL_sv_undef)
1456 double delay 1661 double delay
1457 SV * callback 1662 SV * callback
1458 PPCODE: 1663 PPCODE:
1459{ 1664{
1460 dREQ; 1665 dREQ;
1461 1666
1462 req->type = REQ_BUSY; 1667 req->type = REQ_BUSY;
1463 req->fd = delay < 0. ? 0 : delay; 1668 req->int1 = delay < 0. ? 0 : delay;
1464 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1669 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1465 1670
1466 REQ_SEND; 1671 REQ_SEND;
1467} 1672}
1468 1673
1469void 1674void
… …
1473 PPCODE: 1678 PPCODE:
1474{ 1679{
1475 dREQ; 1680 dREQ;
1476 1681
1477 req->type = REQ_GROUP; 1682 req->type = REQ_GROUP;
1683
1478 req_send (req); 1684 req_send (req);
1479
1480 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1685 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1481} 1686}
1482 1687
1483void 1688void
1484aio_nop (callback=&PL_sv_undef) 1689aio_nop (callback=&PL_sv_undef)
1485 SV * callback 1690 SV * callback
1486 PPCODE: 1691 PPCODE:
1487{ 1692{
1488 dREQ; 1693 dREQ;
1489 1694
1490 req->type = REQ_NOP; 1695 req->type = REQ_NOP;
… …
1519 PROTOTYPE: 1724 PROTOTYPE:
1520 CODE: 1725 CODE:
1521 while (nreqs) 1726 while (nreqs)
1522 { 1727 {
1523 poll_wait (); 1728 poll_wait ();
1524 poll_cb (0); 1729 poll_cb ();
1525 } 1730 }
1526 1731
1527void 1732int
1528poll() 1733poll()
1529 PROTOTYPE: 1734 PROTOTYPE:
1530 CODE: 1735 CODE:
1531 if (nreqs)
1532 {
1533 poll_wait (); 1736 poll_wait ();
1534 poll_cb (0); 1737 RETVAL = poll_cb ();
1535 } 1738 OUTPUT:
1739 RETVAL
1536 1740
1537int 1741int
1538poll_fileno() 1742poll_fileno()
1539 PROTOTYPE: 1743 PROTOTYPE:
1540 CODE: 1744 CODE:
… …
1544 1748
1545int 1749int
1546poll_cb(...) 1750poll_cb(...)
1547 PROTOTYPE: 1751 PROTOTYPE:
1548 CODE: 1752 CODE:
1549 RETVAL = poll_cb (0); 1753 RETVAL = poll_cb ();
1550 OUTPUT:
1551 RETVAL
1552
1553int
1554poll_some(int max = 0)
1555 PROTOTYPE: $
1556 CODE:
1557 RETVAL = poll_cb (max);
1558 OUTPUT: 1754 OUTPUT:
1559 RETVAL 1755 RETVAL
1560 1756
1561void 1757void
1562poll_wait() 1758poll_wait()
1563 PROTOTYPE: 1759 PROTOTYPE:
1564 CODE: 1760 CODE:
1565 if (nreqs)
1566 poll_wait (); 1761 poll_wait ();
1762
1763void
1764setsig (int signum = SIGIO)
1765 PROTOTYPE: ;$
1766 CODE:
1767{
1768 if (block_sig_level)
1769 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1770
1771 LOCK (reslock);
1772 main_tid = pthread_self ();
1773 main_sig = signum;
1774 UNLOCK (reslock);
1775
1776 if (main_sig && npending)
1777 pthread_kill (main_tid, main_sig);
1778}
1779
1780void
1781aio_block (SV *cb)
1782 PROTOTYPE: &
1783 PPCODE:
1784{
1785 int count;
1786
1787 block_sig ();
1788 PUSHMARK (SP);
1789 PUTBACK;
1790 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1791 SPAGAIN;
1792 unblock_sig ();
1793
1794 if (SvTRUE (ERRSV))
1795 croak (0);
1796
1797 XSRETURN (count);
1798}
1567 1799
1568int 1800int
1569nreqs() 1801nreqs()
1570 PROTOTYPE: 1802 PROTOTYPE:
1571 CODE: 1803 CODE:
… …
1587 CODE: 1819 CODE:
1588 RETVAL = get_npending (); 1820 RETVAL = get_npending ();
1589 OUTPUT: 1821 OUTPUT:
1590 RETVAL 1822 RETVAL
1591 1823
1824int
1825nthreads()
1826 PROTOTYPE:
1827 CODE:
1828 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1829 RETVAL = started;
1830 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1831 OUTPUT:
1832 RETVAL
1833
1592PROTOTYPES: DISABLE 1834PROTOTYPES: DISABLE
1593 1835
1594MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1836MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1595 1837
1596void 1838void
… …
1611 PPCODE: 1853 PPCODE:
1612{ 1854{
1613 int i; 1855 int i;
1614 aio_req req; 1856 aio_req req;
1615 1857
1858 if (main_sig && !block_sig_level)
1859 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1860
1616 if (grp->fd == 2) 1861 if (grp->int1 == 2)
1617 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1862 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1618 1863
1619 for (i = 1; i < items; ++i ) 1864 for (i = 1; i < items; ++i )
1620 { 1865 {
1621 if (GIMME_V != G_VOID) 1866 if (GIMME_V != G_VOID)
… …
1623 1868
1624 req = SvAIO_REQ (ST (i)); 1869 req = SvAIO_REQ (ST (i));
1625 1870
1626 if (req) 1871 if (req)
1627 { 1872 {
1628 ++grp->length; 1873 ++grp->size;
1629 req->grp = grp; 1874 req->grp = grp;
1630 1875
1631 req->grp_prev = 0; 1876 req->grp_prev = 0;
1632 req->grp_next = grp->grp_first; 1877 req->grp_next = grp->grp_first;
1633 1878
… …
1656 av = newAV (); 1901 av = newAV ();
1657 1902
1658 for (i = 1; i < items; ++i ) 1903 for (i = 1; i < items; ++i )
1659 av_push (av, newSVsv (ST (i))); 1904 av_push (av, newSVsv (ST (i)));
1660 1905
1661 SvREFCNT_dec (grp->data); 1906 SvREFCNT_dec (grp->sv1);
1662 grp->data = (SV *)av; 1907 grp->sv1 = (SV *)av;
1663} 1908}
1664 1909
1665void 1910void
1666errno (aio_req grp, int errorno = errno) 1911errno (aio_req grp, int errorno = errno)
1667 CODE: 1912 CODE:
1668 grp->errorno = errorno; 1913 grp->errorno = errorno;
1669 1914
1670void 1915void
1671limit (aio_req grp, int limit) 1916limit (aio_req grp, int limit)
1672 CODE: 1917 CODE:
1673 grp->fd2 = limit; 1918 grp->int2 = limit;
1674 aio_grp_feed (grp); 1919 aio_grp_feed (grp);
1675 1920
1676void 1921void
1677feed (aio_req grp, SV *callback=&PL_sv_undef) 1922feed (aio_req grp, SV *callback=&PL_sv_undef)
1678 CODE: 1923 CODE:
1679{ 1924{
1680 SvREFCNT_dec (grp->fh2); 1925 SvREFCNT_dec (grp->sv2);
1681 grp->fh2 = newSVsv (callback); 1926 grp->sv2 = newSVsv (callback);
1682 1927
1683 if (grp->fd2 <= 0) 1928 if (grp->int2 <= 0)
1684 grp->fd2 = 2; 1929 grp->int2 = 2;
1685 1930
1686 aio_grp_feed (grp); 1931 aio_grp_feed (grp);
1687} 1932}
1688 1933

Diff Legend

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