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.92 by root, Wed Nov 8 01:59:59 2006 UTC vs.
Revision 1.109 by root, Sat Oct 6 14:05:19 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h"
18
19#include <pthread.h>
20
21#include <stddef.h> 9#include <stddef.h>
10#include <stdlib.h>
22#include <errno.h> 11#include <errno.h>
23#include <sys/time.h>
24#include <sys/select.h>
25#include <sys/types.h> 12#include <sys/types.h>
26#include <sys/stat.h> 13#include <sys/stat.h>
27#include <limits.h> 14#include <limits.h>
28#include <unistd.h>
29#include <fcntl.h> 15#include <fcntl.h>
30#include <signal.h>
31#include <sched.h> 16#include <sched.h>
17
18#ifdef _WIN32
19
20# define SIGIO 0
21 typedef Direntry_t X_DIRENT;
22#undef malloc
23#undef free
24
25// perl overrides all those nice win32 functions
26# undef open
27# undef read
28# undef write
29# undef send
30# undef recv
31# undef stat
32# undef fstat
33# define lstat stat
34# undef truncate
35# undef ftruncate
36# undef open
37# undef close
38# undef unlink
39# undef rmdir
40# undef rename
41# undef lseek
42
43# define chown(a,b,c) (errno = ENOSYS, -1)
44# define fchown(a,b,c) (errno = ENOSYS, -1)
45# define fchmod(a,b) (errno = ENOSYS, -1)
46# define symlink(a,b) (errno = ENOSYS, -1)
47# define readlink(a,b,c) (errno = ENOSYS, -1)
48# define mknod(a,b,c) (errno = ENOSYS, -1)
49# define truncate(a,b) (errno = ENOSYS, -1)
50# define ftruncate(fd,o) chsize ((fd), (o))
51# define fsync(fd) _commit (fd)
52# define opendir(fd) (errno = ENOSYS, 0)
53# define readdir(fd) (errno = ENOSYS, -1)
54# define closedir(fd) (errno = ENOSYS, -1)
55# define mkdir(a,b) mkdir (a)
56
57#else
58
59# include "autoconf/config.h"
60# include <sys/time.h>
61# include <sys/select.h>
62# include <unistd.h>
63# include <utime.h>
64# include <signal.h>
65 typedef struct dirent X_DIRENT;
66
67#endif
32 68
33#if HAVE_SENDFILE 69#if HAVE_SENDFILE
34# if __linux 70# if __linux
35# include <sys/sendfile.h> 71# include <sys/sendfile.h>
36# elif __freebsd 72# elif __freebsd
51/* used for struct dirent, AIX doesn't provide it */ 87/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 88#ifndef NAME_MAX
53# define NAME_MAX 4096 89# define NAME_MAX 4096
54#endif 90#endif
55 91
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
61#if __ia64
62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
65#else
66# define STACKSIZE 16384
67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */ 92/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 93#define AIO_BUFSIZE 65536
83 94
95/* use NV for 32 bit perls as it allows larger offsets */
96#if IVSIZE >= 8
97# define SvVAL64 SvIV
98#else
99# define SvVAL64 SvNV
100#endif
101
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_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 ()
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 ()
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 ()
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 ()
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 ()
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
320 370
321 abort (); 371 abort ();
322} 372}
323 373
324static int poll_cb (); 374static int poll_cb ();
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 = 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 );
453 527
528 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
529 fh = (SV *)gv;
530 }
531
454 PUSHMARK (SP); 532 PUSHs (fh);
455 XPUSHs (sv_2mortal (fh));
456 } 533 }
457 break; 534 break;
458 535
459 case REQ_GROUP: 536 case REQ_GROUP:
460 req->int1 = 2; /* mark group as finished */ 537 req->int1 = 2; /* mark group as finished */
475 break; 552 break;
476 553
477 case REQ_READLINK: 554 case REQ_READLINK:
478 if (req->result > 0) 555 if (req->result > 0)
479 { 556 {
480 SvCUR_set (req->sv1, req->result); 557 SvCUR_set (req->sv2, req->result);
481 *SvEND (req->sv1) = 0; 558 *SvEND (req->sv2) = 0;
482 PUSHs (req->sv1); 559 PUSHs (req->sv2);
483 } 560 }
484 break; 561 break;
485 562
486 case REQ_STAT: 563 case REQ_STAT:
487 case REQ_LSTAT: 564 case REQ_LSTAT:
491 PL_statcache = *(Stat_t *)(req->ptr2); 568 PL_statcache = *(Stat_t *)(req->ptr2);
492 PUSHs (sv_2mortal (newSViv (req->result))); 569 PUSHs (sv_2mortal (newSViv (req->result)));
493 break; 570 break;
494 571
495 case REQ_READ: 572 case REQ_READ:
496 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));
497 *SvEND (req->sv1) = 0; 574 *SvEND (req->sv2) = 0;
498 PUSHs (sv_2mortal (newSViv (req->result))); 575 PUSHs (sv_2mortal (newSViv (req->result)));
499 break; 576 break;
500 577
501 default: 578 default:
502 PUSHs (sv_2mortal (newSViv (req->result))); 579 PUSHs (sv_2mortal (newSViv (req->result)));
504 } 581 }
505 582
506 errno = req->errorno; 583 errno = req->errorno;
507 584
508 PUTBACK; 585 PUTBACK;
509 call_sv (req->callback, G_VOID | G_EVAL); 586 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
510 SPAGAIN; 587 SPAGAIN;
511 588
512 FREETMPS; 589 FREETMPS;
513 LEAVE; 590 LEAVE;
591
592 PUTBACK;
514 } 593 }
515 594
516 if (req->grp) 595 if (req->grp)
517 { 596 {
518 aio_req grp = req->grp; 597 aio_req grp = req->grp;
525 grp->grp_first = req->grp_next; 604 grp->grp_first = req->grp_next;
526 605
527 aio_grp_dec (grp); 606 aio_grp_dec (grp);
528 } 607 }
529 608
530 if (SvTRUE (ERRSV)) 609 return !SvTRUE (ERRSV);
531 {
532 req_free (req);
533 croak (0);
534 }
535} 610}
536 611
537static void req_free (aio_req req) 612static void req_destroy (aio_req req)
538{ 613{
539 if (req->self) 614 if (req->self)
540 { 615 {
541 sv_unmagic (req->self, PERL_MAGIC_ext); 616 sv_unmagic (req->self, PERL_MAGIC_ext);
542 SvREFCNT_dec (req->self); 617 SvREFCNT_dec (req->self);
543 } 618 }
544 619
545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1); 620 SvREFCNT_dec (req->sv1);
547 SvREFCNT_dec (req->sv2); 621 SvREFCNT_dec (req->sv2);
548 SvREFCNT_dec (req->callback); 622 SvREFCNT_dec (req->callback);
549 623
550 if (req->flags & FLAG_PTR2_FREE) 624 if (req->flags & FLAG_PTR2_FREE)
572 req->flags |= FLAG_CANCELLED; 646 req->flags |= FLAG_CANCELLED;
573 647
574 req_cancel_subs (req); 648 req_cancel_subs (req);
575} 649}
576 650
577static 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 ()
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);
578 696
579static void start_thread (void) 697static void start_thread (void)
580{ 698{
581 sigset_t fullsigset, oldsigset;
582 pthread_attr_t attr;
583
584 worker *wrk = calloc (1, sizeof (worker)); 699 worker *wrk = calloc (1, sizeof (worker));
585 700
586 if (!wrk) 701 if (!wrk)
587 croak ("unable to allocate worker thread data"); 702 croak ("unable to allocate worker thread data");
588 703
589 pthread_attr_init (&attr);
590 pthread_attr_setstacksize (&attr, STACKSIZE);
591 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
592#ifdef PTHREAD_SCOPE_PROCESS
593 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
594#endif
595
596 sigfillset (&fullsigset);
597
598 LOCK (wrklock); 704 X_LOCK (wrklock);
599 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
600 705
601 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 706 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
602 { 707 {
603 wrk->prev = &wrk_first; 708 wrk->prev = &wrk_first;
604 wrk->next = wrk_first.next; 709 wrk->next = wrk_first.next;
605 wrk_first.next->prev = wrk; 710 wrk_first.next->prev = wrk;
606 wrk_first.next = wrk; 711 wrk_first.next = wrk;
607 ++started; 712 ++started;
608 } 713 }
609 else 714 else
610 free (wrk); 715 free (wrk);
611 716
612 sigprocmask (SIG_SETMASK, &oldsigset, 0);
613 UNLOCK (wrklock); 717 X_UNLOCK (wrklock);
614} 718}
615 719
616static void maybe_start_thread () 720static void maybe_start_thread ()
617{ 721{
618 if (get_nthreads () >= wanted) 722 if (get_nthreads () >= wanted)
625 start_thread (); 729 start_thread ();
626} 730}
627 731
628static void req_send (aio_req req) 732static void req_send (aio_req req)
629{ 733{
734 block_sig ();
735
630 ++nreqs; 736 ++nreqs;
631 737
632 LOCK (reqlock); 738 X_LOCK (reqlock);
633 ++nready; 739 ++nready;
634 reqq_push (&req_queue, req); 740 reqq_push (&req_queue, req);
635 pthread_cond_signal (&reqwait); 741 X_COND_SIGNAL (reqwait);
636 UNLOCK (reqlock); 742 X_UNLOCK (reqlock);
743
744 unblock_sig ();
637 745
638 maybe_start_thread (); 746 maybe_start_thread ();
639} 747}
640 748
641static void end_thread (void) 749static void end_thread (void)
645 Newz (0, req, 1, aio_cb); 753 Newz (0, req, 1, aio_cb);
646 754
647 req->type = REQ_QUIT; 755 req->type = REQ_QUIT;
648 req->pri = PRI_MAX + PRI_BIAS; 756 req->pri = PRI_MAX + PRI_BIAS;
649 757
650 LOCK (reqlock); 758 X_LOCK (reqlock);
651 reqq_push (&req_queue, req); 759 reqq_push (&req_queue, req);
652 pthread_cond_signal (&reqwait); 760 X_COND_SIGNAL (reqwait);
653 UNLOCK (reqlock); 761 X_UNLOCK (reqlock);
654 762
655 LOCK (wrklock); 763 X_LOCK (wrklock);
656 --started; 764 --started;
657 UNLOCK (wrklock); 765 X_UNLOCK (wrklock);
658} 766}
659 767
660static void set_max_idle (int nthreads) 768static void set_max_idle (int nthreads)
661{ 769{
662 if (WORDACCESS_UNSAFE) LOCK (reqlock); 770 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
663 max_idle = nthreads <= 0 ? 1 : nthreads; 771 max_idle = nthreads <= 0 ? 1 : nthreads;
664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 772 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
665} 773}
666 774
667static void min_parallel (int nthreads) 775static void min_parallel (int nthreads)
668{ 776{
669 if (wanted < nthreads) 777 if (wanted < nthreads)
684 fd_set rfd; 792 fd_set rfd;
685 793
686 while (nreqs) 794 while (nreqs)
687 { 795 {
688 int size; 796 int size;
689 if (WORDACCESS_UNSAFE) LOCK (reslock); 797 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
690 size = res_queue.size; 798 size = res_queue.size;
691 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 799 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
692 800
693 if (size) 801 if (size)
694 return; 802 return;
695 803
696 maybe_start_thread (); 804 maybe_start_thread ();
697 805
698 FD_ZERO(&rfd); 806 FD_ZERO (&rfd);
699 FD_SET(respipe [0], &rfd); 807 FD_SET (respipe [0], &rfd);
700 808
701 select (respipe [0] + 1, &rfd, 0, 0, 0); 809 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
702 } 810 }
703} 811}
704 812
705static int poll_cb () 813static int poll_cb ()
706{ 814{
712 aio_req req; 820 aio_req req;
713 821
714 if (max_poll_time) 822 if (max_poll_time)
715 gettimeofday (&tv_start, 0); 823 gettimeofday (&tv_start, 0);
716 824
825 block_sig ();
826
717 for (;;) 827 for (;;)
718 { 828 {
719 for (;;) 829 for (;;)
720 { 830 {
721 maybe_start_thread (); 831 maybe_start_thread ();
722 832
723 LOCK (reslock); 833 X_LOCK (reslock);
724 req = reqq_shift (&res_queue); 834 req = reqq_shift (&res_queue);
725 835
726 if (req) 836 if (req)
727 { 837 {
728 --npending; 838 --npending;
729 839
730 if (!res_queue.size) 840 if (!res_queue.size)
731 { 841 {
732 /* read any signals sent by the worker threads */ 842 /* read any signals sent by the worker threads */
733 char buf [32]; 843 char buf [4];
734 while (read (respipe [0], buf, 32) == 32) 844 while (respipe_read (respipe [0], buf, 4) == 4)
735 ; 845 ;
736 } 846 }
737 } 847 }
738 848
739 UNLOCK (reslock); 849 X_UNLOCK (reslock);
740 850
741 if (!req) 851 if (!req)
742 break; 852 break;
743 853
744 --nreqs; 854 --nreqs;
748 req->int1 = 1; /* mark request as delayed */ 858 req->int1 = 1; /* mark request as delayed */
749 continue; 859 continue;
750 } 860 }
751 else 861 else
752 { 862 {
753 req_invoke (req); 863 if (!req_invoke (req))
864 {
865 req_destroy (req);
866 unblock_sig ();
867 croak (0);
868 }
754 869
755 count++; 870 count++;
756 } 871 }
757 872
758 req_free (req); 873 req_destroy (req);
759 874
760 if (maxreqs && !--maxreqs) 875 if (maxreqs && !--maxreqs)
761 break; 876 break;
762 877
763 if (max_poll_time) 878 if (max_poll_time)
775 poll_wait (); 890 poll_wait ();
776 891
777 ++maxreqs; 892 ++maxreqs;
778 } 893 }
779 894
895 unblock_sig ();
780 return count; 896 return count;
781}
782
783static void create_pipe ()
784{
785 if (pipe (respipe))
786 croak ("unable to initialize result pipe");
787
788 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
789 croak ("cannot set result pipe to nonblocking mode");
790
791 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
792 croak ("cannot set result pipe to nonblocking mode");
793} 897}
794 898
795/*****************************************************************************/ 899/*****************************************************************************/
796/* work around various missing functions */ 900/* work around various missing functions */
797 901
802/* 906/*
803 * make our pread/pwrite safe against themselves, but not against 907 * make our pread/pwrite safe against themselves, but not against
804 * 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,
805 * but that's your problem, not mine. 909 * but that's your problem, not mine.
806 */ 910 */
807static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 911static mutex_t preadwritelock = X_MUTEX_INIT;
808 912
809static 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)
810{ 914{
811 ssize_t res; 915 ssize_t res;
812 off_t ooffset; 916 off_t ooffset;
813 917
814 LOCK (preadwritelock); 918 X_LOCK (preadwritelock);
815 ooffset = lseek (fd, 0, SEEK_CUR); 919 ooffset = lseek (fd, 0, SEEK_CUR);
816 lseek (fd, offset, SEEK_SET); 920 lseek (fd, offset, SEEK_SET);
817 res = read (fd, buf, count); 921 res = read (fd, buf, count);
818 lseek (fd, ooffset, SEEK_SET); 922 lseek (fd, ooffset, SEEK_SET);
819 UNLOCK (preadwritelock); 923 X_UNLOCK (preadwritelock);
820 924
821 return res; 925 return res;
822} 926}
823 927
824static 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)
825{ 929{
826 ssize_t res; 930 ssize_t res;
827 off_t ooffset; 931 off_t ooffset;
828 932
829 LOCK (preadwritelock); 933 X_LOCK (preadwritelock);
830 ooffset = lseek (fd, 0, SEEK_CUR); 934 ooffset = lseek (fd, 0, SEEK_CUR);
831 lseek (fd, offset, SEEK_SET); 935 lseek (fd, offset, SEEK_SET);
832 res = write (fd, buf, count); 936 res = write (fd, buf, count);
833 lseek (fd, offset, SEEK_SET); 937 lseek (fd, offset, SEEK_SET);
834 UNLOCK (preadwritelock); 938 X_UNLOCK (preadwritelock);
835 939
836 return res; 940 return res;
837} 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
838#endif 970#endif
839 971
840#if !HAVE_FDATASYNC 972#if !HAVE_FDATASYNC
841# define fdatasync fsync 973# define fdatasync fsync
842#endif 974#endif
844#if !HAVE_READAHEAD 976#if !HAVE_READAHEAD
845# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 977# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
846 978
847static 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)
848{ 980{
981 size_t todo = count;
849 dBUF; 982 dBUF;
850 983
851 while (count > 0) 984 while (todo > 0)
852 { 985 {
853 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 986 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
854 987
855 pread (fd, aio_buf, len, offset); 988 pread (fd, aio_buf, len, offset);
856 offset += len; 989 offset += len;
857 count -= len; 990 todo -= len;
858 } 991 }
859 992
860 errno = 0; 993 errno = 0;
994 return count;
861} 995}
862 996
863#endif 997#endif
864 998
865#if !HAVE_READDIR_R 999#if !HAVE_READDIR_R
866# define readdir_r aio_readdir_r 1000# define readdir_r aio_readdir_r
867 1001
868static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 1002static mutex_t readdirlock = X_MUTEX_INIT;
869 1003
870static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 1004static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
871{ 1005{
872 struct dirent *e; 1006 X_DIRENT *e;
873 int errorno; 1007 int errorno;
874 1008
875 LOCK (readdirlock); 1009 X_LOCK (readdirlock);
876 1010
877 e = readdir (dirp); 1011 e = readdir (dirp);
878 errorno = errno; 1012 errorno = errno;
879 1013
880 if (e) 1014 if (e)
883 strcpy (ent->d_name, e->d_name); 1017 strcpy (ent->d_name, e->d_name);
884 } 1018 }
885 else 1019 else
886 *res = 0; 1020 *res = 0;
887 1021
888 UNLOCK (readdirlock); 1022 X_UNLOCK (readdirlock);
889 1023
890 errno = errorno; 1024 errno = errorno;
891 return e ? 0 : -1; 1025 return e ? 0 : -1;
892} 1026}
893#endif 1027#endif
989static void scandir_ (aio_req req, worker *self) 1123static void scandir_ (aio_req req, worker *self)
990{ 1124{
991 DIR *dirp; 1125 DIR *dirp;
992 union 1126 union
993 { 1127 {
994 struct dirent d; 1128 X_DIRENT d;
995 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1129 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
996 } *u; 1130 } *u;
997 struct dirent *entp; 1131 X_DIRENT *entp;
998 char *name, *names; 1132 char *name, *names;
999 int memlen = 4096; 1133 int memlen = 4096;
1000 int memofs = 0; 1134 int memofs = 0;
1001 int res = 0; 1135 int res = 0;
1002 int errorno;
1003 1136
1004 LOCK (wrklock); 1137 X_LOCK (wrklock);
1005 self->dirp = dirp = opendir (req->ptr1); 1138 self->dirp = dirp = opendir (req->ptr1);
1006 self->dbuf = u = malloc (sizeof (*u)); 1139 self->dbuf = u = malloc (sizeof (*u));
1007 req->flags |= FLAG_PTR2_FREE; 1140 req->flags |= FLAG_PTR2_FREE;
1008 req->ptr2 = names = malloc (memlen); 1141 req->ptr2 = names = malloc (memlen);
1009 UNLOCK (wrklock); 1142 X_UNLOCK (wrklock);
1010 1143
1011 if (dirp && u && names) 1144 if (dirp && u && names)
1012 for (;;) 1145 for (;;)
1013 { 1146 {
1014 errno = 0; 1147 errno = 0;
1026 res++; 1159 res++;
1027 1160
1028 while (memofs + len > memlen) 1161 while (memofs + len > memlen)
1029 { 1162 {
1030 memlen *= 2; 1163 memlen *= 2;
1031 LOCK (wrklock); 1164 X_LOCK (wrklock);
1032 req->ptr2 = names = realloc (names, memlen); 1165 req->ptr2 = names = realloc (names, memlen);
1033 UNLOCK (wrklock); 1166 X_UNLOCK (wrklock);
1034 1167
1035 if (!names) 1168 if (!names)
1036 break; 1169 break;
1037 } 1170 }
1038 1171
1047 req->result = res; 1180 req->result = res;
1048} 1181}
1049 1182
1050/*****************************************************************************/ 1183/*****************************************************************************/
1051 1184
1052static void *aio_proc (void *thr_arg) 1185X_THREAD_PROC (aio_proc)
1053{ 1186{
1187 {//D
1054 aio_req req; 1188 aio_req req;
1055 struct timespec ts; 1189 struct timespec ts;
1056 worker *self = (worker *)thr_arg; 1190 worker *self = (worker *)thr_arg;
1057 1191
1058 /* try to distribute timeouts somewhat evenly */ 1192 /* try to distribute timeouts somewhat randomly */
1059 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 1193 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1060 * (1000000000UL / 1024UL);
1061 1194
1062 for (;;) 1195 for (;;)
1063 { 1196 {
1064 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1197 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1065 1198
1066 LOCK (reqlock); 1199 X_LOCK (reqlock);
1067 1200
1068 for (;;) 1201 for (;;)
1069 { 1202 {
1070 self->req = req = reqq_shift (&req_queue); 1203 self->req = req = reqq_shift (&req_queue);
1071 1204
1072 if (req) 1205 if (req)
1073 break; 1206 break;
1074 1207
1075 ++idle; 1208 ++idle;
1076 1209
1077 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1210 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1078 == ETIMEDOUT) 1211 == ETIMEDOUT)
1079 { 1212 {
1080 if (idle > max_idle) 1213 if (idle > max_idle)
1081 { 1214 {
1082 --idle; 1215 --idle;
1083 UNLOCK (reqlock); 1216 X_UNLOCK (reqlock);
1084 LOCK (wrklock); 1217 X_LOCK (wrklock);
1085 --started; 1218 --started;
1086 UNLOCK (wrklock); 1219 X_UNLOCK (wrklock);
1087 goto quit; 1220 goto quit;
1088 } 1221 }
1089 1222
1090 /* we are allowed to idle, so do so without any timeout */ 1223 /* we are allowed to idle, so do so without any timeout */
1091 pthread_cond_wait (&reqwait, &reqlock); 1224 X_COND_WAIT (reqwait, reqlock);
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1225 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 } 1226 }
1094 1227
1095 --idle; 1228 --idle;
1096 } 1229 }
1097 1230
1098 --nready; 1231 --nready;
1099 1232
1100 UNLOCK (reqlock); 1233 X_UNLOCK (reqlock);
1101 1234
1102 errno = 0; /* strictly unnecessary */ 1235 errno = 0; /* strictly unnecessary */
1103 1236
1104 if (!(req->flags & FLAG_CANCELLED)) 1237 if (!(req->flags & FLAG_CANCELLED))
1105 switch (req->type) 1238 switch (req->type)
1106 { 1239 {
1107 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; 1240 case REQ_READ: req->result = req->offs >= 0
1108 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; 1241 ? pread (req->int1, req->ptr1, req->size, req->offs)
1242 : read (req->int1, req->ptr1, req->size); break;
1243 case REQ_WRITE: req->result = req->offs >= 0
1244 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1245 : write (req->int1, req->ptr1, req->size); break;
1109 1246
1110 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1247 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1111 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break; 1248 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1112 1249
1113 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; 1250 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1114 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; 1251 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1115 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; 1252 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1253
1254 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1255 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1256 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1257 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1258 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1259 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1116 1260
1117 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1261 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1118 case REQ_CLOSE: req->result = close (req->int1); break; 1262 case REQ_CLOSE: req->result = close (req->int1); break;
1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1263 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1264 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1265 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1266 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1267 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1123 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; 1268 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1124 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; 1269 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1125 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; 1270 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; 1272 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1128 case REQ_FSYNC: req->result = fsync (req->int1); break; 1273 case REQ_FSYNC: req->result = fsync (req->int1); break;
1129 case REQ_READDIR: scandir_ (req, self); break; 1274 case REQ_READDIR: scandir_ (req, self); break;
1130 1275
1131 case REQ_BUSY: 1276 case REQ_BUSY:
1277#ifdef _WIN32
1278 Sleep (req->nv1 * 1000.);
1279#else
1132 { 1280 {
1133 struct timeval tv; 1281 struct timeval tv;
1134 1282
1135 tv.tv_sec = req->int1; 1283 tv.tv_sec = req->nv1;
1136 tv.tv_usec = req->int2; 1284 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1137 1285
1138 req->result = select (0, 0, 0, 0, &tv); 1286 req->result = select (0, 0, 0, 0, &tv);
1287 }
1288#endif
1289 break;
1290
1291 case REQ_UTIME:
1292 case REQ_FUTIME:
1293 {
1294 struct timeval tv[2];
1295 struct timeval *times;
1296
1297 if (req->nv1 != -1. || req->nv2 != -1.)
1298 {
1299 tv[0].tv_sec = req->nv1;
1300 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1301 tv[1].tv_sec = req->nv2;
1302 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1303
1304 times = tv;
1305 }
1306 else
1307 times = 0;
1308
1309
1310 req->result = req->type == REQ_FUTIME
1311 ? futimes (req->int1, times)
1312 : utimes (req->ptr1, times);
1139 } 1313 }
1140 1314
1141 case REQ_GROUP: 1315 case REQ_GROUP:
1142 case REQ_NOP: 1316 case REQ_NOP:
1143 break; 1317 break;
1144 1318
1145 case REQ_QUIT: 1319 case REQ_QUIT:
1146 goto quit; 1320 goto quit;
1147 1321
1148 default: 1322 default:
1149 req->result = ENOSYS; 1323 req->result = -1;
1150 break; 1324 break;
1151 } 1325 }
1152 1326
1153 req->errorno = errno; 1327 req->errorno = errno;
1154 1328
1155 LOCK (reslock); 1329 X_LOCK (reslock);
1156 1330
1157 ++npending; 1331 ++npending;
1158 1332
1159 if (!reqq_push (&res_queue, req)) 1333 if (!reqq_push (&res_queue, req))
1334 {
1160 /* write a dummy byte to the pipe so fh becomes ready */ 1335 /* write a dummy byte to the pipe so fh becomes ready */
1161 write (respipe [1], &respipe, 1); 1336 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1337
1338 /* optionally signal the main thread asynchronously */
1339 if (main_sig)
1340 pthread_kill (main_tid, main_sig);
1341 }
1162 1342
1163 self->req = 0; 1343 self->req = 0;
1164 worker_clear (self); 1344 worker_clear (self);
1165 1345
1166 UNLOCK (reslock); 1346 X_UNLOCK (reslock);
1167 } 1347 }
1168 1348
1169quit: 1349quit:
1170 LOCK (wrklock); 1350 X_LOCK (wrklock);
1171 worker_free (self); 1351 worker_free (self);
1172 UNLOCK (wrklock); 1352 X_UNLOCK (wrklock);
1173 1353
1174 return 0; 1354 return 0;
1355 }//D
1175} 1356}
1176 1357
1177/*****************************************************************************/ 1358/*****************************************************************************/
1178 1359
1179static void atfork_prepare (void) 1360static void atfork_prepare (void)
1180{ 1361{
1181 LOCK (wrklock); 1362 X_LOCK (wrklock);
1182 LOCK (reqlock); 1363 X_LOCK (reqlock);
1183 LOCK (reslock); 1364 X_LOCK (reslock);
1184#if !HAVE_PREADWRITE 1365#if !HAVE_PREADWRITE
1185 LOCK (preadwritelock); 1366 X_LOCK (preadwritelock);
1186#endif 1367#endif
1187#if !HAVE_READDIR_R 1368#if !HAVE_READDIR_R
1188 LOCK (readdirlock); 1369 X_LOCK (readdirlock);
1189#endif 1370#endif
1190} 1371}
1191 1372
1192static void atfork_parent (void) 1373static void atfork_parent (void)
1193{ 1374{
1194#if !HAVE_READDIR_R 1375#if !HAVE_READDIR_R
1195 UNLOCK (readdirlock); 1376 X_UNLOCK (readdirlock);
1196#endif 1377#endif
1197#if !HAVE_PREADWRITE 1378#if !HAVE_PREADWRITE
1198 UNLOCK (preadwritelock); 1379 X_UNLOCK (preadwritelock);
1199#endif 1380#endif
1200 UNLOCK (reslock); 1381 X_UNLOCK (reslock);
1201 UNLOCK (reqlock); 1382 X_UNLOCK (reqlock);
1202 UNLOCK (wrklock); 1383 X_UNLOCK (wrklock);
1203} 1384}
1204 1385
1205static void atfork_child (void) 1386static void atfork_child (void)
1206{ 1387{
1207 aio_req prv; 1388 aio_req prv;
1208 1389
1209 while (prv = reqq_shift (&req_queue)) 1390 while (prv = reqq_shift (&req_queue))
1210 req_free (prv); 1391 req_destroy (prv);
1211 1392
1212 while (prv = reqq_shift (&res_queue)) 1393 while (prv = reqq_shift (&res_queue))
1213 req_free (prv); 1394 req_destroy (prv);
1214 1395
1215 while (wrk_first.next != &wrk_first) 1396 while (wrk_first.next != &wrk_first)
1216 { 1397 {
1217 worker *wrk = wrk_first.next; 1398 worker *wrk = wrk_first.next;
1218 1399
1219 if (wrk->req) 1400 if (wrk->req)
1220 req_free (wrk->req); 1401 req_destroy (wrk->req);
1221 1402
1222 worker_clear (wrk); 1403 worker_clear (wrk);
1223 worker_free (wrk); 1404 worker_free (wrk);
1224 } 1405 }
1225 1406
1227 idle = 0; 1408 idle = 0;
1228 nreqs = 0; 1409 nreqs = 0;
1229 nready = 0; 1410 nready = 0;
1230 npending = 0; 1411 npending = 0;
1231 1412
1232 close (respipe [0]);
1233 close (respipe [1]);
1234 create_pipe (); 1413 create_respipe ();
1235 1414
1236 atfork_parent (); 1415 atfork_parent ();
1237} 1416}
1238 1417
1239#define dREQ \ 1418#define dREQ \
1261 1440
1262PROTOTYPES: ENABLE 1441PROTOTYPES: ENABLE
1263 1442
1264BOOT: 1443BOOT:
1265{ 1444{
1266 HV *stash = gv_stashpv ("IO::AIO", 1); 1445 stash = gv_stashpv ("IO::AIO", 1);
1267 1446
1268 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1269 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1270 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1271 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1272 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1452#ifdef _WIN32
1453 X_MUTEX_CHECK (wrklock);
1454 X_MUTEX_CHECK (reslock);
1455 X_MUTEX_CHECK (reqlock);
1456 X_MUTEX_CHECK (reqwait);
1457 X_MUTEX_CHECK (preadwritelock);
1458 X_MUTEX_CHECK (readdirlock);
1459
1460 X_COND_CHECK (reqwait);
1461#else
1273 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1463 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1464#endif
1274 1465
1275 create_pipe (); 1466 create_respipe ();
1467
1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1468 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1277} 1469}
1278 1470
1279void 1471void
1280max_poll_reqs (int nreqs) 1472max_poll_reqs (int nreqs)
1281 PROTOTYPE: $ 1473 PROTOTYPE: $
1310 max_outstanding = maxreqs; 1502 max_outstanding = maxreqs;
1311 OUTPUT: 1503 OUTPUT:
1312 RETVAL 1504 RETVAL
1313 1505
1314void 1506void
1315aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1507aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1316 SV8 * pathname
1317 int flags
1318 int mode
1319 SV * callback
1320 PROTOTYPE: $$$;$ 1508 PROTOTYPE: $$$;$
1321 PPCODE: 1509 PPCODE:
1322{ 1510{
1323 dREQ; 1511 dREQ;
1324 1512
1330 1518
1331 REQ_SEND; 1519 REQ_SEND;
1332} 1520}
1333 1521
1334void 1522void
1335aio_close (fh,callback=&PL_sv_undef) 1523aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1336 SV * fh
1337 SV * callback
1338 PROTOTYPE: $;$ 1524 PROTOTYPE: $;$
1339 ALIAS: 1525 ALIAS:
1340 aio_close = REQ_CLOSE
1341 aio_fsync = REQ_FSYNC 1526 aio_fsync = REQ_FSYNC
1342 aio_fdatasync = REQ_FDATASYNC 1527 aio_fdatasync = REQ_FDATASYNC
1343 PPCODE: 1528 PPCODE:
1344{ 1529{
1345 dREQ; 1530 dREQ;
1346 1531
1347 req->type = ix; 1532 req->type = ix;
1348 req->fh = newSVsv (fh); 1533 req->sv1 = newSVsv (fh);
1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1534 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1350 1535
1351 REQ_SEND (req); 1536 REQ_SEND (req);
1352} 1537}
1353 1538
1539int
1540_dup (int fd)
1541 PROTOTYPE: $
1542 CODE:
1543 RETVAL = dup (fd);
1544 OUTPUT:
1545 RETVAL
1546
1354void 1547void
1548_aio_close (int fd, SV *callback=&PL_sv_undef)
1549 PROTOTYPE: $;$
1550 PPCODE:
1551{
1552 dREQ;
1553
1554 req->type = REQ_CLOSE;
1555 req->int1 = fd;
1556
1557 REQ_SEND (req);
1558}
1559
1560void
1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1561aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1356 SV * fh
1357 UV offset
1358 UV length
1359 SV8 * data
1360 UV dataoffset
1361 SV * callback
1362 ALIAS: 1562 ALIAS:
1363 aio_read = REQ_READ 1563 aio_read = REQ_READ
1364 aio_write = REQ_WRITE 1564 aio_write = REQ_WRITE
1365 PROTOTYPE: $$$$$;$ 1565 PROTOTYPE: $$$$$;$
1366 PPCODE: 1566 PPCODE:
1367{ 1567{
1368 STRLEN svlen; 1568 STRLEN svlen;
1369 char *svptr = SvPVbyte (data, svlen); 1569 char *svptr = SvPVbyte (data, svlen);
1570 UV len = SvUV (length);
1370 1571
1371 SvUPGRADE (data, SVt_PV); 1572 SvUPGRADE (data, SVt_PV);
1372 SvPOK_on (data); 1573 SvPOK_on (data);
1373 1574
1374 if (dataoffset < 0) 1575 if (dataoffset < 0)
1375 dataoffset += svlen; 1576 dataoffset += svlen;
1376 1577
1377 if (dataoffset < 0 || dataoffset > svlen) 1578 if (dataoffset < 0 || dataoffset > svlen)
1378 croak ("data offset outside of string"); 1579 croak ("dataoffset outside of data scalar");
1379 1580
1380 if (ix == REQ_WRITE) 1581 if (ix == REQ_WRITE)
1381 { 1582 {
1382 /* write: check length and adjust. */ 1583 /* write: check length and adjust. */
1383 if (length < 0 || length + dataoffset > svlen) 1584 if (!SvOK (length) || len + dataoffset > svlen)
1384 length = svlen - dataoffset; 1585 len = svlen - dataoffset;
1385 } 1586 }
1386 else 1587 else
1387 { 1588 {
1388 /* read: grow scalar as necessary */ 1589 /* read: grow scalar as necessary */
1389 svptr = SvGROW (data, length + dataoffset); 1590 svptr = SvGROW (data, len + dataoffset + 1);
1390 } 1591 }
1391 1592
1392 if (length < 0) 1593 if (len < 0)
1393 croak ("length must not be negative"); 1594 croak ("length must not be negative");
1394 1595
1395 { 1596 {
1396 dREQ; 1597 dREQ;
1397 1598
1398 req->type = ix; 1599 req->type = ix;
1399 req->fh = newSVsv (fh); 1600 req->sv1 = newSVsv (fh);
1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1601 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1401 : IoOFP (sv_2io (fh))); 1602 : IoOFP (sv_2io (fh)));
1402 req->offs = offset; 1603 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1403 req->size = length; 1604 req->size = len;
1404 req->sv1 = SvREFCNT_inc (data); 1605 req->sv2 = SvREFCNT_inc (data);
1405 req->ptr1 = (char *)svptr + dataoffset; 1606 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset; 1607 req->stroffset = dataoffset;
1407 1608
1408 if (!SvREADONLY (data)) 1609 if (!SvREADONLY (data))
1409 { 1610 {
1410 SvREADONLY_on (data); 1611 SvREADONLY_on (data);
1411 req->flags |= FLAG_SV1_RO_OFF; 1612 req->flags |= FLAG_SV2_RO_OFF;
1412 } 1613 }
1413 1614
1414 REQ_SEND; 1615 REQ_SEND;
1415 } 1616 }
1416} 1617}
1417 1618
1418void 1619void
1419aio_readlink (path,callback=&PL_sv_undef) 1620aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1420 SV8 * path
1421 SV * callback
1422 PROTOTYPE: $$;$ 1621 PROTOTYPE: $$;$
1423 PPCODE: 1622 PPCODE:
1424{ 1623{
1425 SV *data; 1624 SV *data;
1426 dREQ; 1625 dREQ;
1427 1626
1428 data = newSV (NAME_MAX); 1627 data = newSV (NAME_MAX);
1429 SvPOK_on (data); 1628 SvPOK_on (data);
1430 1629
1431 req->type = REQ_READLINK; 1630 req->type = REQ_READLINK;
1432 req->fh = newSVsv (path); 1631 req->sv1 = newSVsv (path);
1433 req->ptr2 = SvPVbyte_nolen (req->fh); 1632 req->ptr2 = SvPVbyte_nolen (req->sv1);
1434 req->sv1 = data; 1633 req->sv2 = data;
1435 req->ptr1 = SvPVbyte_nolen (data); 1634 req->ptr1 = SvPVbyte_nolen (data);
1436 1635
1437 REQ_SEND; 1636 REQ_SEND;
1438} 1637}
1439 1638
1440void 1639void
1441aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1640aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1442 SV * out_fh
1443 SV * in_fh
1444 UV in_offset
1445 UV length
1446 SV * callback
1447 PROTOTYPE: $$$$;$ 1641 PROTOTYPE: $$$$;$
1448 PPCODE: 1642 PPCODE:
1449{ 1643{
1450 dREQ; 1644 dREQ;
1451 1645
1452 req->type = REQ_SENDFILE; 1646 req->type = REQ_SENDFILE;
1453 req->fh = newSVsv (out_fh); 1647 req->sv1 = newSVsv (out_fh);
1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1648 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1455 req->sv2 = newSVsv (in_fh); 1649 req->sv2 = newSVsv (in_fh);
1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1650 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1457 req->offs = in_offset; 1651 req->offs = SvVAL64 (in_offset);
1458 req->size = length; 1652 req->size = length;
1459 1653
1460 REQ_SEND; 1654 REQ_SEND;
1461} 1655}
1462 1656
1463void 1657void
1464aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1658aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1465 SV * fh
1466 UV offset
1467 IV length
1468 SV * callback
1469 PROTOTYPE: $$$;$ 1659 PROTOTYPE: $$$;$
1470 PPCODE: 1660 PPCODE:
1471{ 1661{
1472 dREQ; 1662 dREQ;
1473 1663
1474 req->type = REQ_READAHEAD; 1664 req->type = REQ_READAHEAD;
1475 req->fh = newSVsv (fh); 1665 req->sv1 = newSVsv (fh);
1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1666 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1477 req->offs = offset; 1667 req->offs = SvVAL64 (offset);
1478 req->size = length; 1668 req->size = length;
1479 1669
1480 REQ_SEND; 1670 REQ_SEND;
1481} 1671}
1482 1672
1483void 1673void
1484aio_stat (fh_or_path,callback=&PL_sv_undef) 1674aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1485 SV8 * fh_or_path
1486 SV * callback
1487 ALIAS: 1675 ALIAS:
1488 aio_stat = REQ_STAT 1676 aio_stat = REQ_STAT
1489 aio_lstat = REQ_LSTAT 1677 aio_lstat = REQ_LSTAT
1490 PPCODE: 1678 PPCODE:
1491{ 1679{
1492 dREQ; 1680 dREQ;
1493 1681
1494 req->ptr2 = malloc (sizeof (Stat_t)); 1682 req->ptr2 = malloc (sizeof (Stat_t));
1495 if (!req->ptr2) 1683 if (!req->ptr2)
1496 { 1684 {
1497 req_free (req); 1685 req_destroy (req);
1498 croak ("out of memory during aio_stat statdata allocation"); 1686 croak ("out of memory during aio_stat statdata allocation");
1499 } 1687 }
1500 1688
1501 req->flags |= FLAG_PTR2_FREE; 1689 req->flags |= FLAG_PTR2_FREE;
1690 req->sv1 = newSVsv (fh_or_path);
1502 1691
1503 if (SvPOK (fh_or_path)) 1692 if (SvPOK (fh_or_path))
1504 { 1693 {
1505 req->type = ix; 1694 req->type = ix;
1506 req->sv1 = newSVsv (fh_or_path);
1507 req->ptr1 = SvPVbyte_nolen (req->sv1); 1695 req->ptr1 = SvPVbyte_nolen (req->sv1);
1508 } 1696 }
1509 else 1697 else
1510 { 1698 {
1511 req->type = REQ_FSTAT; 1699 req->type = REQ_FSTAT;
1512 req->fh = newSVsv (fh_or_path);
1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1700 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1514 } 1701 }
1515 1702
1516 REQ_SEND; 1703 REQ_SEND;
1517} 1704}
1518 1705
1519void 1706void
1707aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1708 PPCODE:
1709{
1710 dREQ;
1711
1712 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1713 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1714 req->sv1 = newSVsv (fh_or_path);
1715
1716 if (SvPOK (fh_or_path))
1717 {
1718 req->type = REQ_UTIME;
1719 req->ptr1 = SvPVbyte_nolen (req->sv1);
1720 }
1721 else
1722 {
1723 req->type = REQ_FUTIME;
1724 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1725 }
1726
1727 REQ_SEND;
1728}
1729
1730void
1731aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1732 PPCODE:
1733{
1734 dREQ;
1735
1736 req->sv1 = newSVsv (fh_or_path);
1737 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1738
1739 if (SvPOK (fh_or_path))
1740 {
1741 req->type = REQ_TRUNCATE;
1742 req->ptr1 = SvPVbyte_nolen (req->sv1);
1743 }
1744 else
1745 {
1746 req->type = REQ_FTRUNCATE;
1747 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1748 }
1749
1750 REQ_SEND;
1751}
1752
1753void
1754aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1755 PPCODE:
1756{
1757 dREQ;
1758
1759 req->mode = mode;
1760 req->sv1 = newSVsv (fh_or_path);
1761
1762 if (SvPOK (fh_or_path))
1763 {
1764 req->type = REQ_CHMOD;
1765 req->ptr1 = SvPVbyte_nolen (req->sv1);
1766 }
1767 else
1768 {
1769 req->type = REQ_FCHMOD;
1770 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1771 }
1772
1773 REQ_SEND;
1774}
1775
1776void
1777aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1778 PPCODE:
1779{
1780 dREQ;
1781
1782 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1783 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1784 req->sv1 = newSVsv (fh_or_path);
1785
1786 if (SvPOK (fh_or_path))
1787 {
1788 req->type = REQ_CHOWN;
1789 req->ptr1 = SvPVbyte_nolen (req->sv1);
1790 }
1791 else
1792 {
1793 req->type = REQ_FCHOWN;
1794 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1795 }
1796
1797 REQ_SEND;
1798}
1799
1800void
1520aio_unlink (pathname,callback=&PL_sv_undef) 1801aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1521 SV8 * pathname
1522 SV * callback
1523 ALIAS: 1802 ALIAS:
1524 aio_unlink = REQ_UNLINK 1803 aio_unlink = REQ_UNLINK
1525 aio_rmdir = REQ_RMDIR 1804 aio_rmdir = REQ_RMDIR
1526 aio_readdir = REQ_READDIR 1805 aio_readdir = REQ_READDIR
1527 PPCODE: 1806 PPCODE:
1534 1813
1535 REQ_SEND; 1814 REQ_SEND;
1536} 1815}
1537 1816
1538void 1817void
1818aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1819 PPCODE:
1820{
1821 dREQ;
1822
1823 req->type = REQ_MKDIR;
1824 req->sv1 = newSVsv (pathname);
1825 req->ptr1 = SvPVbyte_nolen (req->sv1);
1826 req->mode = mode;
1827
1828 REQ_SEND;
1829}
1830
1831void
1539aio_link (oldpath,newpath,callback=&PL_sv_undef) 1832aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1540 SV8 * oldpath
1541 SV8 * newpath
1542 SV * callback
1543 ALIAS: 1833 ALIAS:
1544 aio_link = REQ_LINK 1834 aio_link = REQ_LINK
1545 aio_symlink = REQ_SYMLINK 1835 aio_symlink = REQ_SYMLINK
1546 aio_rename = REQ_RENAME 1836 aio_rename = REQ_RENAME
1547 PPCODE: 1837 PPCODE:
1548{ 1838{
1549 dREQ; 1839 dREQ;
1550 1840
1551 req->type = ix; 1841 req->type = ix;
1552 req->fh = newSVsv (oldpath); 1842 req->sv2 = newSVsv (oldpath);
1553 req->ptr2 = SvPVbyte_nolen (req->fh); 1843 req->ptr2 = SvPVbyte_nolen (req->sv2);
1554 req->sv1 = newSVsv (newpath); 1844 req->sv1 = newSVsv (newpath);
1555 req->ptr1 = SvPVbyte_nolen (req->sv1); 1845 req->ptr1 = SvPVbyte_nolen (req->sv1);
1556 1846
1557 REQ_SEND; 1847 REQ_SEND;
1558} 1848}
1559 1849
1560void 1850void
1561aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1851aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1562 SV8 * pathname
1563 SV * callback
1564 UV mode
1565 UV dev
1566 PPCODE: 1852 PPCODE:
1567{ 1853{
1568 dREQ; 1854 dREQ;
1569 1855
1570 req->type = REQ_MKNOD; 1856 req->type = REQ_MKNOD;
1575 1861
1576 REQ_SEND; 1862 REQ_SEND;
1577} 1863}
1578 1864
1579void 1865void
1580aio_busy (delay,callback=&PL_sv_undef) 1866aio_busy (double delay, SV *callback=&PL_sv_undef)
1581 double delay
1582 SV * callback
1583 PPCODE: 1867 PPCODE:
1584{ 1868{
1585 dREQ; 1869 dREQ;
1586 1870
1587 req->type = REQ_BUSY; 1871 req->type = REQ_BUSY;
1588 req->int1 = delay < 0. ? 0 : delay; 1872 req->nv1 = delay < 0. ? 0. : delay;
1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1590 1873
1591 REQ_SEND; 1874 REQ_SEND;
1592} 1875}
1593 1876
1594void 1877void
1595aio_group (callback=&PL_sv_undef) 1878aio_group (SV *callback=&PL_sv_undef)
1596 SV * callback
1597 PROTOTYPE: ;$ 1879 PROTOTYPE: ;$
1598 PPCODE: 1880 PPCODE:
1599{ 1881{
1600 dREQ; 1882 dREQ;
1601 1883
1604 req_send (req); 1886 req_send (req);
1605 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1887 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1606} 1888}
1607 1889
1608void 1890void
1609aio_nop (callback=&PL_sv_undef) 1891aio_nop (SV *callback=&PL_sv_undef)
1610 SV * callback
1611 PPCODE: 1892 PPCODE:
1612{ 1893{
1613 dREQ; 1894 dREQ;
1614 1895
1615 req->type = REQ_NOP; 1896 req->type = REQ_NOP;
1678poll_wait() 1959poll_wait()
1679 PROTOTYPE: 1960 PROTOTYPE:
1680 CODE: 1961 CODE:
1681 poll_wait (); 1962 poll_wait ();
1682 1963
1964void
1965setsig (int signum = SIGIO)
1966 PROTOTYPE: ;$
1967 CODE:
1968{
1969 if (block_sig_level)
1970 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1971
1972 X_LOCK (reslock);
1973 main_tid = pthread_self ();
1974 main_sig = signum;
1975 X_UNLOCK (reslock);
1976
1977 if (main_sig && npending)
1978 pthread_kill (main_tid, main_sig);
1979}
1980
1981void
1982aio_block (SV *cb)
1983 PROTOTYPE: &
1984 PPCODE:
1985{
1986 int count;
1987
1988 block_sig ();
1989 PUSHMARK (SP);
1990 PUTBACK;
1991 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1992 SPAGAIN;
1993 unblock_sig ();
1994
1995 if (SvTRUE (ERRSV))
1996 croak (0);
1997
1998 XSRETURN (count);
1999}
2000
1683int 2001int
1684nreqs() 2002nreqs()
1685 PROTOTYPE: 2003 PROTOTYPE:
1686 CODE: 2004 CODE:
1687 RETVAL = nreqs; 2005 RETVAL = nreqs;
1706 2024
1707int 2025int
1708nthreads() 2026nthreads()
1709 PROTOTYPE: 2027 PROTOTYPE:
1710 CODE: 2028 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock); 2029 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1712 RETVAL = started; 2030 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 2031 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1714 OUTPUT: 2032 OUTPUT:
1715 RETVAL 2033 RETVAL
1716 2034
1717PROTOTYPES: DISABLE 2035PROTOTYPES: DISABLE
1718 2036
1736 PPCODE: 2054 PPCODE:
1737{ 2055{
1738 int i; 2056 int i;
1739 aio_req req; 2057 aio_req req;
1740 2058
2059 if (main_sig && !block_sig_level)
2060 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2061
1741 if (grp->int1 == 2) 2062 if (grp->int1 == 2)
1742 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 2063 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1743 2064
1744 for (i = 1; i < items; ++i ) 2065 for (i = 1; i < items; ++i )
1745 { 2066 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines