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.69 by root, Tue Oct 24 11:57:30 2006 UTC vs.
Revision 1.84 by root, Sat Oct 28 01:24:19 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"
… …
39# else 43# else
40# error sendfile support requested but not available 44# error sendfile support requested but not available
41# endif 45# endif
42#endif 46#endif
43 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
44/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 52#ifndef NAME_MAX
46# define NAME_MAX 4096 53# define NAME_MAX 4096
54#endif
55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
47#endif 59#endif
48 60
49#if __ia64 61#if __ia64
50# define STACKSIZE 65536 62# define STACKSIZE 65536
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
53#else 65#else
54# define STACKSIZE 16384 66# define STACKSIZE 16384
55#endif 67#endif
56 68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDREAD_UNSAFE
74# if __i386 || __x86_64
75# define WORDREAD_UNSAFE 0
76# else
77# define WORDREAD_UNSAFE 1
78# endif
79#endif
80
57/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
59 83
60#define dBUF \ 84#define dBUF \
85 char *aio_buf; \
86 LOCK (wrklock); \
61 char *aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \
62 if (!aio_buf) \ 89 if (!aio_buf) \
63 return -1; 90 return -1;
64
65#define fBUF free (aio_buf)
66 91
67enum { 92enum {
68 REQ_QUIT, 93 REQ_QUIT,
69 REQ_OPEN, REQ_CLOSE, 94 REQ_OPEN, REQ_CLOSE,
70 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
71 REQ_SENDFILE, 96 REQ_SENDFILE,
72 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
73 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
76 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK,
77 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
78 REQ_BUSY, 103 REQ_BUSY,
79}; 104};
80 105
… …
122 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 147 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
123}; 148};
124 149
125static int next_pri = DEFAULT_PRI + PRI_BIAS; 150static int next_pri = DEFAULT_PRI + PRI_BIAS;
126 151
127static int started, wanted; 152static unsigned int started, idle, wanted;
128static volatile int nreqs;
129static int max_outstanding = 1<<30;
130static 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
137 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}
202
203static volatile unsigned int nreqs, nready, npending;
204static volatile unsigned int max_idle = 4;
205static volatile unsigned int max_outstanding = 0xffffffff;
206static int respipe [2];
207
138static pthread_mutex_t reslock = AIO_MUTEX_INIT; 208static pthread_mutex_t reslock = AIO_MUTEX_INIT;
139static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 209static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
140static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 210static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
211
212#if WORDREAD_UNSAFE
213
214static unsigned int get_nready ()
215{
216 unsigned int retval;
217
218 LOCK (reqlock);
219 retval = nready;
220 UNLOCK (reqlock);
221
222 return retval;
223}
224
225static unsigned int get_npending ()
226{
227 unsigned int retval;
228
229 LOCK (reslock);
230 retval = npending;
231 UNLOCK (reslock);
232
233 return retval;
234}
235
236#else
237
238# define get_nready() nready
239# define get_npending() npending
240
241#endif
141 242
142/* 243/*
143 * a somewhat faster data structure might be nice, but 244 * a somewhat faster data structure might be nice, but
144 * with 8 priorities this actually needs <20 insns 245 * with 8 priorities this actually needs <20 insns
145 * per shift, the most expensive operation. 246 * per shift, the most expensive operation.
… …
191 } 292 }
192 293
193 abort (); 294 abort ();
194} 295}
195 296
297static int poll_cb (int max);
196static void req_invoke (aio_req req); 298static void req_invoke (aio_req req);
197static void req_free (aio_req req); 299static void req_free (aio_req req);
300static void req_cancel (aio_req req);
198 301
199/* must be called at most once */ 302/* must be called at most once */
200static SV *req_sv (aio_req req, const char *klass) 303static SV *req_sv (aio_req req, const char *klass)
201{ 304{
202 if (!req->self) 305 if (!req->self)
… …
264 req_invoke (grp); 367 req_invoke (grp);
265 req_free (grp); 368 req_free (grp);
266 } 369 }
267} 370}
268 371
269static void poll_wait ()
270{
271 fd_set rfd;
272
273 while (nreqs)
274 {
275 int size;
276#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
277 pthread_mutex_lock (&reslock);
278#endif
279 size = res_queue.size;
280#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
281 pthread_mutex_unlock (&reslock);
282#endif
283
284 if (size)
285 return;
286
287 FD_ZERO(&rfd);
288 FD_SET(respipe [0], &rfd);
289
290 select (respipe [0] + 1, &rfd, 0, 0, 0);
291 }
292}
293
294static void req_invoke (aio_req req) 372static void req_invoke (aio_req req)
295{ 373{
296 dSP; 374 dSP;
297 375
298 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 376 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
299 { 377 {
300 errno = req->errorno;
301
302 ENTER; 378 ENTER;
303 SAVETMPS; 379 SAVETMPS;
304 PUSHMARK (SP); 380 PUSHMARK (SP);
305 EXTEND (SP, 1); 381 EXTEND (SP, 1);
306 382
… …
310 { 386 {
311 SV *rv = &PL_sv_undef; 387 SV *rv = &PL_sv_undef;
312 388
313 if (req->result >= 0) 389 if (req->result >= 0)
314 { 390 {
391 int i;
315 char *buf = req->data2ptr; 392 char *buf = req->data2ptr;
316 AV *av = newAV (); 393 AV *av = newAV ();
317 394
318 while (req->result) 395 av_extend (av, req->result - 1);
396
397 for (i = 0; i < req->result; ++i)
319 { 398 {
320 SV *sv = newSVpv (buf, 0); 399 SV *sv = newSVpv (buf, 0);
321 400
322 av_push (av, sv); 401 av_store (av, i, sv);
323 buf += SvCUR (sv) + 1; 402 buf += SvCUR (sv) + 1;
324 req->result--;
325 } 403 }
326 404
327 rv = sv_2mortal (newRV_noinc ((SV *)av)); 405 rv = sv_2mortal (newRV_noinc ((SV *)av));
328 } 406 }
329 407
… …
369 default: 447 default:
370 PUSHs (sv_2mortal (newSViv (req->result))); 448 PUSHs (sv_2mortal (newSViv (req->result)));
371 break; 449 break;
372 } 450 }
373 451
452 errno = req->errorno;
374 453
375 PUTBACK; 454 PUTBACK;
376 call_sv (req->callback, G_VOID | G_EVAL); 455 call_sv (req->callback, G_VOID | G_EVAL);
377 SPAGAIN; 456 SPAGAIN;
378 457
… …
413 SvREFCNT_dec (req->fh); 492 SvREFCNT_dec (req->fh);
414 SvREFCNT_dec (req->fh2); 493 SvREFCNT_dec (req->fh2);
415 SvREFCNT_dec (req->callback); 494 SvREFCNT_dec (req->callback);
416 Safefree (req->statdata); 495 Safefree (req->statdata);
417 496
418 if (req->type == REQ_READDIR && req->result >= 0) 497 if (req->type == REQ_READDIR)
419 free (req->data2ptr); 498 free (req->data2ptr);
420 499
421 Safefree (req); 500 Safefree (req);
422} 501}
423 502
503static void req_cancel_subs (aio_req grp)
504{
505 aio_req sub;
506
507 if (grp->type != REQ_GROUP)
508 return;
509
510 SvREFCNT_dec (grp->fh2);
511 grp->fh2 = 0;
512
513 for (sub = grp->grp_first; sub; sub = sub->grp_next)
514 req_cancel (sub);
515}
516
424static void req_cancel (aio_req req) 517static void req_cancel (aio_req req)
425{ 518{
426 req->flags |= FLAG_CANCELLED; 519 req->flags |= FLAG_CANCELLED;
427 520
428 if (req->type == REQ_GROUP) 521 req_cancel_subs (req);
429 { 522}
430 aio_req sub;
431 523
432 for (sub = req->grp_first; sub; sub = sub->grp_next) 524static void *aio_proc(void *arg);
433 req_cancel (sub); 525
526static void start_thread (void)
527{
528 sigset_t fullsigset, oldsigset;
529 pthread_attr_t attr;
530
531 worker *wrk = calloc (1, sizeof (worker));
532
533 if (!wrk)
534 croak ("unable to allocate worker thread data");
535
536 pthread_attr_init (&attr);
537 pthread_attr_setstacksize (&attr, STACKSIZE);
538 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
539#ifdef PTHREAD_SCOPE_PROCESS
540 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
541#endif
542
543 sigfillset (&fullsigset);
544
545 LOCK (wrklock);
546 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
547
548 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
434 } 549 {
435} 550 wrk->prev = &wrk_first;
551 wrk->next = wrk_first.next;
552 wrk_first.next->prev = wrk;
553 wrk_first.next = wrk;
554 ++started;
555 }
556 else
557 free (wrk);
436 558
559 sigprocmask (SIG_SETMASK, &oldsigset, 0);
560 UNLOCK (wrklock);
561}
562
563static void maybe_start_thread ()
564{
565 if (started >= wanted)
566 return;
567
568 /* todo: maybe use idle here, but might be less exact */
569 if ((int)nready <= (int)started - (int)(nreqs - get_nready () - get_npending ()))
570 return;
571
572 start_thread ();
573}
574
575static void req_send (aio_req req)
576{
577 ++nreqs;
578
579 LOCK (reqlock);
580 ++nready;
581 reqq_push (&req_queue, req);
582 pthread_cond_signal (&reqwait);
583 UNLOCK (reqlock);
584
585 maybe_start_thread ();
586}
587
588static void end_thread (void)
589{
590 aio_req req;
591
592 Newz (0, req, 1, aio_cb);
593
594 req->type = REQ_QUIT;
595 req->pri = PRI_MAX + PRI_BIAS;
596
597 LOCK (reqlock);
598 reqq_push (&req_queue, req);
599 pthread_cond_signal (&reqwait);
600 UNLOCK (reqlock);
601
602 LOCK (wrklock);
603 --started;
604 UNLOCK (wrklock);
605}
606
607static void min_parallel (int nthreads)
608{
609 if (wanted < nthreads)
610 wanted = nthreads;
611}
612
613static void max_parallel (int nthreads)
614{
615 if (wanted > nthreads)
616 wanted = nthreads;
617
618 while (started > wanted)
619 end_thread ();
620}
621
622static void poll_wait ()
623{
624 fd_set rfd;
625
626 while (nreqs)
627 {
628 int size;
629 if (WORDREAD_UNSAFE) LOCK (reslock);
630 size = res_queue.size;
631 if (WORDREAD_UNSAFE) UNLOCK (reslock);
632
633 if (size)
634 return;
635
636 maybe_start_thread ();
637
638 FD_ZERO(&rfd);
639 FD_SET(respipe [0], &rfd);
640
641 select (respipe [0] + 1, &rfd, 0, 0, 0);
642 }
643}
644
437static int poll_cb () 645static int poll_cb (int max)
438{ 646{
439 dSP; 647 dSP;
440 int count = 0; 648 int count = 0;
441 int do_croak = 0; 649 int do_croak = 0;
442 aio_req req; 650 aio_req req;
443 651
444 for (;;) 652 for (;;)
445 { 653 {
446 pthread_mutex_lock (&reslock); 654 while (max <= 0 || count < max)
447 req = reqq_shift (&res_queue);
448
449 if (req)
450 { 655 {
656 maybe_start_thread ();
657
658 LOCK (reslock);
659 req = reqq_shift (&res_queue);
660
451 if (!res_queue.size) 661 if (req)
452 { 662 {
663 --npending;
664
665 if (!res_queue.size)
666 {
453 /* read any signals sent by the worker threads */ 667 /* read any signals sent by the worker threads */
454 char buf [32]; 668 char buf [32];
455 while (read (respipe [0], buf, 32) == 32) 669 while (read (respipe [0], buf, 32) == 32)
670 ;
456 ; 671 }
457 } 672 }
673
674 UNLOCK (reslock);
675
676 if (!req)
677 break;
678
679 --nreqs;
680
681 if (req->type == REQ_GROUP && req->length)
682 {
683 req->fd = 1; /* mark request as delayed */
684 continue;
685 }
686 else
687 {
688 if (req->type == REQ_READ)
689 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
690
691 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
692 SvREADONLY_off (req->data);
693
694 if (req->statdata)
695 {
696 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
697 PL_laststatval = req->result;
698 PL_statcache = *(req->statdata);
699 }
700
701 req_invoke (req);
702
703 count++;
704 }
705
706 req_free (req);
458 } 707 }
459 708
460 pthread_mutex_unlock (&reslock); 709 if (nreqs <= max_outstanding)
461
462 if (!req)
463 break; 710 break;
464 711
465 --nreqs; 712 poll_wait ();
466 713
467 if (req->type == REQ_QUIT) 714 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 } 715 }
496 716
497 return count; 717 return count;
498}
499
500static void *aio_proc(void *arg);
501
502static void start_thread (void)
503{
504 sigset_t fullsigset, oldsigset;
505 pthread_t tid;
506 pthread_attr_t attr;
507
508 pthread_attr_init (&attr);
509 pthread_attr_setstacksize (&attr, STACKSIZE);
510 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
511
512 sigfillset (&fullsigset);
513 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
514
515 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
516 started++;
517
518 sigprocmask (SIG_SETMASK, &oldsigset, 0);
519}
520
521static void req_send (aio_req req)
522{
523 while (started < wanted && nreqs >= started)
524 start_thread ();
525
526 ++nreqs;
527
528 pthread_mutex_lock (&reqlock);
529 reqq_push (&req_queue, req);
530 pthread_cond_signal (&reqwait);
531 pthread_mutex_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}
544
545static void end_thread (void)
546{
547 aio_req req;
548
549 Newz (0, req, 1, aio_cb);
550
551 req->type = REQ_QUIT;
552 req->pri = PRI_MAX + PRI_BIAS;
553
554 req_send (req);
555}
556
557static void min_parallel (int nthreads)
558{
559 if (wanted < nthreads)
560 wanted = nthreads;
561}
562
563static void max_parallel (int nthreads)
564{
565 int cur = started;
566
567 if (wanted > nthreads)
568 wanted = nthreads;
569
570 while (cur > wanted)
571 {
572 end_thread ();
573 cur--;
574 }
575
576 while (started > wanted)
577 {
578 poll_wait ();
579 poll_cb ();
580 }
581} 718}
582 719
583static void create_pipe () 720static void create_pipe ()
584{ 721{
585 if (pipe (respipe)) 722 if (pipe (respipe))
… …
609static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 746static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
610{ 747{
611 ssize_t res; 748 ssize_t res;
612 off_t ooffset; 749 off_t ooffset;
613 750
614 pthread_mutex_lock (&preadwritelock); 751 LOCK (preadwritelock);
615 ooffset = lseek (fd, 0, SEEK_CUR); 752 ooffset = lseek (fd, 0, SEEK_CUR);
616 lseek (fd, offset, SEEK_SET); 753 lseek (fd, offset, SEEK_SET);
617 res = read (fd, buf, count); 754 res = read (fd, buf, count);
618 lseek (fd, ooffset, SEEK_SET); 755 lseek (fd, ooffset, SEEK_SET);
619 pthread_mutex_unlock (&preadwritelock); 756 UNLOCK (preadwritelock);
620 757
621 return res; 758 return res;
622} 759}
623 760
624static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 761static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
625{ 762{
626 ssize_t res; 763 ssize_t res;
627 off_t ooffset; 764 off_t ooffset;
628 765
629 pthread_mutex_lock (&preadwritelock); 766 LOCK (preadwritelock);
630 ooffset = lseek (fd, 0, SEEK_CUR); 767 ooffset = lseek (fd, 0, SEEK_CUR);
631 lseek (fd, offset, SEEK_SET); 768 lseek (fd, offset, SEEK_SET);
632 res = write (fd, buf, count); 769 res = write (fd, buf, count);
633 lseek (fd, offset, SEEK_SET); 770 lseek (fd, offset, SEEK_SET);
634 pthread_mutex_unlock (&preadwritelock); 771 UNLOCK (preadwritelock);
635 772
636 return res; 773 return res;
637} 774}
638#endif 775#endif
639 776
640#if !HAVE_FDATASYNC 777#if !HAVE_FDATASYNC
641# define fdatasync fsync 778# define fdatasync fsync
642#endif 779#endif
643 780
644#if !HAVE_READAHEAD 781#if !HAVE_READAHEAD
645# define readahead aio_readahead 782# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
646 783
647static ssize_t readahead (int fd, off_t offset, size_t count) 784static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
648{ 785{
649 dBUF; 786 dBUF;
650 787
651 while (count > 0) 788 while (count > 0)
652 { 789 {
… …
655 pread (fd, aio_buf, len, offset); 792 pread (fd, aio_buf, len, offset);
656 offset += len; 793 offset += len;
657 count -= len; 794 count -= len;
658 } 795 }
659 796
660 fBUF;
661
662 errno = 0; 797 errno = 0;
663} 798}
799
664#endif 800#endif
665 801
666#if !HAVE_READDIR_R 802#if !HAVE_READDIR_R
667# define readdir_r aio_readdir_r 803# define readdir_r aio_readdir_r
668 804
… …
671static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 807static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
672{ 808{
673 struct dirent *e; 809 struct dirent *e;
674 int errorno; 810 int errorno;
675 811
676 pthread_mutex_lock (&readdirlock); 812 LOCK (readdirlock);
677 813
678 e = readdir (dirp); 814 e = readdir (dirp);
679 errorno = errno; 815 errorno = errno;
680 816
681 if (e) 817 if (e)
… …
684 strcpy (ent->d_name, e->d_name); 820 strcpy (ent->d_name, e->d_name);
685 } 821 }
686 else 822 else
687 *res = 0; 823 *res = 0;
688 824
689 pthread_mutex_unlock (&readdirlock); 825 UNLOCK (readdirlock);
690 826
691 errno = errorno; 827 errno = errorno;
692 return e ? 0 : -1; 828 return e ? 0 : -1;
693} 829}
694#endif 830#endif
695 831
696/* sendfile always needs emulation */ 832/* sendfile always needs emulation */
697static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 833static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
698{ 834{
699 ssize_t res; 835 ssize_t res;
700 836
701 if (!count) 837 if (!count)
702 return 0; 838 return 0;
… …
713 { 849 {
714 off_t sbytes; 850 off_t sbytes;
715 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 851 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
716 852
717 if (res < 0 && sbytes) 853 if (res < 0 && sbytes)
718 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 854 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
719 res = sbytes; 855 res = sbytes;
720 } 856 }
721 857
722# elif __hpux 858# elif __hpux
723 res = sendfile (ofd, ifd, offset, count, 0, 0); 859 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
779 915
780 offset += cnt; 916 offset += cnt;
781 res += cnt; 917 res += cnt;
782 count -= cnt; 918 count -= cnt;
783 } 919 }
784
785 fBUF;
786 } 920 }
787 921
788 return res; 922 return res;
789} 923}
790 924
791/* read a full directory */ 925/* read a full directory */
792static int scandir_ (const char *path, void **namesp) 926static void scandir_ (aio_req req, worker *self)
793{ 927{
794 DIR *dirp; 928 DIR *dirp;
795 union 929 union
796 { 930 {
797 struct dirent d; 931 struct dirent d;
… …
802 int memlen = 4096; 936 int memlen = 4096;
803 int memofs = 0; 937 int memofs = 0;
804 int res = 0; 938 int res = 0;
805 int errorno; 939 int errorno;
806 940
807 dirp = opendir (path); 941 LOCK (wrklock);
808 if (!dirp) 942 self->dirp = dirp = opendir (req->dataptr);
809 return -1;
810
811 u = malloc (sizeof (*u)); 943 self->dbuf = u = malloc (sizeof (*u));
812 names = malloc (memlen); 944 req->data2ptr = names = malloc (memlen);
945 UNLOCK (wrklock);
813 946
814 if (u && names) 947 if (dirp && u && names)
815 for (;;) 948 for (;;)
816 { 949 {
817 errno = 0; 950 errno = 0;
818 readdir_r (dirp, &u->d, &entp); 951 readdir_r (dirp, &u->d, &entp);
819 952
… …
829 res++; 962 res++;
830 963
831 while (memofs + len > memlen) 964 while (memofs + len > memlen)
832 { 965 {
833 memlen *= 2; 966 memlen *= 2;
967 LOCK (wrklock);
834 names = realloc (names, memlen); 968 req->data2ptr = names = realloc (names, memlen);
969 UNLOCK (wrklock);
970
835 if (!names) 971 if (!names)
836 break; 972 break;
837 } 973 }
838 974
839 memcpy (names + memofs, name, len); 975 memcpy (names + memofs, name, len);
840 memofs += len; 976 memofs += len;
841 } 977 }
842 } 978 }
843 979
844 errorno = errno;
845 free (u);
846 closedir (dirp);
847
848 if (errorno) 980 if (errno)
849 {
850 free (names);
851 errno = errorno;
852 res = -1; 981 res = -1;
853 } 982
854 983 req->result = res;
855 *namesp = (void *)names;
856 return res;
857} 984}
858 985
859/*****************************************************************************/ 986/*****************************************************************************/
860 987
861static void *aio_proc (void *thr_arg) 988static void *aio_proc (void *thr_arg)
862{ 989{
863 aio_req req; 990 aio_req req;
864 int type; 991 struct timespec ts;
992 worker *self = (worker *)thr_arg;
865 993
866 do 994 /* try to distribute timeouts somewhat evenly */
995 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
996 * (1000000000UL / 1024UL);
997
998 for (;;)
867 { 999 {
868 pthread_mutex_lock (&reqlock); 1000 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1001
1002 LOCK (reqlock);
869 1003
870 for (;;) 1004 for (;;)
871 { 1005 {
872 req = reqq_shift (&req_queue); 1006 self->req = req = reqq_shift (&req_queue);
873 1007
874 if (req) 1008 if (req)
875 break; 1009 break;
876 1010
1011 ++idle;
1012
1013 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1014 == ETIMEDOUT)
1015 {
1016 if (idle > max_idle)
1017 {
1018 --idle;
1019 UNLOCK (reqlock);
1020 LOCK (wrklock);
1021 --started;
1022 UNLOCK (wrklock);
1023 goto quit;
1024 }
1025
1026 /* we are allowed to idle, so do so without any timeout */
877 pthread_cond_wait (&reqwait, &reqlock); 1027 pthread_cond_wait (&reqwait, &reqlock);
1028 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1029 }
1030
1031 --idle;
878 } 1032 }
879 1033
880 pthread_mutex_unlock (&reqlock); 1034 --nready;
1035
1036 UNLOCK (reqlock);
881 1037
882 errno = 0; /* strictly unnecessary */ 1038 errno = 0; /* strictly unnecessary */
883 type = req->type; /* remember type for QUIT check */
884 1039
885 if (!(req->flags & FLAG_CANCELLED)) 1040 if (!(req->flags & FLAG_CANCELLED))
886 switch (type) 1041 switch (req->type)
887 { 1042 {
888 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1043 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; 1044 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
890 1045
891 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1046 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; 1047 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
893 1048
894 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1049 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
895 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1050 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
896 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1051 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
897 1052
… …
900 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1055 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
901 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1056 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
902 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1057 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
903 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1058 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
904 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1059 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
1060 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break;
905 1061
906 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1062 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
907 case REQ_FSYNC: req->result = fsync (req->fd); break; 1063 case REQ_FSYNC: req->result = fsync (req->fd); break;
908 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1064 case REQ_READDIR: scandir_ (req, self); break;
909 1065
910 case REQ_BUSY: 1066 case REQ_BUSY:
911 { 1067 {
912 struct timeval tv; 1068 struct timeval tv;
913 1069
… …
917 req->result = select (0, 0, 0, 0, &tv); 1073 req->result = select (0, 0, 0, 0, &tv);
918 } 1074 }
919 1075
920 case REQ_GROUP: 1076 case REQ_GROUP:
921 case REQ_NOP: 1077 case REQ_NOP:
1078 break;
1079
922 case REQ_QUIT: 1080 case REQ_QUIT:
923 break; 1081 goto quit;
924 1082
925 default: 1083 default:
926 req->result = ENOSYS; 1084 req->result = ENOSYS;
927 break; 1085 break;
928 } 1086 }
929 1087
930 req->errorno = errno; 1088 req->errorno = errno;
931 1089
932 pthread_mutex_lock (&reslock); 1090 LOCK (reslock);
1091
1092 ++npending;
933 1093
934 if (!reqq_push (&res_queue, req)) 1094 if (!reqq_push (&res_queue, req))
935 /* write a dummy byte to the pipe so fh becomes ready */ 1095 /* write a dummy byte to the pipe so fh becomes ready */
936 write (respipe [1], &respipe, 1); 1096 write (respipe [1], &respipe, 1);
937 1097
938 pthread_mutex_unlock (&reslock); 1098 self->req = 0;
1099 worker_clear (self);
1100
1101 UNLOCK (reslock);
939 } 1102 }
940 while (type != REQ_QUIT); 1103
1104quit:
1105 LOCK (wrklock);
1106 worker_free (self);
1107 UNLOCK (wrklock);
941 1108
942 return 0; 1109 return 0;
943} 1110}
944 1111
945/*****************************************************************************/ 1112/*****************************************************************************/
946 1113
947static void atfork_prepare (void) 1114static void atfork_prepare (void)
948{ 1115{
949 pthread_mutex_lock (&reqlock); 1116 LOCK (wrklock);
950 pthread_mutex_lock (&reslock); 1117 LOCK (reqlock);
1118 LOCK (reslock);
951#if !HAVE_PREADWRITE 1119#if !HAVE_PREADWRITE
952 pthread_mutex_lock (&preadwritelock); 1120 LOCK (preadwritelock);
953#endif 1121#endif
954#if !HAVE_READDIR_R 1122#if !HAVE_READDIR_R
955 pthread_mutex_lock (&readdirlock); 1123 LOCK (readdirlock);
956#endif 1124#endif
957} 1125}
958 1126
959static void atfork_parent (void) 1127static void atfork_parent (void)
960{ 1128{
961#if !HAVE_READDIR_R 1129#if !HAVE_READDIR_R
962 pthread_mutex_unlock (&readdirlock); 1130 UNLOCK (readdirlock);
963#endif 1131#endif
964#if !HAVE_PREADWRITE 1132#if !HAVE_PREADWRITE
965 pthread_mutex_unlock (&preadwritelock); 1133 UNLOCK (preadwritelock);
966#endif 1134#endif
967 pthread_mutex_unlock (&reslock); 1135 UNLOCK (reslock);
968 pthread_mutex_unlock (&reqlock); 1136 UNLOCK (reqlock);
1137 UNLOCK (wrklock);
969} 1138}
970 1139
971static void atfork_child (void) 1140static void atfork_child (void)
972{ 1141{
973 aio_req prv; 1142 aio_req prv;
974
975 started = 0;
976 1143
977 while (prv = reqq_shift (&req_queue)) 1144 while (prv = reqq_shift (&req_queue))
978 req_free (prv); 1145 req_free (prv);
979 1146
980 while (prv = reqq_shift (&res_queue)) 1147 while (prv = reqq_shift (&res_queue))
981 req_free (prv); 1148 req_free (prv);
982 1149
1150 while (wrk_first.next != &wrk_first)
1151 {
1152 worker *wrk = wrk_first.next;
1153
1154 if (wrk->req)
1155 req_free (wrk->req);
1156
1157 worker_clear (wrk);
1158 worker_free (wrk);
1159 }
1160
1161 started = 0;
1162 idle = 0;
1163 nreqs = 0;
1164 nready = 0;
1165 npending = 0;
1166
983 close (respipe [0]); 1167 close (respipe [0]);
984 close (respipe [1]); 1168 close (respipe [1]);
985 create_pipe (); 1169 create_pipe ();
986 1170
987 atfork_parent (); 1171 atfork_parent ();
… …
1013PROTOTYPES: ENABLE 1197PROTOTYPES: ENABLE
1014 1198
1015BOOT: 1199BOOT:
1016{ 1200{
1017 HV *stash = gv_stashpv ("IO::AIO", 1); 1201 HV *stash = gv_stashpv ("IO::AIO", 1);
1202
1018 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1203 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1019 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1204 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1020 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1205 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1206 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1207 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1208 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1021 1209
1022 create_pipe (); 1210 create_pipe ();
1023 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1211 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1024} 1212}
1025 1213
1026void 1214void
1027min_parallel (nthreads) 1215min_parallel (int nthreads)
1028 int nthreads
1029 PROTOTYPE: $ 1216 PROTOTYPE: $
1030 1217
1031void 1218void
1032max_parallel (nthreads) 1219max_parallel (int nthreads)
1033 int nthreads
1034 PROTOTYPE: $ 1220 PROTOTYPE: $
1035 1221
1036int 1222int
1037max_outstanding (nreqs) 1223max_outstanding (int maxreqs)
1038 int nreqs 1224 PROTOTYPE: $
1039 PROTOTYPE: $
1040 CODE: 1225 CODE:
1041 RETVAL = max_outstanding; 1226 RETVAL = max_outstanding;
1042 max_outstanding = nreqs; 1227 max_outstanding = maxreqs;
1228 OUTPUT:
1229 RETVAL
1043 1230
1044void 1231void
1045aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1232aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1046 SV * pathname 1233 SV * pathname
1047 int flags 1234 int flags
… …
1262 1449
1263 REQ_SEND; 1450 REQ_SEND;
1264} 1451}
1265 1452
1266void 1453void
1454aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1455 SV * pathname
1456 SV * callback
1457 UV mode
1458 UV dev
1459 PPCODE:
1460{
1461 dREQ;
1462
1463 req->type = REQ_MKNOD;
1464 req->data = newSVsv (pathname);
1465 req->dataptr = SvPVbyte_nolen (req->data);
1466 req->mode = (mode_t)mode;
1467 req->offset = dev;
1468
1469 REQ_SEND;
1470}
1471
1472void
1267aio_busy (delay,callback=&PL_sv_undef) 1473aio_busy (delay,callback=&PL_sv_undef)
1268 double delay 1474 double delay
1269 SV * callback 1475 SV * callback
1270 PPCODE: 1476 PPCODE:
1271{ 1477{
… …
1302 req->type = REQ_NOP; 1508 req->type = REQ_NOP;
1303 1509
1304 REQ_SEND; 1510 REQ_SEND;
1305} 1511}
1306 1512
1307void 1513int
1308aioreq_pri (int pri = DEFAULT_PRI) 1514aioreq_pri (int pri = 0)
1309 CODE: 1515 PROTOTYPE: ;$
1516 CODE:
1517 RETVAL = next_pri - PRI_BIAS;
1518 if (items > 0)
1519 {
1310 if (pri < PRI_MIN) pri = PRI_MIN; 1520 if (pri < PRI_MIN) pri = PRI_MIN;
1311 if (pri > PRI_MAX) pri = PRI_MAX; 1521 if (pri > PRI_MAX) pri = PRI_MAX;
1312 next_pri = pri + PRI_BIAS; 1522 next_pri = pri + PRI_BIAS;
1523 }
1524 OUTPUT:
1525 RETVAL
1313 1526
1314void 1527void
1315aioreq_nice (int nice = 0) 1528aioreq_nice (int nice = 0)
1316 CODE: 1529 CODE:
1317 nice = next_pri - nice; 1530 nice = next_pri - nice;
1318 if (nice < PRI_MIN) nice = PRI_MIN; 1531 if (nice < PRI_MIN) nice = PRI_MIN;
1319 if (nice > PRI_MAX) nice = PRI_MAX; 1532 if (nice > PRI_MAX) nice = PRI_MAX;
1320 next_pri = nice + PRI_BIAS; 1533 next_pri = nice + PRI_BIAS;
1321 1534
1322void 1535void
1323flush () 1536flush ()
1324 PROTOTYPE: 1537 PROTOTYPE:
1325 CODE: 1538 CODE:
1326 while (nreqs) 1539 while (nreqs)
1327 { 1540 {
1328 poll_wait (); 1541 poll_wait ();
1329 poll_cb (); 1542 poll_cb (0);
1330 } 1543 }
1331 1544
1332void 1545void
1333poll() 1546poll()
1334 PROTOTYPE: 1547 PROTOTYPE:
1335 CODE: 1548 CODE:
1336 if (nreqs) 1549 if (nreqs)
1337 { 1550 {
1338 poll_wait (); 1551 poll_wait ();
1339 poll_cb (); 1552 poll_cb (0);
1340 } 1553 }
1341 1554
1342int 1555int
1343poll_fileno() 1556poll_fileno()
1344 PROTOTYPE: 1557 PROTOTYPE:
… …
1349 1562
1350int 1563int
1351poll_cb(...) 1564poll_cb(...)
1352 PROTOTYPE: 1565 PROTOTYPE:
1353 CODE: 1566 CODE:
1354 RETVAL = poll_cb (); 1567 RETVAL = poll_cb (0);
1568 OUTPUT:
1569 RETVAL
1570
1571int
1572poll_some(int max = 0)
1573 PROTOTYPE: $
1574 CODE:
1575 RETVAL = poll_cb (max);
1355 OUTPUT: 1576 OUTPUT:
1356 RETVAL 1577 RETVAL
1357 1578
1358void 1579void
1359poll_wait() 1580poll_wait()
… …
1368 CODE: 1589 CODE:
1369 RETVAL = nreqs; 1590 RETVAL = nreqs;
1370 OUTPUT: 1591 OUTPUT:
1371 RETVAL 1592 RETVAL
1372 1593
1594int
1595nready()
1596 PROTOTYPE:
1597 CODE:
1598 RETVAL = get_nready ();
1599 OUTPUT:
1600 RETVAL
1601
1602int
1603npending()
1604 PROTOTYPE:
1605 CODE:
1606 RETVAL = get_npending ();
1607 OUTPUT:
1608 RETVAL
1609
1373PROTOTYPES: DISABLE 1610PROTOTYPES: DISABLE
1374 1611
1375MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1612MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1376 1613
1377void 1614void
… …
1419 } 1656 }
1420 } 1657 }
1421} 1658}
1422 1659
1423void 1660void
1661cancel_subs (aio_req_ornot req)
1662 CODE:
1663 req_cancel_subs (req);
1664
1665void
1424result (aio_req grp, ...) 1666result (aio_req grp, ...)
1425 CODE: 1667 CODE:
1426{ 1668{
1427 int i; 1669 int i;
1670 AV *av;
1671
1672 grp->errorno = errno;
1673
1428 AV *av = newAV (); 1674 av = newAV ();
1429 1675
1430 for (i = 1; i < items; ++i ) 1676 for (i = 1; i < items; ++i )
1431 av_push (av, newSVsv (ST (i))); 1677 av_push (av, newSVsv (ST (i)));
1432 1678
1433 SvREFCNT_dec (grp->data); 1679 SvREFCNT_dec (grp->data);
1434 grp->data = (SV *)av; 1680 grp->data = (SV *)av;
1435} 1681}
1682
1683void
1684errno (aio_req grp, int errorno = errno)
1685 CODE:
1686 grp->errorno = errorno;
1436 1687
1437void 1688void
1438limit (aio_req grp, int limit) 1689limit (aio_req grp, int limit)
1439 CODE: 1690 CODE:
1440 grp->fd2 = limit; 1691 grp->fd2 = limit;

Diff Legend

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