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.84 by root, Sat Oct 28 01:24:19 2006 UTC vs.
Revision 1.108 by root, Thu Oct 4 12:50:35 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines