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.87 by root, Mon Oct 30 23:42:27 2006 UTC vs.
Revision 1.106 by root, Mon Sep 24 18:14:00 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines