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.69 by root, Tue Oct 24 11:57:30 2006 UTC vs.
Revision 1.87 by root, Mon Oct 30 23:42:27 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_BUSY, 103 REQ_BUSY,
79}; 104};
80 105
81#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
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;
92 off_t offset; 116 off_t offs;
93 size_t length; 117 size_t size;
94 ssize_t result; 118 ssize_t result;
95 119
96 STRLEN dataoffset; 120 STRLEN stroffset;
97 int type; 121 int type;
98 int fd, fd2; 122 int int1, int2;
99 int errorno; 123 int errorno;
100 mode_t mode; /* open */ 124 mode_t mode; /* open */
101 125
102 unsigned char flags; 126 unsigned char flags;
103 unsigned char pri; 127 unsigned char pri;
… …
105 SV *self; /* the perl counterpart of this request, if any */ 129 SV *self; /* the perl counterpart of this request, if any */
106 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 130 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
107} aio_cb; 131} aio_cb;
108 132
109enum { 133enum {
110 FLAG_CANCELLED = 0x01, 134 FLAG_CANCELLED = 0x01,
135 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
136 FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */
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;
400
401 if (req->flags & FLAG_SV1_RO_OFF)
402 SvREADONLY_off (req->sv1);
297 403
298 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 404 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
299 { 405 {
300 errno = req->errorno;
301
302 ENTER; 406 ENTER;
303 SAVETMPS; 407 SAVETMPS;
304 PUSHMARK (SP); 408 PUSHMARK (SP);
305 EXTEND (SP, 1); 409 EXTEND (SP, 1);
306 410
… …
310 { 414 {
311 SV *rv = &PL_sv_undef; 415 SV *rv = &PL_sv_undef;
312 416
313 if (req->result >= 0) 417 if (req->result >= 0)
314 { 418 {
419 int i;
315 char *buf = req->data2ptr; 420 char *buf = req->ptr2;
316 AV *av = newAV (); 421 AV *av = newAV ();
317 422
318 while (req->result) 423 av_extend (av, req->result - 1);
424
425 for (i = 0; i < req->result; ++i)
319 { 426 {
320 SV *sv = newSVpv (buf, 0); 427 SV *sv = newSVpv (buf, 0);
321 428
322 av_push (av, sv); 429 av_store (av, i, sv);
323 buf += SvCUR (sv) + 1; 430 buf += SvCUR (sv) + 1;
324 req->result--;
325 } 431 }
326 432
327 rv = sv_2mortal (newRV_noinc ((SV *)av)); 433 rv = sv_2mortal (newRV_noinc ((SV *)av));
328 } 434 }
329 435
… …
347 XPUSHs (sv_2mortal (fh)); 453 XPUSHs (sv_2mortal (fh));
348 } 454 }
349 break; 455 break;
350 456
351 case REQ_GROUP: 457 case REQ_GROUP:
352 req->fd = 2; /* mark group as finished */ 458 req->int1 = 2; /* mark group as finished */
353 459
354 if (req->data) 460 if (req->sv1)
355 { 461 {
356 int i; 462 int i;
357 AV *av = (AV *)req->data; 463 AV *av = (AV *)req->sv1;
358 464
359 EXTEND (SP, AvFILL (av) + 1); 465 EXTEND (SP, AvFILL (av) + 1);
360 for (i = 0; i <= AvFILL (av); ++i) 466 for (i = 0; i <= AvFILL (av); ++i)
361 PUSHs (*av_fetch (av, i, 0)); 467 PUSHs (*av_fetch (av, i, 0));
362 } 468 }
… …
364 470
365 case REQ_NOP: 471 case REQ_NOP:
366 case REQ_BUSY: 472 case REQ_BUSY:
367 break; 473 break;
368 474
475 case REQ_READLINK:
476 if (req->result > 0)
477 {
478 SvCUR_set (req->sv1, req->result);
479 *SvEND (req->sv1) = 0;
480 PUSHs (req->sv1);
481 }
482 break;
483
484 case REQ_STAT:
485 case REQ_LSTAT:
486 case REQ_FSTAT:
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(Stat_t *)(req->ptr2);
490 PUSHs (sv_2mortal (newSViv (req->result)));
491 break;
492
493 case REQ_READ:
494 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
495 *SvEND (req->sv1) = 0;
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
498
369 default: 499 default:
370 PUSHs (sv_2mortal (newSViv (req->result))); 500 PUSHs (sv_2mortal (newSViv (req->result)));
371 break; 501 break;
372 } 502 }
373 503
504 errno = req->errorno;
374 505
375 PUTBACK; 506 PUTBACK;
376 call_sv (req->callback, G_VOID | G_EVAL); 507 call_sv (req->callback, G_VOID | G_EVAL);
377 SPAGAIN; 508 SPAGAIN;
378 509
… …
407 { 538 {
408 sv_unmagic (req->self, PERL_MAGIC_ext); 539 sv_unmagic (req->self, PERL_MAGIC_ext);
409 SvREFCNT_dec (req->self); 540 SvREFCNT_dec (req->self);
410 } 541 }
411 542
412 SvREFCNT_dec (req->data);
413 SvREFCNT_dec (req->fh); 543 SvREFCNT_dec (req->fh);
544 SvREFCNT_dec (req->sv1);
414 SvREFCNT_dec (req->fh2); 545 SvREFCNT_dec (req->sv2);
415 SvREFCNT_dec (req->callback); 546 SvREFCNT_dec (req->callback);
416 Safefree (req->statdata);
417 547
418 if (req->type == REQ_READDIR && req->result >= 0) 548 if (req->flags & FLAG_PTR2_FREE)
419 free (req->data2ptr); 549 free (req->ptr2);
420 550
421 Safefree (req); 551 Safefree (req);
422} 552}
423 553
554static void req_cancel_subs (aio_req grp)
555{
556 aio_req sub;
557
558 if (grp->type != REQ_GROUP)
559 return;
560
561 SvREFCNT_dec (grp->sv2);
562 grp->sv2 = 0;
563
564 for (sub = grp->grp_first; sub; sub = sub->grp_next)
565 req_cancel (sub);
566}
567
424static void req_cancel (aio_req req) 568static void req_cancel (aio_req req)
425{ 569{
426 req->flags |= FLAG_CANCELLED; 570 req->flags |= FLAG_CANCELLED;
427 571
428 if (req->type == REQ_GROUP) 572 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} 573}
499 574
500static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
501 576
502static void start_thread (void) 577static void start_thread (void)
503{ 578{
504 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
505 pthread_t tid;
506 pthread_attr_t attr; 580 pthread_attr_t attr;
581
582 worker *wrk = calloc (1, sizeof (worker));
583
584 if (!wrk)
585 croak ("unable to allocate worker thread data");
507 586
508 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
509 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
510 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
590#ifdef PTHREAD_SCOPE_PROCESS
591 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
592#endif
511 593
512 sigfillset (&fullsigset); 594 sigfillset (&fullsigset);
595
596 LOCK (wrklock);
513 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 597 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
514 598
515 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 599 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
600 {
601 wrk->prev = &wrk_first;
602 wrk->next = wrk_first.next;
603 wrk_first.next->prev = wrk;
604 wrk_first.next = wrk;
516 started++; 605 ++started;
606 }
607 else
608 free (wrk);
517 609
518 sigprocmask (SIG_SETMASK, &oldsigset, 0); 610 sigprocmask (SIG_SETMASK, &oldsigset, 0);
611 UNLOCK (wrklock);
612}
613
614static void maybe_start_thread ()
615{
616 if (get_nthreads () >= wanted)
617 return;
618
619 /* todo: maybe use idle here, but might be less exact */
620 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
621 return;
622
623 start_thread ();
519} 624}
520 625
521static void req_send (aio_req req) 626static void req_send (aio_req req)
522{ 627{
523 while (started < wanted && nreqs >= started)
524 start_thread ();
525
526 ++nreqs; 628 ++nreqs;
527 629
528 pthread_mutex_lock (&reqlock); 630 LOCK (reqlock);
631 ++nready;
529 reqq_push (&req_queue, req); 632 reqq_push (&req_queue, req);
530 pthread_cond_signal (&reqwait); 633 pthread_cond_signal (&reqwait);
531 pthread_mutex_unlock (&reqlock); 634 UNLOCK (reqlock);
532 635
533 if (nreqs > max_outstanding) 636 maybe_start_thread ();
534 for (;;)
535 {
536 poll_cb ();
537
538 if (nreqs <= max_outstanding)
539 break;
540
541 poll_wait ();
542 }
543} 637}
544 638
545static void end_thread (void) 639static void end_thread (void)
546{ 640{
547 aio_req req; 641 aio_req req;
… …
549 Newz (0, req, 1, aio_cb); 643 Newz (0, req, 1, aio_cb);
550 644
551 req->type = REQ_QUIT; 645 req->type = REQ_QUIT;
552 req->pri = PRI_MAX + PRI_BIAS; 646 req->pri = PRI_MAX + PRI_BIAS;
553 647
554 req_send (req); 648 LOCK (reqlock);
649 reqq_push (&req_queue, req);
650 pthread_cond_signal (&reqwait);
651 UNLOCK (reqlock);
652
653 LOCK (wrklock);
654 --started;
655 UNLOCK (wrklock);
656}
657
658static void set_max_idle (int nthreads)
659{
660 if (WORDACCESS_UNSAFE) LOCK (reqlock);
661 max_idle = nthreads <= 0 ? 1 : nthreads;
662 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
555} 663}
556 664
557static void min_parallel (int nthreads) 665static void min_parallel (int nthreads)
558{ 666{
559 if (wanted < nthreads) 667 if (wanted < nthreads)
560 wanted = nthreads; 668 wanted = nthreads;
561} 669}
562 670
563static void max_parallel (int nthreads) 671static void max_parallel (int nthreads)
564{ 672{
565 int cur = started;
566
567 if (wanted > nthreads) 673 if (wanted > nthreads)
568 wanted = nthreads; 674 wanted = nthreads;
569 675
570 while (cur > wanted) 676 while (started > wanted)
677 end_thread ();
678}
679
680static void poll_wait ()
681{
682 fd_set rfd;
683
684 while (nreqs)
571 { 685 {
686 int size;
687 if (WORDACCESS_UNSAFE) LOCK (reslock);
688 size = res_queue.size;
689 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
690
691 if (size)
692 return;
693
572 end_thread (); 694 maybe_start_thread ();
573 cur--; 695
696 FD_ZERO(&rfd);
697 FD_SET(respipe [0], &rfd);
698
699 select (respipe [0] + 1, &rfd, 0, 0, 0);
574 } 700 }
701}
575 702
576 while (started > wanted) 703static int poll_cb ()
704{
705 dSP;
706 int count = 0;
707 int maxreqs = max_poll_reqs;
708 int do_croak = 0;
709 struct timeval tv_start, tv_now;
710 aio_req req;
711
712 if (max_poll_time)
713 gettimeofday (&tv_start, 0);
714
715 for (;;)
577 { 716 {
717 for (;;)
718 {
719 maybe_start_thread ();
720
721 LOCK (reslock);
722 req = reqq_shift (&res_queue);
723
724 if (req)
725 {
726 --npending;
727
728 if (!res_queue.size)
729 {
730 /* read any signals sent by the worker threads */
731 char buf [32];
732 while (read (respipe [0], buf, 32) == 32)
733 ;
734 }
735 }
736
737 UNLOCK (reslock);
738
739 if (!req)
740 break;
741
742 --nreqs;
743
744 if (req->type == REQ_GROUP && req->size)
745 {
746 req->int1 = 1; /* mark request as delayed */
747 continue;
748 }
749 else
750 {
751 req_invoke (req);
752
753 count++;
754 }
755
756 req_free (req);
757
758 if (maxreqs && !--maxreqs)
759 break;
760
761 if (max_poll_time)
762 {
763 gettimeofday (&tv_now, 0);
764
765 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
766 break;
767 }
768 }
769
770 if (nreqs <= max_outstanding)
771 break;
772
578 poll_wait (); 773 poll_wait ();
579 poll_cb (); 774
775 ++maxreqs;
580 } 776 }
777
778 return count;
581} 779}
582 780
583static void create_pipe () 781static void create_pipe ()
584{ 782{
585 if (pipe (respipe)) 783 if (pipe (respipe))
… …
609static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 807static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
610{ 808{
611 ssize_t res; 809 ssize_t res;
612 off_t ooffset; 810 off_t ooffset;
613 811
614 pthread_mutex_lock (&preadwritelock); 812 LOCK (preadwritelock);
615 ooffset = lseek (fd, 0, SEEK_CUR); 813 ooffset = lseek (fd, 0, SEEK_CUR);
616 lseek (fd, offset, SEEK_SET); 814 lseek (fd, offset, SEEK_SET);
617 res = read (fd, buf, count); 815 res = read (fd, buf, count);
618 lseek (fd, ooffset, SEEK_SET); 816 lseek (fd, ooffset, SEEK_SET);
619 pthread_mutex_unlock (&preadwritelock); 817 UNLOCK (preadwritelock);
620 818
621 return res; 819 return res;
622} 820}
623 821
624static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 822static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
625{ 823{
626 ssize_t res; 824 ssize_t res;
627 off_t ooffset; 825 off_t ooffset;
628 826
629 pthread_mutex_lock (&preadwritelock); 827 LOCK (preadwritelock);
630 ooffset = lseek (fd, 0, SEEK_CUR); 828 ooffset = lseek (fd, 0, SEEK_CUR);
631 lseek (fd, offset, SEEK_SET); 829 lseek (fd, offset, SEEK_SET);
632 res = write (fd, buf, count); 830 res = write (fd, buf, count);
633 lseek (fd, offset, SEEK_SET); 831 lseek (fd, offset, SEEK_SET);
634 pthread_mutex_unlock (&preadwritelock); 832 UNLOCK (preadwritelock);
635 833
636 return res; 834 return res;
637} 835}
638#endif 836#endif
639 837
640#if !HAVE_FDATASYNC 838#if !HAVE_FDATASYNC
641# define fdatasync fsync 839# define fdatasync fsync
642#endif 840#endif
643 841
644#if !HAVE_READAHEAD 842#if !HAVE_READAHEAD
645# define readahead aio_readahead 843# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
646 844
647static ssize_t readahead (int fd, off_t offset, size_t count) 845static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
648{ 846{
649 dBUF; 847 dBUF;
650 848
651 while (count > 0) 849 while (count > 0)
652 { 850 {
… …
655 pread (fd, aio_buf, len, offset); 853 pread (fd, aio_buf, len, offset);
656 offset += len; 854 offset += len;
657 count -= len; 855 count -= len;
658 } 856 }
659 857
660 fBUF;
661
662 errno = 0; 858 errno = 0;
663} 859}
860
664#endif 861#endif
665 862
666#if !HAVE_READDIR_R 863#if !HAVE_READDIR_R
667# define readdir_r aio_readdir_r 864# define readdir_r aio_readdir_r
668 865
… …
671static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 868static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
672{ 869{
673 struct dirent *e; 870 struct dirent *e;
674 int errorno; 871 int errorno;
675 872
676 pthread_mutex_lock (&readdirlock); 873 LOCK (readdirlock);
677 874
678 e = readdir (dirp); 875 e = readdir (dirp);
679 errorno = errno; 876 errorno = errno;
680 877
681 if (e) 878 if (e)
… …
684 strcpy (ent->d_name, e->d_name); 881 strcpy (ent->d_name, e->d_name);
685 } 882 }
686 else 883 else
687 *res = 0; 884 *res = 0;
688 885
689 pthread_mutex_unlock (&readdirlock); 886 UNLOCK (readdirlock);
690 887
691 errno = errorno; 888 errno = errorno;
692 return e ? 0 : -1; 889 return e ? 0 : -1;
693} 890}
694#endif 891#endif
695 892
696/* sendfile always needs emulation */ 893/* sendfile always needs emulation */
697static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 894static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
698{ 895{
699 ssize_t res; 896 ssize_t res;
700 897
701 if (!count) 898 if (!count)
702 return 0; 899 return 0;
… …
713 { 910 {
714 off_t sbytes; 911 off_t sbytes;
715 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 912 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
716 913
717 if (res < 0 && sbytes) 914 if (res < 0 && sbytes)
718 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 915 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
719 res = sbytes; 916 res = sbytes;
720 } 917 }
721 918
722# elif __hpux 919# elif __hpux
723 res = sendfile (ofd, ifd, offset, count, 0, 0); 920 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
779 976
780 offset += cnt; 977 offset += cnt;
781 res += cnt; 978 res += cnt;
782 count -= cnt; 979 count -= cnt;
783 } 980 }
784
785 fBUF;
786 } 981 }
787 982
788 return res; 983 return res;
789} 984}
790 985
791/* read a full directory */ 986/* read a full directory */
792static int scandir_ (const char *path, void **namesp) 987static void scandir_ (aio_req req, worker *self)
793{ 988{
794 DIR *dirp; 989 DIR *dirp;
795 union 990 union
796 { 991 {
797 struct dirent d; 992 struct dirent d;
… …
802 int memlen = 4096; 997 int memlen = 4096;
803 int memofs = 0; 998 int memofs = 0;
804 int res = 0; 999 int res = 0;
805 int errorno; 1000 int errorno;
806 1001
807 dirp = opendir (path); 1002 LOCK (wrklock);
808 if (!dirp) 1003 self->dirp = dirp = opendir (req->ptr1);
809 return -1;
810
811 u = malloc (sizeof (*u)); 1004 self->dbuf = u = malloc (sizeof (*u));
1005 req->flags |= FLAG_PTR2_FREE;
812 names = malloc (memlen); 1006 req->ptr2 = names = malloc (memlen);
1007 UNLOCK (wrklock);
813 1008
814 if (u && names) 1009 if (dirp && u && names)
815 for (;;) 1010 for (;;)
816 { 1011 {
817 errno = 0; 1012 errno = 0;
818 readdir_r (dirp, &u->d, &entp); 1013 readdir_r (dirp, &u->d, &entp);
819 1014
… …
829 res++; 1024 res++;
830 1025
831 while (memofs + len > memlen) 1026 while (memofs + len > memlen)
832 { 1027 {
833 memlen *= 2; 1028 memlen *= 2;
1029 LOCK (wrklock);
834 names = realloc (names, memlen); 1030 req->ptr2 = names = realloc (names, memlen);
1031 UNLOCK (wrklock);
1032
835 if (!names) 1033 if (!names)
836 break; 1034 break;
837 } 1035 }
838 1036
839 memcpy (names + memofs, name, len); 1037 memcpy (names + memofs, name, len);
840 memofs += len; 1038 memofs += len;
841 } 1039 }
842 } 1040 }
843 1041
844 errorno = errno;
845 free (u);
846 closedir (dirp);
847
848 if (errorno) 1042 if (errno)
1043 res = -1;
1044
1045 req->result = res;
1046}
1047
1048/*****************************************************************************/
1049
1050static void *aio_proc (void *thr_arg)
1051{
1052 aio_req req;
1053 struct timespec ts;
1054 worker *self = (worker *)thr_arg;
1055
1056 /* try to distribute timeouts somewhat evenly */
1057 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1058 * (1000000000UL / 1024UL);
1059
1060 for (;;)
849 { 1061 {
850 free (names); 1062 ts.tv_sec = time (0) + IDLE_TIMEOUT;
851 errno = errorno;
852 res = -1;
853 }
854 1063
855 *namesp = (void *)names; 1064 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 1065
870 for (;;) 1066 for (;;)
871 { 1067 {
872 req = reqq_shift (&req_queue); 1068 self->req = req = reqq_shift (&req_queue);
873 1069
874 if (req) 1070 if (req)
875 break; 1071 break;
876 1072
1073 ++idle;
1074
1075 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1076 == ETIMEDOUT)
1077 {
1078 if (idle > max_idle)
1079 {
1080 --idle;
1081 UNLOCK (reqlock);
1082 LOCK (wrklock);
1083 --started;
1084 UNLOCK (wrklock);
1085 goto quit;
1086 }
1087
1088 /* we are allowed to idle, so do so without any timeout */
877 pthread_cond_wait (&reqwait, &reqlock); 1089 pthread_cond_wait (&reqwait, &reqlock);
1090 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1091 }
1092
1093 --idle;
878 } 1094 }
879 1095
880 pthread_mutex_unlock (&reqlock); 1096 --nready;
1097
1098 UNLOCK (reqlock);
881 1099
882 errno = 0; /* strictly unnecessary */ 1100 errno = 0; /* strictly unnecessary */
883 type = req->type; /* remember type for QUIT check */
884 1101
885 if (!(req->flags & FLAG_CANCELLED)) 1102 if (!(req->flags & FLAG_CANCELLED))
886 switch (type) 1103 switch (req->type)
887 { 1104 {
888 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1105 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; 1106 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
890 1107
891 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1108 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; 1109 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
893 1110
894 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1111 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; 1112 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; 1113 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
897 1114
898 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1115 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
899 case REQ_CLOSE: req->result = close (req->fd); break; 1116 case REQ_CLOSE: req->result = close (req->int1); break;
900 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1117 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
901 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1118 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
902 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
903 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
904 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
905 1124
906 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
907 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
908 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
909 1128
910 case REQ_BUSY: 1129 case REQ_BUSY:
911 { 1130 {
912 struct timeval tv; 1131 struct timeval tv;
913 1132
914 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
915 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
916 1135
917 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
918 } 1137 }
919 1138
920 case REQ_GROUP: 1139 case REQ_GROUP:
921 case REQ_NOP: 1140 case REQ_NOP:
1141 break;
1142
922 case REQ_QUIT: 1143 case REQ_QUIT:
923 break; 1144 goto quit;
924 1145
925 default: 1146 default:
926 req->result = ENOSYS; 1147 req->result = ENOSYS;
927 break; 1148 break;
928 } 1149 }
929 1150
930 req->errorno = errno; 1151 req->errorno = errno;
931 1152
932 pthread_mutex_lock (&reslock); 1153 LOCK (reslock);
1154
1155 ++npending;
933 1156
934 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
935 /* write a dummy byte to the pipe so fh becomes ready */ 1158 /* write a dummy byte to the pipe so fh becomes ready */
936 write (respipe [1], &respipe, 1); 1159 write (respipe [1], &respipe, 1);
937 1160
938 pthread_mutex_unlock (&reslock); 1161 self->req = 0;
1162 worker_clear (self);
1163
1164 UNLOCK (reslock);
939 } 1165 }
940 while (type != REQ_QUIT); 1166
1167quit:
1168 LOCK (wrklock);
1169 worker_free (self);
1170 UNLOCK (wrklock);
941 1171
942 return 0; 1172 return 0;
943} 1173}
944 1174
945/*****************************************************************************/ 1175/*****************************************************************************/
946 1176
947static void atfork_prepare (void) 1177static void atfork_prepare (void)
948{ 1178{
949 pthread_mutex_lock (&reqlock); 1179 LOCK (wrklock);
950 pthread_mutex_lock (&reslock); 1180 LOCK (reqlock);
1181 LOCK (reslock);
951#if !HAVE_PREADWRITE 1182#if !HAVE_PREADWRITE
952 pthread_mutex_lock (&preadwritelock); 1183 LOCK (preadwritelock);
953#endif 1184#endif
954#if !HAVE_READDIR_R 1185#if !HAVE_READDIR_R
955 pthread_mutex_lock (&readdirlock); 1186 LOCK (readdirlock);
956#endif 1187#endif
957} 1188}
958 1189
959static void atfork_parent (void) 1190static void atfork_parent (void)
960{ 1191{
961#if !HAVE_READDIR_R 1192#if !HAVE_READDIR_R
962 pthread_mutex_unlock (&readdirlock); 1193 UNLOCK (readdirlock);
963#endif 1194#endif
964#if !HAVE_PREADWRITE 1195#if !HAVE_PREADWRITE
965 pthread_mutex_unlock (&preadwritelock); 1196 UNLOCK (preadwritelock);
966#endif 1197#endif
967 pthread_mutex_unlock (&reslock); 1198 UNLOCK (reslock);
968 pthread_mutex_unlock (&reqlock); 1199 UNLOCK (reqlock);
1200 UNLOCK (wrklock);
969} 1201}
970 1202
971static void atfork_child (void) 1203static void atfork_child (void)
972{ 1204{
973 aio_req prv; 1205 aio_req prv;
974
975 started = 0;
976 1206
977 while (prv = reqq_shift (&req_queue)) 1207 while (prv = reqq_shift (&req_queue))
978 req_free (prv); 1208 req_free (prv);
979 1209
980 while (prv = reqq_shift (&res_queue)) 1210 while (prv = reqq_shift (&res_queue))
981 req_free (prv); 1211 req_free (prv);
982 1212
1213 while (wrk_first.next != &wrk_first)
1214 {
1215 worker *wrk = wrk_first.next;
1216
1217 if (wrk->req)
1218 req_free (wrk->req);
1219
1220 worker_clear (wrk);
1221 worker_free (wrk);
1222 }
1223
1224 started = 0;
1225 idle = 0;
1226 nreqs = 0;
1227 nready = 0;
1228 npending = 0;
1229
983 close (respipe [0]); 1230 close (respipe [0]);
984 close (respipe [1]); 1231 close (respipe [1]);
985 create_pipe (); 1232 create_pipe ();
986 1233
987 atfork_parent (); 1234 atfork_parent ();
… …
1013PROTOTYPES: ENABLE 1260PROTOTYPES: ENABLE
1014 1261
1015BOOT: 1262BOOT:
1016{ 1263{
1017 HV *stash = gv_stashpv ("IO::AIO", 1); 1264 HV *stash = gv_stashpv ("IO::AIO", 1);
1265
1018 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1266 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1019 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1267 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1020 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1268 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1269 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1270 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1271 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1021 1272
1022 create_pipe (); 1273 create_pipe ();
1023 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1274 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1024} 1275}
1025 1276
1026void 1277void
1027min_parallel (nthreads) 1278max_poll_reqs (int nreqs)
1028 int nthreads
1029 PROTOTYPE: $ 1279 PROTOTYPE: $
1280 CODE:
1281 max_poll_reqs = nreqs;
1030 1282
1031void 1283void
1032max_parallel (nthreads) 1284max_poll_time (double nseconds)
1033 int nthreads
1034 PROTOTYPE: $ 1285 PROTOTYPE: $
1286 CODE:
1287 max_poll_time = nseconds * AIO_TICKS;
1288
1289void
1290min_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_parallel (int nthreads)
1295 PROTOTYPE: $
1296
1297void
1298max_idle (int nthreads)
1299 PROTOTYPE: $
1300 CODE:
1301 set_max_idle (nthreads);
1035 1302
1036int 1303int
1037max_outstanding (nreqs) 1304max_outstanding (int maxreqs)
1038 int nreqs 1305 PROTOTYPE: $
1039 PROTOTYPE: $
1040 CODE: 1306 CODE:
1041 RETVAL = max_outstanding; 1307 RETVAL = max_outstanding;
1042 max_outstanding = nreqs; 1308 max_outstanding = maxreqs;
1309 OUTPUT:
1310 RETVAL
1043 1311
1044void 1312void
1045aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1313aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1046 SV * pathname 1314 SV * pathname
1047 int flags 1315 int flags
… …
1051 PPCODE: 1319 PPCODE:
1052{ 1320{
1053 dREQ; 1321 dREQ;
1054 1322
1055 req->type = REQ_OPEN; 1323 req->type = REQ_OPEN;
1056 req->data = newSVsv (pathname); 1324 req->sv1 = newSVsv (pathname);
1057 req->dataptr = SvPVbyte_nolen (req->data); 1325 req->ptr1 = SvPVbyte_nolen (pathname);
1058 req->fd = flags; 1326 req->int1 = flags;
1059 req->mode = mode; 1327 req->mode = mode;
1060 1328
1061 REQ_SEND; 1329 REQ_SEND;
1062} 1330}
1063 1331
… …
1073 PPCODE: 1341 PPCODE:
1074{ 1342{
1075 dREQ; 1343 dREQ;
1076 1344
1077 req->type = ix; 1345 req->type = ix;
1078 req->fh = newSVsv (fh); 1346 req->fh = newSVsv (fh);
1079 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1347 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1080 1348
1081 REQ_SEND (req); 1349 REQ_SEND (req);
1082} 1350}
1083 1351
1084void 1352void
… …
1093 aio_read = REQ_READ 1361 aio_read = REQ_READ
1094 aio_write = REQ_WRITE 1362 aio_write = REQ_WRITE
1095 PROTOTYPE: $$$$$;$ 1363 PROTOTYPE: $$$$$;$
1096 PPCODE: 1364 PPCODE:
1097{ 1365{
1098 aio_req req;
1099 STRLEN svlen; 1366 STRLEN svlen;
1100 char *svptr = SvPVbyte (data, svlen); 1367 char *svptr = SvPVbyte (data, svlen);
1101 1368
1102 SvUPGRADE (data, SVt_PV); 1369 SvUPGRADE (data, SVt_PV);
1103 SvPOK_on (data); 1370 SvPOK_on (data);
… …
1125 1392
1126 { 1393 {
1127 dREQ; 1394 dREQ;
1128 1395
1129 req->type = ix; 1396 req->type = ix;
1130 req->fh = newSVsv (fh); 1397 req->fh = newSVsv (fh);
1131 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1398 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1132 : IoOFP (sv_2io (fh))); 1399 : IoOFP (sv_2io (fh)));
1133 req->offset = offset; 1400 req->offs = offset;
1134 req->length = length; 1401 req->size = length;
1135 req->data = SvREFCNT_inc (data); 1402 req->sv1 = SvREFCNT_inc (data);
1136 req->dataptr = (char *)svptr + dataoffset; 1403 req->ptr1 = (char *)svptr + dataoffset;
1404 req->stroffset = dataoffset;
1137 1405
1138 if (!SvREADONLY (data)) 1406 if (!SvREADONLY (data))
1139 { 1407 {
1140 SvREADONLY_on (data); 1408 SvREADONLY_on (data);
1141 req->data2ptr = (void *)data; 1409 req->flags |= FLAG_SV1_RO_OFF;
1142 } 1410 }
1143 1411
1144 REQ_SEND; 1412 REQ_SEND;
1145 } 1413 }
1414}
1415
1416void
1417aio_readlink (path,callback=&PL_sv_undef)
1418 SV * path
1419 SV * callback
1420 PROTOTYPE: $$;$
1421 PPCODE:
1422{
1423 SV *data;
1424 dREQ;
1425
1426 data = newSV (NAME_MAX);
1427 SvPOK_on (data);
1428
1429 req->type = REQ_READLINK;
1430 req->fh = newSVsv (path);
1431 req->ptr2 = SvPVbyte_nolen (path);
1432 req->sv1 = data;
1433 req->ptr1 = SvPVbyte_nolen (data);
1434
1435 REQ_SEND;
1146} 1436}
1147 1437
1148void 1438void
1149aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1439aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1150 SV * out_fh 1440 SV * out_fh
… …
1156 PPCODE: 1446 PPCODE:
1157{ 1447{
1158 dREQ; 1448 dREQ;
1159 1449
1160 req->type = REQ_SENDFILE; 1450 req->type = REQ_SENDFILE;
1161 req->fh = newSVsv (out_fh); 1451 req->fh = newSVsv (out_fh);
1162 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1452 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1163 req->fh2 = newSVsv (in_fh); 1453 req->sv2 = newSVsv (in_fh);
1164 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1454 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1165 req->offset = in_offset; 1455 req->offs = in_offset;
1166 req->length = length; 1456 req->size = length;
1167 1457
1168 REQ_SEND; 1458 REQ_SEND;
1169} 1459}
1170 1460
1171void 1461void
… …
1178 PPCODE: 1468 PPCODE:
1179{ 1469{
1180 dREQ; 1470 dREQ;
1181 1471
1182 req->type = REQ_READAHEAD; 1472 req->type = REQ_READAHEAD;
1183 req->fh = newSVsv (fh); 1473 req->fh = newSVsv (fh);
1184 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1474 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1185 req->offset = offset; 1475 req->offs = offset;
1186 req->length = length; 1476 req->size = length;
1187 1477
1188 REQ_SEND; 1478 REQ_SEND;
1189} 1479}
1190 1480
1191void 1481void
… …
1197 aio_lstat = REQ_LSTAT 1487 aio_lstat = REQ_LSTAT
1198 PPCODE: 1488 PPCODE:
1199{ 1489{
1200 dREQ; 1490 dREQ;
1201 1491
1202 New (0, req->statdata, 1, Stat_t); 1492 req->ptr2 = malloc (sizeof (Stat_t));
1203 if (!req->statdata) 1493 if (!req->ptr2)
1204 { 1494 {
1205 req_free (req); 1495 req_free (req);
1206 croak ("out of memory during aio_req->statdata allocation"); 1496 croak ("out of memory during aio_req statdata allocation");
1207 } 1497 }
1498
1499 req->flags |= FLAG_PTR2_FREE;
1208 1500
1209 if (SvPOK (fh_or_path)) 1501 if (SvPOK (fh_or_path))
1210 { 1502 {
1211 req->type = ix; 1503 req->type = ix;
1212 req->data = newSVsv (fh_or_path); 1504 req->sv1 = newSVsv (fh_or_path);
1213 req->dataptr = SvPVbyte_nolen (req->data); 1505 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1214 } 1506 }
1215 else 1507 else
1216 { 1508 {
1217 req->type = REQ_FSTAT; 1509 req->type = REQ_FSTAT;
1218 req->fh = newSVsv (fh_or_path); 1510 req->fh = newSVsv (fh_or_path);
1219 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1511 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1220 } 1512 }
1221 1513
1222 REQ_SEND; 1514 REQ_SEND;
1223} 1515}
1224 1516
1225void 1517void
1226aio_unlink (pathname,callback=&PL_sv_undef) 1518aio_unlink (pathname,callback=&PL_sv_undef)
1227 SV * pathname 1519 SV * pathname
1228 SV * callback 1520 SV * callback
1229 ALIAS: 1521 ALIAS:
1230 aio_unlink = REQ_UNLINK 1522 aio_unlink = REQ_UNLINK
1231 aio_rmdir = REQ_RMDIR 1523 aio_rmdir = REQ_RMDIR
1232 aio_readdir = REQ_READDIR 1524 aio_readdir = REQ_READDIR
1233 PPCODE: 1525 PPCODE:
1234{ 1526{
1235 dREQ; 1527 dREQ;
1236 1528
1237 req->type = ix; 1529 req->type = ix;
1238 req->data = newSVsv (pathname); 1530 req->sv1 = newSVsv (pathname);
1239 req->dataptr = SvPVbyte_nolen (req->data); 1531 req->ptr1 = SvPVbyte_nolen (pathname);
1240 1532
1241 REQ_SEND; 1533 REQ_SEND;
1242} 1534}
1243 1535
1244void 1536void
1245aio_link (oldpath,newpath,callback=&PL_sv_undef) 1537aio_link (oldpath,newpath,callback=&PL_sv_undef)
1246 SV * oldpath 1538 SV * oldpath
1247 SV * newpath 1539 SV * newpath
1248 SV * callback 1540 SV * callback
1249 ALIAS: 1541 ALIAS:
1250 aio_link = REQ_LINK 1542 aio_link = REQ_LINK
1251 aio_symlink = REQ_SYMLINK 1543 aio_symlink = REQ_SYMLINK
1252 aio_rename = REQ_RENAME 1544 aio_rename = REQ_RENAME
1253 PPCODE: 1545 PPCODE:
1254{ 1546{
1255 dREQ; 1547 dREQ;
1256 1548
1257 req->type = ix; 1549 req->type = ix;
1258 req->fh = newSVsv (oldpath); 1550 req->fh = newSVsv (oldpath);
1259 req->data2ptr = SvPVbyte_nolen (req->fh); 1551 req->ptr2 = SvPVbyte_nolen (req->fh);
1260 req->data = newSVsv (newpath); 1552 req->sv1 = newSVsv (newpath);
1261 req->dataptr = SvPVbyte_nolen (req->data); 1553 req->ptr1 = SvPVbyte_nolen (newpath);
1262 1554
1263 REQ_SEND; 1555 REQ_SEND;
1264} 1556}
1265 1557
1266void 1558void
1559aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1560 SV * pathname
1561 SV * callback
1562 UV mode
1563 UV dev
1564 PPCODE:
1565{
1566 dREQ;
1567
1568 req->type = REQ_MKNOD;
1569 req->sv1 = newSVsv (pathname);
1570 req->ptr1 = SvPVbyte_nolen (pathname);
1571 req->mode = (mode_t)mode;
1572 req->offs = dev;
1573
1574 REQ_SEND;
1575}
1576
1577void
1267aio_busy (delay,callback=&PL_sv_undef) 1578aio_busy (delay,callback=&PL_sv_undef)
1268 double delay 1579 double delay
1269 SV * callback 1580 SV * callback
1270 PPCODE: 1581 PPCODE:
1271{ 1582{
1272 dREQ; 1583 dREQ;
1273 1584
1274 req->type = REQ_BUSY; 1585 req->type = REQ_BUSY;
1275 req->fd = delay < 0. ? 0 : delay; 1586 req->int1 = delay < 0. ? 0 : delay;
1276 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1587 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1277 1588
1278 REQ_SEND; 1589 REQ_SEND;
1279} 1590}
1280 1591
1281void 1592void
… …
1285 PPCODE: 1596 PPCODE:
1286{ 1597{
1287 dREQ; 1598 dREQ;
1288 1599
1289 req->type = REQ_GROUP; 1600 req->type = REQ_GROUP;
1601
1290 req_send (req); 1602 req_send (req);
1291
1292 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1603 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1293} 1604}
1294 1605
1295void 1606void
1296aio_nop (callback=&PL_sv_undef) 1607aio_nop (callback=&PL_sv_undef)
1297 SV * callback 1608 SV * callback
1298 PPCODE: 1609 PPCODE:
1299{ 1610{
1300 dREQ; 1611 dREQ;
1301 1612
1302 req->type = REQ_NOP; 1613 req->type = REQ_NOP;
1303 1614
1304 REQ_SEND; 1615 REQ_SEND;
1305} 1616}
1306 1617
1307void 1618int
1308aioreq_pri (int pri = DEFAULT_PRI) 1619aioreq_pri (int pri = 0)
1309 CODE: 1620 PROTOTYPE: ;$
1621 CODE:
1622 RETVAL = next_pri - PRI_BIAS;
1623 if (items > 0)
1624 {
1310 if (pri < PRI_MIN) pri = PRI_MIN; 1625 if (pri < PRI_MIN) pri = PRI_MIN;
1311 if (pri > PRI_MAX) pri = PRI_MAX; 1626 if (pri > PRI_MAX) pri = PRI_MAX;
1312 next_pri = pri + PRI_BIAS; 1627 next_pri = pri + PRI_BIAS;
1628 }
1629 OUTPUT:
1630 RETVAL
1313 1631
1314void 1632void
1315aioreq_nice (int nice = 0) 1633aioreq_nice (int nice = 0)
1316 CODE: 1634 CODE:
1317 nice = next_pri - nice; 1635 nice = next_pri - nice;
1318 if (nice < PRI_MIN) nice = PRI_MIN; 1636 if (nice < PRI_MIN) nice = PRI_MIN;
1319 if (nice > PRI_MAX) nice = PRI_MAX; 1637 if (nice > PRI_MAX) nice = PRI_MAX;
1320 next_pri = nice + PRI_BIAS; 1638 next_pri = nice + PRI_BIAS;
1321 1639
1322void 1640void
1323flush () 1641flush ()
1324 PROTOTYPE: 1642 PROTOTYPE:
1325 CODE: 1643 CODE:
1326 while (nreqs) 1644 while (nreqs)
1327 { 1645 {
1328 poll_wait (); 1646 poll_wait ();
1329 poll_cb (); 1647 poll_cb (0);
1330 } 1648 }
1331 1649
1332void 1650void
1333poll() 1651poll()
1334 PROTOTYPE: 1652 PROTOTYPE:
1335 CODE: 1653 CODE:
1336 if (nreqs) 1654 if (nreqs)
1337 { 1655 {
1338 poll_wait (); 1656 poll_wait ();
1339 poll_cb (); 1657 poll_cb (0);
1340 } 1658 }
1341 1659
1342int 1660int
1343poll_fileno() 1661poll_fileno()
1344 PROTOTYPE: 1662 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