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.86 by root, Mon Oct 30 23:30:00 2006 UTC vs.
Revision 1.114 by root, Sat Apr 26 12:00:23 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 Stat_t *statdata;
117 off_t offs; 142 off_t offs;
118 size_t size; 143 size_t size;
119 ssize_t result; 144 ssize_t result;
145 double nv1, nv2;
120 146
121 STRLEN stroffset; 147 STRLEN stroffset;
122 int type; 148 int type;
123 int int1, int2; 149 int int1, int2, int3;
124 int errorno; 150 int errorno;
125 mode_t mode; /* open */ 151 mode_t mode; /* open */
126 152
127 unsigned char flags; 153 unsigned char flags;
128 unsigned char pri; 154 unsigned char pri;
130 SV *self; /* the perl counterpart of this request, if any */ 156 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 157 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 158} aio_cb;
133 159
134enum { 160enum {
135 FLAG_CANCELLED = 0x01, 161 FLAG_CANCELLED = 0x01, /* request was cancelled */
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */ 162 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
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_DATA_RO_OFF) 466 if (req->flags & FLAG_SV2_RO_OFF)
402 SvREADONLY_off (req->sv1); 467 SvREADONLY_off (req->sv2);
403
404 if (req->statdata)
405 {
406 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
407 PL_laststatval = req->result;
408 PL_statcache = *(req->statdata);
409 }
410 468
411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 469 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
412 { 470 {
413 ENTER; 471 ENTER;
414 SAVETMPS; 472 SAVETMPS;
445 break; 503 break;
446 504
447 case REQ_OPEN: 505 case REQ_OPEN:
448 { 506 {
449 /* convert fd to fh */ 507 /* convert fd to fh */
450 SV *fh; 508 SV *fh = &PL_sv_undef;
451 509
452 PUSHs (sv_2mortal (newSViv (req->result))); 510 if (req->result >= 0)
453 PUTBACK; 511 {
454 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 512 GV *gv = (GV *)sv_newmortal ();
455 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);
456 519
457 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 );
458 527
528 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
529 fh = (SV *)gv;
530 }
531
459 PUSHMARK (SP); 532 PUSHs (fh);
460 XPUSHs (sv_2mortal (fh));
461 } 533 }
462 break; 534 break;
463 535
464 case REQ_GROUP: 536 case REQ_GROUP:
465 req->int1 = 2; /* mark group as finished */ 537 req->int1 = 2; /* mark group as finished */
480 break; 552 break;
481 553
482 case REQ_READLINK: 554 case REQ_READLINK:
483 if (req->result > 0) 555 if (req->result > 0)
484 { 556 {
485 SvCUR_set (req->sv1, req->result); 557 SvCUR_set (req->sv2, req->result);
486 *SvEND (req->sv1) = 0; 558 *SvEND (req->sv2) = 0;
487 PUSHs (req->sv1); 559 PUSHs (req->sv2);
488 } 560 }
489 break; 561 break;
490 562
563 case REQ_STAT:
564 case REQ_LSTAT:
565 case REQ_FSTAT:
566 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
567 PL_laststatval = req->result;
568 PL_statcache = *(Stat_t *)(req->ptr2);
569 PUSHs (sv_2mortal (newSViv (req->result)));
570 break;
571
491 case REQ_READ: 572 case REQ_READ:
492 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));
493 *SvEND (req->sv1) = 0; 574 *SvEND (req->sv2) = 0;
494 /* fall through */ 575 PUSHs (sv_2mortal (newSViv (req->result)));
576 break;
577
495 default: 578 default:
496 PUSHs (sv_2mortal (newSViv (req->result))); 579 PUSHs (sv_2mortal (newSViv (req->result)));
497 break; 580 break;
498 } 581 }
499 582
500 errno = req->errorno; 583 errno = req->errorno;
501 584
502 PUTBACK; 585 PUTBACK;
503 call_sv (req->callback, G_VOID | G_EVAL); 586 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
504 SPAGAIN; 587 SPAGAIN;
505 588
506 FREETMPS; 589 FREETMPS;
507 LEAVE; 590 LEAVE;
591
592 PUTBACK;
508 } 593 }
509 594
510 if (req->grp) 595 if (req->grp)
511 { 596 {
512 aio_req grp = req->grp; 597 aio_req grp = req->grp;
519 grp->grp_first = req->grp_next; 604 grp->grp_first = req->grp_next;
520 605
521 aio_grp_dec (grp); 606 aio_grp_dec (grp);
522 } 607 }
523 608
524 if (SvTRUE (ERRSV)) 609 return !SvTRUE (ERRSV);
525 {
526 req_free (req);
527 croak (0);
528 }
529} 610}
530 611
531static void req_free (aio_req req) 612static void req_destroy (aio_req req)
532{ 613{
533 if (req->self) 614 if (req->self)
534 { 615 {
535 sv_unmagic (req->self, PERL_MAGIC_ext); 616 sv_unmagic (req->self, PERL_MAGIC_ext);
536 SvREFCNT_dec (req->self); 617 SvREFCNT_dec (req->self);
537 } 618 }
538 619
539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1); 620 SvREFCNT_dec (req->sv1);
541 SvREFCNT_dec (req->sv2); 621 SvREFCNT_dec (req->sv2);
542 SvREFCNT_dec (req->callback); 622 SvREFCNT_dec (req->callback);
543 Safefree (req->statdata);
544 623
545 if (req->type == REQ_READDIR) 624 if (req->flags & FLAG_PTR2_FREE)
546 free (req->ptr2); 625 free (req->ptr2);
547 626
548 Safefree (req); 627 Safefree (req);
549} 628}
550 629
567 req->flags |= FLAG_CANCELLED; 646 req->flags |= FLAG_CANCELLED;
568 647
569 req_cancel_subs (req); 648 req_cancel_subs (req);
570} 649}
571 650
572static 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);
573 696
574static void start_thread (void) 697static void start_thread (void)
575{ 698{
576 sigset_t fullsigset, oldsigset;
577 pthread_attr_t attr;
578
579 worker *wrk = calloc (1, sizeof (worker)); 699 worker *wrk = calloc (1, sizeof (worker));
580 700
581 if (!wrk) 701 if (!wrk)
582 croak ("unable to allocate worker thread data"); 702 croak ("unable to allocate worker thread data");
583 703
584 pthread_attr_init (&attr);
585 pthread_attr_setstacksize (&attr, STACKSIZE);
586 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
587#ifdef PTHREAD_SCOPE_PROCESS
588 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
589#endif
590
591 sigfillset (&fullsigset);
592
593 LOCK (wrklock); 704 X_LOCK (wrklock);
594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
595 705
596 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 706 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
597 { 707 {
598 wrk->prev = &wrk_first; 708 wrk->prev = &wrk_first;
599 wrk->next = wrk_first.next; 709 wrk->next = wrk_first.next;
600 wrk_first.next->prev = wrk; 710 wrk_first.next->prev = wrk;
601 wrk_first.next = wrk; 711 wrk_first.next = wrk;
602 ++started; 712 ++started;
603 } 713 }
604 else 714 else
605 free (wrk); 715 free (wrk);
606 716
607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock); 717 X_UNLOCK (wrklock);
609} 718}
610 719
611static void maybe_start_thread () 720static void maybe_start_thread (void)
612{ 721{
613 if (get_nthreads () >= wanted) 722 if (get_nthreads () >= wanted)
614 return; 723 return;
615 724
616 /* todo: maybe use idle here, but might be less exact */ 725 /* todo: maybe use idle here, but might be less exact */
620 start_thread (); 729 start_thread ();
621} 730}
622 731
623static void req_send (aio_req req) 732static void req_send (aio_req req)
624{ 733{
734 block_sig ();
735
625 ++nreqs; 736 ++nreqs;
626 737
627 LOCK (reqlock); 738 X_LOCK (reqlock);
628 ++nready; 739 ++nready;
629 reqq_push (&req_queue, req); 740 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait); 741 X_COND_SIGNAL (reqwait);
631 UNLOCK (reqlock); 742 X_UNLOCK (reqlock);
743
744 unblock_sig ();
632 745
633 maybe_start_thread (); 746 maybe_start_thread ();
634} 747}
635 748
636static void end_thread (void) 749static void end_thread (void)
640 Newz (0, req, 1, aio_cb); 753 Newz (0, req, 1, aio_cb);
641 754
642 req->type = REQ_QUIT; 755 req->type = REQ_QUIT;
643 req->pri = PRI_MAX + PRI_BIAS; 756 req->pri = PRI_MAX + PRI_BIAS;
644 757
645 LOCK (reqlock); 758 X_LOCK (reqlock);
646 reqq_push (&req_queue, req); 759 reqq_push (&req_queue, req);
647 pthread_cond_signal (&reqwait); 760 X_COND_SIGNAL (reqwait);
648 UNLOCK (reqlock); 761 X_UNLOCK (reqlock);
649 762
650 LOCK (wrklock); 763 X_LOCK (wrklock);
651 --started; 764 --started;
652 UNLOCK (wrklock); 765 X_UNLOCK (wrklock);
653} 766}
654 767
655static void set_max_idle (int nthreads) 768static void set_max_idle (int nthreads)
656{ 769{
657 if (WORDACCESS_UNSAFE) LOCK (reqlock); 770 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
658 max_idle = nthreads <= 0 ? 1 : nthreads; 771 max_idle = nthreads <= 0 ? 1 : nthreads;
659 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 772 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
660} 773}
661 774
662static void min_parallel (int nthreads) 775static void min_parallel (int nthreads)
663{ 776{
664 if (wanted < nthreads) 777 if (wanted < nthreads)
672 785
673 while (started > wanted) 786 while (started > wanted)
674 end_thread (); 787 end_thread ();
675} 788}
676 789
677static void poll_wait () 790static void poll_wait (void)
678{ 791{
679 fd_set rfd; 792 fd_set rfd;
680 793
681 while (nreqs) 794 while (nreqs)
682 { 795 {
683 int size; 796 int size;
684 if (WORDACCESS_UNSAFE) LOCK (reslock); 797 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
685 size = res_queue.size; 798 size = res_queue.size;
686 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 799 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
687 800
688 if (size) 801 if (size)
689 return; 802 return;
690 803
691 maybe_start_thread (); 804 maybe_start_thread ();
692 805
693 FD_ZERO(&rfd); 806 FD_ZERO (&rfd);
694 FD_SET(respipe [0], &rfd); 807 FD_SET (respipe [0], &rfd);
695 808
696 select (respipe [0] + 1, &rfd, 0, 0, 0); 809 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
697 } 810 }
698} 811}
699 812
700static int poll_cb () 813static int poll_cb (void)
701{ 814{
702 dSP; 815 dSP;
703 int count = 0; 816 int count = 0;
704 int maxreqs = max_poll_reqs; 817 int maxreqs = max_poll_reqs;
705 int do_croak = 0; 818 int do_croak = 0;
707 aio_req req; 820 aio_req req;
708 821
709 if (max_poll_time) 822 if (max_poll_time)
710 gettimeofday (&tv_start, 0); 823 gettimeofday (&tv_start, 0);
711 824
825 block_sig ();
826
712 for (;;) 827 for (;;)
713 { 828 {
714 for (;;) 829 for (;;)
715 { 830 {
716 maybe_start_thread (); 831 maybe_start_thread ();
717 832
718 LOCK (reslock); 833 X_LOCK (reslock);
719 req = reqq_shift (&res_queue); 834 req = reqq_shift (&res_queue);
720 835
721 if (req) 836 if (req)
722 { 837 {
723 --npending; 838 --npending;
724 839
725 if (!res_queue.size) 840 if (!res_queue.size)
726 { 841 {
727 /* read any signals sent by the worker threads */ 842 /* read any signals sent by the worker threads */
728 char buf [32]; 843 char buf [4];
729 while (read (respipe [0], buf, 32) == 32) 844 while (respipe_read (respipe [0], buf, 4) == 4)
730 ; 845 ;
731 } 846 }
732 } 847 }
733 848
734 UNLOCK (reslock); 849 X_UNLOCK (reslock);
735 850
736 if (!req) 851 if (!req)
737 break; 852 break;
738 853
739 --nreqs; 854 --nreqs;
743 req->int1 = 1; /* mark request as delayed */ 858 req->int1 = 1; /* mark request as delayed */
744 continue; 859 continue;
745 } 860 }
746 else 861 else
747 { 862 {
748 req_invoke (req); 863 if (!req_invoke (req))
864 {
865 req_destroy (req);
866 unblock_sig ();
867 croak (0);
868 }
749 869
750 count++; 870 count++;
751 } 871 }
752 872
753 req_free (req); 873 req_destroy (req);
754 874
755 if (maxreqs && !--maxreqs) 875 if (maxreqs && !--maxreqs)
756 break; 876 break;
757 877
758 if (max_poll_time) 878 if (max_poll_time)
770 poll_wait (); 890 poll_wait ();
771 891
772 ++maxreqs; 892 ++maxreqs;
773 } 893 }
774 894
895 unblock_sig ();
775 return count; 896 return count;
776}
777
778static void create_pipe ()
779{
780 if (pipe (respipe))
781 croak ("unable to initialize result pipe");
782
783 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
784 croak ("cannot set result pipe to nonblocking mode");
785
786 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
787 croak ("cannot set result pipe to nonblocking mode");
788} 897}
789 898
790/*****************************************************************************/ 899/*****************************************************************************/
791/* work around various missing functions */ 900/* work around various missing functions */
792 901
797/* 906/*
798 * make our pread/pwrite safe against themselves, but not against 907 * make our pread/pwrite safe against themselves, but not against
799 * 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,
800 * but that's your problem, not mine. 909 * but that's your problem, not mine.
801 */ 910 */
802static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 911static mutex_t preadwritelock = X_MUTEX_INIT;
803 912
804static 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)
805{ 914{
806 ssize_t res; 915 ssize_t res;
807 off_t ooffset; 916 off_t ooffset;
808 917
809 LOCK (preadwritelock); 918 X_LOCK (preadwritelock);
810 ooffset = lseek (fd, 0, SEEK_CUR); 919 ooffset = lseek (fd, 0, SEEK_CUR);
811 lseek (fd, offset, SEEK_SET); 920 lseek (fd, offset, SEEK_SET);
812 res = read (fd, buf, count); 921 res = read (fd, buf, count);
813 lseek (fd, ooffset, SEEK_SET); 922 lseek (fd, ooffset, SEEK_SET);
814 UNLOCK (preadwritelock); 923 X_UNLOCK (preadwritelock);
815 924
816 return res; 925 return res;
817} 926}
818 927
819static 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)
820{ 929{
821 ssize_t res; 930 ssize_t res;
822 off_t ooffset; 931 off_t ooffset;
823 932
824 LOCK (preadwritelock); 933 X_LOCK (preadwritelock);
825 ooffset = lseek (fd, 0, SEEK_CUR); 934 ooffset = lseek (fd, 0, SEEK_CUR);
826 lseek (fd, offset, SEEK_SET); 935 lseek (fd, offset, SEEK_SET);
827 res = write (fd, buf, count); 936 res = write (fd, buf, count);
828 lseek (fd, offset, SEEK_SET); 937 lseek (fd, offset, SEEK_SET);
829 UNLOCK (preadwritelock); 938 X_UNLOCK (preadwritelock);
830 939
831 return res; 940 return res;
832} 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
833#endif 970#endif
834 971
835#if !HAVE_FDATASYNC 972#if !HAVE_FDATASYNC
836# define fdatasync fsync 973# define fdatasync fsync
837#endif 974#endif
839#if !HAVE_READAHEAD 976#if !HAVE_READAHEAD
840# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 977# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
841 978
842static 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)
843{ 980{
981 size_t todo = count;
844 dBUF; 982 dBUF;
845 983
846 while (count > 0) 984 while (todo > 0)
847 { 985 {
848 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 986 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
849 987
850 pread (fd, aio_buf, len, offset); 988 pread (fd, aio_buf, len, offset);
851 offset += len; 989 offset += len;
852 count -= len; 990 todo -= len;
853 } 991 }
854 992
855 errno = 0; 993 errno = 0;
994 return count;
856} 995}
857 996
858#endif 997#endif
859 998
860#if !HAVE_READDIR_R 999#if !HAVE_READDIR_R
861# define readdir_r aio_readdir_r 1000# define readdir_r aio_readdir_r
862 1001
863static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 1002static mutex_t readdirlock = X_MUTEX_INIT;
864 1003
865static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 1004static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
866{ 1005{
867 struct dirent *e; 1006 X_DIRENT *e;
868 int errorno; 1007 int errorno;
869 1008
870 LOCK (readdirlock); 1009 X_LOCK (readdirlock);
871 1010
872 e = readdir (dirp); 1011 e = readdir (dirp);
873 errorno = errno; 1012 errorno = errno;
874 1013
875 if (e) 1014 if (e)
878 strcpy (ent->d_name, e->d_name); 1017 strcpy (ent->d_name, e->d_name);
879 } 1018 }
880 else 1019 else
881 *res = 0; 1020 *res = 0;
882 1021
883 UNLOCK (readdirlock); 1022 X_UNLOCK (readdirlock);
884 1023
885 errno = errorno; 1024 errno = errorno;
886 return e ? 0 : -1; 1025 return e ? 0 : -1;
887} 1026}
888#endif 1027#endif
984static void scandir_ (aio_req req, worker *self) 1123static void scandir_ (aio_req req, worker *self)
985{ 1124{
986 DIR *dirp; 1125 DIR *dirp;
987 union 1126 union
988 { 1127 {
989 struct dirent d; 1128 X_DIRENT d;
990 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1129 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
991 } *u; 1130 } *u;
992 struct dirent *entp; 1131 X_DIRENT *entp;
993 char *name, *names; 1132 char *name, *names;
994 int memlen = 4096; 1133 int memlen = 4096;
995 int memofs = 0; 1134 int memofs = 0;
996 int res = 0; 1135 int res = 0;
997 int errorno;
998 1136
999 LOCK (wrklock); 1137 X_LOCK (wrklock);
1000 self->dirp = dirp = opendir (req->ptr1); 1138 self->dirp = dirp = opendir (req->ptr1);
1001 self->dbuf = u = malloc (sizeof (*u)); 1139 self->dbuf = u = malloc (sizeof (*u));
1140 req->flags |= FLAG_PTR2_FREE;
1002 req->ptr2 = names = malloc (memlen); 1141 req->ptr2 = names = malloc (memlen);
1003 UNLOCK (wrklock); 1142 X_UNLOCK (wrklock);
1004 1143
1005 if (dirp && u && names) 1144 if (dirp && u && names)
1006 for (;;) 1145 for (;;)
1007 { 1146 {
1008 errno = 0; 1147 errno = 0;
1020 res++; 1159 res++;
1021 1160
1022 while (memofs + len > memlen) 1161 while (memofs + len > memlen)
1023 { 1162 {
1024 memlen *= 2; 1163 memlen *= 2;
1025 LOCK (wrklock); 1164 X_LOCK (wrklock);
1026 req->ptr2 = names = realloc (names, memlen); 1165 req->ptr2 = names = realloc (names, memlen);
1027 UNLOCK (wrklock); 1166 X_UNLOCK (wrklock);
1028 1167
1029 if (!names) 1168 if (!names)
1030 break; 1169 break;
1031 } 1170 }
1032 1171
1039 res = -1; 1178 res = -1;
1040 1179
1041 req->result = res; 1180 req->result = res;
1042} 1181}
1043 1182
1183static int
1184aio_close (int fd)
1185{
1186 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1187
1188 X_LOCK (wrklock);
1189
1190 if (close_pipe < 0)
1191 {
1192 int pipefd [2];
1193
1194 if (pipe (pipefd) < 0
1195 || close (pipefd [1]) < 0
1196 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
1197 {
1198 X_UNLOCK (wrklock);
1199 return -1;
1200 }
1201
1202 close_pipe = pipefd [0];
1203 }
1204
1205 X_UNLOCK (wrklock);
1206
1207 return dup2 (close_pipe, fd) < 0 ? -1 : 0;
1208}
1209
1044/*****************************************************************************/ 1210/*****************************************************************************/
1045 1211
1046static void *aio_proc (void *thr_arg) 1212X_THREAD_PROC (aio_proc)
1047{ 1213{
1048 aio_req req; 1214 aio_req req;
1049 struct timespec ts; 1215 struct timespec ts;
1050 worker *self = (worker *)thr_arg; 1216 worker *self = (worker *)thr_arg;
1051 1217
1052 /* try to distribute timeouts somewhat evenly */ 1218 /* try to distribute timeouts somewhat randomly */
1053 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 1219 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1054 * (1000000000UL / 1024UL);
1055 1220
1056 for (;;) 1221 for (;;)
1057 { 1222 {
1058 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1223 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1059 1224
1060 LOCK (reqlock); 1225 X_LOCK (reqlock);
1061 1226
1062 for (;;) 1227 for (;;)
1063 { 1228 {
1064 self->req = req = reqq_shift (&req_queue); 1229 self->req = req = reqq_shift (&req_queue);
1065 1230
1066 if (req) 1231 if (req)
1067 break; 1232 break;
1068 1233
1069 ++idle; 1234 ++idle;
1070 1235
1071 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1236 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1072 == ETIMEDOUT) 1237 == ETIMEDOUT)
1073 { 1238 {
1074 if (idle > max_idle) 1239 if (idle > max_idle)
1075 { 1240 {
1076 --idle; 1241 --idle;
1077 UNLOCK (reqlock); 1242 X_UNLOCK (reqlock);
1078 LOCK (wrklock); 1243 X_LOCK (wrklock);
1079 --started; 1244 --started;
1080 UNLOCK (wrklock); 1245 X_UNLOCK (wrklock);
1081 goto quit; 1246 goto quit;
1082 } 1247 }
1083 1248
1084 /* we are allowed to idle, so do so without any timeout */ 1249 /* we are allowed to idle, so do so without any timeout */
1085 pthread_cond_wait (&reqwait, &reqlock); 1250 X_COND_WAIT (reqwait, reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1251 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 } 1252 }
1088 1253
1089 --idle; 1254 --idle;
1090 } 1255 }
1091 1256
1092 --nready; 1257 --nready;
1093 1258
1094 UNLOCK (reqlock); 1259 X_UNLOCK (reqlock);
1095 1260
1096 errno = 0; /* strictly unnecessary */ 1261 errno = 0; /* strictly unnecessary */
1097 1262
1098 if (!(req->flags & FLAG_CANCELLED)) 1263 if (!(req->flags & FLAG_CANCELLED))
1099 switch (req->type) 1264 switch (req->type)
1100 { 1265 {
1101 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; 1266 case REQ_READ: req->result = req->offs >= 0
1102 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; 1267 ? pread (req->int1, req->ptr1, req->size, req->offs)
1268 : read (req->int1, req->ptr1, req->size); break;
1269 case REQ_WRITE: req->result = req->offs >= 0
1270 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1271 : write (req->int1, req->ptr1, req->size); break;
1103 1272
1104 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1273 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1105 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break; 1274 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1106 1275
1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break; 1276 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break; 1277 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break; 1278 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1279
1280 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1281 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1282 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1283 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1284 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1285 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1110 1286
1111 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1287 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1112 case REQ_CLOSE: req->result = close (req->int1); break; 1288 case REQ_CLOSE: req->result = aio_close (req->int1); break;
1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1289 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1290 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1291 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1292 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1293 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1117 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; 1294 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1118 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; 1295 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1119 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; 1296 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1120 1297
1298 case REQ_SYNC: req->result = 0; sync (); break;
1299 case REQ_FSYNC: req->result = fsync (req->int1); break;
1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; 1300 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1122 case REQ_FSYNC: req->result = fsync (req->int1); break; 1301
1123 case REQ_READDIR: scandir_ (req, self); break; 1302 case REQ_READDIR: scandir_ (req, self); break;
1124 1303
1125 case REQ_BUSY: 1304 case REQ_BUSY:
1305#ifdef _WIN32
1306 Sleep (req->nv1 * 1000.);
1307#else
1126 { 1308 {
1127 struct timeval tv; 1309 struct timeval tv;
1128 1310
1129 tv.tv_sec = req->int1; 1311 tv.tv_sec = req->nv1;
1130 tv.tv_usec = req->int2; 1312 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1131 1313
1132 req->result = select (0, 0, 0, 0, &tv); 1314 req->result = select (0, 0, 0, 0, &tv);
1315 }
1316#endif
1317 break;
1318
1319 case REQ_UTIME:
1320 case REQ_FUTIME:
1321 {
1322 struct timeval tv[2];
1323 struct timeval *times;
1324
1325 if (req->nv1 != -1. || req->nv2 != -1.)
1326 {
1327 tv[0].tv_sec = req->nv1;
1328 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1329 tv[1].tv_sec = req->nv2;
1330 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1331
1332 times = tv;
1333 }
1334 else
1335 times = 0;
1336
1337
1338 req->result = req->type == REQ_FUTIME
1339 ? futimes (req->int1, times)
1340 : utimes (req->ptr1, times);
1133 } 1341 }
1134 1342
1135 case REQ_GROUP: 1343 case REQ_GROUP:
1136 case REQ_NOP: 1344 case REQ_NOP:
1137 break; 1345 break;
1138 1346
1139 case REQ_QUIT: 1347 case REQ_QUIT:
1140 goto quit; 1348 goto quit;
1141 1349
1142 default: 1350 default:
1143 req->result = ENOSYS; 1351 req->result = -1;
1144 break; 1352 break;
1145 } 1353 }
1146 1354
1147 req->errorno = errno; 1355 req->errorno = errno;
1148 1356
1149 LOCK (reslock); 1357 X_LOCK (reslock);
1150 1358
1151 ++npending; 1359 ++npending;
1152 1360
1153 if (!reqq_push (&res_queue, req)) 1361 if (!reqq_push (&res_queue, req))
1362 {
1154 /* write a dummy byte to the pipe so fh becomes ready */ 1363 /* write a dummy byte to the pipe so fh becomes ready */
1155 write (respipe [1], &respipe, 1); 1364 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1365
1366 /* optionally signal the main thread asynchronously */
1367 if (main_sig)
1368 pthread_kill (main_tid, main_sig);
1369 }
1156 1370
1157 self->req = 0; 1371 self->req = 0;
1158 worker_clear (self); 1372 worker_clear (self);
1159 1373
1160 UNLOCK (reslock); 1374 X_UNLOCK (reslock);
1161 } 1375 }
1162 1376
1163quit: 1377quit:
1164 LOCK (wrklock); 1378 X_LOCK (wrklock);
1165 worker_free (self); 1379 worker_free (self);
1166 UNLOCK (wrklock); 1380 X_UNLOCK (wrklock);
1167 1381
1168 return 0; 1382 return 0;
1169} 1383}
1170 1384
1171/*****************************************************************************/ 1385/*****************************************************************************/
1172 1386
1173static void atfork_prepare (void) 1387static void atfork_prepare (void)
1174{ 1388{
1175 LOCK (wrklock); 1389 X_LOCK (wrklock);
1176 LOCK (reqlock); 1390 X_LOCK (reqlock);
1177 LOCK (reslock); 1391 X_LOCK (reslock);
1178#if !HAVE_PREADWRITE 1392#if !HAVE_PREADWRITE
1179 LOCK (preadwritelock); 1393 X_LOCK (preadwritelock);
1180#endif 1394#endif
1181#if !HAVE_READDIR_R 1395#if !HAVE_READDIR_R
1182 LOCK (readdirlock); 1396 X_LOCK (readdirlock);
1183#endif 1397#endif
1184} 1398}
1185 1399
1186static void atfork_parent (void) 1400static void atfork_parent (void)
1187{ 1401{
1188#if !HAVE_READDIR_R 1402#if !HAVE_READDIR_R
1189 UNLOCK (readdirlock); 1403 X_UNLOCK (readdirlock);
1190#endif 1404#endif
1191#if !HAVE_PREADWRITE 1405#if !HAVE_PREADWRITE
1192 UNLOCK (preadwritelock); 1406 X_UNLOCK (preadwritelock);
1193#endif 1407#endif
1194 UNLOCK (reslock); 1408 X_UNLOCK (reslock);
1195 UNLOCK (reqlock); 1409 X_UNLOCK (reqlock);
1196 UNLOCK (wrklock); 1410 X_UNLOCK (wrklock);
1197} 1411}
1198 1412
1199static void atfork_child (void) 1413static void atfork_child (void)
1200{ 1414{
1201 aio_req prv; 1415 aio_req prv;
1202 1416
1203 while (prv = reqq_shift (&req_queue)) 1417 while (prv = reqq_shift (&req_queue))
1204 req_free (prv); 1418 req_destroy (prv);
1205 1419
1206 while (prv = reqq_shift (&res_queue)) 1420 while (prv = reqq_shift (&res_queue))
1207 req_free (prv); 1421 req_destroy (prv);
1208 1422
1209 while (wrk_first.next != &wrk_first) 1423 while (wrk_first.next != &wrk_first)
1210 { 1424 {
1211 worker *wrk = wrk_first.next; 1425 worker *wrk = wrk_first.next;
1212 1426
1213 if (wrk->req) 1427 if (wrk->req)
1214 req_free (wrk->req); 1428 req_destroy (wrk->req);
1215 1429
1216 worker_clear (wrk); 1430 worker_clear (wrk);
1217 worker_free (wrk); 1431 worker_free (wrk);
1218 } 1432 }
1219 1433
1221 idle = 0; 1435 idle = 0;
1222 nreqs = 0; 1436 nreqs = 0;
1223 nready = 0; 1437 nready = 0;
1224 npending = 0; 1438 npending = 0;
1225 1439
1226 close (respipe [0]);
1227 close (respipe [1]);
1228 create_pipe (); 1440 create_respipe ();
1229 1441
1230 atfork_parent (); 1442 atfork_parent ();
1231} 1443}
1232 1444
1233#define dREQ \ 1445#define dREQ \
1255 1467
1256PROTOTYPES: ENABLE 1468PROTOTYPES: ENABLE
1257 1469
1258BOOT: 1470BOOT:
1259{ 1471{
1260 HV *stash = gv_stashpv ("IO::AIO", 1); 1472 stash = gv_stashpv ("IO::AIO", 1);
1261 1473
1262 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1264 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1265 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1266 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1479#ifdef _WIN32
1480 X_MUTEX_CHECK (wrklock);
1481 X_MUTEX_CHECK (reslock);
1482 X_MUTEX_CHECK (reqlock);
1483 X_MUTEX_CHECK (reqwait);
1484 X_MUTEX_CHECK (preadwritelock);
1485 X_MUTEX_CHECK (readdirlock);
1486
1487 X_COND_CHECK (reqwait);
1488#else
1267 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1490 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1491#endif
1268 1492
1269 create_pipe (); 1493 create_respipe ();
1494
1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1495 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1271} 1496}
1272 1497
1273void 1498void
1274max_poll_reqs (int nreqs) 1499max_poll_reqs (int nreqs)
1275 PROTOTYPE: $ 1500 PROTOTYPE: $
1304 max_outstanding = maxreqs; 1529 max_outstanding = maxreqs;
1305 OUTPUT: 1530 OUTPUT:
1306 RETVAL 1531 RETVAL
1307 1532
1308void 1533void
1309aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1534aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1310 SV * pathname
1311 int flags
1312 int mode
1313 SV * callback
1314 PROTOTYPE: $$$;$ 1535 PROTOTYPE: $$$;$
1315 PPCODE: 1536 PPCODE:
1316{ 1537{
1317 dREQ; 1538 dREQ;
1318 1539
1319 req->type = REQ_OPEN; 1540 req->type = REQ_OPEN;
1320 req->sv1 = newSVsv (pathname); 1541 req->sv1 = newSVsv (pathname);
1321 req->ptr1 = SvPVbyte_nolen (pathname); 1542 req->ptr1 = SvPVbyte_nolen (req->sv1);
1322 req->int1 = flags; 1543 req->int1 = flags;
1323 req->mode = mode; 1544 req->mode = mode;
1324 1545
1325 REQ_SEND; 1546 REQ_SEND;
1326} 1547}
1327 1548
1328void 1549void
1329aio_close (fh,callback=&PL_sv_undef) 1550aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1330 SV * fh
1331 SV * callback
1332 PROTOTYPE: $;$ 1551 PROTOTYPE: $;$
1333 ALIAS: 1552 ALIAS:
1334 aio_close = REQ_CLOSE
1335 aio_fsync = REQ_FSYNC 1553 aio_fsync = REQ_FSYNC
1336 aio_fdatasync = REQ_FDATASYNC 1554 aio_fdatasync = REQ_FDATASYNC
1337 PPCODE: 1555 PPCODE:
1338{ 1556{
1339 dREQ; 1557 dREQ;
1340 1558
1341 req->type = ix; 1559 req->type = ix;
1342 req->fh = newSVsv (fh); 1560 req->sv1 = newSVsv (fh);
1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1561 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1344 1562
1345 REQ_SEND (req); 1563 REQ_SEND (req);
1346} 1564}
1347 1565
1348void 1566void
1567aio_close (SV *fh, SV *callback=&PL_sv_undef)
1568 PROTOTYPE: $;$
1569 PPCODE:
1570{
1571 dREQ;
1572
1573 req->type = REQ_CLOSE;
1574 req->sv1 = newSVsv (fh);
1575 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1576
1577 REQ_SEND (req);
1578}
1579
1580void
1349aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1581aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1350 SV * fh
1351 UV offset
1352 UV length
1353 SV * data
1354 UV dataoffset
1355 SV * callback
1356 ALIAS: 1582 ALIAS:
1357 aio_read = REQ_READ 1583 aio_read = REQ_READ
1358 aio_write = REQ_WRITE 1584 aio_write = REQ_WRITE
1359 PROTOTYPE: $$$$$;$ 1585 PROTOTYPE: $$$$$;$
1360 PPCODE: 1586 PPCODE:
1361{ 1587{
1362 STRLEN svlen; 1588 STRLEN svlen;
1363 char *svptr = SvPVbyte (data, svlen); 1589 char *svptr = SvPVbyte (data, svlen);
1590 UV len = SvUV (length);
1364 1591
1365 SvUPGRADE (data, SVt_PV); 1592 SvUPGRADE (data, SVt_PV);
1366 SvPOK_on (data); 1593 SvPOK_on (data);
1367 1594
1368 if (dataoffset < 0) 1595 if (dataoffset < 0)
1369 dataoffset += svlen; 1596 dataoffset += svlen;
1370 1597
1371 if (dataoffset < 0 || dataoffset > svlen) 1598 if (dataoffset < 0 || dataoffset > svlen)
1372 croak ("data offset outside of string"); 1599 croak ("dataoffset outside of data scalar");
1373 1600
1374 if (ix == REQ_WRITE) 1601 if (ix == REQ_WRITE)
1375 { 1602 {
1376 /* write: check length and adjust. */ 1603 /* write: check length and adjust. */
1377 if (length < 0 || length + dataoffset > svlen) 1604 if (!SvOK (length) || len + dataoffset > svlen)
1378 length = svlen - dataoffset; 1605 len = svlen - dataoffset;
1379 } 1606 }
1380 else 1607 else
1381 { 1608 {
1382 /* read: grow scalar as necessary */ 1609 /* read: grow scalar as necessary */
1383 svptr = SvGROW (data, length + dataoffset); 1610 svptr = SvGROW (data, len + dataoffset + 1);
1384 } 1611 }
1385 1612
1386 if (length < 0) 1613 if (len < 0)
1387 croak ("length must not be negative"); 1614 croak ("length must not be negative");
1388 1615
1389 { 1616 {
1390 dREQ; 1617 dREQ;
1391 1618
1392 req->type = ix; 1619 req->type = ix;
1393 req->fh = newSVsv (fh); 1620 req->sv1 = newSVsv (fh);
1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1621 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1395 : IoOFP (sv_2io (fh))); 1622 : IoOFP (sv_2io (fh)));
1396 req->offs = offset; 1623 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1397 req->size = length; 1624 req->size = len;
1398 req->sv1 = SvREFCNT_inc (data); 1625 req->sv2 = SvREFCNT_inc (data);
1399 req->ptr1 = (char *)svptr + dataoffset; 1626 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset; 1627 req->stroffset = dataoffset;
1401 1628
1402 if (!SvREADONLY (data)) 1629 if (!SvREADONLY (data))
1403 { 1630 {
1404 SvREADONLY_on (data); 1631 SvREADONLY_on (data);
1405 req->flags |= FLAG_DATA_RO_OFF; 1632 req->flags |= FLAG_SV2_RO_OFF;
1406 } 1633 }
1407 1634
1408 REQ_SEND; 1635 REQ_SEND;
1409 } 1636 }
1410} 1637}
1411 1638
1412void 1639void
1413aio_readlink (path,callback=&PL_sv_undef) 1640aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1414 SV * path
1415 SV * callback
1416 PROTOTYPE: $$;$ 1641 PROTOTYPE: $$;$
1417 PPCODE: 1642 PPCODE:
1418{ 1643{
1419 SV *data; 1644 SV *data;
1420 dREQ; 1645 dREQ;
1421 1646
1422 data = newSV (NAME_MAX); 1647 data = newSV (NAME_MAX);
1423 SvPOK_on (data); 1648 SvPOK_on (data);
1424 1649
1425 req->type = REQ_READLINK; 1650 req->type = REQ_READLINK;
1426 req->fh = newSVsv (path); 1651 req->sv1 = newSVsv (path);
1427 req->ptr2 = SvPVbyte_nolen (path); 1652 req->ptr2 = SvPVbyte_nolen (req->sv1);
1428 req->sv1 = data; 1653 req->sv2 = data;
1429 req->ptr1 = SvPVbyte_nolen (data); 1654 req->ptr1 = SvPVbyte_nolen (data);
1430 1655
1431 REQ_SEND; 1656 REQ_SEND;
1432} 1657}
1433 1658
1434void 1659void
1435aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1660aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1436 SV * out_fh
1437 SV * in_fh
1438 UV in_offset
1439 UV length
1440 SV * callback
1441 PROTOTYPE: $$$$;$ 1661 PROTOTYPE: $$$$;$
1442 PPCODE: 1662 PPCODE:
1443{ 1663{
1444 dREQ; 1664 dREQ;
1445 1665
1446 req->type = REQ_SENDFILE; 1666 req->type = REQ_SENDFILE;
1447 req->fh = newSVsv (out_fh); 1667 req->sv1 = newSVsv (out_fh);
1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1668 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1449 req->sv2 = newSVsv (in_fh); 1669 req->sv2 = newSVsv (in_fh);
1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1670 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1451 req->offs = in_offset; 1671 req->offs = SvVAL64 (in_offset);
1452 req->size = length; 1672 req->size = length;
1453 1673
1454 REQ_SEND; 1674 REQ_SEND;
1455} 1675}
1456 1676
1457void 1677void
1458aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1678aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1459 SV * fh
1460 UV offset
1461 IV length
1462 SV * callback
1463 PROTOTYPE: $$$;$ 1679 PROTOTYPE: $$$;$
1464 PPCODE: 1680 PPCODE:
1465{ 1681{
1466 dREQ; 1682 dREQ;
1467 1683
1468 req->type = REQ_READAHEAD; 1684 req->type = REQ_READAHEAD;
1469 req->fh = newSVsv (fh); 1685 req->sv1 = newSVsv (fh);
1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1686 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1471 req->offs = offset; 1687 req->offs = SvVAL64 (offset);
1472 req->size = length; 1688 req->size = length;
1473 1689
1474 REQ_SEND; 1690 REQ_SEND;
1475} 1691}
1476 1692
1477void 1693void
1478aio_stat (fh_or_path,callback=&PL_sv_undef) 1694aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1479 SV * fh_or_path
1480 SV * callback
1481 ALIAS: 1695 ALIAS:
1482 aio_stat = REQ_STAT 1696 aio_stat = REQ_STAT
1483 aio_lstat = REQ_LSTAT 1697 aio_lstat = REQ_LSTAT
1484 PPCODE: 1698 PPCODE:
1485{ 1699{
1486 dREQ; 1700 dREQ;
1487 1701
1488 New (0, req->statdata, 1, Stat_t); 1702 req->ptr2 = malloc (sizeof (Stat_t));
1489 if (!req->statdata) 1703 if (!req->ptr2)
1490 { 1704 {
1491 req_free (req); 1705 req_destroy (req);
1492 croak ("out of memory during aio_req->statdata allocation"); 1706 croak ("out of memory during aio_stat statdata allocation");
1493 } 1707 }
1708
1709 req->flags |= FLAG_PTR2_FREE;
1710 req->sv1 = newSVsv (fh_or_path);
1494 1711
1495 if (SvPOK (fh_or_path)) 1712 if (SvPOK (fh_or_path))
1496 { 1713 {
1497 req->type = ix; 1714 req->type = ix;
1498 req->sv1 = newSVsv (fh_or_path);
1499 req->ptr1 = SvPVbyte_nolen (fh_or_path); 1715 req->ptr1 = SvPVbyte_nolen (req->sv1);
1500 } 1716 }
1501 else 1717 else
1502 { 1718 {
1503 req->type = REQ_FSTAT; 1719 req->type = REQ_FSTAT;
1504 req->fh = newSVsv (fh_or_path);
1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1720 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1506 } 1721 }
1507 1722
1508 REQ_SEND; 1723 REQ_SEND;
1509} 1724}
1510 1725
1511void 1726void
1727aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1728 PPCODE:
1729{
1730 dREQ;
1731
1732 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1733 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1734 req->sv1 = newSVsv (fh_or_path);
1735
1736 if (SvPOK (fh_or_path))
1737 {
1738 req->type = REQ_UTIME;
1739 req->ptr1 = SvPVbyte_nolen (req->sv1);
1740 }
1741 else
1742 {
1743 req->type = REQ_FUTIME;
1744 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1745 }
1746
1747 REQ_SEND;
1748}
1749
1750void
1751aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1752 PPCODE:
1753{
1754 dREQ;
1755
1756 req->sv1 = newSVsv (fh_or_path);
1757 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1758
1759 if (SvPOK (fh_or_path))
1760 {
1761 req->type = REQ_TRUNCATE;
1762 req->ptr1 = SvPVbyte_nolen (req->sv1);
1763 }
1764 else
1765 {
1766 req->type = REQ_FTRUNCATE;
1767 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1768 }
1769
1770 REQ_SEND;
1771}
1772
1773void
1774aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1775 PPCODE:
1776{
1777 dREQ;
1778
1779 req->mode = mode;
1780 req->sv1 = newSVsv (fh_or_path);
1781
1782 if (SvPOK (fh_or_path))
1783 {
1784 req->type = REQ_CHMOD;
1785 req->ptr1 = SvPVbyte_nolen (req->sv1);
1786 }
1787 else
1788 {
1789 req->type = REQ_FCHMOD;
1790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1791 }
1792
1793 REQ_SEND;
1794}
1795
1796void
1797aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1798 PPCODE:
1799{
1800 dREQ;
1801
1802 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1803 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1804 req->sv1 = newSVsv (fh_or_path);
1805
1806 if (SvPOK (fh_or_path))
1807 {
1808 req->type = REQ_CHOWN;
1809 req->ptr1 = SvPVbyte_nolen (req->sv1);
1810 }
1811 else
1812 {
1813 req->type = REQ_FCHOWN;
1814 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1815 }
1816
1817 REQ_SEND;
1818}
1819
1820void
1512aio_unlink (pathname,callback=&PL_sv_undef) 1821aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1513 SV * pathname
1514 SV * callback
1515 ALIAS: 1822 ALIAS:
1516 aio_unlink = REQ_UNLINK 1823 aio_unlink = REQ_UNLINK
1517 aio_rmdir = REQ_RMDIR 1824 aio_rmdir = REQ_RMDIR
1518 aio_readdir = REQ_READDIR 1825 aio_readdir = REQ_READDIR
1519 PPCODE: 1826 PPCODE:
1520{ 1827{
1521 dREQ; 1828 dREQ;
1522 1829
1523 req->type = ix; 1830 req->type = ix;
1524 req->sv1 = newSVsv (pathname); 1831 req->sv1 = newSVsv (pathname);
1525 req->ptr1 = SvPVbyte_nolen (pathname); 1832 req->ptr1 = SvPVbyte_nolen (req->sv1);
1833
1834 REQ_SEND;
1835}
1836
1837void
1838aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1839 PPCODE:
1840{
1841 dREQ;
1526 1842
1843 req->type = REQ_MKDIR;
1844 req->sv1 = newSVsv (pathname);
1845 req->ptr1 = SvPVbyte_nolen (req->sv1);
1846 req->mode = mode;
1847
1527 REQ_SEND; 1848 REQ_SEND;
1528} 1849}
1529 1850
1530void 1851void
1531aio_link (oldpath,newpath,callback=&PL_sv_undef) 1852aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1532 SV * oldpath
1533 SV * newpath
1534 SV * callback
1535 ALIAS: 1853 ALIAS:
1536 aio_link = REQ_LINK 1854 aio_link = REQ_LINK
1537 aio_symlink = REQ_SYMLINK 1855 aio_symlink = REQ_SYMLINK
1538 aio_rename = REQ_RENAME 1856 aio_rename = REQ_RENAME
1539 PPCODE: 1857 PPCODE:
1540{ 1858{
1541 dREQ; 1859 dREQ;
1542 1860
1543 req->type = ix; 1861 req->type = ix;
1544 req->fh = newSVsv (oldpath); 1862 req->sv2 = newSVsv (oldpath);
1545 req->ptr2 = SvPVbyte_nolen (req->fh); 1863 req->ptr2 = SvPVbyte_nolen (req->sv2);
1546 req->sv1 = newSVsv (newpath); 1864 req->sv1 = newSVsv (newpath);
1547 req->ptr1 = SvPVbyte_nolen (newpath); 1865 req->ptr1 = SvPVbyte_nolen (req->sv1);
1548 1866
1549 REQ_SEND; 1867 REQ_SEND;
1550} 1868}
1551 1869
1552void 1870void
1553aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1871aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1554 SV * pathname
1555 SV * callback
1556 UV mode
1557 UV dev
1558 PPCODE: 1872 PPCODE:
1559{ 1873{
1560 dREQ; 1874 dREQ;
1561 1875
1562 req->type = REQ_MKNOD; 1876 req->type = REQ_MKNOD;
1563 req->sv1 = newSVsv (pathname); 1877 req->sv1 = newSVsv (pathname);
1564 req->ptr1 = SvPVbyte_nolen (pathname); 1878 req->ptr1 = SvPVbyte_nolen (req->sv1);
1565 req->mode = (mode_t)mode; 1879 req->mode = (mode_t)mode;
1566 req->offs = dev; 1880 req->offs = dev;
1567 1881
1568 REQ_SEND; 1882 REQ_SEND;
1569} 1883}
1570 1884
1571void 1885void
1572aio_busy (delay,callback=&PL_sv_undef) 1886aio_busy (double delay, SV *callback=&PL_sv_undef)
1573 double delay
1574 SV * callback
1575 PPCODE: 1887 PPCODE:
1576{ 1888{
1577 dREQ; 1889 dREQ;
1578 1890
1579 req->type = REQ_BUSY; 1891 req->type = REQ_BUSY;
1580 req->int1 = delay < 0. ? 0 : delay; 1892 req->nv1 = delay < 0. ? 0. : delay;
1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1582 1893
1583 REQ_SEND; 1894 REQ_SEND;
1584} 1895}
1585 1896
1586void 1897void
1587aio_group (callback=&PL_sv_undef) 1898aio_group (SV *callback=&PL_sv_undef)
1588 SV * callback
1589 PROTOTYPE: ;$ 1899 PROTOTYPE: ;$
1590 PPCODE: 1900 PPCODE:
1591{ 1901{
1592 dREQ; 1902 dREQ;
1593 1903
1596 req_send (req); 1906 req_send (req);
1597 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1907 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1598} 1908}
1599 1909
1600void 1910void
1601aio_nop (callback=&PL_sv_undef) 1911aio_nop (SV *callback=&PL_sv_undef)
1602 SV * callback 1912 ALIAS:
1913 aio_nop = REQ_NOP
1914 aio_sync = REQ_SYNC
1603 PPCODE: 1915 PPCODE:
1604{ 1916{
1605 dREQ; 1917 dREQ;
1606 1918
1607 req->type = REQ_NOP; 1919 req->type = ix;
1608 1920
1609 REQ_SEND; 1921 REQ_SEND;
1610} 1922}
1611 1923
1612int 1924int
1636 PROTOTYPE: 1948 PROTOTYPE:
1637 CODE: 1949 CODE:
1638 while (nreqs) 1950 while (nreqs)
1639 { 1951 {
1640 poll_wait (); 1952 poll_wait ();
1641 poll_cb (0); 1953 poll_cb ();
1642 } 1954 }
1643 1955
1644void 1956int
1645poll() 1957poll()
1646 PROTOTYPE: 1958 PROTOTYPE:
1647 CODE: 1959 CODE:
1648 if (nreqs)
1649 {
1650 poll_wait (); 1960 poll_wait ();
1651 poll_cb (0); 1961 RETVAL = poll_cb ();
1652 } 1962 OUTPUT:
1963 RETVAL
1653 1964
1654int 1965int
1655poll_fileno() 1966poll_fileno()
1656 PROTOTYPE: 1967 PROTOTYPE:
1657 CODE: 1968 CODE:
1669 1980
1670void 1981void
1671poll_wait() 1982poll_wait()
1672 PROTOTYPE: 1983 PROTOTYPE:
1673 CODE: 1984 CODE:
1674 if (nreqs)
1675 poll_wait (); 1985 poll_wait ();
1986
1987void
1988setsig (int signum = SIGIO)
1989 PROTOTYPE: ;$
1990 CODE:
1991{
1992 if (block_sig_level)
1993 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1994
1995 X_LOCK (reslock);
1996 main_tid = pthread_self ();
1997 main_sig = signum;
1998 X_UNLOCK (reslock);
1999
2000 if (main_sig && npending)
2001 pthread_kill (main_tid, main_sig);
2002}
2003
2004void
2005aio_block (SV *cb)
2006 PROTOTYPE: &
2007 PPCODE:
2008{
2009 int count;
2010
2011 block_sig ();
2012 PUSHMARK (SP);
2013 PUTBACK;
2014 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
2015 unblock_sig ();
2016
2017 if (SvTRUE (ERRSV))
2018 croak (0);
2019
2020 XSRETURN (count);
2021}
1676 2022
1677int 2023int
1678nreqs() 2024nreqs()
1679 PROTOTYPE: 2025 PROTOTYPE:
1680 CODE: 2026 CODE:
1700 2046
1701int 2047int
1702nthreads() 2048nthreads()
1703 PROTOTYPE: 2049 PROTOTYPE:
1704 CODE: 2050 CODE:
1705 if (WORDACCESS_UNSAFE) LOCK (wrklock); 2051 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1706 RETVAL = started; 2052 RETVAL = started;
1707 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 2053 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1708 OUTPUT: 2054 OUTPUT:
1709 RETVAL 2055 RETVAL
1710 2056
1711PROTOTYPES: DISABLE 2057PROTOTYPES: DISABLE
1712 2058
1730 PPCODE: 2076 PPCODE:
1731{ 2077{
1732 int i; 2078 int i;
1733 aio_req req; 2079 aio_req req;
1734 2080
2081 if (main_sig && !block_sig_level)
2082 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2083
1735 if (grp->int1 == 2) 2084 if (grp->int1 == 2)
1736 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 2085 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1737 2086
1738 for (i = 1; i < items; ++i ) 2087 for (i = 1; i < items; ++i )
1739 { 2088 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines