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.74 by root, Wed Oct 25 17:57:30 2006 UTC vs.
Revision 1.94 by root, Sun Nov 26 18:28:37 2006 UTC

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

Diff Legend

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