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.82 by root, Fri Oct 27 20:11:58 2006 UTC vs.
Revision 1.106 by root, Mon Sep 24 18:14:00 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines