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

Diff Legend

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