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

Diff Legend

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