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.98 by root, Wed May 9 06:45:12 2007 UTC vs.
Revision 1.111 by root, Sun Mar 30 06:31:49 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines