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.56 by root, Mon Oct 23 14:49:51 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines