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.51 by root, Sun Oct 22 22:14:33 2006 UTC vs.
Revision 1.77 by root, Thu Oct 26 13:25:40 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"
39/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 49#ifndef NAME_MAX
41# define NAME_MAX 4096 50# define NAME_MAX 4096
42#endif 51#endif
43 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
44#if __ia64 58#if __ia64
45# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
46#else 62#else
47# define STACKSIZE 8192 63# define STACKSIZE 16384
48#endif 64#endif
65
66/* buffer size for various temporary buffers */
67#define AIO_BUFSIZE 65536
68
69#define dBUF \
70 char *aio_buf; \
71 LOCK (wrklock); \
72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \
74 if (!aio_buf) \
75 return -1;
49 76
50enum { 77enum {
51 REQ_QUIT, 78 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 79 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 80 REQ_READ, REQ_WRITE, REQ_READAHEAD,
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 82 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 83 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 85 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 86 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP, 87 REQ_GROUP, REQ_NOP,
61 REQ_GROUP, 88 REQ_BUSY,
62}; 89};
63 90
64#define AIO_REQ_KLASS "IO::AIO::REQ" 91#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 92#define AIO_GRP_KLASS "IO::AIO::GRP"
66 93
67typedef struct aio_cb 94typedef struct aio_cb
68{ 95{
69 struct aio_cb *volatile next; 96 struct aio_cb *volatile next;
70
71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 97
75 SV *data, *callback; 98 SV *data, *callback;
76 SV *fh, *fh2; 99 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 100 void *dataptr, *data2ptr;
78 Stat_t *statdata; 101 Stat_t *statdata;
79 off_t offset; 102 off_t offset;
80 size_t length; 103 size_t length;
81 ssize_t result; 104 ssize_t result;
82 105
106 STRLEN dataoffset;
83 int type; 107 int type;
84 int fd, fd2; 108 int fd, fd2;
85 int errorno; 109 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 110 mode_t mode; /* open */
111
88 unsigned char cancelled; 112 unsigned char flags;
113 unsigned char pri;
114
115 SV *self; /* the perl counterpart of this request, if any */
116 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 117} aio_cb;
118
119enum {
120 FLAG_CANCELLED = 0x01,
121};
90 122
91typedef aio_cb *aio_req; 123typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 124typedef aio_cb *aio_req_ornot;
93 125
126enum {
127 PRI_MIN = -4,
128 PRI_MAX = 4,
129
130 DEFAULT_PRI = 0,
131 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
133};
134
135static int next_pri = DEFAULT_PRI + PRI_BIAS;
136
94static int started, wanted; 137static int started, wanted;
95static volatile int nreqs; 138static volatile int nreqs;
96static int max_outstanding = 1<<30;
97static int respipe [2]; 139static int respipe [2];
98 140
141#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
142# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
143#else
144# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
145#endif
146
147#define LOCK(mutex) pthread_mutex_lock (&(mutex))
148#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
149
150/* worker threads management */
151static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
152
153typedef struct worker {
154 /* locked by wrklock */
155 struct worker *prev, *next;
156
157 pthread_t tid;
158
159 /* locked by reslock, reqlock or wrklock */
160 aio_req req; /* currently processed request */
161 void *dbuf;
162 DIR *dirp;
163} worker;
164
165static worker wrk_first = { &wrk_first, &wrk_first, 0 };
166
167static void worker_clear (worker *wrk)
168{
169 if (wrk->dirp)
170 {
171 closedir (wrk->dirp);
172 wrk->dirp = 0;
173 }
174
175 if (wrk->dbuf)
176 {
177 free (wrk->dbuf);
178 wrk->dbuf = 0;
179 }
180}
181
182static void worker_free (worker *wrk)
183{
184 wrk->next->prev = wrk->prev;
185 wrk->prev->next = wrk->next;
186
187 free (wrk);
188}
189
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 190static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 191static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 192static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 193
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 194/*
104static volatile aio_req ress, rese; /* queue start, queue end */ 195 * a somewhat faster data structure might be nice, but
196 * with 8 priorities this actually needs <20 insns
197 * per shift, the most expensive operation.
198 */
199typedef struct {
200 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
201 int size;
202} reqq;
105 203
204static reqq req_queue;
205static reqq res_queue;
206
207int reqq_push (reqq *q, aio_req req)
208{
209 int pri = req->pri;
210 req->next = 0;
211
212 if (q->qe[pri])
213 {
214 q->qe[pri]->next = req;
215 q->qe[pri] = req;
216 }
217 else
218 q->qe[pri] = q->qs[pri] = req;
219
220 return q->size++;
221}
222
223aio_req reqq_shift (reqq *q)
224{
225 int pri;
226
227 if (!q->size)
228 return 0;
229
230 --q->size;
231
232 for (pri = NUM_PRI; pri--; )
233 {
234 aio_req req = q->qs[pri];
235
236 if (req)
237 {
238 if (!(q->qs[pri] = req->next))
239 q->qe[pri] = 0;
240
241 return req;
242 }
243 }
244
245 abort ();
246}
247
248static int poll_cb (int max);
106static void req_invoke (aio_req req); 249static void req_invoke (aio_req req);
107static void req_free (aio_req req); 250static void req_free (aio_req req);
251static void req_cancel (aio_req req);
108 252
109/* must be called at most once */ 253/* must be called at most once */
110static SV *req_sv (aio_req req, const char *klass) 254static SV *req_sv (aio_req req, const char *klass)
111{ 255{
112 if (!req->self) 256 if (!req->self)
118 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 262 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
119} 263}
120 264
121static aio_req SvAIO_REQ (SV *sv) 265static aio_req SvAIO_REQ (SV *sv)
122{ 266{
267 MAGIC *mg;
268
123 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 269 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
124 croak ("object of class " AIO_REQ_KLASS " expected"); 270 croak ("object of class " AIO_REQ_KLASS " expected");
125 271
126 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 272 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
127 273
128 return mg ? (aio_req)mg->mg_ptr : 0; 274 return mg ? (aio_req)mg->mg_ptr : 0;
129} 275}
130 276
131static void aio_grp_feed (aio_req grp) 277static void aio_grp_feed (aio_req grp)
132{ 278{
133 while (grp->length < grp->fd2) 279 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
134 { 280 {
135 int old_len = grp->length; 281 int old_len = grp->length;
136 282
137 if (grp->fh2 && SvOK (grp->fh2)) 283 if (grp->fh2 && SvOK (grp->fh2))
138 { 284 {
141 ENTER; 287 ENTER;
142 SAVETMPS; 288 SAVETMPS;
143 PUSHMARK (SP); 289 PUSHMARK (SP);
144 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 290 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
145 PUTBACK; 291 PUTBACK;
146 call_sv (grp->fh2, G_VOID | G_EVAL); 292 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
147 SPAGAIN; 293 SPAGAIN;
148 FREETMPS; 294 FREETMPS;
149 LEAVE; 295 LEAVE;
150 } 296 }
151 297
174 } 320 }
175} 321}
176 322
177static void poll_wait () 323static void poll_wait ()
178{ 324{
179 if (nreqs && !ress)
180 {
181 fd_set rfd; 325 fd_set rfd;
326
327 while (nreqs)
328 {
329 int size;
330#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
331 LOCK (reslock);
332#endif
333 size = res_queue.size;
334#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
335 UNLOCK (reslock);
336#endif
337
338 if (size)
339 return;
340
182 FD_ZERO(&rfd); 341 FD_ZERO(&rfd);
183 FD_SET(respipe [0], &rfd); 342 FD_SET(respipe [0], &rfd);
184 343
185 select (respipe [0] + 1, &rfd, 0, 0, 0); 344 select (respipe [0] + 1, &rfd, 0, 0, 0);
186 } 345 }
187} 346}
188 347
189static void req_invoke (aio_req req) 348static void req_invoke (aio_req req)
190{ 349{
191 dSP; 350 dSP;
192 int errorno = errno;
193 351
194 if (req->cancelled || !SvOK (req->callback)) 352 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
195 return; 353 {
196
197 errno = req->errorno; 354 errno = req->errorno;
198 355
199 ENTER; 356 ENTER;
200 SAVETMPS; 357 SAVETMPS;
201 PUSHMARK (SP); 358 PUSHMARK (SP);
202 EXTEND (SP, 1); 359 EXTEND (SP, 1);
203 360
204 switch (req->type) 361 switch (req->type)
205 {
206 case REQ_READDIR:
207 { 362 {
208 SV *rv = &PL_sv_undef; 363 case REQ_READDIR:
209
210 if (req->result >= 0)
211 { 364 {
212 char *buf = req->data2ptr; 365 SV *rv = &PL_sv_undef;
213 AV *av = newAV ();
214 366
215 while (req->result) 367 if (req->result >= 0)
216 { 368 {
369 int i;
370 char *buf = req->data2ptr;
371 AV *av = newAV ();
372
373 av_extend (av, req->result - 1);
374
375 for (i = 0; i < req->result; ++i)
376 {
217 SV *sv = newSVpv (buf, 0); 377 SV *sv = newSVpv (buf, 0);
218 378
219 av_push (av, sv); 379 av_store (av, i, sv);
220 buf += SvCUR (sv) + 1; 380 buf += SvCUR (sv) + 1;
221 req->result--; 381 }
382
383 rv = sv_2mortal (newRV_noinc ((SV *)av));
222 } 384 }
223 385
224 rv = sv_2mortal (newRV_noinc ((SV *)av)); 386 PUSHs (rv);
225 } 387 }
388 break;
226 389
227 PUSHs (rv); 390 case REQ_OPEN:
391 {
392 /* convert fd to fh */
393 SV *fh;
394
395 PUSHs (sv_2mortal (newSViv (req->result)));
396 PUTBACK;
397 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
398 SPAGAIN;
399
400 fh = SvREFCNT_inc (POPs);
401
402 PUSHMARK (SP);
403 XPUSHs (sv_2mortal (fh));
404 }
405 break;
406
407 case REQ_GROUP:
408 req->fd = 2; /* mark group as finished */
409
410 if (req->data)
411 {
412 int i;
413 AV *av = (AV *)req->data;
414
415 EXTEND (SP, AvFILL (av) + 1);
416 for (i = 0; i <= AvFILL (av); ++i)
417 PUSHs (*av_fetch (av, i, 0));
418 }
419 break;
420
421 case REQ_NOP:
422 case REQ_BUSY:
423 break;
424
425 default:
426 PUSHs (sv_2mortal (newSViv (req->result)));
427 break;
228 } 428 }
229 break;
230 429
231 case REQ_OPEN:
232 {
233 /* convert fd to fh */
234 SV *fh;
235 430
236 PUSHs (sv_2mortal (newSViv (req->result)));
237 PUTBACK; 431 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 }
269
270
271 PUTBACK;
272 call_sv (req->callback, G_VOID | G_EVAL); 432 call_sv (req->callback, G_VOID | G_EVAL);
273 SPAGAIN; 433 SPAGAIN;
274 434
275 FREETMPS; 435 FREETMPS;
276 LEAVE; 436 LEAVE;
277
278 errno = errorno;
279
280 if (SvTRUE (ERRSV))
281 { 437 }
282 req_free (req);
283 croak (0);
284 }
285}
286 438
287static void req_free (aio_req req)
288{
289 if (req->grp) 439 if (req->grp)
290 { 440 {
291 aio_req grp = req->grp; 441 aio_req grp = req->grp;
292 442
293 /* unlink request */ 443 /* unlink request */
298 grp->grp_first = req->grp_next; 448 grp->grp_first = req->grp_next;
299 449
300 aio_grp_dec (grp); 450 aio_grp_dec (grp);
301 } 451 }
302 452
453 if (SvTRUE (ERRSV))
454 {
455 req_free (req);
456 croak (0);
457 }
458}
459
460static void req_free (aio_req req)
461{
303 if (req->self) 462 if (req->self)
304 { 463 {
305 sv_unmagic (req->self, PERL_MAGIC_ext); 464 sv_unmagic (req->self, PERL_MAGIC_ext);
306 SvREFCNT_dec (req->self); 465 SvREFCNT_dec (req->self);
307 } 466 }
310 SvREFCNT_dec (req->fh); 469 SvREFCNT_dec (req->fh);
311 SvREFCNT_dec (req->fh2); 470 SvREFCNT_dec (req->fh2);
312 SvREFCNT_dec (req->callback); 471 SvREFCNT_dec (req->callback);
313 Safefree (req->statdata); 472 Safefree (req->statdata);
314 473
315 if (req->type == REQ_READDIR && req->result >= 0) 474 if (req->type == REQ_READDIR)
316 free (req->data2ptr); 475 free (req->data2ptr);
317 476
318 Safefree (req); 477 Safefree (req);
319} 478}
320 479
480static void req_cancel_subs (aio_req grp)
481{
482 aio_req sub;
483
484 if (grp->type != REQ_GROUP)
485 return;
486
487 SvREFCNT_dec (grp->fh2);
488 grp->fh2 = 0;
489
490 for (sub = grp->grp_first; sub; sub = sub->grp_next)
491 req_cancel (sub);
492}
493
321static void req_cancel (aio_req req) 494static void req_cancel (aio_req req)
322{ 495{
323 req->cancelled = 1; 496 req->flags |= FLAG_CANCELLED;
324 497
325 if (req->type == REQ_GROUP) 498 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} 499}
333 500
334static int poll_cb () 501static int poll_cb (int max)
335{ 502{
336 dSP; 503 dSP;
337 int count = 0; 504 int count = 0;
338 int do_croak = 0; 505 int do_croak = 0;
339 aio_req req; 506 aio_req req;
340 507
341 for (;;) 508 while (max <= 0 || count < max)
342 { 509 {
343 pthread_mutex_lock (&reslock); 510 LOCK (reslock);
344 req = ress; 511 req = reqq_shift (&res_queue);
345 512
346 if (req) 513 if (req)
347 { 514 {
348 ress = req->next;
349
350 if (!ress) 515 if (!res_queue.size)
351 { 516 {
352 /* read any signals sent by the worker threads */ 517 /* read any signals sent by the worker threads */
353 char buf [32]; 518 char buf [32];
354 while (read (respipe [0], buf, 32) == 32) 519 while (read (respipe [0], buf, 32) == 32)
355 ; 520 ;
356
357 rese = 0;
358 } 521 }
359 } 522 }
360 523
361 pthread_mutex_unlock (&reslock); 524 UNLOCK (reslock);
362 525
363 if (!req) 526 if (!req)
364 break; 527 break;
365 528
366 --nreqs; 529 --nreqs;
401static void *aio_proc(void *arg); 564static void *aio_proc(void *arg);
402 565
403static void start_thread (void) 566static void start_thread (void)
404{ 567{
405 sigset_t fullsigset, oldsigset; 568 sigset_t fullsigset, oldsigset;
406 pthread_t tid;
407 pthread_attr_t attr; 569 pthread_attr_t attr;
570
571 worker *wrk = calloc (1, sizeof (worker));
572
573 if (!wrk)
574 croak ("unable to allocate worker thread data");
408 575
409 pthread_attr_init (&attr); 576 pthread_attr_init (&attr);
410 pthread_attr_setstacksize (&attr, STACKSIZE); 577 pthread_attr_setstacksize (&attr, STACKSIZE);
411 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 578 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
412 579
413 sigfillset (&fullsigset); 580 sigfillset (&fullsigset);
581
582 LOCK (wrklock);
414 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 583 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
415 584
416 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 585 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
586 {
587 wrk->prev = &wrk_first;
588 wrk->next = wrk_first.next;
589 wrk_first.next->prev = wrk;
590 wrk_first.next = wrk;
417 started++; 591 started++;
592 }
593 else
594 free (wrk);
418 595
419 sigprocmask (SIG_SETMASK, &oldsigset, 0); 596 sigprocmask (SIG_SETMASK, &oldsigset, 0);
597 UNLOCK (wrklock);
420} 598}
421 599
422static void req_send (aio_req req) 600static void req_send (aio_req req)
423{ 601{
424 while (started < wanted && nreqs >= started) 602 while (started < wanted && nreqs >= started)
425 start_thread (); 603 start_thread ();
426 604
427 ++nreqs; 605 ++nreqs;
428 606
429 pthread_mutex_lock (&reqlock); 607 LOCK (reqlock);
430 608 reqq_push (&req_queue, req);
431 req->next = 0;
432
433 if (reqe)
434 {
435 reqe->next = req;
436 reqe = req;
437 }
438 else
439 reqe = reqs = req;
440
441 pthread_cond_signal (&reqwait); 609 pthread_cond_signal (&reqwait);
442 pthread_mutex_unlock (&reqlock); 610 UNLOCK (reqlock);
443
444 if (nreqs > max_outstanding)
445 for (;;)
446 {
447 poll_cb ();
448
449 if (nreqs <= max_outstanding)
450 break;
451
452 poll_wait ();
453 }
454} 611}
455 612
456static void end_thread (void) 613static void end_thread (void)
457{ 614{
458 aio_req req; 615 aio_req req;
616
459 Newz (0, req, 1, aio_cb); 617 Newz (0, req, 1, aio_cb);
618
460 req->type = REQ_QUIT; 619 req->type = REQ_QUIT;
620 req->pri = PRI_MAX + PRI_BIAS;
461 621
462 req_send (req); 622 req_send (req);
463} 623}
464 624
465static void min_parallel (int nthreads) 625static void min_parallel (int nthreads)
482 } 642 }
483 643
484 while (started > wanted) 644 while (started > wanted)
485 { 645 {
486 poll_wait (); 646 poll_wait ();
487 poll_cb (); 647 poll_cb (0);
488 } 648 }
489} 649}
490 650
491static void create_pipe () 651static void create_pipe ()
492{ 652{
517static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 677static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
518{ 678{
519 ssize_t res; 679 ssize_t res;
520 off_t ooffset; 680 off_t ooffset;
521 681
522 pthread_mutex_lock (&preadwritelock); 682 LOCK (preadwritelock);
523 ooffset = lseek (fd, 0, SEEK_CUR); 683 ooffset = lseek (fd, 0, SEEK_CUR);
524 lseek (fd, offset, SEEK_SET); 684 lseek (fd, offset, SEEK_SET);
525 res = read (fd, buf, count); 685 res = read (fd, buf, count);
526 lseek (fd, ooffset, SEEK_SET); 686 lseek (fd, ooffset, SEEK_SET);
527 pthread_mutex_unlock (&preadwritelock); 687 UNLOCK (preadwritelock);
528 688
529 return res; 689 return res;
530} 690}
531 691
532static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 692static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
533{ 693{
534 ssize_t res; 694 ssize_t res;
535 off_t ooffset; 695 off_t ooffset;
536 696
537 pthread_mutex_lock (&preadwritelock); 697 LOCK (preadwritelock);
538 ooffset = lseek (fd, 0, SEEK_CUR); 698 ooffset = lseek (fd, 0, SEEK_CUR);
539 lseek (fd, offset, SEEK_SET); 699 lseek (fd, offset, SEEK_SET);
540 res = write (fd, buf, count); 700 res = write (fd, buf, count);
541 lseek (fd, offset, SEEK_SET); 701 lseek (fd, offset, SEEK_SET);
542 pthread_mutex_unlock (&preadwritelock); 702 UNLOCK (preadwritelock);
543 703
544 return res; 704 return res;
545} 705}
546#endif 706#endif
547 707
548#if !HAVE_FDATASYNC 708#if !HAVE_FDATASYNC
549# define fdatasync fsync 709# define fdatasync fsync
550#endif 710#endif
551 711
552#if !HAVE_READAHEAD 712#if !HAVE_READAHEAD
553# define readahead aio_readahead 713# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
554 714
555static ssize_t readahead (int fd, off_t offset, size_t count) 715static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
556{ 716{
557 char readahead_buf[4096]; 717 dBUF;
558 718
559 while (count > 0) 719 while (count > 0)
560 { 720 {
561 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 721 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
562 722
563 pread (fd, readahead_buf, len, offset); 723 pread (fd, aio_buf, len, offset);
564 offset += len; 724 offset += len;
565 count -= len; 725 count -= len;
566 } 726 }
567 727
568 errno = 0; 728 errno = 0;
569} 729}
730
570#endif 731#endif
571 732
572#if !HAVE_READDIR_R 733#if !HAVE_READDIR_R
573# define readdir_r aio_readdir_r 734# define readdir_r aio_readdir_r
574 735
577static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 738static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
578{ 739{
579 struct dirent *e; 740 struct dirent *e;
580 int errorno; 741 int errorno;
581 742
582 pthread_mutex_lock (&readdirlock); 743 LOCK (readdirlock);
583 744
584 e = readdir (dirp); 745 e = readdir (dirp);
585 errorno = errno; 746 errorno = errno;
586 747
587 if (e) 748 if (e)
590 strcpy (ent->d_name, e->d_name); 751 strcpy (ent->d_name, e->d_name);
591 } 752 }
592 else 753 else
593 *res = 0; 754 *res = 0;
594 755
595 pthread_mutex_unlock (&readdirlock); 756 UNLOCK (readdirlock);
596 757
597 errno = errorno; 758 errno = errorno;
598 return e ? 0 : -1; 759 return e ? 0 : -1;
599} 760}
600#endif 761#endif
601 762
602/* sendfile always needs emulation */ 763/* sendfile always needs emulation */
603static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 764static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
604{ 765{
605 ssize_t res; 766 ssize_t res;
606 767
607 if (!count) 768 if (!count)
608 return 0; 769 return 0;
619 { 780 {
620 off_t sbytes; 781 off_t sbytes;
621 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 782 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
622 783
623 if (res < 0 && sbytes) 784 if (res < 0 && sbytes)
624 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 785 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
625 res = sbytes; 786 res = sbytes;
626 } 787 }
627 788
628# elif __hpux 789# elif __hpux
629 res = sendfile (ofd, ifd, offset, count, 0, 0); 790 res = sendfile (ofd, ifd, offset, count, 0, 0);
657#endif 818#endif
658 ) 819 )
659 ) 820 )
660 { 821 {
661 /* emulate sendfile. this is a major pain in the ass */ 822 /* emulate sendfile. this is a major pain in the ass */
662 char buf[4096]; 823 dBUF;
824
663 res = 0; 825 res = 0;
664 826
665 while (count) 827 while (count)
666 { 828 {
667 ssize_t cnt; 829 ssize_t cnt;
668 830
669 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 831 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
670 832
671 if (cnt <= 0) 833 if (cnt <= 0)
672 { 834 {
673 if (cnt && !res) res = -1; 835 if (cnt && !res) res = -1;
674 break; 836 break;
675 } 837 }
676 838
677 cnt = write (ofd, buf, cnt); 839 cnt = write (ofd, aio_buf, cnt);
678 840
679 if (cnt <= 0) 841 if (cnt <= 0)
680 { 842 {
681 if (cnt && !res) res = -1; 843 if (cnt && !res) res = -1;
682 break; 844 break;
690 852
691 return res; 853 return res;
692} 854}
693 855
694/* read a full directory */ 856/* read a full directory */
695static int scandir_ (const char *path, void **namesp) 857static void scandir_ (aio_req req, worker *self)
696{ 858{
697 DIR *dirp = opendir (path); 859 DIR *dirp;
698 union 860 union
699 { 861 {
700 struct dirent d; 862 struct dirent d;
701 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 863 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
702 } u; 864 } *u;
703 struct dirent *entp; 865 struct dirent *entp;
704 char *name, *names; 866 char *name, *names;
705 int memlen = 4096; 867 int memlen = 4096;
706 int memofs = 0; 868 int memofs = 0;
707 int res = 0; 869 int res = 0;
708 int errorno; 870 int errorno;
709 871
710 if (!dirp) 872 LOCK (wrklock);
711 return -1; 873 self->dirp = dirp = opendir (req->dataptr);
712 874 self->dbuf = u = malloc (sizeof (*u));
713 names = malloc (memlen); 875 req->data2ptr = names = malloc (memlen);
876 UNLOCK (wrklock);
714 877
878 if (dirp && u && names)
715 for (;;) 879 for (;;)
716 { 880 {
881 errno = 0;
717 errno = 0, readdir_r (dirp, &u.d, &entp); 882 readdir_r (dirp, &u->d, &entp);
718 883
719 if (!entp) 884 if (!entp)
720 break; 885 break;
721 886
722 name = entp->d_name; 887 name = entp->d_name;
723 888
724 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 889 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
725 { 890 {
726 int len = strlen (name) + 1; 891 int len = strlen (name) + 1;
727 892
728 res++; 893 res++;
729 894
730 while (memofs + len > memlen) 895 while (memofs + len > memlen)
731 { 896 {
732 memlen *= 2; 897 memlen *= 2;
898 LOCK (wrklock);
733 names = realloc (names, memlen); 899 req->data2ptr = names = realloc (names, memlen);
900 UNLOCK (wrklock);
901
734 if (!names) 902 if (!names)
735 break; 903 break;
736 } 904 }
737 905
738 memcpy (names + memofs, name, len); 906 memcpy (names + memofs, name, len);
739 memofs += len; 907 memofs += len;
740 } 908 }
741 } 909 }
742 910
743 errorno = errno;
744 closedir (dirp);
745
746 if (errorno) 911 if (errno)
747 {
748 free (names);
749 errno = errorno;
750 res = -1; 912 res = -1;
751 } 913
752 914 req->result = res;
753 *namesp = (void *)names;
754 return res;
755} 915}
756 916
757/*****************************************************************************/ 917/*****************************************************************************/
758 918
759static void *aio_proc (void *thr_arg) 919static void *aio_proc (void *thr_arg)
760{ 920{
761 aio_req req; 921 aio_req req;
762 int type; 922 int type;
923 worker *self = (worker *)thr_arg;
763 924
764 do 925 do
765 { 926 {
766 pthread_mutex_lock (&reqlock); 927 LOCK (reqlock);
767 928
768 for (;;) 929 for (;;)
769 { 930 {
770 req = reqs; 931 self->req = req = reqq_shift (&req_queue);
771
772 if (reqs)
773 {
774 reqs = reqs->next;
775 if (!reqs) reqe = 0;
776 }
777 932
778 if (req) 933 if (req)
779 break; 934 break;
780 935
781 pthread_cond_wait (&reqwait, &reqlock); 936 pthread_cond_wait (&reqwait, &reqlock);
782 } 937 }
783 938
784 pthread_mutex_unlock (&reqlock); 939 UNLOCK (reqlock);
785 940
786 errno = 0; /* strictly unnecessary */ 941 errno = 0; /* strictly unnecessary */
787
788 if (!req->cancelled)
789 switch (type = req->type) /* remember type for QUIT check */ 942 type = req->type; /* remember type for QUIT check */
943
944 if (!(req->flags & FLAG_CANCELLED))
945 switch (type)
790 { 946 {
791 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
792 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 948 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
793 949
794 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
795 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 951 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
796 952
797 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
798 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
799 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
800 956
806 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
807 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
808 964
809 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
810 case REQ_FSYNC: req->result = fsync (req->fd); break; 966 case REQ_FSYNC: req->result = fsync (req->fd); break;
811 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 967 case REQ_READDIR: scandir_ (req, self); break;
812 968
813 case REQ_SLEEP: 969 case REQ_BUSY:
814 { 970 {
815 struct timeval tv; 971 struct timeval tv;
816 972
817 tv.tv_sec = req->fd; 973 tv.tv_sec = req->fd;
818 tv.tv_usec = req->fd2; 974 tv.tv_usec = req->fd2;
819 975
820 req->result = select (0, 0, 0, 0, &tv); 976 req->result = select (0, 0, 0, 0, &tv);
821 } 977 }
822 978
979 case REQ_GROUP:
980 case REQ_NOP:
823 case REQ_QUIT: 981 case REQ_QUIT:
824 break; 982 break;
825 983
826 default: 984 default:
827 req->result = ENOSYS; 985 req->result = ENOSYS;
828 break; 986 break;
829 } 987 }
830 988
831 req->errorno = errno; 989 req->errorno = errno;
832 990
833 pthread_mutex_lock (&reslock); 991 LOCK (reslock);
834 992
835 req->next = 0; 993 if (!reqq_push (&res_queue, req))
836
837 printf ("queue rese %p\n", rese);//D
838 if (rese)
839 {
840 rese->next = req;
841 rese = req;
842 }
843 else
844 {
845 rese = ress = req;
846
847 /* write a dummy byte to the pipe so fh becomes ready */ 994 /* write a dummy byte to the pipe so fh becomes ready */
848 write (respipe [1], &respipe, 1); 995 write (respipe [1], &respipe, 1);
849 }
850 996
851 pthread_mutex_unlock (&reslock); 997 self->req = 0;
998 worker_clear (self);
999
1000 UNLOCK (reslock);
852 } 1001 }
853 while (type != REQ_QUIT); 1002 while (type != REQ_QUIT);
854 1003
1004 LOCK (wrklock);
1005 worker_free (self);
1006 UNLOCK (wrklock);
1007
855 return 0; 1008 return 0;
856} 1009}
857 1010
858/*****************************************************************************/ 1011/*****************************************************************************/
859 1012
860static void atfork_prepare (void) 1013static void atfork_prepare (void)
861{ 1014{
862 pthread_mutex_lock (&reqlock); 1015 LOCK (wrklock);
863 pthread_mutex_lock (&reslock); 1016 LOCK (reqlock);
1017 LOCK (reslock);
864#if !HAVE_PREADWRITE 1018#if !HAVE_PREADWRITE
865 pthread_mutex_lock (&preadwritelock); 1019 LOCK (preadwritelock);
866#endif 1020#endif
867#if !HAVE_READDIR_R 1021#if !HAVE_READDIR_R
868 pthread_mutex_lock (&readdirlock); 1022 LOCK (readdirlock);
869#endif 1023#endif
870} 1024}
871 1025
872static void atfork_parent (void) 1026static void atfork_parent (void)
873{ 1027{
874#if !HAVE_READDIR_R 1028#if !HAVE_READDIR_R
875 pthread_mutex_unlock (&readdirlock); 1029 UNLOCK (readdirlock);
876#endif 1030#endif
877#if !HAVE_PREADWRITE 1031#if !HAVE_PREADWRITE
878 pthread_mutex_unlock (&preadwritelock); 1032 UNLOCK (preadwritelock);
879#endif 1033#endif
880 pthread_mutex_unlock (&reslock); 1034 UNLOCK (reslock);
881 pthread_mutex_unlock (&reqlock); 1035 UNLOCK (reqlock);
1036 UNLOCK (wrklock);
882} 1037}
883 1038
884static void atfork_child (void) 1039static void atfork_child (void)
885{ 1040{
886 aio_req prv; 1041 aio_req prv;
887 1042
1043 while (prv = reqq_shift (&req_queue))
1044 req_free (prv);
1045
1046 while (prv = reqq_shift (&res_queue))
1047 req_free (prv);
1048
1049 while (wrk_first.next != &wrk_first)
1050 {
1051 worker *wrk = wrk_first.next;
1052
1053 if (wrk->req)
1054 req_free (wrk->req);
1055
1056 worker_clear (wrk);
1057 worker_free (wrk);
1058 }
1059
888 started = 0; 1060 started = 0;
889 1061 nreqs = 0;
890 while (reqs)
891 {
892 prv = reqs;
893 reqs = prv->next;
894 req_free (prv);
895 }
896
897 reqs = reqe = 0;
898
899 while (ress)
900 {
901 prv = ress;
902 ress = prv->next;
903 req_free (prv);
904 }
905
906 ress = rese = 0;
907 1062
908 close (respipe [0]); 1063 close (respipe [0]);
909 close (respipe [1]); 1064 close (respipe [1]);
910 create_pipe (); 1065 create_pipe ();
911 1066
912 atfork_parent (); 1067 atfork_parent ();
913} 1068}
914 1069
915#define dREQ \ 1070#define dREQ \
916 aio_req req; \ 1071 aio_req req; \
1072 int req_pri = next_pri; \
1073 next_pri = DEFAULT_PRI + PRI_BIAS; \
917 \ 1074 \
918 if (SvOK (callback) && !SvROK (callback)) \ 1075 if (SvOK (callback) && !SvROK (callback)) \
919 croak ("callback must be undef or of reference type"); \ 1076 croak ("callback must be undef or of reference type"); \
920 \ 1077 \
921 Newz (0, req, 1, aio_cb); \ 1078 Newz (0, req, 1, aio_cb); \
922 if (!req) \ 1079 if (!req) \
923 croak ("out of memory during aio_req allocation"); \ 1080 croak ("out of memory during aio_req allocation"); \
924 \ 1081 \
925 req->callback = newSVsv (callback) 1082 req->callback = newSVsv (callback); \
1083 req->pri = req_pri
926 1084
927#define REQ_SEND \ 1085#define REQ_SEND \
928 req_send (req); \ 1086 req_send (req); \
929 \ 1087 \
930 if (GIMME_V != G_VOID) \ 1088 if (GIMME_V != G_VOID) \
952 1110
953void 1111void
954max_parallel (nthreads) 1112max_parallel (nthreads)
955 int nthreads 1113 int nthreads
956 PROTOTYPE: $ 1114 PROTOTYPE: $
957
958int
959max_outstanding (nreqs)
960 int nreqs
961 PROTOTYPE: $
962 CODE:
963 RETVAL = max_outstanding;
964 max_outstanding = nreqs;
965 1115
966void 1116void
967aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1117aio_open (pathname,flags,mode,callback=&PL_sv_undef)
968 SV * pathname 1118 SV * pathname
969 int flags 1119 int flags
1184 1334
1185 REQ_SEND; 1335 REQ_SEND;
1186} 1336}
1187 1337
1188void 1338void
1189aio_sleep (delay,callback=&PL_sv_undef) 1339aio_busy (delay,callback=&PL_sv_undef)
1190 double delay 1340 double delay
1191 SV * callback 1341 SV * callback
1192 PPCODE: 1342 PPCODE:
1193{ 1343{
1194 dREQ; 1344 dREQ;
1195 1345
1196 req->type = REQ_SLEEP; 1346 req->type = REQ_BUSY;
1197 req->fd = delay < 0. ? 0 : delay; 1347 req->fd = delay < 0. ? 0 : delay;
1198 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1199 1349
1200 REQ_SEND; 1350 REQ_SEND;
1201} 1351}
1205 SV * callback 1355 SV * callback
1206 PROTOTYPE: ;$ 1356 PROTOTYPE: ;$
1207 PPCODE: 1357 PPCODE:
1208{ 1358{
1209 dREQ; 1359 dREQ;
1360
1210 req->type = REQ_GROUP; 1361 req->type = REQ_GROUP;
1211 req_send (req); 1362 req_send (req);
1363
1212 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1364 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1213} 1365}
1366
1367void
1368aio_nop (callback=&PL_sv_undef)
1369 SV * callback
1370 PPCODE:
1371{
1372 dREQ;
1373
1374 req->type = REQ_NOP;
1375
1376 REQ_SEND;
1377}
1378
1379void
1380aioreq_pri (int pri = DEFAULT_PRI)
1381 CODE:
1382 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS;
1385
1386void
1387aioreq_nice (int nice = 0)
1388 CODE:
1389 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS;
1214 1393
1215void 1394void
1216flush () 1395flush ()
1217 PROTOTYPE: 1396 PROTOTYPE:
1218 CODE: 1397 CODE:
1219 while (nreqs) 1398 while (nreqs)
1220 { 1399 {
1221 poll_wait (); 1400 poll_wait ();
1222 poll_cb (); 1401 poll_cb (0);
1223 } 1402 }
1224 1403
1225void 1404void
1226poll() 1405poll()
1227 PROTOTYPE: 1406 PROTOTYPE:
1228 CODE: 1407 CODE:
1229 if (nreqs) 1408 if (nreqs)
1230 { 1409 {
1231 poll_wait (); 1410 poll_wait ();
1232 poll_cb (); 1411 poll_cb (0);
1233 } 1412 }
1234 1413
1235int 1414int
1236poll_fileno() 1415poll_fileno()
1237 PROTOTYPE: 1416 PROTOTYPE:
1242 1421
1243int 1422int
1244poll_cb(...) 1423poll_cb(...)
1245 PROTOTYPE: 1424 PROTOTYPE:
1246 CODE: 1425 CODE:
1247 RETVAL = poll_cb (); 1426 RETVAL = poll_cb (0);
1427 OUTPUT:
1428 RETVAL
1429
1430int
1431poll_some(int max = 0)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = poll_cb (max);
1248 OUTPUT: 1435 OUTPUT:
1249 RETVAL 1436 RETVAL
1250 1437
1251void 1438void
1252poll_wait() 1439poll_wait()
1267 1454
1268MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1455MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1269 1456
1270void 1457void
1271cancel (aio_req_ornot req) 1458cancel (aio_req_ornot req)
1272 PROTOTYPE:
1273 CODE: 1459 CODE:
1274 req_cancel (req); 1460 req_cancel (req);
1275 1461
1462void
1463cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1464 CODE:
1465 SvREFCNT_dec (req->callback);
1466 req->callback = newSVsv (callback);
1467
1276MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1468MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1277 1469
1278void 1470void
1279add (aio_req grp, ...) 1471add (aio_req grp, ...)
1280 PPCODE: 1472 PPCODE:
1281{ 1473{
1282 int i; 1474 int i;
1475 aio_req req;
1283 1476
1284 if (grp->fd == 2) 1477 if (grp->fd == 2)
1285 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1478 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1286 1479
1287 for (i = 1; i < items; ++i ) 1480 for (i = 1; i < items; ++i )
1288 { 1481 {
1289 if (GIMME_V != G_VOID) 1482 if (GIMME_V != G_VOID)
1290 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1483 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1291 1484
1292 aio_req req = SvAIO_REQ (ST (i)); 1485 req = SvAIO_REQ (ST (i));
1293 1486
1294 if (req) 1487 if (req)
1295 { 1488 {
1296 ++grp->length; 1489 ++grp->length;
1297 req->grp = grp; 1490 req->grp = grp;
1306 } 1499 }
1307 } 1500 }
1308} 1501}
1309 1502
1310void 1503void
1504cancel_subs (aio_req_ornot req)
1505 CODE:
1506 req_cancel_subs (req);
1507
1508void
1311result (aio_req grp, ...) 1509result (aio_req grp, ...)
1312 CODE: 1510 CODE:
1313{ 1511{
1314 int i; 1512 int i;
1315 AV *av = newAV (); 1513 AV *av = newAV ();
1320 SvREFCNT_dec (grp->data); 1518 SvREFCNT_dec (grp->data);
1321 grp->data = (SV *)av; 1519 grp->data = (SV *)av;
1322} 1520}
1323 1521
1324void 1522void
1325lock (aio_req grp)
1326 CODE:
1327 ++grp->length;
1328
1329void
1330unlock (aio_req grp)
1331 CODE:
1332 aio_grp_dec (grp);
1333
1334void
1335feeder_limit (aio_req grp, int limit) 1523limit (aio_req grp, int limit)
1336 CODE: 1524 CODE:
1337 grp->fd2 = limit; 1525 grp->fd2 = limit;
1338 aio_grp_feed (grp); 1526 aio_grp_feed (grp);
1339 1527
1340void 1528void
1341set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1529feed (aio_req grp, SV *callback=&PL_sv_undef)
1342 CODE: 1530 CODE:
1343{ 1531{
1344 SvREFCNT_dec (grp->fh2); 1532 SvREFCNT_dec (grp->fh2);
1345 grp->fh2 = newSVsv (callback); 1533 grp->fh2 = newSVsv (callback);
1346 1534

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines