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.68 by root, Tue Oct 24 03:40:25 2006 UTC vs.
Revision 1.92 by root, Wed Nov 8 01:59:59 2006 UTC

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

Diff Legend

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