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.90 by root, Tue Oct 31 00:32:19 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)
… …
425 XPUSHs (sv_2mortal (fh)); 455 XPUSHs (sv_2mortal (fh));
426 } 456 }
427 break; 457 break;
428 458
429 case REQ_GROUP: 459 case REQ_GROUP:
430 req->fd = 2; /* mark group as finished */ 460 req->int1 = 2; /* mark group as finished */
431 461
432 if (req->data) 462 if (req->sv1)
433 { 463 {
434 int i; 464 int i;
435 AV *av = (AV *)req->data; 465 AV *av = (AV *)req->sv1;
436 466
437 EXTEND (SP, AvFILL (av) + 1); 467 EXTEND (SP, AvFILL (av) + 1);
438 for (i = 0; i <= AvFILL (av); ++i) 468 for (i = 0; i <= AvFILL (av); ++i)
439 PUSHs (*av_fetch (av, i, 0)); 469 PUSHs (*av_fetch (av, i, 0));
440 } 470 }
… …
442 472
443 case REQ_NOP: 473 case REQ_NOP:
444 case REQ_BUSY: 474 case REQ_BUSY:
445 break; 475 break;
446 476
477 case REQ_READLINK:
478 if (req->result > 0)
479 {
480 SvCUR_set (req->sv1, req->result);
481 *SvEND (req->sv1) = 0;
482 PUSHs (req->sv1);
483 }
484 break;
485
486 case REQ_STAT:
487 case REQ_LSTAT:
488 case REQ_FSTAT:
489 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
490 PL_laststatval = req->result;
491 PL_statcache = *(Stat_t *)(req->ptr2);
492 PUSHs (sv_2mortal (newSViv (req->result)));
493 break;
494
495 case REQ_READ:
496 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
497 *SvEND (req->sv1) = 0;
498 PUSHs (sv_2mortal (newSViv (req->result)));
499 break;
500
447 default: 501 default:
448 PUSHs (sv_2mortal (newSViv (req->result))); 502 PUSHs (sv_2mortal (newSViv (req->result)));
449 break; 503 break;
450 } 504 }
451 505
… …
486 { 540 {
487 sv_unmagic (req->self, PERL_MAGIC_ext); 541 sv_unmagic (req->self, PERL_MAGIC_ext);
488 SvREFCNT_dec (req->self); 542 SvREFCNT_dec (req->self);
489 } 543 }
490 544
491 SvREFCNT_dec (req->data);
492 SvREFCNT_dec (req->fh); 545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1);
493 SvREFCNT_dec (req->fh2); 547 SvREFCNT_dec (req->sv2);
494 SvREFCNT_dec (req->callback); 548 SvREFCNT_dec (req->callback);
495 Safefree (req->statdata);
496 549
497 if (req->type == REQ_READDIR) 550 if (req->flags & FLAG_PTR2_FREE)
498 free (req->data2ptr); 551 free (req->ptr2);
499 552
500 Safefree (req); 553 Safefree (req);
501} 554}
502 555
503static void req_cancel_subs (aio_req grp) 556static void req_cancel_subs (aio_req grp)
… …
505 aio_req sub; 558 aio_req sub;
506 559
507 if (grp->type != REQ_GROUP) 560 if (grp->type != REQ_GROUP)
508 return; 561 return;
509 562
510 SvREFCNT_dec (grp->fh2); 563 SvREFCNT_dec (grp->sv2);
511 grp->fh2 = 0; 564 grp->sv2 = 0;
512 565
513 for (sub = grp->grp_first; sub; sub = sub->grp_next) 566 for (sub = grp->grp_first; sub; sub = sub->grp_next)
514 req_cancel (sub); 567 req_cancel (sub);
515} 568}
516 569
… …
560 UNLOCK (wrklock); 613 UNLOCK (wrklock);
561} 614}
562 615
563static void maybe_start_thread () 616static void maybe_start_thread ()
564{ 617{
565 if (started >= wanted) 618 if (get_nthreads () >= wanted)
566 return; 619 return;
567 620
568 /* todo: maybe use idle here, but might be less exact */ 621 /* todo: maybe use idle here, but might be less exact */
569 if ((int)nready <= (int)started - (int)(nreqs - get_nready () - get_npending ())) 622 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 623 return;
571 624
572 start_thread (); 625 start_thread ();
573} 626}
574 627
… …
602 LOCK (wrklock); 655 LOCK (wrklock);
603 --started; 656 --started;
604 UNLOCK (wrklock); 657 UNLOCK (wrklock);
605} 658}
606 659
660static void set_max_idle (int nthreads)
661{
662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
663 max_idle = nthreads <= 0 ? 1 : nthreads;
664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
665}
666
607static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
608{ 668{
609 if (wanted < nthreads) 669 if (wanted < nthreads)
610 wanted = nthreads; 670 wanted = nthreads;
611} 671}
… …
624 fd_set rfd; 684 fd_set rfd;
625 685
626 while (nreqs) 686 while (nreqs)
627 { 687 {
628 int size; 688 int size;
629 if (WORDREAD_UNSAFE) LOCK (reslock); 689 if (WORDACCESS_UNSAFE) LOCK (reslock);
630 size = res_queue.size; 690 size = res_queue.size;
631 if (WORDREAD_UNSAFE) UNLOCK (reslock); 691 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
632 692
633 if (size) 693 if (size)
634 return; 694 return;
635 695
636 maybe_start_thread (); 696 maybe_start_thread ();
… …
640 700
641 select (respipe [0] + 1, &rfd, 0, 0, 0); 701 select (respipe [0] + 1, &rfd, 0, 0, 0);
642 } 702 }
643} 703}
644 704
645static int poll_cb (int max) 705static int poll_cb ()
646{ 706{
647 dSP; 707 dSP;
648 int count = 0; 708 int count = 0;
709 int maxreqs = max_poll_reqs;
649 int do_croak = 0; 710 int do_croak = 0;
711 struct timeval tv_start, tv_now;
650 aio_req req; 712 aio_req req;
713
714 if (max_poll_time)
715 gettimeofday (&tv_start, 0);
651 716
652 for (;;) 717 for (;;)
653 { 718 {
654 while (max <= 0 || count < max) 719 for (;;)
655 { 720 {
656 maybe_start_thread (); 721 maybe_start_thread ();
657 722
658 LOCK (reslock); 723 LOCK (reslock);
659 req = reqq_shift (&res_queue); 724 req = reqq_shift (&res_queue);
… …
676 if (!req) 741 if (!req)
677 break; 742 break;
678 743
679 --nreqs; 744 --nreqs;
680 745
681 if (req->type == REQ_GROUP && req->length) 746 if (req->type == REQ_GROUP && req->size)
682 { 747 {
683 req->fd = 1; /* mark request as delayed */ 748 req->int1 = 1; /* mark request as delayed */
684 continue; 749 continue;
685 } 750 }
686 else 751 else
687 { 752 {
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); 753 req_invoke (req);
702 754
703 count++; 755 count++;
704 } 756 }
705 757
706 req_free (req); 758 req_free (req);
759
760 if (maxreqs && !--maxreqs)
761 break;
762
763 if (max_poll_time)
764 {
765 gettimeofday (&tv_now, 0);
766
767 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
768 break;
769 }
707 } 770 }
708 771
709 if (nreqs <= max_outstanding) 772 if (nreqs <= max_outstanding)
710 break; 773 break;
711 774
712 poll_wait (); 775 poll_wait ();
713 776
714 max = 0; 777 ++maxreqs;
715 } 778 }
716 779
717 return count; 780 return count;
718} 781}
719 782
… …
937 int memofs = 0; 1000 int memofs = 0;
938 int res = 0; 1001 int res = 0;
939 int errorno; 1002 int errorno;
940 1003
941 LOCK (wrklock); 1004 LOCK (wrklock);
942 self->dirp = dirp = opendir (req->dataptr); 1005 self->dirp = dirp = opendir (req->ptr1);
943 self->dbuf = u = malloc (sizeof (*u)); 1006 self->dbuf = u = malloc (sizeof (*u));
1007 req->flags |= FLAG_PTR2_FREE;
944 req->data2ptr = names = malloc (memlen); 1008 req->ptr2 = names = malloc (memlen);
945 UNLOCK (wrklock); 1009 UNLOCK (wrklock);
946 1010
947 if (dirp && u && names) 1011 if (dirp && u && names)
948 for (;;) 1012 for (;;)
949 { 1013 {
… …
963 1027
964 while (memofs + len > memlen) 1028 while (memofs + len > memlen)
965 { 1029 {
966 memlen *= 2; 1030 memlen *= 2;
967 LOCK (wrklock); 1031 LOCK (wrklock);
968 req->data2ptr = names = realloc (names, memlen); 1032 req->ptr2 = names = realloc (names, memlen);
969 UNLOCK (wrklock); 1033 UNLOCK (wrklock);
970 1034
971 if (!names) 1035 if (!names)
972 break; 1036 break;
973 } 1037 }
… …
1038 errno = 0; /* strictly unnecessary */ 1102 errno = 0; /* strictly unnecessary */
1039 1103
1040 if (!(req->flags & FLAG_CANCELLED)) 1104 if (!(req->flags & FLAG_CANCELLED))
1041 switch (req->type) 1105 switch (req->type)
1042 { 1106 {
1043 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1044 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1108 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1045 1109
1046 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1110 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1047 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1111 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1048 1112
1049 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1113 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1050 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1114 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1051 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1115 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1052 1116
1053 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1117 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1054 case REQ_CLOSE: req->result = close (req->fd); break; 1118 case REQ_CLOSE: req->result = close (req->int1); break;
1055 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1056 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1057 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1058 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1059 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1123 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; 1124 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1125 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1061 1126
1062 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1063 case REQ_FSYNC: req->result = fsync (req->fd); break; 1128 case REQ_FSYNC: req->result = fsync (req->int1); break;
1064 case REQ_READDIR: scandir_ (req, self); break; 1129 case REQ_READDIR: scandir_ (req, self); break;
1065 1130
1066 case REQ_BUSY: 1131 case REQ_BUSY:
1067 { 1132 {
1068 struct timeval tv; 1133 struct timeval tv;
1069 1134
1070 tv.tv_sec = req->fd; 1135 tv.tv_sec = req->int1;
1071 tv.tv_usec = req->fd2; 1136 tv.tv_usec = req->int2;
1072 1137
1073 req->result = select (0, 0, 0, 0, &tv); 1138 req->result = select (0, 0, 0, 0, &tv);
1074 } 1139 }
1075 1140
1076 case REQ_GROUP: 1141 case REQ_GROUP:
… …
1210 create_pipe (); 1275 create_pipe ();
1211 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1212} 1277}
1213 1278
1214void 1279void
1280max_poll_reqs (int nreqs)
1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_reqs = nreqs;
1284
1285void
1286max_poll_time (double nseconds)
1287 PROTOTYPE: $
1288 CODE:
1289 max_poll_time = nseconds * AIO_TICKS;
1290
1291void
1215min_parallel (int nthreads) 1292min_parallel (int nthreads)
1216 PROTOTYPE: $ 1293 PROTOTYPE: $
1217 1294
1218void 1295void
1219max_parallel (int nthreads) 1296max_parallel (int nthreads)
1220 PROTOTYPE: $ 1297 PROTOTYPE: $
1298
1299void
1300max_idle (int nthreads)
1301 PROTOTYPE: $
1302 CODE:
1303 set_max_idle (nthreads);
1221 1304
1222int 1305int
1223max_outstanding (int maxreqs) 1306max_outstanding (int maxreqs)
1224 PROTOTYPE: $ 1307 PROTOTYPE: $
1225 CODE: 1308 CODE:
… …
1228 OUTPUT: 1311 OUTPUT:
1229 RETVAL 1312 RETVAL
1230 1313
1231void 1314void
1232aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1315aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1233 SV * pathname 1316 SV8 * pathname
1234 int flags 1317 int flags
1235 int mode 1318 int mode
1236 SV * callback 1319 SV * callback
1237 PROTOTYPE: $$$;$ 1320 PROTOTYPE: $$$;$
1238 PPCODE: 1321 PPCODE:
1239{ 1322{
1240 dREQ; 1323 dREQ;
1241 1324
1242 req->type = REQ_OPEN; 1325 req->type = REQ_OPEN;
1243 req->data = newSVsv (pathname); 1326 req->sv1 = newSVsv (pathname);
1244 req->dataptr = SvPVbyte_nolen (req->data); 1327 req->ptr1 = SvPVbyte_nolen (req->sv1);
1245 req->fd = flags; 1328 req->int1 = flags;
1246 req->mode = mode; 1329 req->mode = mode;
1247 1330
1248 REQ_SEND; 1331 REQ_SEND;
1249} 1332}
1250 1333
… …
1260 PPCODE: 1343 PPCODE:
1261{ 1344{
1262 dREQ; 1345 dREQ;
1263 1346
1264 req->type = ix; 1347 req->type = ix;
1265 req->fh = newSVsv (fh); 1348 req->fh = newSVsv (fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1267 1350
1268 REQ_SEND (req); 1351 REQ_SEND (req);
1269} 1352}
1270 1353
1271void 1354void
1272aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1273 SV * fh 1356 SV * fh
1274 UV offset 1357 UV offset
1275 UV length 1358 UV length
1276 SV * data 1359 SV8 * data
1277 UV dataoffset 1360 UV dataoffset
1278 SV * callback 1361 SV * callback
1279 ALIAS: 1362 ALIAS:
1280 aio_read = REQ_READ 1363 aio_read = REQ_READ
1281 aio_write = REQ_WRITE 1364 aio_write = REQ_WRITE
1282 PROTOTYPE: $$$$$;$ 1365 PROTOTYPE: $$$$$;$
1283 PPCODE: 1366 PPCODE:
1284{ 1367{
1285 aio_req req;
1286 STRLEN svlen; 1368 STRLEN svlen;
1287 char *svptr = SvPVbyte (data, svlen); 1369 char *svptr = SvPVbyte (data, svlen);
1288 1370
1289 SvUPGRADE (data, SVt_PV); 1371 SvUPGRADE (data, SVt_PV);
1290 SvPOK_on (data); 1372 SvPOK_on (data);
… …
1312 1394
1313 { 1395 {
1314 dREQ; 1396 dREQ;
1315 1397
1316 req->type = ix; 1398 req->type = ix;
1317 req->fh = newSVsv (fh); 1399 req->fh = newSVsv (fh);
1318 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1319 : IoOFP (sv_2io (fh))); 1401 : IoOFP (sv_2io (fh)));
1320 req->offset = offset; 1402 req->offs = offset;
1321 req->length = length; 1403 req->size = length;
1322 req->data = SvREFCNT_inc (data); 1404 req->sv1 = SvREFCNT_inc (data);
1323 req->dataptr = (char *)svptr + dataoffset; 1405 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset;
1324 1407
1325 if (!SvREADONLY (data)) 1408 if (!SvREADONLY (data))
1326 { 1409 {
1327 SvREADONLY_on (data); 1410 SvREADONLY_on (data);
1328 req->data2ptr = (void *)data; 1411 req->flags |= FLAG_SV1_RO_OFF;
1329 } 1412 }
1330 1413
1331 REQ_SEND; 1414 REQ_SEND;
1332 } 1415 }
1416}
1417
1418void
1419aio_readlink (path,callback=&PL_sv_undef)
1420 SV8 * path
1421 SV * callback
1422 PROTOTYPE: $$;$
1423 PPCODE:
1424{
1425 SV *data;
1426 dREQ;
1427
1428 data = newSV (NAME_MAX);
1429 SvPOK_on (data);
1430
1431 req->type = REQ_READLINK;
1432 req->fh = newSVsv (path);
1433 req->ptr2 = SvPVbyte_nolen (req->fh);
1434 req->sv1 = data;
1435 req->ptr1 = SvPVbyte_nolen (data);
1436
1437 REQ_SEND;
1333} 1438}
1334 1439
1335void 1440void
1336aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1441aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1337 SV * out_fh 1442 SV * out_fh
… …
1343 PPCODE: 1448 PPCODE:
1344{ 1449{
1345 dREQ; 1450 dREQ;
1346 1451
1347 req->type = REQ_SENDFILE; 1452 req->type = REQ_SENDFILE;
1348 req->fh = newSVsv (out_fh); 1453 req->fh = newSVsv (out_fh);
1349 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1350 req->fh2 = newSVsv (in_fh); 1455 req->sv2 = newSVsv (in_fh);
1351 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1352 req->offset = in_offset; 1457 req->offs = in_offset;
1353 req->length = length; 1458 req->size = length;
1354 1459
1355 REQ_SEND; 1460 REQ_SEND;
1356} 1461}
1357 1462
1358void 1463void
… …
1365 PPCODE: 1470 PPCODE:
1366{ 1471{
1367 dREQ; 1472 dREQ;
1368 1473
1369 req->type = REQ_READAHEAD; 1474 req->type = REQ_READAHEAD;
1370 req->fh = newSVsv (fh); 1475 req->fh = newSVsv (fh);
1371 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1372 req->offset = offset; 1477 req->offs = offset;
1373 req->length = length; 1478 req->size = length;
1374 1479
1375 REQ_SEND; 1480 REQ_SEND;
1376} 1481}
1377 1482
1378void 1483void
1379aio_stat (fh_or_path,callback=&PL_sv_undef) 1484aio_stat (fh_or_path,callback=&PL_sv_undef)
1380 SV * fh_or_path 1485 SV8 * fh_or_path
1381 SV * callback 1486 SV * callback
1382 ALIAS: 1487 ALIAS:
1383 aio_stat = REQ_STAT 1488 aio_stat = REQ_STAT
1384 aio_lstat = REQ_LSTAT 1489 aio_lstat = REQ_LSTAT
1385 PPCODE: 1490 PPCODE:
1386{ 1491{
1387 dREQ; 1492 dREQ;
1388 1493
1389 New (0, req->statdata, 1, Stat_t); 1494 req->ptr2 = malloc (sizeof (Stat_t));
1390 if (!req->statdata) 1495 if (!req->ptr2)
1391 { 1496 {
1392 req_free (req); 1497 req_free (req);
1393 croak ("out of memory during aio_req->statdata allocation"); 1498 croak ("out of memory during aio_stat statdata allocation");
1394 } 1499 }
1500
1501 req->flags |= FLAG_PTR2_FREE;
1395 1502
1396 if (SvPOK (fh_or_path)) 1503 if (SvPOK (fh_or_path))
1397 { 1504 {
1398 req->type = ix; 1505 req->type = ix;
1399 req->data = newSVsv (fh_or_path); 1506 req->sv1 = newSVsv (fh_or_path);
1400 req->dataptr = SvPVbyte_nolen (req->data); 1507 req->ptr1 = SvPVbyte_nolen (req->sv1);
1401 } 1508 }
1402 else 1509 else
1403 { 1510 {
1404 req->type = REQ_FSTAT; 1511 req->type = REQ_FSTAT;
1405 req->fh = newSVsv (fh_or_path); 1512 req->fh = newSVsv (fh_or_path);
1406 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1407 } 1514 }
1408 1515
1409 REQ_SEND; 1516 REQ_SEND;
1410} 1517}
1411 1518
1412void 1519void
1413aio_unlink (pathname,callback=&PL_sv_undef) 1520aio_unlink (pathname,callback=&PL_sv_undef)
1414 SV * pathname 1521 SV8 * pathname
1415 SV * callback 1522 SV * callback
1416 ALIAS: 1523 ALIAS:
1417 aio_unlink = REQ_UNLINK 1524 aio_unlink = REQ_UNLINK
1418 aio_rmdir = REQ_RMDIR 1525 aio_rmdir = REQ_RMDIR
1419 aio_readdir = REQ_READDIR 1526 aio_readdir = REQ_READDIR
1420 PPCODE: 1527 PPCODE:
1421{ 1528{
1422 dREQ; 1529 dREQ;
1423 1530
1424 req->type = ix; 1531 req->type = ix;
1425 req->data = newSVsv (pathname); 1532 req->sv1 = newSVsv (pathname);
1426 req->dataptr = SvPVbyte_nolen (req->data); 1533 req->ptr1 = SvPVbyte_nolen (req->sv1);
1427 1534
1428 REQ_SEND; 1535 REQ_SEND;
1429} 1536}
1430 1537
1431void 1538void
1432aio_link (oldpath,newpath,callback=&PL_sv_undef) 1539aio_link (oldpath,newpath,callback=&PL_sv_undef)
1433 SV * oldpath 1540 SV8 * oldpath
1434 SV * newpath 1541 SV8 * newpath
1435 SV * callback 1542 SV * callback
1436 ALIAS: 1543 ALIAS:
1437 aio_link = REQ_LINK 1544 aio_link = REQ_LINK
1438 aio_symlink = REQ_SYMLINK 1545 aio_symlink = REQ_SYMLINK
1439 aio_rename = REQ_RENAME 1546 aio_rename = REQ_RENAME
1440 PPCODE: 1547 PPCODE:
1441{ 1548{
1442 dREQ; 1549 dREQ;
1443 1550
1444 req->type = ix; 1551 req->type = ix;
1445 req->fh = newSVsv (oldpath); 1552 req->fh = newSVsv (oldpath);
1446 req->data2ptr = SvPVbyte_nolen (req->fh); 1553 req->ptr2 = SvPVbyte_nolen (req->fh);
1447 req->data = newSVsv (newpath); 1554 req->sv1 = newSVsv (newpath);
1448 req->dataptr = SvPVbyte_nolen (req->data); 1555 req->ptr1 = SvPVbyte_nolen (req->sv1);
1449 1556
1450 REQ_SEND; 1557 REQ_SEND;
1451} 1558}
1452 1559
1453void 1560void
1454aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1561aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1455 SV * pathname 1562 SV8 * pathname
1456 SV * callback 1563 SV * callback
1457 UV mode 1564 UV mode
1458 UV dev 1565 UV dev
1459 PPCODE: 1566 PPCODE:
1460{ 1567{
1461 dREQ; 1568 dREQ;
1462 1569
1463 req->type = REQ_MKNOD; 1570 req->type = REQ_MKNOD;
1464 req->data = newSVsv (pathname); 1571 req->sv1 = newSVsv (pathname);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1572 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 req->mode = (mode_t)mode; 1573 req->mode = (mode_t)mode;
1467 req->offset = dev; 1574 req->offs = dev;
1468 1575
1469 REQ_SEND; 1576 REQ_SEND;
1470} 1577}
1471 1578
1472void 1579void
1473aio_busy (delay,callback=&PL_sv_undef) 1580aio_busy (delay,callback=&PL_sv_undef)
1474 double delay 1581 double delay
1475 SV * callback 1582 SV * callback
1476 PPCODE: 1583 PPCODE:
1477{ 1584{
1478 dREQ; 1585 dREQ;
1479 1586
1480 req->type = REQ_BUSY; 1587 req->type = REQ_BUSY;
1481 req->fd = delay < 0. ? 0 : delay; 1588 req->int1 = delay < 0. ? 0 : delay;
1482 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1483 1590
1484 REQ_SEND; 1591 REQ_SEND;
1485} 1592}
1486 1593
1487void 1594void
… …
1491 PPCODE: 1598 PPCODE:
1492{ 1599{
1493 dREQ; 1600 dREQ;
1494 1601
1495 req->type = REQ_GROUP; 1602 req->type = REQ_GROUP;
1603
1496 req_send (req); 1604 req_send (req);
1497
1498 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1605 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1499} 1606}
1500 1607
1501void 1608void
1502aio_nop (callback=&PL_sv_undef) 1609aio_nop (callback=&PL_sv_undef)
1503 SV * callback 1610 SV * callback
1504 PPCODE: 1611 PPCODE:
1505{ 1612{
1506 dREQ; 1613 dREQ;
1507 1614
1508 req->type = REQ_NOP; 1615 req->type = REQ_NOP;
… …
1562 1669
1563int 1670int
1564poll_cb(...) 1671poll_cb(...)
1565 PROTOTYPE: 1672 PROTOTYPE:
1566 CODE: 1673 CODE:
1567 RETVAL = poll_cb (0); 1674 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: 1675 OUTPUT:
1577 RETVAL 1676 RETVAL
1578 1677
1579void 1678void
1580poll_wait() 1679poll_wait()
… …
1605 CODE: 1704 CODE:
1606 RETVAL = get_npending (); 1705 RETVAL = get_npending ();
1607 OUTPUT: 1706 OUTPUT:
1608 RETVAL 1707 RETVAL
1609 1708
1709int
1710nthreads()
1711 PROTOTYPE:
1712 CODE:
1713 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1714 RETVAL = started;
1715 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1716 OUTPUT:
1717 RETVAL
1718
1610PROTOTYPES: DISABLE 1719PROTOTYPES: DISABLE
1611 1720
1612MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1721MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1613 1722
1614void 1723void
… …
1629 PPCODE: 1738 PPCODE:
1630{ 1739{
1631 int i; 1740 int i;
1632 aio_req req; 1741 aio_req req;
1633 1742
1634 if (grp->fd == 2) 1743 if (grp->int1 == 2)
1635 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1744 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1636 1745
1637 for (i = 1; i < items; ++i ) 1746 for (i = 1; i < items; ++i )
1638 { 1747 {
1639 if (GIMME_V != G_VOID) 1748 if (GIMME_V != G_VOID)
… …
1641 1750
1642 req = SvAIO_REQ (ST (i)); 1751 req = SvAIO_REQ (ST (i));
1643 1752
1644 if (req) 1753 if (req)
1645 { 1754 {
1646 ++grp->length; 1755 ++grp->size;
1647 req->grp = grp; 1756 req->grp = grp;
1648 1757
1649 req->grp_prev = 0; 1758 req->grp_prev = 0;
1650 req->grp_next = grp->grp_first; 1759 req->grp_next = grp->grp_first;
1651 1760
… …
1674 av = newAV (); 1783 av = newAV ();
1675 1784
1676 for (i = 1; i < items; ++i ) 1785 for (i = 1; i < items; ++i )
1677 av_push (av, newSVsv (ST (i))); 1786 av_push (av, newSVsv (ST (i)));
1678 1787
1679 SvREFCNT_dec (grp->data); 1788 SvREFCNT_dec (grp->sv1);
1680 grp->data = (SV *)av; 1789 grp->sv1 = (SV *)av;
1681} 1790}
1682 1791
1683void 1792void
1684errno (aio_req grp, int errorno = errno) 1793errno (aio_req grp, int errorno = errno)
1685 CODE: 1794 CODE:
1686 grp->errorno = errorno; 1795 grp->errorno = errorno;
1687 1796
1688void 1797void
1689limit (aio_req grp, int limit) 1798limit (aio_req grp, int limit)
1690 CODE: 1799 CODE:
1691 grp->fd2 = limit; 1800 grp->int2 = limit;
1692 aio_grp_feed (grp); 1801 aio_grp_feed (grp);
1693 1802
1694void 1803void
1695feed (aio_req grp, SV *callback=&PL_sv_undef) 1804feed (aio_req grp, SV *callback=&PL_sv_undef)
1696 CODE: 1805 CODE:
1697{ 1806{
1698 SvREFCNT_dec (grp->fh2); 1807 SvREFCNT_dec (grp->sv2);
1699 grp->fh2 = newSVsv (callback); 1808 grp->sv2 = newSVsv (callback);
1700 1809
1701 if (grp->fd2 <= 0) 1810 if (grp->int2 <= 0)
1702 grp->fd2 = 2; 1811 grp->int2 = 2;
1703 1812
1704 aio_grp_feed (grp); 1813 aio_grp_feed (grp);
1705} 1814}
1706 1815

Diff Legend

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