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.83 by root, Sat Oct 28 00:17:30 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,
71 REQ_SENDFILE, 93 REQ_SENDFILE,
72 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 94 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
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_MKNOD, 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;
129static int max_outstanding = 1<<30;
130static int respipe [2];
131 150
132#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 151#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
133# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 152# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
134#else 153#else
135# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 154# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
136#endif 155#endif
137 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
138static pthread_mutex_t reslock = AIO_MUTEX_INIT; 204static pthread_mutex_t reslock = AIO_MUTEX_INIT;
139static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 205static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
140static 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
141 238
142/* 239/*
143 * a somewhat faster data structure might be nice, but 240 * a somewhat faster data structure might be nice, but
144 * with 8 priorities this actually needs <20 insns 241 * with 8 priorities this actually needs <20 insns
145 * per shift, the most expensive operation. 242 * per shift, the most expensive operation.
… …
191 } 288 }
192 289
193 abort (); 290 abort ();
194} 291}
195 292
293static int poll_cb (int max);
196static void req_invoke (aio_req req); 294static void req_invoke (aio_req req);
197static void req_free (aio_req req); 295static void req_free (aio_req req);
296static void req_cancel (aio_req req);
198 297
199/* must be called at most once */ 298/* must be called at most once */
200static SV *req_sv (aio_req req, const char *klass) 299static SV *req_sv (aio_req req, const char *klass)
201{ 300{
202 if (!req->self) 301 if (!req->self)
… …
264 req_invoke (grp); 363 req_invoke (grp);
265 req_free (grp); 364 req_free (grp);
266 } 365 }
267} 366}
268 367
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) 368static void req_invoke (aio_req req)
295{ 369{
296 dSP; 370 dSP;
297 371
298 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 372 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
299 { 373 {
300 errno = req->errorno;
301
302 ENTER; 374 ENTER;
303 SAVETMPS; 375 SAVETMPS;
304 PUSHMARK (SP); 376 PUSHMARK (SP);
305 EXTEND (SP, 1); 377 EXTEND (SP, 1);
306 378
… …
310 { 382 {
311 SV *rv = &PL_sv_undef; 383 SV *rv = &PL_sv_undef;
312 384
313 if (req->result >= 0) 385 if (req->result >= 0)
314 { 386 {
387 int i;
315 char *buf = req->data2ptr; 388 char *buf = req->data2ptr;
316 AV *av = newAV (); 389 AV *av = newAV ();
317 390
318 while (req->result) 391 av_extend (av, req->result - 1);
392
393 for (i = 0; i < req->result; ++i)
319 { 394 {
320 SV *sv = newSVpv (buf, 0); 395 SV *sv = newSVpv (buf, 0);
321 396
322 av_push (av, sv); 397 av_store (av, i, sv);
323 buf += SvCUR (sv) + 1; 398 buf += SvCUR (sv) + 1;
324 req->result--;
325 } 399 }
326 400
327 rv = sv_2mortal (newRV_noinc ((SV *)av)); 401 rv = sv_2mortal (newRV_noinc ((SV *)av));
328 } 402 }
329 403
… …
361 PUSHs (*av_fetch (av, i, 0)); 435 PUSHs (*av_fetch (av, i, 0));
362 } 436 }
363 break; 437 break;
364 438
365 case REQ_NOP: 439 case REQ_NOP:
366 case REQ_SLEEP: 440 case REQ_BUSY:
367 break; 441 break;
368 442
369 default: 443 default:
370 PUSHs (sv_2mortal (newSViv (req->result))); 444 PUSHs (sv_2mortal (newSViv (req->result)));
371 break; 445 break;
372 } 446 }
373 447
448 errno = req->errorno;
374 449
375 PUTBACK; 450 PUTBACK;
376 call_sv (req->callback, G_VOID | G_EVAL); 451 call_sv (req->callback, G_VOID | G_EVAL);
377 SPAGAIN; 452 SPAGAIN;
378 453
… …
413 SvREFCNT_dec (req->fh); 488 SvREFCNT_dec (req->fh);
414 SvREFCNT_dec (req->fh2); 489 SvREFCNT_dec (req->fh2);
415 SvREFCNT_dec (req->callback); 490 SvREFCNT_dec (req->callback);
416 Safefree (req->statdata); 491 Safefree (req->statdata);
417 492
418 if (req->type == REQ_READDIR && req->result >= 0) 493 if (req->type == REQ_READDIR)
419 free (req->data2ptr); 494 free (req->data2ptr);
420 495
421 Safefree (req); 496 Safefree (req);
422} 497}
423 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
424static void req_cancel (aio_req req) 513static void req_cancel (aio_req req)
425{ 514{
426 req->flags |= FLAG_CANCELLED; 515 req->flags |= FLAG_CANCELLED;
427 516
428 if (req->type == REQ_GROUP) 517 req_cancel_subs (req);
429 { 518}
430 aio_req sub;
431 519
432 for (sub = req->grp_first; sub; sub = sub->grp_next) 520static void *aio_proc(void *arg);
433 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)
434 } 545 {
435} 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);
436 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
437static int poll_cb () 663static int poll_cb (int max)
438{ 664{
439 dSP; 665 dSP;
440 int count = 0; 666 int count = 0;
441 int do_croak = 0; 667 int do_croak = 0;
442 aio_req req; 668 aio_req req;
443 669
444 for (;;) 670 for (;;)
445 { 671 {
446 pthread_mutex_lock (&reslock); 672 while (max <= 0 || count < max)
447 req = reqq_shift (&res_queue);
448
449 if (req)
450 { 673 {
674 maybe_start_thread ();
675
676 LOCK (reslock);
677 req = reqq_shift (&res_queue);
678
451 if (!res_queue.size) 679 if (req)
452 { 680 {
681 --npending;
682
683 if (!res_queue.size)
684 {
453 /* read any signals sent by the worker threads */ 685 /* read any signals sent by the worker threads */
454 char buf [32]; 686 char buf [32];
455 while (read (respipe [0], buf, 32) == 32) 687 while (read (respipe [0], buf, 32) == 32)
688 ;
456 ; 689 }
457 } 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);
458 } 725 }
459 726
460 pthread_mutex_unlock (&reslock); 727 if (nreqs <= max_outstanding)
461
462 if (!req)
463 break; 728 break;
464 729
465 --nreqs; 730 poll_wait ();
466 731
467 if (req->type == REQ_QUIT) 732 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 } 733 }
496 734
497 return count; 735 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} 736}
582 737
583static void create_pipe () 738static void create_pipe ()
584{ 739{
585 if (pipe (respipe)) 740 if (pipe (respipe))
… …
609static 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)
610{ 765{
611 ssize_t res; 766 ssize_t res;
612 off_t ooffset; 767 off_t ooffset;
613 768
614 pthread_mutex_lock (&preadwritelock); 769 LOCK (preadwritelock);
615 ooffset = lseek (fd, 0, SEEK_CUR); 770 ooffset = lseek (fd, 0, SEEK_CUR);
616 lseek (fd, offset, SEEK_SET); 771 lseek (fd, offset, SEEK_SET);
617 res = read (fd, buf, count); 772 res = read (fd, buf, count);
618 lseek (fd, ooffset, SEEK_SET); 773 lseek (fd, ooffset, SEEK_SET);
619 pthread_mutex_unlock (&preadwritelock); 774 UNLOCK (preadwritelock);
620 775
621 return res; 776 return res;
622} 777}
623 778
624static 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)
625{ 780{
626 ssize_t res; 781 ssize_t res;
627 off_t ooffset; 782 off_t ooffset;
628 783
629 pthread_mutex_lock (&preadwritelock); 784 LOCK (preadwritelock);
630 ooffset = lseek (fd, 0, SEEK_CUR); 785 ooffset = lseek (fd, 0, SEEK_CUR);
631 lseek (fd, offset, SEEK_SET); 786 lseek (fd, offset, SEEK_SET);
632 res = write (fd, buf, count); 787 res = write (fd, buf, count);
633 lseek (fd, offset, SEEK_SET); 788 lseek (fd, offset, SEEK_SET);
634 pthread_mutex_unlock (&preadwritelock); 789 UNLOCK (preadwritelock);
635 790
636 return res; 791 return res;
637} 792}
638#endif 793#endif
639 794
640#if !HAVE_FDATASYNC 795#if !HAVE_FDATASYNC
641# define fdatasync fsync 796# define fdatasync fsync
642#endif 797#endif
643 798
644#if !HAVE_READAHEAD 799#if !HAVE_READAHEAD
645# define readahead aio_readahead 800# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
646 801
647static 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)
648{ 803{
649 dBUF; 804 dBUF;
650 805
651 while (count > 0) 806 while (count > 0)
652 { 807 {
… …
655 pread (fd, aio_buf, len, offset); 810 pread (fd, aio_buf, len, offset);
656 offset += len; 811 offset += len;
657 count -= len; 812 count -= len;
658 } 813 }
659 814
660 fBUF;
661
662 errno = 0; 815 errno = 0;
663} 816}
817
664#endif 818#endif
665 819
666#if !HAVE_READDIR_R 820#if !HAVE_READDIR_R
667# define readdir_r aio_readdir_r 821# define readdir_r aio_readdir_r
668 822
… …
671static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 825static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
672{ 826{
673 struct dirent *e; 827 struct dirent *e;
674 int errorno; 828 int errorno;
675 829
676 pthread_mutex_lock (&readdirlock); 830 LOCK (readdirlock);
677 831
678 e = readdir (dirp); 832 e = readdir (dirp);
679 errorno = errno; 833 errorno = errno;
680 834
681 if (e) 835 if (e)
… …
684 strcpy (ent->d_name, e->d_name); 838 strcpy (ent->d_name, e->d_name);
685 } 839 }
686 else 840 else
687 *res = 0; 841 *res = 0;
688 842
689 pthread_mutex_unlock (&readdirlock); 843 UNLOCK (readdirlock);
690 844
691 errno = errorno; 845 errno = errorno;
692 return e ? 0 : -1; 846 return e ? 0 : -1;
693} 847}
694#endif 848#endif
695 849
696/* sendfile always needs emulation */ 850/* sendfile always needs emulation */
697static 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)
698{ 852{
699 ssize_t res; 853 ssize_t res;
700 854
701 if (!count) 855 if (!count)
702 return 0; 856 return 0;
… …
713 { 867 {
714 off_t sbytes; 868 off_t sbytes;
715 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 869 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
716 870
717 if (res < 0 && sbytes) 871 if (res < 0 && sbytes)
718 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 872 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
719 res = sbytes; 873 res = sbytes;
720 } 874 }
721 875
722# elif __hpux 876# elif __hpux
723 res = sendfile (ofd, ifd, offset, count, 0, 0); 877 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
779 933
780 offset += cnt; 934 offset += cnt;
781 res += cnt; 935 res += cnt;
782 count -= cnt; 936 count -= cnt;
783 } 937 }
784
785 fBUF;
786 } 938 }
787 939
788 return res; 940 return res;
789} 941}
790 942
791/* read a full directory */ 943/* read a full directory */
792static int scandir_ (const char *path, void **namesp) 944static void scandir_ (aio_req req, worker *self)
793{ 945{
794 DIR *dirp; 946 DIR *dirp;
795 union 947 union
796 { 948 {
797 struct dirent d; 949 struct dirent d;
… …
802 int memlen = 4096; 954 int memlen = 4096;
803 int memofs = 0; 955 int memofs = 0;
804 int res = 0; 956 int res = 0;
805 int errorno; 957 int errorno;
806 958
807 dirp = opendir (path); 959 LOCK (wrklock);
808 if (!dirp) 960 self->dirp = dirp = opendir (req->dataptr);
809 return -1;
810
811 u = malloc (sizeof (*u)); 961 self->dbuf = u = malloc (sizeof (*u));
812 names = malloc (memlen); 962 req->data2ptr = names = malloc (memlen);
963 UNLOCK (wrklock);
813 964
814 if (u && names) 965 if (dirp && u && names)
815 for (;;) 966 for (;;)
816 { 967 {
817 errno = 0; 968 errno = 0;
818 readdir_r (dirp, &u->d, &entp); 969 readdir_r (dirp, &u->d, &entp);
819 970
… …
829 res++; 980 res++;
830 981
831 while (memofs + len > memlen) 982 while (memofs + len > memlen)
832 { 983 {
833 memlen *= 2; 984 memlen *= 2;
985 LOCK (wrklock);
834 names = realloc (names, memlen); 986 req->data2ptr = names = realloc (names, memlen);
987 UNLOCK (wrklock);
988
835 if (!names) 989 if (!names)
836 break; 990 break;
837 } 991 }
838 992
839 memcpy (names + memofs, name, len); 993 memcpy (names + memofs, name, len);
840 memofs += len; 994 memofs += len;
841 } 995 }
842 } 996 }
843 997
844 errorno = errno;
845 free (u);
846 closedir (dirp);
847
848 if (errorno) 998 if (errno)
849 {
850 free (names);
851 errno = errorno;
852 res = -1; 999 res = -1;
853 } 1000
854 1001 req->result = res;
855 *namesp = (void *)names;
856 return res;
857} 1002}
858 1003
859/*****************************************************************************/ 1004/*****************************************************************************/
860 1005
861static void *aio_proc (void *thr_arg) 1006static void *aio_proc (void *thr_arg)
862{ 1007{
863 aio_req req; 1008 aio_req req;
864 int type; 1009 worker *self = (worker *)thr_arg;
865 1010
866 do 1011 for (;;)
867 { 1012 {
868 pthread_mutex_lock (&reqlock); 1013 LOCK (reqlock);
869 1014
870 for (;;) 1015 for (;;)
871 { 1016 {
872 req = reqq_shift (&req_queue); 1017 self->req = req = reqq_shift (&req_queue);
873 1018
874 if (req) 1019 if (req)
875 break; 1020 break;
876 1021
877 pthread_cond_wait (&reqwait, &reqlock); 1022 pthread_cond_wait (&reqwait, &reqlock);
878 } 1023 }
879 1024
880 pthread_mutex_unlock (&reqlock); 1025 --nready;
1026
1027 UNLOCK (reqlock);
881 1028
882 errno = 0; /* strictly unnecessary */ 1029 errno = 0; /* strictly unnecessary */
883 type = req->type; /* remember type for QUIT check */
884 1030
885 if (!(req->flags & FLAG_CANCELLED)) 1031 if (!(req->flags & FLAG_CANCELLED))
886 switch (type) 1032 switch (req->type)
887 { 1033 {
888 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;
889 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;
890 1036
891 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;
892 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;
893 1039
894 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1040 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
895 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1041 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
896 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1042 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
897 1043
… …
900 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1046 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
901 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1047 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
902 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1048 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
903 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1049 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
904 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;
905 1052
906 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1053 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
907 case REQ_FSYNC: req->result = fsync (req->fd); break; 1054 case REQ_FSYNC: req->result = fsync (req->fd); break;
908 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1055 case REQ_READDIR: scandir_ (req, self); break;
909 1056
910 case REQ_SLEEP: 1057 case REQ_BUSY:
911 { 1058 {
912 struct timeval tv; 1059 struct timeval tv;
913 1060
914 tv.tv_sec = req->fd; 1061 tv.tv_sec = req->fd;
915 tv.tv_usec = req->fd2; 1062 tv.tv_usec = req->fd2;
… …
917 req->result = select (0, 0, 0, 0, &tv); 1064 req->result = select (0, 0, 0, 0, &tv);
918 } 1065 }
919 1066
920 case REQ_GROUP: 1067 case REQ_GROUP:
921 case REQ_NOP: 1068 case REQ_NOP:
1069 break;
1070
922 case REQ_QUIT: 1071 case REQ_QUIT:
1072 LOCK (wrklock);
1073 worker_free (self);
1074 --started;
1075 UNLOCK (wrklock);
923 break; 1076 return 0;
924 1077
925 default: 1078 default:
926 req->result = ENOSYS; 1079 req->result = ENOSYS;
927 break; 1080 break;
928 } 1081 }
929 1082
930 req->errorno = errno; 1083 req->errorno = errno;
931 1084
932 pthread_mutex_lock (&reslock); 1085 LOCK (reslock);
1086
1087 ++npending;
933 1088
934 if (!reqq_push (&res_queue, req)) 1089 if (!reqq_push (&res_queue, req))
935 /* write a dummy byte to the pipe so fh becomes ready */ 1090 /* write a dummy byte to the pipe so fh becomes ready */
936 write (respipe [1], &respipe, 1); 1091 write (respipe [1], &respipe, 1);
937 1092
938 pthread_mutex_unlock (&reslock); 1093 self->req = 0;
939 } 1094 worker_clear (self);
940 while (type != REQ_QUIT);
941 1095
942 return 0; 1096 UNLOCK (reslock);
1097 }
943} 1098}
944 1099
945/*****************************************************************************/ 1100/*****************************************************************************/
946 1101
947static void atfork_prepare (void) 1102static void atfork_prepare (void)
948{ 1103{
949 pthread_mutex_lock (&reqlock); 1104 LOCK (wrklock);
950 pthread_mutex_lock (&reslock); 1105 LOCK (reqlock);
1106 LOCK (reslock);
951#if !HAVE_PREADWRITE 1107#if !HAVE_PREADWRITE
952 pthread_mutex_lock (&preadwritelock); 1108 LOCK (preadwritelock);
953#endif 1109#endif
954#if !HAVE_READDIR_R 1110#if !HAVE_READDIR_R
955 pthread_mutex_lock (&readdirlock); 1111 LOCK (readdirlock);
956#endif 1112#endif
957} 1113}
958 1114
959static void atfork_parent (void) 1115static void atfork_parent (void)
960{ 1116{
961#if !HAVE_READDIR_R 1117#if !HAVE_READDIR_R
962 pthread_mutex_unlock (&readdirlock); 1118 UNLOCK (readdirlock);
963#endif 1119#endif
964#if !HAVE_PREADWRITE 1120#if !HAVE_PREADWRITE
965 pthread_mutex_unlock (&preadwritelock); 1121 UNLOCK (preadwritelock);
966#endif 1122#endif
967 pthread_mutex_unlock (&reslock); 1123 UNLOCK (reslock);
968 pthread_mutex_unlock (&reqlock); 1124 UNLOCK (reqlock);
1125 UNLOCK (wrklock);
969} 1126}
970 1127
971static void atfork_child (void) 1128static void atfork_child (void)
972{ 1129{
973 aio_req prv; 1130 aio_req prv;
974
975 started = 0;
976 1131
977 while (prv = reqq_shift (&req_queue)) 1132 while (prv = reqq_shift (&req_queue))
978 req_free (prv); 1133 req_free (prv);
979 1134
980 while (prv = reqq_shift (&res_queue)) 1135 while (prv = reqq_shift (&res_queue))
981 req_free (prv); 1136 req_free (prv);
982 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
983 close (respipe [0]); 1152 close (respipe [0]);
984 close (respipe [1]); 1153 close (respipe [1]);
985 create_pipe (); 1154 create_pipe ();
986 1155
987 atfork_parent (); 1156 atfork_parent ();
… …
1013PROTOTYPES: ENABLE 1182PROTOTYPES: ENABLE
1014 1183
1015BOOT: 1184BOOT:
1016{ 1185{
1017 HV *stash = gv_stashpv ("IO::AIO", 1); 1186 HV *stash = gv_stashpv ("IO::AIO", 1);
1187
1018 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1188 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1019 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1189 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1020 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));
1021 1194
1022 create_pipe (); 1195 create_pipe ();
1023 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1196 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1024}
1025 1197
1198 start_thread ();
1199}
1200
1026void 1201void
1027min_parallel (nthreads) 1202min_parallel (int nthreads)
1028 int nthreads
1029 PROTOTYPE: $ 1203 PROTOTYPE: $
1030 1204
1031void 1205void
1032max_parallel (nthreads) 1206max_parallel (int nthreads)
1033 int nthreads
1034 PROTOTYPE: $ 1207 PROTOTYPE: $
1035 1208
1036int 1209int
1037max_outstanding (nreqs) 1210max_outstanding (int maxreqs)
1038 int nreqs 1211 PROTOTYPE: $
1039 PROTOTYPE: $
1040 CODE: 1212 CODE:
1041 RETVAL = max_outstanding; 1213 RETVAL = max_outstanding;
1042 max_outstanding = nreqs; 1214 max_outstanding = maxreqs;
1215 OUTPUT:
1216 RETVAL
1043 1217
1044void 1218void
1045aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1219aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1046 SV * pathname 1220 SV * pathname
1047 int flags 1221 int flags
… …
1262 1436
1263 REQ_SEND; 1437 REQ_SEND;
1264} 1438}
1265 1439
1266void 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
1267aio_sleep (delay,callback=&PL_sv_undef) 1460aio_busy (delay,callback=&PL_sv_undef)
1268 double delay 1461 double delay
1269 SV * callback 1462 SV * callback
1270 PPCODE: 1463 PPCODE:
1271{ 1464{
1272 dREQ; 1465 dREQ;
1273 1466
1274 req->type = REQ_SLEEP; 1467 req->type = REQ_BUSY;
1275 req->fd = delay < 0. ? 0 : delay; 1468 req->fd = delay < 0. ? 0 : delay;
1276 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1469 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1277 1470
1278 REQ_SEND; 1471 REQ_SEND;
1279} 1472}
… …
1302 req->type = REQ_NOP; 1495 req->type = REQ_NOP;
1303 1496
1304 REQ_SEND; 1497 REQ_SEND;
1305} 1498}
1306 1499
1307void 1500int
1308aioreq_pri (int pri = DEFAULT_PRI) 1501aioreq_pri (int pri = 0)
1502 PROTOTYPE: ;$
1309 CODE: 1503 CODE:
1504 RETVAL = next_pri - PRI_BIAS;
1505 if (items > 0)
1506 {
1310 if (pri < PRI_MIN) pri = PRI_MIN; 1507 if (pri < PRI_MIN) pri = PRI_MIN;
1311 if (pri > PRI_MAX) pri = PRI_MAX; 1508 if (pri > PRI_MAX) pri = PRI_MAX;
1312 next_pri = pri + PRI_BIAS; 1509 next_pri = pri + PRI_BIAS;
1510 }
1511 OUTPUT:
1512 RETVAL
1513
1514void
1515aioreq_nice (int nice = 0)
1516 CODE:
1517 nice = next_pri - nice;
1518 if (nice < PRI_MIN) nice = PRI_MIN;
1519 if (nice > PRI_MAX) nice = PRI_MAX;
1520 next_pri = nice + PRI_BIAS;
1313 1521
1314void 1522void
1315flush () 1523flush ()
1316 PROTOTYPE: 1524 PROTOTYPE:
1317 CODE: 1525 CODE:
1318 while (nreqs) 1526 while (nreqs)
1319 { 1527 {
1320 poll_wait (); 1528 poll_wait ();
1321 poll_cb (); 1529 poll_cb (0);
1322 } 1530 }
1323 1531
1324void 1532void
1325poll() 1533poll()
1326 PROTOTYPE: 1534 PROTOTYPE:
1327 CODE: 1535 CODE:
1328 if (nreqs) 1536 if (nreqs)
1329 { 1537 {
1330 poll_wait (); 1538 poll_wait ();
1331 poll_cb (); 1539 poll_cb (0);
1332 } 1540 }
1333 1541
1334int 1542int
1335poll_fileno() 1543poll_fileno()
1336 PROTOTYPE: 1544 PROTOTYPE:
… …
1341 1549
1342int 1550int
1343poll_cb(...) 1551poll_cb(...)
1344 PROTOTYPE: 1552 PROTOTYPE:
1345 CODE: 1553 CODE:
1346 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);
1347 OUTPUT: 1563 OUTPUT:
1348 RETVAL 1564 RETVAL
1349 1565
1350void 1566void
1351poll_wait() 1567poll_wait()
… …
1360 CODE: 1576 CODE:
1361 RETVAL = nreqs; 1577 RETVAL = nreqs;
1362 OUTPUT: 1578 OUTPUT:
1363 RETVAL 1579 RETVAL
1364 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
1365PROTOTYPES: DISABLE 1597PROTOTYPES: DISABLE
1366 1598
1367MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1599MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1368 1600
1369void 1601void
… …
1411 } 1643 }
1412 } 1644 }
1413} 1645}
1414 1646
1415void 1647void
1648cancel_subs (aio_req_ornot req)
1649 CODE:
1650 req_cancel_subs (req);
1651
1652void
1416result (aio_req grp, ...) 1653result (aio_req grp, ...)
1417 CODE: 1654 CODE:
1418{ 1655{
1419 int i; 1656 int i;
1657 AV *av;
1658
1659 grp->errorno = errno;
1660
1420 AV *av = newAV (); 1661 av = newAV ();
1421 1662
1422 for (i = 1; i < items; ++i ) 1663 for (i = 1; i < items; ++i )
1423 av_push (av, newSVsv (ST (i))); 1664 av_push (av, newSVsv (ST (i)));
1424 1665
1425 SvREFCNT_dec (grp->data); 1666 SvREFCNT_dec (grp->data);
1426 grp->data = (SV *)av; 1667 grp->data = (SV *)av;
1427} 1668}
1669
1670void
1671errno (aio_req grp, int errorno = errno)
1672 CODE:
1673 grp->errorno = errorno;
1428 1674
1429void 1675void
1430limit (aio_req grp, int limit) 1676limit (aio_req grp, int limit)
1431 CODE: 1677 CODE:
1432 grp->fd2 = limit; 1678 grp->fd2 = limit;

Diff Legend

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