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.88 by root, Mon Oct 30 23:43:17 2006 UTC vs.
Revision 1.112 by root, Tue Apr 1 19:40:47 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines