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.71 by root, Tue Oct 24 16:35:04 2006 UTC vs.
Revision 1.91 by root, Wed Nov 8 01:57:43 2006 UTC

1/* solaris */ 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1 2#define _POSIX_PTHREAD_SEMANTICS 1
3 3
4#if __linux 4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE 5# define _GNU_SOURCE
6#endif 6#endif
7 7
8/* just in case */
8#define _REENTRANT 1 9#define _REENTRANT 1
9 10
10#include <errno.h> 11#include <errno.h>
11 12
12#include "EXTERN.h" 13#include "EXTERN.h"
… …
42# else 43# else
43# error sendfile support requested but not available 44# error sendfile support requested but not available
44# endif 45# endif
45#endif 46#endif
46 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
47/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
48#ifndef NAME_MAX 52#ifndef NAME_MAX
49# define NAME_MAX 4096 53# define NAME_MAX 4096
54#endif
55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
50#endif 59#endif
51 60
52#if __ia64 61#if __ia64
53# define STACKSIZE 65536 62# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
56#else 65#else
57# define STACKSIZE 16384 66# define STACKSIZE 16384
58#endif 67#endif
59 68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
60/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
62 83
63#define dBUF \ 84#define dBUF \
64 char *aio_buf; \ 85 char *aio_buf; \
65 LOCK (wrklock); \ 86 LOCK (wrklock); \
66 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
67 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
68 if (!aio_buf) \ 89 if (!aio_buf) \
69 return -1; 90 return -1;
91
92typedef SV SV8; /* byte-sv, used for argument-checking */
70 93
71enum { 94enum {
72 REQ_QUIT, 95 REQ_QUIT,
73 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
74 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
75 REQ_SENDFILE, 98 REQ_SENDFILE,
76 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
77 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
79 REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
80 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
81 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
82 REQ_BUSY, 105 REQ_BUSY,
83}; 106};
84 107
85#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
87 110
88typedef struct aio_cb 111typedef struct aio_cb
89{ 112{
90 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
91 114
92 SV *data, *callback; 115 SV *callback, *fh;
93 SV *fh, *fh2; 116 SV *sv1, *sv2;
94 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
95 Stat_t *statdata;
96 off_t offset; 118 off_t offs;
97 size_t length; 119 size_t size;
98 ssize_t result; 120 ssize_t result;
99 121
100 STRLEN dataoffset; 122 STRLEN stroffset;
101 int type; 123 int type;
102 int fd, fd2; 124 int int1, int2;
103 int errorno; 125 int errorno;
104 mode_t mode; /* open */ 126 mode_t mode; /* open */
105 127
106 unsigned char flags; 128 unsigned char flags;
107 unsigned char pri; 129 unsigned char pri;
… …
109 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
111} aio_cb; 133} aio_cb;
112 134
113enum { 135enum {
114 FLAG_CANCELLED = 0x01, 136 FLAG_CANCELLED = 0x01, /* request was cancelled */
137 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
138 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
115}; 139};
116 140
117typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
118typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
119 143
… …
124 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
125 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
127}; 151};
128 152
153#define AIO_TICKS ((1000000 + 1023) >> 10)
154
155static unsigned int max_poll_time = 0;
156static unsigned int max_poll_reqs = 0;
157
158/* calculcate time difference in ~1/AIO_TICKS of a second */
159static int tvdiff (struct timeval *tv1, struct timeval *tv2)
160{
161 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
162 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
163}
164
129static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
130 166
131static int started, wanted; 167static unsigned int started, idle, wanted;
132static volatile int nreqs;
133static int max_outstanding = 1<<30;
134static int respipe [2];
135 168
136#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
137# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
138#else 171#else
139# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
140#endif 173#endif
141 174
142#define LOCK(mutex) pthread_mutex_lock (&(mutex)) 175#define LOCK(mutex) pthread_mutex_lock (&(mutex))
143#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 176#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
144 177
145/* worker threasd management */ 178/* worker threads management */
146static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 179static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
147 180
148typedef struct worker { 181typedef struct worker {
149 /* locked by wrklock */ 182 /* locked by wrklock */
150 struct worker *prev, *next; 183 struct worker *prev, *next;
… …
180 wrk->prev->next = wrk->next; 213 wrk->prev->next = wrk->next;
181 214
182 free (wrk); 215 free (wrk);
183} 216}
184 217
218static volatile unsigned int nreqs, nready, npending;
219static volatile unsigned int max_idle = 4;
220static volatile unsigned int max_outstanding = 0xffffffff;
221static int respipe [2];
222
185static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
186static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
187static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 225static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
226
227#if WORDACCESS_UNSAFE
228
229static unsigned int get_nready ()
230{
231 unsigned int retval;
232
233 LOCK (reqlock);
234 retval = nready;
235 UNLOCK (reqlock);
236
237 return retval;
238}
239
240static unsigned int get_npending ()
241{
242 unsigned int retval;
243
244 LOCK (reslock);
245 retval = npending;
246 UNLOCK (reslock);
247
248 return retval;
249}
250
251static unsigned int get_nthreads ()
252{
253 unsigned int retval;
254
255 LOCK (wrklock);
256 retval = started;
257 UNLOCK (wrklock);
258
259 return retval;
260}
261
262#else
263
264# define get_nready() nready
265# define get_npending() npending
266# define get_nthreads() started
267
268#endif
188 269
189/* 270/*
190 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
191 * with 8 priorities this actually needs <20 insns 272 * with 8 priorities this actually needs <20 insns
192 * per shift, the most expensive operation. 273 * per shift, the most expensive operation.
… …
238 } 319 }
239 320
240 abort (); 321 abort ();
241} 322}
242 323
324static int poll_cb ();
243static void req_invoke (aio_req req); 325static void req_invoke (aio_req req);
244static void req_free (aio_req req); 326static void req_free (aio_req req);
327static void req_cancel (aio_req req);
245 328
246/* must be called at most once */ 329/* must be called at most once */
247static SV *req_sv (aio_req req, const char *klass) 330static SV *req_sv (aio_req req, const char *klass)
248{ 331{
249 if (!req->self) 332 if (!req->self)
… …
267 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
268} 351}
269 352
270static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
271{ 354{
272 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
273 { 356 {
274 int old_len = grp->length; 357 int old_len = grp->size;
275 358
276 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
277 { 360 {
278 dSP; 361 dSP;
279 362
280 ENTER; 363 ENTER;
281 SAVETMPS; 364 SAVETMPS;
282 PUSHMARK (SP); 365 PUSHMARK (SP);
283 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
284 PUTBACK; 367 PUTBACK;
285 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
286 SPAGAIN; 369 SPAGAIN;
287 FREETMPS; 370 FREETMPS;
288 LEAVE; 371 LEAVE;
289 } 372 }
290 373
291 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
292 if (old_len == grp->length) 375 if (old_len == grp->size)
293 { 376 {
294 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
295 grp->fh2 = 0; 378 grp->sv2 = 0;
296 break; 379 break;
297 } 380 }
298 } 381 }
299} 382}
300 383
301static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
302{ 385{
303 --grp->length; 386 --grp->size;
304 387
305 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
306 aio_grp_feed (grp); 389 aio_grp_feed (grp);
307 390
308 /* finish, if done */ 391 /* finish, if done */
309 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
310 { 393 {
311 req_invoke (grp); 394 req_invoke (grp);
312 req_free (grp); 395 req_free (grp);
313 } 396 }
314} 397}
315 398
316static void poll_wait ()
317{
318 fd_set rfd;
319
320 while (nreqs)
321 {
322 int size;
323#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
324 LOCK (reslock);
325#endif
326 size = res_queue.size;
327#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
328 UNLOCK (reslock);
329#endif
330
331 if (size)
332 return;
333
334 FD_ZERO(&rfd);
335 FD_SET(respipe [0], &rfd);
336
337 select (respipe [0] + 1, &rfd, 0, 0, 0);
338 }
339}
340
341static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
342{ 400{
343 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
344 405
345 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
346 { 407 {
347 errno = req->errorno;
348
349 ENTER; 408 ENTER;
350 SAVETMPS; 409 SAVETMPS;
351 PUSHMARK (SP); 410 PUSHMARK (SP);
352 EXTEND (SP, 1); 411 EXTEND (SP, 1);
353 412
… …
358 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
359 418
360 if (req->result >= 0) 419 if (req->result >= 0)
361 { 420 {
362 int i; 421 int i;
363 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
364 AV *av = newAV (); 423 AV *av = newAV ();
365 424
366 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
367 426
368 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
396 XPUSHs (sv_2mortal (fh)); 455 XPUSHs (sv_2mortal (fh));
397 } 456 }
398 break; 457 break;
399 458
400 case REQ_GROUP: 459 case REQ_GROUP:
401 req->fd = 2; /* mark group as finished */ 460 req->int1 = 2; /* mark group as finished */
402 461
403 if (req->data) 462 if (req->sv1)
404 { 463 {
405 int i; 464 int i;
406 AV *av = (AV *)req->data; 465 AV *av = (AV *)req->sv1;
407 466
408 EXTEND (SP, AvFILL (av) + 1); 467 EXTEND (SP, AvFILL (av) + 1);
409 for (i = 0; i <= AvFILL (av); ++i) 468 for (i = 0; i <= AvFILL (av); ++i)
410 PUSHs (*av_fetch (av, i, 0)); 469 PUSHs (*av_fetch (av, i, 0));
411 } 470 }
… …
413 472
414 case REQ_NOP: 473 case REQ_NOP:
415 case REQ_BUSY: 474 case REQ_BUSY:
416 break; 475 break;
417 476
477 case REQ_READLINK:
478 if (req->result > 0)
479 {
480 SvCUR_set (req->sv1, req->result);
481 *SvEND (req->sv1) = 0;
482 PUSHs (req->sv1);
483 }
484 break;
485
486 case REQ_STAT:
487 case REQ_LSTAT:
488 case REQ_FSTAT:
489 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
490 PL_laststatval = req->result;
491 PL_statcache = *(Stat_t *)(req->ptr2);
492 PUSHs (sv_2mortal (newSViv (req->result)));
493 break;
494
495 case REQ_READ:
496 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
497 *SvEND (req->sv1) = 0;
498 PUSHs (sv_2mortal (newSViv (req->result)));
499 break;
500
418 default: 501 default:
419 PUSHs (sv_2mortal (newSViv (req->result))); 502 PUSHs (sv_2mortal (newSViv (req->result)));
420 break; 503 break;
421 } 504 }
422 505
506 errno = req->errorno;
423 507
424 PUTBACK; 508 PUTBACK;
425 call_sv (req->callback, G_VOID | G_EVAL); 509 call_sv (req->callback, G_VOID | G_EVAL);
426 SPAGAIN; 510 SPAGAIN;
427 511
… …
456 { 540 {
457 sv_unmagic (req->self, PERL_MAGIC_ext); 541 sv_unmagic (req->self, PERL_MAGIC_ext);
458 SvREFCNT_dec (req->self); 542 SvREFCNT_dec (req->self);
459 } 543 }
460 544
461 SvREFCNT_dec (req->data);
462 SvREFCNT_dec (req->fh); 545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1);
463 SvREFCNT_dec (req->fh2); 547 SvREFCNT_dec (req->sv2);
464 SvREFCNT_dec (req->callback); 548 SvREFCNT_dec (req->callback);
465 Safefree (req->statdata);
466 549
467 if (req->type == REQ_READDIR) 550 if (req->flags & FLAG_PTR2_FREE)
468 free (req->data2ptr); 551 free (req->ptr2);
469 552
470 Safefree (req); 553 Safefree (req);
471} 554}
472 555
556static void req_cancel_subs (aio_req grp)
557{
558 aio_req sub;
559
560 if (grp->type != REQ_GROUP)
561 return;
562
563 SvREFCNT_dec (grp->sv2);
564 grp->sv2 = 0;
565
566 for (sub = grp->grp_first; sub; sub = sub->grp_next)
567 req_cancel (sub);
568}
569
473static void req_cancel (aio_req req) 570static void req_cancel (aio_req req)
474{ 571{
475 req->flags |= FLAG_CANCELLED; 572 req->flags |= FLAG_CANCELLED;
476 573
477 if (req->type == REQ_GROUP) 574 req_cancel_subs (req);
478 {
479 aio_req sub;
480
481 for (sub = req->grp_first; sub; sub = sub->grp_next)
482 req_cancel (sub);
483 }
484}
485
486static int poll_cb ()
487{
488 dSP;
489 int count = 0;
490 int do_croak = 0;
491 aio_req req;
492
493 for (;;)
494 {
495 LOCK (reslock);
496 req = reqq_shift (&res_queue);
497
498 if (req)
499 {
500 if (!res_queue.size)
501 {
502 /* read any signals sent by the worker threads */
503 char buf [32];
504 while (read (respipe [0], buf, 32) == 32)
505 ;
506 }
507 }
508
509 UNLOCK (reslock);
510
511 if (!req)
512 break;
513
514 --nreqs;
515
516 if (req->type == REQ_QUIT)
517 started--;
518 else if (req->type == REQ_GROUP && req->length)
519 {
520 req->fd = 1; /* mark request as delayed */
521 continue;
522 }
523 else
524 {
525 if (req->type == REQ_READ)
526 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
527
528 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
529 SvREADONLY_off (req->data);
530
531 if (req->statdata)
532 {
533 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
534 PL_laststatval = req->result;
535 PL_statcache = *(req->statdata);
536 }
537
538 req_invoke (req);
539
540 count++;
541 }
542
543 req_free (req);
544 }
545
546 return count;
547} 575}
548 576
549static void *aio_proc(void *arg); 577static void *aio_proc(void *arg);
550 578
551static void start_thread (void) 579static void start_thread (void)
552{ 580{
581 sigset_t fullsigset, oldsigset;
582 pthread_attr_t attr;
583
553 worker *wrk = calloc (1, sizeof (worker)); 584 worker *wrk = calloc (1, sizeof (worker));
554 585
555 if (!wrk) 586 if (!wrk)
556 croak ("unable to allocate worker thread data"); 587 croak ("unable to allocate worker thread data");
557
558 sigset_t fullsigset, oldsigset;
559 pthread_attr_t attr;
560 588
561 pthread_attr_init (&attr); 589 pthread_attr_init (&attr);
562 pthread_attr_setstacksize (&attr, STACKSIZE); 590 pthread_attr_setstacksize (&attr, STACKSIZE);
563 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 591 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
592#ifdef PTHREAD_SCOPE_PROCESS
593 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
594#endif
564 595
565 sigfillset (&fullsigset); 596 sigfillset (&fullsigset);
566 597
567 LOCK (wrklock); 598 LOCK (wrklock);
568 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 599 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
571 { 602 {
572 wrk->prev = &wrk_first; 603 wrk->prev = &wrk_first;
573 wrk->next = wrk_first.next; 604 wrk->next = wrk_first.next;
574 wrk_first.next->prev = wrk; 605 wrk_first.next->prev = wrk;
575 wrk_first.next = wrk; 606 wrk_first.next = wrk;
576 started++; 607 ++started;
577 } 608 }
578 else 609 else
579 free (wrk); 610 free (wrk);
580 611
581 sigprocmask (SIG_SETMASK, &oldsigset, 0); 612 sigprocmask (SIG_SETMASK, &oldsigset, 0);
582 UNLOCK (wrklock); 613 UNLOCK (wrklock);
583} 614}
584 615
616static void maybe_start_thread ()
617{
618 if (get_nthreads () >= wanted)
619 return;
620
621 /* todo: maybe use idle here, but might be less exact */
622 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
623 return;
624
625 start_thread ();
626}
627
585static void req_send (aio_req req) 628static void req_send (aio_req req)
586{ 629{
587 while (started < wanted && nreqs >= started)
588 start_thread ();
589
590 ++nreqs; 630 ++nreqs;
631
632 LOCK (reqlock);
633 ++nready;
634 reqq_push (&req_queue, req);
635 pthread_cond_signal (&reqwait);
636 UNLOCK (reqlock);
637
638 maybe_start_thread ();
639}
640
641static void end_thread (void)
642{
643 aio_req req;
644
645 Newz (0, req, 1, aio_cb);
646
647 req->type = REQ_QUIT;
648 req->pri = PRI_MAX + PRI_BIAS;
591 649
592 LOCK (reqlock); 650 LOCK (reqlock);
593 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
594 pthread_cond_signal (&reqwait); 652 pthread_cond_signal (&reqwait);
595 UNLOCK (reqlock); 653 UNLOCK (reqlock);
596 654
597 if (nreqs > max_outstanding) 655 LOCK (wrklock);
598 for (;;) 656 --started;
599 { 657 UNLOCK (wrklock);
600 poll_cb ();
601
602 if (nreqs <= max_outstanding)
603 break;
604
605 poll_wait ();
606 }
607} 658}
608 659
609static void end_thread (void) 660static void set_max_idle (int nthreads)
610{ 661{
611 aio_req req; 662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
612 663 max_idle = nthreads <= 0 ? 1 : nthreads;
613 Newz (0, req, 1, aio_cb); 664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
614
615 req->type = REQ_QUIT;
616 req->pri = PRI_MAX + PRI_BIAS;
617
618 req_send (req);
619} 665}
620 666
621static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
622{ 668{
623 if (wanted < nthreads) 669 if (wanted < nthreads)
624 wanted = nthreads; 670 wanted = nthreads;
625} 671}
626 672
627static void max_parallel (int nthreads) 673static void max_parallel (int nthreads)
628{ 674{
629 int cur = started;
630
631 if (wanted > nthreads) 675 if (wanted > nthreads)
632 wanted = nthreads; 676 wanted = nthreads;
633 677
634 while (cur > wanted) 678 while (started > wanted)
679 end_thread ();
680}
681
682static void poll_wait ()
683{
684 fd_set rfd;
685
686 while (nreqs)
635 { 687 {
688 int size;
689 if (WORDACCESS_UNSAFE) LOCK (reslock);
690 size = res_queue.size;
691 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
692
693 if (size)
694 return;
695
636 end_thread (); 696 maybe_start_thread ();
637 cur--; 697
698 FD_ZERO(&rfd);
699 FD_SET(respipe [0], &rfd);
700
701 select (respipe [0] + 1, &rfd, 0, 0, 0);
638 } 702 }
703}
639 704
640 while (started > wanted) 705static int poll_cb ()
706{
707 dSP;
708 int count = 0;
709 int maxreqs = max_poll_reqs;
710 int do_croak = 0;
711 struct timeval tv_start, tv_now;
712 aio_req req;
713
714 if (max_poll_time)
715 gettimeofday (&tv_start, 0);
716
717 for (;;)
641 { 718 {
719 for (;;)
720 {
721 maybe_start_thread ();
722
723 LOCK (reslock);
724 req = reqq_shift (&res_queue);
725
726 if (req)
727 {
728 --npending;
729
730 if (!res_queue.size)
731 {
732 /* read any signals sent by the worker threads */
733 char buf [32];
734 while (read (respipe [0], buf, 32) == 32)
735 ;
736 }
737 }
738
739 UNLOCK (reslock);
740
741 if (!req)
742 break;
743
744 --nreqs;
745
746 if (req->type == REQ_GROUP && req->size)
747 {
748 req->int1 = 1; /* mark request as delayed */
749 continue;
750 }
751 else
752 {
753 req_invoke (req);
754
755 count++;
756 }
757
758 req_free (req);
759
760 if (maxreqs && !--maxreqs)
761 break;
762
763 if (max_poll_time)
764 {
765 gettimeofday (&tv_now, 0);
766
767 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
768 break;
769 }
770 }
771
772 if (nreqs <= max_outstanding)
773 break;
774
642 poll_wait (); 775 poll_wait ();
643 poll_cb (); 776
777 ++maxreqs;
644 } 778 }
779
780 return count;
645} 781}
646 782
647static void create_pipe () 783static void create_pipe ()
648{ 784{
649 if (pipe (respipe)) 785 if (pipe (respipe))
… …
704#if !HAVE_FDATASYNC 840#if !HAVE_FDATASYNC
705# define fdatasync fsync 841# define fdatasync fsync
706#endif 842#endif
707 843
708#if !HAVE_READAHEAD 844#if !HAVE_READAHEAD
709# define readahead aio_readahead 845# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
710 846
711static ssize_t readahead (int fd, off_t offset, size_t count) 847static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
712{ 848{
713 dBUF; 849 dBUF;
714 850
715 while (count > 0) 851 while (count > 0)
716 { 852 {
… …
721 count -= len; 857 count -= len;
722 } 858 }
723 859
724 errno = 0; 860 errno = 0;
725} 861}
862
726#endif 863#endif
727 864
728#if !HAVE_READDIR_R 865#if !HAVE_READDIR_R
729# define readdir_r aio_readdir_r 866# define readdir_r aio_readdir_r
730 867
… …
775 { 912 {
776 off_t sbytes; 913 off_t sbytes;
777 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 914 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
778 915
779 if (res < 0 && sbytes) 916 if (res < 0 && sbytes)
780 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 917 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
781 res = sbytes; 918 res = sbytes;
782 } 919 }
783 920
784# elif __hpux 921# elif __hpux
785 res = sendfile (ofd, ifd, offset, count, 0, 0); 922 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
863 int memofs = 0; 1000 int memofs = 0;
864 int res = 0; 1001 int res = 0;
865 int errorno; 1002 int errorno;
866 1003
867 LOCK (wrklock); 1004 LOCK (wrklock);
868 self->dirp = dirp = opendir (req->dataptr); 1005 self->dirp = dirp = opendir (req->ptr1);
869 self->dbuf = u = malloc (sizeof (*u)); 1006 self->dbuf = u = malloc (sizeof (*u));
1007 req->flags |= FLAG_PTR2_FREE;
1008 req->ptr2 = names = malloc (memlen);
870 UNLOCK (wrklock); 1009 UNLOCK (wrklock);
871
872 req->data2ptr = names = malloc (memlen);
873 1010
874 if (dirp && u && names) 1011 if (dirp && u && names)
875 for (;;) 1012 for (;;)
876 { 1013 {
877 errno = 0; 1014 errno = 0;
… …
890 1027
891 while (memofs + len > memlen) 1028 while (memofs + len > memlen)
892 { 1029 {
893 memlen *= 2; 1030 memlen *= 2;
894 LOCK (wrklock); 1031 LOCK (wrklock);
895 req->data2ptr = names = realloc (names, memlen); 1032 req->ptr2 = names = realloc (names, memlen);
896 UNLOCK (wrklock); 1033 UNLOCK (wrklock);
897 1034
898 if (!names) 1035 if (!names)
899 break; 1036 break;
900 } 1037 }
… …
913/*****************************************************************************/ 1050/*****************************************************************************/
914 1051
915static void *aio_proc (void *thr_arg) 1052static void *aio_proc (void *thr_arg)
916{ 1053{
917 aio_req req; 1054 aio_req req;
918 int type; 1055 struct timespec ts;
919 worker *self = (worker *)thr_arg; 1056 worker *self = (worker *)thr_arg;
920 1057
921 do 1058 /* try to distribute timeouts somewhat evenly */
1059 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1060 * (1000000000UL / 1024UL);
1061
1062 for (;;)
922 { 1063 {
1064 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1065
923 LOCK (reqlock); 1066 LOCK (reqlock);
924 1067
925 for (;;) 1068 for (;;)
926 { 1069 {
927 self->req = req = reqq_shift (&req_queue); 1070 self->req = req = reqq_shift (&req_queue);
928 1071
929 if (req) 1072 if (req)
930 break; 1073 break;
931 1074
1075 ++idle;
1076
1077 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1078 == ETIMEDOUT)
1079 {
1080 if (idle > max_idle)
1081 {
1082 --idle;
1083 UNLOCK (reqlock);
1084 LOCK (wrklock);
1085 --started;
1086 UNLOCK (wrklock);
1087 goto quit;
1088 }
1089
1090 /* we are allowed to idle, so do so without any timeout */
932 pthread_cond_wait (&reqwait, &reqlock); 1091 pthread_cond_wait (&reqwait, &reqlock);
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 }
1094
1095 --idle;
933 } 1096 }
1097
1098 --nready;
934 1099
935 UNLOCK (reqlock); 1100 UNLOCK (reqlock);
936 1101
937 errno = 0; /* strictly unnecessary */ 1102 errno = 0; /* strictly unnecessary */
938 type = req->type; /* remember type for QUIT check */
939 1103
940 if (!(req->flags & FLAG_CANCELLED)) 1104 if (!(req->flags & FLAG_CANCELLED))
941 switch (type) 1105 switch (req->type)
942 { 1106 {
943 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
944 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1108 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
945 1109
946 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1110 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
947 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1111 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
948 1112
949 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1113 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
950 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1114 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
951 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1115 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
952 1116
953 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1117 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
954 case REQ_CLOSE: req->result = close (req->fd); break; 1118 case REQ_CLOSE: req->result = close (req->int1); break;
955 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
956 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
957 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
958 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
959 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1123 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1124 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1125 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
960 1126
961 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
962 case REQ_FSYNC: req->result = fsync (req->fd); break; 1128 case REQ_FSYNC: req->result = fsync (req->int1); break;
963 case REQ_READDIR: scandir_ (req, self); break; 1129 case REQ_READDIR: scandir_ (req, self); break;
964 1130
965 case REQ_BUSY: 1131 case REQ_BUSY:
966 { 1132 {
967 struct timeval tv; 1133 struct timeval tv;
968 1134
969 tv.tv_sec = req->fd; 1135 tv.tv_sec = req->int1;
970 tv.tv_usec = req->fd2; 1136 tv.tv_usec = req->int2;
971 1137
972 req->result = select (0, 0, 0, 0, &tv); 1138 req->result = select (0, 0, 0, 0, &tv);
973 } 1139 }
974 1140
975 case REQ_GROUP: 1141 case REQ_GROUP:
976 case REQ_NOP: 1142 case REQ_NOP:
1143 break;
1144
977 case REQ_QUIT: 1145 case REQ_QUIT:
978 break; 1146 goto quit;
979 1147
980 default: 1148 default:
981 req->result = ENOSYS; 1149 req->result = ENOSYS;
982 break; 1150 break;
983 } 1151 }
984 1152
985 req->errorno = errno; 1153 req->errorno = errno;
986 1154
987 LOCK (reslock); 1155 LOCK (reslock);
988 1156
1157 ++npending;
1158
989 if (!reqq_push (&res_queue, req)) 1159 if (!reqq_push (&res_queue, req))
990 /* write a dummy byte to the pipe so fh becomes ready */ 1160 /* write a dummy byte to the pipe so fh becomes ready */
991 write (respipe [1], &respipe, 1); 1161 write (respipe [1], &respipe, 1);
992 1162
993 self->req = 0; 1163 self->req = 0;
994 worker_clear (self); 1164 worker_clear (self);
995 1165
996 UNLOCK (reslock); 1166 UNLOCK (reslock);
997 } 1167 }
998 while (type != REQ_QUIT);
999 1168
1169quit:
1000 LOCK (wrklock); 1170 LOCK (wrklock);
1001 worker_free (self); 1171 worker_free (self);
1002 UNLOCK (wrklock); 1172 UNLOCK (wrklock);
1003 1173
1004 return 0; 1174 return 0;
… …
1051 1221
1052 worker_clear (wrk); 1222 worker_clear (wrk);
1053 worker_free (wrk); 1223 worker_free (wrk);
1054 } 1224 }
1055 1225
1056 started = 0; 1226 started = 0;
1227 idle = 0;
1057 nreqs = 0; 1228 nreqs = 0;
1229 nready = 0;
1230 npending = 0;
1058 1231
1059 close (respipe [0]); 1232 close (respipe [0]);
1060 close (respipe [1]); 1233 close (respipe [1]);
1061 create_pipe (); 1234 create_pipe ();
1062 1235
… …
1089PROTOTYPES: ENABLE 1262PROTOTYPES: ENABLE
1090 1263
1091BOOT: 1264BOOT:
1092{ 1265{
1093 HV *stash = gv_stashpv ("IO::AIO", 1); 1266 HV *stash = gv_stashpv ("IO::AIO", 1);
1267
1094 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1268 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1095 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1269 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1096 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1270 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1271 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1272 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1273 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1097 1274
1098 create_pipe (); 1275 create_pipe ();
1099 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1100} 1277}
1101 1278
1102void 1279void
1103min_parallel (nthreads) 1280max_poll_reqs (int nreqs)
1104 int nthreads
1105 PROTOTYPE: $ 1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_reqs = nreqs;
1106 1284
1107void 1285void
1108max_parallel (nthreads) 1286max_poll_time (double nseconds)
1109 int nthreads
1110 PROTOTYPE: $ 1287 PROTOTYPE: $
1288 CODE:
1289 max_poll_time = nseconds * AIO_TICKS;
1290
1291void
1292min_parallel (int nthreads)
1293 PROTOTYPE: $
1294
1295void
1296max_parallel (int nthreads)
1297 PROTOTYPE: $
1298
1299void
1300max_idle (int nthreads)
1301 PROTOTYPE: $
1302 CODE:
1303 set_max_idle (nthreads);
1111 1304
1112int 1305int
1113max_outstanding (nreqs) 1306max_outstanding (int maxreqs)
1114 int nreqs 1307 PROTOTYPE: $
1115 PROTOTYPE: $
1116 CODE: 1308 CODE:
1117 RETVAL = max_outstanding; 1309 RETVAL = max_outstanding;
1118 max_outstanding = nreqs; 1310 max_outstanding = maxreqs;
1311 OUTPUT:
1312 RETVAL
1119 1313
1120void 1314void
1121aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1315aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1122 SV * pathname 1316 SV8 * pathname
1123 int flags 1317 int flags
1124 int mode 1318 int mode
1125 SV * callback 1319 SV * callback
1126 PROTOTYPE: $$$;$ 1320 PROTOTYPE: $$$;$
1127 PPCODE: 1321 PPCODE:
1128{ 1322{
1129 dREQ; 1323 dREQ;
1130 1324
1131 req->type = REQ_OPEN; 1325 req->type = REQ_OPEN;
1132 req->data = newSVsv (pathname); 1326 req->sv1 = newSVsv (pathname);
1133 req->dataptr = SvPVbyte_nolen (req->data); 1327 req->ptr1 = SvPVbyte_nolen (req->sv1);
1134 req->fd = flags; 1328 req->int1 = flags;
1135 req->mode = mode; 1329 req->mode = mode;
1136 1330
1137 REQ_SEND; 1331 REQ_SEND;
1138} 1332}
1139 1333
… …
1149 PPCODE: 1343 PPCODE:
1150{ 1344{
1151 dREQ; 1345 dREQ;
1152 1346
1153 req->type = ix; 1347 req->type = ix;
1154 req->fh = newSVsv (fh); 1348 req->fh = newSVsv (fh);
1155 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1156 1350
1157 REQ_SEND (req); 1351 REQ_SEND (req);
1158} 1352}
1159 1353
1160void 1354void
1161aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1162 SV * fh 1356 SV * fh
1163 UV offset 1357 UV offset
1164 UV length 1358 UV length
1165 SV * data 1359 SV8 * data
1166 UV dataoffset 1360 UV dataoffset
1167 SV * callback 1361 SV * callback
1168 ALIAS: 1362 ALIAS:
1169 aio_read = REQ_READ 1363 aio_read = REQ_READ
1170 aio_write = REQ_WRITE 1364 aio_write = REQ_WRITE
1171 PROTOTYPE: $$$$$;$ 1365 PROTOTYPE: $$$$$;$
1172 PPCODE: 1366 PPCODE:
1173{ 1367{
1174 aio_req req;
1175 STRLEN svlen; 1368 STRLEN svlen;
1176 char *svptr = SvPVbyte (data, svlen); 1369 char *svptr = SvPVbyte (data, svlen);
1177 1370
1178 SvUPGRADE (data, SVt_PV); 1371 SvUPGRADE (data, SVt_PV);
1179 SvPOK_on (data); 1372 SvPOK_on (data);
… …
1201 1394
1202 { 1395 {
1203 dREQ; 1396 dREQ;
1204 1397
1205 req->type = ix; 1398 req->type = ix;
1206 req->fh = newSVsv (fh); 1399 req->fh = newSVsv (fh);
1207 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1208 : IoOFP (sv_2io (fh))); 1401 : IoOFP (sv_2io (fh)));
1209 req->offset = offset; 1402 req->offs = offset;
1210 req->length = length; 1403 req->size = length;
1211 req->data = SvREFCNT_inc (data); 1404 req->sv1 = SvREFCNT_inc (data);
1212 req->dataptr = (char *)svptr + dataoffset; 1405 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset;
1213 1407
1214 if (!SvREADONLY (data)) 1408 if (!SvREADONLY (data))
1215 { 1409 {
1216 SvREADONLY_on (data); 1410 SvREADONLY_on (data);
1217 req->data2ptr = (void *)data; 1411 req->flags |= FLAG_SV1_RO_OFF;
1218 } 1412 }
1219 1413
1220 REQ_SEND; 1414 REQ_SEND;
1221 } 1415 }
1416}
1417
1418void
1419aio_readlink (path,callback=&PL_sv_undef)
1420 SV8 * path
1421 SV * callback
1422 PROTOTYPE: $$;$
1423 PPCODE:
1424{
1425 SV *data;
1426 dREQ;
1427
1428 data = newSV (NAME_MAX);
1429 SvPOK_on (data);
1430
1431 req->type = REQ_READLINK;
1432 req->fh = newSVsv (path);
1433 req->ptr2 = SvPVbyte_nolen (req->fh);
1434 req->sv1 = data;
1435 req->ptr1 = SvPVbyte_nolen (data);
1436
1437 REQ_SEND;
1222} 1438}
1223 1439
1224void 1440void
1225aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1441aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1226 SV * out_fh 1442 SV * out_fh
… …
1232 PPCODE: 1448 PPCODE:
1233{ 1449{
1234 dREQ; 1450 dREQ;
1235 1451
1236 req->type = REQ_SENDFILE; 1452 req->type = REQ_SENDFILE;
1237 req->fh = newSVsv (out_fh); 1453 req->fh = newSVsv (out_fh);
1238 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1239 req->fh2 = newSVsv (in_fh); 1455 req->sv2 = newSVsv (in_fh);
1240 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1241 req->offset = in_offset; 1457 req->offs = in_offset;
1242 req->length = length; 1458 req->size = length;
1243 1459
1244 REQ_SEND; 1460 REQ_SEND;
1245} 1461}
1246 1462
1247void 1463void
… …
1254 PPCODE: 1470 PPCODE:
1255{ 1471{
1256 dREQ; 1472 dREQ;
1257 1473
1258 req->type = REQ_READAHEAD; 1474 req->type = REQ_READAHEAD;
1259 req->fh = newSVsv (fh); 1475 req->fh = newSVsv (fh);
1260 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1261 req->offset = offset; 1477 req->offs = offset;
1262 req->length = length; 1478 req->size = length;
1263 1479
1264 REQ_SEND; 1480 REQ_SEND;
1265} 1481}
1266 1482
1267void 1483void
1268aio_stat (fh_or_path,callback=&PL_sv_undef) 1484aio_stat (fh_or_path,callback=&PL_sv_undef)
1269 SV * fh_or_path 1485 SV8 * fh_or_path
1270 SV * callback 1486 SV * callback
1271 ALIAS: 1487 ALIAS:
1272 aio_stat = REQ_STAT 1488 aio_stat = REQ_STAT
1273 aio_lstat = REQ_LSTAT 1489 aio_lstat = REQ_LSTAT
1274 PPCODE: 1490 PPCODE:
1275{ 1491{
1276 dREQ; 1492 dREQ;
1277 1493
1278 New (0, req->statdata, 1, Stat_t); 1494 req->ptr2 = malloc (sizeof (Stat_t));
1279 if (!req->statdata) 1495 if (!req->ptr2)
1280 { 1496 {
1281 req_free (req); 1497 req_free (req);
1282 croak ("out of memory during aio_req->statdata allocation"); 1498 croak ("out of memory during aio_stat statdata allocation");
1283 } 1499 }
1500
1501 req->flags |= FLAG_PTR2_FREE;
1284 1502
1285 if (SvPOK (fh_or_path)) 1503 if (SvPOK (fh_or_path))
1286 { 1504 {
1287 req->type = ix; 1505 req->type = ix;
1288 req->data = newSVsv (fh_or_path); 1506 req->sv1 = newSVsv (fh_or_path);
1289 req->dataptr = SvPVbyte_nolen (req->data); 1507 req->ptr1 = SvPVbyte_nolen (req->sv1);
1290 } 1508 }
1291 else 1509 else
1292 { 1510 {
1293 req->type = REQ_FSTAT; 1511 req->type = REQ_FSTAT;
1294 req->fh = newSVsv (fh_or_path); 1512 req->fh = newSVsv (fh_or_path);
1295 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1296 } 1514 }
1297 1515
1298 REQ_SEND; 1516 REQ_SEND;
1299} 1517}
1300 1518
1301void 1519void
1302aio_unlink (pathname,callback=&PL_sv_undef) 1520aio_unlink (pathname,callback=&PL_sv_undef)
1303 SV * pathname 1521 SV8 * pathname
1304 SV * callback 1522 SV * callback
1305 ALIAS: 1523 ALIAS:
1306 aio_unlink = REQ_UNLINK 1524 aio_unlink = REQ_UNLINK
1307 aio_rmdir = REQ_RMDIR 1525 aio_rmdir = REQ_RMDIR
1308 aio_readdir = REQ_READDIR 1526 aio_readdir = REQ_READDIR
1309 PPCODE: 1527 PPCODE:
1310{ 1528{
1311 dREQ; 1529 dREQ;
1312 1530
1313 req->type = ix; 1531 req->type = ix;
1314 req->data = newSVsv (pathname); 1532 req->sv1 = newSVsv (pathname);
1315 req->dataptr = SvPVbyte_nolen (req->data); 1533 req->ptr1 = SvPVbyte_nolen (req->sv1);
1316 1534
1317 REQ_SEND; 1535 REQ_SEND;
1318} 1536}
1319 1537
1320void 1538void
1321aio_link (oldpath,newpath,callback=&PL_sv_undef) 1539aio_link (oldpath,newpath,callback=&PL_sv_undef)
1322 SV * oldpath 1540 SV8 * oldpath
1323 SV * newpath 1541 SV8 * newpath
1324 SV * callback 1542 SV * callback
1325 ALIAS: 1543 ALIAS:
1326 aio_link = REQ_LINK 1544 aio_link = REQ_LINK
1327 aio_symlink = REQ_SYMLINK 1545 aio_symlink = REQ_SYMLINK
1328 aio_rename = REQ_RENAME 1546 aio_rename = REQ_RENAME
1329 PPCODE: 1547 PPCODE:
1330{ 1548{
1331 dREQ; 1549 dREQ;
1332 1550
1333 req->type = ix; 1551 req->type = ix;
1334 req->fh = newSVsv (oldpath); 1552 req->fh = newSVsv (oldpath);
1335 req->data2ptr = SvPVbyte_nolen (req->fh); 1553 req->ptr2 = SvPVbyte_nolen (req->fh);
1336 req->data = newSVsv (newpath); 1554 req->sv1 = newSVsv (newpath);
1337 req->dataptr = SvPVbyte_nolen (req->data); 1555 req->ptr1 = SvPVbyte_nolen (req->sv1);
1338 1556
1339 REQ_SEND; 1557 REQ_SEND;
1340} 1558}
1341 1559
1342void 1560void
1561aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1562 SV8 * pathname
1563 SV * callback
1564 UV mode
1565 UV dev
1566 PPCODE:
1567{
1568 dREQ;
1569
1570 req->type = REQ_MKNOD;
1571 req->sv1 = newSVsv (pathname);
1572 req->ptr1 = SvPVbyte_nolen (req->sv1);
1573 req->mode = (mode_t)mode;
1574 req->offs = dev;
1575
1576 REQ_SEND;
1577}
1578
1579void
1343aio_busy (delay,callback=&PL_sv_undef) 1580aio_busy (delay,callback=&PL_sv_undef)
1344 double delay 1581 double delay
1345 SV * callback 1582 SV * callback
1346 PPCODE: 1583 PPCODE:
1347{ 1584{
1348 dREQ; 1585 dREQ;
1349 1586
1350 req->type = REQ_BUSY; 1587 req->type = REQ_BUSY;
1351 req->fd = delay < 0. ? 0 : delay; 1588 req->int1 = delay < 0. ? 0 : delay;
1352 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1353 1590
1354 REQ_SEND; 1591 REQ_SEND;
1355} 1592}
1356 1593
1357void 1594void
… …
1361 PPCODE: 1598 PPCODE:
1362{ 1599{
1363 dREQ; 1600 dREQ;
1364 1601
1365 req->type = REQ_GROUP; 1602 req->type = REQ_GROUP;
1603
1366 req_send (req); 1604 req_send (req);
1367
1368 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1605 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1369} 1606}
1370 1607
1371void 1608void
1372aio_nop (callback=&PL_sv_undef) 1609aio_nop (callback=&PL_sv_undef)
1373 SV * callback 1610 SV * callback
1374 PPCODE: 1611 PPCODE:
1375{ 1612{
1376 dREQ; 1613 dREQ;
1377 1614
1378 req->type = REQ_NOP; 1615 req->type = REQ_NOP;
1379 1616
1380 REQ_SEND; 1617 REQ_SEND;
1381} 1618}
1382 1619
1383void 1620int
1384aioreq_pri (int pri = DEFAULT_PRI) 1621aioreq_pri (int pri = 0)
1385 CODE: 1622 PROTOTYPE: ;$
1623 CODE:
1624 RETVAL = next_pri - PRI_BIAS;
1625 if (items > 0)
1626 {
1386 if (pri < PRI_MIN) pri = PRI_MIN; 1627 if (pri < PRI_MIN) pri = PRI_MIN;
1387 if (pri > PRI_MAX) pri = PRI_MAX; 1628 if (pri > PRI_MAX) pri = PRI_MAX;
1388 next_pri = pri + PRI_BIAS; 1629 next_pri = pri + PRI_BIAS;
1630 }
1631 OUTPUT:
1632 RETVAL
1389 1633
1390void 1634void
1391aioreq_nice (int nice = 0) 1635aioreq_nice (int nice = 0)
1392 CODE: 1636 CODE:
1393 nice = next_pri - nice; 1637 nice = next_pri - nice;
1394 if (nice < PRI_MIN) nice = PRI_MIN; 1638 if (nice < PRI_MIN) nice = PRI_MIN;
1395 if (nice > PRI_MAX) nice = PRI_MAX; 1639 if (nice > PRI_MAX) nice = PRI_MAX;
1396 next_pri = nice + PRI_BIAS; 1640 next_pri = nice + PRI_BIAS;
1397 1641
1398void 1642void
1399flush () 1643flush ()
1400 PROTOTYPE: 1644 PROTOTYPE:
1401 CODE: 1645 CODE:
… …
1403 { 1647 {
1404 poll_wait (); 1648 poll_wait ();
1405 poll_cb (); 1649 poll_cb ();
1406 } 1650 }
1407 1651
1408void 1652int
1409poll() 1653poll()
1410 PROTOTYPE: 1654 PROTOTYPE:
1411 CODE: 1655 CODE:
1412 if (nreqs) 1656 if (nreqs)
1413 { 1657 {
1414 poll_wait (); 1658 poll_wait ();
1415 poll_cb (); 1659 RETVAL = poll_cb ();
1416 } 1660 }
1661 else
1662 RETVAL = 0;
1663 OUTPUT:
1664 RETVAL
1417 1665
1418int 1666int
1419poll_fileno() 1667poll_fileno()
1420 PROTOTYPE: 1668 PROTOTYPE:
1421 CODE: 1669 CODE:
… …
1444 CODE: 1692 CODE:
1445 RETVAL = nreqs; 1693 RETVAL = nreqs;
1446 OUTPUT: 1694 OUTPUT:
1447 RETVAL 1695 RETVAL
1448 1696
1697int
1698nready()
1699 PROTOTYPE:
1700 CODE:
1701 RETVAL = get_nready ();
1702 OUTPUT:
1703 RETVAL
1704
1705int
1706npending()
1707 PROTOTYPE:
1708 CODE:
1709 RETVAL = get_npending ();
1710 OUTPUT:
1711 RETVAL
1712
1713int
1714nthreads()
1715 PROTOTYPE:
1716 CODE:
1717 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1718 RETVAL = started;
1719 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1720 OUTPUT:
1721 RETVAL
1722
1449PROTOTYPES: DISABLE 1723PROTOTYPES: DISABLE
1450 1724
1451MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1725MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1452 1726
1453void 1727void
… …
1468 PPCODE: 1742 PPCODE:
1469{ 1743{
1470 int i; 1744 int i;
1471 aio_req req; 1745 aio_req req;
1472 1746
1473 if (grp->fd == 2) 1747 if (grp->int1 == 2)
1474 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1748 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1475 1749
1476 for (i = 1; i < items; ++i ) 1750 for (i = 1; i < items; ++i )
1477 { 1751 {
1478 if (GIMME_V != G_VOID) 1752 if (GIMME_V != G_VOID)
… …
1480 1754
1481 req = SvAIO_REQ (ST (i)); 1755 req = SvAIO_REQ (ST (i));
1482 1756
1483 if (req) 1757 if (req)
1484 { 1758 {
1485 ++grp->length; 1759 ++grp->size;
1486 req->grp = grp; 1760 req->grp = grp;
1487 1761
1488 req->grp_prev = 0; 1762 req->grp_prev = 0;
1489 req->grp_next = grp->grp_first; 1763 req->grp_next = grp->grp_first;
1490 1764
… …
1495 } 1769 }
1496 } 1770 }
1497} 1771}
1498 1772
1499void 1773void
1774cancel_subs (aio_req_ornot req)
1775 CODE:
1776 req_cancel_subs (req);
1777
1778void
1500result (aio_req grp, ...) 1779result (aio_req grp, ...)
1501 CODE: 1780 CODE:
1502{ 1781{
1503 int i; 1782 int i;
1783 AV *av;
1784
1785 grp->errorno = errno;
1786
1504 AV *av = newAV (); 1787 av = newAV ();
1505 1788
1506 for (i = 1; i < items; ++i ) 1789 for (i = 1; i < items; ++i )
1507 av_push (av, newSVsv (ST (i))); 1790 av_push (av, newSVsv (ST (i)));
1508 1791
1509 SvREFCNT_dec (grp->data); 1792 SvREFCNT_dec (grp->sv1);
1510 grp->data = (SV *)av; 1793 grp->sv1 = (SV *)av;
1511} 1794}
1795
1796void
1797errno (aio_req grp, int errorno = errno)
1798 CODE:
1799 grp->errorno = errorno;
1512 1800
1513void 1801void
1514limit (aio_req grp, int limit) 1802limit (aio_req grp, int limit)
1515 CODE: 1803 CODE:
1516 grp->fd2 = limit; 1804 grp->int2 = limit;
1517 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1518 1806
1519void 1807void
1520feed (aio_req grp, SV *callback=&PL_sv_undef) 1808feed (aio_req grp, SV *callback=&PL_sv_undef)
1521 CODE: 1809 CODE:
1522{ 1810{
1523 SvREFCNT_dec (grp->fh2); 1811 SvREFCNT_dec (grp->sv2);
1524 grp->fh2 = newSVsv (callback); 1812 grp->sv2 = newSVsv (callback);
1525 1813
1526 if (grp->fd2 <= 0) 1814 if (grp->int2 <= 0)
1527 grp->fd2 = 2; 1815 grp->int2 = 2;
1528 1816
1529 aio_grp_feed (grp); 1817 aio_grp_feed (grp);
1530} 1818}
1531 1819

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines