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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines