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.67 by root, Tue Oct 24 03:17:39 2006 UTC vs.
Revision 1.96 by root, Sat Dec 23 04:49:37 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines