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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines