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.85 by root, Sat Oct 28 23:32:29 2006 UTC vs.
Revision 1.97 by root, Sun Jan 7 22:59:57 2007 UTC

… …
17#include "autoconf/config.h" 17#include "autoconf/config.h"
18 18
19#include <pthread.h> 19#include <pthread.h>
20 20
21#include <stddef.h> 21#include <stddef.h>
22#include <stdlib.h>
22#include <errno.h> 23#include <errno.h>
23#include <sys/time.h> 24#include <sys/time.h>
24#include <sys/select.h> 25#include <sys/select.h>
25#include <sys/types.h> 26#include <sys/types.h>
26#include <sys/stat.h> 27#include <sys/stat.h>
… …
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 89 UNLOCK (wrklock); \
89 if (!aio_buf) \ 90 if (!aio_buf) \
90 return -1; 91 return -1;
91 92
93typedef SV SV8; /* byte-sv, used for argument-checking */
94
92enum { 95enum {
93 REQ_QUIT, 96 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 97 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 98 REQ_READ, REQ_WRITE, REQ_READAHEAD,
96 REQ_SENDFILE, 99 REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 100 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
98 REQ_FSYNC, REQ_FDATASYNC, 101 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 102 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 103 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 104 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 105 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 106 REQ_BUSY,
104}; 107};
105 108
106#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 111
109typedef struct aio_cb 112typedef struct aio_cb
110{ 113{
111 struct aio_cb *volatile next; 114 struct aio_cb *volatile next;
112 115
113 SV *data, *callback; 116 SV *callback, *fh;
114 SV *fh, *fh2; 117 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 118 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 119 off_t offs;
118 size_t length; 120 size_t size;
119 ssize_t result; 121 ssize_t result;
120 122
121 STRLEN dataoffset; 123 STRLEN stroffset;
122 int type; 124 int type;
123 int fd, fd2; 125 int int1, int2;
124 int errorno; 126 int errorno;
125 mode_t mode; /* open */ 127 mode_t mode; /* open */
126 128
127 unsigned char flags; 129 unsigned char flags;
128 unsigned char pri; 130 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 132 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 134} aio_cb;
133 135
134enum { 136enum {
135 FLAG_CANCELLED = 0x01, 137 FLAG_CANCELLED = 0x01, /* request was cancelled */
138 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
139 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 140};
137 141
138typedef aio_cb *aio_req; 142typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 143typedef aio_cb *aio_req_ornot;
140 144
… …
155/* calculcate time difference in ~1/AIO_TICKS of a second */ 159/* calculcate time difference in ~1/AIO_TICKS of a second */
156static int tvdiff (struct timeval *tv1, struct timeval *tv2) 160static int tvdiff (struct timeval *tv1, struct timeval *tv2)
157{ 161{
158 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 162 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
159 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 163 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
164}
165
166static pthread_t main_tid;
167static int main_sig;
168static int block_sig_level;
169
170void block_sig ()
171{
172 sigset_t ss;
173
174 if (block_sig_level++)
175 return;
176
177 if (!main_sig)
178 return;
179
180 sigemptyset (&ss);
181 sigaddset (&ss, main_sig);
182 pthread_sigmask (SIG_BLOCK, &ss, 0);
183}
184
185void unblock_sig ()
186{
187 sigset_t ss;
188
189 if (--block_sig_level)
190 return;
191
192 if (!main_sig)
193 return;
194
195 sigemptyset (&ss);
196 sigaddset (&ss, main_sig);
197 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
160} 198}
161 199
162static int next_pri = DEFAULT_PRI + PRI_BIAS; 200static int next_pri = DEFAULT_PRI + PRI_BIAS;
163 201
164static unsigned int started, idle, wanted; 202static unsigned int started, idle, wanted;
… …
317 355
318 abort (); 356 abort ();
319} 357}
320 358
321static int poll_cb (); 359static int poll_cb ();
322static void req_invoke (aio_req req); 360static int req_invoke (aio_req req);
323static void req_free (aio_req req); 361static void req_free (aio_req req);
324static void req_cancel (aio_req req); 362static void req_cancel (aio_req req);
325 363
326/* must be called at most once */ 364/* must be called at most once */
327static SV *req_sv (aio_req req, const char *klass) 365static SV *req_sv (aio_req req, const char *klass)
… …
347 return mg ? (aio_req)mg->mg_ptr : 0; 385 return mg ? (aio_req)mg->mg_ptr : 0;
348} 386}
349 387
350static void aio_grp_feed (aio_req grp) 388static void aio_grp_feed (aio_req grp)
351{ 389{
390 block_sig ();
391
352 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 392 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
353 { 393 {
354 int old_len = grp->length; 394 int old_len = grp->size;
355 395
356 if (grp->fh2 && SvOK (grp->fh2)) 396 if (grp->sv2 && SvOK (grp->sv2))
357 { 397 {
358 dSP; 398 dSP;
359 399
360 ENTER; 400 ENTER;
361 SAVETMPS; 401 SAVETMPS;
362 PUSHMARK (SP); 402 PUSHMARK (SP);
363 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 403 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
364 PUTBACK; 404 PUTBACK;
365 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 405 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
366 SPAGAIN; 406 SPAGAIN;
367 FREETMPS; 407 FREETMPS;
368 LEAVE; 408 LEAVE;
369 } 409 }
370 410
371 /* stop if no progress has been made */ 411 /* stop if no progress has been made */
372 if (old_len == grp->length) 412 if (old_len == grp->size)
373 { 413 {
374 SvREFCNT_dec (grp->fh2); 414 SvREFCNT_dec (grp->sv2);
375 grp->fh2 = 0; 415 grp->sv2 = 0;
376 break; 416 break;
377 } 417 }
378 } 418 }
419
420 unblock_sig ();
379} 421}
380 422
381static void aio_grp_dec (aio_req grp) 423static void aio_grp_dec (aio_req grp)
382{ 424{
383 --grp->length; 425 --grp->size;
384 426
385 /* call feeder, if applicable */ 427 /* call feeder, if applicable */
386 aio_grp_feed (grp); 428 aio_grp_feed (grp);
387 429
388 /* finish, if done */ 430 /* finish, if done */
389 if (!grp->length && grp->fd) 431 if (!grp->size && grp->int1)
390 { 432 {
433 block_sig ();
434
391 req_invoke (grp); 435 if (!req_invoke (grp))
436 {
437 req_free (grp);
438 unblock_sig ();
439 croak (0);
440 }
441
392 req_free (grp); 442 req_free (grp);
443 unblock_sig ();
393 } 444 }
394} 445}
395 446
396static void req_invoke (aio_req req) 447static int req_invoke (aio_req req)
397{ 448{
398 dSP; 449 dSP;
450
451 if (req->flags & FLAG_SV1_RO_OFF)
452 SvREADONLY_off (req->sv1);
399 453
400 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
401 { 455 {
402 ENTER; 456 ENTER;
403 SAVETMPS; 457 SAVETMPS;
… …
411 SV *rv = &PL_sv_undef; 465 SV *rv = &PL_sv_undef;
412 466
413 if (req->result >= 0) 467 if (req->result >= 0)
414 { 468 {
415 int i; 469 int i;
416 char *buf = req->data2ptr; 470 char *buf = req->ptr2;
417 AV *av = newAV (); 471 AV *av = newAV ();
418 472
419 av_extend (av, req->result - 1); 473 av_extend (av, req->result - 1);
420 474
421 for (i = 0; i < req->result; ++i) 475 for (i = 0; i < req->result; ++i)
… …
441 PUSHs (sv_2mortal (newSViv (req->result))); 495 PUSHs (sv_2mortal (newSViv (req->result)));
442 PUTBACK; 496 PUTBACK;
443 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 497 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
444 SPAGAIN; 498 SPAGAIN;
445 499
446 fh = SvREFCNT_inc (POPs); 500 fh = POPs;
447
448 PUSHMARK (SP); 501 PUSHMARK (SP);
449 XPUSHs (sv_2mortal (fh)); 502 XPUSHs (fh);
450 } 503 }
451 break; 504 break;
452 505
453 case REQ_GROUP: 506 case REQ_GROUP:
454 req->fd = 2; /* mark group as finished */ 507 req->int1 = 2; /* mark group as finished */
455 508
456 if (req->data) 509 if (req->sv1)
457 { 510 {
458 int i; 511 int i;
459 AV *av = (AV *)req->data; 512 AV *av = (AV *)req->sv1;
460 513
461 EXTEND (SP, AvFILL (av) + 1); 514 EXTEND (SP, AvFILL (av) + 1);
462 for (i = 0; i <= AvFILL (av); ++i) 515 for (i = 0; i <= AvFILL (av); ++i)
463 PUSHs (*av_fetch (av, i, 0)); 516 PUSHs (*av_fetch (av, i, 0));
464 } 517 }
… …
466 519
467 case REQ_NOP: 520 case REQ_NOP:
468 case REQ_BUSY: 521 case REQ_BUSY:
469 break; 522 break;
470 523
524 case REQ_READLINK:
525 if (req->result > 0)
526 {
527 SvCUR_set (req->sv1, req->result);
528 *SvEND (req->sv1) = 0;
529 PUSHs (req->sv1);
530 }
531 break;
532
533 case REQ_STAT:
534 case REQ_LSTAT:
535 case REQ_FSTAT:
536 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
537 PL_laststatval = req->result;
538 PL_statcache = *(Stat_t *)(req->ptr2);
539 PUSHs (sv_2mortal (newSViv (req->result)));
540 break;
541
542 case REQ_READ:
543 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
544 *SvEND (req->sv1) = 0;
545 PUSHs (sv_2mortal (newSViv (req->result)));
546 break;
547
471 default: 548 default:
472 PUSHs (sv_2mortal (newSViv (req->result))); 549 PUSHs (sv_2mortal (newSViv (req->result)));
473 break; 550 break;
474 } 551 }
475 552
… …
495 grp->grp_first = req->grp_next; 572 grp->grp_first = req->grp_next;
496 573
497 aio_grp_dec (grp); 574 aio_grp_dec (grp);
498 } 575 }
499 576
500 if (SvTRUE (ERRSV)) 577 return !SvTRUE (ERRSV);
501 {
502 req_free (req);
503 croak (0);
504 }
505} 578}
506 579
507static void req_free (aio_req req) 580static void req_free (aio_req req)
508{ 581{
509 if (req->self) 582 if (req->self)
510 { 583 {
511 sv_unmagic (req->self, PERL_MAGIC_ext); 584 sv_unmagic (req->self, PERL_MAGIC_ext);
512 SvREFCNT_dec (req->self); 585 SvREFCNT_dec (req->self);
513 } 586 }
514 587
515 SvREFCNT_dec (req->data);
516 SvREFCNT_dec (req->fh); 588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1);
517 SvREFCNT_dec (req->fh2); 590 SvREFCNT_dec (req->sv2);
518 SvREFCNT_dec (req->callback); 591 SvREFCNT_dec (req->callback);
519 Safefree (req->statdata);
520 592
521 if (req->type == REQ_READDIR) 593 if (req->flags & FLAG_PTR2_FREE)
522 free (req->data2ptr); 594 free (req->ptr2);
523 595
524 Safefree (req); 596 Safefree (req);
525} 597}
526 598
527static void req_cancel_subs (aio_req grp) 599static void req_cancel_subs (aio_req grp)
… …
529 aio_req sub; 601 aio_req sub;
530 602
531 if (grp->type != REQ_GROUP) 603 if (grp->type != REQ_GROUP)
532 return; 604 return;
533 605
534 SvREFCNT_dec (grp->fh2); 606 SvREFCNT_dec (grp->sv2);
535 grp->fh2 = 0; 607 grp->sv2 = 0;
536 608
537 for (sub = grp->grp_first; sub; sub = sub->grp_next) 609 for (sub = grp->grp_first; sub; sub = sub->grp_next)
538 req_cancel (sub); 610 req_cancel (sub);
539} 611}
540 612
… …
565#endif 637#endif
566 638
567 sigfillset (&fullsigset); 639 sigfillset (&fullsigset);
568 640
569 LOCK (wrklock); 641 LOCK (wrklock);
570 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
571 643
572 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
573 { 645 {
574 wrk->prev = &wrk_first; 646 wrk->prev = &wrk_first;
575 wrk->next = wrk_first.next; 647 wrk->next = wrk_first.next;
… …
578 ++started; 650 ++started;
579 } 651 }
580 else 652 else
581 free (wrk); 653 free (wrk);
582 654
583 sigprocmask (SIG_SETMASK, &oldsigset, 0); 655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
584 UNLOCK (wrklock); 656 UNLOCK (wrklock);
585} 657}
586 658
587static void maybe_start_thread () 659static void maybe_start_thread ()
588{ 660{
… …
596 start_thread (); 668 start_thread ();
597} 669}
598 670
599static void req_send (aio_req req) 671static void req_send (aio_req req)
600{ 672{
673 block_sig ();
674
601 ++nreqs; 675 ++nreqs;
602 676
603 LOCK (reqlock); 677 LOCK (reqlock);
604 ++nready; 678 ++nready;
605 reqq_push (&req_queue, req); 679 reqq_push (&req_queue, req);
606 pthread_cond_signal (&reqwait); 680 pthread_cond_signal (&reqwait);
607 UNLOCK (reqlock); 681 UNLOCK (reqlock);
682
683 unblock_sig ();
608 684
609 maybe_start_thread (); 685 maybe_start_thread ();
610} 686}
611 687
612static void end_thread (void) 688static void end_thread (void)
… …
683 aio_req req; 759 aio_req req;
684 760
685 if (max_poll_time) 761 if (max_poll_time)
686 gettimeofday (&tv_start, 0); 762 gettimeofday (&tv_start, 0);
687 763
764 block_sig ();
765
688 for (;;) 766 for (;;)
689 { 767 {
690 for (;;) 768 for (;;)
691 { 769 {
692 maybe_start_thread (); 770 maybe_start_thread ();
… …
699 --npending; 777 --npending;
700 778
701 if (!res_queue.size) 779 if (!res_queue.size)
702 { 780 {
703 /* read any signals sent by the worker threads */ 781 /* read any signals sent by the worker threads */
704 char buf [32]; 782 char buf [4];
705 while (read (respipe [0], buf, 32) == 32) 783 while (read (respipe [0], buf, 4) == 4)
706 ; 784 ;
707 } 785 }
708 } 786 }
709 787
710 UNLOCK (reslock); 788 UNLOCK (reslock);
… …
712 if (!req) 790 if (!req)
713 break; 791 break;
714 792
715 --nreqs; 793 --nreqs;
716 794
717 if (req->type == REQ_GROUP && req->length) 795 if (req->type == REQ_GROUP && req->size)
718 { 796 {
719 req->fd = 1; /* mark request as delayed */ 797 req->int1 = 1; /* mark request as delayed */
720 continue; 798 continue;
721 } 799 }
722 else 800 else
723 { 801 {
724 if (req->type == REQ_READ) 802 if (!req_invoke (req))
725 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
726
727 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
728 SvREADONLY_off (req->data);
729
730 if (req->statdata)
731 { 803 {
732 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 804 req_free (req);
733 PL_laststatval = req->result; 805 unblock_sig ();
734 PL_statcache = *(req->statdata); 806 croak (0);
735 } 807 }
736
737 req_invoke (req);
738 808
739 count++; 809 count++;
740 } 810 }
741 811
742 req_free (req); 812 req_free (req);
… …
759 poll_wait (); 829 poll_wait ();
760 830
761 ++maxreqs; 831 ++maxreqs;
762 } 832 }
763 833
834 unblock_sig ();
764 return count; 835 return count;
765} 836}
766 837
767static void create_pipe () 838static void create_pipe ()
768{ 839{
… …
984 int memofs = 0; 1055 int memofs = 0;
985 int res = 0; 1056 int res = 0;
986 int errorno; 1057 int errorno;
987 1058
988 LOCK (wrklock); 1059 LOCK (wrklock);
989 self->dirp = dirp = opendir (req->dataptr); 1060 self->dirp = dirp = opendir (req->ptr1);
990 self->dbuf = u = malloc (sizeof (*u)); 1061 self->dbuf = u = malloc (sizeof (*u));
1062 req->flags |= FLAG_PTR2_FREE;
991 req->data2ptr = names = malloc (memlen); 1063 req->ptr2 = names = malloc (memlen);
992 UNLOCK (wrklock); 1064 UNLOCK (wrklock);
993 1065
994 if (dirp && u && names) 1066 if (dirp && u && names)
995 for (;;) 1067 for (;;)
996 { 1068 {
… …
1010 1082
1011 while (memofs + len > memlen) 1083 while (memofs + len > memlen)
1012 { 1084 {
1013 memlen *= 2; 1085 memlen *= 2;
1014 LOCK (wrklock); 1086 LOCK (wrklock);
1015 req->data2ptr = names = realloc (names, memlen); 1087 req->ptr2 = names = realloc (names, memlen);
1016 UNLOCK (wrklock); 1088 UNLOCK (wrklock);
1017 1089
1018 if (!names) 1090 if (!names)
1019 break; 1091 break;
1020 } 1092 }
… …
1085 errno = 0; /* strictly unnecessary */ 1157 errno = 0; /* strictly unnecessary */
1086 1158
1087 if (!(req->flags & FLAG_CANCELLED)) 1159 if (!(req->flags & FLAG_CANCELLED))
1088 switch (req->type) 1160 switch (req->type)
1089 { 1161 {
1090 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1162 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1091 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1163 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1092 1164
1093 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1165 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1094 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1166 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1095 1167
1096 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1168 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1097 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1169 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1098 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1170 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1099 1171
1100 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1172 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1101 case REQ_CLOSE: req->result = close (req->fd); break; 1173 case REQ_CLOSE: req->result = close (req->int1); break;
1102 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1103 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1176 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1104 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1177 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1105 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1178 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1106 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1179 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1107 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1180 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1181 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1108 1182
1109 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1183 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1110 case REQ_FSYNC: req->result = fsync (req->fd); break; 1184 case REQ_FSYNC: req->result = fsync (req->int1); break;
1111 case REQ_READDIR: scandir_ (req, self); break; 1185 case REQ_READDIR: scandir_ (req, self); break;
1112 1186
1113 case REQ_BUSY: 1187 case REQ_BUSY:
1114 { 1188 {
1115 struct timeval tv; 1189 struct timeval tv;
1116 1190
1117 tv.tv_sec = req->fd; 1191 tv.tv_sec = req->int1;
1118 tv.tv_usec = req->fd2; 1192 tv.tv_usec = req->int2;
1119 1193
1120 req->result = select (0, 0, 0, 0, &tv); 1194 req->result = select (0, 0, 0, 0, &tv);
1121 } 1195 }
1122 1196
1123 case REQ_GROUP: 1197 case REQ_GROUP:
… …
1137 LOCK (reslock); 1211 LOCK (reslock);
1138 1212
1139 ++npending; 1213 ++npending;
1140 1214
1141 if (!reqq_push (&res_queue, req)) 1215 if (!reqq_push (&res_queue, req))
1216 {
1142 /* write a dummy byte to the pipe so fh becomes ready */ 1217 /* write a dummy byte to the pipe so fh becomes ready */
1143 write (respipe [1], &respipe, 1); 1218 write (respipe [1], &respipe, 1);
1219
1220 /* optionally signal the main thread asynchronously */
1221 if (main_sig)
1222 pthread_kill (main_tid, main_sig);
1223 }
1144 1224
1145 self->req = 0; 1225 self->req = 0;
1146 worker_clear (self); 1226 worker_clear (self);
1147 1227
1148 UNLOCK (reslock); 1228 UNLOCK (reslock);
… …
1251 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1331 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1252 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1332 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1253 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1333 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1254 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1334 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1255 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1335 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1336 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1256 1337
1257 create_pipe (); 1338 create_pipe ();
1258 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1339 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1259} 1340}
1260 1341
… …
1293 OUTPUT: 1374 OUTPUT:
1294 RETVAL 1375 RETVAL
1295 1376
1296void 1377void
1297aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1378aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1298 SV * pathname 1379 SV8 * pathname
1299 int flags 1380 int flags
1300 int mode 1381 int mode
1301 SV * callback 1382 SV * callback
1302 PROTOTYPE: $$$;$ 1383 PROTOTYPE: $$$;$
1303 PPCODE: 1384 PPCODE:
1304{ 1385{
1305 dREQ; 1386 dREQ;
1306 1387
1307 req->type = REQ_OPEN; 1388 req->type = REQ_OPEN;
1308 req->data = newSVsv (pathname); 1389 req->sv1 = newSVsv (pathname);
1309 req->dataptr = SvPVbyte_nolen (req->data); 1390 req->ptr1 = SvPVbyte_nolen (req->sv1);
1310 req->fd = flags; 1391 req->int1 = flags;
1311 req->mode = mode; 1392 req->mode = mode;
1312 1393
1313 REQ_SEND; 1394 REQ_SEND;
1314} 1395}
1315 1396
… …
1325 PPCODE: 1406 PPCODE:
1326{ 1407{
1327 dREQ; 1408 dREQ;
1328 1409
1329 req->type = ix; 1410 req->type = ix;
1330 req->fh = newSVsv (fh); 1411 req->fh = newSVsv (fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1412 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1332 1413
1333 REQ_SEND (req); 1414 REQ_SEND (req);
1334} 1415}
1335 1416
1336void 1417void
1337aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1418aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1338 SV * fh 1419 SV * fh
1339 UV offset 1420 UV offset
1340 UV length 1421 UV length
1341 SV * data 1422 SV8 * data
1342 UV dataoffset 1423 UV dataoffset
1343 SV * callback 1424 SV * callback
1344 ALIAS: 1425 ALIAS:
1345 aio_read = REQ_READ 1426 aio_read = REQ_READ
1346 aio_write = REQ_WRITE 1427 aio_write = REQ_WRITE
1347 PROTOTYPE: $$$$$;$ 1428 PROTOTYPE: $$$$$;$
1348 PPCODE: 1429 PPCODE:
1349{ 1430{
1350 aio_req req;
1351 STRLEN svlen; 1431 STRLEN svlen;
1352 char *svptr = SvPVbyte (data, svlen); 1432 char *svptr = SvPVbyte (data, svlen);
1353 1433
1354 SvUPGRADE (data, SVt_PV); 1434 SvUPGRADE (data, SVt_PV);
1355 SvPOK_on (data); 1435 SvPOK_on (data);
… …
1367 length = svlen - dataoffset; 1447 length = svlen - dataoffset;
1368 } 1448 }
1369 else 1449 else
1370 { 1450 {
1371 /* read: grow scalar as necessary */ 1451 /* read: grow scalar as necessary */
1372 svptr = SvGROW (data, length + dataoffset); 1452 svptr = SvGROW (data, length + dataoffset + 1);
1373 } 1453 }
1374 1454
1375 if (length < 0) 1455 if (length < 0)
1376 croak ("length must not be negative"); 1456 croak ("length must not be negative");
1377 1457
1378 { 1458 {
1379 dREQ; 1459 dREQ;
1380 1460
1381 req->type = ix; 1461 req->type = ix;
1382 req->fh = newSVsv (fh); 1462 req->fh = newSVsv (fh);
1383 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1463 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1384 : IoOFP (sv_2io (fh))); 1464 : IoOFP (sv_2io (fh)));
1385 req->offset = offset; 1465 req->offs = offset;
1386 req->length = length; 1466 req->size = length;
1387 req->data = SvREFCNT_inc (data); 1467 req->sv1 = SvREFCNT_inc (data);
1388 req->dataptr = (char *)svptr + dataoffset; 1468 req->ptr1 = (char *)svptr + dataoffset;
1469 req->stroffset = dataoffset;
1389 1470
1390 if (!SvREADONLY (data)) 1471 if (!SvREADONLY (data))
1391 { 1472 {
1392 SvREADONLY_on (data); 1473 SvREADONLY_on (data);
1393 req->data2ptr = (void *)data; 1474 req->flags |= FLAG_SV1_RO_OFF;
1394 } 1475 }
1395 1476
1396 REQ_SEND; 1477 REQ_SEND;
1397 } 1478 }
1479}
1480
1481void
1482aio_readlink (path,callback=&PL_sv_undef)
1483 SV8 * path
1484 SV * callback
1485 PROTOTYPE: $$;$
1486 PPCODE:
1487{
1488 SV *data;
1489 dREQ;
1490
1491 data = newSV (NAME_MAX);
1492 SvPOK_on (data);
1493
1494 req->type = REQ_READLINK;
1495 req->fh = newSVsv (path);
1496 req->ptr2 = SvPVbyte_nolen (req->fh);
1497 req->sv1 = data;
1498 req->ptr1 = SvPVbyte_nolen (data);
1499
1500 REQ_SEND;
1398} 1501}
1399 1502
1400void 1503void
1401aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1504aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1402 SV * out_fh 1505 SV * out_fh
… …
1408 PPCODE: 1511 PPCODE:
1409{ 1512{
1410 dREQ; 1513 dREQ;
1411 1514
1412 req->type = REQ_SENDFILE; 1515 req->type = REQ_SENDFILE;
1413 req->fh = newSVsv (out_fh); 1516 req->fh = newSVsv (out_fh);
1414 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1517 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1415 req->fh2 = newSVsv (in_fh); 1518 req->sv2 = newSVsv (in_fh);
1416 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1519 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1417 req->offset = in_offset; 1520 req->offs = in_offset;
1418 req->length = length; 1521 req->size = length;
1419 1522
1420 REQ_SEND; 1523 REQ_SEND;
1421} 1524}
1422 1525
1423void 1526void
… …
1430 PPCODE: 1533 PPCODE:
1431{ 1534{
1432 dREQ; 1535 dREQ;
1433 1536
1434 req->type = REQ_READAHEAD; 1537 req->type = REQ_READAHEAD;
1435 req->fh = newSVsv (fh); 1538 req->fh = newSVsv (fh);
1436 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1539 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1437 req->offset = offset; 1540 req->offs = offset;
1438 req->length = length; 1541 req->size = length;
1439 1542
1440 REQ_SEND; 1543 REQ_SEND;
1441} 1544}
1442 1545
1443void 1546void
1444aio_stat (fh_or_path,callback=&PL_sv_undef) 1547aio_stat (fh_or_path,callback=&PL_sv_undef)
1445 SV * fh_or_path 1548 SV8 * fh_or_path
1446 SV * callback 1549 SV * callback
1447 ALIAS: 1550 ALIAS:
1448 aio_stat = REQ_STAT 1551 aio_stat = REQ_STAT
1449 aio_lstat = REQ_LSTAT 1552 aio_lstat = REQ_LSTAT
1450 PPCODE: 1553 PPCODE:
1451{ 1554{
1452 dREQ; 1555 dREQ;
1453 1556
1454 New (0, req->statdata, 1, Stat_t); 1557 req->ptr2 = malloc (sizeof (Stat_t));
1455 if (!req->statdata) 1558 if (!req->ptr2)
1456 { 1559 {
1457 req_free (req); 1560 req_free (req);
1458 croak ("out of memory during aio_req->statdata allocation"); 1561 croak ("out of memory during aio_stat statdata allocation");
1459 } 1562 }
1563
1564 req->flags |= FLAG_PTR2_FREE;
1460 1565
1461 if (SvPOK (fh_or_path)) 1566 if (SvPOK (fh_or_path))
1462 { 1567 {
1463 req->type = ix; 1568 req->type = ix;
1464 req->data = newSVsv (fh_or_path); 1569 req->sv1 = newSVsv (fh_or_path);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1570 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 } 1571 }
1467 else 1572 else
1468 { 1573 {
1469 req->type = REQ_FSTAT; 1574 req->type = REQ_FSTAT;
1470 req->fh = newSVsv (fh_or_path); 1575 req->fh = newSVsv (fh_or_path);
1471 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1576 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1472 } 1577 }
1473 1578
1474 REQ_SEND; 1579 REQ_SEND;
1475} 1580}
1476 1581
1477void 1582void
1478aio_unlink (pathname,callback=&PL_sv_undef) 1583aio_unlink (pathname,callback=&PL_sv_undef)
1479 SV * pathname 1584 SV8 * pathname
1480 SV * callback 1585 SV * callback
1481 ALIAS: 1586 ALIAS:
1482 aio_unlink = REQ_UNLINK 1587 aio_unlink = REQ_UNLINK
1483 aio_rmdir = REQ_RMDIR 1588 aio_rmdir = REQ_RMDIR
1484 aio_readdir = REQ_READDIR 1589 aio_readdir = REQ_READDIR
1485 PPCODE: 1590 PPCODE:
1486{ 1591{
1487 dREQ; 1592 dREQ;
1488 1593
1489 req->type = ix; 1594 req->type = ix;
1490 req->data = newSVsv (pathname); 1595 req->sv1 = newSVsv (pathname);
1491 req->dataptr = SvPVbyte_nolen (req->data); 1596 req->ptr1 = SvPVbyte_nolen (req->sv1);
1597
1598 REQ_SEND;
1599}
1600
1601void
1602aio_mkdir (pathname,mode,callback=&PL_sv_undef)
1603 SV8 * pathname
1604 UV mode
1605 SV * callback
1606 PPCODE:
1607{
1608 dREQ;
1492 1609
1610 req->type = REQ_MKDIR;
1611 req->sv1 = newSVsv (pathname);
1612 req->ptr1 = SvPVbyte_nolen (req->sv1);
1613 req->mode = mode;
1614
1493 REQ_SEND; 1615 REQ_SEND;
1494} 1616}
1495 1617
1496void 1618void
1497aio_link (oldpath,newpath,callback=&PL_sv_undef) 1619aio_link (oldpath,newpath,callback=&PL_sv_undef)
1498 SV * oldpath 1620 SV8 * oldpath
1499 SV * newpath 1621 SV8 * newpath
1500 SV * callback 1622 SV * callback
1501 ALIAS: 1623 ALIAS:
1502 aio_link = REQ_LINK 1624 aio_link = REQ_LINK
1503 aio_symlink = REQ_SYMLINK 1625 aio_symlink = REQ_SYMLINK
1504 aio_rename = REQ_RENAME 1626 aio_rename = REQ_RENAME
1505 PPCODE: 1627 PPCODE:
1506{ 1628{
1507 dREQ; 1629 dREQ;
1508 1630
1509 req->type = ix; 1631 req->type = ix;
1510 req->fh = newSVsv (oldpath); 1632 req->fh = newSVsv (oldpath);
1511 req->data2ptr = SvPVbyte_nolen (req->fh); 1633 req->ptr2 = SvPVbyte_nolen (req->fh);
1512 req->data = newSVsv (newpath); 1634 req->sv1 = newSVsv (newpath);
1513 req->dataptr = SvPVbyte_nolen (req->data); 1635 req->ptr1 = SvPVbyte_nolen (req->sv1);
1514 1636
1515 REQ_SEND; 1637 REQ_SEND;
1516} 1638}
1517 1639
1518void 1640void
1519aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1641aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1520 SV * pathname 1642 SV8 * pathname
1521 SV * callback
1522 UV mode 1643 UV mode
1523 UV dev 1644 UV dev
1645 SV * callback
1524 PPCODE: 1646 PPCODE:
1525{ 1647{
1526 dREQ; 1648 dREQ;
1527 1649
1528 req->type = REQ_MKNOD; 1650 req->type = REQ_MKNOD;
1529 req->data = newSVsv (pathname); 1651 req->sv1 = newSVsv (pathname);
1530 req->dataptr = SvPVbyte_nolen (req->data); 1652 req->ptr1 = SvPVbyte_nolen (req->sv1);
1531 req->mode = (mode_t)mode; 1653 req->mode = (mode_t)mode;
1532 req->offset = dev; 1654 req->offs = dev;
1533 1655
1534 REQ_SEND; 1656 REQ_SEND;
1535} 1657}
1536 1658
1537void 1659void
1538aio_busy (delay,callback=&PL_sv_undef) 1660aio_busy (delay,callback=&PL_sv_undef)
1539 double delay 1661 double delay
1540 SV * callback 1662 SV * callback
1541 PPCODE: 1663 PPCODE:
1542{ 1664{
1543 dREQ; 1665 dREQ;
1544 1666
1545 req->type = REQ_BUSY; 1667 req->type = REQ_BUSY;
1546 req->fd = delay < 0. ? 0 : delay; 1668 req->int1 = delay < 0. ? 0 : delay;
1547 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1669 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1548 1670
1549 REQ_SEND; 1671 REQ_SEND;
1550} 1672}
1551 1673
1552void 1674void
… …
1556 PPCODE: 1678 PPCODE:
1557{ 1679{
1558 dREQ; 1680 dREQ;
1559 1681
1560 req->type = REQ_GROUP; 1682 req->type = REQ_GROUP;
1683
1561 req_send (req); 1684 req_send (req);
1562
1563 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1685 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1564} 1686}
1565 1687
1566void 1688void
1567aio_nop (callback=&PL_sv_undef) 1689aio_nop (callback=&PL_sv_undef)
1568 SV * callback 1690 SV * callback
1569 PPCODE: 1691 PPCODE:
1570{ 1692{
1571 dREQ; 1693 dREQ;
1572 1694
1573 req->type = REQ_NOP; 1695 req->type = REQ_NOP;
… …
1602 PROTOTYPE: 1724 PROTOTYPE:
1603 CODE: 1725 CODE:
1604 while (nreqs) 1726 while (nreqs)
1605 { 1727 {
1606 poll_wait (); 1728 poll_wait ();
1607 poll_cb (0); 1729 poll_cb ();
1608 } 1730 }
1609 1731
1610void 1732int
1611poll() 1733poll()
1612 PROTOTYPE: 1734 PROTOTYPE:
1613 CODE: 1735 CODE:
1614 if (nreqs)
1615 {
1616 poll_wait (); 1736 poll_wait ();
1617 poll_cb (0); 1737 RETVAL = poll_cb ();
1618 } 1738 OUTPUT:
1739 RETVAL
1619 1740
1620int 1741int
1621poll_fileno() 1742poll_fileno()
1622 PROTOTYPE: 1743 PROTOTYPE:
1623 CODE: 1744 CODE:
… …
1635 1756
1636void 1757void
1637poll_wait() 1758poll_wait()
1638 PROTOTYPE: 1759 PROTOTYPE:
1639 CODE: 1760 CODE:
1640 if (nreqs)
1641 poll_wait (); 1761 poll_wait ();
1762
1763void
1764setsig (int signum = SIGIO)
1765 PROTOTYPE: ;$
1766 CODE:
1767{
1768 if (block_sig_level)
1769 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1770
1771 LOCK (reslock);
1772 main_tid = pthread_self ();
1773 main_sig = signum;
1774 UNLOCK (reslock);
1775
1776 if (main_sig && npending)
1777 pthread_kill (main_tid, main_sig);
1778}
1779
1780void
1781aio_block (SV *cb)
1782 PROTOTYPE: &
1783 PPCODE:
1784{
1785 int count;
1786
1787 block_sig ();
1788 PUSHMARK (SP);
1789 PUTBACK;
1790 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1791 SPAGAIN;
1792 unblock_sig ();
1793
1794 if (SvTRUE (ERRSV))
1795 croak (0);
1796
1797 XSRETURN (count);
1798}
1642 1799
1643int 1800int
1644nreqs() 1801nreqs()
1645 PROTOTYPE: 1802 PROTOTYPE:
1646 CODE: 1803 CODE:
… …
1696 PPCODE: 1853 PPCODE:
1697{ 1854{
1698 int i; 1855 int i;
1699 aio_req req; 1856 aio_req req;
1700 1857
1858 if (main_sig && !block_sig_level)
1859 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1860
1701 if (grp->fd == 2) 1861 if (grp->int1 == 2)
1702 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1862 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1703 1863
1704 for (i = 1; i < items; ++i ) 1864 for (i = 1; i < items; ++i )
1705 { 1865 {
1706 if (GIMME_V != G_VOID) 1866 if (GIMME_V != G_VOID)
… …
1708 1868
1709 req = SvAIO_REQ (ST (i)); 1869 req = SvAIO_REQ (ST (i));
1710 1870
1711 if (req) 1871 if (req)
1712 { 1872 {
1713 ++grp->length; 1873 ++grp->size;
1714 req->grp = grp; 1874 req->grp = grp;
1715 1875
1716 req->grp_prev = 0; 1876 req->grp_prev = 0;
1717 req->grp_next = grp->grp_first; 1877 req->grp_next = grp->grp_first;
1718 1878
… …
1741 av = newAV (); 1901 av = newAV ();
1742 1902
1743 for (i = 1; i < items; ++i ) 1903 for (i = 1; i < items; ++i )
1744 av_push (av, newSVsv (ST (i))); 1904 av_push (av, newSVsv (ST (i)));
1745 1905
1746 SvREFCNT_dec (grp->data); 1906 SvREFCNT_dec (grp->sv1);
1747 grp->data = (SV *)av; 1907 grp->sv1 = (SV *)av;
1748} 1908}
1749 1909
1750void 1910void
1751errno (aio_req grp, int errorno = errno) 1911errno (aio_req grp, int errorno = errno)
1752 CODE: 1912 CODE:
1753 grp->errorno = errorno; 1913 grp->errorno = errorno;
1754 1914
1755void 1915void
1756limit (aio_req grp, int limit) 1916limit (aio_req grp, int limit)
1757 CODE: 1917 CODE:
1758 grp->fd2 = limit; 1918 grp->int2 = limit;
1759 aio_grp_feed (grp); 1919 aio_grp_feed (grp);
1760 1920
1761void 1921void
1762feed (aio_req grp, SV *callback=&PL_sv_undef) 1922feed (aio_req grp, SV *callback=&PL_sv_undef)
1763 CODE: 1923 CODE:
1764{ 1924{
1765 SvREFCNT_dec (grp->fh2); 1925 SvREFCNT_dec (grp->sv2);
1766 grp->fh2 = newSVsv (callback); 1926 grp->sv2 = newSVsv (callback);
1767 1927
1768 if (grp->fd2 <= 0) 1928 if (grp->int2 <= 0)
1769 grp->fd2 = 2; 1929 grp->int2 = 2;
1770 1930
1771 aio_grp_feed (grp); 1931 aio_grp_feed (grp);
1772} 1932}
1773 1933

Diff Legend

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