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.78 by root, Thu Oct 26 14:35:34 2006 UTC vs.
Revision 1.102 by root, Sun Jun 3 09:44:17 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines