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.61 by root, Mon Oct 23 22:44:21 2006 UTC vs.
Revision 1.91 by root, Wed Nov 8 01:57:43 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines