ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC vs.
Revision 1.103 by root, Sun Jul 8 09:09:34 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines