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.93 by root, Wed Nov 8 02:01:02 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 = POPs;
453 PUSHMARK (SP);
454 XPUSHs (fh);
455 }
456 break;
457
458 case REQ_GROUP:
459 req->int1 = 2; /* mark group as finished */
460
461 if (req->sv1)
462 {
463 int i;
464 AV *av = (AV *)req->sv1;
465
466 EXTEND (SP, AvFILL (av) + 1);
467 for (i = 0; i <= AvFILL (av); ++i)
468 PUSHs (*av_fetch (av, i, 0));
469 }
470 break;
471
472 case REQ_NOP:
473 case REQ_BUSY:
474 break;
475
476 case REQ_READLINK:
477 if (req->result > 0)
478 {
479 SvCUR_set (req->sv1, req->result);
480 *SvEND (req->sv1) = 0;
481 PUSHs (req->sv1);
482 }
483 break;
484
485 case REQ_STAT:
486 case REQ_LSTAT:
487 case REQ_FSTAT:
488 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
489 PL_laststatval = req->result;
490 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result)));
492 break;
493
494 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result)));
498 break;
499
500 default:
501 PUSHs (sv_2mortal (newSViv (req->result)));
502 break;
503 }
504
505 errno = req->errorno;
506
507 PUTBACK;
508 call_sv (req->callback, G_VOID | G_EVAL);
509 SPAGAIN;
510
511 FREETMPS;
512 LEAVE;
223 } 513 }
224}
225 514
226static void req_invoke (aio_req req) 515 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 { 516 {
243 case REQ_READDIR: 517 aio_req grp = req->grp;
244 {
245 SV *rv = &PL_sv_undef;
246 518
247 if (req->result >= 0) 519 /* unlink request */
248 { 520 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
249 char *buf = req->data2ptr; 521 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
250 AV *av = newAV ();
251 522
252 while (req->result) 523 if (grp->grp_first == req)
253 { 524 grp->grp_first = req->grp_next;
254 SV *sv = newSVpv (buf, 0);
255 525
256 av_push (av, sv); 526 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 } 527 }
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 528
318 if (SvTRUE (ERRSV)) 529 if (SvTRUE (ERRSV))
319 { 530 {
320 req_free (req); 531 req_free (req);
321 croak (0); 532 croak (0);
322 } 533 }
323} 534}
324 535
325static void req_free (aio_req req) 536static void req_free (aio_req req)
326{ 537{
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) 538 if (req->self)
342 { 539 {
343 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
344 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
345 } 542 }
346 543
347 SvREFCNT_dec (req->data);
348 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
349 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
350 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
351 Safefree (req->statdata);
352 548
353 if (req->type == REQ_READDIR && req->result >= 0) 549 if (req->flags & FLAG_PTR2_FREE)
354 free (req->data2ptr); 550 free (req->ptr2);
355 551
356 Safefree (req); 552 Safefree (req);
357} 553}
358 554
555static void req_cancel_subs (aio_req grp)
556{
557 aio_req sub;
558
559 if (grp->type != REQ_GROUP)
560 return;
561
562 SvREFCNT_dec (grp->sv2);
563 grp->sv2 = 0;
564
565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
566 req_cancel (sub);
567}
568
359static void req_cancel (aio_req req) 569static void req_cancel (aio_req req)
360{ 570{
361 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
362 572
363 if (req->type == REQ_GROUP) 573 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} 574}
438 575
439static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
440 577
441static void start_thread (void) 578static void start_thread (void)
442{ 579{
443 sigset_t fullsigset, oldsigset; 580 sigset_t fullsigset, oldsigset;
444 pthread_t tid;
445 pthread_attr_t attr; 581 pthread_attr_t attr;
582
583 worker *wrk = calloc (1, sizeof (worker));
584
585 if (!wrk)
586 croak ("unable to allocate worker thread data");
446 587
447 pthread_attr_init (&attr); 588 pthread_attr_init (&attr);
448 pthread_attr_setstacksize (&attr, STACKSIZE); 589 pthread_attr_setstacksize (&attr, STACKSIZE);
449 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 590 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
591#ifdef PTHREAD_SCOPE_PROCESS
592 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
593#endif
450 594
451 sigfillset (&fullsigset); 595 sigfillset (&fullsigset);
596
597 LOCK (wrklock);
452 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
453 599
454 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 600 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 { 601 {
473 reqe->next = req; 602 wrk->prev = &wrk_first;
474 reqe = req; 603 wrk->next = wrk_first.next;
604 wrk_first.next->prev = wrk;
605 wrk_first.next = wrk;
606 ++started;
475 } 607 }
476 else 608 else
477 reqe = reqs = req; 609 free (wrk);
478 610
611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
612 UNLOCK (wrklock);
613}
614
615static void maybe_start_thread ()
616{
617 if (get_nthreads () >= wanted)
618 return;
619
620 /* todo: maybe use idle here, but might be less exact */
621 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
622 return;
623
624 start_thread ();
625}
626
627static void req_send (aio_req req)
628{
629 ++nreqs;
630
631 LOCK (reqlock);
632 ++nready;
633 reqq_push (&req_queue, req);
479 pthread_cond_signal (&reqwait); 634 pthread_cond_signal (&reqwait);
480 pthread_mutex_unlock (&reqlock); 635 UNLOCK (reqlock);
481 636
482 if (nreqs > max_outstanding) 637 maybe_start_thread ();
483 for (;;)
484 {
485 poll_cb ();
486
487 if (nreqs <= max_outstanding)
488 break;
489
490 poll_wait ();
491 }
492} 638}
493 639
494static void end_thread (void) 640static void end_thread (void)
495{ 641{
496 aio_req req; 642 aio_req req;
643
497 Newz (0, req, 1, aio_cb); 644 Newz (0, req, 1, aio_cb);
645
498 req->type = REQ_QUIT; 646 req->type = REQ_QUIT;
647 req->pri = PRI_MAX + PRI_BIAS;
499 648
500 req_send (req); 649 LOCK (reqlock);
650 reqq_push (&req_queue, req);
651 pthread_cond_signal (&reqwait);
652 UNLOCK (reqlock);
653
654 LOCK (wrklock);
655 --started;
656 UNLOCK (wrklock);
657}
658
659static void set_max_idle (int nthreads)
660{
661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
662 max_idle = nthreads <= 0 ? 1 : nthreads;
663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
501} 664}
502 665
503static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
504{ 667{
505 if (wanted < nthreads) 668 if (wanted < nthreads)
506 wanted = nthreads; 669 wanted = nthreads;
507} 670}
508 671
509static void max_parallel (int nthreads) 672static void max_parallel (int nthreads)
510{ 673{
511 int cur = started;
512
513 if (wanted > nthreads) 674 if (wanted > nthreads)
514 wanted = nthreads; 675 wanted = nthreads;
515 676
516 while (cur > wanted) 677 while (started > wanted)
678 end_thread ();
679}
680
681static void poll_wait ()
682{
683 fd_set rfd;
684
685 while (nreqs)
517 { 686 {
687 int size;
688 if (WORDACCESS_UNSAFE) LOCK (reslock);
689 size = res_queue.size;
690 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
691
692 if (size)
693 return;
694
518 end_thread (); 695 maybe_start_thread ();
519 cur--; 696
697 FD_ZERO(&rfd);
698 FD_SET(respipe [0], &rfd);
699
700 select (respipe [0] + 1, &rfd, 0, 0, 0);
520 } 701 }
702}
521 703
522 while (started > wanted) 704static int poll_cb ()
705{
706 dSP;
707 int count = 0;
708 int maxreqs = max_poll_reqs;
709 int do_croak = 0;
710 struct timeval tv_start, tv_now;
711 aio_req req;
712
713 if (max_poll_time)
714 gettimeofday (&tv_start, 0);
715
716 for (;;)
523 { 717 {
718 for (;;)
719 {
720 maybe_start_thread ();
721
722 LOCK (reslock);
723 req = reqq_shift (&res_queue);
724
725 if (req)
726 {
727 --npending;
728
729 if (!res_queue.size)
730 {
731 /* read any signals sent by the worker threads */
732 char buf [32];
733 while (read (respipe [0], buf, 32) == 32)
734 ;
735 }
736 }
737
738 UNLOCK (reslock);
739
740 if (!req)
741 break;
742
743 --nreqs;
744
745 if (req->type == REQ_GROUP && req->size)
746 {
747 req->int1 = 1; /* mark request as delayed */
748 continue;
749 }
750 else
751 {
752 req_invoke (req);
753
754 count++;
755 }
756
757 req_free (req);
758
759 if (maxreqs && !--maxreqs)
760 break;
761
762 if (max_poll_time)
763 {
764 gettimeofday (&tv_now, 0);
765
766 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
767 break;
768 }
769 }
770
771 if (nreqs <= max_outstanding)
772 break;
773
524 poll_wait (); 774 poll_wait ();
525 poll_cb (); 775
776 ++maxreqs;
526 } 777 }
778
779 return count;
527} 780}
528 781
529static void create_pipe () 782static void create_pipe ()
530{ 783{
531 if (pipe (respipe)) 784 if (pipe (respipe))
555static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 808static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
556{ 809{
557 ssize_t res; 810 ssize_t res;
558 off_t ooffset; 811 off_t ooffset;
559 812
560 pthread_mutex_lock (&preadwritelock); 813 LOCK (preadwritelock);
561 ooffset = lseek (fd, 0, SEEK_CUR); 814 ooffset = lseek (fd, 0, SEEK_CUR);
562 lseek (fd, offset, SEEK_SET); 815 lseek (fd, offset, SEEK_SET);
563 res = read (fd, buf, count); 816 res = read (fd, buf, count);
564 lseek (fd, ooffset, SEEK_SET); 817 lseek (fd, ooffset, SEEK_SET);
565 pthread_mutex_unlock (&preadwritelock); 818 UNLOCK (preadwritelock);
566 819
567 return res; 820 return res;
568} 821}
569 822
570static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 823static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
571{ 824{
572 ssize_t res; 825 ssize_t res;
573 off_t ooffset; 826 off_t ooffset;
574 827
575 pthread_mutex_lock (&preadwritelock); 828 LOCK (preadwritelock);
576 ooffset = lseek (fd, 0, SEEK_CUR); 829 ooffset = lseek (fd, 0, SEEK_CUR);
577 lseek (fd, offset, SEEK_SET); 830 lseek (fd, offset, SEEK_SET);
578 res = write (fd, buf, count); 831 res = write (fd, buf, count);
579 lseek (fd, offset, SEEK_SET); 832 lseek (fd, offset, SEEK_SET);
580 pthread_mutex_unlock (&preadwritelock); 833 UNLOCK (preadwritelock);
581 834
582 return res; 835 return res;
583} 836}
584#endif 837#endif
585 838
586#if !HAVE_FDATASYNC 839#if !HAVE_FDATASYNC
587# define fdatasync fsync 840# define fdatasync fsync
588#endif 841#endif
589 842
590#if !HAVE_READAHEAD 843#if !HAVE_READAHEAD
591# define readahead aio_readahead 844# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
592 845
593static ssize_t readahead (int fd, off_t offset, size_t count) 846static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
594{ 847{
595 char readahead_buf[4096]; 848 dBUF;
596 849
597 while (count > 0) 850 while (count > 0)
598 { 851 {
599 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 852 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
600 853
601 pread (fd, readahead_buf, len, offset); 854 pread (fd, aio_buf, len, offset);
602 offset += len; 855 offset += len;
603 count -= len; 856 count -= len;
604 } 857 }
605 858
606 errno = 0; 859 errno = 0;
607} 860}
861
608#endif 862#endif
609 863
610#if !HAVE_READDIR_R 864#if !HAVE_READDIR_R
611# define readdir_r aio_readdir_r 865# define readdir_r aio_readdir_r
612 866
615static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 869static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
616{ 870{
617 struct dirent *e; 871 struct dirent *e;
618 int errorno; 872 int errorno;
619 873
620 pthread_mutex_lock (&readdirlock); 874 LOCK (readdirlock);
621 875
622 e = readdir (dirp); 876 e = readdir (dirp);
623 errorno = errno; 877 errorno = errno;
624 878
625 if (e) 879 if (e)
628 strcpy (ent->d_name, e->d_name); 882 strcpy (ent->d_name, e->d_name);
629 } 883 }
630 else 884 else
631 *res = 0; 885 *res = 0;
632 886
633 pthread_mutex_unlock (&readdirlock); 887 UNLOCK (readdirlock);
634 888
635 errno = errorno; 889 errno = errorno;
636 return e ? 0 : -1; 890 return e ? 0 : -1;
637} 891}
638#endif 892#endif
639 893
640/* sendfile always needs emulation */ 894/* sendfile always needs emulation */
641static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 895static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
642{ 896{
643 ssize_t res; 897 ssize_t res;
644 898
645 if (!count) 899 if (!count)
646 return 0; 900 return 0;
657 { 911 {
658 off_t sbytes; 912 off_t sbytes;
659 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 913 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
660 914
661 if (res < 0 && sbytes) 915 if (res < 0 && sbytes)
662 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 916 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
663 res = sbytes; 917 res = sbytes;
664 } 918 }
665 919
666# elif __hpux 920# elif __hpux
667 res = sendfile (ofd, ifd, offset, count, 0, 0); 921 res = sendfile (ofd, ifd, offset, count, 0, 0);
695#endif 949#endif
696 ) 950 )
697 ) 951 )
698 { 952 {
699 /* emulate sendfile. this is a major pain in the ass */ 953 /* emulate sendfile. this is a major pain in the ass */
700 char buf[4096]; 954 dBUF;
955
701 res = 0; 956 res = 0;
702 957
703 while (count) 958 while (count)
704 { 959 {
705 ssize_t cnt; 960 ssize_t cnt;
706 961
707 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 962 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
708 963
709 if (cnt <= 0) 964 if (cnt <= 0)
710 { 965 {
711 if (cnt && !res) res = -1; 966 if (cnt && !res) res = -1;
712 break; 967 break;
713 } 968 }
714 969
715 cnt = write (ofd, buf, cnt); 970 cnt = write (ofd, aio_buf, cnt);
716 971
717 if (cnt <= 0) 972 if (cnt <= 0)
718 { 973 {
719 if (cnt && !res) res = -1; 974 if (cnt && !res) res = -1;
720 break; 975 break;
728 983
729 return res; 984 return res;
730} 985}
731 986
732/* read a full directory */ 987/* read a full directory */
733static int scandir_ (const char *path, void **namesp) 988static void scandir_ (aio_req req, worker *self)
734{ 989{
735 DIR *dirp = opendir (path); 990 DIR *dirp;
736 union 991 union
737 { 992 {
738 struct dirent d; 993 struct dirent d;
739 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 994 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
740 } u; 995 } *u;
741 struct dirent *entp; 996 struct dirent *entp;
742 char *name, *names; 997 char *name, *names;
743 int memlen = 4096; 998 int memlen = 4096;
744 int memofs = 0; 999 int memofs = 0;
745 int res = 0; 1000 int res = 0;
746 int errorno; 1001 int errorno;
747 1002
748 if (!dirp) 1003 LOCK (wrklock);
749 return -1; 1004 self->dirp = dirp = opendir (req->ptr1);
750 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
751 names = malloc (memlen); 1007 req->ptr2 = names = malloc (memlen);
1008 UNLOCK (wrklock);
1009
1010 if (dirp && u && names)
1011 for (;;)
1012 {
1013 errno = 0;
1014 readdir_r (dirp, &u->d, &entp);
1015
1016 if (!entp)
1017 break;
1018
1019 name = entp->d_name;
1020
1021 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1022 {
1023 int len = strlen (name) + 1;
1024
1025 res++;
1026
1027 while (memofs + len > memlen)
1028 {
1029 memlen *= 2;
1030 LOCK (wrklock);
1031 req->ptr2 = names = realloc (names, memlen);
1032 UNLOCK (wrklock);
1033
1034 if (!names)
1035 break;
1036 }
1037
1038 memcpy (names + memofs, name, len);
1039 memofs += len;
1040 }
1041 }
1042
1043 if (errno)
1044 res = -1;
1045
1046 req->result = res;
1047}
1048
1049/*****************************************************************************/
1050
1051static void *aio_proc (void *thr_arg)
1052{
1053 aio_req req;
1054 struct timespec ts;
1055 worker *self = (worker *)thr_arg;
1056
1057 /* try to distribute timeouts somewhat evenly */
1058 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1059 * (1000000000UL / 1024UL);
752 1060
753 for (;;) 1061 for (;;)
754 { 1062 {
755 errno = 0, readdir_r (dirp, &u.d, &entp); 1063 ts.tv_sec = time (0) + IDLE_TIMEOUT;
756 1064
757 if (!entp) 1065 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 1066
806 for (;;) 1067 for (;;)
807 { 1068 {
808 req = reqs; 1069 self->req = req = reqq_shift (&req_queue);
809
810 if (reqs)
811 {
812 reqs = reqs->next;
813 if (!reqs) reqe = 0;
814 }
815 1070
816 if (req) 1071 if (req)
817 break; 1072 break;
818 1073
1074 ++idle;
1075
1076 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1077 == ETIMEDOUT)
1078 {
1079 if (idle > max_idle)
1080 {
1081 --idle;
1082 UNLOCK (reqlock);
1083 LOCK (wrklock);
1084 --started;
1085 UNLOCK (wrklock);
1086 goto quit;
1087 }
1088
1089 /* we are allowed to idle, so do so without any timeout */
819 pthread_cond_wait (&reqwait, &reqlock); 1090 pthread_cond_wait (&reqwait, &reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 }
1093
1094 --idle;
820 } 1095 }
821 1096
822 pthread_mutex_unlock (&reqlock); 1097 --nready;
1098
1099 UNLOCK (reqlock);
823 1100
824 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
825 type = req->type; /* remember type for QUIT check */
826 1102
827 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
828 switch (type) 1104 switch (req->type)
829 { 1105 {
830 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1106 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; 1107 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
832 1108
833 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1109 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; 1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
835 1111
836 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1112 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; 1113 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; 1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
839 1115
840 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
841 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
842 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
843 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
844 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
845 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
846 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
847 1125
848 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
849 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
850 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
851 1129
852 case REQ_SLEEP: 1130 case REQ_BUSY:
853 { 1131 {
854 struct timeval tv; 1132 struct timeval tv;
855 1133
856 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
857 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
858 1136
859 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
860 } 1138 }
861 1139
862 case REQ_GROUP: 1140 case REQ_GROUP:
863 case REQ_NOP: 1141 case REQ_NOP:
1142 break;
1143
864 case REQ_QUIT: 1144 case REQ_QUIT:
865 break; 1145 goto quit;
866 1146
867 default: 1147 default:
868 req->result = ENOSYS; 1148 req->result = ENOSYS;
869 break; 1149 break;
870 } 1150 }
871 1151
872 req->errorno = errno; 1152 req->errorno = errno;
873 1153
874 pthread_mutex_lock (&reslock); 1154 LOCK (reslock);
875 1155
876 req->next = 0; 1156 ++npending;
877 1157
878 if (rese) 1158 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 */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
888 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
889 }
890 1161
891 pthread_mutex_unlock (&reslock); 1162 self->req = 0;
1163 worker_clear (self);
1164
1165 UNLOCK (reslock);
892 } 1166 }
893 while (type != REQ_QUIT); 1167
1168quit:
1169 LOCK (wrklock);
1170 worker_free (self);
1171 UNLOCK (wrklock);
894 1172
895 return 0; 1173 return 0;
896} 1174}
897 1175
898/*****************************************************************************/ 1176/*****************************************************************************/
899 1177
900static void atfork_prepare (void) 1178static void atfork_prepare (void)
901{ 1179{
902 pthread_mutex_lock (&reqlock); 1180 LOCK (wrklock);
903 pthread_mutex_lock (&reslock); 1181 LOCK (reqlock);
1182 LOCK (reslock);
904#if !HAVE_PREADWRITE 1183#if !HAVE_PREADWRITE
905 pthread_mutex_lock (&preadwritelock); 1184 LOCK (preadwritelock);
906#endif 1185#endif
907#if !HAVE_READDIR_R 1186#if !HAVE_READDIR_R
908 pthread_mutex_lock (&readdirlock); 1187 LOCK (readdirlock);
909#endif 1188#endif
910} 1189}
911 1190
912static void atfork_parent (void) 1191static void atfork_parent (void)
913{ 1192{
914#if !HAVE_READDIR_R 1193#if !HAVE_READDIR_R
915 pthread_mutex_unlock (&readdirlock); 1194 UNLOCK (readdirlock);
916#endif 1195#endif
917#if !HAVE_PREADWRITE 1196#if !HAVE_PREADWRITE
918 pthread_mutex_unlock (&preadwritelock); 1197 UNLOCK (preadwritelock);
919#endif 1198#endif
920 pthread_mutex_unlock (&reslock); 1199 UNLOCK (reslock);
921 pthread_mutex_unlock (&reqlock); 1200 UNLOCK (reqlock);
1201 UNLOCK (wrklock);
922} 1202}
923 1203
924static void atfork_child (void) 1204static void atfork_child (void)
925{ 1205{
926 aio_req prv; 1206 aio_req prv;
927 1207
928 started = 0; 1208 while (prv = reqq_shift (&req_queue))
1209 req_free (prv);
929 1210
930 while (reqs) 1211 while (prv = reqq_shift (&res_queue))
1212 req_free (prv);
1213
1214 while (wrk_first.next != &wrk_first)
931 { 1215 {
932 prv = reqs; 1216 worker *wrk = wrk_first.next;
933 reqs = prv->next; 1217
1218 if (wrk->req)
1219 req_free (wrk->req);
1220
1221 worker_clear (wrk);
934 req_free (prv); 1222 worker_free (wrk);
935 } 1223 }
936 1224
937 reqs = reqe = 0; 1225 started = 0;
938 1226 idle = 0;
939 while (ress) 1227 nreqs = 0;
940 { 1228 nready = 0;
941 prv = ress; 1229 npending = 0;
942 ress = prv->next;
943 req_free (prv);
944 }
945
946 ress = rese = 0;
947 1230
948 close (respipe [0]); 1231 close (respipe [0]);
949 close (respipe [1]); 1232 close (respipe [1]);
950 create_pipe (); 1233 create_pipe ();
951 1234
978PROTOTYPES: ENABLE 1261PROTOTYPES: ENABLE
979 1262
980BOOT: 1263BOOT:
981{ 1264{
982 HV *stash = gv_stashpv ("IO::AIO", 1); 1265 HV *stash = gv_stashpv ("IO::AIO", 1);
1266
983 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
984 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
985 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1269 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1270 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1271 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1272 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
986 1273
987 create_pipe (); 1274 create_pipe ();
988 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
989} 1276}
990 1277
991void 1278void
992min_parallel (nthreads) 1279max_poll_reqs (int nreqs)
993 int nthreads
994 PROTOTYPE: $ 1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
995 1283
996void 1284void
997max_parallel (nthreads) 1285max_poll_time (double nseconds)
998 int nthreads
999 PROTOTYPE: $ 1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_time = nseconds * AIO_TICKS;
1289
1290void
1291min_parallel (int nthreads)
1292 PROTOTYPE: $
1293
1294void
1295max_parallel (int nthreads)
1296 PROTOTYPE: $
1297
1298void
1299max_idle (int nthreads)
1300 PROTOTYPE: $
1301 CODE:
1302 set_max_idle (nthreads);
1000 1303
1001int 1304int
1002max_outstanding (nreqs) 1305max_outstanding (int maxreqs)
1003 int nreqs 1306 PROTOTYPE: $
1004 PROTOTYPE: $
1005 CODE: 1307 CODE:
1006 RETVAL = max_outstanding; 1308 RETVAL = max_outstanding;
1007 max_outstanding = nreqs; 1309 max_outstanding = maxreqs;
1310 OUTPUT:
1311 RETVAL
1008 1312
1009void 1313void
1010aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1011 SV * pathname 1315 SV8 * pathname
1012 int flags 1316 int flags
1013 int mode 1317 int mode
1014 SV * callback 1318 SV * callback
1015 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1016 PPCODE: 1320 PPCODE:
1017{ 1321{
1018 dREQ; 1322 dREQ;
1019 1323
1020 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1021 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1022 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1023 req->fd = flags; 1327 req->int1 = flags;
1024 req->mode = mode; 1328 req->mode = mode;
1025 1329
1026 REQ_SEND; 1330 REQ_SEND;
1027} 1331}
1028 1332
1038 PPCODE: 1342 PPCODE:
1039{ 1343{
1040 dREQ; 1344 dREQ;
1041 1345
1042 req->type = ix; 1346 req->type = ix;
1043 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1044 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1045 1349
1046 REQ_SEND (req); 1350 REQ_SEND (req);
1047} 1351}
1048 1352
1049void 1353void
1050aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1051 SV * fh 1355 SV * fh
1052 UV offset 1356 UV offset
1053 UV length 1357 UV length
1054 SV * data 1358 SV8 * data
1055 UV dataoffset 1359 UV dataoffset
1056 SV * callback 1360 SV * callback
1057 ALIAS: 1361 ALIAS:
1058 aio_read = REQ_READ 1362 aio_read = REQ_READ
1059 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1060 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1061 PPCODE: 1365 PPCODE:
1062{ 1366{
1063 aio_req req;
1064 STRLEN svlen; 1367 STRLEN svlen;
1065 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1066 1369
1067 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1068 SvPOK_on (data); 1371 SvPOK_on (data);
1090 1393
1091 { 1394 {
1092 dREQ; 1395 dREQ;
1093 1396
1094 req->type = ix; 1397 req->type = ix;
1095 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1096 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1097 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1098 req->offset = offset; 1401 req->offs = offset;
1099 req->length = length; 1402 req->size = length;
1100 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1101 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1102 1406
1103 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1104 { 1408 {
1105 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1106 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1107 } 1411 }
1108 1412
1109 REQ_SEND; 1413 REQ_SEND;
1110 } 1414 }
1415}
1416
1417void
1418aio_readlink (path,callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$
1422 PPCODE:
1423{
1424 SV *data;
1425 dREQ;
1426
1427 data = newSV (NAME_MAX);
1428 SvPOK_on (data);
1429
1430 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh);
1433 req->sv1 = data;
1434 req->ptr1 = SvPVbyte_nolen (data);
1435
1436 REQ_SEND;
1111} 1437}
1112 1438
1113void 1439void
1114aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1115 SV * out_fh 1441 SV * out_fh
1121 PPCODE: 1447 PPCODE:
1122{ 1448{
1123 dREQ; 1449 dREQ;
1124 1450
1125 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1126 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1127 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1128 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1129 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1130 req->offset = in_offset; 1456 req->offs = in_offset;
1131 req->length = length; 1457 req->size = length;
1132 1458
1133 REQ_SEND; 1459 REQ_SEND;
1134} 1460}
1135 1461
1136void 1462void
1143 PPCODE: 1469 PPCODE:
1144{ 1470{
1145 dREQ; 1471 dREQ;
1146 1472
1147 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1148 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1149 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1150 req->offset = offset; 1476 req->offs = offset;
1151 req->length = length; 1477 req->size = length;
1152 1478
1153 REQ_SEND; 1479 REQ_SEND;
1154} 1480}
1155 1481
1156void 1482void
1157aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1158 SV * fh_or_path 1484 SV8 * fh_or_path
1159 SV * callback 1485 SV * callback
1160 ALIAS: 1486 ALIAS:
1161 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1162 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1163 PPCODE: 1489 PPCODE:
1164{ 1490{
1165 dREQ; 1491 dREQ;
1166 1492
1167 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1168 if (!req->statdata) 1494 if (!req->ptr2)
1169 { 1495 {
1170 req_free (req); 1496 req_free (req);
1171 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1172 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1173 1501
1174 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1175 { 1503 {
1176 req->type = ix; 1504 req->type = ix;
1177 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1178 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1179 } 1507 }
1180 else 1508 else
1181 { 1509 {
1182 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1183 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1184 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1185 } 1513 }
1186 1514
1187 REQ_SEND; 1515 REQ_SEND;
1188} 1516}
1189 1517
1190void 1518void
1191aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1192 SV * pathname 1520 SV8 * pathname
1193 SV * callback 1521 SV * callback
1194 ALIAS: 1522 ALIAS:
1195 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1196 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1197 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1198 PPCODE: 1526 PPCODE:
1199{ 1527{
1200 dREQ; 1528 dREQ;
1201 1529
1202 req->type = ix; 1530 req->type = ix;
1203 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1204 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1205 1533
1206 REQ_SEND; 1534 REQ_SEND;
1207} 1535}
1208 1536
1209void 1537void
1210aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1211 SV * oldpath 1539 SV8 * oldpath
1212 SV * newpath 1540 SV8 * newpath
1213 SV * callback 1541 SV * callback
1214 ALIAS: 1542 ALIAS:
1215 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1216 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1217 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1218 PPCODE: 1546 PPCODE:
1219{ 1547{
1220 dREQ; 1548 dREQ;
1221 1549
1222 req->type = ix; 1550 req->type = ix;
1223 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1224 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1225 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1226 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1227 1555
1228 REQ_SEND; 1556 REQ_SEND;
1229} 1557}
1230 1558
1231void 1559void
1232aio_sleep (delay,callback=&PL_sv_undef) 1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1233 double delay 1561 SV8 * pathname
1234 SV * callback 1562 SV * callback
1563 UV mode
1564 UV dev
1235 PPCODE: 1565 PPCODE:
1236{ 1566{
1237 dREQ; 1567 dREQ;
1568
1569 req->type = REQ_MKNOD;
1570 req->sv1 = newSVsv (pathname);
1571 req->ptr1 = SvPVbyte_nolen (req->sv1);
1572 req->mode = (mode_t)mode;
1573 req->offs = dev;
1574
1575 REQ_SEND;
1576}
1238 1577
1578void
1579aio_busy (delay,callback=&PL_sv_undef)
1580 double delay
1581 SV * callback
1582 PPCODE:
1583{
1584 dREQ;
1585
1239 req->type = REQ_SLEEP; 1586 req->type = REQ_BUSY;
1240 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1241 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1242 1589
1243 REQ_SEND; 1590 REQ_SEND;
1244} 1591}
1245 1592
1246void 1593void
1250 PPCODE: 1597 PPCODE:
1251{ 1598{
1252 dREQ; 1599 dREQ;
1253 1600
1254 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1255 req_send (req); 1603 req_send (req);
1256
1257 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1258} 1605}
1259 1606
1260void 1607void
1261aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1262 SV * callback 1609 SV * callback
1263 PPCODE: 1610 PPCODE:
1264{ 1611{
1265 dREQ; 1612 dREQ;
1266 1613
1267 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
1268 1615
1269 REQ_SEND; 1616 REQ_SEND;
1270} 1617}
1271 1618
1272#if 0 1619int
1273 1620aioreq_pri (int pri = 0)
1274void 1621 PROTOTYPE: ;$
1275aio_pri (int pri = DEFAULT_PRI)
1276 CODE: 1622 CODE:
1623 RETVAL = next_pri - PRI_BIAS;
1624 if (items > 0)
1625 {
1277 if (pri < PRI_MIN) pri = PRI_MIN; 1626 if (pri < PRI_MIN) pri = PRI_MIN;
1278 if (pri > PRI_MAX) pri = PRI_MAX; 1627 if (pri > PRI_MAX) pri = PRI_MAX;
1279 next_pri = pri + PRI_BIAS; 1628 next_pri = pri + PRI_BIAS;
1629 }
1630 OUTPUT:
1631 RETVAL
1280 1632
1281#endif 1633void
1634aioreq_nice (int nice = 0)
1635 CODE:
1636 nice = next_pri - nice;
1637 if (nice < PRI_MIN) nice = PRI_MIN;
1638 if (nice > PRI_MAX) nice = PRI_MAX;
1639 next_pri = nice + PRI_BIAS;
1282 1640
1283void 1641void
1284flush () 1642flush ()
1285 PROTOTYPE: 1643 PROTOTYPE:
1286 CODE: 1644 CODE:
1288 { 1646 {
1289 poll_wait (); 1647 poll_wait ();
1290 poll_cb (); 1648 poll_cb ();
1291 } 1649 }
1292 1650
1293void 1651int
1294poll() 1652poll()
1295 PROTOTYPE: 1653 PROTOTYPE:
1296 CODE: 1654 CODE:
1297 if (nreqs)
1298 {
1299 poll_wait (); 1655 poll_wait ();
1300 poll_cb (); 1656 RETVAL = poll_cb ();
1301 } 1657 OUTPUT:
1658 RETVAL
1302 1659
1303int 1660int
1304poll_fileno() 1661poll_fileno()
1305 PROTOTYPE: 1662 PROTOTYPE:
1306 CODE: 1663 CODE:
1318 1675
1319void 1676void
1320poll_wait() 1677poll_wait()
1321 PROTOTYPE: 1678 PROTOTYPE:
1322 CODE: 1679 CODE:
1323 if (nreqs)
1324 poll_wait (); 1680 poll_wait ();
1325 1681
1326int 1682int
1327nreqs() 1683nreqs()
1328 PROTOTYPE: 1684 PROTOTYPE:
1329 CODE: 1685 CODE:
1330 RETVAL = nreqs; 1686 RETVAL = nreqs;
1331 OUTPUT: 1687 OUTPUT:
1332 RETVAL 1688 RETVAL
1333 1689
1690int
1691nready()
1692 PROTOTYPE:
1693 CODE:
1694 RETVAL = get_nready ();
1695 OUTPUT:
1696 RETVAL
1697
1698int
1699npending()
1700 PROTOTYPE:
1701 CODE:
1702 RETVAL = get_npending ();
1703 OUTPUT:
1704 RETVAL
1705
1706int
1707nthreads()
1708 PROTOTYPE:
1709 CODE:
1710 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1711 RETVAL = started;
1712 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1713 OUTPUT:
1714 RETVAL
1715
1334PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1335 1717
1336MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1718MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1337 1719
1338void 1720void
1339cancel (aio_req_ornot req) 1721cancel (aio_req_ornot req)
1340 PROTOTYPE:
1341 CODE: 1722 CODE:
1342 req_cancel (req); 1723 req_cancel (req);
1343 1724
1344void 1725void
1345cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1726cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1354 PPCODE: 1735 PPCODE:
1355{ 1736{
1356 int i; 1737 int i;
1357 aio_req req; 1738 aio_req req;
1358 1739
1359 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1360 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1741 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1361 1742
1362 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1363 { 1744 {
1364 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
1366 1747
1367 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1368 1749
1369 if (req) 1750 if (req)
1370 { 1751 {
1371 ++grp->length; 1752 ++grp->size;
1372 req->grp = grp; 1753 req->grp = grp;
1373 1754
1374 req->grp_prev = 0; 1755 req->grp_prev = 0;
1375 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1376 1757
1381 } 1762 }
1382 } 1763 }
1383} 1764}
1384 1765
1385void 1766void
1767cancel_subs (aio_req_ornot req)
1768 CODE:
1769 req_cancel_subs (req);
1770
1771void
1386result (aio_req grp, ...) 1772result (aio_req grp, ...)
1387 CODE: 1773 CODE:
1388{ 1774{
1389 int i; 1775 int i;
1776 AV *av;
1777
1778 grp->errorno = errno;
1779
1390 AV *av = newAV (); 1780 av = newAV ();
1391 1781
1392 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1393 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1394 1784
1395 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1396 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1397} 1787}
1398 1788
1399void 1789void
1790errno (aio_req grp, int errorno = errno)
1791 CODE:
1792 grp->errorno = errorno;
1793
1794void
1400feed_limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1401 CODE: 1796 CODE:
1402 grp->fd2 = limit; 1797 grp->int2 = limit;
1403 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1404 1799
1405void 1800void
1406feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1407 CODE: 1802 CODE:
1408{ 1803{
1409 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1410 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1411 1806
1412 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1413 grp->fd2 = 2; 1808 grp->int2 = 2;
1414 1809
1415 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1416} 1811}
1417 1812

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines