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.78 by root, Thu Oct 26 14:35:34 2006 UTC vs.
Revision 1.113 by root, Wed Apr 16 16:45:18 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines