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.70 by root, Tue Oct 24 15:15:56 2006 UTC vs.
Revision 1.76 by root, Thu Oct 26 12:38:04 2006 UTC

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

Diff Legend

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