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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines