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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines