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.84 by root, Sat Oct 28 01:24:19 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC

… …
68 68
69/* wether word reads are potentially non-atomic. 69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs 70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes. 71 * on have atomic word read/writes.
72 */ 72 */
73#ifndef WORDREAD_UNSAFE 73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64 74# if __i386 || __x86_64
75# define WORDREAD_UNSAFE 0 75# define WORDACCESS_UNSAFE 0
76# else 76# else
77# define WORDREAD_UNSAFE 1 77# define WORDACCESS_UNSAFE 1
78# endif 78# endif
79#endif 79#endif
80 80
81/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
… …
86 LOCK (wrklock); \ 86 LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
89 if (!aio_buf) \ 89 if (!aio_buf) \
90 return -1; 90 return -1;
91
92typedef SV SV8; /* byte-sv, used for argument-checking */
91 93
92enum { 94enum {
93 REQ_QUIT, 95 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
96 REQ_SENDFILE, 98 REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
98 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 105 REQ_BUSY,
104}; 106};
105 107
106#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 110
109typedef struct aio_cb 111typedef struct aio_cb
110{ 112{
111 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
112 114
113 SV *data, *callback; 115 SV *callback, *fh;
114 SV *fh, *fh2; 116 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 118 off_t offs;
118 size_t length; 119 size_t size;
119 ssize_t result; 120 ssize_t result;
120 121
121 STRLEN dataoffset; 122 STRLEN stroffset;
122 int type; 123 int type;
123 int fd, fd2; 124 int int1, int2;
124 int errorno; 125 int errorno;
125 mode_t mode; /* open */ 126 mode_t mode; /* open */
126 127
127 unsigned char flags; 128 unsigned char flags;
128 unsigned char pri; 129 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 133} aio_cb;
133 134
134enum { 135enum {
135 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) */
136}; 139};
137 140
138typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
140 143
… …
144 147
145 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
146 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
147 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
148}; 151};
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}
149 164
150static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
151 166
152static unsigned int started, idle, wanted; 167static unsigned int started, idle, wanted;
153 168
… …
207 222
208static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
209static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
210static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 225static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
211 226
212#if WORDREAD_UNSAFE 227#if WORDACCESS_UNSAFE
213 228
214static unsigned int get_nready () 229static unsigned int get_nready ()
215{ 230{
216 unsigned int retval; 231 unsigned int retval;
217 232
… …
231 UNLOCK (reslock); 246 UNLOCK (reslock);
232 247
233 return retval; 248 return retval;
234} 249}
235 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
236#else 262#else
237 263
238# define get_nready() nready 264# define get_nready() nready
239# define get_npending() npending 265# define get_npending() npending
266# define get_nthreads() started
240 267
241#endif 268#endif
242 269
243/* 270/*
244 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
… …
292 } 319 }
293 320
294 abort (); 321 abort ();
295} 322}
296 323
297static int poll_cb (int max); 324static int poll_cb ();
298static void req_invoke (aio_req req); 325static void req_invoke (aio_req req);
299static void req_free (aio_req req); 326static void req_free (aio_req req);
300static void req_cancel (aio_req req); 327static void req_cancel (aio_req req);
301 328
302/* must be called at most once */ 329/* must be called at most once */
… …
323 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
324} 351}
325 352
326static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
327{ 354{
328 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
329 { 356 {
330 int old_len = grp->length; 357 int old_len = grp->size;
331 358
332 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
333 { 360 {
334 dSP; 361 dSP;
335 362
336 ENTER; 363 ENTER;
337 SAVETMPS; 364 SAVETMPS;
338 PUSHMARK (SP); 365 PUSHMARK (SP);
339 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
340 PUTBACK; 367 PUTBACK;
341 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
342 SPAGAIN; 369 SPAGAIN;
343 FREETMPS; 370 FREETMPS;
344 LEAVE; 371 LEAVE;
345 } 372 }
346 373
347 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
348 if (old_len == grp->length) 375 if (old_len == grp->size)
349 { 376 {
350 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
351 grp->fh2 = 0; 378 grp->sv2 = 0;
352 break; 379 break;
353 } 380 }
354 } 381 }
355} 382}
356 383
357static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
358{ 385{
359 --grp->length; 386 --grp->size;
360 387
361 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
362 aio_grp_feed (grp); 389 aio_grp_feed (grp);
363 390
364 /* finish, if done */ 391 /* finish, if done */
365 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
366 { 393 {
367 req_invoke (grp); 394 req_invoke (grp);
368 req_free (grp); 395 req_free (grp);
369 } 396 }
370} 397}
371 398
372static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
373{ 400{
374 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
375 405
376 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
377 { 407 {
378 ENTER; 408 ENTER;
379 SAVETMPS; 409 SAVETMPS;
… …
387 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
388 418
389 if (req->result >= 0) 419 if (req->result >= 0)
390 { 420 {
391 int i; 421 int i;
392 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
393 AV *av = newAV (); 423 AV *av = newAV ();
394 424
395 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
396 426
397 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
417 PUSHs (sv_2mortal (newSViv (req->result))); 447 PUSHs (sv_2mortal (newSViv (req->result)));
418 PUTBACK; 448 PUTBACK;
419 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
420 SPAGAIN; 450 SPAGAIN;
421 451
422 fh = SvREFCNT_inc (POPs); 452 fh = POPs;
423
424 PUSHMARK (SP); 453 PUSHMARK (SP);
425 XPUSHs (sv_2mortal (fh)); 454 XPUSHs (fh);
426 } 455 }
427 break; 456 break;
428 457
429 case REQ_GROUP: 458 case REQ_GROUP:
430 req->fd = 2; /* mark group as finished */ 459 req->int1 = 2; /* mark group as finished */
431 460
432 if (req->data) 461 if (req->sv1)
433 { 462 {
434 int i; 463 int i;
435 AV *av = (AV *)req->data; 464 AV *av = (AV *)req->sv1;
436 465
437 EXTEND (SP, AvFILL (av) + 1); 466 EXTEND (SP, AvFILL (av) + 1);
438 for (i = 0; i <= AvFILL (av); ++i) 467 for (i = 0; i <= AvFILL (av); ++i)
439 PUSHs (*av_fetch (av, i, 0)); 468 PUSHs (*av_fetch (av, i, 0));
440 } 469 }
… …
442 471
443 case REQ_NOP: 472 case REQ_NOP:
444 case REQ_BUSY: 473 case REQ_BUSY:
445 break; 474 break;
446 475
476 case REQ_READLINK:
477 if (req->result > 0)
478 {
479 SvCUR_set (req->sv1, req->result);
480 *SvEND (req->sv1) = 0;
481 PUSHs (req->sv1);
482 }
483 break;
484
485 case REQ_STAT:
486 case REQ_LSTAT:
487 case REQ_FSTAT:
488 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
489 PL_laststatval = req->result;
490 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result)));
492 break;
493
494 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result)));
498 break;
499
447 default: 500 default:
448 PUSHs (sv_2mortal (newSViv (req->result))); 501 PUSHs (sv_2mortal (newSViv (req->result)));
449 break; 502 break;
450 } 503 }
451 504
… …
486 { 539 {
487 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
488 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
489 } 542 }
490 543
491 SvREFCNT_dec (req->data);
492 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
493 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
494 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
495 Safefree (req->statdata);
496 548
497 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
498 free (req->data2ptr); 550 free (req->ptr2);
499 551
500 Safefree (req); 552 Safefree (req);
501} 553}
502 554
503static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
505 aio_req sub; 557 aio_req sub;
506 558
507 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
508 return; 560 return;
509 561
510 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
511 grp->fh2 = 0; 563 grp->sv2 = 0;
512 564
513 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
514 req_cancel (sub); 566 req_cancel (sub);
515} 567}
516 568
… …
560 UNLOCK (wrklock); 612 UNLOCK (wrklock);
561} 613}
562 614
563static void maybe_start_thread () 615static void maybe_start_thread ()
564{ 616{
565 if (started >= wanted) 617 if (get_nthreads () >= wanted)
566 return; 618 return;
567 619
568 /* todo: maybe use idle here, but might be less exact */ 620 /* todo: maybe use idle here, but might be less exact */
569 if ((int)nready <= (int)started - (int)(nreqs - get_nready () - get_npending ())) 621 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 622 return;
571 623
572 start_thread (); 624 start_thread ();
573} 625}
574 626
… …
602 LOCK (wrklock); 654 LOCK (wrklock);
603 --started; 655 --started;
604 UNLOCK (wrklock); 656 UNLOCK (wrklock);
605} 657}
606 658
659static void set_max_idle (int nthreads)
660{
661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
662 max_idle = nthreads <= 0 ? 1 : nthreads;
663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
664}
665
607static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
608{ 667{
609 if (wanted < nthreads) 668 if (wanted < nthreads)
610 wanted = nthreads; 669 wanted = nthreads;
611} 670}
… …
624 fd_set rfd; 683 fd_set rfd;
625 684
626 while (nreqs) 685 while (nreqs)
627 { 686 {
628 int size; 687 int size;
629 if (WORDREAD_UNSAFE) LOCK (reslock); 688 if (WORDACCESS_UNSAFE) LOCK (reslock);
630 size = res_queue.size; 689 size = res_queue.size;
631 if (WORDREAD_UNSAFE) UNLOCK (reslock); 690 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
632 691
633 if (size) 692 if (size)
634 return; 693 return;
635 694
636 maybe_start_thread (); 695 maybe_start_thread ();
… …
640 699
641 select (respipe [0] + 1, &rfd, 0, 0, 0); 700 select (respipe [0] + 1, &rfd, 0, 0, 0);
642 } 701 }
643} 702}
644 703
645static int poll_cb (int max) 704static int poll_cb ()
646{ 705{
647 dSP; 706 dSP;
648 int count = 0; 707 int count = 0;
708 int maxreqs = max_poll_reqs;
649 int do_croak = 0; 709 int do_croak = 0;
710 struct timeval tv_start, tv_now;
650 aio_req req; 711 aio_req req;
712
713 if (max_poll_time)
714 gettimeofday (&tv_start, 0);
651 715
652 for (;;) 716 for (;;)
653 { 717 {
654 while (max <= 0 || count < max) 718 for (;;)
655 { 719 {
656 maybe_start_thread (); 720 maybe_start_thread ();
657 721
658 LOCK (reslock); 722 LOCK (reslock);
659 req = reqq_shift (&res_queue); 723 req = reqq_shift (&res_queue);
… …
676 if (!req) 740 if (!req)
677 break; 741 break;
678 742
679 --nreqs; 743 --nreqs;
680 744
681 if (req->type == REQ_GROUP && req->length) 745 if (req->type == REQ_GROUP && req->size)
682 { 746 {
683 req->fd = 1; /* mark request as delayed */ 747 req->int1 = 1; /* mark request as delayed */
684 continue; 748 continue;
685 } 749 }
686 else 750 else
687 { 751 {
688 if (req->type == REQ_READ)
689 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
690
691 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
692 SvREADONLY_off (req->data);
693
694 if (req->statdata)
695 {
696 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
697 PL_laststatval = req->result;
698 PL_statcache = *(req->statdata);
699 }
700
701 req_invoke (req); 752 req_invoke (req);
702 753
703 count++; 754 count++;
704 } 755 }
705 756
706 req_free (req); 757 req_free (req);
758
759 if (maxreqs && !--maxreqs)
760 break;
761
762 if (max_poll_time)
763 {
764 gettimeofday (&tv_now, 0);
765
766 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
767 break;
768 }
707 } 769 }
708 770
709 if (nreqs <= max_outstanding) 771 if (nreqs <= max_outstanding)
710 break; 772 break;
711 773
712 poll_wait (); 774 poll_wait ();
713 775
714 max = 0; 776 ++maxreqs;
715 } 777 }
716 778
717 return count; 779 return count;
718} 780}
719 781
… …
937 int memofs = 0; 999 int memofs = 0;
938 int res = 0; 1000 int res = 0;
939 int errorno; 1001 int errorno;
940 1002
941 LOCK (wrklock); 1003 LOCK (wrklock);
942 self->dirp = dirp = opendir (req->dataptr); 1004 self->dirp = dirp = opendir (req->ptr1);
943 self->dbuf = u = malloc (sizeof (*u)); 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
944 req->data2ptr = names = malloc (memlen); 1007 req->ptr2 = names = malloc (memlen);
945 UNLOCK (wrklock); 1008 UNLOCK (wrklock);
946 1009
947 if (dirp && u && names) 1010 if (dirp && u && names)
948 for (;;) 1011 for (;;)
949 { 1012 {
… …
963 1026
964 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
965 { 1028 {
966 memlen *= 2; 1029 memlen *= 2;
967 LOCK (wrklock); 1030 LOCK (wrklock);
968 req->data2ptr = names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
969 UNLOCK (wrklock); 1032 UNLOCK (wrklock);
970 1033
971 if (!names) 1034 if (!names)
972 break; 1035 break;
973 } 1036 }
… …
1038 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
1039 1102
1040 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
1041 switch (req->type) 1104 switch (req->type)
1042 { 1105 {
1043 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1044 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1045 1108
1046 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1109 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1047 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1048 1111
1049 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1112 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1050 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1113 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1051 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1052 1115
1053 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1054 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
1055 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1056 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1057 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1058 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1059 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1060 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1061 1125
1062 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1063 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
1064 case REQ_READDIR: scandir_ (req, self); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
1065 1129
1066 case REQ_BUSY: 1130 case REQ_BUSY:
1067 { 1131 {
1068 struct timeval tv; 1132 struct timeval tv;
1069 1133
1070 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
1071 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
1072 1136
1073 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
1074 } 1138 }
1075 1139
1076 case REQ_GROUP: 1140 case REQ_GROUP:
… …
1210 create_pipe (); 1274 create_pipe ();
1211 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1212} 1276}
1213 1277
1214void 1278void
1279max_poll_reqs (int nreqs)
1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
1283
1284void
1285max_poll_time (double nseconds)
1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_time = nseconds * AIO_TICKS;
1289
1290void
1215min_parallel (int nthreads) 1291min_parallel (int nthreads)
1216 PROTOTYPE: $ 1292 PROTOTYPE: $
1217 1293
1218void 1294void
1219max_parallel (int nthreads) 1295max_parallel (int nthreads)
1220 PROTOTYPE: $ 1296 PROTOTYPE: $
1297
1298void
1299max_idle (int nthreads)
1300 PROTOTYPE: $
1301 CODE:
1302 set_max_idle (nthreads);
1221 1303
1222int 1304int
1223max_outstanding (int maxreqs) 1305max_outstanding (int maxreqs)
1224 PROTOTYPE: $ 1306 PROTOTYPE: $
1225 CODE: 1307 CODE:
… …
1228 OUTPUT: 1310 OUTPUT:
1229 RETVAL 1311 RETVAL
1230 1312
1231void 1313void
1232aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1233 SV * pathname 1315 SV8 * pathname
1234 int flags 1316 int flags
1235 int mode 1317 int mode
1236 SV * callback 1318 SV * callback
1237 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1238 PPCODE: 1320 PPCODE:
1239{ 1321{
1240 dREQ; 1322 dREQ;
1241 1323
1242 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1243 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1244 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1245 req->fd = flags; 1327 req->int1 = flags;
1246 req->mode = mode; 1328 req->mode = mode;
1247 1329
1248 REQ_SEND; 1330 REQ_SEND;
1249} 1331}
1250 1332
… …
1260 PPCODE: 1342 PPCODE:
1261{ 1343{
1262 dREQ; 1344 dREQ;
1263 1345
1264 req->type = ix; 1346 req->type = ix;
1265 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1267 1349
1268 REQ_SEND (req); 1350 REQ_SEND (req);
1269} 1351}
1270 1352
1271void 1353void
1272aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1273 SV * fh 1355 SV * fh
1274 UV offset 1356 UV offset
1275 UV length 1357 UV length
1276 SV * data 1358 SV8 * data
1277 UV dataoffset 1359 UV dataoffset
1278 SV * callback 1360 SV * callback
1279 ALIAS: 1361 ALIAS:
1280 aio_read = REQ_READ 1362 aio_read = REQ_READ
1281 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1282 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1283 PPCODE: 1365 PPCODE:
1284{ 1366{
1285 aio_req req;
1286 STRLEN svlen; 1367 STRLEN svlen;
1287 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1288 1369
1289 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1290 SvPOK_on (data); 1371 SvPOK_on (data);
… …
1312 1393
1313 { 1394 {
1314 dREQ; 1395 dREQ;
1315 1396
1316 req->type = ix; 1397 req->type = ix;
1317 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1318 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1319 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1320 req->offset = offset; 1401 req->offs = offset;
1321 req->length = length; 1402 req->size = length;
1322 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1323 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1324 1406
1325 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1326 { 1408 {
1327 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1328 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1329 } 1411 }
1330 1412
1331 REQ_SEND; 1413 REQ_SEND;
1332 } 1414 }
1415}
1416
1417void
1418aio_readlink (path,callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$
1422 PPCODE:
1423{
1424 SV *data;
1425 dREQ;
1426
1427 data = newSV (NAME_MAX);
1428 SvPOK_on (data);
1429
1430 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh);
1433 req->sv1 = data;
1434 req->ptr1 = SvPVbyte_nolen (data);
1435
1436 REQ_SEND;
1333} 1437}
1334 1438
1335void 1439void
1336aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1337 SV * out_fh 1441 SV * out_fh
… …
1343 PPCODE: 1447 PPCODE:
1344{ 1448{
1345 dREQ; 1449 dREQ;
1346 1450
1347 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1348 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1349 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1350 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1351 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1352 req->offset = in_offset; 1456 req->offs = in_offset;
1353 req->length = length; 1457 req->size = length;
1354 1458
1355 REQ_SEND; 1459 REQ_SEND;
1356} 1460}
1357 1461
1358void 1462void
… …
1365 PPCODE: 1469 PPCODE:
1366{ 1470{
1367 dREQ; 1471 dREQ;
1368 1472
1369 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1370 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1371 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1372 req->offset = offset; 1476 req->offs = offset;
1373 req->length = length; 1477 req->size = length;
1374 1478
1375 REQ_SEND; 1479 REQ_SEND;
1376} 1480}
1377 1481
1378void 1482void
1379aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1380 SV * fh_or_path 1484 SV8 * fh_or_path
1381 SV * callback 1485 SV * callback
1382 ALIAS: 1486 ALIAS:
1383 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1384 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1385 PPCODE: 1489 PPCODE:
1386{ 1490{
1387 dREQ; 1491 dREQ;
1388 1492
1389 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1390 if (!req->statdata) 1494 if (!req->ptr2)
1391 { 1495 {
1392 req_free (req); 1496 req_free (req);
1393 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1394 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1395 1501
1396 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1397 { 1503 {
1398 req->type = ix; 1504 req->type = ix;
1399 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1400 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1401 } 1507 }
1402 else 1508 else
1403 { 1509 {
1404 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1405 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1406 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1407 } 1513 }
1408 1514
1409 REQ_SEND; 1515 REQ_SEND;
1410} 1516}
1411 1517
1412void 1518void
1413aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1414 SV * pathname 1520 SV8 * pathname
1415 SV * callback 1521 SV * callback
1416 ALIAS: 1522 ALIAS:
1417 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1418 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1419 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1420 PPCODE: 1526 PPCODE:
1421{ 1527{
1422 dREQ; 1528 dREQ;
1423 1529
1424 req->type = ix; 1530 req->type = ix;
1425 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1426 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1427 1533
1428 REQ_SEND; 1534 REQ_SEND;
1429} 1535}
1430 1536
1431void 1537void
1432aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1433 SV * oldpath 1539 SV8 * oldpath
1434 SV * newpath 1540 SV8 * newpath
1435 SV * callback 1541 SV * callback
1436 ALIAS: 1542 ALIAS:
1437 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1438 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1439 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1440 PPCODE: 1546 PPCODE:
1441{ 1547{
1442 dREQ; 1548 dREQ;
1443 1549
1444 req->type = ix; 1550 req->type = ix;
1445 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1446 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1447 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1448 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1449 1555
1450 REQ_SEND; 1556 REQ_SEND;
1451} 1557}
1452 1558
1453void 1559void
1454aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1455 SV * pathname 1561 SV8 * pathname
1456 SV * callback 1562 SV * callback
1457 UV mode 1563 UV mode
1458 UV dev 1564 UV dev
1459 PPCODE: 1565 PPCODE:
1460{ 1566{
1461 dREQ; 1567 dREQ;
1462 1568
1463 req->type = REQ_MKNOD; 1569 req->type = REQ_MKNOD;
1464 req->data = newSVsv (pathname); 1570 req->sv1 = newSVsv (pathname);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1571 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 req->mode = (mode_t)mode; 1572 req->mode = (mode_t)mode;
1467 req->offset = dev; 1573 req->offs = dev;
1468 1574
1469 REQ_SEND; 1575 REQ_SEND;
1470} 1576}
1471 1577
1472void 1578void
1473aio_busy (delay,callback=&PL_sv_undef) 1579aio_busy (delay,callback=&PL_sv_undef)
1474 double delay 1580 double delay
1475 SV * callback 1581 SV * callback
1476 PPCODE: 1582 PPCODE:
1477{ 1583{
1478 dREQ; 1584 dREQ;
1479 1585
1480 req->type = REQ_BUSY; 1586 req->type = REQ_BUSY;
1481 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1482 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1483 1589
1484 REQ_SEND; 1590 REQ_SEND;
1485} 1591}
1486 1592
1487void 1593void
… …
1491 PPCODE: 1597 PPCODE:
1492{ 1598{
1493 dREQ; 1599 dREQ;
1494 1600
1495 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1496 req_send (req); 1603 req_send (req);
1497
1498 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1499} 1605}
1500 1606
1501void 1607void
1502aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1503 SV * callback 1609 SV * callback
1504 PPCODE: 1610 PPCODE:
1505{ 1611{
1506 dREQ; 1612 dREQ;
1507 1613
1508 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
… …
1537 PROTOTYPE: 1643 PROTOTYPE:
1538 CODE: 1644 CODE:
1539 while (nreqs) 1645 while (nreqs)
1540 { 1646 {
1541 poll_wait (); 1647 poll_wait ();
1542 poll_cb (0); 1648 poll_cb ();
1543 } 1649 }
1544 1650
1545void 1651int
1546poll() 1652poll()
1547 PROTOTYPE: 1653 PROTOTYPE:
1548 CODE: 1654 CODE:
1549 if (nreqs)
1550 {
1551 poll_wait (); 1655 poll_wait ();
1552 poll_cb (0); 1656 RETVAL = poll_cb ();
1553 } 1657 OUTPUT:
1658 RETVAL
1554 1659
1555int 1660int
1556poll_fileno() 1661poll_fileno()
1557 PROTOTYPE: 1662 PROTOTYPE:
1558 CODE: 1663 CODE:
… …
1562 1667
1563int 1668int
1564poll_cb(...) 1669poll_cb(...)
1565 PROTOTYPE: 1670 PROTOTYPE:
1566 CODE: 1671 CODE:
1567 RETVAL = poll_cb (0); 1672 RETVAL = poll_cb ();
1568 OUTPUT:
1569 RETVAL
1570
1571int
1572poll_some(int max = 0)
1573 PROTOTYPE: $
1574 CODE:
1575 RETVAL = poll_cb (max);
1576 OUTPUT: 1673 OUTPUT:
1577 RETVAL 1674 RETVAL
1578 1675
1579void 1676void
1580poll_wait() 1677poll_wait()
1581 PROTOTYPE: 1678 PROTOTYPE:
1582 CODE: 1679 CODE:
1583 if (nreqs)
1584 poll_wait (); 1680 poll_wait ();
1585 1681
1586int 1682int
1587nreqs() 1683nreqs()
1588 PROTOTYPE: 1684 PROTOTYPE:
1589 CODE: 1685 CODE:
… …
1605 CODE: 1701 CODE:
1606 RETVAL = get_npending (); 1702 RETVAL = get_npending ();
1607 OUTPUT: 1703 OUTPUT:
1608 RETVAL 1704 RETVAL
1609 1705
1706int
1707nthreads()
1708 PROTOTYPE:
1709 CODE:
1710 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1711 RETVAL = started;
1712 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1713 OUTPUT:
1714 RETVAL
1715
1610PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1611 1717
1612MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1718MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1613 1719
1614void 1720void
… …
1629 PPCODE: 1735 PPCODE:
1630{ 1736{
1631 int i; 1737 int i;
1632 aio_req req; 1738 aio_req req;
1633 1739
1634 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1635 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1741 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1636 1742
1637 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1638 { 1744 {
1639 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
… …
1641 1747
1642 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1643 1749
1644 if (req) 1750 if (req)
1645 { 1751 {
1646 ++grp->length; 1752 ++grp->size;
1647 req->grp = grp; 1753 req->grp = grp;
1648 1754
1649 req->grp_prev = 0; 1755 req->grp_prev = 0;
1650 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1651 1757
… …
1674 av = newAV (); 1780 av = newAV ();
1675 1781
1676 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1677 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1678 1784
1679 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1680 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1681} 1787}
1682 1788
1683void 1789void
1684errno (aio_req grp, int errorno = errno) 1790errno (aio_req grp, int errorno = errno)
1685 CODE: 1791 CODE:
1686 grp->errorno = errorno; 1792 grp->errorno = errorno;
1687 1793
1688void 1794void
1689limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1690 CODE: 1796 CODE:
1691 grp->fd2 = limit; 1797 grp->int2 = limit;
1692 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1693 1799
1694void 1800void
1695feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1696 CODE: 1802 CODE:
1697{ 1803{
1698 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1699 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1700 1806
1701 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1702 grp->fd2 = 2; 1808 grp->int2 = 2;
1703 1809
1704 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1705} 1811}
1706 1812

Diff Legend

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