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.67 by root, Tue Oct 24 03:17:39 2006 UTC vs.
Revision 1.79 by root, Thu Oct 26 16:28:33 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
54# define STACKSIZE 16384 63# define STACKSIZE 16384
55#endif 64#endif
56 65
66/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes.
69 */
70#ifndef WORDREAD_UNSAFE
71# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0
73# else
74# define WORDREAD_UNSAFE 1
75# endif
76#endif
77
57/* buffer size for various temporary buffers */ 78/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536 79#define AIO_BUFSIZE 65536
59 80
60#define dBUF \ 81#define dBUF \
82 char *aio_buf; \
83 LOCK (wrklock); \
61 char *aio_buf = malloc (AIO_BUFSIZE); \ 84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \
62 if (!aio_buf) \ 86 if (!aio_buf) \
63 return -1; 87 return -1;
64
65#define fBUF free (aio_buf)
66 88
67enum { 89enum {
68 REQ_QUIT, 90 REQ_QUIT,
69 REQ_OPEN, REQ_CLOSE, 91 REQ_OPEN, REQ_CLOSE,
70 REQ_READ, REQ_WRITE, REQ_READAHEAD, 92 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
73 REQ_FSYNC, REQ_FDATASYNC, 95 REQ_FSYNC, REQ_FDATASYNC,
74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75 REQ_READDIR, 97 REQ_READDIR,
76 REQ_LINK, REQ_SYMLINK, 98 REQ_LINK, REQ_SYMLINK,
77 REQ_GROUP, REQ_NOP, 99 REQ_GROUP, REQ_NOP,
78 REQ_SLEEP, 100 REQ_BUSY,
79}; 101};
80 102
81#define AIO_REQ_KLASS "IO::AIO::REQ" 103#define AIO_REQ_KLASS "IO::AIO::REQ"
82#define AIO_GRP_KLASS "IO::AIO::GRP" 104#define AIO_GRP_KLASS "IO::AIO::GRP"
83 105
… …
122 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 144 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
123}; 145};
124 146
125static int next_pri = DEFAULT_PRI + PRI_BIAS; 147static int next_pri = DEFAULT_PRI + PRI_BIAS;
126 148
127static int started, wanted; 149static unsigned int started, wanted;
128static volatile int nreqs; 150static volatile unsigned int nreqs, nready, npending;
129static int max_outstanding = 1<<30; 151static volatile unsigned int max_outstanding = 0xffffffff;
130static int respipe [2]; 152static int respipe [2];
131 153
132#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
133# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
134#else 156#else
135# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
136#endif 158#endif
159
160#define LOCK(mutex) pthread_mutex_lock (&(mutex))
161#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
162
163/* worker threads management */
164static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
165
166typedef struct worker {
167 /* locked by wrklock */
168 struct worker *prev, *next;
169
170 pthread_t tid;
171
172 /* locked by reslock, reqlock or wrklock */
173 aio_req req; /* currently processed request */
174 void *dbuf;
175 DIR *dirp;
176} worker;
177
178static worker wrk_first = { &wrk_first, &wrk_first, 0 };
179
180static void worker_clear (worker *wrk)
181{
182 if (wrk->dirp)
183 {
184 closedir (wrk->dirp);
185 wrk->dirp = 0;
186 }
187
188 if (wrk->dbuf)
189 {
190 free (wrk->dbuf);
191 wrk->dbuf = 0;
192 }
193}
194
195static void worker_free (worker *wrk)
196{
197 wrk->next->prev = wrk->prev;
198 wrk->prev->next = wrk->next;
199
200 free (wrk);
201}
137 202
138static pthread_mutex_t reslock = AIO_MUTEX_INIT; 203static pthread_mutex_t reslock = AIO_MUTEX_INIT;
139static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 204static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
140static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
141 206
… …
191 } 256 }
192 257
193 abort (); 258 abort ();
194} 259}
195 260
261static int poll_cb (int max);
196static void req_invoke (aio_req req); 262static void req_invoke (aio_req req);
197static void req_free (aio_req req); 263static void req_free (aio_req req);
264static void req_cancel (aio_req req);
198 265
199/* must be called at most once */ 266/* must be called at most once */
200static SV *req_sv (aio_req req, const char *klass) 267static SV *req_sv (aio_req req, const char *klass)
201{ 268{
202 if (!req->self) 269 if (!req->self)
… …
271 fd_set rfd; 338 fd_set rfd;
272 339
273 while (nreqs) 340 while (nreqs)
274 { 341 {
275 int size; 342 int size;
276#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 343 if (WORDREAD_UNSAFE) LOCK (reslock);
277 pthread_mutex_lock (&reslock);
278#endif
279 size = res_queue.size; 344 size = res_queue.size;
280#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
281 pthread_mutex_unlock (&reslock);
282#endif
283 346
284 if (size) 347 if (size)
285 return; 348 return;
286 349
287 FD_ZERO(&rfd); 350 FD_ZERO(&rfd);
… …
295{ 358{
296 dSP; 359 dSP;
297 360
298 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
299 { 362 {
300 errno = req->errorno;
301
302 ENTER; 363 ENTER;
303 SAVETMPS; 364 SAVETMPS;
304 PUSHMARK (SP); 365 PUSHMARK (SP);
305 EXTEND (SP, 1); 366 EXTEND (SP, 1);
306 367
… …
310 { 371 {
311 SV *rv = &PL_sv_undef; 372 SV *rv = &PL_sv_undef;
312 373
313 if (req->result >= 0) 374 if (req->result >= 0)
314 { 375 {
376 int i;
315 char *buf = req->data2ptr; 377 char *buf = req->data2ptr;
316 AV *av = newAV (); 378 AV *av = newAV ();
317 379
318 while (req->result) 380 av_extend (av, req->result - 1);
381
382 for (i = 0; i < req->result; ++i)
319 { 383 {
320 SV *sv = newSVpv (buf, 0); 384 SV *sv = newSVpv (buf, 0);
321 385
322 av_push (av, sv); 386 av_store (av, i, sv);
323 buf += SvCUR (sv) + 1; 387 buf += SvCUR (sv) + 1;
324 req->result--;
325 } 388 }
326 389
327 rv = sv_2mortal (newRV_noinc ((SV *)av)); 390 rv = sv_2mortal (newRV_noinc ((SV *)av));
328 } 391 }
329 392
… …
361 PUSHs (*av_fetch (av, i, 0)); 424 PUSHs (*av_fetch (av, i, 0));
362 } 425 }
363 break; 426 break;
364 427
365 case REQ_NOP: 428 case REQ_NOP:
366 case REQ_SLEEP: 429 case REQ_BUSY:
367 break; 430 break;
368 431
369 default: 432 default:
370 PUSHs (sv_2mortal (newSViv (req->result))); 433 PUSHs (sv_2mortal (newSViv (req->result)));
371 break; 434 break;
372 } 435 }
373 436
437 errno = req->errorno;
374 438
375 PUTBACK; 439 PUTBACK;
376 call_sv (req->callback, G_VOID | G_EVAL); 440 call_sv (req->callback, G_VOID | G_EVAL);
377 SPAGAIN; 441 SPAGAIN;
378 442
… …
413 SvREFCNT_dec (req->fh); 477 SvREFCNT_dec (req->fh);
414 SvREFCNT_dec (req->fh2); 478 SvREFCNT_dec (req->fh2);
415 SvREFCNT_dec (req->callback); 479 SvREFCNT_dec (req->callback);
416 Safefree (req->statdata); 480 Safefree (req->statdata);
417 481
418 if (req->type == REQ_READDIR && req->result >= 0) 482 if (req->type == REQ_READDIR)
419 free (req->data2ptr); 483 free (req->data2ptr);
420 484
421 Safefree (req); 485 Safefree (req);
422} 486}
423 487
488static void req_cancel_subs (aio_req grp)
489{
490 aio_req sub;
491
492 if (grp->type != REQ_GROUP)
493 return;
494
495 SvREFCNT_dec (grp->fh2);
496 grp->fh2 = 0;
497
498 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub);
500}
501
424static void req_cancel (aio_req req) 502static void req_cancel (aio_req req)
425{ 503{
426 req->flags |= FLAG_CANCELLED; 504 req->flags |= FLAG_CANCELLED;
427 505
428 if (req->type == REQ_GROUP) 506 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} 507}
436 508
437static int poll_cb () 509static int poll_cb (int max)
438{ 510{
439 dSP; 511 dSP;
440 int count = 0; 512 int count = 0;
441 int do_croak = 0; 513 int do_croak = 0;
442 aio_req req; 514 aio_req req;
443 515
444 for (;;) 516 for (;;)
445 { 517 {
446 pthread_mutex_lock (&reslock); 518 while (max <= 0 || count < max)
447 req = reqq_shift (&res_queue);
448
449 if (req)
450 { 519 {
520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
522
451 if (!res_queue.size) 523 if (req)
452 { 524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
453 /* read any signals sent by the worker threads */ 529 /* read any signals sent by the worker threads */
454 char buf [32]; 530 char buf [32];
455 while (read (respipe [0], buf, 32) == 32) 531 while (read (respipe [0], buf, 32) == 32)
532 ;
456 ; 533 }
457 } 534 }
535
536 UNLOCK (reslock);
537
538 if (!req)
539 break;
540
541 --nreqs;
542
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length)
546 {
547 req->fd = 1; /* mark request as delayed */
548 continue;
549 }
550 else
551 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req);
566
567 count++;
568 }
569
570 req_free (req);
458 } 571 }
459 572
460 pthread_mutex_unlock (&reslock); 573 if (nreqs <= max_outstanding)
461
462 if (!req)
463 break; 574 break;
464 575
465 --nreqs; 576 poll_wait ();
466 577
467 if (req->type == REQ_QUIT) 578 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 } 579 }
496 580
497 return count; 581 return count;
498} 582}
499 583
500static void *aio_proc(void *arg); 584static void *aio_proc(void *arg);
501 585
502static void start_thread (void) 586static void start_thread (void)
503{ 587{
504 sigset_t fullsigset, oldsigset; 588 sigset_t fullsigset, oldsigset;
505 pthread_t tid;
506 pthread_attr_t attr; 589 pthread_attr_t attr;
590
591 worker *wrk = calloc (1, sizeof (worker));
592
593 if (!wrk)
594 croak ("unable to allocate worker thread data");
507 595
508 pthread_attr_init (&attr); 596 pthread_attr_init (&attr);
509 pthread_attr_setstacksize (&attr, STACKSIZE); 597 pthread_attr_setstacksize (&attr, STACKSIZE);
510 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
511 599
512 sigfillset (&fullsigset); 600 sigfillset (&fullsigset);
601
602 LOCK (wrklock);
513 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
514 604
515 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 605 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
606 {
607 wrk->prev = &wrk_first;
608 wrk->next = wrk_first.next;
609 wrk_first.next->prev = wrk;
610 wrk_first.next = wrk;
516 started++; 611 ++started;
612 }
613 else
614 free (wrk);
517 615
518 sigprocmask (SIG_SETMASK, &oldsigset, 0); 616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock);
519} 618}
520 619
521static void req_send (aio_req req) 620static void req_send (aio_req req)
522{ 621{
523 while (started < wanted && nreqs >= started) 622 while (started < wanted && nreqs >= started)
524 start_thread (); 623 start_thread ();
525 624
526 ++nreqs; 625 ++nreqs;
527 626
528 pthread_mutex_lock (&reqlock); 627 LOCK (reqlock);
628 ++nready;
529 reqq_push (&req_queue, req); 629 reqq_push (&req_queue, req);
530 pthread_cond_signal (&reqwait); 630 pthread_cond_signal (&reqwait);
531 pthread_mutex_unlock (&reqlock); 631 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} 632}
544 633
545static void end_thread (void) 634static void end_thread (void)
546{ 635{
547 aio_req req; 636 aio_req req;
… …
574 } 663 }
575 664
576 while (started > wanted) 665 while (started > wanted)
577 { 666 {
578 poll_wait (); 667 poll_wait ();
579 poll_cb (); 668 poll_cb (0);
580 } 669 }
581} 670}
582 671
583static void create_pipe () 672static void create_pipe ()
584{ 673{
… …
609static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 698static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
610{ 699{
611 ssize_t res; 700 ssize_t res;
612 off_t ooffset; 701 off_t ooffset;
613 702
614 pthread_mutex_lock (&preadwritelock); 703 LOCK (preadwritelock);
615 ooffset = lseek (fd, 0, SEEK_CUR); 704 ooffset = lseek (fd, 0, SEEK_CUR);
616 lseek (fd, offset, SEEK_SET); 705 lseek (fd, offset, SEEK_SET);
617 res = read (fd, buf, count); 706 res = read (fd, buf, count);
618 lseek (fd, ooffset, SEEK_SET); 707 lseek (fd, ooffset, SEEK_SET);
619 pthread_mutex_unlock (&preadwritelock); 708 UNLOCK (preadwritelock);
620 709
621 return res; 710 return res;
622} 711}
623 712
624static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 713static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
625{ 714{
626 ssize_t res; 715 ssize_t res;
627 off_t ooffset; 716 off_t ooffset;
628 717
629 pthread_mutex_lock (&preadwritelock); 718 LOCK (preadwritelock);
630 ooffset = lseek (fd, 0, SEEK_CUR); 719 ooffset = lseek (fd, 0, SEEK_CUR);
631 lseek (fd, offset, SEEK_SET); 720 lseek (fd, offset, SEEK_SET);
632 res = write (fd, buf, count); 721 res = write (fd, buf, count);
633 lseek (fd, offset, SEEK_SET); 722 lseek (fd, offset, SEEK_SET);
634 pthread_mutex_unlock (&preadwritelock); 723 UNLOCK (preadwritelock);
635 724
636 return res; 725 return res;
637} 726}
638#endif 727#endif
639 728
640#if !HAVE_FDATASYNC 729#if !HAVE_FDATASYNC
641# define fdatasync fsync 730# define fdatasync fsync
642#endif 731#endif
643 732
644#if !HAVE_READAHEAD 733#if !HAVE_READAHEAD
645# define readahead aio_readahead 734# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
646 735
647static ssize_t readahead (int fd, off_t offset, size_t count) 736static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
648{ 737{
649 dBUF; 738 dBUF;
650 739
651 while (count > 0) 740 while (count > 0)
652 { 741 {
… …
655 pread (fd, aio_buf, len, offset); 744 pread (fd, aio_buf, len, offset);
656 offset += len; 745 offset += len;
657 count -= len; 746 count -= len;
658 } 747 }
659 748
660 fBUF;
661
662 errno = 0; 749 errno = 0;
663} 750}
751
664#endif 752#endif
665 753
666#if !HAVE_READDIR_R 754#if !HAVE_READDIR_R
667# define readdir_r aio_readdir_r 755# define readdir_r aio_readdir_r
668 756
… …
671static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 759static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
672{ 760{
673 struct dirent *e; 761 struct dirent *e;
674 int errorno; 762 int errorno;
675 763
676 pthread_mutex_lock (&readdirlock); 764 LOCK (readdirlock);
677 765
678 e = readdir (dirp); 766 e = readdir (dirp);
679 errorno = errno; 767 errorno = errno;
680 768
681 if (e) 769 if (e)
… …
684 strcpy (ent->d_name, e->d_name); 772 strcpy (ent->d_name, e->d_name);
685 } 773 }
686 else 774 else
687 *res = 0; 775 *res = 0;
688 776
689 pthread_mutex_unlock (&readdirlock); 777 UNLOCK (readdirlock);
690 778
691 errno = errorno; 779 errno = errorno;
692 return e ? 0 : -1; 780 return e ? 0 : -1;
693} 781}
694#endif 782#endif
695 783
696/* sendfile always needs emulation */ 784/* sendfile always needs emulation */
697static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 785static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
698{ 786{
699 ssize_t res; 787 ssize_t res;
700 788
701 if (!count) 789 if (!count)
702 return 0; 790 return 0;
… …
713 { 801 {
714 off_t sbytes; 802 off_t sbytes;
715 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 803 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
716 804
717 if (res < 0 && sbytes) 805 if (res < 0 && sbytes)
718 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 806 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
719 res = sbytes; 807 res = sbytes;
720 } 808 }
721 809
722# elif __hpux 810# elif __hpux
723 res = sendfile (ofd, ifd, offset, count, 0, 0); 811 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
779 867
780 offset += cnt; 868 offset += cnt;
781 res += cnt; 869 res += cnt;
782 count -= cnt; 870 count -= cnt;
783 } 871 }
784
785 fBUF;
786 } 872 }
787 873
788 return res; 874 return res;
789} 875}
790 876
791/* read a full directory */ 877/* read a full directory */
792static int scandir_ (const char *path, void **namesp) 878static void scandir_ (aio_req req, worker *self)
793{ 879{
794 DIR *dirp; 880 DIR *dirp;
795 union 881 union
796 { 882 {
797 struct dirent d; 883 struct dirent d;
… …
802 int memlen = 4096; 888 int memlen = 4096;
803 int memofs = 0; 889 int memofs = 0;
804 int res = 0; 890 int res = 0;
805 int errorno; 891 int errorno;
806 892
807 dirp = opendir (path); 893 LOCK (wrklock);
808 if (!dirp) 894 self->dirp = dirp = opendir (req->dataptr);
809 return -1;
810
811 u = malloc (sizeof (*u)); 895 self->dbuf = u = malloc (sizeof (*u));
812 names = malloc (memlen); 896 req->data2ptr = names = malloc (memlen);
897 UNLOCK (wrklock);
813 898
814 if (u && names) 899 if (dirp && u && names)
815 for (;;) 900 for (;;)
816 { 901 {
817 errno = 0; 902 errno = 0;
818 readdir_r (dirp, &u->d, &entp); 903 readdir_r (dirp, &u->d, &entp);
819 904
… …
829 res++; 914 res++;
830 915
831 while (memofs + len > memlen) 916 while (memofs + len > memlen)
832 { 917 {
833 memlen *= 2; 918 memlen *= 2;
919 LOCK (wrklock);
834 names = realloc (names, memlen); 920 req->data2ptr = names = realloc (names, memlen);
921 UNLOCK (wrklock);
922
835 if (!names) 923 if (!names)
836 break; 924 break;
837 } 925 }
838 926
839 memcpy (names + memofs, name, len); 927 memcpy (names + memofs, name, len);
840 memofs += len; 928 memofs += len;
841 } 929 }
842 } 930 }
843 931
844 errorno = errno;
845 free (u);
846 closedir (dirp);
847
848 if (errorno) 932 if (errno)
849 {
850 free (names);
851 errno = errorno;
852 res = -1; 933 res = -1;
853 } 934
854 935 req->result = res;
855 *namesp = (void *)names;
856 return res;
857} 936}
858 937
859/*****************************************************************************/ 938/*****************************************************************************/
860 939
861static void *aio_proc (void *thr_arg) 940static void *aio_proc (void *thr_arg)
862{ 941{
863 aio_req req; 942 aio_req req;
864 int type; 943 int type;
944 worker *self = (worker *)thr_arg;
865 945
866 do 946 do
867 { 947 {
868 pthread_mutex_lock (&reqlock); 948 LOCK (reqlock);
869 949
870 for (;;) 950 for (;;)
871 { 951 {
872 req = reqq_shift (&req_queue); 952 self->req = req = reqq_shift (&req_queue);
873 953
874 if (req) 954 if (req)
875 break; 955 break;
876 956
877 pthread_cond_wait (&reqwait, &reqlock); 957 pthread_cond_wait (&reqwait, &reqlock);
878 } 958 }
879 959
880 pthread_mutex_unlock (&reqlock); 960 --nready;
961
962 UNLOCK (reqlock);
881 963
882 errno = 0; /* strictly unnecessary */ 964 errno = 0; /* strictly unnecessary */
883 type = req->type; /* remember type for QUIT check */ 965 type = req->type; /* remember type for QUIT check */
884 966
885 if (!(req->flags & FLAG_CANCELLED)) 967 if (!(req->flags & FLAG_CANCELLED))
… …
887 { 969 {
888 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 970 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; 971 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
890 972
891 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 973 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; 974 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
893 975
894 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 976 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
895 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 977 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
896 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 978 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
897 979
… …
903 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
904 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
905 987
906 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
907 case REQ_FSYNC: req->result = fsync (req->fd); break; 989 case REQ_FSYNC: req->result = fsync (req->fd); break;
908 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 990 case REQ_READDIR: scandir_ (req, self); break;
909 991
910 case REQ_SLEEP: 992 case REQ_BUSY:
911 { 993 {
912 struct timeval tv; 994 struct timeval tv;
913 995
914 tv.tv_sec = req->fd; 996 tv.tv_sec = req->fd;
915 tv.tv_usec = req->fd2; 997 tv.tv_usec = req->fd2;
… …
927 break; 1009 break;
928 } 1010 }
929 1011
930 req->errorno = errno; 1012 req->errorno = errno;
931 1013
932 pthread_mutex_lock (&reslock); 1014 LOCK (reslock);
1015
1016 ++npending;
933 1017
934 if (!reqq_push (&res_queue, req)) 1018 if (!reqq_push (&res_queue, req))
935 /* write a dummy byte to the pipe so fh becomes ready */ 1019 /* write a dummy byte to the pipe so fh becomes ready */
936 write (respipe [1], &respipe, 1); 1020 write (respipe [1], &respipe, 1);
937 1021
938 pthread_mutex_unlock (&reslock); 1022 self->req = 0;
1023 worker_clear (self);
1024
1025 UNLOCK (reslock);
939 } 1026 }
940 while (type != REQ_QUIT); 1027 while (type != REQ_QUIT);
941 1028
1029 LOCK (wrklock);
1030 worker_free (self);
1031 UNLOCK (wrklock);
1032
942 return 0; 1033 return 0;
943} 1034}
944 1035
945/*****************************************************************************/ 1036/*****************************************************************************/
946 1037
947static void atfork_prepare (void) 1038static void atfork_prepare (void)
948{ 1039{
949 pthread_mutex_lock (&reqlock); 1040 LOCK (wrklock);
950 pthread_mutex_lock (&reslock); 1041 LOCK (reqlock);
1042 LOCK (reslock);
951#if !HAVE_PREADWRITE 1043#if !HAVE_PREADWRITE
952 pthread_mutex_lock (&preadwritelock); 1044 LOCK (preadwritelock);
953#endif 1045#endif
954#if !HAVE_READDIR_R 1046#if !HAVE_READDIR_R
955 pthread_mutex_lock (&readdirlock); 1047 LOCK (readdirlock);
956#endif 1048#endif
957} 1049}
958 1050
959static void atfork_parent (void) 1051static void atfork_parent (void)
960{ 1052{
961#if !HAVE_READDIR_R 1053#if !HAVE_READDIR_R
962 pthread_mutex_unlock (&readdirlock); 1054 UNLOCK (readdirlock);
963#endif 1055#endif
964#if !HAVE_PREADWRITE 1056#if !HAVE_PREADWRITE
965 pthread_mutex_unlock (&preadwritelock); 1057 UNLOCK (preadwritelock);
966#endif 1058#endif
967 pthread_mutex_unlock (&reslock); 1059 UNLOCK (reslock);
968 pthread_mutex_unlock (&reqlock); 1060 UNLOCK (reqlock);
1061 UNLOCK (wrklock);
969} 1062}
970 1063
971static void atfork_child (void) 1064static void atfork_child (void)
972{ 1065{
973 aio_req prv; 1066 aio_req prv;
974
975 started = 0;
976 1067
977 while (prv = reqq_shift (&req_queue)) 1068 while (prv = reqq_shift (&req_queue))
978 req_free (prv); 1069 req_free (prv);
979 1070
980 while (prv = reqq_shift (&res_queue)) 1071 while (prv = reqq_shift (&res_queue))
981 req_free (prv); 1072 req_free (prv);
982 1073
1074 while (wrk_first.next != &wrk_first)
1075 {
1076 worker *wrk = wrk_first.next;
1077
1078 if (wrk->req)
1079 req_free (wrk->req);
1080
1081 worker_clear (wrk);
1082 worker_free (wrk);
1083 }
1084
1085 started = 0;
1086 nreqs = 0;
1087
983 close (respipe [0]); 1088 close (respipe [0]);
984 close (respipe [1]); 1089 close (respipe [1]);
985 create_pipe (); 1090 create_pipe ();
986 1091
987 atfork_parent (); 1092 atfork_parent ();
… …
1022 create_pipe (); 1127 create_pipe ();
1023 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1024} 1129}
1025 1130
1026void 1131void
1027min_parallel (nthreads) 1132min_parallel (int nthreads)
1028 int nthreads
1029 PROTOTYPE: $ 1133 PROTOTYPE: $
1030 1134
1031void 1135void
1032max_parallel (nthreads) 1136max_parallel (int nthreads)
1033 int nthreads
1034 PROTOTYPE: $ 1137 PROTOTYPE: $
1035 1138
1036int 1139int
1037max_outstanding (nreqs) 1140max_outstanding (int maxreqs)
1038 int nreqs 1141 PROTOTYPE: $
1039 PROTOTYPE: $
1040 CODE: 1142 CODE:
1041 RETVAL = max_outstanding; 1143 RETVAL = max_outstanding;
1042 max_outstanding = nreqs; 1144 max_outstanding = maxreqs;
1145 OUTPUT:
1146 RETVAL
1043 1147
1044void 1148void
1045aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1149aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1046 SV * pathname 1150 SV * pathname
1047 int flags 1151 int flags
… …
1262 1366
1263 REQ_SEND; 1367 REQ_SEND;
1264} 1368}
1265 1369
1266void 1370void
1267aio_sleep (delay,callback=&PL_sv_undef) 1371aio_busy (delay,callback=&PL_sv_undef)
1268 double delay 1372 double delay
1269 SV * callback 1373 SV * callback
1270 PPCODE: 1374 PPCODE:
1271{ 1375{
1272 dREQ; 1376 dREQ;
1273 1377
1274 req->type = REQ_SLEEP; 1378 req->type = REQ_BUSY;
1275 req->fd = delay < 0. ? 0 : delay; 1379 req->fd = delay < 0. ? 0 : delay;
1276 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1277 1381
1278 REQ_SEND; 1382 REQ_SEND;
1279} 1383}
… …
1302 req->type = REQ_NOP; 1406 req->type = REQ_NOP;
1303 1407
1304 REQ_SEND; 1408 REQ_SEND;
1305} 1409}
1306 1410
1307void 1411int
1308aioreq_pri (int pri = DEFAULT_PRI) 1412aioreq_pri (int pri = 0)
1413 PROTOTYPE: ;$
1309 CODE: 1414 CODE:
1415 RETVAL = next_pri - PRI_BIAS;
1416 if (items > 0)
1417 {
1310 if (pri < PRI_MIN) pri = PRI_MIN; 1418 if (pri < PRI_MIN) pri = PRI_MIN;
1311 if (pri > PRI_MAX) pri = PRI_MAX; 1419 if (pri > PRI_MAX) pri = PRI_MAX;
1312 next_pri = pri + PRI_BIAS; 1420 next_pri = pri + PRI_BIAS;
1421 }
1422 OUTPUT:
1423 RETVAL
1424
1425void
1426aioreq_nice (int nice = 0)
1427 CODE:
1428 nice = next_pri - nice;
1429 if (nice < PRI_MIN) nice = PRI_MIN;
1430 if (nice > PRI_MAX) nice = PRI_MAX;
1431 next_pri = nice + PRI_BIAS;
1313 1432
1314void 1433void
1315flush () 1434flush ()
1316 PROTOTYPE: 1435 PROTOTYPE:
1317 CODE: 1436 CODE:
1318 while (nreqs) 1437 while (nreqs)
1319 { 1438 {
1320 poll_wait (); 1439 poll_wait ();
1321 poll_cb (); 1440 poll_cb (0);
1322 } 1441 }
1323 1442
1324void 1443void
1325poll() 1444poll()
1326 PROTOTYPE: 1445 PROTOTYPE:
1327 CODE: 1446 CODE:
1328 if (nreqs) 1447 if (nreqs)
1329 { 1448 {
1330 poll_wait (); 1449 poll_wait ();
1331 poll_cb (); 1450 poll_cb (0);
1332 } 1451 }
1333 1452
1334int 1453int
1335poll_fileno() 1454poll_fileno()
1336 PROTOTYPE: 1455 PROTOTYPE:
… …
1341 1460
1342int 1461int
1343poll_cb(...) 1462poll_cb(...)
1344 PROTOTYPE: 1463 PROTOTYPE:
1345 CODE: 1464 CODE:
1346 RETVAL = poll_cb (); 1465 RETVAL = poll_cb (0);
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1347 OUTPUT: 1474 OUTPUT:
1348 RETVAL 1475 RETVAL
1349 1476
1350void 1477void
1351poll_wait() 1478poll_wait()
… …
1360 CODE: 1487 CODE:
1361 RETVAL = nreqs; 1488 RETVAL = nreqs;
1362 OUTPUT: 1489 OUTPUT:
1363 RETVAL 1490 RETVAL
1364 1491
1492int
1493nready()
1494 PROTOTYPE:
1495 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready;
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT:
1500 RETVAL
1501
1502int
1503npending()
1504 PROTOTYPE:
1505 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock);
1509 OUTPUT:
1510 RETVAL
1511
1365PROTOTYPES: DISABLE 1512PROTOTYPES: DISABLE
1366 1513
1367MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1514MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1368 1515
1369void 1516void
… …
1411 } 1558 }
1412 } 1559 }
1413} 1560}
1414 1561
1415void 1562void
1563cancel_subs (aio_req_ornot req)
1564 CODE:
1565 req_cancel_subs (req);
1566
1567void
1416result (aio_req grp, ...) 1568result (aio_req grp, ...)
1417 CODE: 1569 CODE:
1418{ 1570{
1419 int i; 1571 int i;
1572 AV *av;
1573
1574 grp->errorno = errno;
1575
1420 AV *av = newAV (); 1576 av = newAV ();
1421 1577
1422 for (i = 1; i < items; ++i ) 1578 for (i = 1; i < items; ++i )
1423 av_push (av, newSVsv (ST (i))); 1579 av_push (av, newSVsv (ST (i)));
1424 1580
1425 SvREFCNT_dec (grp->data); 1581 SvREFCNT_dec (grp->data);
1426 grp->data = (SV *)av; 1582 grp->data = (SV *)av;
1427} 1583}
1584
1585void
1586errno (aio_req grp, int errorno = errno)
1587 CODE:
1588 grp->errorno = errorno;
1428 1589
1429void 1590void
1430limit (aio_req grp, int limit) 1591limit (aio_req grp, int limit)
1431 CODE: 1592 CODE:
1432 grp->fd2 = limit; 1593 grp->fd2 = limit;

Diff Legend

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