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

Diff Legend

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