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.93 by root, Wed Nov 8 02:01:02 2006 UTC vs.
Revision 1.108 by root, Thu Oct 4 12:50:35 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"
18
19#include <pthread.h>
20
21#include <stddef.h> 9#include <stddef.h>
10#include <stdlib.h>
22#include <errno.h> 11#include <errno.h>
23#include <sys/time.h>
24#include <sys/select.h>
25#include <sys/types.h> 12#include <sys/types.h>
26#include <sys/stat.h> 13#include <sys/stat.h>
27#include <limits.h> 14#include <limits.h>
28#include <unistd.h>
29#include <fcntl.h> 15#include <fcntl.h>
30#include <signal.h>
31#include <sched.h> 16#include <sched.h>
17
18#ifdef _WIN32
19
20# define SIGIO 0
21 typedef Direntry_t X_DIRENT;
22#undef malloc
23#undef free
24
25// perl overrides all those nice win32 functions
26# undef open
27# undef read
28# undef write
29# undef send
30# undef recv
31# undef stat
32# undef fstat
33# define lstat stat
34# undef truncate
35# undef ftruncate
36# undef open
37# undef close
38# undef unlink
39# undef rmdir
40# undef rename
41# undef lseek
42
43# define chown(a,b,c) (errno = ENOSYS, -1)
44# define fchown(a,b,c) (errno = ENOSYS, -1)
45# define fchmod(a,b) (errno = ENOSYS, -1)
46# define symlink(a,b) (errno = ENOSYS, -1)
47# define readlink(a,b,c) (errno = ENOSYS, -1)
48# define mknod(a,b,c) (errno = ENOSYS, -1)
49# define truncate(a,b) (errno = ENOSYS, -1)
50# define ftruncate(fd,o) chsize ((fd), (o))
51# define fsync(fd) _commit (fd)
52# define opendir(fd) (errno = ENOSYS, 0)
53# define readdir(fd) (errno = ENOSYS, -1)
54# define closedir(fd) (errno = ENOSYS, -1)
55# define mkdir(a,b) mkdir (a)
56
57#else
58
59# include "autoconf/config.h"
60# include <sys/time.h>
61# include <sys/select.h>
62# include <unistd.h>
63# include <utime.h>
64# include <signal.h>
65 typedef struct dirent X_DIRENT;
66
67#endif
32 68
33#if HAVE_SENDFILE 69#if HAVE_SENDFILE
34# if __linux 70# if __linux
35# include <sys/sendfile.h> 71# include <sys/sendfile.h>
36# elif __freebsd 72# elif __freebsd
51/* used for struct dirent, AIX doesn't provide it */ 87/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 88#ifndef NAME_MAX
53# define NAME_MAX 4096 89# define NAME_MAX 4096
54#endif 90#endif
55 91
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 */ 92/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 93#define AIO_BUFSIZE 65536
83 94
95/* use NV for 32 bit perls as it allows larger offsets */
96#if IVSIZE >= 8
97# define SvVAL64 SvIV
98#else
99# define SvVAL64 SvNV
100#endif
101
102static HV *stash;
103
84#define dBUF \ 104#define dBUF \
85 char *aio_buf; \ 105 char *aio_buf; \
86 LOCK (wrklock); \ 106 X_LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 107 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 108 X_UNLOCK (wrklock); \
89 if (!aio_buf) \ 109 if (!aio_buf) \
90 return -1; 110 return -1;
91 111
92typedef SV SV8; /* byte-sv, used for argument-checking */ 112typedef SV SV8; /* byte-sv, used for argument-checking */
93 113
94enum { 114enum {
95 REQ_QUIT, 115 REQ_QUIT,
96 REQ_OPEN, REQ_CLOSE, 116 REQ_OPEN, REQ_CLOSE,
97 REQ_READ, REQ_WRITE, REQ_READAHEAD, 117 REQ_READ, REQ_WRITE,
98 REQ_SENDFILE, 118 REQ_READAHEAD, REQ_SENDFILE,
99 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 119 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
120 REQ_TRUNCATE, REQ_FTRUNCATE,
121 REQ_UTIME, REQ_FUTIME,
122 REQ_CHMOD, REQ_FCHMOD,
123 REQ_CHOWN, REQ_FCHOWN,
100 REQ_FSYNC, REQ_FDATASYNC, 124 REQ_FSYNC, REQ_FDATASYNC,
101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 125 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
102 REQ_MKNOD, REQ_READDIR, 126 REQ_MKNOD, REQ_READDIR,
103 REQ_LINK, REQ_SYMLINK, REQ_READLINK, 127 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
104 REQ_GROUP, REQ_NOP, 128 REQ_GROUP, REQ_NOP,
105 REQ_BUSY, 129 REQ_BUSY,
106}; 130};
110 134
111typedef struct aio_cb 135typedef struct aio_cb
112{ 136{
113 struct aio_cb *volatile next; 137 struct aio_cb *volatile next;
114 138
115 SV *callback, *fh; 139 SV *callback;
116 SV *sv1, *sv2; 140 SV *sv1, *sv2;
117 void *ptr1, *ptr2; 141 void *ptr1, *ptr2;
118 off_t offs; 142 off_t offs;
119 size_t size; 143 size_t size;
120 ssize_t result; 144 ssize_t result;
145 double nv1, nv2;
121 146
122 STRLEN stroffset; 147 STRLEN stroffset;
123 int type; 148 int type;
124 int int1, int2; 149 int int1, int2, int3;
125 int errorno; 150 int errorno;
126 mode_t mode; /* open */ 151 mode_t mode; /* open */
127 152
128 unsigned char flags; 153 unsigned char flags;
129 unsigned char pri; 154 unsigned char pri;
132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 157 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
133} aio_cb; 158} aio_cb;
134 159
135enum { 160enum {
136 FLAG_CANCELLED = 0x01, /* request was cancelled */ 161 FLAG_CANCELLED = 0x01, /* request was cancelled */
137 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ 162 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
138 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ 163 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
139}; 164};
140 165
141typedef aio_cb *aio_req; 166typedef aio_cb *aio_req;
142typedef aio_cb *aio_req_ornot; 167typedef aio_cb *aio_req_ornot;
160{ 185{
161 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 186 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
162 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 187 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
163} 188}
164 189
190static thread_t main_tid;
191static int main_sig;
192static int block_sig_level;
193
194void block_sig ()
195{
196 sigset_t ss;
197
198 if (block_sig_level++)
199 return;
200
201 if (!main_sig)
202 return;
203
204 sigemptyset (&ss);
205 sigaddset (&ss, main_sig);
206 pthread_sigmask (SIG_BLOCK, &ss, 0);
207}
208
209void unblock_sig ()
210{
211 sigset_t ss;
212
213 if (--block_sig_level)
214 return;
215
216 if (!main_sig)
217 return;
218
219 sigemptyset (&ss);
220 sigaddset (&ss, main_sig);
221 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
222}
223
165static int next_pri = DEFAULT_PRI + PRI_BIAS; 224static int next_pri = DEFAULT_PRI + PRI_BIAS;
166 225
167static unsigned int started, idle, wanted; 226static unsigned int started, idle, wanted;
168 227
169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
171#else
172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
173#endif
174
175#define LOCK(mutex) pthread_mutex_lock (&(mutex))
176#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
177
178/* worker threads management */ 228/* worker threads management */
179static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 229static mutex_t wrklock = X_MUTEX_INIT;
180 230
181typedef struct worker { 231typedef struct worker {
182 /* locked by wrklock */ 232 /* locked by wrklock */
183 struct worker *prev, *next; 233 struct worker *prev, *next;
184 234
185 pthread_t tid; 235 thread_t tid;
186 236
187 /* locked by reslock, reqlock or wrklock */ 237 /* locked by reslock, reqlock or wrklock */
188 aio_req req; /* currently processed request */ 238 aio_req req; /* currently processed request */
189 void *dbuf; 239 void *dbuf;
190 DIR *dirp; 240 DIR *dirp;
216} 266}
217 267
218static volatile unsigned int nreqs, nready, npending; 268static volatile unsigned int nreqs, nready, npending;
219static volatile unsigned int max_idle = 4; 269static volatile unsigned int max_idle = 4;
220static volatile unsigned int max_outstanding = 0xffffffff; 270static volatile unsigned int max_outstanding = 0xffffffff;
221static int respipe [2]; 271static int respipe_osf [2], respipe [2] = { -1, -1 };
222 272
223static pthread_mutex_t reslock = AIO_MUTEX_INIT; 273static mutex_t reslock = X_MUTEX_INIT;
224static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 274static mutex_t reqlock = X_MUTEX_INIT;
225static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 275static cond_t reqwait = X_COND_INIT;
226 276
227#if WORDACCESS_UNSAFE 277#if WORDACCESS_UNSAFE
228 278
229static unsigned int get_nready () 279static unsigned int get_nready ()
230{ 280{
231 unsigned int retval; 281 unsigned int retval;
232 282
233 LOCK (reqlock); 283 X_LOCK (reqlock);
234 retval = nready; 284 retval = nready;
235 UNLOCK (reqlock); 285 X_UNLOCK (reqlock);
236 286
237 return retval; 287 return retval;
238} 288}
239 289
240static unsigned int get_npending () 290static unsigned int get_npending ()
241{ 291{
242 unsigned int retval; 292 unsigned int retval;
243 293
244 LOCK (reslock); 294 X_LOCK (reslock);
245 retval = npending; 295 retval = npending;
246 UNLOCK (reslock); 296 X_UNLOCK (reslock);
247 297
248 return retval; 298 return retval;
249} 299}
250 300
251static unsigned int get_nthreads () 301static unsigned int get_nthreads ()
252{ 302{
253 unsigned int retval; 303 unsigned int retval;
254 304
255 LOCK (wrklock); 305 X_LOCK (wrklock);
256 retval = started; 306 retval = started;
257 UNLOCK (wrklock); 307 X_UNLOCK (wrklock);
258 308
259 return retval; 309 return retval;
260} 310}
261 311
262#else 312#else
320 370
321 abort (); 371 abort ();
322} 372}
323 373
324static int poll_cb (); 374static int poll_cb ();
325static void req_invoke (aio_req req); 375static int req_invoke (aio_req req);
326static void req_free (aio_req req); 376static void req_destroy (aio_req req);
327static void req_cancel (aio_req req); 377static void req_cancel (aio_req req);
328 378
329/* must be called at most once */ 379/* must be called at most once */
330static SV *req_sv (aio_req req, const char *klass) 380static SV *req_sv (aio_req req, const char *klass)
331{ 381{
350 return mg ? (aio_req)mg->mg_ptr : 0; 400 return mg ? (aio_req)mg->mg_ptr : 0;
351} 401}
352 402
353static void aio_grp_feed (aio_req grp) 403static void aio_grp_feed (aio_req grp)
354{ 404{
405 block_sig ();
406
355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED)) 407 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
356 { 408 {
357 int old_len = grp->size; 409 int old_len = grp->size;
358 410
359 if (grp->sv2 && SvOK (grp->sv2)) 411 if (grp->sv2 && SvOK (grp->sv2))
377 SvREFCNT_dec (grp->sv2); 429 SvREFCNT_dec (grp->sv2);
378 grp->sv2 = 0; 430 grp->sv2 = 0;
379 break; 431 break;
380 } 432 }
381 } 433 }
434
435 unblock_sig ();
382} 436}
383 437
384static void aio_grp_dec (aio_req grp) 438static void aio_grp_dec (aio_req grp)
385{ 439{
386 --grp->size; 440 --grp->size;
389 aio_grp_feed (grp); 443 aio_grp_feed (grp);
390 444
391 /* finish, if done */ 445 /* finish, if done */
392 if (!grp->size && grp->int1) 446 if (!grp->size && grp->int1)
393 { 447 {
448 block_sig ();
449
394 req_invoke (grp); 450 if (!req_invoke (grp))
451 {
452 req_destroy (grp);
453 unblock_sig ();
454 croak (0);
455 }
456
395 req_free (grp); 457 req_destroy (grp);
458 unblock_sig ();
396 } 459 }
397} 460}
398 461
399static void req_invoke (aio_req req) 462static int req_invoke (aio_req req)
400{ 463{
401 dSP; 464 dSP;
402 465
403 if (req->flags & FLAG_SV1_RO_OFF) 466 if (req->flags & FLAG_SV2_RO_OFF)
404 SvREADONLY_off (req->sv1); 467 SvREADONLY_off (req->sv2);
405 468
406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 469 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
407 { 470 {
408 ENTER; 471 ENTER;
409 SAVETMPS; 472 SAVETMPS;
440 break; 503 break;
441 504
442 case REQ_OPEN: 505 case REQ_OPEN:
443 { 506 {
444 /* convert fd to fh */ 507 /* convert fd to fh */
445 SV *fh; 508 SV *fh = &PL_sv_undef;
446 509
447 PUSHs (sv_2mortal (newSViv (req->result))); 510 if (req->result >= 0)
448 PUTBACK; 511 {
449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 512 GV *gv = (GV *)sv_newmortal ();
450 SPAGAIN; 513 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
514 char sym [64];
515 int symlen;
516
517 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);
518 gv_init (gv, stash, sym, symlen, 0);
451 519
452 fh = POPs; 520 symlen = snprintf (
453 PUSHMARK (SP); 521 sym,
522 sizeof (sym),
523 "%s&=%d",
524 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
525 req->result
526 );
527
528 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
529 fh = (SV *)gv;
530 }
531
454 XPUSHs (fh); 532 XPUSHs (fh);
455 } 533 }
456 break; 534 break;
457 535
458 case REQ_GROUP: 536 case REQ_GROUP:
474 break; 552 break;
475 553
476 case REQ_READLINK: 554 case REQ_READLINK:
477 if (req->result > 0) 555 if (req->result > 0)
478 { 556 {
479 SvCUR_set (req->sv1, req->result); 557 SvCUR_set (req->sv2, req->result);
480 *SvEND (req->sv1) = 0; 558 *SvEND (req->sv2) = 0;
481 PUSHs (req->sv1); 559 PUSHs (req->sv2);
482 } 560 }
483 break; 561 break;
484 562
485 case REQ_STAT: 563 case REQ_STAT:
486 case REQ_LSTAT: 564 case REQ_LSTAT:
490 PL_statcache = *(Stat_t *)(req->ptr2); 568 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result))); 569 PUSHs (sv_2mortal (newSViv (req->result)));
492 break; 570 break;
493 571
494 case REQ_READ: 572 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); 573 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0; 574 *SvEND (req->sv2) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result))); 575 PUSHs (sv_2mortal (newSViv (req->result)));
498 break; 576 break;
499 577
500 default: 578 default:
501 PUSHs (sv_2mortal (newSViv (req->result))); 579 PUSHs (sv_2mortal (newSViv (req->result)));
524 grp->grp_first = req->grp_next; 602 grp->grp_first = req->grp_next;
525 603
526 aio_grp_dec (grp); 604 aio_grp_dec (grp);
527 } 605 }
528 606
529 if (SvTRUE (ERRSV)) 607 return !SvTRUE (ERRSV);
530 {
531 req_free (req);
532 croak (0);
533 }
534} 608}
535 609
536static void req_free (aio_req req) 610static void req_destroy (aio_req req)
537{ 611{
538 if (req->self) 612 if (req->self)
539 { 613 {
540 sv_unmagic (req->self, PERL_MAGIC_ext); 614 sv_unmagic (req->self, PERL_MAGIC_ext);
541 SvREFCNT_dec (req->self); 615 SvREFCNT_dec (req->self);
542 } 616 }
543 617
544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1); 618 SvREFCNT_dec (req->sv1);
546 SvREFCNT_dec (req->sv2); 619 SvREFCNT_dec (req->sv2);
547 SvREFCNT_dec (req->callback); 620 SvREFCNT_dec (req->callback);
548 621
549 if (req->flags & FLAG_PTR2_FREE) 622 if (req->flags & FLAG_PTR2_FREE)
571 req->flags |= FLAG_CANCELLED; 644 req->flags |= FLAG_CANCELLED;
572 645
573 req_cancel_subs (req); 646 req_cancel_subs (req);
574} 647}
575 648
576static void *aio_proc(void *arg); 649#ifdef USE_SOCKETS_AS_HANDLES
650# define TO_SOCKET(x) (win32_get_osfhandle (x))
651#else
652# define TO_SOCKET(x) (x)
653#endif
654
655static void
656create_respipe ()
657{
658 int old_readfd = respipe [0];
659
660 if (respipe [1] >= 0)
661 respipe_close (TO_SOCKET (respipe [1]));
662
663#ifdef _WIN32
664 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
665#else
666 if (pipe (respipe))
667#endif
668 croak ("unable to initialize result pipe");
669
670 if (old_readfd >= 0)
671 {
672 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
673 croak ("unable to initialize result pipe(2)");
674
675 respipe_close (respipe [0]);
676 respipe [0] = old_readfd;
677 }
678
679#ifdef _WIN32
680 int arg = 1;
681 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
682 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
683#else
684 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
685 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
686#endif
687 croak ("unable to initialize result pipe(3)");
688
689 respipe_osf [0] = TO_SOCKET (respipe [0]);
690 respipe_osf [1] = TO_SOCKET (respipe [1]);
691}
692
693X_THREAD_PROC (aio_proc);
577 694
578static void start_thread (void) 695static void start_thread (void)
579{ 696{
580 sigset_t fullsigset, oldsigset;
581 pthread_attr_t attr;
582
583 worker *wrk = calloc (1, sizeof (worker)); 697 worker *wrk = calloc (1, sizeof (worker));
584 698
585 if (!wrk) 699 if (!wrk)
586 croak ("unable to allocate worker thread data"); 700 croak ("unable to allocate worker thread data");
587 701
588 pthread_attr_init (&attr);
589 pthread_attr_setstacksize (&attr, STACKSIZE);
590 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
591#ifdef PTHREAD_SCOPE_PROCESS
592 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
593#endif
594
595 sigfillset (&fullsigset);
596
597 LOCK (wrklock); 702 X_LOCK (wrklock);
598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
599 703
600 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 704 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
601 { 705 {
602 wrk->prev = &wrk_first; 706 wrk->prev = &wrk_first;
603 wrk->next = wrk_first.next; 707 wrk->next = wrk_first.next;
604 wrk_first.next->prev = wrk; 708 wrk_first.next->prev = wrk;
605 wrk_first.next = wrk; 709 wrk_first.next = wrk;
606 ++started; 710 ++started;
607 } 711 }
608 else 712 else
609 free (wrk); 713 free (wrk);
610 714
611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
612 UNLOCK (wrklock); 715 X_UNLOCK (wrklock);
613} 716}
614 717
615static void maybe_start_thread () 718static void maybe_start_thread ()
616{ 719{
617 if (get_nthreads () >= wanted) 720 if (get_nthreads () >= wanted)
624 start_thread (); 727 start_thread ();
625} 728}
626 729
627static void req_send (aio_req req) 730static void req_send (aio_req req)
628{ 731{
732 block_sig ();
733
629 ++nreqs; 734 ++nreqs;
630 735
631 LOCK (reqlock); 736 X_LOCK (reqlock);
632 ++nready; 737 ++nready;
633 reqq_push (&req_queue, req); 738 reqq_push (&req_queue, req);
634 pthread_cond_signal (&reqwait); 739 X_COND_SIGNAL (reqwait);
635 UNLOCK (reqlock); 740 X_UNLOCK (reqlock);
741
742 unblock_sig ();
636 743
637 maybe_start_thread (); 744 maybe_start_thread ();
638} 745}
639 746
640static void end_thread (void) 747static void end_thread (void)
644 Newz (0, req, 1, aio_cb); 751 Newz (0, req, 1, aio_cb);
645 752
646 req->type = REQ_QUIT; 753 req->type = REQ_QUIT;
647 req->pri = PRI_MAX + PRI_BIAS; 754 req->pri = PRI_MAX + PRI_BIAS;
648 755
649 LOCK (reqlock); 756 X_LOCK (reqlock);
650 reqq_push (&req_queue, req); 757 reqq_push (&req_queue, req);
651 pthread_cond_signal (&reqwait); 758 X_COND_SIGNAL (reqwait);
652 UNLOCK (reqlock); 759 X_UNLOCK (reqlock);
653 760
654 LOCK (wrklock); 761 X_LOCK (wrklock);
655 --started; 762 --started;
656 UNLOCK (wrklock); 763 X_UNLOCK (wrklock);
657} 764}
658 765
659static void set_max_idle (int nthreads) 766static void set_max_idle (int nthreads)
660{ 767{
661 if (WORDACCESS_UNSAFE) LOCK (reqlock); 768 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
662 max_idle = nthreads <= 0 ? 1 : nthreads; 769 max_idle = nthreads <= 0 ? 1 : nthreads;
663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 770 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
664} 771}
665 772
666static void min_parallel (int nthreads) 773static void min_parallel (int nthreads)
667{ 774{
668 if (wanted < nthreads) 775 if (wanted < nthreads)
683 fd_set rfd; 790 fd_set rfd;
684 791
685 while (nreqs) 792 while (nreqs)
686 { 793 {
687 int size; 794 int size;
688 if (WORDACCESS_UNSAFE) LOCK (reslock); 795 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
689 size = res_queue.size; 796 size = res_queue.size;
690 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 797 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
691 798
692 if (size) 799 if (size)
693 return; 800 return;
694 801
695 maybe_start_thread (); 802 maybe_start_thread ();
696 803
697 FD_ZERO(&rfd); 804 FD_ZERO (&rfd);
698 FD_SET(respipe [0], &rfd); 805 FD_SET (respipe [0], &rfd);
699 806
700 select (respipe [0] + 1, &rfd, 0, 0, 0); 807 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
701 } 808 }
702} 809}
703 810
704static int poll_cb () 811static int poll_cb ()
705{ 812{
711 aio_req req; 818 aio_req req;
712 819
713 if (max_poll_time) 820 if (max_poll_time)
714 gettimeofday (&tv_start, 0); 821 gettimeofday (&tv_start, 0);
715 822
823 block_sig ();
824
716 for (;;) 825 for (;;)
717 { 826 {
718 for (;;) 827 for (;;)
719 { 828 {
720 maybe_start_thread (); 829 maybe_start_thread ();
721 830
722 LOCK (reslock); 831 X_LOCK (reslock);
723 req = reqq_shift (&res_queue); 832 req = reqq_shift (&res_queue);
724 833
725 if (req) 834 if (req)
726 { 835 {
727 --npending; 836 --npending;
728 837
729 if (!res_queue.size) 838 if (!res_queue.size)
730 { 839 {
731 /* read any signals sent by the worker threads */ 840 /* read any signals sent by the worker threads */
732 char buf [32]; 841 char buf [4];
733 while (read (respipe [0], buf, 32) == 32) 842 while (respipe_read (respipe [0], buf, 4) == 4)
734 ; 843 ;
735 } 844 }
736 } 845 }
737 846
738 UNLOCK (reslock); 847 X_UNLOCK (reslock);
739 848
740 if (!req) 849 if (!req)
741 break; 850 break;
742 851
743 --nreqs; 852 --nreqs;
747 req->int1 = 1; /* mark request as delayed */ 856 req->int1 = 1; /* mark request as delayed */
748 continue; 857 continue;
749 } 858 }
750 else 859 else
751 { 860 {
752 req_invoke (req); 861 if (!req_invoke (req))
862 {
863 req_destroy (req);
864 unblock_sig ();
865 croak (0);
866 }
753 867
754 count++; 868 count++;
755 } 869 }
756 870
757 req_free (req); 871 req_destroy (req);
758 872
759 if (maxreqs && !--maxreqs) 873 if (maxreqs && !--maxreqs)
760 break; 874 break;
761 875
762 if (max_poll_time) 876 if (max_poll_time)
774 poll_wait (); 888 poll_wait ();
775 889
776 ++maxreqs; 890 ++maxreqs;
777 } 891 }
778 892
893 unblock_sig ();
779 return count; 894 return count;
780}
781
782static void create_pipe ()
783{
784 if (pipe (respipe))
785 croak ("unable to initialize result pipe");
786
787 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
788 croak ("cannot set result pipe to nonblocking mode");
789
790 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
791 croak ("cannot set result pipe to nonblocking mode");
792} 895}
793 896
794/*****************************************************************************/ 897/*****************************************************************************/
795/* work around various missing functions */ 898/* work around various missing functions */
796 899
801/* 904/*
802 * make our pread/pwrite safe against themselves, but not against 905 * make our pread/pwrite safe against themselves, but not against
803 * normal read/write by using a mutex. slows down execution a lot, 906 * normal read/write by using a mutex. slows down execution a lot,
804 * but that's your problem, not mine. 907 * but that's your problem, not mine.
805 */ 908 */
806static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 909static mutex_t preadwritelock = X_MUTEX_INIT;
807 910
808static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 911static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
809{ 912{
810 ssize_t res; 913 ssize_t res;
811 off_t ooffset; 914 off_t ooffset;
812 915
813 LOCK (preadwritelock); 916 X_LOCK (preadwritelock);
814 ooffset = lseek (fd, 0, SEEK_CUR); 917 ooffset = lseek (fd, 0, SEEK_CUR);
815 lseek (fd, offset, SEEK_SET); 918 lseek (fd, offset, SEEK_SET);
816 res = read (fd, buf, count); 919 res = read (fd, buf, count);
817 lseek (fd, ooffset, SEEK_SET); 920 lseek (fd, ooffset, SEEK_SET);
818 UNLOCK (preadwritelock); 921 X_UNLOCK (preadwritelock);
819 922
820 return res; 923 return res;
821} 924}
822 925
823static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 926static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
824{ 927{
825 ssize_t res; 928 ssize_t res;
826 off_t ooffset; 929 off_t ooffset;
827 930
828 LOCK (preadwritelock); 931 X_LOCK (preadwritelock);
829 ooffset = lseek (fd, 0, SEEK_CUR); 932 ooffset = lseek (fd, 0, SEEK_CUR);
830 lseek (fd, offset, SEEK_SET); 933 lseek (fd, offset, SEEK_SET);
831 res = write (fd, buf, count); 934 res = write (fd, buf, count);
832 lseek (fd, offset, SEEK_SET); 935 lseek (fd, offset, SEEK_SET);
833 UNLOCK (preadwritelock); 936 X_UNLOCK (preadwritelock);
834 937
835 return res; 938 return res;
836} 939}
940#endif
941
942#ifndef HAVE_FUTIMES
943
944# define utimes(path,times) aio_utimes (path, times)
945# define futimes(fd,times) aio_futimes (fd, times)
946
947int aio_utimes (const char *filename, const struct timeval times[2])
948{
949 if (times)
950 {
951 struct utimbuf buf;
952
953 buf.actime = times[0].tv_sec;
954 buf.modtime = times[1].tv_sec;
955
956 return utime (filename, &buf);
957 }
958 else
959 return utime (filename, 0);
960}
961
962int aio_futimes (int fd, const struct timeval tv[2])
963{
964 errno = ENOSYS;
965 return -1;
966}
967
837#endif 968#endif
838 969
839#if !HAVE_FDATASYNC 970#if !HAVE_FDATASYNC
840# define fdatasync fsync 971# define fdatasync fsync
841#endif 972#endif
843#if !HAVE_READAHEAD 974#if !HAVE_READAHEAD
844# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 975# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
845 976
846static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self) 977static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
847{ 978{
979 size_t todo = count;
848 dBUF; 980 dBUF;
849 981
850 while (count > 0) 982 while (todo > 0)
851 { 983 {
852 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 984 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
853 985
854 pread (fd, aio_buf, len, offset); 986 pread (fd, aio_buf, len, offset);
855 offset += len; 987 offset += len;
856 count -= len; 988 todo -= len;
857 } 989 }
858 990
859 errno = 0; 991 errno = 0;
992 return count;
860} 993}
861 994
862#endif 995#endif
863 996
864#if !HAVE_READDIR_R 997#if !HAVE_READDIR_R
865# define readdir_r aio_readdir_r 998# define readdir_r aio_readdir_r
866 999
867static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 1000static mutex_t readdirlock = X_MUTEX_INIT;
868 1001
869static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 1002static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
870{ 1003{
871 struct dirent *e; 1004 X_DIRENT *e;
872 int errorno; 1005 int errorno;
873 1006
874 LOCK (readdirlock); 1007 X_LOCK (readdirlock);
875 1008
876 e = readdir (dirp); 1009 e = readdir (dirp);
877 errorno = errno; 1010 errorno = errno;
878 1011
879 if (e) 1012 if (e)
882 strcpy (ent->d_name, e->d_name); 1015 strcpy (ent->d_name, e->d_name);
883 } 1016 }
884 else 1017 else
885 *res = 0; 1018 *res = 0;
886 1019
887 UNLOCK (readdirlock); 1020 X_UNLOCK (readdirlock);
888 1021
889 errno = errorno; 1022 errno = errorno;
890 return e ? 0 : -1; 1023 return e ? 0 : -1;
891} 1024}
892#endif 1025#endif
988static void scandir_ (aio_req req, worker *self) 1121static void scandir_ (aio_req req, worker *self)
989{ 1122{
990 DIR *dirp; 1123 DIR *dirp;
991 union 1124 union
992 { 1125 {
993 struct dirent d; 1126 X_DIRENT d;
994 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1127 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
995 } *u; 1128 } *u;
996 struct dirent *entp; 1129 X_DIRENT *entp;
997 char *name, *names; 1130 char *name, *names;
998 int memlen = 4096; 1131 int memlen = 4096;
999 int memofs = 0; 1132 int memofs = 0;
1000 int res = 0; 1133 int res = 0;
1001 int errorno;
1002 1134
1003 LOCK (wrklock); 1135 X_LOCK (wrklock);
1004 self->dirp = dirp = opendir (req->ptr1); 1136 self->dirp = dirp = opendir (req->ptr1);
1005 self->dbuf = u = malloc (sizeof (*u)); 1137 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE; 1138 req->flags |= FLAG_PTR2_FREE;
1007 req->ptr2 = names = malloc (memlen); 1139 req->ptr2 = names = malloc (memlen);
1008 UNLOCK (wrklock); 1140 X_UNLOCK (wrklock);
1009 1141
1010 if (dirp && u && names) 1142 if (dirp && u && names)
1011 for (;;) 1143 for (;;)
1012 { 1144 {
1013 errno = 0; 1145 errno = 0;
1025 res++; 1157 res++;
1026 1158
1027 while (memofs + len > memlen) 1159 while (memofs + len > memlen)
1028 { 1160 {
1029 memlen *= 2; 1161 memlen *= 2;
1030 LOCK (wrklock); 1162 X_LOCK (wrklock);
1031 req->ptr2 = names = realloc (names, memlen); 1163 req->ptr2 = names = realloc (names, memlen);
1032 UNLOCK (wrklock); 1164 X_UNLOCK (wrklock);
1033 1165
1034 if (!names) 1166 if (!names)
1035 break; 1167 break;
1036 } 1168 }
1037 1169
1046 req->result = res; 1178 req->result = res;
1047} 1179}
1048 1180
1049/*****************************************************************************/ 1181/*****************************************************************************/
1050 1182
1051static void *aio_proc (void *thr_arg) 1183X_THREAD_PROC (aio_proc)
1052{ 1184{
1185 {//D
1053 aio_req req; 1186 aio_req req;
1054 struct timespec ts; 1187 struct timespec ts;
1055 worker *self = (worker *)thr_arg; 1188 worker *self = (worker *)thr_arg;
1056 1189
1057 /* try to distribute timeouts somewhat evenly */ 1190 /* try to distribute timeouts somewhat randomly */
1058 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 1191 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1059 * (1000000000UL / 1024UL);
1060 1192
1061 for (;;) 1193 for (;;)
1062 { 1194 {
1063 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1195 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1064 1196
1065 LOCK (reqlock); 1197 X_LOCK (reqlock);
1066 1198
1067 for (;;) 1199 for (;;)
1068 { 1200 {
1069 self->req = req = reqq_shift (&req_queue); 1201 self->req = req = reqq_shift (&req_queue);
1070 1202
1071 if (req) 1203 if (req)
1072 break; 1204 break;
1073 1205
1074 ++idle; 1206 ++idle;
1075 1207
1076 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1208 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1077 == ETIMEDOUT) 1209 == ETIMEDOUT)
1078 { 1210 {
1079 if (idle > max_idle) 1211 if (idle > max_idle)
1080 { 1212 {
1081 --idle; 1213 --idle;
1082 UNLOCK (reqlock); 1214 X_UNLOCK (reqlock);
1083 LOCK (wrklock); 1215 X_LOCK (wrklock);
1084 --started; 1216 --started;
1085 UNLOCK (wrklock); 1217 X_UNLOCK (wrklock);
1086 goto quit; 1218 goto quit;
1087 } 1219 }
1088 1220
1089 /* we are allowed to idle, so do so without any timeout */ 1221 /* we are allowed to idle, so do so without any timeout */
1090 pthread_cond_wait (&reqwait, &reqlock); 1222 X_COND_WAIT (reqwait, reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1223 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 } 1224 }
1093 1225
1094 --idle; 1226 --idle;
1095 } 1227 }
1096 1228
1097 --nready; 1229 --nready;
1098 1230
1099 UNLOCK (reqlock); 1231 X_UNLOCK (reqlock);
1100 1232
1101 errno = 0; /* strictly unnecessary */ 1233 errno = 0; /* strictly unnecessary */
1102 1234
1103 if (!(req->flags & FLAG_CANCELLED)) 1235 if (!(req->flags & FLAG_CANCELLED))
1104 switch (req->type) 1236 switch (req->type)
1105 { 1237 {
1106 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; 1238 case REQ_READ: req->result = req->offs >= 0
1107 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; 1239 ? pread (req->int1, req->ptr1, req->size, req->offs)
1240 : read (req->int1, req->ptr1, req->size); break;
1241 case REQ_WRITE: req->result = req->offs >= 0
1242 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1243 : write (req->int1, req->ptr1, req->size); break;
1108 1244
1109 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1245 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break; 1246 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1111 1247
1112 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; 1248 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1113 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; 1249 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; 1250 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1115 1251
1252 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1253 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1254 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1255 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1256 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1257 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1258
1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1259 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1117 case REQ_CLOSE: req->result = close (req->int1); break; 1260 case REQ_CLOSE: req->result = PerlIO_close ((PerlIO *)req->ptr1); break;
1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1261 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1262 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1263 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1264 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1265 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; 1266 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; 1267 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; 1268 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; 1270 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1127 case REQ_FSYNC: req->result = fsync (req->int1); break; 1271 case REQ_FSYNC: req->result = fsync (req->int1); break;
1128 case REQ_READDIR: scandir_ (req, self); break; 1272 case REQ_READDIR: scandir_ (req, self); break;
1129 1273
1130 case REQ_BUSY: 1274 case REQ_BUSY:
1275#ifdef _WIN32
1276 Sleep (req->nv1 * 1000.);
1277#else
1131 { 1278 {
1132 struct timeval tv; 1279 struct timeval tv;
1133 1280
1134 tv.tv_sec = req->int1; 1281 tv.tv_sec = req->nv1;
1135 tv.tv_usec = req->int2; 1282 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1136 1283
1137 req->result = select (0, 0, 0, 0, &tv); 1284 req->result = select (0, 0, 0, 0, &tv);
1285 }
1286#endif
1287 break;
1288
1289 case REQ_UTIME:
1290 case REQ_FUTIME:
1291 {
1292 struct timeval tv[2];
1293 struct timeval *times;
1294
1295 if (req->nv1 != -1. || req->nv2 != -1.)
1296 {
1297 tv[0].tv_sec = req->nv1;
1298 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1299 tv[1].tv_sec = req->nv2;
1300 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1301
1302 times = tv;
1303 }
1304 else
1305 times = 0;
1306
1307
1308 req->result = req->type == REQ_FUTIME
1309 ? futimes (req->int1, times)
1310 : utimes (req->ptr1, times);
1138 } 1311 }
1139 1312
1140 case REQ_GROUP: 1313 case REQ_GROUP:
1141 case REQ_NOP: 1314 case REQ_NOP:
1142 break; 1315 break;
1143 1316
1144 case REQ_QUIT: 1317 case REQ_QUIT:
1145 goto quit; 1318 goto quit;
1146 1319
1147 default: 1320 default:
1148 req->result = ENOSYS; 1321 req->result = -1;
1149 break; 1322 break;
1150 } 1323 }
1151 1324
1152 req->errorno = errno; 1325 req->errorno = errno;
1153 1326
1154 LOCK (reslock); 1327 X_LOCK (reslock);
1155 1328
1156 ++npending; 1329 ++npending;
1157 1330
1158 if (!reqq_push (&res_queue, req)) 1331 if (!reqq_push (&res_queue, req))
1332 {
1159 /* write a dummy byte to the pipe so fh becomes ready */ 1333 /* write a dummy byte to the pipe so fh becomes ready */
1160 write (respipe [1], &respipe, 1); 1334 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1335
1336 /* optionally signal the main thread asynchronously */
1337 if (main_sig)
1338 pthread_kill (main_tid, main_sig);
1339 }
1161 1340
1162 self->req = 0; 1341 self->req = 0;
1163 worker_clear (self); 1342 worker_clear (self);
1164 1343
1165 UNLOCK (reslock); 1344 X_UNLOCK (reslock);
1166 } 1345 }
1167 1346
1168quit: 1347quit:
1169 LOCK (wrklock); 1348 X_LOCK (wrklock);
1170 worker_free (self); 1349 worker_free (self);
1171 UNLOCK (wrklock); 1350 X_UNLOCK (wrklock);
1172 1351
1173 return 0; 1352 return 0;
1353 }//D
1174} 1354}
1175 1355
1176/*****************************************************************************/ 1356/*****************************************************************************/
1177 1357
1178static void atfork_prepare (void) 1358static void atfork_prepare (void)
1179{ 1359{
1180 LOCK (wrklock); 1360 X_LOCK (wrklock);
1181 LOCK (reqlock); 1361 X_LOCK (reqlock);
1182 LOCK (reslock); 1362 X_LOCK (reslock);
1183#if !HAVE_PREADWRITE 1363#if !HAVE_PREADWRITE
1184 LOCK (preadwritelock); 1364 X_LOCK (preadwritelock);
1185#endif 1365#endif
1186#if !HAVE_READDIR_R 1366#if !HAVE_READDIR_R
1187 LOCK (readdirlock); 1367 X_LOCK (readdirlock);
1188#endif 1368#endif
1189} 1369}
1190 1370
1191static void atfork_parent (void) 1371static void atfork_parent (void)
1192{ 1372{
1193#if !HAVE_READDIR_R 1373#if !HAVE_READDIR_R
1194 UNLOCK (readdirlock); 1374 X_UNLOCK (readdirlock);
1195#endif 1375#endif
1196#if !HAVE_PREADWRITE 1376#if !HAVE_PREADWRITE
1197 UNLOCK (preadwritelock); 1377 X_UNLOCK (preadwritelock);
1198#endif 1378#endif
1199 UNLOCK (reslock); 1379 X_UNLOCK (reslock);
1200 UNLOCK (reqlock); 1380 X_UNLOCK (reqlock);
1201 UNLOCK (wrklock); 1381 X_UNLOCK (wrklock);
1202} 1382}
1203 1383
1204static void atfork_child (void) 1384static void atfork_child (void)
1205{ 1385{
1206 aio_req prv; 1386 aio_req prv;
1207 1387
1208 while (prv = reqq_shift (&req_queue)) 1388 while (prv = reqq_shift (&req_queue))
1209 req_free (prv); 1389 req_destroy (prv);
1210 1390
1211 while (prv = reqq_shift (&res_queue)) 1391 while (prv = reqq_shift (&res_queue))
1212 req_free (prv); 1392 req_destroy (prv);
1213 1393
1214 while (wrk_first.next != &wrk_first) 1394 while (wrk_first.next != &wrk_first)
1215 { 1395 {
1216 worker *wrk = wrk_first.next; 1396 worker *wrk = wrk_first.next;
1217 1397
1218 if (wrk->req) 1398 if (wrk->req)
1219 req_free (wrk->req); 1399 req_destroy (wrk->req);
1220 1400
1221 worker_clear (wrk); 1401 worker_clear (wrk);
1222 worker_free (wrk); 1402 worker_free (wrk);
1223 } 1403 }
1224 1404
1226 idle = 0; 1406 idle = 0;
1227 nreqs = 0; 1407 nreqs = 0;
1228 nready = 0; 1408 nready = 0;
1229 npending = 0; 1409 npending = 0;
1230 1410
1231 close (respipe [0]);
1232 close (respipe [1]);
1233 create_pipe (); 1411 create_respipe ();
1234 1412
1235 atfork_parent (); 1413 atfork_parent ();
1236} 1414}
1237 1415
1238#define dREQ \ 1416#define dREQ \
1260 1438
1261PROTOTYPES: ENABLE 1439PROTOTYPES: ENABLE
1262 1440
1263BOOT: 1441BOOT:
1264{ 1442{
1265 HV *stash = gv_stashpv ("IO::AIO", 1); 1443 stash = gv_stashpv ("IO::AIO", 1);
1266 1444
1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1445 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1446 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1269 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1447 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1270 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1448 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1271 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1449 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1450#ifdef _WIN32
1451 X_MUTEX_CHECK (wrklock);
1452 X_MUTEX_CHECK (reslock);
1453 X_MUTEX_CHECK (reqlock);
1454 X_MUTEX_CHECK (reqwait);
1455 X_MUTEX_CHECK (preadwritelock);
1456 X_MUTEX_CHECK (readdirlock);
1457
1458 X_COND_CHECK (reqwait);
1459#else
1272 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1460 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1461 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1462#endif
1273 1463
1274 create_pipe (); 1464 create_respipe ();
1465
1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1466 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1276} 1467}
1277 1468
1278void 1469void
1279max_poll_reqs (int nreqs) 1470max_poll_reqs (int nreqs)
1280 PROTOTYPE: $ 1471 PROTOTYPE: $
1309 max_outstanding = maxreqs; 1500 max_outstanding = maxreqs;
1310 OUTPUT: 1501 OUTPUT:
1311 RETVAL 1502 RETVAL
1312 1503
1313void 1504void
1314aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1505aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1315 SV8 * pathname
1316 int flags
1317 int mode
1318 SV * callback
1319 PROTOTYPE: $$$;$ 1506 PROTOTYPE: $$$;$
1320 PPCODE: 1507 PPCODE:
1321{ 1508{
1322 dREQ; 1509 dREQ;
1323 1510
1329 1516
1330 REQ_SEND; 1517 REQ_SEND;
1331} 1518}
1332 1519
1333void 1520void
1334aio_close (fh,callback=&PL_sv_undef) 1521aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1335 SV * fh
1336 SV * callback
1337 PROTOTYPE: $;$ 1522 PROTOTYPE: $;$
1338 ALIAS: 1523 ALIAS:
1339 aio_close = REQ_CLOSE
1340 aio_fsync = REQ_FSYNC 1524 aio_fsync = REQ_FSYNC
1341 aio_fdatasync = REQ_FDATASYNC 1525 aio_fdatasync = REQ_FDATASYNC
1342 PPCODE: 1526 PPCODE:
1343{ 1527{
1344 dREQ; 1528 dREQ;
1345 1529
1346 req->type = ix; 1530 req->type = ix;
1347 req->fh = newSVsv (fh); 1531 req->sv1 = newSVsv (fh);
1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1532 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1349 1533
1350 REQ_SEND (req); 1534 REQ_SEND (req);
1351} 1535}
1352 1536
1353void 1537void
1538aio_close (SV *fh, SV *callback=&PL_sv_undef)
1539 PROTOTYPE: $;$
1540 PPCODE:
1541{
1542 PerlIO *io = IoIFP (sv_2io (fh));
1543 int fd = PerlIO_fileno (io);
1544
1545 if (fd < 0)
1546 croak ("aio_close called with fd-less filehandle");
1547
1548 PerlIO_binmode (aTHX_ io, 0, 0, 0);
1549
1550 {
1551 dREQ;
1552
1553 req->type = REQ_CLOSE;
1554 req->sv1 = newSVsv (fh);
1555 req->ptr1 = (void *)io;
1556
1557 REQ_SEND (req);
1558 }
1559}
1560
1561void
1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1562aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1355 SV * fh
1356 UV offset
1357 UV length
1358 SV8 * data
1359 UV dataoffset
1360 SV * callback
1361 ALIAS: 1563 ALIAS:
1362 aio_read = REQ_READ 1564 aio_read = REQ_READ
1363 aio_write = REQ_WRITE 1565 aio_write = REQ_WRITE
1364 PROTOTYPE: $$$$$;$ 1566 PROTOTYPE: $$$$$;$
1365 PPCODE: 1567 PPCODE:
1366{ 1568{
1367 STRLEN svlen; 1569 STRLEN svlen;
1368 char *svptr = SvPVbyte (data, svlen); 1570 char *svptr = SvPVbyte (data, svlen);
1571 UV len = SvUV (length);
1369 1572
1370 SvUPGRADE (data, SVt_PV); 1573 SvUPGRADE (data, SVt_PV);
1371 SvPOK_on (data); 1574 SvPOK_on (data);
1372 1575
1373 if (dataoffset < 0) 1576 if (dataoffset < 0)
1374 dataoffset += svlen; 1577 dataoffset += svlen;
1375 1578
1376 if (dataoffset < 0 || dataoffset > svlen) 1579 if (dataoffset < 0 || dataoffset > svlen)
1377 croak ("data offset outside of string"); 1580 croak ("dataoffset outside of data scalar");
1378 1581
1379 if (ix == REQ_WRITE) 1582 if (ix == REQ_WRITE)
1380 { 1583 {
1381 /* write: check length and adjust. */ 1584 /* write: check length and adjust. */
1382 if (length < 0 || length + dataoffset > svlen) 1585 if (!SvOK (length) || len + dataoffset > svlen)
1383 length = svlen - dataoffset; 1586 len = svlen - dataoffset;
1384 } 1587 }
1385 else 1588 else
1386 { 1589 {
1387 /* read: grow scalar as necessary */ 1590 /* read: grow scalar as necessary */
1388 svptr = SvGROW (data, length + dataoffset); 1591 svptr = SvGROW (data, len + dataoffset + 1);
1389 } 1592 }
1390 1593
1391 if (length < 0) 1594 if (len < 0)
1392 croak ("length must not be negative"); 1595 croak ("length must not be negative");
1393 1596
1394 { 1597 {
1395 dREQ; 1598 dREQ;
1396 1599
1397 req->type = ix; 1600 req->type = ix;
1398 req->fh = newSVsv (fh); 1601 req->sv1 = newSVsv (fh);
1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1602 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1400 : IoOFP (sv_2io (fh))); 1603 : IoOFP (sv_2io (fh)));
1401 req->offs = offset; 1604 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1402 req->size = length; 1605 req->size = len;
1403 req->sv1 = SvREFCNT_inc (data); 1606 req->sv2 = SvREFCNT_inc (data);
1404 req->ptr1 = (char *)svptr + dataoffset; 1607 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset; 1608 req->stroffset = dataoffset;
1406 1609
1407 if (!SvREADONLY (data)) 1610 if (!SvREADONLY (data))
1408 { 1611 {
1409 SvREADONLY_on (data); 1612 SvREADONLY_on (data);
1410 req->flags |= FLAG_SV1_RO_OFF; 1613 req->flags |= FLAG_SV2_RO_OFF;
1411 } 1614 }
1412 1615
1413 REQ_SEND; 1616 REQ_SEND;
1414 } 1617 }
1415} 1618}
1416 1619
1417void 1620void
1418aio_readlink (path,callback=&PL_sv_undef) 1621aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$ 1622 PROTOTYPE: $$;$
1422 PPCODE: 1623 PPCODE:
1423{ 1624{
1424 SV *data; 1625 SV *data;
1425 dREQ; 1626 dREQ;
1426 1627
1427 data = newSV (NAME_MAX); 1628 data = newSV (NAME_MAX);
1428 SvPOK_on (data); 1629 SvPOK_on (data);
1429 1630
1430 req->type = REQ_READLINK; 1631 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path); 1632 req->sv1 = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh); 1633 req->ptr2 = SvPVbyte_nolen (req->sv1);
1433 req->sv1 = data; 1634 req->sv2 = data;
1434 req->ptr1 = SvPVbyte_nolen (data); 1635 req->ptr1 = SvPVbyte_nolen (data);
1435 1636
1436 REQ_SEND; 1637 REQ_SEND;
1437} 1638}
1438 1639
1439void 1640void
1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1641aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1441 SV * out_fh
1442 SV * in_fh
1443 UV in_offset
1444 UV length
1445 SV * callback
1446 PROTOTYPE: $$$$;$ 1642 PROTOTYPE: $$$$;$
1447 PPCODE: 1643 PPCODE:
1448{ 1644{
1449 dREQ; 1645 dREQ;
1450 1646
1451 req->type = REQ_SENDFILE; 1647 req->type = REQ_SENDFILE;
1452 req->fh = newSVsv (out_fh); 1648 req->sv1 = newSVsv (out_fh);
1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1649 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1454 req->sv2 = newSVsv (in_fh); 1650 req->sv2 = newSVsv (in_fh);
1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1651 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1456 req->offs = in_offset; 1652 req->offs = SvVAL64 (in_offset);
1457 req->size = length; 1653 req->size = length;
1458 1654
1459 REQ_SEND; 1655 REQ_SEND;
1460} 1656}
1461 1657
1462void 1658void
1463aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1659aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1464 SV * fh
1465 UV offset
1466 IV length
1467 SV * callback
1468 PROTOTYPE: $$$;$ 1660 PROTOTYPE: $$$;$
1469 PPCODE: 1661 PPCODE:
1470{ 1662{
1471 dREQ; 1663 dREQ;
1472 1664
1473 req->type = REQ_READAHEAD; 1665 req->type = REQ_READAHEAD;
1474 req->fh = newSVsv (fh); 1666 req->sv1 = newSVsv (fh);
1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1667 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1476 req->offs = offset; 1668 req->offs = SvVAL64 (offset);
1477 req->size = length; 1669 req->size = length;
1478 1670
1479 REQ_SEND; 1671 REQ_SEND;
1480} 1672}
1481 1673
1482void 1674void
1483aio_stat (fh_or_path,callback=&PL_sv_undef) 1675aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1484 SV8 * fh_or_path
1485 SV * callback
1486 ALIAS: 1676 ALIAS:
1487 aio_stat = REQ_STAT 1677 aio_stat = REQ_STAT
1488 aio_lstat = REQ_LSTAT 1678 aio_lstat = REQ_LSTAT
1489 PPCODE: 1679 PPCODE:
1490{ 1680{
1491 dREQ; 1681 dREQ;
1492 1682
1493 req->ptr2 = malloc (sizeof (Stat_t)); 1683 req->ptr2 = malloc (sizeof (Stat_t));
1494 if (!req->ptr2) 1684 if (!req->ptr2)
1495 { 1685 {
1496 req_free (req); 1686 req_destroy (req);
1497 croak ("out of memory during aio_stat statdata allocation"); 1687 croak ("out of memory during aio_stat statdata allocation");
1498 } 1688 }
1499 1689
1500 req->flags |= FLAG_PTR2_FREE; 1690 req->flags |= FLAG_PTR2_FREE;
1691 req->sv1 = newSVsv (fh_or_path);
1501 1692
1502 if (SvPOK (fh_or_path)) 1693 if (SvPOK (fh_or_path))
1503 { 1694 {
1504 req->type = ix; 1695 req->type = ix;
1505 req->sv1 = newSVsv (fh_or_path);
1506 req->ptr1 = SvPVbyte_nolen (req->sv1); 1696 req->ptr1 = SvPVbyte_nolen (req->sv1);
1507 } 1697 }
1508 else 1698 else
1509 { 1699 {
1510 req->type = REQ_FSTAT; 1700 req->type = REQ_FSTAT;
1511 req->fh = newSVsv (fh_or_path);
1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1701 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1513 } 1702 }
1514 1703
1515 REQ_SEND; 1704 REQ_SEND;
1516} 1705}
1517 1706
1518void 1707void
1708aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1709 PPCODE:
1710{
1711 dREQ;
1712
1713 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1714 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1715 req->sv1 = newSVsv (fh_or_path);
1716
1717 if (SvPOK (fh_or_path))
1718 {
1719 req->type = REQ_UTIME;
1720 req->ptr1 = SvPVbyte_nolen (req->sv1);
1721 }
1722 else
1723 {
1724 req->type = REQ_FUTIME;
1725 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1726 }
1727
1728 REQ_SEND;
1729}
1730
1731void
1732aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1733 PPCODE:
1734{
1735 dREQ;
1736
1737 req->sv1 = newSVsv (fh_or_path);
1738 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1739
1740 if (SvPOK (fh_or_path))
1741 {
1742 req->type = REQ_TRUNCATE;
1743 req->ptr1 = SvPVbyte_nolen (req->sv1);
1744 }
1745 else
1746 {
1747 req->type = REQ_FTRUNCATE;
1748 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1749 }
1750
1751 REQ_SEND;
1752}
1753
1754void
1755aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1756 PPCODE:
1757{
1758 dREQ;
1759
1760 req->mode = mode;
1761 req->sv1 = newSVsv (fh_or_path);
1762
1763 if (SvPOK (fh_or_path))
1764 {
1765 req->type = REQ_CHMOD;
1766 req->ptr1 = SvPVbyte_nolen (req->sv1);
1767 }
1768 else
1769 {
1770 req->type = REQ_FCHMOD;
1771 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1772 }
1773
1774 REQ_SEND;
1775}
1776
1777void
1778aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1779 PPCODE:
1780{
1781 dREQ;
1782
1783 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1784 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1785 req->sv1 = newSVsv (fh_or_path);
1786
1787 if (SvPOK (fh_or_path))
1788 {
1789 req->type = REQ_CHOWN;
1790 req->ptr1 = SvPVbyte_nolen (req->sv1);
1791 }
1792 else
1793 {
1794 req->type = REQ_FCHOWN;
1795 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1796 }
1797
1798 REQ_SEND;
1799}
1800
1801void
1519aio_unlink (pathname,callback=&PL_sv_undef) 1802aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1520 SV8 * pathname
1521 SV * callback
1522 ALIAS: 1803 ALIAS:
1523 aio_unlink = REQ_UNLINK 1804 aio_unlink = REQ_UNLINK
1524 aio_rmdir = REQ_RMDIR 1805 aio_rmdir = REQ_RMDIR
1525 aio_readdir = REQ_READDIR 1806 aio_readdir = REQ_READDIR
1526 PPCODE: 1807 PPCODE:
1533 1814
1534 REQ_SEND; 1815 REQ_SEND;
1535} 1816}
1536 1817
1537void 1818void
1819aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1820 PPCODE:
1821{
1822 dREQ;
1823
1824 req->type = REQ_MKDIR;
1825 req->sv1 = newSVsv (pathname);
1826 req->ptr1 = SvPVbyte_nolen (req->sv1);
1827 req->mode = mode;
1828
1829 REQ_SEND;
1830}
1831
1832void
1538aio_link (oldpath,newpath,callback=&PL_sv_undef) 1833aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1539 SV8 * oldpath
1540 SV8 * newpath
1541 SV * callback
1542 ALIAS: 1834 ALIAS:
1543 aio_link = REQ_LINK 1835 aio_link = REQ_LINK
1544 aio_symlink = REQ_SYMLINK 1836 aio_symlink = REQ_SYMLINK
1545 aio_rename = REQ_RENAME 1837 aio_rename = REQ_RENAME
1546 PPCODE: 1838 PPCODE:
1547{ 1839{
1548 dREQ; 1840 dREQ;
1549 1841
1550 req->type = ix; 1842 req->type = ix;
1551 req->fh = newSVsv (oldpath); 1843 req->sv2 = newSVsv (oldpath);
1552 req->ptr2 = SvPVbyte_nolen (req->fh); 1844 req->ptr2 = SvPVbyte_nolen (req->sv2);
1553 req->sv1 = newSVsv (newpath); 1845 req->sv1 = newSVsv (newpath);
1554 req->ptr1 = SvPVbyte_nolen (req->sv1); 1846 req->ptr1 = SvPVbyte_nolen (req->sv1);
1555 1847
1556 REQ_SEND; 1848 REQ_SEND;
1557} 1849}
1558 1850
1559void 1851void
1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1852aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1561 SV8 * pathname
1562 SV * callback
1563 UV mode
1564 UV dev
1565 PPCODE: 1853 PPCODE:
1566{ 1854{
1567 dREQ; 1855 dREQ;
1568 1856
1569 req->type = REQ_MKNOD; 1857 req->type = REQ_MKNOD;
1574 1862
1575 REQ_SEND; 1863 REQ_SEND;
1576} 1864}
1577 1865
1578void 1866void
1579aio_busy (delay,callback=&PL_sv_undef) 1867aio_busy (double delay, SV *callback=&PL_sv_undef)
1580 double delay
1581 SV * callback
1582 PPCODE: 1868 PPCODE:
1583{ 1869{
1584 dREQ; 1870 dREQ;
1585 1871
1586 req->type = REQ_BUSY; 1872 req->type = REQ_BUSY;
1587 req->int1 = delay < 0. ? 0 : delay; 1873 req->nv1 = delay < 0. ? 0. : delay;
1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1589 1874
1590 REQ_SEND; 1875 REQ_SEND;
1591} 1876}
1592 1877
1593void 1878void
1594aio_group (callback=&PL_sv_undef) 1879aio_group (SV *callback=&PL_sv_undef)
1595 SV * callback
1596 PROTOTYPE: ;$ 1880 PROTOTYPE: ;$
1597 PPCODE: 1881 PPCODE:
1598{ 1882{
1599 dREQ; 1883 dREQ;
1600 1884
1603 req_send (req); 1887 req_send (req);
1604 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1888 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1605} 1889}
1606 1890
1607void 1891void
1608aio_nop (callback=&PL_sv_undef) 1892aio_nop (SV *callback=&PL_sv_undef)
1609 SV * callback
1610 PPCODE: 1893 PPCODE:
1611{ 1894{
1612 dREQ; 1895 dREQ;
1613 1896
1614 req->type = REQ_NOP; 1897 req->type = REQ_NOP;
1677poll_wait() 1960poll_wait()
1678 PROTOTYPE: 1961 PROTOTYPE:
1679 CODE: 1962 CODE:
1680 poll_wait (); 1963 poll_wait ();
1681 1964
1965void
1966setsig (int signum = SIGIO)
1967 PROTOTYPE: ;$
1968 CODE:
1969{
1970 if (block_sig_level)
1971 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1972
1973 X_LOCK (reslock);
1974 main_tid = pthread_self ();
1975 main_sig = signum;
1976 X_UNLOCK (reslock);
1977
1978 if (main_sig && npending)
1979 pthread_kill (main_tid, main_sig);
1980}
1981
1982void
1983aio_block (SV *cb)
1984 PROTOTYPE: &
1985 PPCODE:
1986{
1987 int count;
1988
1989 block_sig ();
1990 PUSHMARK (SP);
1991 PUTBACK;
1992 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1993 SPAGAIN;
1994 unblock_sig ();
1995
1996 if (SvTRUE (ERRSV))
1997 croak (0);
1998
1999 XSRETURN (count);
2000}
2001
1682int 2002int
1683nreqs() 2003nreqs()
1684 PROTOTYPE: 2004 PROTOTYPE:
1685 CODE: 2005 CODE:
1686 RETVAL = nreqs; 2006 RETVAL = nreqs;
1705 2025
1706int 2026int
1707nthreads() 2027nthreads()
1708 PROTOTYPE: 2028 PROTOTYPE:
1709 CODE: 2029 CODE:
1710 if (WORDACCESS_UNSAFE) LOCK (wrklock); 2030 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1711 RETVAL = started; 2031 RETVAL = started;
1712 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 2032 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1713 OUTPUT: 2033 OUTPUT:
1714 RETVAL 2034 RETVAL
1715 2035
1716PROTOTYPES: DISABLE 2036PROTOTYPES: DISABLE
1717 2037
1735 PPCODE: 2055 PPCODE:
1736{ 2056{
1737 int i; 2057 int i;
1738 aio_req req; 2058 aio_req req;
1739 2059
2060 if (main_sig && !block_sig_level)
2061 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2062
1740 if (grp->int1 == 2) 2063 if (grp->int1 == 2)
1741 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 2064 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1742 2065
1743 for (i = 1; i < items; ++i ) 2066 for (i = 1; i < items; ++i )
1744 { 2067 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines