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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines