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.78 by root, Thu Oct 26 14:35:34 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
… …
122 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 132 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
123}; 133};
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 unsigned int started, wanted;
128static volatile int nreqs; 138static volatile unsigned int nreqs;
129static int max_outstanding = 1<<30; 139static volatile unsigned int max_outstanding = 0xffffffff;
130static int respipe [2]; 140static int respipe [2];
131 141
132#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 142#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
133# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 143# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
134#else 144#else
135# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 145# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
136#endif 146#endif
147
148#define LOCK(mutex) pthread_mutex_lock (&(mutex))
149#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
150
151/* worker threads management */
152static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
153
154typedef struct worker {
155 /* locked by wrklock */
156 struct worker *prev, *next;
157
158 pthread_t tid;
159
160 /* locked by reslock, reqlock or wrklock */
161 aio_req req; /* currently processed request */
162 void *dbuf;
163 DIR *dirp;
164} worker;
165
166static worker wrk_first = { &wrk_first, &wrk_first, 0 };
167
168static void worker_clear (worker *wrk)
169{
170 if (wrk->dirp)
171 {
172 closedir (wrk->dirp);
173 wrk->dirp = 0;
174 }
175
176 if (wrk->dbuf)
177 {
178 free (wrk->dbuf);
179 wrk->dbuf = 0;
180 }
181}
182
183static void worker_free (worker *wrk)
184{
185 wrk->next->prev = wrk->prev;
186 wrk->prev->next = wrk->next;
187
188 free (wrk);
189}
137 190
138static pthread_mutex_t reslock = AIO_MUTEX_INIT; 191static pthread_mutex_t reslock = AIO_MUTEX_INIT;
139static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 192static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
140static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 193static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
141 194
… …
191 } 244 }
192 245
193 abort (); 246 abort ();
194} 247}
195 248
249static int poll_cb (int max);
196static void req_invoke (aio_req req); 250static void req_invoke (aio_req req);
197static void req_free (aio_req req); 251static void req_free (aio_req req);
252static void req_cancel (aio_req req);
198 253
199/* must be called at most once */ 254/* must be called at most once */
200static SV *req_sv (aio_req req, const char *klass) 255static SV *req_sv (aio_req req, const char *klass)
201{ 256{
202 if (!req->self) 257 if (!req->self)
… …
271 fd_set rfd; 326 fd_set rfd;
272 327
273 while (nreqs) 328 while (nreqs)
274 { 329 {
275 int size; 330 int size;
276#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 331#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
277 pthread_mutex_lock (&reslock); 332 LOCK (reslock);
278#endif 333#endif
279 size = res_queue.size; 334 size = res_queue.size;
280#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 335#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
281 pthread_mutex_unlock (&reslock); 336 UNLOCK (reslock);
282#endif 337#endif
283 338
284 if (size) 339 if (size)
285 return; 340 return;
286 341
… …
310 { 365 {
311 SV *rv = &PL_sv_undef; 366 SV *rv = &PL_sv_undef;
312 367
313 if (req->result >= 0) 368 if (req->result >= 0)
314 { 369 {
370 int i;
315 char *buf = req->data2ptr; 371 char *buf = req->data2ptr;
316 AV *av = newAV (); 372 AV *av = newAV ();
317 373
318 while (req->result) 374 av_extend (av, req->result - 1);
375
376 for (i = 0; i < req->result; ++i)
319 { 377 {
320 SV *sv = newSVpv (buf, 0); 378 SV *sv = newSVpv (buf, 0);
321 379
322 av_push (av, sv); 380 av_store (av, i, sv);
323 buf += SvCUR (sv) + 1; 381 buf += SvCUR (sv) + 1;
324 req->result--;
325 } 382 }
326 383
327 rv = sv_2mortal (newRV_noinc ((SV *)av)); 384 rv = sv_2mortal (newRV_noinc ((SV *)av));
328 } 385 }
329 386
… …
361 PUSHs (*av_fetch (av, i, 0)); 418 PUSHs (*av_fetch (av, i, 0));
362 } 419 }
363 break; 420 break;
364 421
365 case REQ_NOP: 422 case REQ_NOP:
366 case REQ_SLEEP: 423 case REQ_BUSY:
367 break; 424 break;
368 425
369 default: 426 default:
370 PUSHs (sv_2mortal (newSViv (req->result))); 427 PUSHs (sv_2mortal (newSViv (req->result)));
371 break; 428 break;
… …
413 SvREFCNT_dec (req->fh); 470 SvREFCNT_dec (req->fh);
414 SvREFCNT_dec (req->fh2); 471 SvREFCNT_dec (req->fh2);
415 SvREFCNT_dec (req->callback); 472 SvREFCNT_dec (req->callback);
416 Safefree (req->statdata); 473 Safefree (req->statdata);
417 474
418 if (req->type == REQ_READDIR && req->result >= 0) 475 if (req->type == REQ_READDIR)
419 free (req->data2ptr); 476 free (req->data2ptr);
420 477
421 Safefree (req); 478 Safefree (req);
422} 479}
423 480
481static void req_cancel_subs (aio_req grp)
482{
483 aio_req sub;
484
485 if (grp->type != REQ_GROUP)
486 return;
487
488 SvREFCNT_dec (grp->fh2);
489 grp->fh2 = 0;
490
491 for (sub = grp->grp_first; sub; sub = sub->grp_next)
492 req_cancel (sub);
493}
494
424static void req_cancel (aio_req req) 495static void req_cancel (aio_req req)
425{ 496{
426 req->flags |= FLAG_CANCELLED; 497 req->flags |= FLAG_CANCELLED;
427 498
428 if (req->type == REQ_GROUP) 499 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} 500}
436 501
437static int poll_cb () 502static int poll_cb (int max)
438{ 503{
439 dSP; 504 dSP;
440 int count = 0; 505 int count = 0;
441 int do_croak = 0; 506 int do_croak = 0;
442 aio_req req; 507 aio_req req;
443 508
444 for (;;) 509 for (;;)
445 { 510 {
446 pthread_mutex_lock (&reslock); 511 while (max <= 0 || count < max)
447 req = reqq_shift (&res_queue);
448
449 if (req)
450 { 512 {
513 LOCK (reslock);
514 req = reqq_shift (&res_queue);
515
451 if (!res_queue.size) 516 if (req)
452 { 517 {
518 if (!res_queue.size)
519 {
453 /* read any signals sent by the worker threads */ 520 /* read any signals sent by the worker threads */
454 char buf [32]; 521 char buf [32];
455 while (read (respipe [0], buf, 32) == 32) 522 while (read (respipe [0], buf, 32) == 32)
523 ;
456 ; 524 }
457 } 525 }
526
527 UNLOCK (reslock);
528
529 if (!req)
530 break;
531
532 --nreqs;
533
534 if (req->type == REQ_QUIT)
535 --started;
536 else if (req->type == REQ_GROUP && req->length)
537 {
538 req->fd = 1; /* mark request as delayed */
539 continue;
540 }
541 else
542 {
543 if (req->type == REQ_READ)
544 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
545
546 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
547 SvREADONLY_off (req->data);
548
549 if (req->statdata)
550 {
551 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
552 PL_laststatval = req->result;
553 PL_statcache = *(req->statdata);
554 }
555
556 req_invoke (req);
557
558 count++;
559 }
560
561 req_free (req);
458 } 562 }
459 563
460 pthread_mutex_unlock (&reslock); 564 if (nreqs <= max_outstanding)
461
462 if (!req)
463 break; 565 break;
464 566
465 --nreqs; 567 poll_wait ();
466 568
467 if (req->type == REQ_QUIT) 569 max = 0;
468 started--;
469 else if (req->type == REQ_GROUP && req->length)
470 {
471 req->fd = 1; /* mark request as delayed */
472 continue;
473 }
474 else
475 {
476 if (req->type == REQ_READ)
477 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
478
479 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
480 SvREADONLY_off (req->data);
481
482 if (req->statdata)
483 {
484 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
485 PL_laststatval = req->result;
486 PL_statcache = *(req->statdata);
487 }
488
489 req_invoke (req);
490
491 count++;
492 }
493
494 req_free (req);
495 } 570 }
496 571
497 return count; 572 return count;
498} 573}
499 574
500static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
501 576
502static void start_thread (void) 577static void start_thread (void)
503{ 578{
504 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
505 pthread_t tid;
506 pthread_attr_t attr; 580 pthread_attr_t attr;
581
582 worker *wrk = calloc (1, sizeof (worker));
583
584 if (!wrk)
585 croak ("unable to allocate worker thread data");
507 586
508 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
509 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
510 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
511 590
512 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
592
593 LOCK (wrklock);
513 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
514 595
515 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 596 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
597 {
598 wrk->prev = &wrk_first;
599 wrk->next = wrk_first.next;
600 wrk_first.next->prev = wrk;
601 wrk_first.next = wrk;
516 started++; 602 ++started;
603 }
604 else
605 free (wrk);
517 606
518 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock);
519} 609}
520 610
521static void req_send (aio_req req) 611static void req_send (aio_req req)
522{ 612{
523 while (started < wanted && nreqs >= started) 613 while (started < wanted && nreqs >= started)
524 start_thread (); 614 start_thread ();
525 615
526 ++nreqs; 616 ++nreqs;
527 617
528 pthread_mutex_lock (&reqlock); 618 LOCK (reqlock);
529 reqq_push (&req_queue, req); 619 reqq_push (&req_queue, req);
530 pthread_cond_signal (&reqwait); 620 pthread_cond_signal (&reqwait);
531 pthread_mutex_unlock (&reqlock); 621 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} 622}
544 623
545static void end_thread (void) 624static void end_thread (void)
546{ 625{
547 aio_req req; 626 aio_req req;
… …
574 } 653 }
575 654
576 while (started > wanted) 655 while (started > wanted)
577 { 656 {
578 poll_wait (); 657 poll_wait ();
579 poll_cb (); 658 poll_cb (0);
580 } 659 }
581} 660}
582 661
583static void create_pipe () 662static void create_pipe ()
584{ 663{
… …
609static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 688static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
610{ 689{
611 ssize_t res; 690 ssize_t res;
612 off_t ooffset; 691 off_t ooffset;
613 692
614 pthread_mutex_lock (&preadwritelock); 693 LOCK (preadwritelock);
615 ooffset = lseek (fd, 0, SEEK_CUR); 694 ooffset = lseek (fd, 0, SEEK_CUR);
616 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
617 res = read (fd, buf, count); 696 res = read (fd, buf, count);
618 lseek (fd, ooffset, SEEK_SET); 697 lseek (fd, ooffset, SEEK_SET);
619 pthread_mutex_unlock (&preadwritelock); 698 UNLOCK (preadwritelock);
620 699
621 return res; 700 return res;
622} 701}
623 702
624static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 703static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
625{ 704{
626 ssize_t res; 705 ssize_t res;
627 off_t ooffset; 706 off_t ooffset;
628 707
629 pthread_mutex_lock (&preadwritelock); 708 LOCK (preadwritelock);
630 ooffset = lseek (fd, 0, SEEK_CUR); 709 ooffset = lseek (fd, 0, SEEK_CUR);
631 lseek (fd, offset, SEEK_SET); 710 lseek (fd, offset, SEEK_SET);
632 res = write (fd, buf, count); 711 res = write (fd, buf, count);
633 lseek (fd, offset, SEEK_SET); 712 lseek (fd, offset, SEEK_SET);
634 pthread_mutex_unlock (&preadwritelock); 713 UNLOCK (preadwritelock);
635 714
636 return res; 715 return res;
637} 716}
638#endif 717#endif
639 718
640#if !HAVE_FDATASYNC 719#if !HAVE_FDATASYNC
641# define fdatasync fsync 720# define fdatasync fsync
642#endif 721#endif
643 722
644#if !HAVE_READAHEAD 723#if !HAVE_READAHEAD
645# define readahead aio_readahead 724# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
646 725
647static ssize_t readahead (int fd, off_t offset, size_t count) 726static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
648{ 727{
649 dBUF; 728 dBUF;
650 729
651 while (count > 0) 730 while (count > 0)
652 { 731 {
… …
655 pread (fd, aio_buf, len, offset); 734 pread (fd, aio_buf, len, offset);
656 offset += len; 735 offset += len;
657 count -= len; 736 count -= len;
658 } 737 }
659 738
660 fBUF;
661
662 errno = 0; 739 errno = 0;
663} 740}
741
664#endif 742#endif
665 743
666#if !HAVE_READDIR_R 744#if !HAVE_READDIR_R
667# define readdir_r aio_readdir_r 745# define readdir_r aio_readdir_r
668 746
… …
671static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 749static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
672{ 750{
673 struct dirent *e; 751 struct dirent *e;
674 int errorno; 752 int errorno;
675 753
676 pthread_mutex_lock (&readdirlock); 754 LOCK (readdirlock);
677 755
678 e = readdir (dirp); 756 e = readdir (dirp);
679 errorno = errno; 757 errorno = errno;
680 758
681 if (e) 759 if (e)
… …
684 strcpy (ent->d_name, e->d_name); 762 strcpy (ent->d_name, e->d_name);
685 } 763 }
686 else 764 else
687 *res = 0; 765 *res = 0;
688 766
689 pthread_mutex_unlock (&readdirlock); 767 UNLOCK (readdirlock);
690 768
691 errno = errorno; 769 errno = errorno;
692 return e ? 0 : -1; 770 return e ? 0 : -1;
693} 771}
694#endif 772#endif
695 773
696/* sendfile always needs emulation */ 774/* sendfile always needs emulation */
697static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 775static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
698{ 776{
699 ssize_t res; 777 ssize_t res;
700 778
701 if (!count) 779 if (!count)
702 return 0; 780 return 0;
… …
713 { 791 {
714 off_t sbytes; 792 off_t sbytes;
715 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 793 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
716 794
717 if (res < 0 && sbytes) 795 if (res < 0 && sbytes)
718 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 796 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
719 res = sbytes; 797 res = sbytes;
720 } 798 }
721 799
722# elif __hpux 800# elif __hpux
723 res = sendfile (ofd, ifd, offset, count, 0, 0); 801 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
779 857
780 offset += cnt; 858 offset += cnt;
781 res += cnt; 859 res += cnt;
782 count -= cnt; 860 count -= cnt;
783 } 861 }
784
785 fBUF;
786 } 862 }
787 863
788 return res; 864 return res;
789} 865}
790 866
791/* read a full directory */ 867/* read a full directory */
792static int scandir_ (const char *path, void **namesp) 868static void scandir_ (aio_req req, worker *self)
793{ 869{
794 DIR *dirp; 870 DIR *dirp;
795 union 871 union
796 { 872 {
797 struct dirent d; 873 struct dirent d;
… …
802 int memlen = 4096; 878 int memlen = 4096;
803 int memofs = 0; 879 int memofs = 0;
804 int res = 0; 880 int res = 0;
805 int errorno; 881 int errorno;
806 882
807 dirp = opendir (path); 883 LOCK (wrklock);
808 if (!dirp) 884 self->dirp = dirp = opendir (req->dataptr);
809 return -1;
810
811 u = malloc (sizeof (*u)); 885 self->dbuf = u = malloc (sizeof (*u));
812 names = malloc (memlen); 886 req->data2ptr = names = malloc (memlen);
887 UNLOCK (wrklock);
813 888
814 if (u && names) 889 if (dirp && u && names)
815 for (;;) 890 for (;;)
816 { 891 {
817 errno = 0; 892 errno = 0;
818 readdir_r (dirp, &u->d, &entp); 893 readdir_r (dirp, &u->d, &entp);
819 894
… …
829 res++; 904 res++;
830 905
831 while (memofs + len > memlen) 906 while (memofs + len > memlen)
832 { 907 {
833 memlen *= 2; 908 memlen *= 2;
909 LOCK (wrklock);
834 names = realloc (names, memlen); 910 req->data2ptr = names = realloc (names, memlen);
911 UNLOCK (wrklock);
912
835 if (!names) 913 if (!names)
836 break; 914 break;
837 } 915 }
838 916
839 memcpy (names + memofs, name, len); 917 memcpy (names + memofs, name, len);
840 memofs += len; 918 memofs += len;
841 } 919 }
842 } 920 }
843 921
844 errorno = errno;
845 free (u);
846 closedir (dirp);
847
848 if (errorno) 922 if (errno)
849 {
850 free (names);
851 errno = errorno;
852 res = -1; 923 res = -1;
853 } 924
854 925 req->result = res;
855 *namesp = (void *)names;
856 return res;
857} 926}
858 927
859/*****************************************************************************/ 928/*****************************************************************************/
860 929
861static void *aio_proc (void *thr_arg) 930static void *aio_proc (void *thr_arg)
862{ 931{
863 aio_req req; 932 aio_req req;
864 int type; 933 int type;
934 worker *self = (worker *)thr_arg;
865 935
866 do 936 do
867 { 937 {
868 pthread_mutex_lock (&reqlock); 938 LOCK (reqlock);
869 939
870 for (;;) 940 for (;;)
871 { 941 {
872 req = reqq_shift (&req_queue); 942 self->req = req = reqq_shift (&req_queue);
873 943
874 if (req) 944 if (req)
875 break; 945 break;
876 946
877 pthread_cond_wait (&reqwait, &reqlock); 947 pthread_cond_wait (&reqwait, &reqlock);
878 } 948 }
879 949
880 pthread_mutex_unlock (&reqlock); 950 UNLOCK (reqlock);
881 951
882 errno = 0; /* strictly unnecessary */ 952 errno = 0; /* strictly unnecessary */
883 type = req->type; /* remember type for QUIT check */ 953 type = req->type; /* remember type for QUIT check */
884 954
885 if (!(req->flags & FLAG_CANCELLED)) 955 if (!(req->flags & FLAG_CANCELLED))
… …
887 { 957 {
888 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 958 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; 959 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
890 960
891 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 961 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; 962 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
893 963
894 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 964 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
895 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 965 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
896 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 966 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
897 967
… …
903 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 973 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
904 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 974 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
905 975
906 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 976 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
907 case REQ_FSYNC: req->result = fsync (req->fd); break; 977 case REQ_FSYNC: req->result = fsync (req->fd); break;
908 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 978 case REQ_READDIR: scandir_ (req, self); break;
909 979
910 case REQ_SLEEP: 980 case REQ_BUSY:
911 { 981 {
912 struct timeval tv; 982 struct timeval tv;
913 983
914 tv.tv_sec = req->fd; 984 tv.tv_sec = req->fd;
915 tv.tv_usec = req->fd2; 985 tv.tv_usec = req->fd2;
… …
927 break; 997 break;
928 } 998 }
929 999
930 req->errorno = errno; 1000 req->errorno = errno;
931 1001
932 pthread_mutex_lock (&reslock); 1002 LOCK (reslock);
933 1003
934 if (!reqq_push (&res_queue, req)) 1004 if (!reqq_push (&res_queue, req))
935 /* write a dummy byte to the pipe so fh becomes ready */ 1005 /* write a dummy byte to the pipe so fh becomes ready */
936 write (respipe [1], &respipe, 1); 1006 write (respipe [1], &respipe, 1);
937 1007
938 pthread_mutex_unlock (&reslock); 1008 self->req = 0;
1009 worker_clear (self);
1010
1011 UNLOCK (reslock);
939 } 1012 }
940 while (type != REQ_QUIT); 1013 while (type != REQ_QUIT);
941 1014
1015 LOCK (wrklock);
1016 worker_free (self);
1017 UNLOCK (wrklock);
1018
942 return 0; 1019 return 0;
943} 1020}
944 1021
945/*****************************************************************************/ 1022/*****************************************************************************/
946 1023
947static void atfork_prepare (void) 1024static void atfork_prepare (void)
948{ 1025{
949 pthread_mutex_lock (&reqlock); 1026 LOCK (wrklock);
950 pthread_mutex_lock (&reslock); 1027 LOCK (reqlock);
1028 LOCK (reslock);
951#if !HAVE_PREADWRITE 1029#if !HAVE_PREADWRITE
952 pthread_mutex_lock (&preadwritelock); 1030 LOCK (preadwritelock);
953#endif 1031#endif
954#if !HAVE_READDIR_R 1032#if !HAVE_READDIR_R
955 pthread_mutex_lock (&readdirlock); 1033 LOCK (readdirlock);
956#endif 1034#endif
957} 1035}
958 1036
959static void atfork_parent (void) 1037static void atfork_parent (void)
960{ 1038{
961#if !HAVE_READDIR_R 1039#if !HAVE_READDIR_R
962 pthread_mutex_unlock (&readdirlock); 1040 UNLOCK (readdirlock);
963#endif 1041#endif
964#if !HAVE_PREADWRITE 1042#if !HAVE_PREADWRITE
965 pthread_mutex_unlock (&preadwritelock); 1043 UNLOCK (preadwritelock);
966#endif 1044#endif
967 pthread_mutex_unlock (&reslock); 1045 UNLOCK (reslock);
968 pthread_mutex_unlock (&reqlock); 1046 UNLOCK (reqlock);
1047 UNLOCK (wrklock);
969} 1048}
970 1049
971static void atfork_child (void) 1050static void atfork_child (void)
972{ 1051{
973 aio_req prv; 1052 aio_req prv;
974
975 started = 0;
976 1053
977 while (prv = reqq_shift (&req_queue)) 1054 while (prv = reqq_shift (&req_queue))
978 req_free (prv); 1055 req_free (prv);
979 1056
980 while (prv = reqq_shift (&res_queue)) 1057 while (prv = reqq_shift (&res_queue))
981 req_free (prv); 1058 req_free (prv);
982 1059
1060 while (wrk_first.next != &wrk_first)
1061 {
1062 worker *wrk = wrk_first.next;
1063
1064 if (wrk->req)
1065 req_free (wrk->req);
1066
1067 worker_clear (wrk);
1068 worker_free (wrk);
1069 }
1070
1071 started = 0;
1072 nreqs = 0;
1073
983 close (respipe [0]); 1074 close (respipe [0]);
984 close (respipe [1]); 1075 close (respipe [1]);
985 create_pipe (); 1076 create_pipe ();
986 1077
987 atfork_parent (); 1078 atfork_parent ();
… …
1022 create_pipe (); 1113 create_pipe ();
1023 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1114 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1024} 1115}
1025 1116
1026void 1117void
1027min_parallel (nthreads) 1118min_parallel (int nthreads)
1028 int nthreads
1029 PROTOTYPE: $ 1119 PROTOTYPE: $
1030 1120
1031void 1121void
1032max_parallel (nthreads) 1122max_parallel (int nthreads)
1033 int nthreads
1034 PROTOTYPE: $ 1123 PROTOTYPE: $
1035 1124
1036int 1125int
1037max_outstanding (nreqs) 1126max_outstanding (int maxreqs)
1038 int nreqs 1127 PROTOTYPE: $
1039 PROTOTYPE: $
1040 CODE: 1128 CODE:
1041 RETVAL = max_outstanding; 1129 RETVAL = max_outstanding;
1042 max_outstanding = nreqs; 1130 max_outstanding = maxreqs;
1131 OUTPUT:
1132 RETVAL
1043 1133
1044void 1134void
1045aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1135aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1046 SV * pathname 1136 SV * pathname
1047 int flags 1137 int flags
… …
1262 1352
1263 REQ_SEND; 1353 REQ_SEND;
1264} 1354}
1265 1355
1266void 1356void
1267aio_sleep (delay,callback=&PL_sv_undef) 1357aio_busy (delay,callback=&PL_sv_undef)
1268 double delay 1358 double delay
1269 SV * callback 1359 SV * callback
1270 PPCODE: 1360 PPCODE:
1271{ 1361{
1272 dREQ; 1362 dREQ;
1273 1363
1274 req->type = REQ_SLEEP; 1364 req->type = REQ_BUSY;
1275 req->fd = delay < 0. ? 0 : delay; 1365 req->fd = delay < 0. ? 0 : delay;
1276 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1366 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1277 1367
1278 REQ_SEND; 1368 REQ_SEND;
1279} 1369}
… …
1324 PROTOTYPE: 1414 PROTOTYPE:
1325 CODE: 1415 CODE:
1326 while (nreqs) 1416 while (nreqs)
1327 { 1417 {
1328 poll_wait (); 1418 poll_wait ();
1329 poll_cb (); 1419 poll_cb (0);
1330 } 1420 }
1331 1421
1332void 1422void
1333poll() 1423poll()
1334 PROTOTYPE: 1424 PROTOTYPE:
1335 CODE: 1425 CODE:
1336 if (nreqs) 1426 if (nreqs)
1337 { 1427 {
1338 poll_wait (); 1428 poll_wait ();
1339 poll_cb (); 1429 poll_cb (0);
1340 } 1430 }
1341 1431
1342int 1432int
1343poll_fileno() 1433poll_fileno()
1344 PROTOTYPE: 1434 PROTOTYPE:
… …
1349 1439
1350int 1440int
1351poll_cb(...) 1441poll_cb(...)
1352 PROTOTYPE: 1442 PROTOTYPE:
1353 CODE: 1443 CODE:
1354 RETVAL = poll_cb (); 1444 RETVAL = poll_cb (0);
1445 OUTPUT:
1446 RETVAL
1447
1448int
1449poll_some(int max = 0)
1450 PROTOTYPE: $
1451 CODE:
1452 RETVAL = poll_cb (max);
1355 OUTPUT: 1453 OUTPUT:
1356 RETVAL 1454 RETVAL
1357 1455
1358void 1456void
1359poll_wait() 1457poll_wait()
… …
1419 } 1517 }
1420 } 1518 }
1421} 1519}
1422 1520
1423void 1521void
1522cancel_subs (aio_req_ornot req)
1523 CODE:
1524 req_cancel_subs (req);
1525
1526void
1424result (aio_req grp, ...) 1527result (aio_req grp, ...)
1425 CODE: 1528 CODE:
1426{ 1529{
1427 int i; 1530 int i;
1428 AV *av = newAV (); 1531 AV *av = newAV ();

Diff Legend

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