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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines