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.70 by root, Tue Oct 24 15:15:56 2006 UTC vs.
Revision 1.92 by root, Wed Nov 8 01:59:59 2006 UTC

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

Diff Legend

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