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.86 by root, Mon Oct 30 23:30:00 2006 UTC vs.
Revision 1.98 by root, Wed May 9 06:45:12 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h" 9#include "autoconf/config.h"
18 10
19#include <pthread.h>
20
21#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
22#include <errno.h> 13#include <errno.h>
23#include <sys/time.h> 14#include <sys/time.h>
24#include <sys/select.h> 15#include <sys/select.h>
25#include <sys/types.h> 16#include <sys/types.h>
26#include <sys/stat.h> 17#include <sys/stat.h>
… …
51/* used for struct dirent, AIX doesn't provide it */ 42/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 43#ifndef NAME_MAX
53# define NAME_MAX 4096 44# define NAME_MAX 4096
54#endif 45#endif
55 46
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
61#if __ia64
62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
65#else
66# define STACKSIZE 16384
67#endif
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 WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */ 47/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 48#define AIO_BUFSIZE 65536
83 49
84#define dBUF \ 50#define dBUF \
85 char *aio_buf; \ 51 char *aio_buf; \
… …
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 53 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 54 UNLOCK (wrklock); \
89 if (!aio_buf) \ 55 if (!aio_buf) \
90 return -1; 56 return -1;
91 57
58typedef SV SV8; /* byte-sv, used for argument-checking */
59
92enum { 60enum {
93 REQ_QUIT, 61 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 62 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 63 REQ_READ, REQ_WRITE, REQ_READAHEAD,
96 REQ_SENDFILE, 64 REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 65 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
98 REQ_FSYNC, REQ_FDATASYNC, 66 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 67 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 68 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, REQ_READLINK, 69 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 70 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 71 REQ_BUSY,
104}; 72};
… …
111 struct aio_cb *volatile next; 79 struct aio_cb *volatile next;
112 80
113 SV *callback, *fh; 81 SV *callback, *fh;
114 SV *sv1, *sv2; 82 SV *sv1, *sv2;
115 void *ptr1, *ptr2; 83 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offs; 84 off_t offs;
118 size_t size; 85 size_t size;
119 ssize_t result; 86 ssize_t result;
120 87
121 STRLEN stroffset; 88 STRLEN stroffset;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 97 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 98 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 99} aio_cb;
133 100
134enum { 101enum {
135 FLAG_CANCELLED = 0x01, 102 FLAG_CANCELLED = 0x01, /* request was cancelled */
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */ 103 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
104 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
137}; 105};
138 106
139typedef aio_cb *aio_req; 107typedef aio_cb *aio_req;
140typedef aio_cb *aio_req_ornot; 108typedef aio_cb *aio_req_ornot;
141 109
… …
158{ 126{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 127 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 128 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161} 129}
162 130
131static thread_t main_tid;
132static int main_sig;
133static int block_sig_level;
134
135void block_sig ()
136{
137 sigset_t ss;
138
139 if (block_sig_level++)
140 return;
141
142 if (!main_sig)
143 return;
144
145 sigemptyset (&ss);
146 sigaddset (&ss, main_sig);
147 pthread_sigmask (SIG_BLOCK, &ss, 0);
148}
149
150void unblock_sig ()
151{
152 sigset_t ss;
153
154 if (--block_sig_level)
155 return;
156
157 if (!main_sig)
158 return;
159
160 sigemptyset (&ss);
161 sigaddset (&ss, main_sig);
162 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
163}
164
163static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
164 166
165static unsigned int started, idle, wanted; 167static unsigned int started, idle, wanted;
166 168
167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
169#else
170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
171#endif
172
173#define LOCK(mutex) pthread_mutex_lock (&(mutex))
174#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
175
176/* worker threads management */ 169/* worker threads management */
177static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 170static mutex_t wrklock = MUTEX_INIT;
178 171
179typedef struct worker { 172typedef struct worker {
180 /* locked by wrklock */ 173 /* locked by wrklock */
181 struct worker *prev, *next; 174 struct worker *prev, *next;
182 175
183 pthread_t tid; 176 thread_t tid;
184 177
185 /* locked by reslock, reqlock or wrklock */ 178 /* locked by reslock, reqlock or wrklock */
186 aio_req req; /* currently processed request */ 179 aio_req req; /* currently processed request */
187 void *dbuf; 180 void *dbuf;
188 DIR *dirp; 181 DIR *dirp;
… …
216static volatile unsigned int nreqs, nready, npending; 209static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4; 210static volatile unsigned int max_idle = 4;
218static volatile unsigned int max_outstanding = 0xffffffff; 211static volatile unsigned int max_outstanding = 0xffffffff;
219static int respipe [2]; 212static int respipe [2];
220 213
221static pthread_mutex_t reslock = AIO_MUTEX_INIT; 214static mutex_t reslock = MUTEX_INIT;
222static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 215static mutex_t reqlock = MUTEX_INIT;
223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 216static cond_t reqwait = COND_INIT;
224 217
225#if WORDACCESS_UNSAFE 218#if WORDACCESS_UNSAFE
226 219
227static unsigned int get_nready () 220static unsigned int get_nready ()
228{ 221{
… …
318 311
319 abort (); 312 abort ();
320} 313}
321 314
322static int poll_cb (); 315static int poll_cb ();
323static void req_invoke (aio_req req); 316static int req_invoke (aio_req req);
324static void req_free (aio_req req); 317static void req_free (aio_req req);
325static void req_cancel (aio_req req); 318static void req_cancel (aio_req req);
326 319
327/* must be called at most once */ 320/* must be called at most once */
328static SV *req_sv (aio_req req, const char *klass) 321static SV *req_sv (aio_req req, const char *klass)
… …
348 return mg ? (aio_req)mg->mg_ptr : 0; 341 return mg ? (aio_req)mg->mg_ptr : 0;
349} 342}
350 343
351static void aio_grp_feed (aio_req grp) 344static void aio_grp_feed (aio_req grp)
352{ 345{
346 block_sig ();
347
353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED)) 348 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
354 { 349 {
355 int old_len = grp->size; 350 int old_len = grp->size;
356 351
357 if (grp->sv2 && SvOK (grp->sv2)) 352 if (grp->sv2 && SvOK (grp->sv2))
… …
375 SvREFCNT_dec (grp->sv2); 370 SvREFCNT_dec (grp->sv2);
376 grp->sv2 = 0; 371 grp->sv2 = 0;
377 break; 372 break;
378 } 373 }
379 } 374 }
375
376 unblock_sig ();
380} 377}
381 378
382static void aio_grp_dec (aio_req grp) 379static void aio_grp_dec (aio_req grp)
383{ 380{
384 --grp->size; 381 --grp->size;
… …
387 aio_grp_feed (grp); 384 aio_grp_feed (grp);
388 385
389 /* finish, if done */ 386 /* finish, if done */
390 if (!grp->size && grp->int1) 387 if (!grp->size && grp->int1)
391 { 388 {
389 block_sig ();
390
392 req_invoke (grp); 391 if (!req_invoke (grp))
392 {
393 req_free (grp);
394 unblock_sig ();
395 croak (0);
396 }
397
393 req_free (grp); 398 req_free (grp);
399 unblock_sig ();
394 } 400 }
395} 401}
396 402
397static void req_invoke (aio_req req) 403static int req_invoke (aio_req req)
398{ 404{
399 dSP; 405 dSP;
400 406
401 if (req->flags & FLAG_DATA_RO_OFF) 407 if (req->flags & FLAG_SV1_RO_OFF)
402 SvREADONLY_off (req->sv1); 408 SvREADONLY_off (req->sv1);
403
404 if (req->statdata)
405 {
406 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
407 PL_laststatval = req->result;
408 PL_statcache = *(req->statdata);
409 }
410 409
411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 410 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
412 { 411 {
413 ENTER; 412 ENTER;
414 SAVETMPS; 413 SAVETMPS;
… …
452 PUSHs (sv_2mortal (newSViv (req->result))); 451 PUSHs (sv_2mortal (newSViv (req->result)));
453 PUTBACK; 452 PUTBACK;
454 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 453 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
455 SPAGAIN; 454 SPAGAIN;
456 455
457 fh = SvREFCNT_inc (POPs); 456 fh = POPs;
458
459 PUSHMARK (SP); 457 PUSHMARK (SP);
460 XPUSHs (sv_2mortal (fh)); 458 XPUSHs (fh);
461 } 459 }
462 break; 460 break;
463 461
464 case REQ_GROUP: 462 case REQ_GROUP:
465 req->int1 = 2; /* mark group as finished */ 463 req->int1 = 2; /* mark group as finished */
… …
486 *SvEND (req->sv1) = 0; 484 *SvEND (req->sv1) = 0;
487 PUSHs (req->sv1); 485 PUSHs (req->sv1);
488 } 486 }
489 break; 487 break;
490 488
489 case REQ_STAT:
490 case REQ_LSTAT:
491 case REQ_FSTAT:
492 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
493 PL_laststatval = req->result;
494 PL_statcache = *(Stat_t *)(req->ptr2);
495 PUSHs (sv_2mortal (newSViv (req->result)));
496 break;
497
491 case REQ_READ: 498 case REQ_READ:
492 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); 499 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
493 *SvEND (req->sv1) = 0; 500 *SvEND (req->sv1) = 0;
494 /* fall through */ 501 PUSHs (sv_2mortal (newSViv (req->result)));
502 break;
503
495 default: 504 default:
496 PUSHs (sv_2mortal (newSViv (req->result))); 505 PUSHs (sv_2mortal (newSViv (req->result)));
497 break; 506 break;
498 } 507 }
499 508
… …
519 grp->grp_first = req->grp_next; 528 grp->grp_first = req->grp_next;
520 529
521 aio_grp_dec (grp); 530 aio_grp_dec (grp);
522 } 531 }
523 532
524 if (SvTRUE (ERRSV)) 533 return !SvTRUE (ERRSV);
525 {
526 req_free (req);
527 croak (0);
528 }
529} 534}
530 535
531static void req_free (aio_req req) 536static void req_free (aio_req req)
532{ 537{
533 if (req->self) 538 if (req->self)
… …
538 543
539 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1); 545 SvREFCNT_dec (req->sv1);
541 SvREFCNT_dec (req->sv2); 546 SvREFCNT_dec (req->sv2);
542 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
543 Safefree (req->statdata);
544 548
545 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
546 free (req->ptr2); 550 free (req->ptr2);
547 551
548 Safefree (req); 552 Safefree (req);
549} 553}
550 554
… …
571 575
572static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
573 577
574static void start_thread (void) 578static void start_thread (void)
575{ 579{
576 sigset_t fullsigset, oldsigset;
577 pthread_attr_t attr;
578
579 worker *wrk = calloc (1, sizeof (worker)); 580 worker *wrk = calloc (1, sizeof (worker));
580 581
581 if (!wrk) 582 if (!wrk)
582 croak ("unable to allocate worker thread data"); 583 croak ("unable to allocate worker thread data");
583 584
584 pthread_attr_init (&attr);
585 pthread_attr_setstacksize (&attr, STACKSIZE);
586 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
587#ifdef PTHREAD_SCOPE_PROCESS
588 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
589#endif
590
591 sigfillset (&fullsigset);
592
593 LOCK (wrklock); 585 LOCK (wrklock);
594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
595 586
596 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 587 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
597 { 588 {
598 wrk->prev = &wrk_first; 589 wrk->prev = &wrk_first;
599 wrk->next = wrk_first.next; 590 wrk->next = wrk_first.next;
600 wrk_first.next->prev = wrk; 591 wrk_first.next->prev = wrk;
601 wrk_first.next = wrk; 592 wrk_first.next = wrk;
602 ++started; 593 ++started;
603 } 594 }
604 else 595 else
605 free (wrk); 596 free (wrk);
606 597
607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock); 598 UNLOCK (wrklock);
609} 599}
610 600
611static void maybe_start_thread () 601static void maybe_start_thread ()
612{ 602{
… …
620 start_thread (); 610 start_thread ();
621} 611}
622 612
623static void req_send (aio_req req) 613static void req_send (aio_req req)
624{ 614{
615 block_sig ();
616
625 ++nreqs; 617 ++nreqs;
626 618
627 LOCK (reqlock); 619 LOCK (reqlock);
628 ++nready; 620 ++nready;
629 reqq_push (&req_queue, req); 621 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait); 622 COND_SIGNAL (reqwait);
631 UNLOCK (reqlock); 623 UNLOCK (reqlock);
624
625 unblock_sig ();
632 626
633 maybe_start_thread (); 627 maybe_start_thread ();
634} 628}
635 629
636static void end_thread (void) 630static void end_thread (void)
… …
642 req->type = REQ_QUIT; 636 req->type = REQ_QUIT;
643 req->pri = PRI_MAX + PRI_BIAS; 637 req->pri = PRI_MAX + PRI_BIAS;
644 638
645 LOCK (reqlock); 639 LOCK (reqlock);
646 reqq_push (&req_queue, req); 640 reqq_push (&req_queue, req);
647 pthread_cond_signal (&reqwait); 641 COND_SIGNAL (reqwait);
648 UNLOCK (reqlock); 642 UNLOCK (reqlock);
649 643
650 LOCK (wrklock); 644 LOCK (wrklock);
651 --started; 645 --started;
652 UNLOCK (wrklock); 646 UNLOCK (wrklock);
… …
707 aio_req req; 701 aio_req req;
708 702
709 if (max_poll_time) 703 if (max_poll_time)
710 gettimeofday (&tv_start, 0); 704 gettimeofday (&tv_start, 0);
711 705
706 block_sig ();
707
712 for (;;) 708 for (;;)
713 { 709 {
714 for (;;) 710 for (;;)
715 { 711 {
716 maybe_start_thread (); 712 maybe_start_thread ();
… …
723 --npending; 719 --npending;
724 720
725 if (!res_queue.size) 721 if (!res_queue.size)
726 { 722 {
727 /* read any signals sent by the worker threads */ 723 /* read any signals sent by the worker threads */
728 char buf [32]; 724 char buf [4];
729 while (read (respipe [0], buf, 32) == 32) 725 while (read (respipe [0], buf, 4) == 4)
730 ; 726 ;
731 } 727 }
732 } 728 }
733 729
734 UNLOCK (reslock); 730 UNLOCK (reslock);
… …
743 req->int1 = 1; /* mark request as delayed */ 739 req->int1 = 1; /* mark request as delayed */
744 continue; 740 continue;
745 } 741 }
746 else 742 else
747 { 743 {
748 req_invoke (req); 744 if (!req_invoke (req))
745 {
746 req_free (req);
747 unblock_sig ();
748 croak (0);
749 }
749 750
750 count++; 751 count++;
751 } 752 }
752 753
753 req_free (req); 754 req_free (req);
… …
770 poll_wait (); 771 poll_wait ();
771 772
772 ++maxreqs; 773 ++maxreqs;
773 } 774 }
774 775
776 unblock_sig ();
775 return count; 777 return count;
776} 778}
777 779
778static void create_pipe () 780static void create_pipe ()
779{ 781{
… …
797/* 799/*
798 * make our pread/pwrite safe against themselves, but not against 800 * make our pread/pwrite safe against themselves, but not against
799 * normal read/write by using a mutex. slows down execution a lot, 801 * normal read/write by using a mutex. slows down execution a lot,
800 * but that's your problem, not mine. 802 * but that's your problem, not mine.
801 */ 803 */
802static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 804static mutex_t preadwritelock = MUTEX_INIT;
803 805
804static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 806static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
805{ 807{
806 ssize_t res; 808 ssize_t res;
807 off_t ooffset; 809 off_t ooffset;
… …
858#endif 860#endif
859 861
860#if !HAVE_READDIR_R 862#if !HAVE_READDIR_R
861# define readdir_r aio_readdir_r 863# define readdir_r aio_readdir_r
862 864
863static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 865static mutex_t readdirlock = MUTEX_INIT;
864 866
865static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 867static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
866{ 868{
867 struct dirent *e; 869 struct dirent *e;
868 int errorno; 870 int errorno;
… …
997 int errorno; 999 int errorno;
998 1000
999 LOCK (wrklock); 1001 LOCK (wrklock);
1000 self->dirp = dirp = opendir (req->ptr1); 1002 self->dirp = dirp = opendir (req->ptr1);
1001 self->dbuf = u = malloc (sizeof (*u)); 1003 self->dbuf = u = malloc (sizeof (*u));
1004 req->flags |= FLAG_PTR2_FREE;
1002 req->ptr2 = names = malloc (memlen); 1005 req->ptr2 = names = malloc (memlen);
1003 UNLOCK (wrklock); 1006 UNLOCK (wrklock);
1004 1007
1005 if (dirp && u && names) 1008 if (dirp && u && names)
1006 for (;;) 1009 for (;;)
… …
1066 if (req) 1069 if (req)
1067 break; 1070 break;
1068 1071
1069 ++idle; 1072 ++idle;
1070 1073
1071 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1074 if (COND_TIMEDWAIT (reqwait, reqlock, ts)
1072 == ETIMEDOUT) 1075 == ETIMEDOUT)
1073 { 1076 {
1074 if (idle > max_idle) 1077 if (idle > max_idle)
1075 { 1078 {
1076 --idle; 1079 --idle;
… …
1080 UNLOCK (wrklock); 1083 UNLOCK (wrklock);
1081 goto quit; 1084 goto quit;
1082 } 1085 }
1083 1086
1084 /* we are allowed to idle, so do so without any timeout */ 1087 /* we are allowed to idle, so do so without any timeout */
1085 pthread_cond_wait (&reqwait, &reqlock); 1088 COND_WAIT (reqwait, reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1089 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 } 1090 }
1088 1091
1089 --idle; 1092 --idle;
1090 } 1093 }
… …
1102 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; 1105 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1103 1106
1104 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1107 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1105 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break; 1108 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1106 1109
1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break; 1110 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break; 1111 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break; 1112 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1110 1113
1111 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1114 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1112 case REQ_CLOSE: req->result = close (req->int1); break; 1115 case REQ_CLOSE: req->result = close (req->int1); break;
1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1116 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1117 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1118 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1117 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1118 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; 1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1119 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; 1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
… …
1149 LOCK (reslock); 1153 LOCK (reslock);
1150 1154
1151 ++npending; 1155 ++npending;
1152 1156
1153 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
1158 {
1154 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
1155 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
1161
1162 /* optionally signal the main thread asynchronously */
1163 if (main_sig)
1164 pthread_kill (main_tid, main_sig);
1165 }
1156 1166
1157 self->req = 0; 1167 self->req = 0;
1158 worker_clear (self); 1168 worker_clear (self);
1159 1169
1160 UNLOCK (reslock); 1170 UNLOCK (reslock);
… …
1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1273 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1264 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1274 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1265 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1275 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1266 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1276 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1267 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1277 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1278 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1268 1279
1269 create_pipe (); 1280 create_pipe ();
1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1281 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1271} 1282}
1272 1283
1273void 1284void
1274max_poll_reqs (int nreqs) 1285max_poll_reqs (int nreqs)
1275 PROTOTYPE: $ 1286 PROTOTYPE: $
… …
1305 OUTPUT: 1316 OUTPUT:
1306 RETVAL 1317 RETVAL
1307 1318
1308void 1319void
1309aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1320aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1310 SV * pathname 1321 SV8 * pathname
1311 int flags 1322 int flags
1312 int mode 1323 int mode
1313 SV * callback 1324 SV * callback
1314 PROTOTYPE: $$$;$ 1325 PROTOTYPE: $$$;$
1315 PPCODE: 1326 PPCODE:
1316{ 1327{
1317 dREQ; 1328 dREQ;
1318 1329
1319 req->type = REQ_OPEN; 1330 req->type = REQ_OPEN;
1320 req->sv1 = newSVsv (pathname); 1331 req->sv1 = newSVsv (pathname);
1321 req->ptr1 = SvPVbyte_nolen (pathname); 1332 req->ptr1 = SvPVbyte_nolen (req->sv1);
1322 req->int1 = flags; 1333 req->int1 = flags;
1323 req->mode = mode; 1334 req->mode = mode;
1324 1335
1325 REQ_SEND; 1336 REQ_SEND;
1326} 1337}
… …
1348void 1359void
1349aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1360aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1350 SV * fh 1361 SV * fh
1351 UV offset 1362 UV offset
1352 UV length 1363 UV length
1353 SV * data 1364 SV8 * data
1354 UV dataoffset 1365 UV dataoffset
1355 SV * callback 1366 SV * callback
1356 ALIAS: 1367 ALIAS:
1357 aio_read = REQ_READ 1368 aio_read = REQ_READ
1358 aio_write = REQ_WRITE 1369 aio_write = REQ_WRITE
… …
1378 length = svlen - dataoffset; 1389 length = svlen - dataoffset;
1379 } 1390 }
1380 else 1391 else
1381 { 1392 {
1382 /* read: grow scalar as necessary */ 1393 /* read: grow scalar as necessary */
1383 svptr = SvGROW (data, length + dataoffset); 1394 svptr = SvGROW (data, length + dataoffset + 1);
1384 } 1395 }
1385 1396
1386 if (length < 0) 1397 if (length < 0)
1387 croak ("length must not be negative"); 1398 croak ("length must not be negative");
1388 1399
… …
1400 req->stroffset = dataoffset; 1411 req->stroffset = dataoffset;
1401 1412
1402 if (!SvREADONLY (data)) 1413 if (!SvREADONLY (data))
1403 { 1414 {
1404 SvREADONLY_on (data); 1415 SvREADONLY_on (data);
1405 req->flags |= FLAG_DATA_RO_OFF; 1416 req->flags |= FLAG_SV1_RO_OFF;
1406 } 1417 }
1407 1418
1408 REQ_SEND; 1419 REQ_SEND;
1409 } 1420 }
1410} 1421}
1411 1422
1412void 1423void
1413aio_readlink (path,callback=&PL_sv_undef) 1424aio_readlink (path,callback=&PL_sv_undef)
1414 SV * path 1425 SV8 * path
1415 SV * callback 1426 SV * callback
1416 PROTOTYPE: $$;$ 1427 PROTOTYPE: $$;$
1417 PPCODE: 1428 PPCODE:
1418{ 1429{
1419 SV *data; 1430 SV *data;
… …
1422 data = newSV (NAME_MAX); 1433 data = newSV (NAME_MAX);
1423 SvPOK_on (data); 1434 SvPOK_on (data);
1424 1435
1425 req->type = REQ_READLINK; 1436 req->type = REQ_READLINK;
1426 req->fh = newSVsv (path); 1437 req->fh = newSVsv (path);
1427 req->ptr2 = SvPVbyte_nolen (path); 1438 req->ptr2 = SvPVbyte_nolen (req->fh);
1428 req->sv1 = data; 1439 req->sv1 = data;
1429 req->ptr1 = SvPVbyte_nolen (data); 1440 req->ptr1 = SvPVbyte_nolen (data);
1430 1441
1431 REQ_SEND; 1442 REQ_SEND;
1432} 1443}
… …
1474 REQ_SEND; 1485 REQ_SEND;
1475} 1486}
1476 1487
1477void 1488void
1478aio_stat (fh_or_path,callback=&PL_sv_undef) 1489aio_stat (fh_or_path,callback=&PL_sv_undef)
1479 SV * fh_or_path 1490 SV8 * fh_or_path
1480 SV * callback 1491 SV * callback
1481 ALIAS: 1492 ALIAS:
1482 aio_stat = REQ_STAT 1493 aio_stat = REQ_STAT
1483 aio_lstat = REQ_LSTAT 1494 aio_lstat = REQ_LSTAT
1484 PPCODE: 1495 PPCODE:
1485{ 1496{
1486 dREQ; 1497 dREQ;
1487 1498
1488 New (0, req->statdata, 1, Stat_t); 1499 req->ptr2 = malloc (sizeof (Stat_t));
1489 if (!req->statdata) 1500 if (!req->ptr2)
1490 { 1501 {
1491 req_free (req); 1502 req_free (req);
1492 croak ("out of memory during aio_req->statdata allocation"); 1503 croak ("out of memory during aio_stat statdata allocation");
1493 } 1504 }
1505
1506 req->flags |= FLAG_PTR2_FREE;
1494 1507
1495 if (SvPOK (fh_or_path)) 1508 if (SvPOK (fh_or_path))
1496 { 1509 {
1497 req->type = ix; 1510 req->type = ix;
1498 req->sv1 = newSVsv (fh_or_path); 1511 req->sv1 = newSVsv (fh_or_path);
1499 req->ptr1 = SvPVbyte_nolen (fh_or_path); 1512 req->ptr1 = SvPVbyte_nolen (req->sv1);
1500 } 1513 }
1501 else 1514 else
1502 { 1515 {
1503 req->type = REQ_FSTAT; 1516 req->type = REQ_FSTAT;
1504 req->fh = newSVsv (fh_or_path); 1517 req->fh = newSVsv (fh_or_path);
… …
1508 REQ_SEND; 1521 REQ_SEND;
1509} 1522}
1510 1523
1511void 1524void
1512aio_unlink (pathname,callback=&PL_sv_undef) 1525aio_unlink (pathname,callback=&PL_sv_undef)
1513 SV * pathname 1526 SV8 * pathname
1514 SV * callback 1527 SV * callback
1515 ALIAS: 1528 ALIAS:
1516 aio_unlink = REQ_UNLINK 1529 aio_unlink = REQ_UNLINK
1517 aio_rmdir = REQ_RMDIR 1530 aio_rmdir = REQ_RMDIR
1518 aio_readdir = REQ_READDIR 1531 aio_readdir = REQ_READDIR
… …
1520{ 1533{
1521 dREQ; 1534 dREQ;
1522 1535
1523 req->type = ix; 1536 req->type = ix;
1524 req->sv1 = newSVsv (pathname); 1537 req->sv1 = newSVsv (pathname);
1525 req->ptr1 = SvPVbyte_nolen (pathname); 1538 req->ptr1 = SvPVbyte_nolen (req->sv1);
1539
1540 REQ_SEND;
1541}
1542
1543void
1544aio_mkdir (pathname,mode,callback=&PL_sv_undef)
1545 SV8 * pathname
1546 UV mode
1547 SV * callback
1548 PPCODE:
1549{
1550 dREQ;
1526 1551
1552 req->type = REQ_MKDIR;
1553 req->sv1 = newSVsv (pathname);
1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1555 req->mode = mode;
1556
1527 REQ_SEND; 1557 REQ_SEND;
1528} 1558}
1529 1559
1530void 1560void
1531aio_link (oldpath,newpath,callback=&PL_sv_undef) 1561aio_link (oldpath,newpath,callback=&PL_sv_undef)
1532 SV * oldpath 1562 SV8 * oldpath
1533 SV * newpath 1563 SV8 * newpath
1534 SV * callback 1564 SV * callback
1535 ALIAS: 1565 ALIAS:
1536 aio_link = REQ_LINK 1566 aio_link = REQ_LINK
1537 aio_symlink = REQ_SYMLINK 1567 aio_symlink = REQ_SYMLINK
1538 aio_rename = REQ_RENAME 1568 aio_rename = REQ_RENAME
… …
1542 1572
1543 req->type = ix; 1573 req->type = ix;
1544 req->fh = newSVsv (oldpath); 1574 req->fh = newSVsv (oldpath);
1545 req->ptr2 = SvPVbyte_nolen (req->fh); 1575 req->ptr2 = SvPVbyte_nolen (req->fh);
1546 req->sv1 = newSVsv (newpath); 1576 req->sv1 = newSVsv (newpath);
1547 req->ptr1 = SvPVbyte_nolen (newpath); 1577 req->ptr1 = SvPVbyte_nolen (req->sv1);
1548 1578
1549 REQ_SEND; 1579 REQ_SEND;
1550} 1580}
1551 1581
1552void 1582void
1553aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1583aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1554 SV * pathname 1584 SV8 * pathname
1555 SV * callback
1556 UV mode 1585 UV mode
1557 UV dev 1586 UV dev
1587 SV * callback
1558 PPCODE: 1588 PPCODE:
1559{ 1589{
1560 dREQ; 1590 dREQ;
1561 1591
1562 req->type = REQ_MKNOD; 1592 req->type = REQ_MKNOD;
1563 req->sv1 = newSVsv (pathname); 1593 req->sv1 = newSVsv (pathname);
1564 req->ptr1 = SvPVbyte_nolen (pathname); 1594 req->ptr1 = SvPVbyte_nolen (req->sv1);
1565 req->mode = (mode_t)mode; 1595 req->mode = (mode_t)mode;
1566 req->offs = dev; 1596 req->offs = dev;
1567 1597
1568 REQ_SEND; 1598 REQ_SEND;
1569} 1599}
… …
1636 PROTOTYPE: 1666 PROTOTYPE:
1637 CODE: 1667 CODE:
1638 while (nreqs) 1668 while (nreqs)
1639 { 1669 {
1640 poll_wait (); 1670 poll_wait ();
1641 poll_cb (0); 1671 poll_cb ();
1642 } 1672 }
1643 1673
1644void 1674int
1645poll() 1675poll()
1646 PROTOTYPE: 1676 PROTOTYPE:
1647 CODE: 1677 CODE:
1648 if (nreqs)
1649 {
1650 poll_wait (); 1678 poll_wait ();
1651 poll_cb (0); 1679 RETVAL = poll_cb ();
1652 } 1680 OUTPUT:
1681 RETVAL
1653 1682
1654int 1683int
1655poll_fileno() 1684poll_fileno()
1656 PROTOTYPE: 1685 PROTOTYPE:
1657 CODE: 1686 CODE:
… …
1669 1698
1670void 1699void
1671poll_wait() 1700poll_wait()
1672 PROTOTYPE: 1701 PROTOTYPE:
1673 CODE: 1702 CODE:
1674 if (nreqs)
1675 poll_wait (); 1703 poll_wait ();
1704
1705void
1706setsig (int signum = SIGIO)
1707 PROTOTYPE: ;$
1708 CODE:
1709{
1710 if (block_sig_level)
1711 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1712
1713 LOCK (reslock);
1714 main_tid = pthread_self ();
1715 main_sig = signum;
1716 UNLOCK (reslock);
1717
1718 if (main_sig && npending)
1719 pthread_kill (main_tid, main_sig);
1720}
1721
1722void
1723aio_block (SV *cb)
1724 PROTOTYPE: &
1725 PPCODE:
1726{
1727 int count;
1728
1729 block_sig ();
1730 PUSHMARK (SP);
1731 PUTBACK;
1732 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1733 SPAGAIN;
1734 unblock_sig ();
1735
1736 if (SvTRUE (ERRSV))
1737 croak (0);
1738
1739 XSRETURN (count);
1740}
1676 1741
1677int 1742int
1678nreqs() 1743nreqs()
1679 PROTOTYPE: 1744 PROTOTYPE:
1680 CODE: 1745 CODE:
… …
1730 PPCODE: 1795 PPCODE:
1731{ 1796{
1732 int i; 1797 int i;
1733 aio_req req; 1798 aio_req req;
1734 1799
1800 if (main_sig && !block_sig_level)
1801 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1802
1735 if (grp->int1 == 2) 1803 if (grp->int1 == 2)
1736 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1804 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1737 1805
1738 for (i = 1; i < items; ++i ) 1806 for (i = 1; i < items; ++i )
1739 { 1807 {

Diff Legend

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