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.70 by root, Tue Oct 24 15:15:56 2006 UTC vs.
Revision 1.96 by root, Sat Dec 23 04:49:37 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines