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.105 by root, Sun Jul 8 11:12:15 2007 UTC

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

Diff Legend

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