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.63 by root, Mon Oct 23 23:48:31 2006 UTC vs.
Revision 1.91 by root, Wed Nov 8 01:57:43 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines