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.68 by root, Tue Oct 24 03:40:25 2006 UTC vs.
Revision 1.77 by root, Thu Oct 26 13:25:40 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
… …
44/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 49#ifndef NAME_MAX
46# define NAME_MAX 4096 50# define NAME_MAX 4096
47#endif 51#endif
48 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
49#if __ia64 58#if __ia64
50# define STACKSIZE 65536 59# define STACKSIZE 65536
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN 61# define STACKSIZE PTHREAD_STACK_MIN
53#else 62#else
… …
56 65
57/* buffer size for various temporary buffers */ 66/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536 67#define AIO_BUFSIZE 65536
59 68
60#define dBUF \ 69#define dBUF \
70 char *aio_buf; \
71 LOCK (wrklock); \
61 char *aio_buf = malloc (AIO_BUFSIZE); \ 72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \
62 if (!aio_buf) \ 74 if (!aio_buf) \
63 return -1; 75 return -1;
64
65#define fBUF free (aio_buf)
66 76
67enum { 77enum {
68 REQ_QUIT, 78 REQ_QUIT,
69 REQ_OPEN, REQ_CLOSE, 79 REQ_OPEN, REQ_CLOSE,
70 REQ_READ, REQ_WRITE, REQ_READAHEAD, 80 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
73 REQ_FSYNC, REQ_FDATASYNC, 83 REQ_FSYNC, REQ_FDATASYNC,
74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75 REQ_READDIR, 85 REQ_READDIR,
76 REQ_LINK, REQ_SYMLINK, 86 REQ_LINK, REQ_SYMLINK,
77 REQ_GROUP, REQ_NOP, 87 REQ_GROUP, REQ_NOP,
78 REQ_SLEEP, 88 REQ_BUSY,
79}; 89};
80 90
81#define AIO_REQ_KLASS "IO::AIO::REQ" 91#define AIO_REQ_KLASS "IO::AIO::REQ"
82#define AIO_GRP_KLASS "IO::AIO::GRP" 92#define AIO_GRP_KLASS "IO::AIO::GRP"
83 93
… …
124 134
125static int next_pri = DEFAULT_PRI + PRI_BIAS; 135static int next_pri = DEFAULT_PRI + PRI_BIAS;
126 136
127static int started, wanted; 137static int started, wanted;
128static volatile int nreqs; 138static volatile int nreqs;
129static int max_outstanding = 1<<30;
130static int respipe [2]; 139static int respipe [2];
131 140
132#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 141#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
133# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 142# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
134#else 143#else
135# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 144# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
136#endif 145#endif
146
147#define LOCK(mutex) pthread_mutex_lock (&(mutex))
148#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
149
150/* worker threads management */
151static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
152
153typedef struct worker {
154 /* locked by wrklock */
155 struct worker *prev, *next;
156
157 pthread_t tid;
158
159 /* locked by reslock, reqlock or wrklock */
160 aio_req req; /* currently processed request */
161 void *dbuf;
162 DIR *dirp;
163} worker;
164
165static worker wrk_first = { &wrk_first, &wrk_first, 0 };
166
167static void worker_clear (worker *wrk)
168{
169 if (wrk->dirp)
170 {
171 closedir (wrk->dirp);
172 wrk->dirp = 0;
173 }
174
175 if (wrk->dbuf)
176 {
177 free (wrk->dbuf);
178 wrk->dbuf = 0;
179 }
180}
181
182static void worker_free (worker *wrk)
183{
184 wrk->next->prev = wrk->prev;
185 wrk->prev->next = wrk->next;
186
187 free (wrk);
188}
137 189
138static pthread_mutex_t reslock = AIO_MUTEX_INIT; 190static pthread_mutex_t reslock = AIO_MUTEX_INIT;
139static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 191static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
140static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 192static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
141 193
… …
191 } 243 }
192 244
193 abort (); 245 abort ();
194} 246}
195 247
248static int poll_cb (int max);
196static void req_invoke (aio_req req); 249static void req_invoke (aio_req req);
197static void req_free (aio_req req); 250static void req_free (aio_req req);
251static void req_cancel (aio_req req);
198 252
199/* must be called at most once */ 253/* must be called at most once */
200static SV *req_sv (aio_req req, const char *klass) 254static SV *req_sv (aio_req req, const char *klass)
201{ 255{
202 if (!req->self) 256 if (!req->self)
… …
271 fd_set rfd; 325 fd_set rfd;
272 326
273 while (nreqs) 327 while (nreqs)
274 { 328 {
275 int size; 329 int size;
276#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 330#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
277 pthread_mutex_lock (&reslock); 331 LOCK (reslock);
278#endif 332#endif
279 size = res_queue.size; 333 size = res_queue.size;
280#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 334#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
281 pthread_mutex_unlock (&reslock); 335 UNLOCK (reslock);
282#endif 336#endif
283 337
284 if (size) 338 if (size)
285 return; 339 return;
286 340
… …
310 { 364 {
311 SV *rv = &PL_sv_undef; 365 SV *rv = &PL_sv_undef;
312 366
313 if (req->result >= 0) 367 if (req->result >= 0)
314 { 368 {
369 int i;
315 char *buf = req->data2ptr; 370 char *buf = req->data2ptr;
316 AV *av = newAV (); 371 AV *av = newAV ();
317 372
318 while (req->result) 373 av_extend (av, req->result - 1);
374
375 for (i = 0; i < req->result; ++i)
319 { 376 {
320 SV *sv = newSVpv (buf, 0); 377 SV *sv = newSVpv (buf, 0);
321 378
322 av_push (av, sv); 379 av_store (av, i, sv);
323 buf += SvCUR (sv) + 1; 380 buf += SvCUR (sv) + 1;
324 req->result--;
325 } 381 }
326 382
327 rv = sv_2mortal (newRV_noinc ((SV *)av)); 383 rv = sv_2mortal (newRV_noinc ((SV *)av));
328 } 384 }
329 385
… …
361 PUSHs (*av_fetch (av, i, 0)); 417 PUSHs (*av_fetch (av, i, 0));
362 } 418 }
363 break; 419 break;
364 420
365 case REQ_NOP: 421 case REQ_NOP:
366 case REQ_SLEEP: 422 case REQ_BUSY:
367 break; 423 break;
368 424
369 default: 425 default:
370 PUSHs (sv_2mortal (newSViv (req->result))); 426 PUSHs (sv_2mortal (newSViv (req->result)));
371 break; 427 break;
… …
413 SvREFCNT_dec (req->fh); 469 SvREFCNT_dec (req->fh);
414 SvREFCNT_dec (req->fh2); 470 SvREFCNT_dec (req->fh2);
415 SvREFCNT_dec (req->callback); 471 SvREFCNT_dec (req->callback);
416 Safefree (req->statdata); 472 Safefree (req->statdata);
417 473
418 if (req->type == REQ_READDIR && req->result >= 0) 474 if (req->type == REQ_READDIR)
419 free (req->data2ptr); 475 free (req->data2ptr);
420 476
421 Safefree (req); 477 Safefree (req);
422} 478}
423 479
480static void req_cancel_subs (aio_req grp)
481{
482 aio_req sub;
483
484 if (grp->type != REQ_GROUP)
485 return;
486
487 SvREFCNT_dec (grp->fh2);
488 grp->fh2 = 0;
489
490 for (sub = grp->grp_first; sub; sub = sub->grp_next)
491 req_cancel (sub);
492}
493
424static void req_cancel (aio_req req) 494static void req_cancel (aio_req req)
425{ 495{
426 req->flags |= FLAG_CANCELLED; 496 req->flags |= FLAG_CANCELLED;
427 497
428 if (req->type == REQ_GROUP) 498 req_cancel_subs (req);
429 {
430 aio_req sub;
431
432 for (sub = req->grp_first; sub; sub = sub->grp_next)
433 req_cancel (sub);
434 }
435} 499}
436 500
437static int poll_cb () 501static int poll_cb (int max)
438{ 502{
439 dSP; 503 dSP;
440 int count = 0; 504 int count = 0;
441 int do_croak = 0; 505 int do_croak = 0;
442 aio_req req; 506 aio_req req;
443 507
444 for (;;) 508 while (max <= 0 || count < max)
445 { 509 {
446 pthread_mutex_lock (&reslock); 510 LOCK (reslock);
447 req = reqq_shift (&res_queue); 511 req = reqq_shift (&res_queue);
448 512
449 if (req) 513 if (req)
450 { 514 {
451 if (!res_queue.size) 515 if (!res_queue.size)
… …
455 while (read (respipe [0], buf, 32) == 32) 519 while (read (respipe [0], buf, 32) == 32)
456 ; 520 ;
457 } 521 }
458 } 522 }
459 523
460 pthread_mutex_unlock (&reslock); 524 UNLOCK (reslock);
461 525
462 if (!req) 526 if (!req)
463 break; 527 break;
464 528
465 --nreqs; 529 --nreqs;
… …
500static void *aio_proc(void *arg); 564static void *aio_proc(void *arg);
501 565
502static void start_thread (void) 566static void start_thread (void)
503{ 567{
504 sigset_t fullsigset, oldsigset; 568 sigset_t fullsigset, oldsigset;
505 pthread_t tid;
506 pthread_attr_t attr; 569 pthread_attr_t attr;
570
571 worker *wrk = calloc (1, sizeof (worker));
572
573 if (!wrk)
574 croak ("unable to allocate worker thread data");
507 575
508 pthread_attr_init (&attr); 576 pthread_attr_init (&attr);
509 pthread_attr_setstacksize (&attr, STACKSIZE); 577 pthread_attr_setstacksize (&attr, STACKSIZE);
510 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 578 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
511 579
512 sigfillset (&fullsigset); 580 sigfillset (&fullsigset);
581
582 LOCK (wrklock);
513 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 583 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
514 584
515 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 585 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
586 {
587 wrk->prev = &wrk_first;
588 wrk->next = wrk_first.next;
589 wrk_first.next->prev = wrk;
590 wrk_first.next = wrk;
516 started++; 591 started++;
592 }
593 else
594 free (wrk);
517 595
518 sigprocmask (SIG_SETMASK, &oldsigset, 0); 596 sigprocmask (SIG_SETMASK, &oldsigset, 0);
597 UNLOCK (wrklock);
519} 598}
520 599
521static void req_send (aio_req req) 600static void req_send (aio_req req)
522{ 601{
523 while (started < wanted && nreqs >= started) 602 while (started < wanted && nreqs >= started)
524 start_thread (); 603 start_thread ();
525 604
526 ++nreqs; 605 ++nreqs;
527 606
528 pthread_mutex_lock (&reqlock); 607 LOCK (reqlock);
529 reqq_push (&req_queue, req); 608 reqq_push (&req_queue, req);
530 pthread_cond_signal (&reqwait); 609 pthread_cond_signal (&reqwait);
531 pthread_mutex_unlock (&reqlock); 610 UNLOCK (reqlock);
532
533 if (nreqs > max_outstanding)
534 for (;;)
535 {
536 poll_cb ();
537
538 if (nreqs <= max_outstanding)
539 break;
540
541 poll_wait ();
542 }
543} 611}
544 612
545static void end_thread (void) 613static void end_thread (void)
546{ 614{
547 aio_req req; 615 aio_req req;
… …
574 } 642 }
575 643
576 while (started > wanted) 644 while (started > wanted)
577 { 645 {
578 poll_wait (); 646 poll_wait ();
579 poll_cb (); 647 poll_cb (0);
580 } 648 }
581} 649}
582 650
583static void create_pipe () 651static void create_pipe ()
584{ 652{
… …
609static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 677static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
610{ 678{
611 ssize_t res; 679 ssize_t res;
612 off_t ooffset; 680 off_t ooffset;
613 681
614 pthread_mutex_lock (&preadwritelock); 682 LOCK (preadwritelock);
615 ooffset = lseek (fd, 0, SEEK_CUR); 683 ooffset = lseek (fd, 0, SEEK_CUR);
616 lseek (fd, offset, SEEK_SET); 684 lseek (fd, offset, SEEK_SET);
617 res = read (fd, buf, count); 685 res = read (fd, buf, count);
618 lseek (fd, ooffset, SEEK_SET); 686 lseek (fd, ooffset, SEEK_SET);
619 pthread_mutex_unlock (&preadwritelock); 687 UNLOCK (preadwritelock);
620 688
621 return res; 689 return res;
622} 690}
623 691
624static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 692static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
625{ 693{
626 ssize_t res; 694 ssize_t res;
627 off_t ooffset; 695 off_t ooffset;
628 696
629 pthread_mutex_lock (&preadwritelock); 697 LOCK (preadwritelock);
630 ooffset = lseek (fd, 0, SEEK_CUR); 698 ooffset = lseek (fd, 0, SEEK_CUR);
631 lseek (fd, offset, SEEK_SET); 699 lseek (fd, offset, SEEK_SET);
632 res = write (fd, buf, count); 700 res = write (fd, buf, count);
633 lseek (fd, offset, SEEK_SET); 701 lseek (fd, offset, SEEK_SET);
634 pthread_mutex_unlock (&preadwritelock); 702 UNLOCK (preadwritelock);
635 703
636 return res; 704 return res;
637} 705}
638#endif 706#endif
639 707
640#if !HAVE_FDATASYNC 708#if !HAVE_FDATASYNC
641# define fdatasync fsync 709# define fdatasync fsync
642#endif 710#endif
643 711
644#if !HAVE_READAHEAD 712#if !HAVE_READAHEAD
645# define readahead aio_readahead 713# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
646 714
647static ssize_t readahead (int fd, off_t offset, size_t count) 715static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
648{ 716{
649 dBUF; 717 dBUF;
650 718
651 while (count > 0) 719 while (count > 0)
652 { 720 {
… …
655 pread (fd, aio_buf, len, offset); 723 pread (fd, aio_buf, len, offset);
656 offset += len; 724 offset += len;
657 count -= len; 725 count -= len;
658 } 726 }
659 727
660 fBUF;
661
662 errno = 0; 728 errno = 0;
663} 729}
730
664#endif 731#endif
665 732
666#if !HAVE_READDIR_R 733#if !HAVE_READDIR_R
667# define readdir_r aio_readdir_r 734# define readdir_r aio_readdir_r
668 735
… …
671static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 738static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
672{ 739{
673 struct dirent *e; 740 struct dirent *e;
674 int errorno; 741 int errorno;
675 742
676 pthread_mutex_lock (&readdirlock); 743 LOCK (readdirlock);
677 744
678 e = readdir (dirp); 745 e = readdir (dirp);
679 errorno = errno; 746 errorno = errno;
680 747
681 if (e) 748 if (e)
… …
684 strcpy (ent->d_name, e->d_name); 751 strcpy (ent->d_name, e->d_name);
685 } 752 }
686 else 753 else
687 *res = 0; 754 *res = 0;
688 755
689 pthread_mutex_unlock (&readdirlock); 756 UNLOCK (readdirlock);
690 757
691 errno = errorno; 758 errno = errorno;
692 return e ? 0 : -1; 759 return e ? 0 : -1;
693} 760}
694#endif 761#endif
695 762
696/* sendfile always needs emulation */ 763/* sendfile always needs emulation */
697static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 764static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
698{ 765{
699 ssize_t res; 766 ssize_t res;
700 767
701 if (!count) 768 if (!count)
702 return 0; 769 return 0;
… …
713 { 780 {
714 off_t sbytes; 781 off_t sbytes;
715 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 782 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
716 783
717 if (res < 0 && sbytes) 784 if (res < 0 && sbytes)
718 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 785 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
719 res = sbytes; 786 res = sbytes;
720 } 787 }
721 788
722# elif __hpux 789# elif __hpux
723 res = sendfile (ofd, ifd, offset, count, 0, 0); 790 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
779 846
780 offset += cnt; 847 offset += cnt;
781 res += cnt; 848 res += cnt;
782 count -= cnt; 849 count -= cnt;
783 } 850 }
784
785 fBUF;
786 } 851 }
787 852
788 return res; 853 return res;
789} 854}
790 855
791/* read a full directory */ 856/* read a full directory */
792static int scandir_ (const char *path, void **namesp) 857static void scandir_ (aio_req req, worker *self)
793{ 858{
794 DIR *dirp; 859 DIR *dirp;
795 union 860 union
796 { 861 {
797 struct dirent d; 862 struct dirent d;
… …
802 int memlen = 4096; 867 int memlen = 4096;
803 int memofs = 0; 868 int memofs = 0;
804 int res = 0; 869 int res = 0;
805 int errorno; 870 int errorno;
806 871
807 dirp = opendir (path); 872 LOCK (wrklock);
808 if (!dirp) 873 self->dirp = dirp = opendir (req->dataptr);
809 return -1;
810
811 u = malloc (sizeof (*u)); 874 self->dbuf = u = malloc (sizeof (*u));
812 names = malloc (memlen); 875 req->data2ptr = names = malloc (memlen);
876 UNLOCK (wrklock);
813 877
814 if (u && names) 878 if (dirp && u && names)
815 for (;;) 879 for (;;)
816 { 880 {
817 errno = 0; 881 errno = 0;
818 readdir_r (dirp, &u->d, &entp); 882 readdir_r (dirp, &u->d, &entp);
819 883
… …
829 res++; 893 res++;
830 894
831 while (memofs + len > memlen) 895 while (memofs + len > memlen)
832 { 896 {
833 memlen *= 2; 897 memlen *= 2;
898 LOCK (wrklock);
834 names = realloc (names, memlen); 899 req->data2ptr = names = realloc (names, memlen);
900 UNLOCK (wrklock);
901
835 if (!names) 902 if (!names)
836 break; 903 break;
837 } 904 }
838 905
839 memcpy (names + memofs, name, len); 906 memcpy (names + memofs, name, len);
840 memofs += len; 907 memofs += len;
841 } 908 }
842 } 909 }
843 910
844 errorno = errno;
845 free (u);
846 closedir (dirp);
847
848 if (errorno) 911 if (errno)
849 {
850 free (names);
851 errno = errorno;
852 res = -1; 912 res = -1;
853 } 913
854 914 req->result = res;
855 *namesp = (void *)names;
856 return res;
857} 915}
858 916
859/*****************************************************************************/ 917/*****************************************************************************/
860 918
861static void *aio_proc (void *thr_arg) 919static void *aio_proc (void *thr_arg)
862{ 920{
863 aio_req req; 921 aio_req req;
864 int type; 922 int type;
923 worker *self = (worker *)thr_arg;
865 924
866 do 925 do
867 { 926 {
868 pthread_mutex_lock (&reqlock); 927 LOCK (reqlock);
869 928
870 for (;;) 929 for (;;)
871 { 930 {
872 req = reqq_shift (&req_queue); 931 self->req = req = reqq_shift (&req_queue);
873 932
874 if (req) 933 if (req)
875 break; 934 break;
876 935
877 pthread_cond_wait (&reqwait, &reqlock); 936 pthread_cond_wait (&reqwait, &reqlock);
878 } 937 }
879 938
880 pthread_mutex_unlock (&reqlock); 939 UNLOCK (reqlock);
881 940
882 errno = 0; /* strictly unnecessary */ 941 errno = 0; /* strictly unnecessary */
883 type = req->type; /* remember type for QUIT check */ 942 type = req->type; /* remember type for QUIT check */
884 943
885 if (!(req->flags & FLAG_CANCELLED)) 944 if (!(req->flags & FLAG_CANCELLED))
… …
887 { 946 {
888 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
889 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 948 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
890 949
891 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
892 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 951 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
893 952
894 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
895 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
896 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
897 956
… …
903 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
904 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
905 964
906 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
907 case REQ_FSYNC: req->result = fsync (req->fd); break; 966 case REQ_FSYNC: req->result = fsync (req->fd); break;
908 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 967 case REQ_READDIR: scandir_ (req, self); break;
909 968
910 case REQ_SLEEP: 969 case REQ_BUSY:
911 { 970 {
912 struct timeval tv; 971 struct timeval tv;
913 972
914 tv.tv_sec = req->fd; 973 tv.tv_sec = req->fd;
915 tv.tv_usec = req->fd2; 974 tv.tv_usec = req->fd2;
… …
927 break; 986 break;
928 } 987 }
929 988
930 req->errorno = errno; 989 req->errorno = errno;
931 990
932 pthread_mutex_lock (&reslock); 991 LOCK (reslock);
933 992
934 if (!reqq_push (&res_queue, req)) 993 if (!reqq_push (&res_queue, req))
935 /* write a dummy byte to the pipe so fh becomes ready */ 994 /* write a dummy byte to the pipe so fh becomes ready */
936 write (respipe [1], &respipe, 1); 995 write (respipe [1], &respipe, 1);
937 996
938 pthread_mutex_unlock (&reslock); 997 self->req = 0;
998 worker_clear (self);
999
1000 UNLOCK (reslock);
939 } 1001 }
940 while (type != REQ_QUIT); 1002 while (type != REQ_QUIT);
941 1003
1004 LOCK (wrklock);
1005 worker_free (self);
1006 UNLOCK (wrklock);
1007
942 return 0; 1008 return 0;
943} 1009}
944 1010
945/*****************************************************************************/ 1011/*****************************************************************************/
946 1012
947static void atfork_prepare (void) 1013static void atfork_prepare (void)
948{ 1014{
949 pthread_mutex_lock (&reqlock); 1015 LOCK (wrklock);
950 pthread_mutex_lock (&reslock); 1016 LOCK (reqlock);
1017 LOCK (reslock);
951#if !HAVE_PREADWRITE 1018#if !HAVE_PREADWRITE
952 pthread_mutex_lock (&preadwritelock); 1019 LOCK (preadwritelock);
953#endif 1020#endif
954#if !HAVE_READDIR_R 1021#if !HAVE_READDIR_R
955 pthread_mutex_lock (&readdirlock); 1022 LOCK (readdirlock);
956#endif 1023#endif
957} 1024}
958 1025
959static void atfork_parent (void) 1026static void atfork_parent (void)
960{ 1027{
961#if !HAVE_READDIR_R 1028#if !HAVE_READDIR_R
962 pthread_mutex_unlock (&readdirlock); 1029 UNLOCK (readdirlock);
963#endif 1030#endif
964#if !HAVE_PREADWRITE 1031#if !HAVE_PREADWRITE
965 pthread_mutex_unlock (&preadwritelock); 1032 UNLOCK (preadwritelock);
966#endif 1033#endif
967 pthread_mutex_unlock (&reslock); 1034 UNLOCK (reslock);
968 pthread_mutex_unlock (&reqlock); 1035 UNLOCK (reqlock);
1036 UNLOCK (wrklock);
969} 1037}
970 1038
971static void atfork_child (void) 1039static void atfork_child (void)
972{ 1040{
973 aio_req prv; 1041 aio_req prv;
974
975 started = 0;
976 1042
977 while (prv = reqq_shift (&req_queue)) 1043 while (prv = reqq_shift (&req_queue))
978 req_free (prv); 1044 req_free (prv);
979 1045
980 while (prv = reqq_shift (&res_queue)) 1046 while (prv = reqq_shift (&res_queue))
981 req_free (prv); 1047 req_free (prv);
982 1048
1049 while (wrk_first.next != &wrk_first)
1050 {
1051 worker *wrk = wrk_first.next;
1052
1053 if (wrk->req)
1054 req_free (wrk->req);
1055
1056 worker_clear (wrk);
1057 worker_free (wrk);
1058 }
1059
1060 started = 0;
1061 nreqs = 0;
1062
983 close (respipe [0]); 1063 close (respipe [0]);
984 close (respipe [1]); 1064 close (respipe [1]);
985 create_pipe (); 1065 create_pipe ();
986 1066
987 atfork_parent (); 1067 atfork_parent ();
… …
1031void 1111void
1032max_parallel (nthreads) 1112max_parallel (nthreads)
1033 int nthreads 1113 int nthreads
1034 PROTOTYPE: $ 1114 PROTOTYPE: $
1035 1115
1036int
1037max_outstanding (nreqs)
1038 int nreqs
1039 PROTOTYPE: $
1040 CODE:
1041 RETVAL = max_outstanding;
1042 max_outstanding = nreqs;
1043
1044void 1116void
1045aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1117aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1046 SV * pathname 1118 SV * pathname
1047 int flags 1119 int flags
1048 int mode 1120 int mode
… …
1262 1334
1263 REQ_SEND; 1335 REQ_SEND;
1264} 1336}
1265 1337
1266void 1338void
1267aio_sleep (delay,callback=&PL_sv_undef) 1339aio_busy (delay,callback=&PL_sv_undef)
1268 double delay 1340 double delay
1269 SV * callback 1341 SV * callback
1270 PPCODE: 1342 PPCODE:
1271{ 1343{
1272 dREQ; 1344 dREQ;
1273 1345
1274 req->type = REQ_SLEEP; 1346 req->type = REQ_BUSY;
1275 req->fd = delay < 0. ? 0 : delay; 1347 req->fd = delay < 0. ? 0 : delay;
1276 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1277 1349
1278 REQ_SEND; 1350 REQ_SEND;
1279} 1351}
… …
1324 PROTOTYPE: 1396 PROTOTYPE:
1325 CODE: 1397 CODE:
1326 while (nreqs) 1398 while (nreqs)
1327 { 1399 {
1328 poll_wait (); 1400 poll_wait ();
1329 poll_cb (); 1401 poll_cb (0);
1330 } 1402 }
1331 1403
1332void 1404void
1333poll() 1405poll()
1334 PROTOTYPE: 1406 PROTOTYPE:
1335 CODE: 1407 CODE:
1336 if (nreqs) 1408 if (nreqs)
1337 { 1409 {
1338 poll_wait (); 1410 poll_wait ();
1339 poll_cb (); 1411 poll_cb (0);
1340 } 1412 }
1341 1413
1342int 1414int
1343poll_fileno() 1415poll_fileno()
1344 PROTOTYPE: 1416 PROTOTYPE:
… …
1349 1421
1350int 1422int
1351poll_cb(...) 1423poll_cb(...)
1352 PROTOTYPE: 1424 PROTOTYPE:
1353 CODE: 1425 CODE:
1354 RETVAL = poll_cb (); 1426 RETVAL = poll_cb (0);
1427 OUTPUT:
1428 RETVAL
1429
1430int
1431poll_some(int max = 0)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = poll_cb (max);
1355 OUTPUT: 1435 OUTPUT:
1356 RETVAL 1436 RETVAL
1357 1437
1358void 1438void
1359poll_wait() 1439poll_wait()
… …
1419 } 1499 }
1420 } 1500 }
1421} 1501}
1422 1502
1423void 1503void
1504cancel_subs (aio_req_ornot req)
1505 CODE:
1506 req_cancel_subs (req);
1507
1508void
1424result (aio_req grp, ...) 1509result (aio_req grp, ...)
1425 CODE: 1510 CODE:
1426{ 1511{
1427 int i; 1512 int i;
1428 AV *av = newAV (); 1513 AV *av = newAV ();

Diff Legend

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