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.71 by root, Tue Oct 24 16:35:04 2006 UTC

… …
59 59
60/* buffer size for various temporary buffers */ 60/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 61#define AIO_BUFSIZE 65536
62 62
63#define dBUF \ 63#define dBUF \
64 char *aio_buf; \
65 LOCK (wrklock); \
64 char *aio_buf = malloc (AIO_BUFSIZE); \ 66 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
67 UNLOCK (wrklock); \
65 if (!aio_buf) \ 68 if (!aio_buf) \
66 return -1; 69 return -1;
67
68#define fBUF free (aio_buf)
69 70
70enum { 71enum {
71 REQ_QUIT, 72 REQ_QUIT,
72 REQ_OPEN, REQ_CLOSE, 73 REQ_OPEN, REQ_CLOSE,
73 REQ_READ, REQ_WRITE, REQ_READAHEAD, 74 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 137# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else 138#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 139# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif 140#endif
140 141
142#define LOCK(mutex) pthread_mutex_lock (&(mutex))
143#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
144
145/* worker threasd management */
146static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
147
148typedef struct worker {
149 /* locked by wrklock */
150 struct worker *prev, *next;
151
152 pthread_t tid;
153
154 /* locked by reslock, reqlock or wrklock */
155 aio_req req; /* currently processed request */
156 void *dbuf;
157 DIR *dirp;
158} worker;
159
160static worker wrk_first = { &wrk_first, &wrk_first, 0 };
161
162static void worker_clear (worker *wrk)
163{
164 if (wrk->dirp)
165 {
166 closedir (wrk->dirp);
167 wrk->dirp = 0;
168 }
169
170 if (wrk->dbuf)
171 {
172 free (wrk->dbuf);
173 wrk->dbuf = 0;
174 }
175}
176
177static void worker_free (worker *wrk)
178{
179 wrk->next->prev = wrk->prev;
180 wrk->prev->next = wrk->next;
181
182 free (wrk);
183}
184
141static pthread_mutex_t reslock = AIO_MUTEX_INIT; 185static pthread_mutex_t reslock = AIO_MUTEX_INIT;
142static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 186static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
143static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 187static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
144 188
145/* 189/*
… …
274 fd_set rfd; 318 fd_set rfd;
275 319
276 while (nreqs) 320 while (nreqs)
277 { 321 {
278 int size; 322 int size;
279#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 323#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
280 pthread_mutex_lock (&reslock); 324 LOCK (reslock);
281#endif 325#endif
282 size = res_queue.size; 326 size = res_queue.size;
283#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 327#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
284 pthread_mutex_unlock (&reslock); 328 UNLOCK (reslock);
285#endif 329#endif
286 330
287 if (size) 331 if (size)
288 return; 332 return;
289 333
… …
313 { 357 {
314 SV *rv = &PL_sv_undef; 358 SV *rv = &PL_sv_undef;
315 359
316 if (req->result >= 0) 360 if (req->result >= 0)
317 { 361 {
362 int i;
318 char *buf = req->data2ptr; 363 char *buf = req->data2ptr;
319 AV *av = newAV (); 364 AV *av = newAV ();
320 365
321 while (req->result) 366 av_extend (av, req->result - 1);
367
368 for (i = 0; i < req->result; ++i)
322 { 369 {
323 SV *sv = newSVpv (buf, 0); 370 SV *sv = newSVpv (buf, 0);
324 371
325 av_push (av, sv); 372 av_store (av, i, sv);
326 buf += SvCUR (sv) + 1; 373 buf += SvCUR (sv) + 1;
327 req->result--;
328 } 374 }
329 375
330 rv = sv_2mortal (newRV_noinc ((SV *)av)); 376 rv = sv_2mortal (newRV_noinc ((SV *)av));
331 } 377 }
332 378
… …
416 SvREFCNT_dec (req->fh); 462 SvREFCNT_dec (req->fh);
417 SvREFCNT_dec (req->fh2); 463 SvREFCNT_dec (req->fh2);
418 SvREFCNT_dec (req->callback); 464 SvREFCNT_dec (req->callback);
419 Safefree (req->statdata); 465 Safefree (req->statdata);
420 466
421 if (req->type == REQ_READDIR && req->result >= 0) 467 if (req->type == REQ_READDIR)
422 free (req->data2ptr); 468 free (req->data2ptr);
423 469
424 Safefree (req); 470 Safefree (req);
425} 471}
426 472
… …
444 int do_croak = 0; 490 int do_croak = 0;
445 aio_req req; 491 aio_req req;
446 492
447 for (;;) 493 for (;;)
448 { 494 {
449 pthread_mutex_lock (&reslock); 495 LOCK (reslock);
450 req = reqq_shift (&res_queue); 496 req = reqq_shift (&res_queue);
451 497
452 if (req) 498 if (req)
453 { 499 {
454 if (!res_queue.size) 500 if (!res_queue.size)
… …
458 while (read (respipe [0], buf, 32) == 32) 504 while (read (respipe [0], buf, 32) == 32)
459 ; 505 ;
460 } 506 }
461 } 507 }
462 508
463 pthread_mutex_unlock (&reslock); 509 UNLOCK (reslock);
464 510
465 if (!req) 511 if (!req)
466 break; 512 break;
467 513
468 --nreqs; 514 --nreqs;
… …
502 548
503static void *aio_proc(void *arg); 549static void *aio_proc(void *arg);
504 550
505static void start_thread (void) 551static void start_thread (void)
506{ 552{
553 worker *wrk = calloc (1, sizeof (worker));
554
555 if (!wrk)
556 croak ("unable to allocate worker thread data");
557
507 sigset_t fullsigset, oldsigset; 558 sigset_t fullsigset, oldsigset;
508 pthread_t tid;
509 pthread_attr_t attr; 559 pthread_attr_t attr;
510 560
511 pthread_attr_init (&attr); 561 pthread_attr_init (&attr);
512 pthread_attr_setstacksize (&attr, STACKSIZE); 562 pthread_attr_setstacksize (&attr, STACKSIZE);
513 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 563 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
514 564
515 sigfillset (&fullsigset); 565 sigfillset (&fullsigset);
566
567 LOCK (wrklock);
516 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 568 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
517 569
518 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 570 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
571 {
572 wrk->prev = &wrk_first;
573 wrk->next = wrk_first.next;
574 wrk_first.next->prev = wrk;
575 wrk_first.next = wrk;
519 started++; 576 started++;
577 }
578 else
579 free (wrk);
520 580
521 sigprocmask (SIG_SETMASK, &oldsigset, 0); 581 sigprocmask (SIG_SETMASK, &oldsigset, 0);
582 UNLOCK (wrklock);
522} 583}
523 584
524static void req_send (aio_req req) 585static void req_send (aio_req req)
525{ 586{
526 while (started < wanted && nreqs >= started) 587 while (started < wanted && nreqs >= started)
527 start_thread (); 588 start_thread ();
528 589
529 ++nreqs; 590 ++nreqs;
530 591
531 pthread_mutex_lock (&reqlock); 592 LOCK (reqlock);
532 reqq_push (&req_queue, req); 593 reqq_push (&req_queue, req);
533 pthread_cond_signal (&reqwait); 594 pthread_cond_signal (&reqwait);
534 pthread_mutex_unlock (&reqlock); 595 UNLOCK (reqlock);
535 596
536 if (nreqs > max_outstanding) 597 if (nreqs > max_outstanding)
537 for (;;) 598 for (;;)
538 { 599 {
539 poll_cb (); 600 poll_cb ();
… …
612static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 673static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
613{ 674{
614 ssize_t res; 675 ssize_t res;
615 off_t ooffset; 676 off_t ooffset;
616 677
617 pthread_mutex_lock (&preadwritelock); 678 LOCK (preadwritelock);
618 ooffset = lseek (fd, 0, SEEK_CUR); 679 ooffset = lseek (fd, 0, SEEK_CUR);
619 lseek (fd, offset, SEEK_SET); 680 lseek (fd, offset, SEEK_SET);
620 res = read (fd, buf, count); 681 res = read (fd, buf, count);
621 lseek (fd, ooffset, SEEK_SET); 682 lseek (fd, ooffset, SEEK_SET);
622 pthread_mutex_unlock (&preadwritelock); 683 UNLOCK (preadwritelock);
623 684
624 return res; 685 return res;
625} 686}
626 687
627static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 688static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
628{ 689{
629 ssize_t res; 690 ssize_t res;
630 off_t ooffset; 691 off_t ooffset;
631 692
632 pthread_mutex_lock (&preadwritelock); 693 LOCK (preadwritelock);
633 ooffset = lseek (fd, 0, SEEK_CUR); 694 ooffset = lseek (fd, 0, SEEK_CUR);
634 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
635 res = write (fd, buf, count); 696 res = write (fd, buf, count);
636 lseek (fd, offset, SEEK_SET); 697 lseek (fd, offset, SEEK_SET);
637 pthread_mutex_unlock (&preadwritelock); 698 UNLOCK (preadwritelock);
638 699
639 return res; 700 return res;
640} 701}
641#endif 702#endif
642 703
… …
658 pread (fd, aio_buf, len, offset); 719 pread (fd, aio_buf, len, offset);
659 offset += len; 720 offset += len;
660 count -= len; 721 count -= len;
661 } 722 }
662 723
663 fBUF;
664
665 errno = 0; 724 errno = 0;
666} 725}
667#endif 726#endif
668 727
669#if !HAVE_READDIR_R 728#if !HAVE_READDIR_R
… …
674static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 733static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
675{ 734{
676 struct dirent *e; 735 struct dirent *e;
677 int errorno; 736 int errorno;
678 737
679 pthread_mutex_lock (&readdirlock); 738 LOCK (readdirlock);
680 739
681 e = readdir (dirp); 740 e = readdir (dirp);
682 errorno = errno; 741 errorno = errno;
683 742
684 if (e) 743 if (e)
… …
687 strcpy (ent->d_name, e->d_name); 746 strcpy (ent->d_name, e->d_name);
688 } 747 }
689 else 748 else
690 *res = 0; 749 *res = 0;
691 750
692 pthread_mutex_unlock (&readdirlock); 751 UNLOCK (readdirlock);
693 752
694 errno = errorno; 753 errno = errorno;
695 return e ? 0 : -1; 754 return e ? 0 : -1;
696} 755}
697#endif 756#endif
698 757
699/* sendfile always needs emulation */ 758/* sendfile always needs emulation */
700static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 759static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
701{ 760{
702 ssize_t res; 761 ssize_t res;
703 762
704 if (!count) 763 if (!count)
705 return 0; 764 return 0;
… …
782 841
783 offset += cnt; 842 offset += cnt;
784 res += cnt; 843 res += cnt;
785 count -= cnt; 844 count -= cnt;
786 } 845 }
787
788 fBUF;
789 } 846 }
790 847
791 return res; 848 return res;
792} 849}
793 850
794/* read a full directory */ 851/* read a full directory */
795static int scandir_ (const char *path, void **namesp) 852static void scandir_ (aio_req req, worker *self)
796{ 853{
797 DIR *dirp; 854 DIR *dirp;
798 union 855 union
799 { 856 {
800 struct dirent d; 857 struct dirent d;
… …
805 int memlen = 4096; 862 int memlen = 4096;
806 int memofs = 0; 863 int memofs = 0;
807 int res = 0; 864 int res = 0;
808 int errorno; 865 int errorno;
809 866
810 dirp = opendir (path); 867 LOCK (wrklock);
811 if (!dirp) 868 self->dirp = dirp = opendir (req->dataptr);
812 return -1;
813
814 u = malloc (sizeof (*u)); 869 self->dbuf = u = malloc (sizeof (*u));
870 UNLOCK (wrklock);
871
815 names = malloc (memlen); 872 req->data2ptr = names = malloc (memlen);
816 873
817 if (u && names) 874 if (dirp && u && names)
818 for (;;) 875 for (;;)
819 { 876 {
820 errno = 0; 877 errno = 0;
821 readdir_r (dirp, &u->d, &entp); 878 readdir_r (dirp, &u->d, &entp);
822 879
… …
832 res++; 889 res++;
833 890
834 while (memofs + len > memlen) 891 while (memofs + len > memlen)
835 { 892 {
836 memlen *= 2; 893 memlen *= 2;
894 LOCK (wrklock);
837 names = realloc (names, memlen); 895 req->data2ptr = names = realloc (names, memlen);
896 UNLOCK (wrklock);
897
838 if (!names) 898 if (!names)
839 break; 899 break;
840 } 900 }
841 901
842 memcpy (names + memofs, name, len); 902 memcpy (names + memofs, name, len);
843 memofs += len; 903 memofs += len;
844 } 904 }
845 } 905 }
846 906
847 errorno = errno;
848 free (u);
849 closedir (dirp);
850
851 if (errorno) 907 if (errno)
852 {
853 free (names);
854 errno = errorno;
855 res = -1; 908 res = -1;
856 } 909
857 910 req->result = res;
858 *namesp = (void *)names;
859 return res;
860} 911}
861 912
862/*****************************************************************************/ 913/*****************************************************************************/
863 914
864static void *aio_proc (void *thr_arg) 915static void *aio_proc (void *thr_arg)
865{ 916{
866 aio_req req; 917 aio_req req;
867 int type; 918 int type;
919 worker *self = (worker *)thr_arg;
868 920
869 do 921 do
870 { 922 {
871 pthread_mutex_lock (&reqlock); 923 LOCK (reqlock);
872 924
873 for (;;) 925 for (;;)
874 { 926 {
875 req = reqq_shift (&req_queue); 927 self->req = req = reqq_shift (&req_queue);
876 928
877 if (req) 929 if (req)
878 break; 930 break;
879 931
880 pthread_cond_wait (&reqwait, &reqlock); 932 pthread_cond_wait (&reqwait, &reqlock);
881 } 933 }
882 934
883 pthread_mutex_unlock (&reqlock); 935 UNLOCK (reqlock);
884 936
885 errno = 0; /* strictly unnecessary */ 937 errno = 0; /* strictly unnecessary */
886 type = req->type; /* remember type for QUIT check */ 938 type = req->type; /* remember type for QUIT check */
887 939
888 if (!(req->flags & FLAG_CANCELLED)) 940 if (!(req->flags & FLAG_CANCELLED))
… …
890 { 942 {
891 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 943 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; 944 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
893 945
894 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 946 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; 947 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
896 948
897 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 949 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
898 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 950 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
899 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 951 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
900 952
… …
906 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 958 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
907 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 959 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
908 960
909 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 961 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
910 case REQ_FSYNC: req->result = fsync (req->fd); break; 962 case REQ_FSYNC: req->result = fsync (req->fd); break;
911 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 963 case REQ_READDIR: scandir_ (req, self); break;
912 964
913 case REQ_BUSY: 965 case REQ_BUSY:
914 { 966 {
915 struct timeval tv; 967 struct timeval tv;
916 968
… …
930 break; 982 break;
931 } 983 }
932 984
933 req->errorno = errno; 985 req->errorno = errno;
934 986
935 pthread_mutex_lock (&reslock); 987 LOCK (reslock);
936 988
937 if (!reqq_push (&res_queue, req)) 989 if (!reqq_push (&res_queue, req))
938 /* write a dummy byte to the pipe so fh becomes ready */ 990 /* write a dummy byte to the pipe so fh becomes ready */
939 write (respipe [1], &respipe, 1); 991 write (respipe [1], &respipe, 1);
940 992
941 pthread_mutex_unlock (&reslock); 993 self->req = 0;
994 worker_clear (self);
995
996 UNLOCK (reslock);
942 } 997 }
943 while (type != REQ_QUIT); 998 while (type != REQ_QUIT);
944 999
1000 LOCK (wrklock);
1001 worker_free (self);
1002 UNLOCK (wrklock);
1003
945 return 0; 1004 return 0;
946} 1005}
947 1006
948/*****************************************************************************/ 1007/*****************************************************************************/
949 1008
950static void atfork_prepare (void) 1009static void atfork_prepare (void)
951{ 1010{
952 pthread_mutex_lock (&reqlock); 1011 LOCK (wrklock);
953 pthread_mutex_lock (&reslock); 1012 LOCK (reqlock);
1013 LOCK (reslock);
954#if !HAVE_PREADWRITE 1014#if !HAVE_PREADWRITE
955 pthread_mutex_lock (&preadwritelock); 1015 LOCK (preadwritelock);
956#endif 1016#endif
957#if !HAVE_READDIR_R 1017#if !HAVE_READDIR_R
958 pthread_mutex_lock (&readdirlock); 1018 LOCK (readdirlock);
959#endif 1019#endif
960} 1020}
961 1021
962static void atfork_parent (void) 1022static void atfork_parent (void)
963{ 1023{
964#if !HAVE_READDIR_R 1024#if !HAVE_READDIR_R
965 pthread_mutex_unlock (&readdirlock); 1025 UNLOCK (readdirlock);
966#endif 1026#endif
967#if !HAVE_PREADWRITE 1027#if !HAVE_PREADWRITE
968 pthread_mutex_unlock (&preadwritelock); 1028 UNLOCK (preadwritelock);
969#endif 1029#endif
970 pthread_mutex_unlock (&reslock); 1030 UNLOCK (reslock);
971 pthread_mutex_unlock (&reqlock); 1031 UNLOCK (reqlock);
1032 UNLOCK (wrklock);
972} 1033}
973 1034
974static void atfork_child (void) 1035static void atfork_child (void)
975{ 1036{
976 aio_req prv; 1037 aio_req prv;
977
978 started = 0;
979 1038
980 while (prv = reqq_shift (&req_queue)) 1039 while (prv = reqq_shift (&req_queue))
981 req_free (prv); 1040 req_free (prv);
982 1041
983 while (prv = reqq_shift (&res_queue)) 1042 while (prv = reqq_shift (&res_queue))
984 req_free (prv); 1043 req_free (prv);
985 1044
1045 while (wrk_first.next != &wrk_first)
1046 {
1047 worker *wrk = wrk_first.next;
1048
1049 if (wrk->req)
1050 req_free (wrk->req);
1051
1052 worker_clear (wrk);
1053 worker_free (wrk);
1054 }
1055
1056 started = 0;
1057 nreqs = 0;
1058
986 close (respipe [0]); 1059 close (respipe [0]);
987 close (respipe [1]); 1060 close (respipe [1]);
988 create_pipe (); 1061 create_pipe ();
989 1062
990 atfork_parent (); 1063 atfork_parent ();

Diff Legend

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