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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines