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.65 by root, Tue Oct 24 00:26:32 2006 UTC vs.
Revision 1.98 by root, Wed May 9 06:45:12 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines