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.74 by root, Wed Oct 25 17:57:30 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 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 respipe [2];
134 168
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else 171#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif 173#endif
140 174
141#define LOCK(mutex) pthread_mutex_lock (&(mutex)) 175#define LOCK(mutex) pthread_mutex_lock (&(mutex))
142#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 176#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
143 177
144/* worker threasd management */ 178/* worker threads management */
145static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 179static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
146 180
147typedef struct worker { 181typedef struct worker {
148 /* locked by wrklock */ 182 /* locked by wrklock */
149 struct worker *prev, *next; 183 struct worker *prev, *next;
… …
179 wrk->prev->next = wrk->next; 213 wrk->prev->next = wrk->next;
180 214
181 free (wrk); 215 free (wrk);
182} 216}
183 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
184static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
185static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
186static 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
187 269
188/* 270/*
189 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
190 * with 8 priorities this actually needs <20 insns 272 * with 8 priorities this actually needs <20 insns
191 * per shift, the most expensive operation. 273 * per shift, the most expensive operation.
… …
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)
… …
389 PUSHs (sv_2mortal (newSViv (req->result))); 447 PUSHs (sv_2mortal (newSViv (req->result)));
390 PUTBACK; 448 PUTBACK;
391 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
392 SPAGAIN; 450 SPAGAIN;
393 451
394 fh = SvREFCNT_inc (POPs); 452 fh = POPs;
395
396 PUSHMARK (SP); 453 PUSHMARK (SP);
397 XPUSHs (sv_2mortal (fh)); 454 XPUSHs (fh);
398 } 455 }
399 break; 456 break;
400 457
401 case REQ_GROUP: 458 case REQ_GROUP:
402 req->fd = 2; /* mark group as finished */ 459 req->int1 = 2; /* mark group as finished */
403 460
404 if (req->data) 461 if (req->sv1)
405 { 462 {
406 int i; 463 int i;
407 AV *av = (AV *)req->data; 464 AV *av = (AV *)req->sv1;
408 465
409 EXTEND (SP, AvFILL (av) + 1); 466 EXTEND (SP, AvFILL (av) + 1);
410 for (i = 0; i <= AvFILL (av); ++i) 467 for (i = 0; i <= AvFILL (av); ++i)
411 PUSHs (*av_fetch (av, i, 0)); 468 PUSHs (*av_fetch (av, i, 0));
412 } 469 }
… …
414 471
415 case REQ_NOP: 472 case REQ_NOP:
416 case REQ_BUSY: 473 case REQ_BUSY:
417 break; 474 break;
418 475
476 case REQ_READLINK:
477 if (req->result > 0)
478 {
479 SvCUR_set (req->sv1, req->result);
480 *SvEND (req->sv1) = 0;
481 PUSHs (req->sv1);
482 }
483 break;
484
485 case REQ_STAT:
486 case REQ_LSTAT:
487 case REQ_FSTAT:
488 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
489 PL_laststatval = req->result;
490 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result)));
492 break;
493
494 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result)));
498 break;
499
419 default: 500 default:
420 PUSHs (sv_2mortal (newSViv (req->result))); 501 PUSHs (sv_2mortal (newSViv (req->result)));
421 break; 502 break;
422 } 503 }
423 504
505 errno = req->errorno;
424 506
425 PUTBACK; 507 PUTBACK;
426 call_sv (req->callback, G_VOID | G_EVAL); 508 call_sv (req->callback, G_VOID | G_EVAL);
427 SPAGAIN; 509 SPAGAIN;
428 510
… …
457 { 539 {
458 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
459 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
460 } 542 }
461 543
462 SvREFCNT_dec (req->data);
463 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
464 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
465 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
466 Safefree (req->statdata);
467 548
468 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
469 free (req->data2ptr); 550 free (req->ptr2);
470 551
471 Safefree (req); 552 Safefree (req);
472} 553}
473 554
474static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
476 aio_req sub; 557 aio_req sub;
477 558
478 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
479 return; 560 return;
480 561
481 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
482 grp->fh2 = 0; 563 grp->sv2 = 0;
483 564
484 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
485 req_cancel (sub); 566 req_cancel (sub);
486} 567}
487 568
488static void req_cancel (aio_req req) 569static void req_cancel (aio_req req)
489{ 570{
490 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
491 572
492 req_cancel_subs (req); 573 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} 574}
557 575
558static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
559 577
560static void start_thread (void) 578static void start_thread (void)
… …
568 croak ("unable to allocate worker thread data"); 586 croak ("unable to allocate worker thread data");
569 587
570 pthread_attr_init (&attr); 588 pthread_attr_init (&attr);
571 pthread_attr_setstacksize (&attr, STACKSIZE); 589 pthread_attr_setstacksize (&attr, STACKSIZE);
572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 590 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
591#ifdef PTHREAD_SCOPE_PROCESS
592 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
593#endif
573 594
574 sigfillset (&fullsigset); 595 sigfillset (&fullsigset);
575 596
576 LOCK (wrklock); 597 LOCK (wrklock);
577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
580 { 601 {
581 wrk->prev = &wrk_first; 602 wrk->prev = &wrk_first;
582 wrk->next = wrk_first.next; 603 wrk->next = wrk_first.next;
583 wrk_first.next->prev = wrk; 604 wrk_first.next->prev = wrk;
584 wrk_first.next = wrk; 605 wrk_first.next = wrk;
585 started++; 606 ++started;
586 } 607 }
587 else 608 else
588 free (wrk); 609 free (wrk);
589 610
590 sigprocmask (SIG_SETMASK, &oldsigset, 0); 611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock); 612 UNLOCK (wrklock);
592} 613}
593 614
615static void maybe_start_thread ()
616{
617 if (get_nthreads () >= wanted)
618 return;
619
620 /* todo: maybe use idle here, but might be less exact */
621 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
622 return;
623
624 start_thread ();
625}
626
594static void req_send (aio_req req) 627static void req_send (aio_req req)
595{ 628{
596 while (started < wanted && nreqs >= started)
597 start_thread ();
598
599 ++nreqs; 629 ++nreqs;
630
631 LOCK (reqlock);
632 ++nready;
633 reqq_push (&req_queue, req);
634 pthread_cond_signal (&reqwait);
635 UNLOCK (reqlock);
636
637 maybe_start_thread ();
638}
639
640static void end_thread (void)
641{
642 aio_req req;
643
644 Newz (0, req, 1, aio_cb);
645
646 req->type = REQ_QUIT;
647 req->pri = PRI_MAX + PRI_BIAS;
600 648
601 LOCK (reqlock); 649 LOCK (reqlock);
602 reqq_push (&req_queue, req); 650 reqq_push (&req_queue, req);
603 pthread_cond_signal (&reqwait); 651 pthread_cond_signal (&reqwait);
604 UNLOCK (reqlock); 652 UNLOCK (reqlock);
605}
606 653
607static void end_thread (void) 654 LOCK (wrklock);
608{ 655 --started;
609 aio_req req; 656 UNLOCK (wrklock);
657}
610 658
611 Newz (0, req, 1, aio_cb); 659static void set_max_idle (int nthreads)
612 660{
613 req->type = REQ_QUIT; 661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
614 req->pri = PRI_MAX + PRI_BIAS; 662 max_idle = nthreads <= 0 ? 1 : nthreads;
615 663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
616 req_send (req);
617} 664}
618 665
619static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
620{ 667{
621 if (wanted < nthreads) 668 if (wanted < nthreads)
622 wanted = nthreads; 669 wanted = nthreads;
623} 670}
624 671
625static void max_parallel (int nthreads) 672static void max_parallel (int nthreads)
626{ 673{
627 int cur = started;
628
629 if (wanted > nthreads) 674 if (wanted > nthreads)
630 wanted = nthreads; 675 wanted = nthreads;
631 676
632 while (cur > wanted) 677 while (started > wanted)
678 end_thread ();
679}
680
681static void poll_wait ()
682{
683 fd_set rfd;
684
685 while (nreqs)
633 { 686 {
687 int size;
688 if (WORDACCESS_UNSAFE) LOCK (reslock);
689 size = res_queue.size;
690 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
691
692 if (size)
693 return;
694
634 end_thread (); 695 maybe_start_thread ();
635 cur--; 696
697 FD_ZERO(&rfd);
698 FD_SET(respipe [0], &rfd);
699
700 select (respipe [0] + 1, &rfd, 0, 0, 0);
636 } 701 }
702}
637 703
638 while (started > wanted) 704static int poll_cb ()
705{
706 dSP;
707 int count = 0;
708 int maxreqs = max_poll_reqs;
709 int do_croak = 0;
710 struct timeval tv_start, tv_now;
711 aio_req req;
712
713 if (max_poll_time)
714 gettimeofday (&tv_start, 0);
715
716 for (;;)
639 { 717 {
718 for (;;)
719 {
720 maybe_start_thread ();
721
722 LOCK (reslock);
723 req = reqq_shift (&res_queue);
724
725 if (req)
726 {
727 --npending;
728
729 if (!res_queue.size)
730 {
731 /* read any signals sent by the worker threads */
732 char buf [32];
733 while (read (respipe [0], buf, 32) == 32)
734 ;
735 }
736 }
737
738 UNLOCK (reslock);
739
740 if (!req)
741 break;
742
743 --nreqs;
744
745 if (req->type == REQ_GROUP && req->size)
746 {
747 req->int1 = 1; /* mark request as delayed */
748 continue;
749 }
750 else
751 {
752 req_invoke (req);
753
754 count++;
755 }
756
757 req_free (req);
758
759 if (maxreqs && !--maxreqs)
760 break;
761
762 if (max_poll_time)
763 {
764 gettimeofday (&tv_now, 0);
765
766 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
767 break;
768 }
769 }
770
771 if (nreqs <= max_outstanding)
772 break;
773
640 poll_wait (); 774 poll_wait ();
641 poll_cb (); 775
776 ++maxreqs;
642 } 777 }
778
779 return count;
643} 780}
644 781
645static void create_pipe () 782static void create_pipe ()
646{ 783{
647 if (pipe (respipe)) 784 if (pipe (respipe))
… …
702#if !HAVE_FDATASYNC 839#if !HAVE_FDATASYNC
703# define fdatasync fsync 840# define fdatasync fsync
704#endif 841#endif
705 842
706#if !HAVE_READAHEAD 843#if !HAVE_READAHEAD
707# define readahead aio_readahead 844# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
708 845
709static ssize_t readahead (int fd, off_t offset, size_t count) 846static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
710{ 847{
711 dBUF; 848 dBUF;
712 849
713 while (count > 0) 850 while (count > 0)
714 { 851 {
… …
719 count -= len; 856 count -= len;
720 } 857 }
721 858
722 errno = 0; 859 errno = 0;
723} 860}
861
724#endif 862#endif
725 863
726#if !HAVE_READDIR_R 864#if !HAVE_READDIR_R
727# define readdir_r aio_readdir_r 865# define readdir_r aio_readdir_r
728 866
… …
773 { 911 {
774 off_t sbytes; 912 off_t sbytes;
775 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 913 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
776 914
777 if (res < 0 && sbytes) 915 if (res < 0 && sbytes)
778 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 916 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
779 res = sbytes; 917 res = sbytes;
780 } 918 }
781 919
782# elif __hpux 920# elif __hpux
783 res = sendfile (ofd, ifd, offset, count, 0, 0); 921 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
861 int memofs = 0; 999 int memofs = 0;
862 int res = 0; 1000 int res = 0;
863 int errorno; 1001 int errorno;
864 1002
865 LOCK (wrklock); 1003 LOCK (wrklock);
866 self->dirp = dirp = opendir (req->dataptr); 1004 self->dirp = dirp = opendir (req->ptr1);
867 self->dbuf = u = malloc (sizeof (*u)); 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
1007 req->ptr2 = names = malloc (memlen);
868 UNLOCK (wrklock); 1008 UNLOCK (wrklock);
869
870 req->data2ptr = names = malloc (memlen);
871 1009
872 if (dirp && u && names) 1010 if (dirp && u && names)
873 for (;;) 1011 for (;;)
874 { 1012 {
875 errno = 0; 1013 errno = 0;
… …
888 1026
889 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
890 { 1028 {
891 memlen *= 2; 1029 memlen *= 2;
892 LOCK (wrklock); 1030 LOCK (wrklock);
893 req->data2ptr = names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
894 UNLOCK (wrklock); 1032 UNLOCK (wrklock);
895 1033
896 if (!names) 1034 if (!names)
897 break; 1035 break;
898 } 1036 }
… …
911/*****************************************************************************/ 1049/*****************************************************************************/
912 1050
913static void *aio_proc (void *thr_arg) 1051static void *aio_proc (void *thr_arg)
914{ 1052{
915 aio_req req; 1053 aio_req req;
916 int type; 1054 struct timespec ts;
917 worker *self = (worker *)thr_arg; 1055 worker *self = (worker *)thr_arg;
918 1056
919 do 1057 /* try to distribute timeouts somewhat evenly */
1058 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1059 * (1000000000UL / 1024UL);
1060
1061 for (;;)
920 { 1062 {
1063 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1064
921 LOCK (reqlock); 1065 LOCK (reqlock);
922 1066
923 for (;;) 1067 for (;;)
924 { 1068 {
925 self->req = req = reqq_shift (&req_queue); 1069 self->req = req = reqq_shift (&req_queue);
926 1070
927 if (req) 1071 if (req)
928 break; 1072 break;
929 1073
1074 ++idle;
1075
1076 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1077 == ETIMEDOUT)
1078 {
1079 if (idle > max_idle)
1080 {
1081 --idle;
1082 UNLOCK (reqlock);
1083 LOCK (wrklock);
1084 --started;
1085 UNLOCK (wrklock);
1086 goto quit;
1087 }
1088
1089 /* we are allowed to idle, so do so without any timeout */
930 pthread_cond_wait (&reqwait, &reqlock); 1090 pthread_cond_wait (&reqwait, &reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 }
1093
1094 --idle;
931 } 1095 }
1096
1097 --nready;
932 1098
933 UNLOCK (reqlock); 1099 UNLOCK (reqlock);
934 1100
935 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
936 type = req->type; /* remember type for QUIT check */
937 1102
938 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
939 switch (type) 1104 switch (req->type)
940 { 1105 {
941 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
942 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
943 1108
944 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1109 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
945 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
946 1111
947 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1112 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
948 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1113 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
949 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
950 1115
951 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
952 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
953 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
954 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
955 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
956 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
957 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
958 1125
959 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
960 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
961 case REQ_READDIR: scandir_ (req, self); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
962 1129
963 case REQ_BUSY: 1130 case REQ_BUSY:
964 { 1131 {
965 struct timeval tv; 1132 struct timeval tv;
966 1133
967 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
968 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
969 1136
970 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
971 } 1138 }
972 1139
973 case REQ_GROUP: 1140 case REQ_GROUP:
974 case REQ_NOP: 1141 case REQ_NOP:
1142 break;
1143
975 case REQ_QUIT: 1144 case REQ_QUIT:
976 break; 1145 goto quit;
977 1146
978 default: 1147 default:
979 req->result = ENOSYS; 1148 req->result = ENOSYS;
980 break; 1149 break;
981 } 1150 }
982 1151
983 req->errorno = errno; 1152 req->errorno = errno;
984 1153
985 LOCK (reslock); 1154 LOCK (reslock);
986 1155
1156 ++npending;
1157
987 if (!reqq_push (&res_queue, req)) 1158 if (!reqq_push (&res_queue, req))
988 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
989 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
990 1161
991 self->req = 0; 1162 self->req = 0;
992 worker_clear (self); 1163 worker_clear (self);
993 1164
994 UNLOCK (reslock); 1165 UNLOCK (reslock);
995 } 1166 }
996 while (type != REQ_QUIT);
997 1167
1168quit:
998 LOCK (wrklock); 1169 LOCK (wrklock);
999 worker_free (self); 1170 worker_free (self);
1000 UNLOCK (wrklock); 1171 UNLOCK (wrklock);
1001 1172
1002 return 0; 1173 return 0;
… …
1049 1220
1050 worker_clear (wrk); 1221 worker_clear (wrk);
1051 worker_free (wrk); 1222 worker_free (wrk);
1052 } 1223 }
1053 1224
1054 started = 0; 1225 started = 0;
1226 idle = 0;
1055 nreqs = 0; 1227 nreqs = 0;
1228 nready = 0;
1229 npending = 0;
1056 1230
1057 close (respipe [0]); 1231 close (respipe [0]);
1058 close (respipe [1]); 1232 close (respipe [1]);
1059 create_pipe (); 1233 create_pipe ();
1060 1234
… …
1087PROTOTYPES: ENABLE 1261PROTOTYPES: ENABLE
1088 1262
1089BOOT: 1263BOOT:
1090{ 1264{
1091 HV *stash = gv_stashpv ("IO::AIO", 1); 1265 HV *stash = gv_stashpv ("IO::AIO", 1);
1266
1092 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1093 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1094 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1269 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1270 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1271 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1272 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1095 1273
1096 create_pipe (); 1274 create_pipe ();
1097 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1098} 1276}
1099 1277
1100void 1278void
1101min_parallel (nthreads) 1279max_poll_reqs (int nreqs)
1102 int nthreads
1103 PROTOTYPE: $ 1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
1104 1283
1105void 1284void
1106max_parallel (nthreads) 1285max_poll_time (double nseconds)
1107 int nthreads
1108 PROTOTYPE: $ 1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_time = nseconds * AIO_TICKS;
1289
1290void
1291min_parallel (int nthreads)
1292 PROTOTYPE: $
1293
1294void
1295max_parallel (int nthreads)
1296 PROTOTYPE: $
1297
1298void
1299max_idle (int nthreads)
1300 PROTOTYPE: $
1301 CODE:
1302 set_max_idle (nthreads);
1303
1304int
1305max_outstanding (int maxreqs)
1306 PROTOTYPE: $
1307 CODE:
1308 RETVAL = max_outstanding;
1309 max_outstanding = maxreqs;
1310 OUTPUT:
1311 RETVAL
1109 1312
1110void 1313void
1111aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1112 SV * pathname 1315 SV8 * pathname
1113 int flags 1316 int flags
1114 int mode 1317 int mode
1115 SV * callback 1318 SV * callback
1116 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1117 PPCODE: 1320 PPCODE:
1118{ 1321{
1119 dREQ; 1322 dREQ;
1120 1323
1121 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1122 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1123 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1124 req->fd = flags; 1327 req->int1 = flags;
1125 req->mode = mode; 1328 req->mode = mode;
1126 1329
1127 REQ_SEND; 1330 REQ_SEND;
1128} 1331}
1129 1332
… …
1139 PPCODE: 1342 PPCODE:
1140{ 1343{
1141 dREQ; 1344 dREQ;
1142 1345
1143 req->type = ix; 1346 req->type = ix;
1144 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1145 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1146 1349
1147 REQ_SEND (req); 1350 REQ_SEND (req);
1148} 1351}
1149 1352
1150void 1353void
1151aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1152 SV * fh 1355 SV * fh
1153 UV offset 1356 UV offset
1154 UV length 1357 UV length
1155 SV * data 1358 SV8 * data
1156 UV dataoffset 1359 UV dataoffset
1157 SV * callback 1360 SV * callback
1158 ALIAS: 1361 ALIAS:
1159 aio_read = REQ_READ 1362 aio_read = REQ_READ
1160 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1161 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1162 PPCODE: 1365 PPCODE:
1163{ 1366{
1164 aio_req req;
1165 STRLEN svlen; 1367 STRLEN svlen;
1166 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1167 1369
1168 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1169 SvPOK_on (data); 1371 SvPOK_on (data);
… …
1191 1393
1192 { 1394 {
1193 dREQ; 1395 dREQ;
1194 1396
1195 req->type = ix; 1397 req->type = ix;
1196 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1197 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1198 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1199 req->offset = offset; 1401 req->offs = offset;
1200 req->length = length; 1402 req->size = length;
1201 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1202 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1203 1406
1204 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1205 { 1408 {
1206 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1207 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1208 } 1411 }
1209 1412
1210 REQ_SEND; 1413 REQ_SEND;
1211 } 1414 }
1415}
1416
1417void
1418aio_readlink (path,callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$
1422 PPCODE:
1423{
1424 SV *data;
1425 dREQ;
1426
1427 data = newSV (NAME_MAX);
1428 SvPOK_on (data);
1429
1430 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh);
1433 req->sv1 = data;
1434 req->ptr1 = SvPVbyte_nolen (data);
1435
1436 REQ_SEND;
1212} 1437}
1213 1438
1214void 1439void
1215aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1216 SV * out_fh 1441 SV * out_fh
… …
1222 PPCODE: 1447 PPCODE:
1223{ 1448{
1224 dREQ; 1449 dREQ;
1225 1450
1226 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1227 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1228 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1229 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1230 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1231 req->offset = in_offset; 1456 req->offs = in_offset;
1232 req->length = length; 1457 req->size = length;
1233 1458
1234 REQ_SEND; 1459 REQ_SEND;
1235} 1460}
1236 1461
1237void 1462void
… …
1244 PPCODE: 1469 PPCODE:
1245{ 1470{
1246 dREQ; 1471 dREQ;
1247 1472
1248 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1249 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1250 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1251 req->offset = offset; 1476 req->offs = offset;
1252 req->length = length; 1477 req->size = length;
1253 1478
1254 REQ_SEND; 1479 REQ_SEND;
1255} 1480}
1256 1481
1257void 1482void
1258aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1259 SV * fh_or_path 1484 SV8 * fh_or_path
1260 SV * callback 1485 SV * callback
1261 ALIAS: 1486 ALIAS:
1262 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1263 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1264 PPCODE: 1489 PPCODE:
1265{ 1490{
1266 dREQ; 1491 dREQ;
1267 1492
1268 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1269 if (!req->statdata) 1494 if (!req->ptr2)
1270 { 1495 {
1271 req_free (req); 1496 req_free (req);
1272 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1273 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1274 1501
1275 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1276 { 1503 {
1277 req->type = ix; 1504 req->type = ix;
1278 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1279 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1280 } 1507 }
1281 else 1508 else
1282 { 1509 {
1283 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1284 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1285 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1286 } 1513 }
1287 1514
1288 REQ_SEND; 1515 REQ_SEND;
1289} 1516}
1290 1517
1291void 1518void
1292aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1293 SV * pathname 1520 SV8 * pathname
1294 SV * callback 1521 SV * callback
1295 ALIAS: 1522 ALIAS:
1296 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1297 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1298 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1299 PPCODE: 1526 PPCODE:
1300{ 1527{
1301 dREQ; 1528 dREQ;
1302 1529
1303 req->type = ix; 1530 req->type = ix;
1304 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1305 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1306 1533
1307 REQ_SEND; 1534 REQ_SEND;
1308} 1535}
1309 1536
1310void 1537void
1311aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1312 SV * oldpath 1539 SV8 * oldpath
1313 SV * newpath 1540 SV8 * newpath
1314 SV * callback 1541 SV * callback
1315 ALIAS: 1542 ALIAS:
1316 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1317 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1318 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1319 PPCODE: 1546 PPCODE:
1320{ 1547{
1321 dREQ; 1548 dREQ;
1322 1549
1323 req->type = ix; 1550 req->type = ix;
1324 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1325 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1326 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1327 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1328 1555
1329 REQ_SEND; 1556 REQ_SEND;
1330} 1557}
1331 1558
1332void 1559void
1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1561 SV8 * pathname
1562 SV * callback
1563 UV mode
1564 UV dev
1565 PPCODE:
1566{
1567 dREQ;
1568
1569 req->type = REQ_MKNOD;
1570 req->sv1 = newSVsv (pathname);
1571 req->ptr1 = SvPVbyte_nolen (req->sv1);
1572 req->mode = (mode_t)mode;
1573 req->offs = dev;
1574
1575 REQ_SEND;
1576}
1577
1578void
1333aio_busy (delay,callback=&PL_sv_undef) 1579aio_busy (delay,callback=&PL_sv_undef)
1334 double delay 1580 double delay
1335 SV * callback 1581 SV * callback
1336 PPCODE: 1582 PPCODE:
1337{ 1583{
1338 dREQ; 1584 dREQ;
1339 1585
1340 req->type = REQ_BUSY; 1586 req->type = REQ_BUSY;
1341 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1342 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1343 1589
1344 REQ_SEND; 1590 REQ_SEND;
1345} 1591}
1346 1592
1347void 1593void
… …
1351 PPCODE: 1597 PPCODE:
1352{ 1598{
1353 dREQ; 1599 dREQ;
1354 1600
1355 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1356 req_send (req); 1603 req_send (req);
1357
1358 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1359} 1605}
1360 1606
1361void 1607void
1362aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1363 SV * callback 1609 SV * callback
1364 PPCODE: 1610 PPCODE:
1365{ 1611{
1366 dREQ; 1612 dREQ;
1367 1613
1368 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
1369 1615
1370 REQ_SEND; 1616 REQ_SEND;
1371} 1617}
1372 1618
1373void 1619int
1374aioreq_pri (int pri = DEFAULT_PRI) 1620aioreq_pri (int pri = 0)
1375 CODE: 1621 PROTOTYPE: ;$
1622 CODE:
1623 RETVAL = next_pri - PRI_BIAS;
1624 if (items > 0)
1625 {
1376 if (pri < PRI_MIN) pri = PRI_MIN; 1626 if (pri < PRI_MIN) pri = PRI_MIN;
1377 if (pri > PRI_MAX) pri = PRI_MAX; 1627 if (pri > PRI_MAX) pri = PRI_MAX;
1378 next_pri = pri + PRI_BIAS; 1628 next_pri = pri + PRI_BIAS;
1629 }
1630 OUTPUT:
1631 RETVAL
1379 1632
1380void 1633void
1381aioreq_nice (int nice = 0) 1634aioreq_nice (int nice = 0)
1382 CODE: 1635 CODE:
1383 nice = next_pri - nice; 1636 nice = next_pri - nice;
1384 if (nice < PRI_MIN) nice = PRI_MIN; 1637 if (nice < PRI_MIN) nice = PRI_MIN;
1385 if (nice > PRI_MAX) nice = PRI_MAX; 1638 if (nice > PRI_MAX) nice = PRI_MAX;
1386 next_pri = nice + PRI_BIAS; 1639 next_pri = nice + PRI_BIAS;
1387 1640
1388void 1641void
1389flush () 1642flush ()
1390 PROTOTYPE: 1643 PROTOTYPE:
1391 CODE: 1644 CODE:
… …
1393 { 1646 {
1394 poll_wait (); 1647 poll_wait ();
1395 poll_cb (); 1648 poll_cb ();
1396 } 1649 }
1397 1650
1398void 1651int
1399poll() 1652poll()
1400 PROTOTYPE: 1653 PROTOTYPE:
1401 CODE: 1654 CODE:
1402 if (nreqs)
1403 {
1404 poll_wait (); 1655 poll_wait ();
1405 poll_cb (); 1656 RETVAL = poll_cb ();
1406 } 1657 OUTPUT:
1658 RETVAL
1407 1659
1408int 1660int
1409poll_fileno() 1661poll_fileno()
1410 PROTOTYPE: 1662 PROTOTYPE:
1411 CODE: 1663 CODE:
… …
1423 1675
1424void 1676void
1425poll_wait() 1677poll_wait()
1426 PROTOTYPE: 1678 PROTOTYPE:
1427 CODE: 1679 CODE:
1428 if (nreqs)
1429 poll_wait (); 1680 poll_wait ();
1430 1681
1431int 1682int
1432nreqs() 1683nreqs()
1433 PROTOTYPE: 1684 PROTOTYPE:
1434 CODE: 1685 CODE:
1435 RETVAL = nreqs; 1686 RETVAL = nreqs;
1436 OUTPUT: 1687 OUTPUT:
1437 RETVAL 1688 RETVAL
1438 1689
1690int
1691nready()
1692 PROTOTYPE:
1693 CODE:
1694 RETVAL = get_nready ();
1695 OUTPUT:
1696 RETVAL
1697
1698int
1699npending()
1700 PROTOTYPE:
1701 CODE:
1702 RETVAL = get_npending ();
1703 OUTPUT:
1704 RETVAL
1705
1706int
1707nthreads()
1708 PROTOTYPE:
1709 CODE:
1710 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1711 RETVAL = started;
1712 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1713 OUTPUT:
1714 RETVAL
1715
1439PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1440 1717
1441MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1718MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1442 1719
1443void 1720void
… …
1458 PPCODE: 1735 PPCODE:
1459{ 1736{
1460 int i; 1737 int i;
1461 aio_req req; 1738 aio_req req;
1462 1739
1463 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1464 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1741 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1465 1742
1466 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1467 { 1744 {
1468 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
… …
1470 1747
1471 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1472 1749
1473 if (req) 1750 if (req)
1474 { 1751 {
1475 ++grp->length; 1752 ++grp->size;
1476 req->grp = grp; 1753 req->grp = grp;
1477 1754
1478 req->grp_prev = 0; 1755 req->grp_prev = 0;
1479 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1480 1757
… …
1494void 1771void
1495result (aio_req grp, ...) 1772result (aio_req grp, ...)
1496 CODE: 1773 CODE:
1497{ 1774{
1498 int i; 1775 int i;
1776 AV *av;
1777
1778 grp->errorno = errno;
1779
1499 AV *av = newAV (); 1780 av = newAV ();
1500 1781
1501 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1502 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1503 1784
1504 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1505 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1506} 1787}
1788
1789void
1790errno (aio_req grp, int errorno = errno)
1791 CODE:
1792 grp->errorno = errorno;
1507 1793
1508void 1794void
1509limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1510 CODE: 1796 CODE:
1511 grp->fd2 = limit; 1797 grp->int2 = limit;
1512 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1513 1799
1514void 1800void
1515feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1516 CODE: 1802 CODE:
1517{ 1803{
1518 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1519 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1520 1806
1521 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1522 grp->fd2 = 2; 1808 grp->int2 = 2;
1523 1809
1524 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1525} 1811}
1526 1812

Diff Legend

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