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.75 by root, Thu Oct 26 06:44:48 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
50#endif 54#endif
51 55
… …
60# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
61#else 65#else
62# define STACKSIZE 16384 66# define STACKSIZE 16384
63#endif 67#endif
64 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
65/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
66#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
67 83
68#define dBUF \ 84#define dBUF \
69 char *aio_buf; \ 85 char *aio_buf; \
70 LOCK (wrklock); \ 86 LOCK (wrklock); \
71 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
72 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
73 if (!aio_buf) \ 89 if (!aio_buf) \
74 return -1; 90 return -1;
91
92typedef SV SV8; /* byte-sv, used for argument-checking */
75 93
76enum { 94enum {
77 REQ_QUIT, 95 REQ_QUIT,
78 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
79 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
80 REQ_SENDFILE, 98 REQ_SENDFILE,
81 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
82 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
83 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
84 REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
85 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
86 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
87 REQ_BUSY, 105 REQ_BUSY,
88}; 106};
89 107
90#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
92 110
93typedef struct aio_cb 111typedef struct aio_cb
94{ 112{
95 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
96 114
97 SV *data, *callback; 115 SV *callback, *fh;
98 SV *fh, *fh2; 116 SV *sv1, *sv2;
99 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
100 Stat_t *statdata;
101 off_t offset; 118 off_t offs;
102 size_t length; 119 size_t size;
103 ssize_t result; 120 ssize_t result;
104 121
105 STRLEN dataoffset; 122 STRLEN stroffset;
106 int type; 123 int type;
107 int fd, fd2; 124 int int1, int2;
108 int errorno; 125 int errorno;
109 mode_t mode; /* open */ 126 mode_t mode; /* open */
110 127
111 unsigned char flags; 128 unsigned char flags;
112 unsigned char pri; 129 unsigned char pri;
… …
114 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
115 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
116} aio_cb; 133} aio_cb;
117 134
118enum { 135enum {
119 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) */
120}; 139};
121 140
122typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
123typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
124 143
… …
129 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
130 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
131 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
132}; 151};
133 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
134static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
135 166
136static int started, wanted; 167static unsigned int started, idle, wanted;
137static volatile int nreqs;
138static int respipe [2];
139 168
140#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
141# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
142#else 171#else
143# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
144#endif 173#endif
145 174
146#define LOCK(mutex) pthread_mutex_lock (&(mutex)) 175#define LOCK(mutex) pthread_mutex_lock (&(mutex))
147#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 176#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
148 177
149/* worker threasd management */ 178/* worker threads management */
150static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 179static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
151 180
152typedef struct worker { 181typedef struct worker {
153 /* locked by wrklock */ 182 /* locked by wrklock */
154 struct worker *prev, *next; 183 struct worker *prev, *next;
… …
184 wrk->prev->next = wrk->next; 213 wrk->prev->next = wrk->next;
185 214
186 free (wrk); 215 free (wrk);
187} 216}
188 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
189static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
190static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
191static 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
192 269
193/* 270/*
194 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
195 * with 8 priorities this actually needs <20 insns 272 * with 8 priorities this actually needs <20 insns
196 * per shift, the most expensive operation. 273 * per shift, the most expensive operation.
… …
273 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
274} 351}
275 352
276static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
277{ 354{
278 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
279 { 356 {
280 int old_len = grp->length; 357 int old_len = grp->size;
281 358
282 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
283 { 360 {
284 dSP; 361 dSP;
285 362
286 ENTER; 363 ENTER;
287 SAVETMPS; 364 SAVETMPS;
288 PUSHMARK (SP); 365 PUSHMARK (SP);
289 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
290 PUTBACK; 367 PUTBACK;
291 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
292 SPAGAIN; 369 SPAGAIN;
293 FREETMPS; 370 FREETMPS;
294 LEAVE; 371 LEAVE;
295 } 372 }
296 373
297 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
298 if (old_len == grp->length) 375 if (old_len == grp->size)
299 { 376 {
300 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
301 grp->fh2 = 0; 378 grp->sv2 = 0;
302 break; 379 break;
303 } 380 }
304 } 381 }
305} 382}
306 383
307static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
308{ 385{
309 --grp->length; 386 --grp->size;
310 387
311 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
312 aio_grp_feed (grp); 389 aio_grp_feed (grp);
313 390
314 /* finish, if done */ 391 /* finish, if done */
315 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
316 { 393 {
317 req_invoke (grp); 394 req_invoke (grp);
318 req_free (grp); 395 req_free (grp);
319 } 396 }
320} 397}
321 398
322static void poll_wait ()
323{
324 fd_set rfd;
325
326 while (nreqs)
327 {
328 int size;
329#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
330 LOCK (reslock);
331#endif
332 size = res_queue.size;
333#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
334 UNLOCK (reslock);
335#endif
336
337 if (size)
338 return;
339
340 FD_ZERO(&rfd);
341 FD_SET(respipe [0], &rfd);
342
343 select (respipe [0] + 1, &rfd, 0, 0, 0);
344 }
345}
346
347static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
348{ 400{
349 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
350 405
351 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
352 { 407 {
353 errno = req->errorno;
354
355 ENTER; 408 ENTER;
356 SAVETMPS; 409 SAVETMPS;
357 PUSHMARK (SP); 410 PUSHMARK (SP);
358 EXTEND (SP, 1); 411 EXTEND (SP, 1);
359 412
… …
364 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
365 418
366 if (req->result >= 0) 419 if (req->result >= 0)
367 { 420 {
368 int i; 421 int i;
369 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
370 AV *av = newAV (); 423 AV *av = newAV ();
371 424
372 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
373 426
374 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
394 PUSHs (sv_2mortal (newSViv (req->result))); 447 PUSHs (sv_2mortal (newSViv (req->result)));
395 PUTBACK; 448 PUTBACK;
396 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
397 SPAGAIN; 450 SPAGAIN;
398 451
399 fh = SvREFCNT_inc (POPs); 452 fh = POPs;
400
401 PUSHMARK (SP); 453 PUSHMARK (SP);
402 XPUSHs (sv_2mortal (fh)); 454 XPUSHs (fh);
403 } 455 }
404 break; 456 break;
405 457
406 case REQ_GROUP: 458 case REQ_GROUP:
407 req->fd = 2; /* mark group as finished */ 459 req->int1 = 2; /* mark group as finished */
408 460
409 if (req->data) 461 if (req->sv1)
410 { 462 {
411 int i; 463 int i;
412 AV *av = (AV *)req->data; 464 AV *av = (AV *)req->sv1;
413 465
414 EXTEND (SP, AvFILL (av) + 1); 466 EXTEND (SP, AvFILL (av) + 1);
415 for (i = 0; i <= AvFILL (av); ++i) 467 for (i = 0; i <= AvFILL (av); ++i)
416 PUSHs (*av_fetch (av, i, 0)); 468 PUSHs (*av_fetch (av, i, 0));
417 } 469 }
… …
419 471
420 case REQ_NOP: 472 case REQ_NOP:
421 case REQ_BUSY: 473 case REQ_BUSY:
422 break; 474 break;
423 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
424 default: 500 default:
425 PUSHs (sv_2mortal (newSViv (req->result))); 501 PUSHs (sv_2mortal (newSViv (req->result)));
426 break; 502 break;
427 } 503 }
428 504
505 errno = req->errorno;
429 506
430 PUTBACK; 507 PUTBACK;
431 call_sv (req->callback, G_VOID | G_EVAL); 508 call_sv (req->callback, G_VOID | G_EVAL);
432 SPAGAIN; 509 SPAGAIN;
433 510
… …
462 { 539 {
463 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
464 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
465 } 542 }
466 543
467 SvREFCNT_dec (req->data);
468 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
469 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
470 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
471 Safefree (req->statdata);
472 548
473 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
474 free (req->data2ptr); 550 free (req->ptr2);
475 551
476 Safefree (req); 552 Safefree (req);
477} 553}
478 554
479static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
481 aio_req sub; 557 aio_req sub;
482 558
483 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
484 return; 560 return;
485 561
486 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
487 grp->fh2 = 0; 563 grp->sv2 = 0;
488 564
489 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
490 req_cancel (sub); 566 req_cancel (sub);
491} 567}
492 568
493static void req_cancel (aio_req req) 569static void req_cancel (aio_req req)
494{ 570{
495 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
496 572
497 req_cancel_subs (req); 573 req_cancel_subs (req);
498}
499
500static int poll_cb ()
501{
502 dSP;
503 int count = 0;
504 int do_croak = 0;
505 aio_req req;
506
507 for (;;)
508 {
509 LOCK (reslock);
510 req = reqq_shift (&res_queue);
511
512 if (req)
513 {
514 if (!res_queue.size)
515 {
516 /* read any signals sent by the worker threads */
517 char buf [32];
518 while (read (respipe [0], buf, 32) == 32)
519 ;
520 }
521 }
522
523 UNLOCK (reslock);
524
525 if (!req)
526 break;
527
528 --nreqs;
529
530 if (req->type == REQ_QUIT)
531 started--;
532 else if (req->type == REQ_GROUP && req->length)
533 {
534 req->fd = 1; /* mark request as delayed */
535 continue;
536 }
537 else
538 {
539 if (req->type == REQ_READ)
540 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
541
542 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
543 SvREADONLY_off (req->data);
544
545 if (req->statdata)
546 {
547 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
548 PL_laststatval = req->result;
549 PL_statcache = *(req->statdata);
550 }
551
552 req_invoke (req);
553
554 count++;
555 }
556
557 req_free (req);
558 }
559
560 return count;
561} 574}
562 575
563static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
564 577
565static void start_thread (void) 578static void start_thread (void)
… …
573 croak ("unable to allocate worker thread data"); 586 croak ("unable to allocate worker thread data");
574 587
575 pthread_attr_init (&attr); 588 pthread_attr_init (&attr);
576 pthread_attr_setstacksize (&attr, STACKSIZE); 589 pthread_attr_setstacksize (&attr, STACKSIZE);
577 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
578 594
579 sigfillset (&fullsigset); 595 sigfillset (&fullsigset);
580 596
581 LOCK (wrklock); 597 LOCK (wrklock);
582 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
585 { 601 {
586 wrk->prev = &wrk_first; 602 wrk->prev = &wrk_first;
587 wrk->next = wrk_first.next; 603 wrk->next = wrk_first.next;
588 wrk_first.next->prev = wrk; 604 wrk_first.next->prev = wrk;
589 wrk_first.next = wrk; 605 wrk_first.next = wrk;
590 started++; 606 ++started;
591 } 607 }
592 else 608 else
593 free (wrk); 609 free (wrk);
594 610
595 sigprocmask (SIG_SETMASK, &oldsigset, 0); 611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
596 UNLOCK (wrklock); 612 UNLOCK (wrklock);
597} 613}
598 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
599static void req_send (aio_req req) 627static void req_send (aio_req req)
600{ 628{
601 while (started < wanted && nreqs >= started)
602 start_thread ();
603
604 ++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;
605 648
606 LOCK (reqlock); 649 LOCK (reqlock);
607 reqq_push (&req_queue, req); 650 reqq_push (&req_queue, req);
608 pthread_cond_signal (&reqwait); 651 pthread_cond_signal (&reqwait);
609 UNLOCK (reqlock); 652 UNLOCK (reqlock);
610}
611 653
612static void end_thread (void) 654 LOCK (wrklock);
613{ 655 --started;
614 aio_req req; 656 UNLOCK (wrklock);
657}
615 658
616 Newz (0, req, 1, aio_cb); 659static void set_max_idle (int nthreads)
617 660{
618 req->type = REQ_QUIT; 661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
619 req->pri = PRI_MAX + PRI_BIAS; 662 max_idle = nthreads <= 0 ? 1 : nthreads;
620 663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
621 req_send (req);
622} 664}
623 665
624static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
625{ 667{
626 if (wanted < nthreads) 668 if (wanted < nthreads)
627 wanted = nthreads; 669 wanted = nthreads;
628} 670}
629 671
630static void max_parallel (int nthreads) 672static void max_parallel (int nthreads)
631{ 673{
632 int cur = started;
633
634 if (wanted > nthreads) 674 if (wanted > nthreads)
635 wanted = nthreads; 675 wanted = nthreads;
636 676
637 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)
638 { 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
639 end_thread (); 695 maybe_start_thread ();
640 cur--; 696
697 FD_ZERO(&rfd);
698 FD_SET(respipe [0], &rfd);
699
700 select (respipe [0] + 1, &rfd, 0, 0, 0);
641 } 701 }
702}
642 703
643 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 (;;)
644 { 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
645 poll_wait (); 774 poll_wait ();
646 poll_cb (); 775
776 ++maxreqs;
647 } 777 }
778
779 return count;
648} 780}
649 781
650static void create_pipe () 782static void create_pipe ()
651{ 783{
652 if (pipe (respipe)) 784 if (pipe (respipe))
… …
779 { 911 {
780 off_t sbytes; 912 off_t sbytes;
781 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 913 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
782 914
783 if (res < 0 && sbytes) 915 if (res < 0 && sbytes)
784 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 916 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
785 res = sbytes; 917 res = sbytes;
786 } 918 }
787 919
788# elif __hpux 920# elif __hpux
789 res = sendfile (ofd, ifd, offset, count, 0, 0); 921 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
867 int memofs = 0; 999 int memofs = 0;
868 int res = 0; 1000 int res = 0;
869 int errorno; 1001 int errorno;
870 1002
871 LOCK (wrklock); 1003 LOCK (wrklock);
872 self->dirp = dirp = opendir (req->dataptr); 1004 self->dirp = dirp = opendir (req->ptr1);
873 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);
874 UNLOCK (wrklock); 1008 UNLOCK (wrklock);
875
876 req->data2ptr = names = malloc (memlen);
877 1009
878 if (dirp && u && names) 1010 if (dirp && u && names)
879 for (;;) 1011 for (;;)
880 { 1012 {
881 errno = 0; 1013 errno = 0;
… …
894 1026
895 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
896 { 1028 {
897 memlen *= 2; 1029 memlen *= 2;
898 LOCK (wrklock); 1030 LOCK (wrklock);
899 req->data2ptr = names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
900 UNLOCK (wrklock); 1032 UNLOCK (wrklock);
901 1033
902 if (!names) 1034 if (!names)
903 break; 1035 break;
904 } 1036 }
… …
917/*****************************************************************************/ 1049/*****************************************************************************/
918 1050
919static void *aio_proc (void *thr_arg) 1051static void *aio_proc (void *thr_arg)
920{ 1052{
921 aio_req req; 1053 aio_req req;
922 int type; 1054 struct timespec ts;
923 worker *self = (worker *)thr_arg; 1055 worker *self = (worker *)thr_arg;
924 1056
925 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 (;;)
926 { 1062 {
1063 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1064
927 LOCK (reqlock); 1065 LOCK (reqlock);
928 1066
929 for (;;) 1067 for (;;)
930 { 1068 {
931 self->req = req = reqq_shift (&req_queue); 1069 self->req = req = reqq_shift (&req_queue);
932 1070
933 if (req) 1071 if (req)
934 break; 1072 break;
935 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 */
936 pthread_cond_wait (&reqwait, &reqlock); 1090 pthread_cond_wait (&reqwait, &reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 }
1093
1094 --idle;
937 } 1095 }
1096
1097 --nready;
938 1098
939 UNLOCK (reqlock); 1099 UNLOCK (reqlock);
940 1100
941 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
943 1102
944 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
945 switch (type) 1104 switch (req->type)
946 { 1105 {
947 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;
948 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;
949 1108
950 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;
951 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;
952 1111
953 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;
954 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;
955 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;
956 1115
957 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;
958 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
959 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
960 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
961 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
963 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;
964 1125
965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
966 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
967 case REQ_READDIR: scandir_ (req, self); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
968 1129
969 case REQ_BUSY: 1130 case REQ_BUSY:
970 { 1131 {
971 struct timeval tv; 1132 struct timeval tv;
972 1133
973 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
974 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
975 1136
976 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
977 } 1138 }
978 1139
979 case REQ_GROUP: 1140 case REQ_GROUP:
980 case REQ_NOP: 1141 case REQ_NOP:
1142 break;
1143
981 case REQ_QUIT: 1144 case REQ_QUIT:
982 break; 1145 goto quit;
983 1146
984 default: 1147 default:
985 req->result = ENOSYS; 1148 req->result = ENOSYS;
986 break; 1149 break;
987 } 1150 }
988 1151
989 req->errorno = errno; 1152 req->errorno = errno;
990 1153
991 LOCK (reslock); 1154 LOCK (reslock);
992 1155
1156 ++npending;
1157
993 if (!reqq_push (&res_queue, req)) 1158 if (!reqq_push (&res_queue, req))
994 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
995 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
996 1161
997 self->req = 0; 1162 self->req = 0;
998 worker_clear (self); 1163 worker_clear (self);
999 1164
1000 UNLOCK (reslock); 1165 UNLOCK (reslock);
1001 } 1166 }
1002 while (type != REQ_QUIT);
1003 1167
1168quit:
1004 LOCK (wrklock); 1169 LOCK (wrklock);
1005 worker_free (self); 1170 worker_free (self);
1006 UNLOCK (wrklock); 1171 UNLOCK (wrklock);
1007 1172
1008 return 0; 1173 return 0;
… …
1055 1220
1056 worker_clear (wrk); 1221 worker_clear (wrk);
1057 worker_free (wrk); 1222 worker_free (wrk);
1058 } 1223 }
1059 1224
1060 started = 0; 1225 started = 0;
1226 idle = 0;
1061 nreqs = 0; 1227 nreqs = 0;
1228 nready = 0;
1229 npending = 0;
1062 1230
1063 close (respipe [0]); 1231 close (respipe [0]);
1064 close (respipe [1]); 1232 close (respipe [1]);
1065 create_pipe (); 1233 create_pipe ();
1066 1234
… …
1093PROTOTYPES: ENABLE 1261PROTOTYPES: ENABLE
1094 1262
1095BOOT: 1263BOOT:
1096{ 1264{
1097 HV *stash = gv_stashpv ("IO::AIO", 1); 1265 HV *stash = gv_stashpv ("IO::AIO", 1);
1266
1098 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1099 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1100 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));
1101 1273
1102 create_pipe (); 1274 create_pipe ();
1103 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1104} 1276}
1105 1277
1106void 1278void
1107min_parallel (nthreads) 1279max_poll_reqs (int nreqs)
1108 int nthreads
1109 PROTOTYPE: $ 1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
1110 1283
1111void 1284void
1112max_parallel (nthreads) 1285max_poll_time (double nseconds)
1113 int nthreads
1114 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
1115 1312
1116void 1313void
1117aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1118 SV * pathname 1315 SV8 * pathname
1119 int flags 1316 int flags
1120 int mode 1317 int mode
1121 SV * callback 1318 SV * callback
1122 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1123 PPCODE: 1320 PPCODE:
1124{ 1321{
1125 dREQ; 1322 dREQ;
1126 1323
1127 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1128 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1129 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1130 req->fd = flags; 1327 req->int1 = flags;
1131 req->mode = mode; 1328 req->mode = mode;
1132 1329
1133 REQ_SEND; 1330 REQ_SEND;
1134} 1331}
1135 1332
… …
1145 PPCODE: 1342 PPCODE:
1146{ 1343{
1147 dREQ; 1344 dREQ;
1148 1345
1149 req->type = ix; 1346 req->type = ix;
1150 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1151 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1152 1349
1153 REQ_SEND (req); 1350 REQ_SEND (req);
1154} 1351}
1155 1352
1156void 1353void
1157aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1158 SV * fh 1355 SV * fh
1159 UV offset 1356 UV offset
1160 UV length 1357 UV length
1161 SV * data 1358 SV8 * data
1162 UV dataoffset 1359 UV dataoffset
1163 SV * callback 1360 SV * callback
1164 ALIAS: 1361 ALIAS:
1165 aio_read = REQ_READ 1362 aio_read = REQ_READ
1166 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1167 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1168 PPCODE: 1365 PPCODE:
1169{ 1366{
1170 aio_req req;
1171 STRLEN svlen; 1367 STRLEN svlen;
1172 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1173 1369
1174 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1175 SvPOK_on (data); 1371 SvPOK_on (data);
… …
1197 1393
1198 { 1394 {
1199 dREQ; 1395 dREQ;
1200 1396
1201 req->type = ix; 1397 req->type = ix;
1202 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1203 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1204 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1205 req->offset = offset; 1401 req->offs = offset;
1206 req->length = length; 1402 req->size = length;
1207 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1208 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1209 1406
1210 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1211 { 1408 {
1212 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1213 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1214 } 1411 }
1215 1412
1216 REQ_SEND; 1413 REQ_SEND;
1217 } 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;
1218} 1437}
1219 1438
1220void 1439void
1221aio_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)
1222 SV * out_fh 1441 SV * out_fh
… …
1228 PPCODE: 1447 PPCODE:
1229{ 1448{
1230 dREQ; 1449 dREQ;
1231 1450
1232 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1233 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1234 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1235 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1236 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1237 req->offset = in_offset; 1456 req->offs = in_offset;
1238 req->length = length; 1457 req->size = length;
1239 1458
1240 REQ_SEND; 1459 REQ_SEND;
1241} 1460}
1242 1461
1243void 1462void
… …
1250 PPCODE: 1469 PPCODE:
1251{ 1470{
1252 dREQ; 1471 dREQ;
1253 1472
1254 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1255 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1256 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1257 req->offset = offset; 1476 req->offs = offset;
1258 req->length = length; 1477 req->size = length;
1259 1478
1260 REQ_SEND; 1479 REQ_SEND;
1261} 1480}
1262 1481
1263void 1482void
1264aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1265 SV * fh_or_path 1484 SV8 * fh_or_path
1266 SV * callback 1485 SV * callback
1267 ALIAS: 1486 ALIAS:
1268 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1269 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1270 PPCODE: 1489 PPCODE:
1271{ 1490{
1272 dREQ; 1491 dREQ;
1273 1492
1274 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1275 if (!req->statdata) 1494 if (!req->ptr2)
1276 { 1495 {
1277 req_free (req); 1496 req_free (req);
1278 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1279 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1280 1501
1281 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1282 { 1503 {
1283 req->type = ix; 1504 req->type = ix;
1284 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1285 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1286 } 1507 }
1287 else 1508 else
1288 { 1509 {
1289 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1290 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1291 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 } 1513 }
1293 1514
1294 REQ_SEND; 1515 REQ_SEND;
1295} 1516}
1296 1517
1297void 1518void
1298aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1299 SV * pathname 1520 SV8 * pathname
1300 SV * callback 1521 SV * callback
1301 ALIAS: 1522 ALIAS:
1302 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1303 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1304 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1305 PPCODE: 1526 PPCODE:
1306{ 1527{
1307 dREQ; 1528 dREQ;
1308 1529
1309 req->type = ix; 1530 req->type = ix;
1310 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1311 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1312 1533
1313 REQ_SEND; 1534 REQ_SEND;
1314} 1535}
1315 1536
1316void 1537void
1317aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1318 SV * oldpath 1539 SV8 * oldpath
1319 SV * newpath 1540 SV8 * newpath
1320 SV * callback 1541 SV * callback
1321 ALIAS: 1542 ALIAS:
1322 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1323 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1324 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1325 PPCODE: 1546 PPCODE:
1326{ 1547{
1327 dREQ; 1548 dREQ;
1328 1549
1329 req->type = ix; 1550 req->type = ix;
1330 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1331 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1332 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1333 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1334 1555
1335 REQ_SEND; 1556 REQ_SEND;
1336} 1557}
1337 1558
1338void 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
1339aio_busy (delay,callback=&PL_sv_undef) 1579aio_busy (delay,callback=&PL_sv_undef)
1340 double delay 1580 double delay
1341 SV * callback 1581 SV * callback
1342 PPCODE: 1582 PPCODE:
1343{ 1583{
1344 dREQ; 1584 dREQ;
1345 1585
1346 req->type = REQ_BUSY; 1586 req->type = REQ_BUSY;
1347 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1349 1589
1350 REQ_SEND; 1590 REQ_SEND;
1351} 1591}
1352 1592
1353void 1593void
… …
1357 PPCODE: 1597 PPCODE:
1358{ 1598{
1359 dREQ; 1599 dREQ;
1360 1600
1361 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1362 req_send (req); 1603 req_send (req);
1363
1364 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1365} 1605}
1366 1606
1367void 1607void
1368aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1369 SV * callback 1609 SV * callback
1370 PPCODE: 1610 PPCODE:
1371{ 1611{
1372 dREQ; 1612 dREQ;
1373 1613
1374 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
1375 1615
1376 REQ_SEND; 1616 REQ_SEND;
1377} 1617}
1378 1618
1379void 1619int
1380aioreq_pri (int pri = DEFAULT_PRI) 1620aioreq_pri (int pri = 0)
1381 CODE: 1621 PROTOTYPE: ;$
1622 CODE:
1623 RETVAL = next_pri - PRI_BIAS;
1624 if (items > 0)
1625 {
1382 if (pri < PRI_MIN) pri = PRI_MIN; 1626 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX; 1627 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS; 1628 next_pri = pri + PRI_BIAS;
1629 }
1630 OUTPUT:
1631 RETVAL
1385 1632
1386void 1633void
1387aioreq_nice (int nice = 0) 1634aioreq_nice (int nice = 0)
1388 CODE: 1635 CODE:
1389 nice = next_pri - nice; 1636 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN; 1637 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX; 1638 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS; 1639 next_pri = nice + PRI_BIAS;
1393 1640
1394void 1641void
1395flush () 1642flush ()
1396 PROTOTYPE: 1643 PROTOTYPE:
1397 CODE: 1644 CODE:
… …
1399 { 1646 {
1400 poll_wait (); 1647 poll_wait ();
1401 poll_cb (); 1648 poll_cb ();
1402 } 1649 }
1403 1650
1404void 1651int
1405poll() 1652poll()
1406 PROTOTYPE: 1653 PROTOTYPE:
1407 CODE: 1654 CODE:
1408 if (nreqs)
1409 {
1410 poll_wait (); 1655 poll_wait ();
1411 poll_cb (); 1656 RETVAL = poll_cb ();
1412 } 1657 OUTPUT:
1658 RETVAL
1413 1659
1414int 1660int
1415poll_fileno() 1661poll_fileno()
1416 PROTOTYPE: 1662 PROTOTYPE:
1417 CODE: 1663 CODE:
… …
1429 1675
1430void 1676void
1431poll_wait() 1677poll_wait()
1432 PROTOTYPE: 1678 PROTOTYPE:
1433 CODE: 1679 CODE:
1434 if (nreqs)
1435 poll_wait (); 1680 poll_wait ();
1436 1681
1437int 1682int
1438nreqs() 1683nreqs()
1439 PROTOTYPE: 1684 PROTOTYPE:
1440 CODE: 1685 CODE:
1441 RETVAL = nreqs; 1686 RETVAL = nreqs;
1442 OUTPUT: 1687 OUTPUT:
1443 RETVAL 1688 RETVAL
1444 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
1445PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1446 1717
1447MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1718MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1448 1719
1449void 1720void
… …
1464 PPCODE: 1735 PPCODE:
1465{ 1736{
1466 int i; 1737 int i;
1467 aio_req req; 1738 aio_req req;
1468 1739
1469 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1470 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");
1471 1742
1472 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1473 { 1744 {
1474 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
… …
1476 1747
1477 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1478 1749
1479 if (req) 1750 if (req)
1480 { 1751 {
1481 ++grp->length; 1752 ++grp->size;
1482 req->grp = grp; 1753 req->grp = grp;
1483 1754
1484 req->grp_prev = 0; 1755 req->grp_prev = 0;
1485 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1486 1757
… …
1500void 1771void
1501result (aio_req grp, ...) 1772result (aio_req grp, ...)
1502 CODE: 1773 CODE:
1503{ 1774{
1504 int i; 1775 int i;
1776 AV *av;
1777
1778 grp->errorno = errno;
1779
1505 AV *av = newAV (); 1780 av = newAV ();
1506 1781
1507 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1508 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1509 1784
1510 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1511 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1512} 1787}
1788
1789void
1790errno (aio_req grp, int errorno = errno)
1791 CODE:
1792 grp->errorno = errorno;
1513 1793
1514void 1794void
1515limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1516 CODE: 1796 CODE:
1517 grp->fd2 = limit; 1797 grp->int2 = limit;
1518 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1519 1799
1520void 1800void
1521feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1522 CODE: 1802 CODE:
1523{ 1803{
1524 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1525 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1526 1806
1527 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1528 grp->fd2 = 2; 1808 grp->int2 = 2;
1529 1809
1530 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1531} 1811}
1532 1812

Diff Legend

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