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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines