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.75 by root, Thu Oct 26 06:44:48 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
5# define _GNU_SOURCE
6#endif
7
8#define _REENTRANT 1
9 2
10#include <errno.h> 3#include <errno.h>
11 4
12#include "EXTERN.h" 5#include "EXTERN.h"
13#include "perl.h" 6#include "perl.h"
14#include "XSUB.h" 7#include "XSUB.h"
15 8
16#include "autoconf/config.h" 9#include "autoconf/config.h"
17 10
18#include <pthread.h>
19
20#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
21#include <errno.h> 13#include <errno.h>
22#include <sys/time.h> 14#include <sys/time.h>
23#include <sys/select.h> 15#include <sys/select.h>
24#include <sys/types.h> 16#include <sys/types.h>
25#include <sys/stat.h> 17#include <sys/stat.h>
26#include <limits.h> 18#include <limits.h>
27#include <unistd.h> 19#include <unistd.h>
28#include <fcntl.h> 20#include <fcntl.h>
29#include <signal.h> 21#include <signal.h>
30#include <sched.h> 22#include <sched.h>
23#include <utime.h>
31 24
32#if HAVE_SENDFILE 25#if HAVE_SENDFILE
33# if __linux 26# if __linux
34# include <sys/sendfile.h> 27# include <sys/sendfile.h>
35# elif __freebsd 28# elif __freebsd
42# else 35# else
43# error sendfile support requested but not available 36# error sendfile support requested but not available
44# endif 37# endif
45#endif 38#endif
46 39
40/* number of seconds after which idle threads exit */
41#define IDLE_TIMEOUT 10
42
47/* used for struct dirent, AIX doesn't provide it */ 43/* used for struct dirent, AIX doesn't provide it */
48#ifndef NAME_MAX 44#ifndef NAME_MAX
49# define NAME_MAX 4096 45# define NAME_MAX 4096
50#endif 46#endif
51 47
52#ifndef PTHREAD_STACK_MIN
53/* care for broken platforms, e.g. windows */
54# define PTHREAD_STACK_MIN 16384
55#endif
56
57#if __ia64
58# define STACKSIZE 65536
59#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
60# define STACKSIZE PTHREAD_STACK_MIN
61#else
62# define STACKSIZE 16384
63#endif
64
65/* buffer size for various temporary buffers */ 48/* buffer size for various temporary buffers */
66#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
67 57
68#define dBUF \ 58#define dBUF \
69 char *aio_buf; \ 59 char *aio_buf; \
70 LOCK (wrklock); \ 60 LOCK (wrklock); \
71 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 61 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
72 UNLOCK (wrklock); \ 62 UNLOCK (wrklock); \
73 if (!aio_buf) \ 63 if (!aio_buf) \
74 return -1; 64 return -1;
75 65
66typedef SV SV8; /* byte-sv, used for argument-checking */
67
76enum { 68enum {
77 REQ_QUIT, 69 REQ_QUIT,
78 REQ_OPEN, REQ_CLOSE, 70 REQ_OPEN, REQ_CLOSE,
79 REQ_READ, REQ_WRITE, REQ_READAHEAD, 71 REQ_READ, REQ_WRITE,
80 REQ_SENDFILE, 72 REQ_READAHEAD, REQ_SENDFILE,
81 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,
82 REQ_FSYNC, REQ_FDATASYNC, 77 REQ_FSYNC, REQ_FDATASYNC,
83 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 78 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
84 REQ_READDIR, 79 REQ_MKNOD, REQ_READDIR,
85 REQ_LINK, REQ_SYMLINK, 80 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
86 REQ_GROUP, REQ_NOP, 81 REQ_GROUP, REQ_NOP,
87 REQ_BUSY, 82 REQ_BUSY,
88}; 83};
89 84
90#define AIO_REQ_KLASS "IO::AIO::REQ" 85#define AIO_REQ_KLASS "IO::AIO::REQ"
92 87
93typedef struct aio_cb 88typedef struct aio_cb
94{ 89{
95 struct aio_cb *volatile next; 90 struct aio_cb *volatile next;
96 91
97 SV *data, *callback; 92 SV *callback;
98 SV *fh, *fh2; 93 SV *sv1, *sv2;
99 void *dataptr, *data2ptr; 94 void *ptr1, *ptr2;
100 Stat_t *statdata;
101 off_t offset; 95 off_t offs;
102 size_t length; 96 size_t size;
103 ssize_t result; 97 ssize_t result;
98 double nv1, nv2;
104 99
105 STRLEN dataoffset; 100 STRLEN stroffset;
106 int type; 101 int type;
107 int fd, fd2; 102 int int1, int2, int3;
108 int errorno; 103 int errorno;
109 mode_t mode; /* open */ 104 mode_t mode; /* open */
110 105
111 unsigned char flags; 106 unsigned char flags;
112 unsigned char pri; 107 unsigned char pri;
114 SV *self; /* the perl counterpart of this request, if any */ 109 SV *self; /* the perl counterpart of this request, if any */
115 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
116} aio_cb; 111} aio_cb;
117 112
118enum { 113enum {
119 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) */
120}; 117};
121 118
122typedef aio_cb *aio_req; 119typedef aio_cb *aio_req;
123typedef aio_cb *aio_req_ornot; 120typedef aio_cb *aio_req_ornot;
124 121
129 DEFAULT_PRI = 0, 126 DEFAULT_PRI = 0,
130 PRI_BIAS = -PRI_MIN, 127 PRI_BIAS = -PRI_MIN,
131 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 128 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
132}; 129};
133 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
134static int next_pri = DEFAULT_PRI + PRI_BIAS; 177static int next_pri = DEFAULT_PRI + PRI_BIAS;
135 178
136static int started, wanted; 179static unsigned int started, idle, wanted;
137static volatile int nreqs;
138static int respipe [2];
139 180
140#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
141# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
142#else
143# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
144#endif
145
146#define LOCK(mutex) pthread_mutex_lock (&(mutex))
147#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
148
149/* worker threasd management */ 181/* worker threads management */
150static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 182static mutex_t wrklock = MUTEX_INIT;
151 183
152typedef struct worker { 184typedef struct worker {
153 /* locked by wrklock */ 185 /* locked by wrklock */
154 struct worker *prev, *next; 186 struct worker *prev, *next;
155 187
156 pthread_t tid; 188 thread_t tid;
157 189
158 /* locked by reslock, reqlock or wrklock */ 190 /* locked by reslock, reqlock or wrklock */
159 aio_req req; /* currently processed request */ 191 aio_req req; /* currently processed request */
160 void *dbuf; 192 void *dbuf;
161 DIR *dirp; 193 DIR *dirp;
184 wrk->prev->next = wrk->next; 216 wrk->prev->next = wrk->next;
185 217
186 free (wrk); 218 free (wrk);
187} 219}
188 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
189static pthread_mutex_t reslock = AIO_MUTEX_INIT; 226static mutex_t reslock = MUTEX_INIT;
190static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 227static mutex_t reqlock = MUTEX_INIT;
191static 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
192 272
193/* 273/*
194 * a somewhat faster data structure might be nice, but 274 * a somewhat faster data structure might be nice, but
195 * with 8 priorities this actually needs <20 insns 275 * with 8 priorities this actually needs <20 insns
196 * per shift, the most expensive operation. 276 * per shift, the most expensive operation.
243 323
244 abort (); 324 abort ();
245} 325}
246 326
247static int poll_cb (); 327static int poll_cb ();
248static void req_invoke (aio_req req); 328static int req_invoke (aio_req req);
249static void req_free (aio_req req); 329static void req_destroy (aio_req req);
250static void req_cancel (aio_req req); 330static void req_cancel (aio_req req);
251 331
252/* must be called at most once */ 332/* must be called at most once */
253static SV *req_sv (aio_req req, const char *klass) 333static SV *req_sv (aio_req req, const char *klass)
254{ 334{
273 return mg ? (aio_req)mg->mg_ptr : 0; 353 return mg ? (aio_req)mg->mg_ptr : 0;
274} 354}
275 355
276static void aio_grp_feed (aio_req grp) 356static void aio_grp_feed (aio_req grp)
277{ 357{
358 block_sig ();
359
278 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 360 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
279 { 361 {
280 int old_len = grp->length; 362 int old_len = grp->size;
281 363
282 if (grp->fh2 && SvOK (grp->fh2)) 364 if (grp->sv2 && SvOK (grp->sv2))
283 { 365 {
284 dSP; 366 dSP;
285 367
286 ENTER; 368 ENTER;
287 SAVETMPS; 369 SAVETMPS;
288 PUSHMARK (SP); 370 PUSHMARK (SP);
289 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 371 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
290 PUTBACK; 372 PUTBACK;
291 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 373 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
292 SPAGAIN; 374 SPAGAIN;
293 FREETMPS; 375 FREETMPS;
294 LEAVE; 376 LEAVE;
295 } 377 }
296 378
297 /* stop if no progress has been made */ 379 /* stop if no progress has been made */
298 if (old_len == grp->length) 380 if (old_len == grp->size)
299 { 381 {
300 SvREFCNT_dec (grp->fh2); 382 SvREFCNT_dec (grp->sv2);
301 grp->fh2 = 0; 383 grp->sv2 = 0;
302 break; 384 break;
303 } 385 }
304 } 386 }
387
388 unblock_sig ();
305} 389}
306 390
307static void aio_grp_dec (aio_req grp) 391static void aio_grp_dec (aio_req grp)
308{ 392{
309 --grp->length; 393 --grp->size;
310 394
311 /* call feeder, if applicable */ 395 /* call feeder, if applicable */
312 aio_grp_feed (grp); 396 aio_grp_feed (grp);
313 397
314 /* finish, if done */ 398 /* finish, if done */
315 if (!grp->length && grp->fd) 399 if (!grp->size && grp->int1)
316 { 400 {
401 block_sig ();
402
317 req_invoke (grp); 403 if (!req_invoke (grp))
404 {
405 req_destroy (grp);
406 unblock_sig ();
407 croak (0);
408 }
409
318 req_free (grp); 410 req_destroy (grp);
411 unblock_sig ();
319 } 412 }
320} 413}
321 414
322static void poll_wait ()
323{
324 fd_set rfd;
325
326 while (nreqs)
327 {
328 int size;
329#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
330 LOCK (reslock);
331#endif
332 size = res_queue.size;
333#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
334 UNLOCK (reslock);
335#endif
336
337 if (size)
338 return;
339
340 FD_ZERO(&rfd);
341 FD_SET(respipe [0], &rfd);
342
343 select (respipe [0] + 1, &rfd, 0, 0, 0);
344 }
345}
346
347static void req_invoke (aio_req req) 415static int req_invoke (aio_req req)
348{ 416{
349 dSP; 417 dSP;
418
419 if (req->flags & FLAG_SV2_RO_OFF)
420 SvREADONLY_off (req->sv2);
350 421
351 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 422 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
352 { 423 {
353 errno = req->errorno;
354
355 ENTER; 424 ENTER;
356 SAVETMPS; 425 SAVETMPS;
357 PUSHMARK (SP); 426 PUSHMARK (SP);
358 EXTEND (SP, 1); 427 EXTEND (SP, 1);
359 428
364 SV *rv = &PL_sv_undef; 433 SV *rv = &PL_sv_undef;
365 434
366 if (req->result >= 0) 435 if (req->result >= 0)
367 { 436 {
368 int i; 437 int i;
369 char *buf = req->data2ptr; 438 char *buf = req->ptr2;
370 AV *av = newAV (); 439 AV *av = newAV ();
371 440
372 av_extend (av, req->result - 1); 441 av_extend (av, req->result - 1);
373 442
374 for (i = 0; i < req->result; ++i) 443 for (i = 0; i < req->result; ++i)
394 PUSHs (sv_2mortal (newSViv (req->result))); 463 PUSHs (sv_2mortal (newSViv (req->result)));
395 PUTBACK; 464 PUTBACK;
396 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 465 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
397 SPAGAIN; 466 SPAGAIN;
398 467
399 fh = SvREFCNT_inc (POPs); 468 fh = POPs;
400
401 PUSHMARK (SP); 469 PUSHMARK (SP);
402 XPUSHs (sv_2mortal (fh)); 470 XPUSHs (fh);
403 } 471 }
404 break; 472 break;
405 473
406 case REQ_GROUP: 474 case REQ_GROUP:
407 req->fd = 2; /* mark group as finished */ 475 req->int1 = 2; /* mark group as finished */
408 476
409 if (req->data) 477 if (req->sv1)
410 { 478 {
411 int i; 479 int i;
412 AV *av = (AV *)req->data; 480 AV *av = (AV *)req->sv1;
413 481
414 EXTEND (SP, AvFILL (av) + 1); 482 EXTEND (SP, AvFILL (av) + 1);
415 for (i = 0; i <= AvFILL (av); ++i) 483 for (i = 0; i <= AvFILL (av); ++i)
416 PUSHs (*av_fetch (av, i, 0)); 484 PUSHs (*av_fetch (av, i, 0));
417 } 485 }
419 487
420 case REQ_NOP: 488 case REQ_NOP:
421 case REQ_BUSY: 489 case REQ_BUSY:
422 break; 490 break;
423 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
424 default: 516 default:
425 PUSHs (sv_2mortal (newSViv (req->result))); 517 PUSHs (sv_2mortal (newSViv (req->result)));
426 break; 518 break;
427 } 519 }
428 520
521 errno = req->errorno;
429 522
430 PUTBACK; 523 PUTBACK;
431 call_sv (req->callback, G_VOID | G_EVAL); 524 call_sv (req->callback, G_VOID | G_EVAL);
432 SPAGAIN; 525 SPAGAIN;
433 526
447 grp->grp_first = req->grp_next; 540 grp->grp_first = req->grp_next;
448 541
449 aio_grp_dec (grp); 542 aio_grp_dec (grp);
450 } 543 }
451 544
452 if (SvTRUE (ERRSV)) 545 return !SvTRUE (ERRSV);
453 {
454 req_free (req);
455 croak (0);
456 }
457} 546}
458 547
459static void req_free (aio_req req) 548static void req_destroy (aio_req req)
460{ 549{
461 if (req->self) 550 if (req->self)
462 { 551 {
463 sv_unmagic (req->self, PERL_MAGIC_ext); 552 sv_unmagic (req->self, PERL_MAGIC_ext);
464 SvREFCNT_dec (req->self); 553 SvREFCNT_dec (req->self);
465 } 554 }
466 555
467 SvREFCNT_dec (req->data);
468 SvREFCNT_dec (req->fh); 556 SvREFCNT_dec (req->sv1);
469 SvREFCNT_dec (req->fh2); 557 SvREFCNT_dec (req->sv2);
470 SvREFCNT_dec (req->callback); 558 SvREFCNT_dec (req->callback);
471 Safefree (req->statdata);
472 559
473 if (req->type == REQ_READDIR) 560 if (req->flags & FLAG_PTR2_FREE)
474 free (req->data2ptr); 561 free (req->ptr2);
475 562
476 Safefree (req); 563 Safefree (req);
477} 564}
478 565
479static void req_cancel_subs (aio_req grp) 566static void req_cancel_subs (aio_req grp)
481 aio_req sub; 568 aio_req sub;
482 569
483 if (grp->type != REQ_GROUP) 570 if (grp->type != REQ_GROUP)
484 return; 571 return;
485 572
486 SvREFCNT_dec (grp->fh2); 573 SvREFCNT_dec (grp->sv2);
487 grp->fh2 = 0; 574 grp->sv2 = 0;
488 575
489 for (sub = grp->grp_first; sub; sub = sub->grp_next) 576 for (sub = grp->grp_first; sub; sub = sub->grp_next)
490 req_cancel (sub); 577 req_cancel (sub);
491} 578}
492 579
495 req->flags |= FLAG_CANCELLED; 582 req->flags |= FLAG_CANCELLED;
496 583
497 req_cancel_subs (req); 584 req_cancel_subs (req);
498} 585}
499 586
500static int poll_cb ()
501{
502 dSP;
503 int count = 0;
504 int do_croak = 0;
505 aio_req req;
506
507 for (;;)
508 {
509 LOCK (reslock);
510 req = reqq_shift (&res_queue);
511
512 if (req)
513 {
514 if (!res_queue.size)
515 {
516 /* read any signals sent by the worker threads */
517 char buf [32];
518 while (read (respipe [0], buf, 32) == 32)
519 ;
520 }
521 }
522
523 UNLOCK (reslock);
524
525 if (!req)
526 break;
527
528 --nreqs;
529
530 if (req->type == REQ_QUIT)
531 started--;
532 else if (req->type == REQ_GROUP && req->length)
533 {
534 req->fd = 1; /* mark request as delayed */
535 continue;
536 }
537 else
538 {
539 if (req->type == REQ_READ)
540 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
541
542 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
543 SvREADONLY_off (req->data);
544
545 if (req->statdata)
546 {
547 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
548 PL_laststatval = req->result;
549 PL_statcache = *(req->statdata);
550 }
551
552 req_invoke (req);
553
554 count++;
555 }
556
557 req_free (req);
558 }
559
560 return count;
561}
562
563static void *aio_proc(void *arg); 587static void *aio_proc (void *arg);
564 588
565static void start_thread (void) 589static void start_thread (void)
566{ 590{
567 sigset_t fullsigset, oldsigset;
568 pthread_attr_t attr;
569
570 worker *wrk = calloc (1, sizeof (worker)); 591 worker *wrk = calloc (1, sizeof (worker));
571 592
572 if (!wrk) 593 if (!wrk)
573 croak ("unable to allocate worker thread data"); 594 croak ("unable to allocate worker thread data");
574 595
575 pthread_attr_init (&attr);
576 pthread_attr_setstacksize (&attr, STACKSIZE);
577 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
578
579 sigfillset (&fullsigset);
580
581 LOCK (wrklock); 596 LOCK (wrklock);
582 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
583 597
584 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 598 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
585 { 599 {
586 wrk->prev = &wrk_first; 600 wrk->prev = &wrk_first;
587 wrk->next = wrk_first.next; 601 wrk->next = wrk_first.next;
588 wrk_first.next->prev = wrk; 602 wrk_first.next->prev = wrk;
589 wrk_first.next = wrk; 603 wrk_first.next = wrk;
590 started++; 604 ++started;
591 } 605 }
592 else 606 else
593 free (wrk); 607 free (wrk);
594 608
595 sigprocmask (SIG_SETMASK, &oldsigset, 0);
596 UNLOCK (wrklock); 609 UNLOCK (wrklock);
597} 610}
598 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
599static void req_send (aio_req req) 624static void req_send (aio_req req)
600{ 625{
601 while (started < wanted && nreqs >= started) 626 block_sig ();
602 start_thread ();
603 627
604 ++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;
605 649
606 LOCK (reqlock); 650 LOCK (reqlock);
607 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
608 pthread_cond_signal (&reqwait); 652 COND_SIGNAL (reqwait);
609 UNLOCK (reqlock); 653 UNLOCK (reqlock);
610}
611 654
612static void end_thread (void) 655 LOCK (wrklock);
613{ 656 --started;
614 aio_req req; 657 UNLOCK (wrklock);
658}
615 659
616 Newz (0, req, 1, aio_cb); 660static void set_max_idle (int nthreads)
617 661{
618 req->type = REQ_QUIT; 662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
619 req->pri = PRI_MAX + PRI_BIAS; 663 max_idle = nthreads <= 0 ? 1 : nthreads;
620 664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
621 req_send (req);
622} 665}
623 666
624static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
625{ 668{
626 if (wanted < nthreads) 669 if (wanted < nthreads)
627 wanted = nthreads; 670 wanted = nthreads;
628} 671}
629 672
630static void max_parallel (int nthreads) 673static void max_parallel (int nthreads)
631{ 674{
632 int cur = started;
633
634 if (wanted > nthreads) 675 if (wanted > nthreads)
635 wanted = nthreads; 676 wanted = nthreads;
636 677
637 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)
638 { 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
639 end_thread (); 696 maybe_start_thread ();
640 cur--; 697
698 FD_ZERO(&rfd);
699 FD_SET(respipe [0], &rfd);
700
701 select (respipe [0] + 1, &rfd, 0, 0, 0);
641 } 702 }
703}
642 704
643 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 (;;)
644 { 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
645 poll_wait (); 782 poll_wait ();
646 poll_cb (); 783
784 ++maxreqs;
647 } 785 }
786
787 unblock_sig ();
788 return count;
648} 789}
649 790
650static void create_pipe () 791static void create_pipe ()
651{ 792{
652 if (pipe (respipe)) 793 if (pipe (respipe))
669/* 810/*
670 * make our pread/pwrite safe against themselves, but not against 811 * make our pread/pwrite safe against themselves, but not against
671 * 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,
672 * but that's your problem, not mine. 813 * but that's your problem, not mine.
673 */ 814 */
674static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 815static mutex_t preadwritelock = MUTEX_INIT;
675 816
676static 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)
677{ 818{
678 ssize_t res; 819 ssize_t res;
679 off_t ooffset; 820 off_t ooffset;
702 843
703 return res; 844 return res;
704} 845}
705#endif 846#endif
706 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
707#if !HAVE_FDATASYNC 876#if !HAVE_FDATASYNC
708# define fdatasync fsync 877# define fdatasync fsync
709#endif 878#endif
710 879
711#if !HAVE_READAHEAD 880#if !HAVE_READAHEAD
730#endif 899#endif
731 900
732#if !HAVE_READDIR_R 901#if !HAVE_READDIR_R
733# define readdir_r aio_readdir_r 902# define readdir_r aio_readdir_r
734 903
735static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 904static mutex_t readdirlock = MUTEX_INIT;
736 905
737static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 906static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
738{ 907{
739 struct dirent *e; 908 struct dirent *e;
740 int errorno; 909 int errorno;
779 { 948 {
780 off_t sbytes; 949 off_t sbytes;
781 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 950 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
782 951
783 if (res < 0 && sbytes) 952 if (res < 0 && sbytes)
784 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 953 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
785 res = sbytes; 954 res = sbytes;
786 } 955 }
787 956
788# elif __hpux 957# elif __hpux
789 res = sendfile (ofd, ifd, offset, count, 0, 0); 958 res = sendfile (ofd, ifd, offset, count, 0, 0);
867 int memofs = 0; 1036 int memofs = 0;
868 int res = 0; 1037 int res = 0;
869 int errorno; 1038 int errorno;
870 1039
871 LOCK (wrklock); 1040 LOCK (wrklock);
872 self->dirp = dirp = opendir (req->dataptr); 1041 self->dirp = dirp = opendir (req->ptr1);
873 self->dbuf = u = malloc (sizeof (*u)); 1042 self->dbuf = u = malloc (sizeof (*u));
1043 req->flags |= FLAG_PTR2_FREE;
1044 req->ptr2 = names = malloc (memlen);
874 UNLOCK (wrklock); 1045 UNLOCK (wrklock);
875
876 req->data2ptr = names = malloc (memlen);
877 1046
878 if (dirp && u && names) 1047 if (dirp && u && names)
879 for (;;) 1048 for (;;)
880 { 1049 {
881 errno = 0; 1050 errno = 0;
894 1063
895 while (memofs + len > memlen) 1064 while (memofs + len > memlen)
896 { 1065 {
897 memlen *= 2; 1066 memlen *= 2;
898 LOCK (wrklock); 1067 LOCK (wrklock);
899 req->data2ptr = names = realloc (names, memlen); 1068 req->ptr2 = names = realloc (names, memlen);
900 UNLOCK (wrklock); 1069 UNLOCK (wrklock);
901 1070
902 if (!names) 1071 if (!names)
903 break; 1072 break;
904 } 1073 }
917/*****************************************************************************/ 1086/*****************************************************************************/
918 1087
919static void *aio_proc (void *thr_arg) 1088static void *aio_proc (void *thr_arg)
920{ 1089{
921 aio_req req; 1090 aio_req req;
922 int type; 1091 struct timespec ts;
923 worker *self = (worker *)thr_arg; 1092 worker *self = (worker *)thr_arg;
924 1093
925 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 (;;)
926 { 1099 {
1100 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1101
927 LOCK (reqlock); 1102 LOCK (reqlock);
928 1103
929 for (;;) 1104 for (;;)
930 { 1105 {
931 self->req = req = reqq_shift (&req_queue); 1106 self->req = req = reqq_shift (&req_queue);
932 1107
933 if (req) 1108 if (req)
934 break; 1109 break;
935 1110
936 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;
937 } 1132 }
1133
1134 --nready;
938 1135
939 UNLOCK (reqlock); 1136 UNLOCK (reqlock);
940 1137
941 errno = 0; /* strictly unnecessary */ 1138 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
943 1139
944 if (!(req->flags & FLAG_CANCELLED)) 1140 if (!(req->flags & FLAG_CANCELLED))
945 switch (type) 1141 switch (req->type)
946 { 1142 {
947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1143 case REQ_READ: req->result = req->offs >= 0
948 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;
949 1149
950 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;
951 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;
952 1152
953 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;
954 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;
955 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;
956 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
957 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;
958 case REQ_CLOSE: req->result = close (req->fd); break; 1163 case REQ_CLOSE: req->result = close (req->int1); break;
959 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1164 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
960 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;
961 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1167 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1168 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
963 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;
964 1172
965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1173 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
966 case REQ_FSYNC: req->result = fsync (req->fd); break; 1174 case REQ_FSYNC: req->result = fsync (req->int1); break;
967 case REQ_READDIR: scandir_ (req, self); break; 1175 case REQ_READDIR: scandir_ (req, self); break;
968 1176
969 case REQ_BUSY: 1177 case REQ_BUSY:
970 { 1178 {
971 struct timeval tv; 1179 struct timeval tv;
972 1180
973 tv.tv_sec = req->fd; 1181 tv.tv_sec = req->nv1;
974 tv.tv_usec = req->fd2; 1182 tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.;
975 1183
976 req->result = select (0, 0, 0, 0, &tv); 1184 req->result = select (0, 0, 0, 0, &tv);
977 } 1185 }
978 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
979 case REQ_GROUP: 1211 case REQ_GROUP:
980 case REQ_NOP: 1212 case REQ_NOP:
1213 break;
1214
981 case REQ_QUIT: 1215 case REQ_QUIT:
982 break; 1216 goto quit;
983 1217
984 default: 1218 default:
985 req->result = ENOSYS; 1219 req->result = -1;
986 break; 1220 break;
987 } 1221 }
988 1222
989 req->errorno = errno; 1223 req->errorno = errno;
990 1224
991 LOCK (reslock); 1225 LOCK (reslock);
992 1226
1227 ++npending;
1228
993 if (!reqq_push (&res_queue, req)) 1229 if (!reqq_push (&res_queue, req))
1230 {
994 /* write a dummy byte to the pipe so fh becomes ready */ 1231 /* write a dummy byte to the pipe so fh becomes ready */
995 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 }
996 1238
997 self->req = 0; 1239 self->req = 0;
998 worker_clear (self); 1240 worker_clear (self);
999 1241
1000 UNLOCK (reslock); 1242 UNLOCK (reslock);
1001 } 1243 }
1002 while (type != REQ_QUIT);
1003 1244
1245quit:
1004 LOCK (wrklock); 1246 LOCK (wrklock);
1005 worker_free (self); 1247 worker_free (self);
1006 UNLOCK (wrklock); 1248 UNLOCK (wrklock);
1007 1249
1008 return 0; 1250 return 0;
1039static void atfork_child (void) 1281static void atfork_child (void)
1040{ 1282{
1041 aio_req prv; 1283 aio_req prv;
1042 1284
1043 while (prv = reqq_shift (&req_queue)) 1285 while (prv = reqq_shift (&req_queue))
1044 req_free (prv); 1286 req_destroy (prv);
1045 1287
1046 while (prv = reqq_shift (&res_queue)) 1288 while (prv = reqq_shift (&res_queue))
1047 req_free (prv); 1289 req_destroy (prv);
1048 1290
1049 while (wrk_first.next != &wrk_first) 1291 while (wrk_first.next != &wrk_first)
1050 { 1292 {
1051 worker *wrk = wrk_first.next; 1293 worker *wrk = wrk_first.next;
1052 1294
1053 if (wrk->req) 1295 if (wrk->req)
1054 req_free (wrk->req); 1296 req_destroy (wrk->req);
1055 1297
1056 worker_clear (wrk); 1298 worker_clear (wrk);
1057 worker_free (wrk); 1299 worker_free (wrk);
1058 } 1300 }
1059 1301
1060 started = 0; 1302 started = 0;
1303 idle = 0;
1061 nreqs = 0; 1304 nreqs = 0;
1305 nready = 0;
1306 npending = 0;
1062 1307
1063 close (respipe [0]); 1308 close (respipe [0]);
1064 close (respipe [1]); 1309 close (respipe [1]);
1065 create_pipe (); 1310 create_pipe ();
1066 1311
1093PROTOTYPES: ENABLE 1338PROTOTYPES: ENABLE
1094 1339
1095BOOT: 1340BOOT:
1096{ 1341{
1097 HV *stash = gv_stashpv ("IO::AIO", 1); 1342 HV *stash = gv_stashpv ("IO::AIO", 1);
1343
1098 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1344 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1099 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1345 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1100 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));
1101 1351
1102 create_pipe (); 1352 create_pipe ();
1103 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1353 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1104} 1354}
1105 1355
1106void 1356void
1107min_parallel (nthreads) 1357max_poll_reqs (int nreqs)
1108 int nthreads
1109 PROTOTYPE: $ 1358 PROTOTYPE: $
1359 CODE:
1360 max_poll_reqs = nreqs;
1110 1361
1111void 1362void
1112max_parallel (nthreads) 1363max_poll_time (double nseconds)
1113 int nthreads
1114 PROTOTYPE: $ 1364 PROTOTYPE: $
1365 CODE:
1366 max_poll_time = nseconds * AIO_TICKS;
1115 1367
1116void 1368void
1369min_parallel (int nthreads)
1370 PROTOTYPE: $
1371
1372void
1373max_parallel (int nthreads)
1374 PROTOTYPE: $
1375
1376void
1377max_idle (int nthreads)
1378 PROTOTYPE: $
1379 CODE:
1380 set_max_idle (nthreads);
1381
1382int
1383max_outstanding (int maxreqs)
1384 PROTOTYPE: $
1385 CODE:
1386 RETVAL = max_outstanding;
1387 max_outstanding = maxreqs;
1388 OUTPUT:
1389 RETVAL
1390
1391void
1117aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1392aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1118 SV * pathname
1119 int flags
1120 int mode
1121 SV * callback
1122 PROTOTYPE: $$$;$ 1393 PROTOTYPE: $$$;$
1123 PPCODE: 1394 PPCODE:
1124{ 1395{
1125 dREQ; 1396 dREQ;
1126 1397
1127 req->type = REQ_OPEN; 1398 req->type = REQ_OPEN;
1128 req->data = newSVsv (pathname); 1399 req->sv1 = newSVsv (pathname);
1129 req->dataptr = SvPVbyte_nolen (req->data); 1400 req->ptr1 = SvPVbyte_nolen (req->sv1);
1130 req->fd = flags; 1401 req->int1 = flags;
1131 req->mode = mode; 1402 req->mode = mode;
1132 1403
1133 REQ_SEND; 1404 REQ_SEND;
1134} 1405}
1135 1406
1136void 1407void
1137aio_close (fh,callback=&PL_sv_undef) 1408aio_close (SV *fh, SV *callback=&PL_sv_undef)
1138 SV * fh
1139 SV * callback
1140 PROTOTYPE: $;$ 1409 PROTOTYPE: $;$
1141 ALIAS: 1410 ALIAS:
1142 aio_close = REQ_CLOSE 1411 aio_close = REQ_CLOSE
1143 aio_fsync = REQ_FSYNC 1412 aio_fsync = REQ_FSYNC
1144 aio_fdatasync = REQ_FDATASYNC 1413 aio_fdatasync = REQ_FDATASYNC
1145 PPCODE: 1414 PPCODE:
1146{ 1415{
1147 dREQ; 1416 dREQ;
1148 1417
1149 req->type = ix; 1418 req->type = ix;
1150 req->fh = newSVsv (fh); 1419 req->sv1 = newSVsv (fh);
1151 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1420 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1152 1421
1153 REQ_SEND (req); 1422 REQ_SEND (req);
1154} 1423}
1155 1424
1156void 1425void
1157aio_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)
1158 SV * fh
1159 UV offset
1160 UV length
1161 SV * data
1162 UV dataoffset
1163 SV * callback
1164 ALIAS: 1427 ALIAS:
1165 aio_read = REQ_READ 1428 aio_read = REQ_READ
1166 aio_write = REQ_WRITE 1429 aio_write = REQ_WRITE
1167 PROTOTYPE: $$$$$;$ 1430 PROTOTYPE: $$$$$;$
1168 PPCODE: 1431 PPCODE:
1169{ 1432{
1170 aio_req req;
1171 STRLEN svlen; 1433 STRLEN svlen;
1172 char *svptr = SvPVbyte (data, svlen); 1434 char *svptr = SvPVbyte (data, svlen);
1435 UV len = SvUV (length);
1173 1436
1174 SvUPGRADE (data, SVt_PV); 1437 SvUPGRADE (data, SVt_PV);
1175 SvPOK_on (data); 1438 SvPOK_on (data);
1176 1439
1177 if (dataoffset < 0) 1440 if (dataoffset < 0)
1178 dataoffset += svlen; 1441 dataoffset += svlen;
1179 1442
1180 if (dataoffset < 0 || dataoffset > svlen) 1443 if (dataoffset < 0 || dataoffset > svlen)
1181 croak ("data offset outside of string"); 1444 croak ("dataoffset outside of data scalar");
1182 1445
1183 if (ix == REQ_WRITE) 1446 if (ix == REQ_WRITE)
1184 { 1447 {
1185 /* write: check length and adjust. */ 1448 /* write: check length and adjust. */
1186 if (length < 0 || length + dataoffset > svlen) 1449 if (!SvOK (length) || len + dataoffset > svlen)
1187 length = svlen - dataoffset; 1450 len = svlen - dataoffset;
1188 } 1451 }
1189 else 1452 else
1190 { 1453 {
1191 /* read: grow scalar as necessary */ 1454 /* read: grow scalar as necessary */
1192 svptr = SvGROW (data, length + dataoffset); 1455 svptr = SvGROW (data, len + dataoffset + 1);
1193 } 1456 }
1194 1457
1195 if (length < 0) 1458 if (len < 0)
1196 croak ("length must not be negative"); 1459 croak ("length must not be negative");
1197 1460
1198 { 1461 {
1199 dREQ; 1462 dREQ;
1200 1463
1201 req->type = ix; 1464 req->type = ix;
1202 req->fh = newSVsv (fh); 1465 req->sv1 = newSVsv (fh);
1203 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1466 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1204 : IoOFP (sv_2io (fh))); 1467 : IoOFP (sv_2io (fh)));
1468 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1205 req->offset = offset; 1469 req->size = len;
1206 req->length = length;
1207 req->data = SvREFCNT_inc (data); 1470 req->sv2 = SvREFCNT_inc (data);
1208 req->dataptr = (char *)svptr + dataoffset; 1471 req->ptr1 = (char *)svptr + dataoffset;
1472 req->stroffset = dataoffset;
1209 1473
1210 if (!SvREADONLY (data)) 1474 if (!SvREADONLY (data))
1211 { 1475 {
1212 SvREADONLY_on (data); 1476 SvREADONLY_on (data);
1213 req->data2ptr = (void *)data; 1477 req->flags |= FLAG_SV2_RO_OFF;
1214 } 1478 }
1215 1479
1216 REQ_SEND; 1480 REQ_SEND;
1217 } 1481 }
1218} 1482}
1219 1483
1220void 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
1221aio_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)
1222 SV * out_fh
1223 SV * in_fh
1224 UV in_offset
1225 UV length
1226 SV * callback
1227 PROTOTYPE: $$$$;$ 1506 PROTOTYPE: $$$$;$
1228 PPCODE: 1507 PPCODE:
1229{ 1508{
1230 dREQ; 1509 dREQ;
1231 1510
1232 req->type = REQ_SENDFILE; 1511 req->type = REQ_SENDFILE;
1233 req->fh = newSVsv (out_fh); 1512 req->sv1 = newSVsv (out_fh);
1234 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1235 req->fh2 = newSVsv (in_fh); 1514 req->sv2 = newSVsv (in_fh);
1236 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1515 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1237 req->offset = in_offset; 1516 req->offs = SvVAL64 (in_offset);
1238 req->length = length; 1517 req->size = length;
1239 1518
1240 REQ_SEND; 1519 REQ_SEND;
1241} 1520}
1242 1521
1243void 1522void
1244aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1523aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1245 SV * fh
1246 UV offset
1247 IV length
1248 SV * callback
1249 PROTOTYPE: $$$;$ 1524 PROTOTYPE: $$$;$
1250 PPCODE: 1525 PPCODE:
1251{ 1526{
1252 dREQ; 1527 dREQ;
1253 1528
1254 req->type = REQ_READAHEAD; 1529 req->type = REQ_READAHEAD;
1255 req->fh = newSVsv (fh); 1530 req->sv1 = newSVsv (fh);
1256 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1531 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1257 req->offset = offset; 1532 req->offs = SvVAL64 (offset);
1258 req->length = length; 1533 req->size = length;
1259 1534
1260 REQ_SEND; 1535 REQ_SEND;
1261} 1536}
1262 1537
1263void 1538void
1264aio_stat (fh_or_path,callback=&PL_sv_undef) 1539aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1265 SV * fh_or_path
1266 SV * callback
1267 ALIAS: 1540 ALIAS:
1268 aio_stat = REQ_STAT 1541 aio_stat = REQ_STAT
1269 aio_lstat = REQ_LSTAT 1542 aio_lstat = REQ_LSTAT
1270 PPCODE: 1543 PPCODE:
1271{ 1544{
1272 dREQ; 1545 dREQ;
1273 1546
1274 New (0, req->statdata, 1, Stat_t); 1547 req->ptr2 = malloc (sizeof (Stat_t));
1275 if (!req->statdata) 1548 if (!req->ptr2)
1276 { 1549 {
1277 req_free (req); 1550 req_destroy (req);
1278 croak ("out of memory during aio_req->statdata allocation"); 1551 croak ("out of memory during aio_stat statdata allocation");
1279 } 1552 }
1553
1554 req->flags |= FLAG_PTR2_FREE;
1555 req->sv1 = newSVsv (fh_or_path);
1280 1556
1281 if (SvPOK (fh_or_path)) 1557 if (SvPOK (fh_or_path))
1282 { 1558 {
1283 req->type = ix; 1559 req->type = ix;
1284 req->data = newSVsv (fh_or_path);
1285 req->dataptr = SvPVbyte_nolen (req->data); 1560 req->ptr1 = SvPVbyte_nolen (req->sv1);
1286 } 1561 }
1287 else 1562 else
1288 { 1563 {
1289 req->type = REQ_FSTAT; 1564 req->type = REQ_FSTAT;
1290 req->fh = newSVsv (fh_or_path);
1291 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 } 1566 }
1293 1567
1294 REQ_SEND; 1568 REQ_SEND;
1295} 1569}
1296 1570
1297void 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
1298aio_unlink (pathname,callback=&PL_sv_undef) 1643aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1299 SV * pathname
1300 SV * callback
1301 ALIAS: 1644 ALIAS:
1302 aio_unlink = REQ_UNLINK 1645 aio_unlink = REQ_UNLINK
1303 aio_rmdir = REQ_RMDIR 1646 aio_rmdir = REQ_RMDIR
1304 aio_readdir = REQ_READDIR 1647 aio_readdir = REQ_READDIR
1305 PPCODE: 1648 PPCODE:
1306{ 1649{
1307 dREQ; 1650 dREQ;
1308 1651
1309 req->type = ix; 1652 req->type = ix;
1310 req->data = newSVsv (pathname); 1653 req->sv1 = newSVsv (pathname);
1311 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;
1312 1664
1665 req->type = REQ_MKDIR;
1666 req->sv1 = newSVsv (pathname);
1667 req->ptr1 = SvPVbyte_nolen (req->sv1);
1668 req->mode = mode;
1669
1313 REQ_SEND; 1670 REQ_SEND;
1314} 1671}
1315 1672
1316void 1673void
1317aio_link (oldpath,newpath,callback=&PL_sv_undef) 1674aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1318 SV * oldpath
1319 SV * newpath
1320 SV * callback
1321 ALIAS: 1675 ALIAS:
1322 aio_link = REQ_LINK 1676 aio_link = REQ_LINK
1323 aio_symlink = REQ_SYMLINK 1677 aio_symlink = REQ_SYMLINK
1324 aio_rename = REQ_RENAME 1678 aio_rename = REQ_RENAME
1325 PPCODE: 1679 PPCODE:
1326{ 1680{
1327 dREQ; 1681 dREQ;
1328 1682
1329 req->type = ix; 1683 req->type = ix;
1330 req->fh = newSVsv (oldpath); 1684 req->sv2 = newSVsv (oldpath);
1331 req->data2ptr = SvPVbyte_nolen (req->fh); 1685 req->ptr2 = SvPVbyte_nolen (req->sv2);
1332 req->data = newSVsv (newpath); 1686 req->sv1 = newSVsv (newpath);
1333 req->dataptr = SvPVbyte_nolen (req->data); 1687 req->ptr1 = SvPVbyte_nolen (req->sv1);
1334 1688
1335 REQ_SEND; 1689 REQ_SEND;
1336} 1690}
1337 1691
1338void 1692void
1339aio_busy (delay,callback=&PL_sv_undef) 1693aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1340 double delay
1341 SV * callback
1342 PPCODE: 1694 PPCODE:
1343{ 1695{
1344 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;
1345 1712
1346 req->type = REQ_BUSY; 1713 req->type = REQ_BUSY;
1347 req->fd = delay < 0. ? 0 : delay; 1714 req->nv1 = delay < 0. ? 0. : delay;
1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1349 1715
1350 REQ_SEND; 1716 REQ_SEND;
1351} 1717}
1352 1718
1353void 1719void
1354aio_group (callback=&PL_sv_undef) 1720aio_group (SV *callback=&PL_sv_undef)
1355 SV * callback
1356 PROTOTYPE: ;$ 1721 PROTOTYPE: ;$
1357 PPCODE: 1722 PPCODE:
1358{ 1723{
1359 dREQ; 1724 dREQ;
1360 1725
1361 req->type = REQ_GROUP; 1726 req->type = REQ_GROUP;
1727
1362 req_send (req); 1728 req_send (req);
1363
1364 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1729 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1365} 1730}
1366 1731
1367void 1732void
1368aio_nop (callback=&PL_sv_undef) 1733aio_nop (SV *callback=&PL_sv_undef)
1369 SV * callback
1370 PPCODE: 1734 PPCODE:
1371{ 1735{
1372 dREQ; 1736 dREQ;
1373 1737
1374 req->type = REQ_NOP; 1738 req->type = REQ_NOP;
1375 1739
1376 REQ_SEND; 1740 REQ_SEND;
1377} 1741}
1378 1742
1379void 1743int
1380aioreq_pri (int pri = DEFAULT_PRI) 1744aioreq_pri (int pri = 0)
1381 CODE: 1745 PROTOTYPE: ;$
1746 CODE:
1747 RETVAL = next_pri - PRI_BIAS;
1748 if (items > 0)
1749 {
1382 if (pri < PRI_MIN) pri = PRI_MIN; 1750 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX; 1751 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS; 1752 next_pri = pri + PRI_BIAS;
1753 }
1754 OUTPUT:
1755 RETVAL
1385 1756
1386void 1757void
1387aioreq_nice (int nice = 0) 1758aioreq_nice (int nice = 0)
1388 CODE: 1759 CODE:
1389 nice = next_pri - nice; 1760 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN; 1761 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX; 1762 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS; 1763 next_pri = nice + PRI_BIAS;
1393 1764
1394void 1765void
1395flush () 1766flush ()
1396 PROTOTYPE: 1767 PROTOTYPE:
1397 CODE: 1768 CODE:
1399 { 1770 {
1400 poll_wait (); 1771 poll_wait ();
1401 poll_cb (); 1772 poll_cb ();
1402 } 1773 }
1403 1774
1404void 1775int
1405poll() 1776poll()
1406 PROTOTYPE: 1777 PROTOTYPE:
1407 CODE: 1778 CODE:
1408 if (nreqs)
1409 {
1410 poll_wait (); 1779 poll_wait ();
1411 poll_cb (); 1780 RETVAL = poll_cb ();
1412 } 1781 OUTPUT:
1782 RETVAL
1413 1783
1414int 1784int
1415poll_fileno() 1785poll_fileno()
1416 PROTOTYPE: 1786 PROTOTYPE:
1417 CODE: 1787 CODE:
1429 1799
1430void 1800void
1431poll_wait() 1801poll_wait()
1432 PROTOTYPE: 1802 PROTOTYPE:
1433 CODE: 1803 CODE:
1434 if (nreqs)
1435 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}
1436 1842
1437int 1843int
1438nreqs() 1844nreqs()
1439 PROTOTYPE: 1845 PROTOTYPE:
1440 CODE: 1846 CODE:
1441 RETVAL = nreqs; 1847 RETVAL = nreqs;
1442 OUTPUT: 1848 OUTPUT:
1443 RETVAL 1849 RETVAL
1444 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
1445PROTOTYPES: DISABLE 1877PROTOTYPES: DISABLE
1446 1878
1447MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1879MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1448 1880
1449void 1881void
1464 PPCODE: 1896 PPCODE:
1465{ 1897{
1466 int i; 1898 int i;
1467 aio_req req; 1899 aio_req req;
1468 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
1469 if (grp->fd == 2) 1904 if (grp->int1 == 2)
1470 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");
1471 1906
1472 for (i = 1; i < items; ++i ) 1907 for (i = 1; i < items; ++i )
1473 { 1908 {
1474 if (GIMME_V != G_VOID) 1909 if (GIMME_V != G_VOID)
1476 1911
1477 req = SvAIO_REQ (ST (i)); 1912 req = SvAIO_REQ (ST (i));
1478 1913
1479 if (req) 1914 if (req)
1480 { 1915 {
1481 ++grp->length; 1916 ++grp->size;
1482 req->grp = grp; 1917 req->grp = grp;
1483 1918
1484 req->grp_prev = 0; 1919 req->grp_prev = 0;
1485 req->grp_next = grp->grp_first; 1920 req->grp_next = grp->grp_first;
1486 1921
1500void 1935void
1501result (aio_req grp, ...) 1936result (aio_req grp, ...)
1502 CODE: 1937 CODE:
1503{ 1938{
1504 int i; 1939 int i;
1940 AV *av;
1941
1942 grp->errorno = errno;
1943
1505 AV *av = newAV (); 1944 av = newAV ();
1506 1945
1507 for (i = 1; i < items; ++i ) 1946 for (i = 1; i < items; ++i )
1508 av_push (av, newSVsv (ST (i))); 1947 av_push (av, newSVsv (ST (i)));
1509 1948
1510 SvREFCNT_dec (grp->data); 1949 SvREFCNT_dec (grp->sv1);
1511 grp->data = (SV *)av; 1950 grp->sv1 = (SV *)av;
1512} 1951}
1952
1953void
1954errno (aio_req grp, int errorno = errno)
1955 CODE:
1956 grp->errorno = errorno;
1513 1957
1514void 1958void
1515limit (aio_req grp, int limit) 1959limit (aio_req grp, int limit)
1516 CODE: 1960 CODE:
1517 grp->fd2 = limit; 1961 grp->int2 = limit;
1518 aio_grp_feed (grp); 1962 aio_grp_feed (grp);
1519 1963
1520void 1964void
1521feed (aio_req grp, SV *callback=&PL_sv_undef) 1965feed (aio_req grp, SV *callback=&PL_sv_undef)
1522 CODE: 1966 CODE:
1523{ 1967{
1524 SvREFCNT_dec (grp->fh2); 1968 SvREFCNT_dec (grp->sv2);
1525 grp->fh2 = newSVsv (callback); 1969 grp->sv2 = newSVsv (callback);
1526 1970
1527 if (grp->fd2 <= 0) 1971 if (grp->int2 <= 0)
1528 grp->fd2 = 2; 1972 grp->int2 = 2;
1529 1973
1530 aio_grp_feed (grp); 1974 aio_grp_feed (grp);
1531} 1975}
1532 1976

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines