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.83 by root, Sat Oct 28 00:17:30 2006 UTC vs.
Revision 1.86 by root, Mon Oct 30 23:30:00 2006 UTC

… …
43# else 43# else
44# error sendfile support requested but not available 44# error sendfile support requested but not available
45# endif 45# endif
46#endif 46#endif
47 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
48/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 52#ifndef NAME_MAX
50# define NAME_MAX 4096 53# define NAME_MAX 4096
51#endif 54#endif
52 55
… …
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
… …
93 REQ_SENDFILE, 96 REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
95 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
97 REQ_MKNOD, REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 103 REQ_BUSY,
101}; 104};
102 105
103#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
105 108
106typedef struct aio_cb 109typedef struct aio_cb
107{ 110{
108 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
109 112
110 SV *data, *callback; 113 SV *callback, *fh;
111 SV *fh, *fh2; 114 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
113 Stat_t *statdata; 116 Stat_t *statdata;
114 off_t offset; 117 off_t offs;
115 size_t length; 118 size_t size;
116 ssize_t result; 119 ssize_t result;
117 120
118 STRLEN dataoffset; 121 STRLEN stroffset;
119 int type; 122 int type;
120 int fd, fd2; 123 int int1, int2;
121 int errorno; 124 int errorno;
122 mode_t mode; /* open */ 125 mode_t mode; /* open */
123 126
124 unsigned char flags; 127 unsigned char flags;
125 unsigned char pri; 128 unsigned char pri;
… …
127 SV *self; /* the perl counterpart of this request, if any */ 130 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 132} aio_cb;
130 133
131enum { 134enum {
132 FLAG_CANCELLED = 0x01, 135 FLAG_CANCELLED = 0x01,
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */
133}; 137};
134 138
135typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
137 141
… …
142 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 149};
146 150
151#define AIO_TICKS ((1000000 + 1023) >> 10)
152
153static unsigned int max_poll_time = 0;
154static unsigned int max_poll_reqs = 0;
155
156/* calculcate time difference in ~1/AIO_TICKS of a second */
157static int tvdiff (struct timeval *tv1, struct timeval *tv2)
158{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161}
162
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 164
149static unsigned int started, wanted; 165static unsigned int started, idle, wanted;
150 166
151#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
152# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
153#else 169#else
154# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
196 212
197 free (wrk); 213 free (wrk);
198} 214}
199 215
200static volatile unsigned int nreqs, nready, npending; 216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
201static volatile unsigned int max_outstanding = 0xffffffff; 218static volatile unsigned int max_outstanding = 0xffffffff;
202static int respipe [2]; 219static int respipe [2];
203 220
204static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
205static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
206static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
207 224
208#if WORDREAD_UNSAFE 225#if WORDACCESS_UNSAFE
209 226
210static unsigned int get_nready () 227static unsigned int get_nready ()
211{ 228{
212 unsigned int retval; 229 unsigned int retval;
213 230
… …
227 UNLOCK (reslock); 244 UNLOCK (reslock);
228 245
229 return retval; 246 return retval;
230} 247}
231 248
249static unsigned int get_nthreads ()
250{
251 unsigned int retval;
252
253 LOCK (wrklock);
254 retval = started;
255 UNLOCK (wrklock);
256
257 return retval;
258}
259
232#else 260#else
233 261
234# define get_nready() nready 262# define get_nready() nready
235# define get_npending() npending 263# define get_npending() npending
264# define get_nthreads() started
236 265
237#endif 266#endif
238 267
239/* 268/*
240 * a somewhat faster data structure might be nice, but 269 * a somewhat faster data structure might be nice, but
… …
288 } 317 }
289 318
290 abort (); 319 abort ();
291} 320}
292 321
293static int poll_cb (int max); 322static int poll_cb ();
294static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
295static void req_free (aio_req req); 324static void req_free (aio_req req);
296static void req_cancel (aio_req req); 325static void req_cancel (aio_req req);
297 326
298/* must be called at most once */ 327/* must be called at most once */
… …
319 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
320} 349}
321 350
322static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
323{ 352{
324 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
325 { 354 {
326 int old_len = grp->length; 355 int old_len = grp->size;
327 356
328 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
329 { 358 {
330 dSP; 359 dSP;
331 360
332 ENTER; 361 ENTER;
333 SAVETMPS; 362 SAVETMPS;
334 PUSHMARK (SP); 363 PUSHMARK (SP);
335 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
336 PUTBACK; 365 PUTBACK;
337 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
338 SPAGAIN; 367 SPAGAIN;
339 FREETMPS; 368 FREETMPS;
340 LEAVE; 369 LEAVE;
341 } 370 }
342 371
343 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
344 if (old_len == grp->length) 373 if (old_len == grp->size)
345 { 374 {
346 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
347 grp->fh2 = 0; 376 grp->sv2 = 0;
348 break; 377 break;
349 } 378 }
350 } 379 }
351} 380}
352 381
353static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
354{ 383{
355 --grp->length; 384 --grp->size;
356 385
357 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
358 aio_grp_feed (grp); 387 aio_grp_feed (grp);
359 388
360 /* finish, if done */ 389 /* finish, if done */
361 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
362 { 391 {
363 req_invoke (grp); 392 req_invoke (grp);
364 req_free (grp); 393 req_free (grp);
365 } 394 }
366} 395}
367 396
368static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
369{ 398{
370 dSP; 399 dSP;
400
401 if (req->flags & FLAG_DATA_RO_OFF)
402 SvREADONLY_off (req->sv1);
403
404 if (req->statdata)
405 {
406 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
407 PL_laststatval = req->result;
408 PL_statcache = *(req->statdata);
409 }
371 410
372 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
373 { 412 {
374 ENTER; 413 ENTER;
375 SAVETMPS; 414 SAVETMPS;
… …
383 SV *rv = &PL_sv_undef; 422 SV *rv = &PL_sv_undef;
384 423
385 if (req->result >= 0) 424 if (req->result >= 0)
386 { 425 {
387 int i; 426 int i;
388 char *buf = req->data2ptr; 427 char *buf = req->ptr2;
389 AV *av = newAV (); 428 AV *av = newAV ();
390 429
391 av_extend (av, req->result - 1); 430 av_extend (av, req->result - 1);
392 431
393 for (i = 0; i < req->result; ++i) 432 for (i = 0; i < req->result; ++i)
… …
421 XPUSHs (sv_2mortal (fh)); 460 XPUSHs (sv_2mortal (fh));
422 } 461 }
423 break; 462 break;
424 463
425 case REQ_GROUP: 464 case REQ_GROUP:
426 req->fd = 2; /* mark group as finished */ 465 req->int1 = 2; /* mark group as finished */
427 466
428 if (req->data) 467 if (req->sv1)
429 { 468 {
430 int i; 469 int i;
431 AV *av = (AV *)req->data; 470 AV *av = (AV *)req->sv1;
432 471
433 EXTEND (SP, AvFILL (av) + 1); 472 EXTEND (SP, AvFILL (av) + 1);
434 for (i = 0; i <= AvFILL (av); ++i) 473 for (i = 0; i <= AvFILL (av); ++i)
435 PUSHs (*av_fetch (av, i, 0)); 474 PUSHs (*av_fetch (av, i, 0));
436 } 475 }
… …
438 477
439 case REQ_NOP: 478 case REQ_NOP:
440 case REQ_BUSY: 479 case REQ_BUSY:
441 break; 480 break;
442 481
482 case REQ_READLINK:
483 if (req->result > 0)
484 {
485 SvCUR_set (req->sv1, req->result);
486 *SvEND (req->sv1) = 0;
487 PUSHs (req->sv1);
488 }
489 break;
490
491 case REQ_READ:
492 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
493 *SvEND (req->sv1) = 0;
494 /* fall through */
443 default: 495 default:
444 PUSHs (sv_2mortal (newSViv (req->result))); 496 PUSHs (sv_2mortal (newSViv (req->result)));
445 break; 497 break;
446 } 498 }
447 499
… …
482 { 534 {
483 sv_unmagic (req->self, PERL_MAGIC_ext); 535 sv_unmagic (req->self, PERL_MAGIC_ext);
484 SvREFCNT_dec (req->self); 536 SvREFCNT_dec (req->self);
485 } 537 }
486 538
487 SvREFCNT_dec (req->data);
488 SvREFCNT_dec (req->fh); 539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1);
489 SvREFCNT_dec (req->fh2); 541 SvREFCNT_dec (req->sv2);
490 SvREFCNT_dec (req->callback); 542 SvREFCNT_dec (req->callback);
491 Safefree (req->statdata); 543 Safefree (req->statdata);
492 544
493 if (req->type == REQ_READDIR) 545 if (req->type == REQ_READDIR)
494 free (req->data2ptr); 546 free (req->ptr2);
495 547
496 Safefree (req); 548 Safefree (req);
497} 549}
498 550
499static void req_cancel_subs (aio_req grp) 551static void req_cancel_subs (aio_req grp)
… …
501 aio_req sub; 553 aio_req sub;
502 554
503 if (grp->type != REQ_GROUP) 555 if (grp->type != REQ_GROUP)
504 return; 556 return;
505 557
506 SvREFCNT_dec (grp->fh2); 558 SvREFCNT_dec (grp->sv2);
507 grp->fh2 = 0; 559 grp->sv2 = 0;
508 560
509 for (sub = grp->grp_first; sub; sub = sub->grp_next) 561 for (sub = grp->grp_first; sub; sub = sub->grp_next)
510 req_cancel (sub); 562 req_cancel (sub);
511} 563}
512 564
… …
556 UNLOCK (wrklock); 608 UNLOCK (wrklock);
557} 609}
558 610
559static void maybe_start_thread () 611static void maybe_start_thread ()
560{ 612{
561#if 0 613 if (get_nthreads () >= wanted)
562 static struct timeval last;
563 struct timeval diff, now;
564#endif
565
566 if (started >= wanted)
567 return; 614 return;
568 615
569 if (nready <= nreqs - get_nready () - get_npending ()) 616 /* todo: maybe use idle here, but might be less exact */
617 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 618 return;
571
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 619
590 start_thread (); 620 start_thread ();
591} 621}
592 622
593static void req_send (aio_req req) 623static void req_send (aio_req req)
… …
620 LOCK (wrklock); 650 LOCK (wrklock);
621 --started; 651 --started;
622 UNLOCK (wrklock); 652 UNLOCK (wrklock);
623} 653}
624 654
655static void set_max_idle (int nthreads)
656{
657 if (WORDACCESS_UNSAFE) LOCK (reqlock);
658 max_idle = nthreads <= 0 ? 1 : nthreads;
659 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
660}
661
625static void min_parallel (int nthreads) 662static void min_parallel (int nthreads)
626{ 663{
627 if (wanted < nthreads) 664 if (wanted < nthreads)
628 wanted = nthreads; 665 wanted = nthreads;
629} 666}
… …
642 fd_set rfd; 679 fd_set rfd;
643 680
644 while (nreqs) 681 while (nreqs)
645 { 682 {
646 int size; 683 int size;
647 if (WORDREAD_UNSAFE) LOCK (reslock); 684 if (WORDACCESS_UNSAFE) LOCK (reslock);
648 size = res_queue.size; 685 size = res_queue.size;
649 if (WORDREAD_UNSAFE) UNLOCK (reslock); 686 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
650 687
651 if (size) 688 if (size)
652 return; 689 return;
653 690
654 maybe_start_thread (); 691 maybe_start_thread ();
… …
658 695
659 select (respipe [0] + 1, &rfd, 0, 0, 0); 696 select (respipe [0] + 1, &rfd, 0, 0, 0);
660 } 697 }
661} 698}
662 699
663static int poll_cb (int max) 700static int poll_cb ()
664{ 701{
665 dSP; 702 dSP;
666 int count = 0; 703 int count = 0;
704 int maxreqs = max_poll_reqs;
667 int do_croak = 0; 705 int do_croak = 0;
706 struct timeval tv_start, tv_now;
668 aio_req req; 707 aio_req req;
669 708
709 if (max_poll_time)
710 gettimeofday (&tv_start, 0);
711
670 for (;;) 712 for (;;)
671 { 713 {
672 while (max <= 0 || count < max) 714 for (;;)
673 { 715 {
674 maybe_start_thread (); 716 maybe_start_thread ();
675 717
676 LOCK (reslock); 718 LOCK (reslock);
677 req = reqq_shift (&res_queue); 719 req = reqq_shift (&res_queue);
… …
694 if (!req) 736 if (!req)
695 break; 737 break;
696 738
697 --nreqs; 739 --nreqs;
698 740
699 if (req->type == REQ_GROUP && req->length) 741 if (req->type == REQ_GROUP && req->size)
700 { 742 {
701 req->fd = 1; /* mark request as delayed */ 743 req->int1 = 1; /* mark request as delayed */
702 continue; 744 continue;
703 } 745 }
704 else 746 else
705 { 747 {
706 if (req->type == REQ_READ)
707 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
708
709 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
710 SvREADONLY_off (req->data);
711
712 if (req->statdata)
713 {
714 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
715 PL_laststatval = req->result;
716 PL_statcache = *(req->statdata);
717 }
718
719 req_invoke (req); 748 req_invoke (req);
720 749
721 count++; 750 count++;
722 } 751 }
723 752
724 req_free (req); 753 req_free (req);
754
755 if (maxreqs && !--maxreqs)
756 break;
757
758 if (max_poll_time)
759 {
760 gettimeofday (&tv_now, 0);
761
762 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
763 break;
764 }
725 } 765 }
726 766
727 if (nreqs <= max_outstanding) 767 if (nreqs <= max_outstanding)
728 break; 768 break;
729 769
730 poll_wait (); 770 poll_wait ();
731 771
732 max = 0; 772 ++maxreqs;
733 } 773 }
734 774
735 return count; 775 return count;
736} 776}
737 777
… …
955 int memofs = 0; 995 int memofs = 0;
956 int res = 0; 996 int res = 0;
957 int errorno; 997 int errorno;
958 998
959 LOCK (wrklock); 999 LOCK (wrklock);
960 self->dirp = dirp = opendir (req->dataptr); 1000 self->dirp = dirp = opendir (req->ptr1);
961 self->dbuf = u = malloc (sizeof (*u)); 1001 self->dbuf = u = malloc (sizeof (*u));
962 req->data2ptr = names = malloc (memlen); 1002 req->ptr2 = names = malloc (memlen);
963 UNLOCK (wrklock); 1003 UNLOCK (wrklock);
964 1004
965 if (dirp && u && names) 1005 if (dirp && u && names)
966 for (;;) 1006 for (;;)
967 { 1007 {
… …
981 1021
982 while (memofs + len > memlen) 1022 while (memofs + len > memlen)
983 { 1023 {
984 memlen *= 2; 1024 memlen *= 2;
985 LOCK (wrklock); 1025 LOCK (wrklock);
986 req->data2ptr = names = realloc (names, memlen); 1026 req->ptr2 = names = realloc (names, memlen);
987 UNLOCK (wrklock); 1027 UNLOCK (wrklock);
988 1028
989 if (!names) 1029 if (!names)
990 break; 1030 break;
991 } 1031 }
… …
1004/*****************************************************************************/ 1044/*****************************************************************************/
1005 1045
1006static void *aio_proc (void *thr_arg) 1046static void *aio_proc (void *thr_arg)
1007{ 1047{
1008 aio_req req; 1048 aio_req req;
1049 struct timespec ts;
1009 worker *self = (worker *)thr_arg; 1050 worker *self = (worker *)thr_arg;
1010 1051
1052 /* try to distribute timeouts somewhat evenly */
1053 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1054 * (1000000000UL / 1024UL);
1055
1011 for (;;) 1056 for (;;)
1012 { 1057 {
1058 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1059
1013 LOCK (reqlock); 1060 LOCK (reqlock);
1014 1061
1015 for (;;) 1062 for (;;)
1016 { 1063 {
1017 self->req = req = reqq_shift (&req_queue); 1064 self->req = req = reqq_shift (&req_queue);
1018 1065
1019 if (req) 1066 if (req)
1020 break; 1067 break;
1021 1068
1069 ++idle;
1070
1071 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1072 == ETIMEDOUT)
1073 {
1074 if (idle > max_idle)
1075 {
1076 --idle;
1077 UNLOCK (reqlock);
1078 LOCK (wrklock);
1079 --started;
1080 UNLOCK (wrklock);
1081 goto quit;
1082 }
1083
1084 /* we are allowed to idle, so do so without any timeout */
1022 pthread_cond_wait (&reqwait, &reqlock); 1085 pthread_cond_wait (&reqwait, &reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 }
1088
1089 --idle;
1023 } 1090 }
1024 1091
1025 --nready; 1092 --nready;
1026 1093
1027 UNLOCK (reqlock); 1094 UNLOCK (reqlock);
… …
1029 errno = 0; /* strictly unnecessary */ 1096 errno = 0; /* strictly unnecessary */
1030 1097
1031 if (!(req->flags & FLAG_CANCELLED)) 1098 if (!(req->flags & FLAG_CANCELLED))
1032 switch (req->type) 1099 switch (req->type)
1033 { 1100 {
1034 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1101 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1035 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1102 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1036 1103
1037 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1104 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1038 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1105 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1039 1106
1040 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break;
1041 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break;
1042 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break;
1043 1110
1044 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1111 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1045 case REQ_CLOSE: req->result = close (req->fd); break; 1112 case REQ_CLOSE: req->result = close (req->int1); break;
1046 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1047 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1048 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1049 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1050 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1117 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1051 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1118 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1119 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1052 1120
1053 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1054 case REQ_FSYNC: req->result = fsync (req->fd); break; 1122 case REQ_FSYNC: req->result = fsync (req->int1); break;
1055 case REQ_READDIR: scandir_ (req, self); break; 1123 case REQ_READDIR: scandir_ (req, self); break;
1056 1124
1057 case REQ_BUSY: 1125 case REQ_BUSY:
1058 { 1126 {
1059 struct timeval tv; 1127 struct timeval tv;
1060 1128
1061 tv.tv_sec = req->fd; 1129 tv.tv_sec = req->int1;
1062 tv.tv_usec = req->fd2; 1130 tv.tv_usec = req->int2;
1063 1131
1064 req->result = select (0, 0, 0, 0, &tv); 1132 req->result = select (0, 0, 0, 0, &tv);
1065 } 1133 }
1066 1134
1067 case REQ_GROUP: 1135 case REQ_GROUP:
1068 case REQ_NOP: 1136 case REQ_NOP:
1069 break; 1137 break;
1070 1138
1071 case REQ_QUIT: 1139 case REQ_QUIT:
1072 LOCK (wrklock); 1140 goto quit;
1073 worker_free (self);
1074 --started;
1075 UNLOCK (wrklock);
1076 return 0;
1077 1141
1078 default: 1142 default:
1079 req->result = ENOSYS; 1143 req->result = ENOSYS;
1080 break; 1144 break;
1081 } 1145 }
… …
1093 self->req = 0; 1157 self->req = 0;
1094 worker_clear (self); 1158 worker_clear (self);
1095 1159
1096 UNLOCK (reslock); 1160 UNLOCK (reslock);
1097 } 1161 }
1162
1163quit:
1164 LOCK (wrklock);
1165 worker_free (self);
1166 UNLOCK (wrklock);
1167
1168 return 0;
1098} 1169}
1099 1170
1100/*****************************************************************************/ 1171/*****************************************************************************/
1101 1172
1102static void atfork_prepare (void) 1173static void atfork_prepare (void)
… …
1144 1215
1145 worker_clear (wrk); 1216 worker_clear (wrk);
1146 worker_free (wrk); 1217 worker_free (wrk);
1147 } 1218 }
1148 1219
1149 started = 0; 1220 started = 0;
1221 idle = 0;
1150 nreqs = 0; 1222 nreqs = 0;
1223 nready = 0;
1224 npending = 0;
1151 1225
1152 close (respipe [0]); 1226 close (respipe [0]);
1153 close (respipe [1]); 1227 close (respipe [1]);
1154 create_pipe (); 1228 create_pipe ();
1155 1229
… …
1192 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1266 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1193 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1267 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1194 1268
1195 create_pipe (); 1269 create_pipe ();
1196 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1197
1198 start_thread ();
1199} 1271}
1272
1273void
1274max_poll_reqs (int nreqs)
1275 PROTOTYPE: $
1276 CODE:
1277 max_poll_reqs = nreqs;
1278
1279void
1280max_poll_time (double nseconds)
1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_time = nseconds * AIO_TICKS;
1200 1284
1201void 1285void
1202min_parallel (int nthreads) 1286min_parallel (int nthreads)
1203 PROTOTYPE: $ 1287 PROTOTYPE: $
1204 1288
1205void 1289void
1206max_parallel (int nthreads) 1290max_parallel (int nthreads)
1207 PROTOTYPE: $ 1291 PROTOTYPE: $
1292
1293void
1294max_idle (int nthreads)
1295 PROTOTYPE: $
1296 CODE:
1297 set_max_idle (nthreads);
1208 1298
1209int 1299int
1210max_outstanding (int maxreqs) 1300max_outstanding (int maxreqs)
1211 PROTOTYPE: $ 1301 PROTOTYPE: $
1212 CODE: 1302 CODE:
… …
1225 PPCODE: 1315 PPCODE:
1226{ 1316{
1227 dREQ; 1317 dREQ;
1228 1318
1229 req->type = REQ_OPEN; 1319 req->type = REQ_OPEN;
1230 req->data = newSVsv (pathname); 1320 req->sv1 = newSVsv (pathname);
1231 req->dataptr = SvPVbyte_nolen (req->data); 1321 req->ptr1 = SvPVbyte_nolen (pathname);
1232 req->fd = flags; 1322 req->int1 = flags;
1233 req->mode = mode; 1323 req->mode = mode;
1234 1324
1235 REQ_SEND; 1325 REQ_SEND;
1236} 1326}
1237 1327
… …
1247 PPCODE: 1337 PPCODE:
1248{ 1338{
1249 dREQ; 1339 dREQ;
1250 1340
1251 req->type = ix; 1341 req->type = ix;
1252 req->fh = newSVsv (fh); 1342 req->fh = newSVsv (fh);
1253 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1254 1344
1255 REQ_SEND (req); 1345 REQ_SEND (req);
1256} 1346}
1257 1347
1258void 1348void
… …
1267 aio_read = REQ_READ 1357 aio_read = REQ_READ
1268 aio_write = REQ_WRITE 1358 aio_write = REQ_WRITE
1269 PROTOTYPE: $$$$$;$ 1359 PROTOTYPE: $$$$$;$
1270 PPCODE: 1360 PPCODE:
1271{ 1361{
1272 aio_req req;
1273 STRLEN svlen; 1362 STRLEN svlen;
1274 char *svptr = SvPVbyte (data, svlen); 1363 char *svptr = SvPVbyte (data, svlen);
1275 1364
1276 SvUPGRADE (data, SVt_PV); 1365 SvUPGRADE (data, SVt_PV);
1277 SvPOK_on (data); 1366 SvPOK_on (data);
… …
1299 1388
1300 { 1389 {
1301 dREQ; 1390 dREQ;
1302 1391
1303 req->type = ix; 1392 req->type = ix;
1304 req->fh = newSVsv (fh); 1393 req->fh = newSVsv (fh);
1305 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1306 : IoOFP (sv_2io (fh))); 1395 : IoOFP (sv_2io (fh)));
1307 req->offset = offset; 1396 req->offs = offset;
1308 req->length = length; 1397 req->size = length;
1309 req->data = SvREFCNT_inc (data); 1398 req->sv1 = SvREFCNT_inc (data);
1310 req->dataptr = (char *)svptr + dataoffset; 1399 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset;
1311 1401
1312 if (!SvREADONLY (data)) 1402 if (!SvREADONLY (data))
1313 { 1403 {
1314 SvREADONLY_on (data); 1404 SvREADONLY_on (data);
1315 req->data2ptr = (void *)data; 1405 req->flags |= FLAG_DATA_RO_OFF;
1316 } 1406 }
1317 1407
1318 REQ_SEND; 1408 REQ_SEND;
1319 } 1409 }
1410}
1411
1412void
1413aio_readlink (path,callback=&PL_sv_undef)
1414 SV * path
1415 SV * callback
1416 PROTOTYPE: $$;$
1417 PPCODE:
1418{
1419 SV *data;
1420 dREQ;
1421
1422 data = newSV (NAME_MAX);
1423 SvPOK_on (data);
1424
1425 req->type = REQ_READLINK;
1426 req->fh = newSVsv (path);
1427 req->ptr2 = SvPVbyte_nolen (path);
1428 req->sv1 = data;
1429 req->ptr1 = SvPVbyte_nolen (data);
1430
1431 REQ_SEND;
1320} 1432}
1321 1433
1322void 1434void
1323aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1435aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1324 SV * out_fh 1436 SV * out_fh
… …
1330 PPCODE: 1442 PPCODE:
1331{ 1443{
1332 dREQ; 1444 dREQ;
1333 1445
1334 req->type = REQ_SENDFILE; 1446 req->type = REQ_SENDFILE;
1335 req->fh = newSVsv (out_fh); 1447 req->fh = newSVsv (out_fh);
1336 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1337 req->fh2 = newSVsv (in_fh); 1449 req->sv2 = newSVsv (in_fh);
1338 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1339 req->offset = in_offset; 1451 req->offs = in_offset;
1340 req->length = length; 1452 req->size = length;
1341 1453
1342 REQ_SEND; 1454 REQ_SEND;
1343} 1455}
1344 1456
1345void 1457void
… …
1352 PPCODE: 1464 PPCODE:
1353{ 1465{
1354 dREQ; 1466 dREQ;
1355 1467
1356 req->type = REQ_READAHEAD; 1468 req->type = REQ_READAHEAD;
1357 req->fh = newSVsv (fh); 1469 req->fh = newSVsv (fh);
1358 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1359 req->offset = offset; 1471 req->offs = offset;
1360 req->length = length; 1472 req->size = length;
1361 1473
1362 REQ_SEND; 1474 REQ_SEND;
1363} 1475}
1364 1476
1365void 1477void
… …
1381 } 1493 }
1382 1494
1383 if (SvPOK (fh_or_path)) 1495 if (SvPOK (fh_or_path))
1384 { 1496 {
1385 req->type = ix; 1497 req->type = ix;
1386 req->data = newSVsv (fh_or_path); 1498 req->sv1 = newSVsv (fh_or_path);
1387 req->dataptr = SvPVbyte_nolen (req->data); 1499 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1388 } 1500 }
1389 else 1501 else
1390 { 1502 {
1391 req->type = REQ_FSTAT; 1503 req->type = REQ_FSTAT;
1392 req->fh = newSVsv (fh_or_path); 1504 req->fh = newSVsv (fh_or_path);
1393 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1394 } 1506 }
1395 1507
1396 REQ_SEND; 1508 REQ_SEND;
1397} 1509}
1398 1510
1399void 1511void
1400aio_unlink (pathname,callback=&PL_sv_undef) 1512aio_unlink (pathname,callback=&PL_sv_undef)
1401 SV * pathname 1513 SV * pathname
1402 SV * callback 1514 SV * callback
1403 ALIAS: 1515 ALIAS:
1404 aio_unlink = REQ_UNLINK 1516 aio_unlink = REQ_UNLINK
1405 aio_rmdir = REQ_RMDIR 1517 aio_rmdir = REQ_RMDIR
1406 aio_readdir = REQ_READDIR 1518 aio_readdir = REQ_READDIR
1407 PPCODE: 1519 PPCODE:
1408{ 1520{
1409 dREQ; 1521 dREQ;
1410 1522
1411 req->type = ix; 1523 req->type = ix;
1412 req->data = newSVsv (pathname); 1524 req->sv1 = newSVsv (pathname);
1413 req->dataptr = SvPVbyte_nolen (req->data); 1525 req->ptr1 = SvPVbyte_nolen (pathname);
1414 1526
1415 REQ_SEND; 1527 REQ_SEND;
1416} 1528}
1417 1529
1418void 1530void
1419aio_link (oldpath,newpath,callback=&PL_sv_undef) 1531aio_link (oldpath,newpath,callback=&PL_sv_undef)
1420 SV * oldpath 1532 SV * oldpath
1421 SV * newpath 1533 SV * newpath
1422 SV * callback 1534 SV * callback
1423 ALIAS: 1535 ALIAS:
1424 aio_link = REQ_LINK 1536 aio_link = REQ_LINK
1425 aio_symlink = REQ_SYMLINK 1537 aio_symlink = REQ_SYMLINK
1426 aio_rename = REQ_RENAME 1538 aio_rename = REQ_RENAME
1427 PPCODE: 1539 PPCODE:
1428{ 1540{
1429 dREQ; 1541 dREQ;
1430 1542
1431 req->type = ix; 1543 req->type = ix;
1432 req->fh = newSVsv (oldpath); 1544 req->fh = newSVsv (oldpath);
1433 req->data2ptr = SvPVbyte_nolen (req->fh); 1545 req->ptr2 = SvPVbyte_nolen (req->fh);
1434 req->data = newSVsv (newpath); 1546 req->sv1 = newSVsv (newpath);
1435 req->dataptr = SvPVbyte_nolen (req->data); 1547 req->ptr1 = SvPVbyte_nolen (newpath);
1436 1548
1437 REQ_SEND; 1549 REQ_SEND;
1438} 1550}
1439 1551
1440void 1552void
1441aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1553aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1442 SV * pathname 1554 SV * pathname
1443 SV * callback 1555 SV * callback
1444 UV mode 1556 UV mode
1445 UV dev 1557 UV dev
1446 PPCODE: 1558 PPCODE:
1447{ 1559{
1448 dREQ; 1560 dREQ;
1449 1561
1450 req->type = REQ_MKNOD; 1562 req->type = REQ_MKNOD;
1451 req->data = newSVsv (pathname); 1563 req->sv1 = newSVsv (pathname);
1452 req->dataptr = SvPVbyte_nolen (req->data); 1564 req->ptr1 = SvPVbyte_nolen (pathname);
1453 req->mode = (mode_t)mode; 1565 req->mode = (mode_t)mode;
1454 req->offset = dev; 1566 req->offs = dev;
1455 1567
1456 REQ_SEND; 1568 REQ_SEND;
1457} 1569}
1458 1570
1459void 1571void
1460aio_busy (delay,callback=&PL_sv_undef) 1572aio_busy (delay,callback=&PL_sv_undef)
1461 double delay 1573 double delay
1462 SV * callback 1574 SV * callback
1463 PPCODE: 1575 PPCODE:
1464{ 1576{
1465 dREQ; 1577 dREQ;
1466 1578
1467 req->type = REQ_BUSY; 1579 req->type = REQ_BUSY;
1468 req->fd = delay < 0. ? 0 : delay; 1580 req->int1 = delay < 0. ? 0 : delay;
1469 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1470 1582
1471 REQ_SEND; 1583 REQ_SEND;
1472} 1584}
1473 1585
1474void 1586void
… …
1478 PPCODE: 1590 PPCODE:
1479{ 1591{
1480 dREQ; 1592 dREQ;
1481 1593
1482 req->type = REQ_GROUP; 1594 req->type = REQ_GROUP;
1595
1483 req_send (req); 1596 req_send (req);
1484
1485 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1597 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1486} 1598}
1487 1599
1488void 1600void
1489aio_nop (callback=&PL_sv_undef) 1601aio_nop (callback=&PL_sv_undef)
1490 SV * callback 1602 SV * callback
1491 PPCODE: 1603 PPCODE:
1492{ 1604{
1493 dREQ; 1605 dREQ;
1494 1606
1495 req->type = REQ_NOP; 1607 req->type = REQ_NOP;
… …
1549 1661
1550int 1662int
1551poll_cb(...) 1663poll_cb(...)
1552 PROTOTYPE: 1664 PROTOTYPE:
1553 CODE: 1665 CODE:
1554 RETVAL = poll_cb (0); 1666 RETVAL = poll_cb ();
1555 OUTPUT:
1556 RETVAL
1557
1558int
1559poll_some(int max = 0)
1560 PROTOTYPE: $
1561 CODE:
1562 RETVAL = poll_cb (max);
1563 OUTPUT: 1667 OUTPUT:
1564 RETVAL 1668 RETVAL
1565 1669
1566void 1670void
1567poll_wait() 1671poll_wait()
… …
1592 CODE: 1696 CODE:
1593 RETVAL = get_npending (); 1697 RETVAL = get_npending ();
1594 OUTPUT: 1698 OUTPUT:
1595 RETVAL 1699 RETVAL
1596 1700
1701int
1702nthreads()
1703 PROTOTYPE:
1704 CODE:
1705 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1706 RETVAL = started;
1707 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1708 OUTPUT:
1709 RETVAL
1710
1597PROTOTYPES: DISABLE 1711PROTOTYPES: DISABLE
1598 1712
1599MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1713MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1600 1714
1601void 1715void
… …
1616 PPCODE: 1730 PPCODE:
1617{ 1731{
1618 int i; 1732 int i;
1619 aio_req req; 1733 aio_req req;
1620 1734
1621 if (grp->fd == 2) 1735 if (grp->int1 == 2)
1622 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1736 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1623 1737
1624 for (i = 1; i < items; ++i ) 1738 for (i = 1; i < items; ++i )
1625 { 1739 {
1626 if (GIMME_V != G_VOID) 1740 if (GIMME_V != G_VOID)
… …
1628 1742
1629 req = SvAIO_REQ (ST (i)); 1743 req = SvAIO_REQ (ST (i));
1630 1744
1631 if (req) 1745 if (req)
1632 { 1746 {
1633 ++grp->length; 1747 ++grp->size;
1634 req->grp = grp; 1748 req->grp = grp;
1635 1749
1636 req->grp_prev = 0; 1750 req->grp_prev = 0;
1637 req->grp_next = grp->grp_first; 1751 req->grp_next = grp->grp_first;
1638 1752
… …
1661 av = newAV (); 1775 av = newAV ();
1662 1776
1663 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1664 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1665 1779
1666 SvREFCNT_dec (grp->data); 1780 SvREFCNT_dec (grp->sv1);
1667 grp->data = (SV *)av; 1781 grp->sv1 = (SV *)av;
1668} 1782}
1669 1783
1670void 1784void
1671errno (aio_req grp, int errorno = errno) 1785errno (aio_req grp, int errorno = errno)
1672 CODE: 1786 CODE:
1673 grp->errorno = errorno; 1787 grp->errorno = errorno;
1674 1788
1675void 1789void
1676limit (aio_req grp, int limit) 1790limit (aio_req grp, int limit)
1677 CODE: 1791 CODE:
1678 grp->fd2 = limit; 1792 grp->int2 = limit;
1679 aio_grp_feed (grp); 1793 aio_grp_feed (grp);
1680 1794
1681void 1795void
1682feed (aio_req grp, SV *callback=&PL_sv_undef) 1796feed (aio_req grp, SV *callback=&PL_sv_undef)
1683 CODE: 1797 CODE:
1684{ 1798{
1685 SvREFCNT_dec (grp->fh2); 1799 SvREFCNT_dec (grp->sv2);
1686 grp->fh2 = newSVsv (callback); 1800 grp->sv2 = newSVsv (callback);
1687 1801
1688 if (grp->fd2 <= 0) 1802 if (grp->int2 <= 0)
1689 grp->fd2 = 2; 1803 grp->int2 = 2;
1690 1804
1691 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1692} 1806}
1693 1807

Diff Legend

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