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.83 by root, Sat Oct 28 00:17:30 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
57# define STACKSIZE 16384 63# define STACKSIZE 16384
58#endif 64#endif
59 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
60/* buffer size for various temporary buffers */ 78/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 79#define AIO_BUFSIZE 65536
62 80
63#define dBUF \ 81#define dBUF \
82 char *aio_buf; \
83 LOCK (wrklock); \
64 char *aio_buf = malloc (AIO_BUFSIZE); \ 84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \
65 if (!aio_buf) \ 86 if (!aio_buf) \
66 return -1; 87 return -1;
67
68#define fBUF free (aio_buf)
69 88
70enum { 89enum {
71 REQ_QUIT, 90 REQ_QUIT,
72 REQ_OPEN, REQ_CLOSE, 91 REQ_OPEN, REQ_CLOSE,
73 REQ_READ, REQ_WRITE, REQ_READAHEAD, 92 REQ_READ, REQ_WRITE, REQ_READAHEAD,
74 REQ_SENDFILE, 93 REQ_SENDFILE,
75 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 94 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
76 REQ_FSYNC, REQ_FDATASYNC, 95 REQ_FSYNC, REQ_FDATASYNC,
77 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
78 REQ_READDIR, 97 REQ_MKNOD, REQ_READDIR,
79 REQ_LINK, REQ_SYMLINK, 98 REQ_LINK, REQ_SYMLINK,
80 REQ_GROUP, REQ_NOP, 99 REQ_GROUP, REQ_NOP,
81 REQ_BUSY, 100 REQ_BUSY,
82}; 101};
83 102
125 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 144 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
126}; 145};
127 146
128static int next_pri = DEFAULT_PRI + PRI_BIAS; 147static int next_pri = DEFAULT_PRI + PRI_BIAS;
129 148
130static int started, wanted; 149static unsigned int started, wanted;
131static volatile int nreqs;
132static int max_outstanding = 1<<30;
133static int respipe [2];
134 150
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 151#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 152# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else 153#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 154# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif 155#endif
140 156
157#define LOCK(mutex) pthread_mutex_lock (&(mutex))
158#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
159
160/* worker threads management */
161static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
162
163typedef struct worker {
164 /* locked by wrklock */
165 struct worker *prev, *next;
166
167 pthread_t tid;
168
169 /* locked by reslock, reqlock or wrklock */
170 aio_req req; /* currently processed request */
171 void *dbuf;
172 DIR *dirp;
173} worker;
174
175static worker wrk_first = { &wrk_first, &wrk_first, 0 };
176
177static void worker_clear (worker *wrk)
178{
179 if (wrk->dirp)
180 {
181 closedir (wrk->dirp);
182 wrk->dirp = 0;
183 }
184
185 if (wrk->dbuf)
186 {
187 free (wrk->dbuf);
188 wrk->dbuf = 0;
189 }
190}
191
192static void worker_free (worker *wrk)
193{
194 wrk->next->prev = wrk->prev;
195 wrk->prev->next = wrk->next;
196
197 free (wrk);
198}
199
200static volatile unsigned int nreqs, nready, npending;
201static volatile unsigned int max_outstanding = 0xffffffff;
202static int respipe [2];
203
141static pthread_mutex_t reslock = AIO_MUTEX_INIT; 204static pthread_mutex_t reslock = AIO_MUTEX_INIT;
142static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 205static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
143static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 206static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
207
208#if WORDREAD_UNSAFE
209
210static unsigned int get_nready ()
211{
212 unsigned int retval;
213
214 LOCK (reqlock);
215 retval = nready;
216 UNLOCK (reqlock);
217
218 return retval;
219}
220
221static unsigned int get_npending ()
222{
223 unsigned int retval;
224
225 LOCK (reslock);
226 retval = npending;
227 UNLOCK (reslock);
228
229 return retval;
230}
231
232#else
233
234# define get_nready() nready
235# define get_npending() npending
236
237#endif
144 238
145/* 239/*
146 * a somewhat faster data structure might be nice, but 240 * a somewhat faster data structure might be nice, but
147 * with 8 priorities this actually needs <20 insns 241 * with 8 priorities this actually needs <20 insns
148 * per shift, the most expensive operation. 242 * per shift, the most expensive operation.
194 } 288 }
195 289
196 abort (); 290 abort ();
197} 291}
198 292
293static int poll_cb (int max);
199static void req_invoke (aio_req req); 294static void req_invoke (aio_req req);
200static void req_free (aio_req req); 295static void req_free (aio_req req);
296static void req_cancel (aio_req req);
201 297
202/* must be called at most once */ 298/* must be called at most once */
203static SV *req_sv (aio_req req, const char *klass) 299static SV *req_sv (aio_req req, const char *klass)
204{ 300{
205 if (!req->self) 301 if (!req->self)
267 req_invoke (grp); 363 req_invoke (grp);
268 req_free (grp); 364 req_free (grp);
269 } 365 }
270} 366}
271 367
272static void poll_wait ()
273{
274 fd_set rfd;
275
276 while (nreqs)
277 {
278 int size;
279#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
280 pthread_mutex_lock (&reslock);
281#endif
282 size = res_queue.size;
283#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
284 pthread_mutex_unlock (&reslock);
285#endif
286
287 if (size)
288 return;
289
290 FD_ZERO(&rfd);
291 FD_SET(respipe [0], &rfd);
292
293 select (respipe [0] + 1, &rfd, 0, 0, 0);
294 }
295}
296
297static void req_invoke (aio_req req) 368static void req_invoke (aio_req req)
298{ 369{
299 dSP; 370 dSP;
300 371
301 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 372 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
302 { 373 {
303 errno = req->errorno;
304
305 ENTER; 374 ENTER;
306 SAVETMPS; 375 SAVETMPS;
307 PUSHMARK (SP); 376 PUSHMARK (SP);
308 EXTEND (SP, 1); 377 EXTEND (SP, 1);
309 378
313 { 382 {
314 SV *rv = &PL_sv_undef; 383 SV *rv = &PL_sv_undef;
315 384
316 if (req->result >= 0) 385 if (req->result >= 0)
317 { 386 {
387 int i;
318 char *buf = req->data2ptr; 388 char *buf = req->data2ptr;
319 AV *av = newAV (); 389 AV *av = newAV ();
320 390
321 while (req->result) 391 av_extend (av, req->result - 1);
392
393 for (i = 0; i < req->result; ++i)
322 { 394 {
323 SV *sv = newSVpv (buf, 0); 395 SV *sv = newSVpv (buf, 0);
324 396
325 av_push (av, sv); 397 av_store (av, i, sv);
326 buf += SvCUR (sv) + 1; 398 buf += SvCUR (sv) + 1;
327 req->result--;
328 } 399 }
329 400
330 rv = sv_2mortal (newRV_noinc ((SV *)av)); 401 rv = sv_2mortal (newRV_noinc ((SV *)av));
331 } 402 }
332 403
372 default: 443 default:
373 PUSHs (sv_2mortal (newSViv (req->result))); 444 PUSHs (sv_2mortal (newSViv (req->result)));
374 break; 445 break;
375 } 446 }
376 447
448 errno = req->errorno;
377 449
378 PUTBACK; 450 PUTBACK;
379 call_sv (req->callback, G_VOID | G_EVAL); 451 call_sv (req->callback, G_VOID | G_EVAL);
380 SPAGAIN; 452 SPAGAIN;
381 453
416 SvREFCNT_dec (req->fh); 488 SvREFCNT_dec (req->fh);
417 SvREFCNT_dec (req->fh2); 489 SvREFCNT_dec (req->fh2);
418 SvREFCNT_dec (req->callback); 490 SvREFCNT_dec (req->callback);
419 Safefree (req->statdata); 491 Safefree (req->statdata);
420 492
421 if (req->type == REQ_READDIR && req->result >= 0) 493 if (req->type == REQ_READDIR)
422 free (req->data2ptr); 494 free (req->data2ptr);
423 495
424 Safefree (req); 496 Safefree (req);
425} 497}
426 498
499static void req_cancel_subs (aio_req grp)
500{
501 aio_req sub;
502
503 if (grp->type != REQ_GROUP)
504 return;
505
506 SvREFCNT_dec (grp->fh2);
507 grp->fh2 = 0;
508
509 for (sub = grp->grp_first; sub; sub = sub->grp_next)
510 req_cancel (sub);
511}
512
427static void req_cancel (aio_req req) 513static void req_cancel (aio_req req)
428{ 514{
429 req->flags |= FLAG_CANCELLED; 515 req->flags |= FLAG_CANCELLED;
430 516
431 if (req->type == REQ_GROUP) 517 req_cancel_subs (req);
432 { 518}
433 aio_req sub;
434 519
435 for (sub = req->grp_first; sub; sub = sub->grp_next) 520static void *aio_proc(void *arg);
436 req_cancel (sub); 521
522static void start_thread (void)
523{
524 sigset_t fullsigset, oldsigset;
525 pthread_attr_t attr;
526
527 worker *wrk = calloc (1, sizeof (worker));
528
529 if (!wrk)
530 croak ("unable to allocate worker thread data");
531
532 pthread_attr_init (&attr);
533 pthread_attr_setstacksize (&attr, STACKSIZE);
534 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
535#ifdef PTHREAD_SCOPE_PROCESS
536 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
537#endif
538
539 sigfillset (&fullsigset);
540
541 LOCK (wrklock);
542 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
543
544 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
437 } 545 {
438} 546 wrk->prev = &wrk_first;
547 wrk->next = wrk_first.next;
548 wrk_first.next->prev = wrk;
549 wrk_first.next = wrk;
550 ++started;
551 }
552 else
553 free (wrk);
439 554
555 sigprocmask (SIG_SETMASK, &oldsigset, 0);
556 UNLOCK (wrklock);
557}
558
559static void maybe_start_thread ()
560{
561#if 0
562 static struct timeval last;
563 struct timeval diff, now;
564#endif
565
566 if (started >= wanted)
567 return;
568
569 if (nready <= nreqs - get_nready () - get_npending ())
570 return;
571
572#if 0
573 gettimeofday (&now, 0);
574
575 diff.tv_sec = now.tv_sec - last.tv_sec;
576 diff.tv_usec = now.tv_usec - last.tv_usec;
577
578 if (diff.tv_usec < 0)
579 {
580 --diff.tv_sec;
581 diff.tv_usec += 1000000;
582 }
583
584 if (!diff.tv_sec && diff.tv_usec < 10000)
585 return;
586
587 last = now;
588#endif
589
590 start_thread ();
591}
592
593static void req_send (aio_req req)
594{
595 ++nreqs;
596
597 LOCK (reqlock);
598 ++nready;
599 reqq_push (&req_queue, req);
600 pthread_cond_signal (&reqwait);
601 UNLOCK (reqlock);
602
603 maybe_start_thread ();
604}
605
606static void end_thread (void)
607{
608 aio_req req;
609
610 Newz (0, req, 1, aio_cb);
611
612 req->type = REQ_QUIT;
613 req->pri = PRI_MAX + PRI_BIAS;
614
615 LOCK (reqlock);
616 reqq_push (&req_queue, req);
617 pthread_cond_signal (&reqwait);
618 UNLOCK (reqlock);
619
620 LOCK (wrklock);
621 --started;
622 UNLOCK (wrklock);
623}
624
625static void min_parallel (int nthreads)
626{
627 if (wanted < nthreads)
628 wanted = nthreads;
629}
630
631static void max_parallel (int nthreads)
632{
633 if (wanted > nthreads)
634 wanted = nthreads;
635
636 while (started > wanted)
637 end_thread ();
638}
639
640static void poll_wait ()
641{
642 fd_set rfd;
643
644 while (nreqs)
645 {
646 int size;
647 if (WORDREAD_UNSAFE) LOCK (reslock);
648 size = res_queue.size;
649 if (WORDREAD_UNSAFE) UNLOCK (reslock);
650
651 if (size)
652 return;
653
654 maybe_start_thread ();
655
656 FD_ZERO(&rfd);
657 FD_SET(respipe [0], &rfd);
658
659 select (respipe [0] + 1, &rfd, 0, 0, 0);
660 }
661}
662
440static int poll_cb () 663static int poll_cb (int max)
441{ 664{
442 dSP; 665 dSP;
443 int count = 0; 666 int count = 0;
444 int do_croak = 0; 667 int do_croak = 0;
445 aio_req req; 668 aio_req req;
446 669
447 for (;;) 670 for (;;)
448 { 671 {
449 pthread_mutex_lock (&reslock); 672 while (max <= 0 || count < max)
450 req = reqq_shift (&res_queue);
451
452 if (req)
453 { 673 {
674 maybe_start_thread ();
675
676 LOCK (reslock);
677 req = reqq_shift (&res_queue);
678
454 if (!res_queue.size) 679 if (req)
455 { 680 {
681 --npending;
682
683 if (!res_queue.size)
684 {
456 /* read any signals sent by the worker threads */ 685 /* read any signals sent by the worker threads */
457 char buf [32]; 686 char buf [32];
458 while (read (respipe [0], buf, 32) == 32) 687 while (read (respipe [0], buf, 32) == 32)
688 ;
459 ; 689 }
460 } 690 }
691
692 UNLOCK (reslock);
693
694 if (!req)
695 break;
696
697 --nreqs;
698
699 if (req->type == REQ_GROUP && req->length)
700 {
701 req->fd = 1; /* mark request as delayed */
702 continue;
703 }
704 else
705 {
706 if (req->type == REQ_READ)
707 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
708
709 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
710 SvREADONLY_off (req->data);
711
712 if (req->statdata)
713 {
714 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
715 PL_laststatval = req->result;
716 PL_statcache = *(req->statdata);
717 }
718
719 req_invoke (req);
720
721 count++;
722 }
723
724 req_free (req);
461 } 725 }
462 726
463 pthread_mutex_unlock (&reslock); 727 if (nreqs <= max_outstanding)
464
465 if (!req)
466 break; 728 break;
467 729
468 --nreqs; 730 poll_wait ();
469 731
470 if (req->type == REQ_QUIT) 732 max = 0;
471 started--;
472 else if (req->type == REQ_GROUP && req->length)
473 {
474 req->fd = 1; /* mark request as delayed */
475 continue;
476 }
477 else
478 {
479 if (req->type == REQ_READ)
480 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
481
482 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
483 SvREADONLY_off (req->data);
484
485 if (req->statdata)
486 {
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(req->statdata);
490 }
491
492 req_invoke (req);
493
494 count++;
495 }
496
497 req_free (req);
498 } 733 }
499 734
500 return count; 735 return count;
501}
502
503static void *aio_proc(void *arg);
504
505static void start_thread (void)
506{
507 sigset_t fullsigset, oldsigset;
508 pthread_t tid;
509 pthread_attr_t attr;
510
511 pthread_attr_init (&attr);
512 pthread_attr_setstacksize (&attr, STACKSIZE);
513 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
514
515 sigfillset (&fullsigset);
516 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
517
518 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
519 started++;
520
521 sigprocmask (SIG_SETMASK, &oldsigset, 0);
522}
523
524static void req_send (aio_req req)
525{
526 while (started < wanted && nreqs >= started)
527 start_thread ();
528
529 ++nreqs;
530
531 pthread_mutex_lock (&reqlock);
532 reqq_push (&req_queue, req);
533 pthread_cond_signal (&reqwait);
534 pthread_mutex_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}
547
548static void end_thread (void)
549{
550 aio_req req;
551
552 Newz (0, req, 1, aio_cb);
553
554 req->type = REQ_QUIT;
555 req->pri = PRI_MAX + PRI_BIAS;
556
557 req_send (req);
558}
559
560static void min_parallel (int nthreads)
561{
562 if (wanted < nthreads)
563 wanted = nthreads;
564}
565
566static void max_parallel (int nthreads)
567{
568 int cur = started;
569
570 if (wanted > nthreads)
571 wanted = nthreads;
572
573 while (cur > wanted)
574 {
575 end_thread ();
576 cur--;
577 }
578
579 while (started > wanted)
580 {
581 poll_wait ();
582 poll_cb ();
583 }
584} 736}
585 737
586static void create_pipe () 738static void create_pipe ()
587{ 739{
588 if (pipe (respipe)) 740 if (pipe (respipe))
612static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 764static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
613{ 765{
614 ssize_t res; 766 ssize_t res;
615 off_t ooffset; 767 off_t ooffset;
616 768
617 pthread_mutex_lock (&preadwritelock); 769 LOCK (preadwritelock);
618 ooffset = lseek (fd, 0, SEEK_CUR); 770 ooffset = lseek (fd, 0, SEEK_CUR);
619 lseek (fd, offset, SEEK_SET); 771 lseek (fd, offset, SEEK_SET);
620 res = read (fd, buf, count); 772 res = read (fd, buf, count);
621 lseek (fd, ooffset, SEEK_SET); 773 lseek (fd, ooffset, SEEK_SET);
622 pthread_mutex_unlock (&preadwritelock); 774 UNLOCK (preadwritelock);
623 775
624 return res; 776 return res;
625} 777}
626 778
627static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 779static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
628{ 780{
629 ssize_t res; 781 ssize_t res;
630 off_t ooffset; 782 off_t ooffset;
631 783
632 pthread_mutex_lock (&preadwritelock); 784 LOCK (preadwritelock);
633 ooffset = lseek (fd, 0, SEEK_CUR); 785 ooffset = lseek (fd, 0, SEEK_CUR);
634 lseek (fd, offset, SEEK_SET); 786 lseek (fd, offset, SEEK_SET);
635 res = write (fd, buf, count); 787 res = write (fd, buf, count);
636 lseek (fd, offset, SEEK_SET); 788 lseek (fd, offset, SEEK_SET);
637 pthread_mutex_unlock (&preadwritelock); 789 UNLOCK (preadwritelock);
638 790
639 return res; 791 return res;
640} 792}
641#endif 793#endif
642 794
643#if !HAVE_FDATASYNC 795#if !HAVE_FDATASYNC
644# define fdatasync fsync 796# define fdatasync fsync
645#endif 797#endif
646 798
647#if !HAVE_READAHEAD 799#if !HAVE_READAHEAD
648# define readahead aio_readahead 800# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
649 801
650static ssize_t readahead (int fd, off_t offset, size_t count) 802static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
651{ 803{
652 dBUF; 804 dBUF;
653 805
654 while (count > 0) 806 while (count > 0)
655 { 807 {
658 pread (fd, aio_buf, len, offset); 810 pread (fd, aio_buf, len, offset);
659 offset += len; 811 offset += len;
660 count -= len; 812 count -= len;
661 } 813 }
662 814
663 fBUF;
664
665 errno = 0; 815 errno = 0;
666} 816}
817
667#endif 818#endif
668 819
669#if !HAVE_READDIR_R 820#if !HAVE_READDIR_R
670# define readdir_r aio_readdir_r 821# define readdir_r aio_readdir_r
671 822
674static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 825static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
675{ 826{
676 struct dirent *e; 827 struct dirent *e;
677 int errorno; 828 int errorno;
678 829
679 pthread_mutex_lock (&readdirlock); 830 LOCK (readdirlock);
680 831
681 e = readdir (dirp); 832 e = readdir (dirp);
682 errorno = errno; 833 errorno = errno;
683 834
684 if (e) 835 if (e)
687 strcpy (ent->d_name, e->d_name); 838 strcpy (ent->d_name, e->d_name);
688 } 839 }
689 else 840 else
690 *res = 0; 841 *res = 0;
691 842
692 pthread_mutex_unlock (&readdirlock); 843 UNLOCK (readdirlock);
693 844
694 errno = errorno; 845 errno = errorno;
695 return e ? 0 : -1; 846 return e ? 0 : -1;
696} 847}
697#endif 848#endif
698 849
699/* sendfile always needs emulation */ 850/* sendfile always needs emulation */
700static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 851static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
701{ 852{
702 ssize_t res; 853 ssize_t res;
703 854
704 if (!count) 855 if (!count)
705 return 0; 856 return 0;
716 { 867 {
717 off_t sbytes; 868 off_t sbytes;
718 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 869 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
719 870
720 if (res < 0 && sbytes) 871 if (res < 0 && sbytes)
721 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 872 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
722 res = sbytes; 873 res = sbytes;
723 } 874 }
724 875
725# elif __hpux 876# elif __hpux
726 res = sendfile (ofd, ifd, offset, count, 0, 0); 877 res = sendfile (ofd, ifd, offset, count, 0, 0);
782 933
783 offset += cnt; 934 offset += cnt;
784 res += cnt; 935 res += cnt;
785 count -= cnt; 936 count -= cnt;
786 } 937 }
787
788 fBUF;
789 } 938 }
790 939
791 return res; 940 return res;
792} 941}
793 942
794/* read a full directory */ 943/* read a full directory */
795static int scandir_ (const char *path, void **namesp) 944static void scandir_ (aio_req req, worker *self)
796{ 945{
797 DIR *dirp; 946 DIR *dirp;
798 union 947 union
799 { 948 {
800 struct dirent d; 949 struct dirent d;
805 int memlen = 4096; 954 int memlen = 4096;
806 int memofs = 0; 955 int memofs = 0;
807 int res = 0; 956 int res = 0;
808 int errorno; 957 int errorno;
809 958
810 dirp = opendir (path); 959 LOCK (wrklock);
811 if (!dirp) 960 self->dirp = dirp = opendir (req->dataptr);
812 return -1;
813
814 u = malloc (sizeof (*u)); 961 self->dbuf = u = malloc (sizeof (*u));
815 names = malloc (memlen); 962 req->data2ptr = names = malloc (memlen);
963 UNLOCK (wrklock);
816 964
817 if (u && names) 965 if (dirp && u && names)
818 for (;;) 966 for (;;)
819 { 967 {
820 errno = 0; 968 errno = 0;
821 readdir_r (dirp, &u->d, &entp); 969 readdir_r (dirp, &u->d, &entp);
822 970
832 res++; 980 res++;
833 981
834 while (memofs + len > memlen) 982 while (memofs + len > memlen)
835 { 983 {
836 memlen *= 2; 984 memlen *= 2;
985 LOCK (wrklock);
837 names = realloc (names, memlen); 986 req->data2ptr = names = realloc (names, memlen);
987 UNLOCK (wrklock);
988
838 if (!names) 989 if (!names)
839 break; 990 break;
840 } 991 }
841 992
842 memcpy (names + memofs, name, len); 993 memcpy (names + memofs, name, len);
843 memofs += len; 994 memofs += len;
844 } 995 }
845 } 996 }
846 997
847 errorno = errno;
848 free (u);
849 closedir (dirp);
850
851 if (errorno) 998 if (errno)
852 {
853 free (names);
854 errno = errorno;
855 res = -1; 999 res = -1;
856 } 1000
857 1001 req->result = res;
858 *namesp = (void *)names;
859 return res;
860} 1002}
861 1003
862/*****************************************************************************/ 1004/*****************************************************************************/
863 1005
864static void *aio_proc (void *thr_arg) 1006static void *aio_proc (void *thr_arg)
865{ 1007{
866 aio_req req; 1008 aio_req req;
867 int type; 1009 worker *self = (worker *)thr_arg;
868 1010
869 do 1011 for (;;)
870 { 1012 {
871 pthread_mutex_lock (&reqlock); 1013 LOCK (reqlock);
872 1014
873 for (;;) 1015 for (;;)
874 { 1016 {
875 req = reqq_shift (&req_queue); 1017 self->req = req = reqq_shift (&req_queue);
876 1018
877 if (req) 1019 if (req)
878 break; 1020 break;
879 1021
880 pthread_cond_wait (&reqwait, &reqlock); 1022 pthread_cond_wait (&reqwait, &reqlock);
881 } 1023 }
882 1024
883 pthread_mutex_unlock (&reqlock); 1025 --nready;
1026
1027 UNLOCK (reqlock);
884 1028
885 errno = 0; /* strictly unnecessary */ 1029 errno = 0; /* strictly unnecessary */
886 type = req->type; /* remember type for QUIT check */
887 1030
888 if (!(req->flags & FLAG_CANCELLED)) 1031 if (!(req->flags & FLAG_CANCELLED))
889 switch (type) 1032 switch (req->type)
890 { 1033 {
891 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1034 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; 1035 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
893 1036
894 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1037 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; 1038 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
896 1039
897 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1040 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
898 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1041 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
899 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1042 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
900 1043
903 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1046 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
904 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1047 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
905 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1048 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
906 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1049 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
907 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1050 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
1051 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break;
908 1052
909 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1053 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
910 case REQ_FSYNC: req->result = fsync (req->fd); break; 1054 case REQ_FSYNC: req->result = fsync (req->fd); break;
911 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1055 case REQ_READDIR: scandir_ (req, self); break;
912 1056
913 case REQ_BUSY: 1057 case REQ_BUSY:
914 { 1058 {
915 struct timeval tv; 1059 struct timeval tv;
916 1060
920 req->result = select (0, 0, 0, 0, &tv); 1064 req->result = select (0, 0, 0, 0, &tv);
921 } 1065 }
922 1066
923 case REQ_GROUP: 1067 case REQ_GROUP:
924 case REQ_NOP: 1068 case REQ_NOP:
1069 break;
1070
925 case REQ_QUIT: 1071 case REQ_QUIT:
1072 LOCK (wrklock);
1073 worker_free (self);
1074 --started;
1075 UNLOCK (wrklock);
926 break; 1076 return 0;
927 1077
928 default: 1078 default:
929 req->result = ENOSYS; 1079 req->result = ENOSYS;
930 break; 1080 break;
931 } 1081 }
932 1082
933 req->errorno = errno; 1083 req->errorno = errno;
934 1084
935 pthread_mutex_lock (&reslock); 1085 LOCK (reslock);
1086
1087 ++npending;
936 1088
937 if (!reqq_push (&res_queue, req)) 1089 if (!reqq_push (&res_queue, req))
938 /* write a dummy byte to the pipe so fh becomes ready */ 1090 /* write a dummy byte to the pipe so fh becomes ready */
939 write (respipe [1], &respipe, 1); 1091 write (respipe [1], &respipe, 1);
940 1092
941 pthread_mutex_unlock (&reslock); 1093 self->req = 0;
942 } 1094 worker_clear (self);
943 while (type != REQ_QUIT);
944 1095
945 return 0; 1096 UNLOCK (reslock);
1097 }
946} 1098}
947 1099
948/*****************************************************************************/ 1100/*****************************************************************************/
949 1101
950static void atfork_prepare (void) 1102static void atfork_prepare (void)
951{ 1103{
952 pthread_mutex_lock (&reqlock); 1104 LOCK (wrklock);
953 pthread_mutex_lock (&reslock); 1105 LOCK (reqlock);
1106 LOCK (reslock);
954#if !HAVE_PREADWRITE 1107#if !HAVE_PREADWRITE
955 pthread_mutex_lock (&preadwritelock); 1108 LOCK (preadwritelock);
956#endif 1109#endif
957#if !HAVE_READDIR_R 1110#if !HAVE_READDIR_R
958 pthread_mutex_lock (&readdirlock); 1111 LOCK (readdirlock);
959#endif 1112#endif
960} 1113}
961 1114
962static void atfork_parent (void) 1115static void atfork_parent (void)
963{ 1116{
964#if !HAVE_READDIR_R 1117#if !HAVE_READDIR_R
965 pthread_mutex_unlock (&readdirlock); 1118 UNLOCK (readdirlock);
966#endif 1119#endif
967#if !HAVE_PREADWRITE 1120#if !HAVE_PREADWRITE
968 pthread_mutex_unlock (&preadwritelock); 1121 UNLOCK (preadwritelock);
969#endif 1122#endif
970 pthread_mutex_unlock (&reslock); 1123 UNLOCK (reslock);
971 pthread_mutex_unlock (&reqlock); 1124 UNLOCK (reqlock);
1125 UNLOCK (wrklock);
972} 1126}
973 1127
974static void atfork_child (void) 1128static void atfork_child (void)
975{ 1129{
976 aio_req prv; 1130 aio_req prv;
977
978 started = 0;
979 1131
980 while (prv = reqq_shift (&req_queue)) 1132 while (prv = reqq_shift (&req_queue))
981 req_free (prv); 1133 req_free (prv);
982 1134
983 while (prv = reqq_shift (&res_queue)) 1135 while (prv = reqq_shift (&res_queue))
984 req_free (prv); 1136 req_free (prv);
985 1137
1138 while (wrk_first.next != &wrk_first)
1139 {
1140 worker *wrk = wrk_first.next;
1141
1142 if (wrk->req)
1143 req_free (wrk->req);
1144
1145 worker_clear (wrk);
1146 worker_free (wrk);
1147 }
1148
1149 started = 0;
1150 nreqs = 0;
1151
986 close (respipe [0]); 1152 close (respipe [0]);
987 close (respipe [1]); 1153 close (respipe [1]);
988 create_pipe (); 1154 create_pipe ();
989 1155
990 atfork_parent (); 1156 atfork_parent ();
1016PROTOTYPES: ENABLE 1182PROTOTYPES: ENABLE
1017 1183
1018BOOT: 1184BOOT:
1019{ 1185{
1020 HV *stash = gv_stashpv ("IO::AIO", 1); 1186 HV *stash = gv_stashpv ("IO::AIO", 1);
1187
1021 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1188 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1022 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1189 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1023 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1190 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1191 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1192 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1193 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1024 1194
1025 create_pipe (); 1195 create_pipe ();
1026 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1196 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1027}
1028 1197
1198 start_thread ();
1199}
1200
1029void 1201void
1030min_parallel (nthreads) 1202min_parallel (int nthreads)
1031 int nthreads
1032 PROTOTYPE: $ 1203 PROTOTYPE: $
1033 1204
1034void 1205void
1035max_parallel (nthreads) 1206max_parallel (int nthreads)
1036 int nthreads
1037 PROTOTYPE: $ 1207 PROTOTYPE: $
1038 1208
1039int 1209int
1040max_outstanding (nreqs) 1210max_outstanding (int maxreqs)
1041 int nreqs 1211 PROTOTYPE: $
1042 PROTOTYPE: $
1043 CODE: 1212 CODE:
1044 RETVAL = max_outstanding; 1213 RETVAL = max_outstanding;
1045 max_outstanding = nreqs; 1214 max_outstanding = maxreqs;
1215 OUTPUT:
1216 RETVAL
1046 1217
1047void 1218void
1048aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1219aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1049 SV * pathname 1220 SV * pathname
1050 int flags 1221 int flags
1265 1436
1266 REQ_SEND; 1437 REQ_SEND;
1267} 1438}
1268 1439
1269void 1440void
1441aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1442 SV * pathname
1443 SV * callback
1444 UV mode
1445 UV dev
1446 PPCODE:
1447{
1448 dREQ;
1449
1450 req->type = REQ_MKNOD;
1451 req->data = newSVsv (pathname);
1452 req->dataptr = SvPVbyte_nolen (req->data);
1453 req->mode = (mode_t)mode;
1454 req->offset = dev;
1455
1456 REQ_SEND;
1457}
1458
1459void
1270aio_busy (delay,callback=&PL_sv_undef) 1460aio_busy (delay,callback=&PL_sv_undef)
1271 double delay 1461 double delay
1272 SV * callback 1462 SV * callback
1273 PPCODE: 1463 PPCODE:
1274{ 1464{
1305 req->type = REQ_NOP; 1495 req->type = REQ_NOP;
1306 1496
1307 REQ_SEND; 1497 REQ_SEND;
1308} 1498}
1309 1499
1310void 1500int
1311aioreq_pri (int pri = DEFAULT_PRI) 1501aioreq_pri (int pri = 0)
1312 CODE: 1502 PROTOTYPE: ;$
1503 CODE:
1504 RETVAL = next_pri - PRI_BIAS;
1505 if (items > 0)
1506 {
1313 if (pri < PRI_MIN) pri = PRI_MIN; 1507 if (pri < PRI_MIN) pri = PRI_MIN;
1314 if (pri > PRI_MAX) pri = PRI_MAX; 1508 if (pri > PRI_MAX) pri = PRI_MAX;
1315 next_pri = pri + PRI_BIAS; 1509 next_pri = pri + PRI_BIAS;
1510 }
1511 OUTPUT:
1512 RETVAL
1316 1513
1317void 1514void
1318aioreq_nice (int nice = 0) 1515aioreq_nice (int nice = 0)
1319 CODE: 1516 CODE:
1320 nice = next_pri - nice; 1517 nice = next_pri - nice;
1321 if (nice < PRI_MIN) nice = PRI_MIN; 1518 if (nice < PRI_MIN) nice = PRI_MIN;
1322 if (nice > PRI_MAX) nice = PRI_MAX; 1519 if (nice > PRI_MAX) nice = PRI_MAX;
1323 next_pri = nice + PRI_BIAS; 1520 next_pri = nice + PRI_BIAS;
1324 1521
1325void 1522void
1326flush () 1523flush ()
1327 PROTOTYPE: 1524 PROTOTYPE:
1328 CODE: 1525 CODE:
1329 while (nreqs) 1526 while (nreqs)
1330 { 1527 {
1331 poll_wait (); 1528 poll_wait ();
1332 poll_cb (); 1529 poll_cb (0);
1333 } 1530 }
1334 1531
1335void 1532void
1336poll() 1533poll()
1337 PROTOTYPE: 1534 PROTOTYPE:
1338 CODE: 1535 CODE:
1339 if (nreqs) 1536 if (nreqs)
1340 { 1537 {
1341 poll_wait (); 1538 poll_wait ();
1342 poll_cb (); 1539 poll_cb (0);
1343 } 1540 }
1344 1541
1345int 1542int
1346poll_fileno() 1543poll_fileno()
1347 PROTOTYPE: 1544 PROTOTYPE:
1352 1549
1353int 1550int
1354poll_cb(...) 1551poll_cb(...)
1355 PROTOTYPE: 1552 PROTOTYPE:
1356 CODE: 1553 CODE:
1357 RETVAL = poll_cb (); 1554 RETVAL = poll_cb (0);
1555 OUTPUT:
1556 RETVAL
1557
1558int
1559poll_some(int max = 0)
1560 PROTOTYPE: $
1561 CODE:
1562 RETVAL = poll_cb (max);
1358 OUTPUT: 1563 OUTPUT:
1359 RETVAL 1564 RETVAL
1360 1565
1361void 1566void
1362poll_wait() 1567poll_wait()
1371 CODE: 1576 CODE:
1372 RETVAL = nreqs; 1577 RETVAL = nreqs;
1373 OUTPUT: 1578 OUTPUT:
1374 RETVAL 1579 RETVAL
1375 1580
1581int
1582nready()
1583 PROTOTYPE:
1584 CODE:
1585 RETVAL = get_nready ();
1586 OUTPUT:
1587 RETVAL
1588
1589int
1590npending()
1591 PROTOTYPE:
1592 CODE:
1593 RETVAL = get_npending ();
1594 OUTPUT:
1595 RETVAL
1596
1376PROTOTYPES: DISABLE 1597PROTOTYPES: DISABLE
1377 1598
1378MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1599MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1379 1600
1380void 1601void
1422 } 1643 }
1423 } 1644 }
1424} 1645}
1425 1646
1426void 1647void
1648cancel_subs (aio_req_ornot req)
1649 CODE:
1650 req_cancel_subs (req);
1651
1652void
1427result (aio_req grp, ...) 1653result (aio_req grp, ...)
1428 CODE: 1654 CODE:
1429{ 1655{
1430 int i; 1656 int i;
1657 AV *av;
1658
1659 grp->errorno = errno;
1660
1431 AV *av = newAV (); 1661 av = newAV ();
1432 1662
1433 for (i = 1; i < items; ++i ) 1663 for (i = 1; i < items; ++i )
1434 av_push (av, newSVsv (ST (i))); 1664 av_push (av, newSVsv (ST (i)));
1435 1665
1436 SvREFCNT_dec (grp->data); 1666 SvREFCNT_dec (grp->data);
1437 grp->data = (SV *)av; 1667 grp->data = (SV *)av;
1438} 1668}
1669
1670void
1671errno (aio_req grp, int errorno = errno)
1672 CODE:
1673 grp->errorno = errorno;
1439 1674
1440void 1675void
1441limit (aio_req grp, int limit) 1676limit (aio_req grp, int limit)
1442 CODE: 1677 CODE:
1443 grp->fd2 = limit; 1678 grp->fd2 = limit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines