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.73 by root, Tue Oct 24 21:26:30 2006 UTC vs.
Revision 1.92 by root, Wed Nov 8 01:59:59 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);
245static void req_cancel (aio_req req); 327static void req_cancel (aio_req req);
246 328
247/* must be called at most once */ 329/* must be called at most once */
… …
268 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
269} 351}
270 352
271static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
272{ 354{
273 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
274 { 356 {
275 int old_len = grp->length; 357 int old_len = grp->size;
276 358
277 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
278 { 360 {
279 dSP; 361 dSP;
280 362
281 ENTER; 363 ENTER;
282 SAVETMPS; 364 SAVETMPS;
283 PUSHMARK (SP); 365 PUSHMARK (SP);
284 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
285 PUTBACK; 367 PUTBACK;
286 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
287 SPAGAIN; 369 SPAGAIN;
288 FREETMPS; 370 FREETMPS;
289 LEAVE; 371 LEAVE;
290 } 372 }
291 373
292 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
293 if (old_len == grp->length) 375 if (old_len == grp->size)
294 { 376 {
295 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
296 grp->fh2 = 0; 378 grp->sv2 = 0;
297 break; 379 break;
298 } 380 }
299 } 381 }
300} 382}
301 383
302static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
303{ 385{
304 --grp->length; 386 --grp->size;
305 387
306 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
307 aio_grp_feed (grp); 389 aio_grp_feed (grp);
308 390
309 /* finish, if done */ 391 /* finish, if done */
310 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
311 { 393 {
312 req_invoke (grp); 394 req_invoke (grp);
313 req_free (grp); 395 req_free (grp);
314 } 396 }
315} 397}
316 398
317static void poll_wait ()
318{
319 fd_set rfd;
320
321 while (nreqs)
322 {
323 int size;
324#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
325 LOCK (reslock);
326#endif
327 size = res_queue.size;
328#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
329 UNLOCK (reslock);
330#endif
331
332 if (size)
333 return;
334
335 FD_ZERO(&rfd);
336 FD_SET(respipe [0], &rfd);
337
338 select (respipe [0] + 1, &rfd, 0, 0, 0);
339 }
340}
341
342static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
343{ 400{
344 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
345 405
346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
347 { 407 {
348 errno = req->errorno;
349
350 ENTER; 408 ENTER;
351 SAVETMPS; 409 SAVETMPS;
352 PUSHMARK (SP); 410 PUSHMARK (SP);
353 EXTEND (SP, 1); 411 EXTEND (SP, 1);
354 412
… …
359 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
360 418
361 if (req->result >= 0) 419 if (req->result >= 0)
362 { 420 {
363 int i; 421 int i;
364 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
365 AV *av = newAV (); 423 AV *av = newAV ();
366 424
367 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
368 426
369 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
397 XPUSHs (sv_2mortal (fh)); 455 XPUSHs (sv_2mortal (fh));
398 } 456 }
399 break; 457 break;
400 458
401 case REQ_GROUP: 459 case REQ_GROUP:
402 req->fd = 2; /* mark group as finished */ 460 req->int1 = 2; /* mark group as finished */
403 461
404 if (req->data) 462 if (req->sv1)
405 { 463 {
406 int i; 464 int i;
407 AV *av = (AV *)req->data; 465 AV *av = (AV *)req->sv1;
408 466
409 EXTEND (SP, AvFILL (av) + 1); 467 EXTEND (SP, AvFILL (av) + 1);
410 for (i = 0; i <= AvFILL (av); ++i) 468 for (i = 0; i <= AvFILL (av); ++i)
411 PUSHs (*av_fetch (av, i, 0)); 469 PUSHs (*av_fetch (av, i, 0));
412 } 470 }
… …
414 472
415 case REQ_NOP: 473 case REQ_NOP:
416 case REQ_BUSY: 474 case REQ_BUSY:
417 break; 475 break;
418 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
419 default: 501 default:
420 PUSHs (sv_2mortal (newSViv (req->result))); 502 PUSHs (sv_2mortal (newSViv (req->result)));
421 break; 503 break;
422 } 504 }
423 505
506 errno = req->errorno;
424 507
425 PUTBACK; 508 PUTBACK;
426 call_sv (req->callback, G_VOID | G_EVAL); 509 call_sv (req->callback, G_VOID | G_EVAL);
427 SPAGAIN; 510 SPAGAIN;
428 511
… …
457 { 540 {
458 sv_unmagic (req->self, PERL_MAGIC_ext); 541 sv_unmagic (req->self, PERL_MAGIC_ext);
459 SvREFCNT_dec (req->self); 542 SvREFCNT_dec (req->self);
460 } 543 }
461 544
462 SvREFCNT_dec (req->data);
463 SvREFCNT_dec (req->fh); 545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1);
464 SvREFCNT_dec (req->fh2); 547 SvREFCNT_dec (req->sv2);
465 SvREFCNT_dec (req->callback); 548 SvREFCNT_dec (req->callback);
466 Safefree (req->statdata);
467 549
468 if (req->type == REQ_READDIR) 550 if (req->flags & FLAG_PTR2_FREE)
469 free (req->data2ptr); 551 free (req->ptr2);
470 552
471 Safefree (req); 553 Safefree (req);
472} 554}
473 555
474static void req_cancel_subs (aio_req grp) 556static void req_cancel_subs (aio_req grp)
… …
476 aio_req sub; 558 aio_req sub;
477 559
478 if (grp->type != REQ_GROUP) 560 if (grp->type != REQ_GROUP)
479 return; 561 return;
480 562
481 SvREFCNT_dec (grp->fh2); 563 SvREFCNT_dec (grp->sv2);
482 grp->fh2 = 0; 564 grp->sv2 = 0;
483 565
484 for (sub = grp->grp_first; sub; sub = sub->grp_next) 566 for (sub = grp->grp_first; sub; sub = sub->grp_next)
485 req_cancel (sub); 567 req_cancel (sub);
486} 568}
487 569
488static void req_cancel (aio_req req) 570static void req_cancel (aio_req req)
489{ 571{
490 req->flags |= FLAG_CANCELLED; 572 req->flags |= FLAG_CANCELLED;
491 573
492 req_cancel_subs (req); 574 req_cancel_subs (req);
493}
494
495static int poll_cb ()
496{
497 dSP;
498 int count = 0;
499 int do_croak = 0;
500 aio_req req;
501
502 for (;;)
503 {
504 LOCK (reslock);
505 req = reqq_shift (&res_queue);
506
507 if (req)
508 {
509 if (!res_queue.size)
510 {
511 /* read any signals sent by the worker threads */
512 char buf [32];
513 while (read (respipe [0], buf, 32) == 32)
514 ;
515 }
516 }
517
518 UNLOCK (reslock);
519
520 if (!req)
521 break;
522
523 --nreqs;
524
525 if (req->type == REQ_QUIT)
526 started--;
527 else if (req->type == REQ_GROUP && req->length)
528 {
529 req->fd = 1; /* mark request as delayed */
530 continue;
531 }
532 else
533 {
534 if (req->type == REQ_READ)
535 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
536
537 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
538 SvREADONLY_off (req->data);
539
540 if (req->statdata)
541 {
542 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
543 PL_laststatval = req->result;
544 PL_statcache = *(req->statdata);
545 }
546
547 req_invoke (req);
548
549 count++;
550 }
551
552 req_free (req);
553 }
554
555 return count;
556} 575}
557 576
558static void *aio_proc(void *arg); 577static void *aio_proc(void *arg);
559 578
560static void start_thread (void) 579static void start_thread (void)
… …
568 croak ("unable to allocate worker thread data"); 587 croak ("unable to allocate worker thread data");
569 588
570 pthread_attr_init (&attr); 589 pthread_attr_init (&attr);
571 pthread_attr_setstacksize (&attr, STACKSIZE); 590 pthread_attr_setstacksize (&attr, STACKSIZE);
572 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
573 595
574 sigfillset (&fullsigset); 596 sigfillset (&fullsigset);
575 597
576 LOCK (wrklock); 598 LOCK (wrklock);
577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 599 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
580 { 602 {
581 wrk->prev = &wrk_first; 603 wrk->prev = &wrk_first;
582 wrk->next = wrk_first.next; 604 wrk->next = wrk_first.next;
583 wrk_first.next->prev = wrk; 605 wrk_first.next->prev = wrk;
584 wrk_first.next = wrk; 606 wrk_first.next = wrk;
585 started++; 607 ++started;
586 } 608 }
587 else 609 else
588 free (wrk); 610 free (wrk);
589 611
590 sigprocmask (SIG_SETMASK, &oldsigset, 0); 612 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock); 613 UNLOCK (wrklock);
592} 614}
593 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
594static void req_send (aio_req req) 628static void req_send (aio_req req)
595{ 629{
596 while (started < wanted && nreqs >= started)
597 start_thread ();
598
599 ++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;
600 649
601 LOCK (reqlock); 650 LOCK (reqlock);
602 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
603 pthread_cond_signal (&reqwait); 652 pthread_cond_signal (&reqwait);
604 UNLOCK (reqlock); 653 UNLOCK (reqlock);
605 654
606 if (nreqs > max_outstanding) 655 LOCK (wrklock);
607 for (;;) 656 --started;
608 { 657 UNLOCK (wrklock);
609 poll_cb ();
610
611 if (nreqs <= max_outstanding)
612 break;
613
614 poll_wait ();
615 }
616} 658}
617 659
618static void end_thread (void) 660static void set_max_idle (int nthreads)
619{ 661{
620 aio_req req; 662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
621 663 max_idle = nthreads <= 0 ? 1 : nthreads;
622 Newz (0, req, 1, aio_cb); 664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
623
624 req->type = REQ_QUIT;
625 req->pri = PRI_MAX + PRI_BIAS;
626
627 req_send (req);
628} 665}
629 666
630static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
631{ 668{
632 if (wanted < nthreads) 669 if (wanted < nthreads)
633 wanted = nthreads; 670 wanted = nthreads;
634} 671}
635 672
636static void max_parallel (int nthreads) 673static void max_parallel (int nthreads)
637{ 674{
638 int cur = started;
639
640 if (wanted > nthreads) 675 if (wanted > nthreads)
641 wanted = nthreads; 676 wanted = nthreads;
642 677
643 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)
644 { 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
645 end_thread (); 696 maybe_start_thread ();
646 cur--; 697
698 FD_ZERO(&rfd);
699 FD_SET(respipe [0], &rfd);
700
701 select (respipe [0] + 1, &rfd, 0, 0, 0);
647 } 702 }
703}
648 704
649 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 (;;)
650 { 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
651 poll_wait (); 775 poll_wait ();
652 poll_cb (); 776
777 ++maxreqs;
653 } 778 }
779
780 return count;
654} 781}
655 782
656static void create_pipe () 783static void create_pipe ()
657{ 784{
658 if (pipe (respipe)) 785 if (pipe (respipe))
… …
713#if !HAVE_FDATASYNC 840#if !HAVE_FDATASYNC
714# define fdatasync fsync 841# define fdatasync fsync
715#endif 842#endif
716 843
717#if !HAVE_READAHEAD 844#if !HAVE_READAHEAD
718# define readahead aio_readahead 845# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
719 846
720static 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)
721{ 848{
722 dBUF; 849 dBUF;
723 850
724 while (count > 0) 851 while (count > 0)
725 { 852 {
… …
730 count -= len; 857 count -= len;
731 } 858 }
732 859
733 errno = 0; 860 errno = 0;
734} 861}
862
735#endif 863#endif
736 864
737#if !HAVE_READDIR_R 865#if !HAVE_READDIR_R
738# define readdir_r aio_readdir_r 866# define readdir_r aio_readdir_r
739 867
… …
784 { 912 {
785 off_t sbytes; 913 off_t sbytes;
786 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 914 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
787 915
788 if (res < 0 && sbytes) 916 if (res < 0 && sbytes)
789 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 917 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
790 res = sbytes; 918 res = sbytes;
791 } 919 }
792 920
793# elif __hpux 921# elif __hpux
794 res = sendfile (ofd, ifd, offset, count, 0, 0); 922 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
872 int memofs = 0; 1000 int memofs = 0;
873 int res = 0; 1001 int res = 0;
874 int errorno; 1002 int errorno;
875 1003
876 LOCK (wrklock); 1004 LOCK (wrklock);
877 self->dirp = dirp = opendir (req->dataptr); 1005 self->dirp = dirp = opendir (req->ptr1);
878 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);
879 UNLOCK (wrklock); 1009 UNLOCK (wrklock);
880
881 req->data2ptr = names = malloc (memlen);
882 1010
883 if (dirp && u && names) 1011 if (dirp && u && names)
884 for (;;) 1012 for (;;)
885 { 1013 {
886 errno = 0; 1014 errno = 0;
… …
899 1027
900 while (memofs + len > memlen) 1028 while (memofs + len > memlen)
901 { 1029 {
902 memlen *= 2; 1030 memlen *= 2;
903 LOCK (wrklock); 1031 LOCK (wrklock);
904 req->data2ptr = names = realloc (names, memlen); 1032 req->ptr2 = names = realloc (names, memlen);
905 UNLOCK (wrklock); 1033 UNLOCK (wrklock);
906 1034
907 if (!names) 1035 if (!names)
908 break; 1036 break;
909 } 1037 }
… …
922/*****************************************************************************/ 1050/*****************************************************************************/
923 1051
924static void *aio_proc (void *thr_arg) 1052static void *aio_proc (void *thr_arg)
925{ 1053{
926 aio_req req; 1054 aio_req req;
927 int type; 1055 struct timespec ts;
928 worker *self = (worker *)thr_arg; 1056 worker *self = (worker *)thr_arg;
929 1057
930 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 (;;)
931 { 1063 {
1064 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1065
932 LOCK (reqlock); 1066 LOCK (reqlock);
933 1067
934 for (;;) 1068 for (;;)
935 { 1069 {
936 self->req = req = reqq_shift (&req_queue); 1070 self->req = req = reqq_shift (&req_queue);
937 1071
938 if (req) 1072 if (req)
939 break; 1073 break;
940 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 */
941 pthread_cond_wait (&reqwait, &reqlock); 1091 pthread_cond_wait (&reqwait, &reqlock);
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 }
1094
1095 --idle;
942 } 1096 }
1097
1098 --nready;
943 1099
944 UNLOCK (reqlock); 1100 UNLOCK (reqlock);
945 1101
946 errno = 0; /* strictly unnecessary */ 1102 errno = 0; /* strictly unnecessary */
947 type = req->type; /* remember type for QUIT check */
948 1103
949 if (!(req->flags & FLAG_CANCELLED)) 1104 if (!(req->flags & FLAG_CANCELLED))
950 switch (type) 1105 switch (req->type)
951 { 1106 {
952 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;
953 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;
954 1109
955 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;
956 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;
957 1112
958 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;
959 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;
960 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;
961 1116
962 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;
963 case REQ_CLOSE: req->result = close (req->fd); break; 1118 case REQ_CLOSE: req->result = close (req->int1); break;
964 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
965 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
966 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
967 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
968 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;
969 1126
970 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
971 case REQ_FSYNC: req->result = fsync (req->fd); break; 1128 case REQ_FSYNC: req->result = fsync (req->int1); break;
972 case REQ_READDIR: scandir_ (req, self); break; 1129 case REQ_READDIR: scandir_ (req, self); break;
973 1130
974 case REQ_BUSY: 1131 case REQ_BUSY:
975 { 1132 {
976 struct timeval tv; 1133 struct timeval tv;
977 1134
978 tv.tv_sec = req->fd; 1135 tv.tv_sec = req->int1;
979 tv.tv_usec = req->fd2; 1136 tv.tv_usec = req->int2;
980 1137
981 req->result = select (0, 0, 0, 0, &tv); 1138 req->result = select (0, 0, 0, 0, &tv);
982 } 1139 }
983 1140
984 case REQ_GROUP: 1141 case REQ_GROUP:
985 case REQ_NOP: 1142 case REQ_NOP:
1143 break;
1144
986 case REQ_QUIT: 1145 case REQ_QUIT:
987 break; 1146 goto quit;
988 1147
989 default: 1148 default:
990 req->result = ENOSYS; 1149 req->result = ENOSYS;
991 break; 1150 break;
992 } 1151 }
993 1152
994 req->errorno = errno; 1153 req->errorno = errno;
995 1154
996 LOCK (reslock); 1155 LOCK (reslock);
997 1156
1157 ++npending;
1158
998 if (!reqq_push (&res_queue, req)) 1159 if (!reqq_push (&res_queue, req))
999 /* write a dummy byte to the pipe so fh becomes ready */ 1160 /* write a dummy byte to the pipe so fh becomes ready */
1000 write (respipe [1], &respipe, 1); 1161 write (respipe [1], &respipe, 1);
1001 1162
1002 self->req = 0; 1163 self->req = 0;
1003 worker_clear (self); 1164 worker_clear (self);
1004 1165
1005 UNLOCK (reslock); 1166 UNLOCK (reslock);
1006 } 1167 }
1007 while (type != REQ_QUIT);
1008 1168
1169quit:
1009 LOCK (wrklock); 1170 LOCK (wrklock);
1010 worker_free (self); 1171 worker_free (self);
1011 UNLOCK (wrklock); 1172 UNLOCK (wrklock);
1012 1173
1013 return 0; 1174 return 0;
… …
1060 1221
1061 worker_clear (wrk); 1222 worker_clear (wrk);
1062 worker_free (wrk); 1223 worker_free (wrk);
1063 } 1224 }
1064 1225
1065 started = 0; 1226 started = 0;
1227 idle = 0;
1066 nreqs = 0; 1228 nreqs = 0;
1229 nready = 0;
1230 npending = 0;
1067 1231
1068 close (respipe [0]); 1232 close (respipe [0]);
1069 close (respipe [1]); 1233 close (respipe [1]);
1070 create_pipe (); 1234 create_pipe ();
1071 1235
… …
1098PROTOTYPES: ENABLE 1262PROTOTYPES: ENABLE
1099 1263
1100BOOT: 1264BOOT:
1101{ 1265{
1102 HV *stash = gv_stashpv ("IO::AIO", 1); 1266 HV *stash = gv_stashpv ("IO::AIO", 1);
1267
1103 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1268 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1104 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1269 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1105 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));
1106 1274
1107 create_pipe (); 1275 create_pipe ();
1108 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1109} 1277}
1110 1278
1111void 1279void
1112min_parallel (nthreads) 1280max_poll_reqs (int nreqs)
1113 int nthreads
1114 PROTOTYPE: $ 1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_reqs = nreqs;
1115 1284
1116void 1285void
1117max_parallel (nthreads) 1286max_poll_time (double nseconds)
1118 int nthreads
1119 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);
1120 1304
1121int 1305int
1122max_outstanding (nreqs) 1306max_outstanding (int maxreqs)
1123 int nreqs 1307 PROTOTYPE: $
1124 PROTOTYPE: $
1125 CODE: 1308 CODE:
1126 RETVAL = max_outstanding; 1309 RETVAL = max_outstanding;
1127 max_outstanding = nreqs; 1310 max_outstanding = maxreqs;
1311 OUTPUT:
1312 RETVAL
1128 1313
1129void 1314void
1130aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1315aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1131 SV * pathname 1316 SV8 * pathname
1132 int flags 1317 int flags
1133 int mode 1318 int mode
1134 SV * callback 1319 SV * callback
1135 PROTOTYPE: $$$;$ 1320 PROTOTYPE: $$$;$
1136 PPCODE: 1321 PPCODE:
1137{ 1322{
1138 dREQ; 1323 dREQ;
1139 1324
1140 req->type = REQ_OPEN; 1325 req->type = REQ_OPEN;
1141 req->data = newSVsv (pathname); 1326 req->sv1 = newSVsv (pathname);
1142 req->dataptr = SvPVbyte_nolen (req->data); 1327 req->ptr1 = SvPVbyte_nolen (req->sv1);
1143 req->fd = flags; 1328 req->int1 = flags;
1144 req->mode = mode; 1329 req->mode = mode;
1145 1330
1146 REQ_SEND; 1331 REQ_SEND;
1147} 1332}
1148 1333
… …
1158 PPCODE: 1343 PPCODE:
1159{ 1344{
1160 dREQ; 1345 dREQ;
1161 1346
1162 req->type = ix; 1347 req->type = ix;
1163 req->fh = newSVsv (fh); 1348 req->fh = newSVsv (fh);
1164 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1165 1350
1166 REQ_SEND (req); 1351 REQ_SEND (req);
1167} 1352}
1168 1353
1169void 1354void
1170aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1171 SV * fh 1356 SV * fh
1172 UV offset 1357 UV offset
1173 UV length 1358 UV length
1174 SV * data 1359 SV8 * data
1175 UV dataoffset 1360 UV dataoffset
1176 SV * callback 1361 SV * callback
1177 ALIAS: 1362 ALIAS:
1178 aio_read = REQ_READ 1363 aio_read = REQ_READ
1179 aio_write = REQ_WRITE 1364 aio_write = REQ_WRITE
1180 PROTOTYPE: $$$$$;$ 1365 PROTOTYPE: $$$$$;$
1181 PPCODE: 1366 PPCODE:
1182{ 1367{
1183 aio_req req;
1184 STRLEN svlen; 1368 STRLEN svlen;
1185 char *svptr = SvPVbyte (data, svlen); 1369 char *svptr = SvPVbyte (data, svlen);
1186 1370
1187 SvUPGRADE (data, SVt_PV); 1371 SvUPGRADE (data, SVt_PV);
1188 SvPOK_on (data); 1372 SvPOK_on (data);
… …
1210 1394
1211 { 1395 {
1212 dREQ; 1396 dREQ;
1213 1397
1214 req->type = ix; 1398 req->type = ix;
1215 req->fh = newSVsv (fh); 1399 req->fh = newSVsv (fh);
1216 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1217 : IoOFP (sv_2io (fh))); 1401 : IoOFP (sv_2io (fh)));
1218 req->offset = offset; 1402 req->offs = offset;
1219 req->length = length; 1403 req->size = length;
1220 req->data = SvREFCNT_inc (data); 1404 req->sv1 = SvREFCNT_inc (data);
1221 req->dataptr = (char *)svptr + dataoffset; 1405 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset;
1222 1407
1223 if (!SvREADONLY (data)) 1408 if (!SvREADONLY (data))
1224 { 1409 {
1225 SvREADONLY_on (data); 1410 SvREADONLY_on (data);
1226 req->data2ptr = (void *)data; 1411 req->flags |= FLAG_SV1_RO_OFF;
1227 } 1412 }
1228 1413
1229 REQ_SEND; 1414 REQ_SEND;
1230 } 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;
1231} 1438}
1232 1439
1233void 1440void
1234aio_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)
1235 SV * out_fh 1442 SV * out_fh
… …
1241 PPCODE: 1448 PPCODE:
1242{ 1449{
1243 dREQ; 1450 dREQ;
1244 1451
1245 req->type = REQ_SENDFILE; 1452 req->type = REQ_SENDFILE;
1246 req->fh = newSVsv (out_fh); 1453 req->fh = newSVsv (out_fh);
1247 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1248 req->fh2 = newSVsv (in_fh); 1455 req->sv2 = newSVsv (in_fh);
1249 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1250 req->offset = in_offset; 1457 req->offs = in_offset;
1251 req->length = length; 1458 req->size = length;
1252 1459
1253 REQ_SEND; 1460 REQ_SEND;
1254} 1461}
1255 1462
1256void 1463void
… …
1263 PPCODE: 1470 PPCODE:
1264{ 1471{
1265 dREQ; 1472 dREQ;
1266 1473
1267 req->type = REQ_READAHEAD; 1474 req->type = REQ_READAHEAD;
1268 req->fh = newSVsv (fh); 1475 req->fh = newSVsv (fh);
1269 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1270 req->offset = offset; 1477 req->offs = offset;
1271 req->length = length; 1478 req->size = length;
1272 1479
1273 REQ_SEND; 1480 REQ_SEND;
1274} 1481}
1275 1482
1276void 1483void
1277aio_stat (fh_or_path,callback=&PL_sv_undef) 1484aio_stat (fh_or_path,callback=&PL_sv_undef)
1278 SV * fh_or_path 1485 SV8 * fh_or_path
1279 SV * callback 1486 SV * callback
1280 ALIAS: 1487 ALIAS:
1281 aio_stat = REQ_STAT 1488 aio_stat = REQ_STAT
1282 aio_lstat = REQ_LSTAT 1489 aio_lstat = REQ_LSTAT
1283 PPCODE: 1490 PPCODE:
1284{ 1491{
1285 dREQ; 1492 dREQ;
1286 1493
1287 New (0, req->statdata, 1, Stat_t); 1494 req->ptr2 = malloc (sizeof (Stat_t));
1288 if (!req->statdata) 1495 if (!req->ptr2)
1289 { 1496 {
1290 req_free (req); 1497 req_free (req);
1291 croak ("out of memory during aio_req->statdata allocation"); 1498 croak ("out of memory during aio_stat statdata allocation");
1292 } 1499 }
1500
1501 req->flags |= FLAG_PTR2_FREE;
1293 1502
1294 if (SvPOK (fh_or_path)) 1503 if (SvPOK (fh_or_path))
1295 { 1504 {
1296 req->type = ix; 1505 req->type = ix;
1297 req->data = newSVsv (fh_or_path); 1506 req->sv1 = newSVsv (fh_or_path);
1298 req->dataptr = SvPVbyte_nolen (req->data); 1507 req->ptr1 = SvPVbyte_nolen (req->sv1);
1299 } 1508 }
1300 else 1509 else
1301 { 1510 {
1302 req->type = REQ_FSTAT; 1511 req->type = REQ_FSTAT;
1303 req->fh = newSVsv (fh_or_path); 1512 req->fh = newSVsv (fh_or_path);
1304 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1305 } 1514 }
1306 1515
1307 REQ_SEND; 1516 REQ_SEND;
1308} 1517}
1309 1518
1310void 1519void
1311aio_unlink (pathname,callback=&PL_sv_undef) 1520aio_unlink (pathname,callback=&PL_sv_undef)
1312 SV * pathname 1521 SV8 * pathname
1313 SV * callback 1522 SV * callback
1314 ALIAS: 1523 ALIAS:
1315 aio_unlink = REQ_UNLINK 1524 aio_unlink = REQ_UNLINK
1316 aio_rmdir = REQ_RMDIR 1525 aio_rmdir = REQ_RMDIR
1317 aio_readdir = REQ_READDIR 1526 aio_readdir = REQ_READDIR
1318 PPCODE: 1527 PPCODE:
1319{ 1528{
1320 dREQ; 1529 dREQ;
1321 1530
1322 req->type = ix; 1531 req->type = ix;
1323 req->data = newSVsv (pathname); 1532 req->sv1 = newSVsv (pathname);
1324 req->dataptr = SvPVbyte_nolen (req->data); 1533 req->ptr1 = SvPVbyte_nolen (req->sv1);
1325 1534
1326 REQ_SEND; 1535 REQ_SEND;
1327} 1536}
1328 1537
1329void 1538void
1330aio_link (oldpath,newpath,callback=&PL_sv_undef) 1539aio_link (oldpath,newpath,callback=&PL_sv_undef)
1331 SV * oldpath 1540 SV8 * oldpath
1332 SV * newpath 1541 SV8 * newpath
1333 SV * callback 1542 SV * callback
1334 ALIAS: 1543 ALIAS:
1335 aio_link = REQ_LINK 1544 aio_link = REQ_LINK
1336 aio_symlink = REQ_SYMLINK 1545 aio_symlink = REQ_SYMLINK
1337 aio_rename = REQ_RENAME 1546 aio_rename = REQ_RENAME
1338 PPCODE: 1547 PPCODE:
1339{ 1548{
1340 dREQ; 1549 dREQ;
1341 1550
1342 req->type = ix; 1551 req->type = ix;
1343 req->fh = newSVsv (oldpath); 1552 req->fh = newSVsv (oldpath);
1344 req->data2ptr = SvPVbyte_nolen (req->fh); 1553 req->ptr2 = SvPVbyte_nolen (req->fh);
1345 req->data = newSVsv (newpath); 1554 req->sv1 = newSVsv (newpath);
1346 req->dataptr = SvPVbyte_nolen (req->data); 1555 req->ptr1 = SvPVbyte_nolen (req->sv1);
1347 1556
1348 REQ_SEND; 1557 REQ_SEND;
1349} 1558}
1350 1559
1351void 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
1352aio_busy (delay,callback=&PL_sv_undef) 1580aio_busy (delay,callback=&PL_sv_undef)
1353 double delay 1581 double delay
1354 SV * callback 1582 SV * callback
1355 PPCODE: 1583 PPCODE:
1356{ 1584{
1357 dREQ; 1585 dREQ;
1358 1586
1359 req->type = REQ_BUSY; 1587 req->type = REQ_BUSY;
1360 req->fd = delay < 0. ? 0 : delay; 1588 req->int1 = delay < 0. ? 0 : delay;
1361 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1362 1590
1363 REQ_SEND; 1591 REQ_SEND;
1364} 1592}
1365 1593
1366void 1594void
… …
1370 PPCODE: 1598 PPCODE:
1371{ 1599{
1372 dREQ; 1600 dREQ;
1373 1601
1374 req->type = REQ_GROUP; 1602 req->type = REQ_GROUP;
1603
1375 req_send (req); 1604 req_send (req);
1376
1377 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1605 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1378} 1606}
1379 1607
1380void 1608void
1381aio_nop (callback=&PL_sv_undef) 1609aio_nop (callback=&PL_sv_undef)
1382 SV * callback 1610 SV * callback
1383 PPCODE: 1611 PPCODE:
1384{ 1612{
1385 dREQ; 1613 dREQ;
1386 1614
1387 req->type = REQ_NOP; 1615 req->type = REQ_NOP;
1388 1616
1389 REQ_SEND; 1617 REQ_SEND;
1390} 1618}
1391 1619
1392void 1620int
1393aioreq_pri (int pri = DEFAULT_PRI) 1621aioreq_pri (int pri = 0)
1394 CODE: 1622 PROTOTYPE: ;$
1623 CODE:
1624 RETVAL = next_pri - PRI_BIAS;
1625 if (items > 0)
1626 {
1395 if (pri < PRI_MIN) pri = PRI_MIN; 1627 if (pri < PRI_MIN) pri = PRI_MIN;
1396 if (pri > PRI_MAX) pri = PRI_MAX; 1628 if (pri > PRI_MAX) pri = PRI_MAX;
1397 next_pri = pri + PRI_BIAS; 1629 next_pri = pri + PRI_BIAS;
1630 }
1631 OUTPUT:
1632 RETVAL
1398 1633
1399void 1634void
1400aioreq_nice (int nice = 0) 1635aioreq_nice (int nice = 0)
1401 CODE: 1636 CODE:
1402 nice = next_pri - nice; 1637 nice = next_pri - nice;
1403 if (nice < PRI_MIN) nice = PRI_MIN; 1638 if (nice < PRI_MIN) nice = PRI_MIN;
1404 if (nice > PRI_MAX) nice = PRI_MAX; 1639 if (nice > PRI_MAX) nice = PRI_MAX;
1405 next_pri = nice + PRI_BIAS; 1640 next_pri = nice + PRI_BIAS;
1406 1641
1407void 1642void
1408flush () 1643flush ()
1409 PROTOTYPE: 1644 PROTOTYPE:
1410 CODE: 1645 CODE:
… …
1412 { 1647 {
1413 poll_wait (); 1648 poll_wait ();
1414 poll_cb (); 1649 poll_cb ();
1415 } 1650 }
1416 1651
1417void 1652int
1418poll() 1653poll()
1419 PROTOTYPE: 1654 PROTOTYPE:
1420 CODE: 1655 CODE:
1421 if (nreqs)
1422 {
1423 poll_wait (); 1656 poll_wait ();
1424 poll_cb (); 1657 RETVAL = poll_cb ();
1425 } 1658 OUTPUT:
1659 RETVAL
1426 1660
1427int 1661int
1428poll_fileno() 1662poll_fileno()
1429 PROTOTYPE: 1663 PROTOTYPE:
1430 CODE: 1664 CODE:
… …
1442 1676
1443void 1677void
1444poll_wait() 1678poll_wait()
1445 PROTOTYPE: 1679 PROTOTYPE:
1446 CODE: 1680 CODE:
1447 if (nreqs)
1448 poll_wait (); 1681 poll_wait ();
1449 1682
1450int 1683int
1451nreqs() 1684nreqs()
1452 PROTOTYPE: 1685 PROTOTYPE:
1453 CODE: 1686 CODE:
1454 RETVAL = nreqs; 1687 RETVAL = nreqs;
1455 OUTPUT: 1688 OUTPUT:
1456 RETVAL 1689 RETVAL
1457 1690
1691int
1692nready()
1693 PROTOTYPE:
1694 CODE:
1695 RETVAL = get_nready ();
1696 OUTPUT:
1697 RETVAL
1698
1699int
1700npending()
1701 PROTOTYPE:
1702 CODE:
1703 RETVAL = get_npending ();
1704 OUTPUT:
1705 RETVAL
1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1458PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1459 1718
1460MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1461 1720
1462void 1721void
… …
1477 PPCODE: 1736 PPCODE:
1478{ 1737{
1479 int i; 1738 int i;
1480 aio_req req; 1739 aio_req req;
1481 1740
1482 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1483 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1484 1743
1485 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1486 { 1745 {
1487 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
… …
1489 1748
1490 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1491 1750
1492 if (req) 1751 if (req)
1493 { 1752 {
1494 ++grp->length; 1753 ++grp->size;
1495 req->grp = grp; 1754 req->grp = grp;
1496 1755
1497 req->grp_prev = 0; 1756 req->grp_prev = 0;
1498 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1499 1758
… …
1513void 1772void
1514result (aio_req grp, ...) 1773result (aio_req grp, ...)
1515 CODE: 1774 CODE:
1516{ 1775{
1517 int i; 1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1518 AV *av = newAV (); 1781 av = newAV ();
1519 1782
1520 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1521 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1522 1785
1523 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1524 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1525} 1788}
1789
1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1526 1794
1527void 1795void
1528limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1529 CODE: 1797 CODE:
1530 grp->fd2 = limit; 1798 grp->int2 = limit;
1531 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1532 1800
1533void 1801void
1534feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1535 CODE: 1803 CODE:
1536{ 1804{
1537 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1538 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1539 1807
1540 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1541 grp->fd2 = 2; 1809 grp->int2 = 2;
1542 1810
1543 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1544} 1812}
1545 1813

Diff Legend

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