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.93 by root, Wed Nov 8 02:01:02 2006 UTC

1/* solaris */ 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1 2#define _POSIX_PTHREAD_SEMANTICS 1
3 3
4#if __linux 4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE 5# define _GNU_SOURCE
6#endif 6#endif
7 7
8/* just in case */
8#define _REENTRANT 1 9#define _REENTRANT 1
9 10
10#include <errno.h> 11#include <errno.h>
11 12
12#include "EXTERN.h" 13#include "EXTERN.h"
… …
42# else 43# else
43# error sendfile support requested but not available 44# error sendfile support requested but not available
44# endif 45# endif
45#endif 46#endif
46 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
47/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
48#ifndef NAME_MAX 52#ifndef NAME_MAX
49# define NAME_MAX 4096 53# define NAME_MAX 4096
54#endif
55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
50#endif 59#endif
51 60
52#if __ia64 61#if __ia64
53# define STACKSIZE 65536 62# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
56#else 65#else
57# define STACKSIZE 16384 66# define STACKSIZE 16384
58#endif 67#endif
59 68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
60/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
62 83
63#define dBUF \ 84#define dBUF \
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
… …
342 PUSHs (sv_2mortal (newSViv (req->result))); 447 PUSHs (sv_2mortal (newSViv (req->result)));
343 PUTBACK; 448 PUTBACK;
344 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
345 SPAGAIN; 450 SPAGAIN;
346 451
347 fh = SvREFCNT_inc (POPs); 452 fh = POPs;
348
349 PUSHMARK (SP); 453 PUSHMARK (SP);
350 XPUSHs (sv_2mortal (fh)); 454 XPUSHs (fh);
351 } 455 }
352 break; 456 break;
353 457
354 case REQ_GROUP: 458 case REQ_GROUP:
355 req->fd = 2; /* mark group as finished */ 459 req->int1 = 2; /* mark group as finished */
356 460
357 if (req->data) 461 if (req->sv1)
358 { 462 {
359 int i; 463 int i;
360 AV *av = (AV *)req->data; 464 AV *av = (AV *)req->sv1;
361 465
362 EXTEND (SP, AvFILL (av) + 1); 466 EXTEND (SP, AvFILL (av) + 1);
363 for (i = 0; i <= AvFILL (av); ++i) 467 for (i = 0; i <= AvFILL (av); ++i)
364 PUSHs (*av_fetch (av, i, 0)); 468 PUSHs (*av_fetch (av, i, 0));
365 } 469 }
… …
367 471
368 case REQ_NOP: 472 case REQ_NOP:
369 case REQ_BUSY: 473 case REQ_BUSY:
370 break; 474 break;
371 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
372 default: 500 default:
373 PUSHs (sv_2mortal (newSViv (req->result))); 501 PUSHs (sv_2mortal (newSViv (req->result)));
374 break; 502 break;
375 } 503 }
376 504
505 errno = req->errorno;
377 506
378 PUTBACK; 507 PUTBACK;
379 call_sv (req->callback, G_VOID | G_EVAL); 508 call_sv (req->callback, G_VOID | G_EVAL);
380 SPAGAIN; 509 SPAGAIN;
381 510
… …
410 { 539 {
411 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
412 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
413 } 542 }
414 543
415 SvREFCNT_dec (req->data);
416 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
417 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
418 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
419 Safefree (req->statdata);
420 548
421 if (req->type == REQ_READDIR && req->result >= 0) 549 if (req->flags & FLAG_PTR2_FREE)
422 free (req->data2ptr); 550 free (req->ptr2);
423 551
424 Safefree (req); 552 Safefree (req);
425} 553}
426 554
555static void req_cancel_subs (aio_req grp)
556{
557 aio_req sub;
558
559 if (grp->type != REQ_GROUP)
560 return;
561
562 SvREFCNT_dec (grp->sv2);
563 grp->sv2 = 0;
564
565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
566 req_cancel (sub);
567}
568
427static void req_cancel (aio_req req) 569static void req_cancel (aio_req req)
428{ 570{
429 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
430 572
431 if (req->type == REQ_GROUP) 573 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} 574}
502 575
503static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
504 577
505static void start_thread (void) 578static void start_thread (void)
506{ 579{
507 sigset_t fullsigset, oldsigset; 580 sigset_t fullsigset, oldsigset;
508 pthread_t tid;
509 pthread_attr_t attr; 581 pthread_attr_t attr;
582
583 worker *wrk = calloc (1, sizeof (worker));
584
585 if (!wrk)
586 croak ("unable to allocate worker thread data");
510 587
511 pthread_attr_init (&attr); 588 pthread_attr_init (&attr);
512 pthread_attr_setstacksize (&attr, STACKSIZE); 589 pthread_attr_setstacksize (&attr, STACKSIZE);
513 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
514 594
515 sigfillset (&fullsigset); 595 sigfillset (&fullsigset);
596
597 LOCK (wrklock);
516 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
517 599
518 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 600 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
601 {
602 wrk->prev = &wrk_first;
603 wrk->next = wrk_first.next;
604 wrk_first.next->prev = wrk;
605 wrk_first.next = wrk;
519 started++; 606 ++started;
607 }
608 else
609 free (wrk);
520 610
521 sigprocmask (SIG_SETMASK, &oldsigset, 0); 611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
612 UNLOCK (wrklock);
613}
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 ();
522} 625}
523 626
524static void req_send (aio_req req) 627static void req_send (aio_req req)
525{ 628{
526 while (started < wanted && nreqs >= started)
527 start_thread ();
528
529 ++nreqs; 629 ++nreqs;
530 630
531 pthread_mutex_lock (&reqlock); 631 LOCK (reqlock);
632 ++nready;
532 reqq_push (&req_queue, req); 633 reqq_push (&req_queue, req);
533 pthread_cond_signal (&reqwait); 634 pthread_cond_signal (&reqwait);
534 pthread_mutex_unlock (&reqlock); 635 UNLOCK (reqlock);
535 636
536 if (nreqs > max_outstanding) 637 maybe_start_thread ();
537 for (;;)
538 {
539 poll_cb ();
540
541 if (nreqs <= max_outstanding)
542 break;
543
544 poll_wait ();
545 }
546} 638}
547 639
548static void end_thread (void) 640static void end_thread (void)
549{ 641{
550 aio_req req; 642 aio_req req;
… …
552 Newz (0, req, 1, aio_cb); 644 Newz (0, req, 1, aio_cb);
553 645
554 req->type = REQ_QUIT; 646 req->type = REQ_QUIT;
555 req->pri = PRI_MAX + PRI_BIAS; 647 req->pri = PRI_MAX + PRI_BIAS;
556 648
557 req_send (req); 649 LOCK (reqlock);
650 reqq_push (&req_queue, req);
651 pthread_cond_signal (&reqwait);
652 UNLOCK (reqlock);
653
654 LOCK (wrklock);
655 --started;
656 UNLOCK (wrklock);
657}
658
659static void set_max_idle (int nthreads)
660{
661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
662 max_idle = nthreads <= 0 ? 1 : nthreads;
663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
558} 664}
559 665
560static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
561{ 667{
562 if (wanted < nthreads) 668 if (wanted < nthreads)
563 wanted = nthreads; 669 wanted = nthreads;
564} 670}
565 671
566static void max_parallel (int nthreads) 672static void max_parallel (int nthreads)
567{ 673{
568 int cur = started;
569
570 if (wanted > nthreads) 674 if (wanted > nthreads)
571 wanted = nthreads; 675 wanted = nthreads;
572 676
573 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)
574 { 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
575 end_thread (); 695 maybe_start_thread ();
576 cur--; 696
697 FD_ZERO(&rfd);
698 FD_SET(respipe [0], &rfd);
699
700 select (respipe [0] + 1, &rfd, 0, 0, 0);
577 } 701 }
702}
578 703
579 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 (;;)
580 { 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
581 poll_wait (); 774 poll_wait ();
582 poll_cb (); 775
776 ++maxreqs;
583 } 777 }
778
779 return count;
584} 780}
585 781
586static void create_pipe () 782static void create_pipe ()
587{ 783{
588 if (pipe (respipe)) 784 if (pipe (respipe))
… …
612static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 808static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
613{ 809{
614 ssize_t res; 810 ssize_t res;
615 off_t ooffset; 811 off_t ooffset;
616 812
617 pthread_mutex_lock (&preadwritelock); 813 LOCK (preadwritelock);
618 ooffset = lseek (fd, 0, SEEK_CUR); 814 ooffset = lseek (fd, 0, SEEK_CUR);
619 lseek (fd, offset, SEEK_SET); 815 lseek (fd, offset, SEEK_SET);
620 res = read (fd, buf, count); 816 res = read (fd, buf, count);
621 lseek (fd, ooffset, SEEK_SET); 817 lseek (fd, ooffset, SEEK_SET);
622 pthread_mutex_unlock (&preadwritelock); 818 UNLOCK (preadwritelock);
623 819
624 return res; 820 return res;
625} 821}
626 822
627static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 823static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
628{ 824{
629 ssize_t res; 825 ssize_t res;
630 off_t ooffset; 826 off_t ooffset;
631 827
632 pthread_mutex_lock (&preadwritelock); 828 LOCK (preadwritelock);
633 ooffset = lseek (fd, 0, SEEK_CUR); 829 ooffset = lseek (fd, 0, SEEK_CUR);
634 lseek (fd, offset, SEEK_SET); 830 lseek (fd, offset, SEEK_SET);
635 res = write (fd, buf, count); 831 res = write (fd, buf, count);
636 lseek (fd, offset, SEEK_SET); 832 lseek (fd, offset, SEEK_SET);
637 pthread_mutex_unlock (&preadwritelock); 833 UNLOCK (preadwritelock);
638 834
639 return res; 835 return res;
640} 836}
641#endif 837#endif
642 838
643#if !HAVE_FDATASYNC 839#if !HAVE_FDATASYNC
644# define fdatasync fsync 840# define fdatasync fsync
645#endif 841#endif
646 842
647#if !HAVE_READAHEAD 843#if !HAVE_READAHEAD
648# define readahead aio_readahead 844# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
649 845
650static ssize_t readahead (int fd, off_t offset, size_t count) 846static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
651{ 847{
652 dBUF; 848 dBUF;
653 849
654 while (count > 0) 850 while (count > 0)
655 { 851 {
… …
658 pread (fd, aio_buf, len, offset); 854 pread (fd, aio_buf, len, offset);
659 offset += len; 855 offset += len;
660 count -= len; 856 count -= len;
661 } 857 }
662 858
663 fBUF;
664
665 errno = 0; 859 errno = 0;
666} 860}
861
667#endif 862#endif
668 863
669#if !HAVE_READDIR_R 864#if !HAVE_READDIR_R
670# define readdir_r aio_readdir_r 865# define readdir_r aio_readdir_r
671 866
… …
674static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 869static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
675{ 870{
676 struct dirent *e; 871 struct dirent *e;
677 int errorno; 872 int errorno;
678 873
679 pthread_mutex_lock (&readdirlock); 874 LOCK (readdirlock);
680 875
681 e = readdir (dirp); 876 e = readdir (dirp);
682 errorno = errno; 877 errorno = errno;
683 878
684 if (e) 879 if (e)
… …
687 strcpy (ent->d_name, e->d_name); 882 strcpy (ent->d_name, e->d_name);
688 } 883 }
689 else 884 else
690 *res = 0; 885 *res = 0;
691 886
692 pthread_mutex_unlock (&readdirlock); 887 UNLOCK (readdirlock);
693 888
694 errno = errorno; 889 errno = errorno;
695 return e ? 0 : -1; 890 return e ? 0 : -1;
696} 891}
697#endif 892#endif
698 893
699/* sendfile always needs emulation */ 894/* sendfile always needs emulation */
700static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 895static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
701{ 896{
702 ssize_t res; 897 ssize_t res;
703 898
704 if (!count) 899 if (!count)
705 return 0; 900 return 0;
… …
716 { 911 {
717 off_t sbytes; 912 off_t sbytes;
718 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 913 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
719 914
720 if (res < 0 && sbytes) 915 if (res < 0 && sbytes)
721 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 916 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
722 res = sbytes; 917 res = sbytes;
723 } 918 }
724 919
725# elif __hpux 920# elif __hpux
726 res = sendfile (ofd, ifd, offset, count, 0, 0); 921 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
782 977
783 offset += cnt; 978 offset += cnt;
784 res += cnt; 979 res += cnt;
785 count -= cnt; 980 count -= cnt;
786 } 981 }
787
788 fBUF;
789 } 982 }
790 983
791 return res; 984 return res;
792} 985}
793 986
794/* read a full directory */ 987/* read a full directory */
795static int scandir_ (const char *path, void **namesp) 988static void scandir_ (aio_req req, worker *self)
796{ 989{
797 DIR *dirp; 990 DIR *dirp;
798 union 991 union
799 { 992 {
800 struct dirent d; 993 struct dirent d;
… …
805 int memlen = 4096; 998 int memlen = 4096;
806 int memofs = 0; 999 int memofs = 0;
807 int res = 0; 1000 int res = 0;
808 int errorno; 1001 int errorno;
809 1002
810 dirp = opendir (path); 1003 LOCK (wrklock);
811 if (!dirp) 1004 self->dirp = dirp = opendir (req->ptr1);
812 return -1;
813
814 u = malloc (sizeof (*u)); 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
815 names = malloc (memlen); 1007 req->ptr2 = names = malloc (memlen);
1008 UNLOCK (wrklock);
816 1009
817 if (u && names) 1010 if (dirp && u && names)
818 for (;;) 1011 for (;;)
819 { 1012 {
820 errno = 0; 1013 errno = 0;
821 readdir_r (dirp, &u->d, &entp); 1014 readdir_r (dirp, &u->d, &entp);
822 1015
… …
832 res++; 1025 res++;
833 1026
834 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
835 { 1028 {
836 memlen *= 2; 1029 memlen *= 2;
1030 LOCK (wrklock);
837 names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
1032 UNLOCK (wrklock);
1033
838 if (!names) 1034 if (!names)
839 break; 1035 break;
840 } 1036 }
841 1037
842 memcpy (names + memofs, name, len); 1038 memcpy (names + memofs, name, len);
843 memofs += len; 1039 memofs += len;
844 } 1040 }
845 } 1041 }
846 1042
847 errorno = errno;
848 free (u);
849 closedir (dirp);
850
851 if (errorno) 1043 if (errno)
1044 res = -1;
1045
1046 req->result = res;
1047}
1048
1049/*****************************************************************************/
1050
1051static void *aio_proc (void *thr_arg)
1052{
1053 aio_req req;
1054 struct timespec ts;
1055 worker *self = (worker *)thr_arg;
1056
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 (;;)
852 { 1062 {
853 free (names); 1063 ts.tv_sec = time (0) + IDLE_TIMEOUT;
854 errno = errorno;
855 res = -1;
856 }
857 1064
858 *namesp = (void *)names; 1065 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 1066
873 for (;;) 1067 for (;;)
874 { 1068 {
875 req = reqq_shift (&req_queue); 1069 self->req = req = reqq_shift (&req_queue);
876 1070
877 if (req) 1071 if (req)
878 break; 1072 break;
879 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 */
880 pthread_cond_wait (&reqwait, &reqlock); 1090 pthread_cond_wait (&reqwait, &reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 }
1093
1094 --idle;
881 } 1095 }
882 1096
883 pthread_mutex_unlock (&reqlock); 1097 --nready;
1098
1099 UNLOCK (reqlock);
884 1100
885 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
886 type = req->type; /* remember type for QUIT check */
887 1102
888 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
889 switch (type) 1104 switch (req->type)
890 { 1105 {
891 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;
892 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;
893 1108
894 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;
895 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
896 1111
897 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;
898 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;
899 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;
900 1115
901 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;
902 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
903 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
904 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
905 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
906 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
907 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;
908 1125
909 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
910 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
911 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
912 1129
913 case REQ_BUSY: 1130 case REQ_BUSY:
914 { 1131 {
915 struct timeval tv; 1132 struct timeval tv;
916 1133
917 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
918 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
919 1136
920 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
921 } 1138 }
922 1139
923 case REQ_GROUP: 1140 case REQ_GROUP:
924 case REQ_NOP: 1141 case REQ_NOP:
1142 break;
1143
925 case REQ_QUIT: 1144 case REQ_QUIT:
926 break; 1145 goto quit;
927 1146
928 default: 1147 default:
929 req->result = ENOSYS; 1148 req->result = ENOSYS;
930 break; 1149 break;
931 } 1150 }
932 1151
933 req->errorno = errno; 1152 req->errorno = errno;
934 1153
935 pthread_mutex_lock (&reslock); 1154 LOCK (reslock);
1155
1156 ++npending;
936 1157
937 if (!reqq_push (&res_queue, req)) 1158 if (!reqq_push (&res_queue, req))
938 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
939 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
940 1161
941 pthread_mutex_unlock (&reslock); 1162 self->req = 0;
1163 worker_clear (self);
1164
1165 UNLOCK (reslock);
942 } 1166 }
943 while (type != REQ_QUIT); 1167
1168quit:
1169 LOCK (wrklock);
1170 worker_free (self);
1171 UNLOCK (wrklock);
944 1172
945 return 0; 1173 return 0;
946} 1174}
947 1175
948/*****************************************************************************/ 1176/*****************************************************************************/
949 1177
950static void atfork_prepare (void) 1178static void atfork_prepare (void)
951{ 1179{
952 pthread_mutex_lock (&reqlock); 1180 LOCK (wrklock);
953 pthread_mutex_lock (&reslock); 1181 LOCK (reqlock);
1182 LOCK (reslock);
954#if !HAVE_PREADWRITE 1183#if !HAVE_PREADWRITE
955 pthread_mutex_lock (&preadwritelock); 1184 LOCK (preadwritelock);
956#endif 1185#endif
957#if !HAVE_READDIR_R 1186#if !HAVE_READDIR_R
958 pthread_mutex_lock (&readdirlock); 1187 LOCK (readdirlock);
959#endif 1188#endif
960} 1189}
961 1190
962static void atfork_parent (void) 1191static void atfork_parent (void)
963{ 1192{
964#if !HAVE_READDIR_R 1193#if !HAVE_READDIR_R
965 pthread_mutex_unlock (&readdirlock); 1194 UNLOCK (readdirlock);
966#endif 1195#endif
967#if !HAVE_PREADWRITE 1196#if !HAVE_PREADWRITE
968 pthread_mutex_unlock (&preadwritelock); 1197 UNLOCK (preadwritelock);
969#endif 1198#endif
970 pthread_mutex_unlock (&reslock); 1199 UNLOCK (reslock);
971 pthread_mutex_unlock (&reqlock); 1200 UNLOCK (reqlock);
1201 UNLOCK (wrklock);
972} 1202}
973 1203
974static void atfork_child (void) 1204static void atfork_child (void)
975{ 1205{
976 aio_req prv; 1206 aio_req prv;
977
978 started = 0;
979 1207
980 while (prv = reqq_shift (&req_queue)) 1208 while (prv = reqq_shift (&req_queue))
981 req_free (prv); 1209 req_free (prv);
982 1210
983 while (prv = reqq_shift (&res_queue)) 1211 while (prv = reqq_shift (&res_queue))
984 req_free (prv); 1212 req_free (prv);
985 1213
1214 while (wrk_first.next != &wrk_first)
1215 {
1216 worker *wrk = wrk_first.next;
1217
1218 if (wrk->req)
1219 req_free (wrk->req);
1220
1221 worker_clear (wrk);
1222 worker_free (wrk);
1223 }
1224
1225 started = 0;
1226 idle = 0;
1227 nreqs = 0;
1228 nready = 0;
1229 npending = 0;
1230
986 close (respipe [0]); 1231 close (respipe [0]);
987 close (respipe [1]); 1232 close (respipe [1]);
988 create_pipe (); 1233 create_pipe ();
989 1234
990 atfork_parent (); 1235 atfork_parent ();
… …
1016PROTOTYPES: ENABLE 1261PROTOTYPES: ENABLE
1017 1262
1018BOOT: 1263BOOT:
1019{ 1264{
1020 HV *stash = gv_stashpv ("IO::AIO", 1); 1265 HV *stash = gv_stashpv ("IO::AIO", 1);
1266
1021 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1022 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1023 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));
1024 1273
1025 create_pipe (); 1274 create_pipe ();
1026 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1027} 1276}
1028 1277
1029void 1278void
1030min_parallel (nthreads) 1279max_poll_reqs (int nreqs)
1031 int nthreads
1032 PROTOTYPE: $ 1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
1033 1283
1034void 1284void
1035max_parallel (nthreads) 1285max_poll_time (double nseconds)
1036 int nthreads
1037 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);
1038 1303
1039int 1304int
1040max_outstanding (nreqs) 1305max_outstanding (int maxreqs)
1041 int nreqs 1306 PROTOTYPE: $
1042 PROTOTYPE: $
1043 CODE: 1307 CODE:
1044 RETVAL = max_outstanding; 1308 RETVAL = max_outstanding;
1045 max_outstanding = nreqs; 1309 max_outstanding = maxreqs;
1310 OUTPUT:
1311 RETVAL
1046 1312
1047void 1313void
1048aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1049 SV * pathname 1315 SV8 * pathname
1050 int flags 1316 int flags
1051 int mode 1317 int mode
1052 SV * callback 1318 SV * callback
1053 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1054 PPCODE: 1320 PPCODE:
1055{ 1321{
1056 dREQ; 1322 dREQ;
1057 1323
1058 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1059 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1060 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1061 req->fd = flags; 1327 req->int1 = flags;
1062 req->mode = mode; 1328 req->mode = mode;
1063 1329
1064 REQ_SEND; 1330 REQ_SEND;
1065} 1331}
1066 1332
… …
1076 PPCODE: 1342 PPCODE:
1077{ 1343{
1078 dREQ; 1344 dREQ;
1079 1345
1080 req->type = ix; 1346 req->type = ix;
1081 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1082 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1083 1349
1084 REQ_SEND (req); 1350 REQ_SEND (req);
1085} 1351}
1086 1352
1087void 1353void
1088aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1089 SV * fh 1355 SV * fh
1090 UV offset 1356 UV offset
1091 UV length 1357 UV length
1092 SV * data 1358 SV8 * data
1093 UV dataoffset 1359 UV dataoffset
1094 SV * callback 1360 SV * callback
1095 ALIAS: 1361 ALIAS:
1096 aio_read = REQ_READ 1362 aio_read = REQ_READ
1097 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1098 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1099 PPCODE: 1365 PPCODE:
1100{ 1366{
1101 aio_req req;
1102 STRLEN svlen; 1367 STRLEN svlen;
1103 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1104 1369
1105 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1106 SvPOK_on (data); 1371 SvPOK_on (data);
… …
1128 1393
1129 { 1394 {
1130 dREQ; 1395 dREQ;
1131 1396
1132 req->type = ix; 1397 req->type = ix;
1133 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1134 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1135 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1136 req->offset = offset; 1401 req->offs = offset;
1137 req->length = length; 1402 req->size = length;
1138 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1139 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1140 1406
1141 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1142 { 1408 {
1143 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1144 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1145 } 1411 }
1146 1412
1147 REQ_SEND; 1413 REQ_SEND;
1148 } 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;
1149} 1437}
1150 1438
1151void 1439void
1152aio_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)
1153 SV * out_fh 1441 SV * out_fh
… …
1159 PPCODE: 1447 PPCODE:
1160{ 1448{
1161 dREQ; 1449 dREQ;
1162 1450
1163 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1164 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1165 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1166 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1167 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1168 req->offset = in_offset; 1456 req->offs = in_offset;
1169 req->length = length; 1457 req->size = length;
1170 1458
1171 REQ_SEND; 1459 REQ_SEND;
1172} 1460}
1173 1461
1174void 1462void
… …
1181 PPCODE: 1469 PPCODE:
1182{ 1470{
1183 dREQ; 1471 dREQ;
1184 1472
1185 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1186 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1187 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1188 req->offset = offset; 1476 req->offs = offset;
1189 req->length = length; 1477 req->size = length;
1190 1478
1191 REQ_SEND; 1479 REQ_SEND;
1192} 1480}
1193 1481
1194void 1482void
1195aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1196 SV * fh_or_path 1484 SV8 * fh_or_path
1197 SV * callback 1485 SV * callback
1198 ALIAS: 1486 ALIAS:
1199 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1200 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1201 PPCODE: 1489 PPCODE:
1202{ 1490{
1203 dREQ; 1491 dREQ;
1204 1492
1205 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1206 if (!req->statdata) 1494 if (!req->ptr2)
1207 { 1495 {
1208 req_free (req); 1496 req_free (req);
1209 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1210 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1211 1501
1212 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1213 { 1503 {
1214 req->type = ix; 1504 req->type = ix;
1215 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1216 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1217 } 1507 }
1218 else 1508 else
1219 { 1509 {
1220 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1221 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1222 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1223 } 1513 }
1224 1514
1225 REQ_SEND; 1515 REQ_SEND;
1226} 1516}
1227 1517
1228void 1518void
1229aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1230 SV * pathname 1520 SV8 * pathname
1231 SV * callback 1521 SV * callback
1232 ALIAS: 1522 ALIAS:
1233 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1234 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1235 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1236 PPCODE: 1526 PPCODE:
1237{ 1527{
1238 dREQ; 1528 dREQ;
1239 1529
1240 req->type = ix; 1530 req->type = ix;
1241 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1242 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1243 1533
1244 REQ_SEND; 1534 REQ_SEND;
1245} 1535}
1246 1536
1247void 1537void
1248aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1249 SV * oldpath 1539 SV8 * oldpath
1250 SV * newpath 1540 SV8 * newpath
1251 SV * callback 1541 SV * callback
1252 ALIAS: 1542 ALIAS:
1253 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1254 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1255 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1256 PPCODE: 1546 PPCODE:
1257{ 1547{
1258 dREQ; 1548 dREQ;
1259 1549
1260 req->type = ix; 1550 req->type = ix;
1261 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1262 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1263 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1264 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1265 1555
1266 REQ_SEND; 1556 REQ_SEND;
1267} 1557}
1268 1558
1269void 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
1270aio_busy (delay,callback=&PL_sv_undef) 1579aio_busy (delay,callback=&PL_sv_undef)
1271 double delay 1580 double delay
1272 SV * callback 1581 SV * callback
1273 PPCODE: 1582 PPCODE:
1274{ 1583{
1275 dREQ; 1584 dREQ;
1276 1585
1277 req->type = REQ_BUSY; 1586 req->type = REQ_BUSY;
1278 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1279 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1280 1589
1281 REQ_SEND; 1590 REQ_SEND;
1282} 1591}
1283 1592
1284void 1593void
… …
1288 PPCODE: 1597 PPCODE:
1289{ 1598{
1290 dREQ; 1599 dREQ;
1291 1600
1292 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1293 req_send (req); 1603 req_send (req);
1294
1295 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1296} 1605}
1297 1606
1298void 1607void
1299aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1300 SV * callback 1609 SV * callback
1301 PPCODE: 1610 PPCODE:
1302{ 1611{
1303 dREQ; 1612 dREQ;
1304 1613
1305 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
1306 1615
1307 REQ_SEND; 1616 REQ_SEND;
1308} 1617}
1309 1618
1310void 1619int
1311aioreq_pri (int pri = DEFAULT_PRI) 1620aioreq_pri (int pri = 0)
1312 CODE: 1621 PROTOTYPE: ;$
1622 CODE:
1623 RETVAL = next_pri - PRI_BIAS;
1624 if (items > 0)
1625 {
1313 if (pri < PRI_MIN) pri = PRI_MIN; 1626 if (pri < PRI_MIN) pri = PRI_MIN;
1314 if (pri > PRI_MAX) pri = PRI_MAX; 1627 if (pri > PRI_MAX) pri = PRI_MAX;
1315 next_pri = pri + PRI_BIAS; 1628 next_pri = pri + PRI_BIAS;
1629 }
1630 OUTPUT:
1631 RETVAL
1316 1632
1317void 1633void
1318aioreq_nice (int nice = 0) 1634aioreq_nice (int nice = 0)
1319 CODE: 1635 CODE:
1320 nice = next_pri - nice; 1636 nice = next_pri - nice;
1321 if (nice < PRI_MIN) nice = PRI_MIN; 1637 if (nice < PRI_MIN) nice = PRI_MIN;
1322 if (nice > PRI_MAX) nice = PRI_MAX; 1638 if (nice > PRI_MAX) nice = PRI_MAX;
1323 next_pri = nice + PRI_BIAS; 1639 next_pri = nice + PRI_BIAS;
1324 1640
1325void 1641void
1326flush () 1642flush ()
1327 PROTOTYPE: 1643 PROTOTYPE:
1328 CODE: 1644 CODE:
… …
1330 { 1646 {
1331 poll_wait (); 1647 poll_wait ();
1332 poll_cb (); 1648 poll_cb ();
1333 } 1649 }
1334 1650
1335void 1651int
1336poll() 1652poll()
1337 PROTOTYPE: 1653 PROTOTYPE:
1338 CODE: 1654 CODE:
1339 if (nreqs)
1340 {
1341 poll_wait (); 1655 poll_wait ();
1342 poll_cb (); 1656 RETVAL = poll_cb ();
1343 } 1657 OUTPUT:
1658 RETVAL
1344 1659
1345int 1660int
1346poll_fileno() 1661poll_fileno()
1347 PROTOTYPE: 1662 PROTOTYPE:
1348 CODE: 1663 CODE:
… …
1360 1675
1361void 1676void
1362poll_wait() 1677poll_wait()
1363 PROTOTYPE: 1678 PROTOTYPE:
1364 CODE: 1679 CODE:
1365 if (nreqs)
1366 poll_wait (); 1680 poll_wait ();
1367 1681
1368int 1682int
1369nreqs() 1683nreqs()
1370 PROTOTYPE: 1684 PROTOTYPE:
1371 CODE: 1685 CODE:
1372 RETVAL = nreqs; 1686 RETVAL = nreqs;
1373 OUTPUT: 1687 OUTPUT:
1374 RETVAL 1688 RETVAL
1375 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
1376PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1377 1717
1378MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1718MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1379 1719
1380void 1720void
… …
1395 PPCODE: 1735 PPCODE:
1396{ 1736{
1397 int i; 1737 int i;
1398 aio_req req; 1738 aio_req req;
1399 1739
1400 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1401 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");
1402 1742
1403 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1404 { 1744 {
1405 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
… …
1407 1747
1408 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1409 1749
1410 if (req) 1750 if (req)
1411 { 1751 {
1412 ++grp->length; 1752 ++grp->size;
1413 req->grp = grp; 1753 req->grp = grp;
1414 1754
1415 req->grp_prev = 0; 1755 req->grp_prev = 0;
1416 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1417 1757
… …
1422 } 1762 }
1423 } 1763 }
1424} 1764}
1425 1765
1426void 1766void
1767cancel_subs (aio_req_ornot req)
1768 CODE:
1769 req_cancel_subs (req);
1770
1771void
1427result (aio_req grp, ...) 1772result (aio_req grp, ...)
1428 CODE: 1773 CODE:
1429{ 1774{
1430 int i; 1775 int i;
1776 AV *av;
1777
1778 grp->errorno = errno;
1779
1431 AV *av = newAV (); 1780 av = newAV ();
1432 1781
1433 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1434 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1435 1784
1436 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1437 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1438} 1787}
1788
1789void
1790errno (aio_req grp, int errorno = errno)
1791 CODE:
1792 grp->errorno = errorno;
1439 1793
1440void 1794void
1441limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1442 CODE: 1796 CODE:
1443 grp->fd2 = limit; 1797 grp->int2 = limit;
1444 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1445 1799
1446void 1800void
1447feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1448 CODE: 1802 CODE:
1449{ 1803{
1450 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1451 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1452 1806
1453 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1454 grp->fd2 = 2; 1808 grp->int2 = 2;
1455 1809
1456 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1457} 1811}
1458 1812

Diff Legend

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