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.70 by root, Tue Oct 24 15:15:56 2006 UTC vs.
Revision 1.153 by root, Wed Jul 15 01:36:04 2009 UTC

1/* solaris */ 1#include "libeio/xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux
5# define _GNU_SOURCE
6#endif
7
8#define _REENTRANT 1
9 2
10#include <errno.h> 3#include <errno.h>
11 4
12#include "EXTERN.h" 5#include "EXTERN.h"
13#include "perl.h" 6#include "perl.h"
14#include "XSUB.h" 7#include "XSUB.h"
15 8
16#include "autoconf/config.h" 9#include "schmorp.h"
17
18#include <pthread.h>
19 10
20#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
21#include <errno.h> 13#include <errno.h>
22#include <sys/time.h>
23#include <sys/select.h>
24#include <sys/types.h> 14#include <sys/types.h>
25#include <sys/stat.h> 15#include <sys/stat.h>
26#include <limits.h> 16#include <limits.h>
27#include <unistd.h>
28#include <fcntl.h> 17#include <fcntl.h>
29#include <signal.h>
30#include <sched.h> 18#include <sched.h>
31 19
32#if HAVE_SENDFILE 20/* perl namespace pollution */
33# if __linux 21#undef VERSION
34# include <sys/sendfile.h> 22
35# elif __freebsd 23#ifdef _WIN32
36# include <sys/socket.h> 24
37# include <sys/uio.h> 25# define EIO_STRUCT_DIRENT Direntry_t
38# elif __hpux 26# undef malloc
39# include <sys/socket.h> 27# undef free
40# elif __solaris /* not yet */ 28
41# include <sys/sendfile.h> 29// perl overrides all those nice win32 functions
30# undef open
31# undef read
32# undef write
33# undef send
34# undef recv
35# undef stat
36# undef fstat
37# define lstat stat
38# undef truncate
39# undef ftruncate
40# undef open
41# undef close
42# undef unlink
43# undef rmdir
44# undef rename
45# undef lseek
46
47# define chown(a,b,c) (errno = ENOSYS, -1)
48# define fchown(a,b,c) (errno = ENOSYS, -1)
49# define fchmod(a,b) (errno = ENOSYS, -1)
50# define symlink(a,b) (errno = ENOSYS, -1)
51# define readlink(a,b,c) (errno = ENOSYS, -1)
52# define mknod(a,b,c) (errno = ENOSYS, -1)
53# define truncate(a,b) (errno = ENOSYS, -1)
54# define ftruncate(fd,o) chsize ((fd), (o))
55# define fsync(fd) _commit (fd)
56# define opendir(fd) (errno = ENOSYS, 0)
57# define readdir(fd) (errno = ENOSYS, -1)
58# define closedir(fd) (errno = ENOSYS, -1)
59# define mkdir(a,b) mkdir (a)
60
42# else 61#else
43# error sendfile support requested but not available 62
44# endif 63# include <sys/time.h>
64# include <sys/select.h>
65# include <unistd.h>
66# include <utime.h>
67# include <signal.h>
68# define EIO_STRUCT_DIRENT struct dirent
69
45#endif 70#endif
46 71
47/* used for struct dirent, AIX doesn't provide it */ 72/* perl stupidly overrides readdir and maybe others */
48#ifndef NAME_MAX 73/* with thread-unsafe versions, imagine that :( */
49# define NAME_MAX 4096 74#undef readdir
75#undef opendir
76#undef closedir
77
78#define EIO_STRUCT_STAT Stat_t
79
80/* use NV for 32 bit perls as it allows larger offsets */
81#if IVSIZE >= 8
82# define VAL64 IV
83# define SvVAL64 SvIV
84# define newSVval64 newSViv
85#else
86# define VAL64 NV
87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
50#endif 89#endif
51 90
52#if __ia64 91/*****************************************************************************/
53# define STACKSIZE 65536 92
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 93#if __GNUC__ >= 3
55# define STACKSIZE PTHREAD_STACK_MIN 94# define expect(expr,value) __builtin_expect ((expr),(value))
56#else 95#else
57# define STACKSIZE 16384 96# define expect(expr,value) (expr)
58#endif 97#endif
59 98
60/* buffer size for various temporary buffers */ 99#define expect_false(expr) expect ((expr) != 0, 0)
61#define AIO_BUFSIZE 65536 100#define expect_true(expr) expect ((expr) != 0, 1)
62 101
63#define dBUF \ 102/*****************************************************************************/
64 char *aio_buf = malloc (AIO_BUFSIZE); \
65 if (!aio_buf) \
66 return -1;
67 103
68#define fBUF free (aio_buf) 104static HV *stash;
69 105typedef SV SV8; /* byte-sv, used for argument-checking */
70enum { 106typedef int aio_rfd; /* read file desriptor */
71 REQ_QUIT, 107typedef int aio_wfd; /* write file descriptor */
72 REQ_OPEN, REQ_CLOSE,
73 REQ_READ, REQ_WRITE, REQ_READAHEAD,
74 REQ_SENDFILE,
75 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
76 REQ_FSYNC, REQ_FDATASYNC,
77 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
78 REQ_READDIR,
79 REQ_LINK, REQ_SYMLINK,
80 REQ_GROUP, REQ_NOP,
81 REQ_BUSY,
82};
83 108
84#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
85#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
86 111
87typedef struct aio_cb 112#define EIO_REQ_MEMBERS \
88{
89 struct aio_cb *volatile next;
90
91 SV *data, *callback; 113 SV *callback; \
92 SV *fh, *fh2; 114 SV *sv1, *sv2; \
93 void *dataptr, *data2ptr;
94 Stat_t *statdata;
95 off_t offset;
96 size_t length;
97 ssize_t result;
98
99 STRLEN dataoffset; 115 STRLEN stroffset; \
100 int type; 116 SV *self;
101 int fd, fd2;
102 int errorno;
103 mode_t mode; /* open */
104 117
105 unsigned char flags; 118#define EIO_NO_WRAPPERS 1
106 unsigned char pri;
107 119
108 SV *self; /* the perl counterpart of this request, if any */ 120#include "libeio/eio.h"
109 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 121
110} aio_cb; 122#ifndef POSIX_FADV_NORMAL
123# define POSIX_FADV_NORMAL 0
124# define NO_FADVISE 1
125#endif
126
127#ifndef POSIX_FADV_SEQUENTIAL
128# define POSIX_FADV_SEQUENTIAL 0
129#endif
130
131#ifndef POSIX_FADV_RANDOM
132# define POSIX_FADV_RANDOM 0
133#endif
134
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138
139#ifndef POSIX_FADV_WILLNEED
140# define POSIX_FADV_WILLNEED 0
141#endif
142
143#ifndef POSIX_FADV_DONTNEED
144# define POSIX_FADV_DONTNEED 0
145#endif
146
147static int req_invoke (eio_req *req);
148#define EIO_FINISH(req) req_invoke (req)
149static void req_destroy (eio_req *grp);
150#define EIO_DESTROY(req) req_destroy (req)
111 151
112enum { 152enum {
113 FLAG_CANCELLED = 0x01, 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
114}; 154};
115 155
156#include "libeio/eio.c"
157
116typedef aio_cb *aio_req; 158typedef eio_req *aio_req;
117typedef aio_cb *aio_req_ornot; 159typedef eio_req *aio_req_ornot;
118 160
119enum { 161static SV *on_next_submit;
120 PRI_MIN = -4, 162static int next_pri = EIO_PRI_DEFAULT;
121 PRI_MAX = 4,
122
123 DEFAULT_PRI = 0,
124 PRI_BIAS = -PRI_MIN,
125 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
126};
127
128static int next_pri = DEFAULT_PRI + PRI_BIAS;
129
130static int started, wanted;
131static volatile int nreqs;
132static int max_outstanding = 1<<30; 163static int max_outstanding;
164
133static int respipe [2]; 165static int respipe_osf [2];
166static s_epipe respipe;
134 167
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 168static void req_destroy (aio_req req);
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif
140
141static pthread_mutex_t reslock = AIO_MUTEX_INIT;
142static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
143static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
144
145/*
146 * a somewhat faster data structure might be nice, but
147 * with 8 priorities this actually needs <20 insns
148 * per shift, the most expensive operation.
149 */
150typedef struct {
151 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
152 int size;
153} reqq;
154
155static reqq req_queue;
156static reqq res_queue;
157
158int reqq_push (reqq *q, aio_req req)
159{
160 int pri = req->pri;
161 req->next = 0;
162
163 if (q->qe[pri])
164 {
165 q->qe[pri]->next = req;
166 q->qe[pri] = req;
167 }
168 else
169 q->qe[pri] = q->qs[pri] = req;
170
171 return q->size++;
172}
173
174aio_req reqq_shift (reqq *q)
175{
176 int pri;
177
178 if (!q->size)
179 return 0;
180
181 --q->size;
182
183 for (pri = NUM_PRI; pri--; )
184 {
185 aio_req req = q->qs[pri];
186
187 if (req)
188 {
189 if (!(q->qs[pri] = req->next))
190 q->qe[pri] = 0;
191
192 return req;
193 }
194 }
195
196 abort ();
197}
198
199static void req_invoke (aio_req req); 169static void req_cancel (aio_req req);
200static void req_free (aio_req req); 170
171static void want_poll (void)
172{
173 /* write a dummy byte to the pipe so fh becomes ready */
174 s_epipe_signal (&respipe);
175}
176
177static void done_poll (void)
178{
179 /* read any signals sent by the worker threads */
180 s_epipe_drain (&respipe);
181}
201 182
202/* must be called at most once */ 183/* must be called at most once */
203static SV *req_sv (aio_req req, const char *klass) 184static SV *req_sv (aio_req req, const char *klass)
204{ 185{
205 if (!req->self) 186 if (!req->self)
223 return mg ? (aio_req)mg->mg_ptr : 0; 204 return mg ? (aio_req)mg->mg_ptr : 0;
224} 205}
225 206
226static void aio_grp_feed (aio_req grp) 207static void aio_grp_feed (aio_req grp)
227{ 208{
228 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 209 if (grp->sv2 && SvOK (grp->sv2))
229 { 210 {
230 int old_len = grp->length;
231
232 if (grp->fh2 && SvOK (grp->fh2))
233 {
234 dSP; 211 dSP;
235 212
236 ENTER; 213 ENTER;
237 SAVETMPS; 214 SAVETMPS;
238 PUSHMARK (SP); 215 PUSHMARK (SP);
239 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 216 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
240 PUTBACK; 217 PUTBACK;
241 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 218 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
242 SPAGAIN; 219 SPAGAIN;
243 FREETMPS; 220 FREETMPS;
244 LEAVE; 221 LEAVE;
245 }
246
247 /* stop if no progress has been made */
248 if (old_len == grp->length)
249 {
250 SvREFCNT_dec (grp->fh2);
251 grp->fh2 = 0;
252 break;
253 }
254 } 222 }
255} 223}
256 224
257static void aio_grp_dec (aio_req grp) 225static void req_submit (eio_req *req)
258{ 226{
259 --grp->length; 227 eio_submit (req);
260 228
261 /* call feeder, if applicable */ 229 if (expect_false (on_next_submit))
262 aio_grp_feed (grp);
263
264 /* finish, if done */
265 if (!grp->length && grp->fd)
266 { 230 {
267 req_invoke (grp); 231 dSP;
268 req_free (grp); 232 SV *cb = sv_2mortal (on_next_submit);
233
234 on_next_submit = 0;
235
236 PUSHMARK (SP);
237 PUTBACK;
238 call_sv (cb, G_DISCARD | G_EVAL);
269 } 239 }
270} 240}
271 241
272static void poll_wait () 242static int req_invoke (eio_req *req)
273{ 243{
274 fd_set rfd; 244 dSP;
275 245
276 while (nreqs) 246 if (req->flags & FLAG_SV2_RO_OFF)
247 SvREADONLY_off (req->sv2);
248
249 if (!EIO_CANCELLED (req) && req->callback)
277 { 250 {
278 int size;
279#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
280 pthread_mutex_lock (&reslock);
281#endif
282 size = res_queue.size;
283#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
284 pthread_mutex_unlock (&reslock);
285#endif
286
287 if (size)
288 return;
289
290 FD_ZERO(&rfd);
291 FD_SET(respipe [0], &rfd);
292
293 select (respipe [0] + 1, &rfd, 0, 0, 0);
294 }
295}
296
297static void req_invoke (aio_req req)
298{
299 dSP;
300
301 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
302 {
303 errno = req->errorno;
304
305 ENTER; 251 ENTER;
306 SAVETMPS; 252 SAVETMPS;
307 PUSHMARK (SP); 253 PUSHMARK (SP);
308 EXTEND (SP, 1); 254 EXTEND (SP, 1);
309 255
310 switch (req->type) 256 switch (req->type)
311 { 257 {
312 case REQ_READDIR: 258 case EIO_READDIR:
313 { 259 {
314 SV *rv = &PL_sv_undef; 260 SV *rv = &PL_sv_undef;
315 261
316 if (req->result >= 0) 262 if (req->result >= 0)
317 { 263 {
264 int i;
318 char *buf = req->data2ptr; 265 char *names = (char *)req->ptr2;
266 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
319 AV *av = newAV (); 267 AV *av = newAV ();
320 268
321 while (req->result) 269 av_extend (av, req->result - 1);
270
271 for (i = 0; i < req->result; ++i)
322 { 272 {
273 if (req->int1 & EIO_READDIR_DENTS)
274 {
275 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
276
277 if (req->int1 & EIO_READDIR_CUSTOM2)
278 {
279 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
280 AV *avent = newAV ();
281
282 av_extend (avent, 2);
283
284 if (!sv_type [ent->type])
285 {
286 sv_type [ent->type] = newSViv (ent->type);
287 SvREADONLY_on (sv_type [ent->type]);
288 }
289
290 av_store (avent, 0, namesv);
291 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
292 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
293
294 av_store (av, i, newRV_noinc ((SV *)avent));
295 }
296 else
297 av_store (av, i, namesv);
298
299 ++ent;
300 }
301 else
302 {
323 SV *sv = newSVpv (buf, 0); 303 SV *name = newSVpv (names, 0);
324
325 av_push (av, sv); 304 av_store (av, i, name);
326 buf += SvCUR (sv) + 1; 305 names += SvCUR (name) + 1;
327 req->result--; 306 }
328 } 307 }
329 308
330 rv = sv_2mortal (newRV_noinc ((SV *)av)); 309 rv = sv_2mortal (newRV_noinc ((SV *)av));
331 } 310 }
332 311
333 PUSHs (rv); 312 PUSHs (rv);
313
314 if (req->int1 & EIO_READDIR_CUSTOM1)
315 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
334 } 316 }
335 break; 317 break;
336 318
337 case REQ_OPEN: 319 case EIO_OPEN:
338 { 320 {
339 /* convert fd to fh */ 321 /* convert fd to fh */
340 SV *fh; 322 SV *fh = &PL_sv_undef;
341 323
342 PUSHs (sv_2mortal (newSViv (req->result))); 324 if (req->result >= 0)
343 PUTBACK; 325 {
344 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 326 GV *gv = (GV *)sv_newmortal ();
345 SPAGAIN; 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
328 char sym [64];
329 int symlen;
330
331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
332 gv_init (gv, stash, sym, symlen, 0);
346 333
347 fh = SvREFCNT_inc (POPs); 334 symlen = snprintf (
335 sym,
336 sizeof (sym),
337 "%s&=%d",
338 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
339 (int)req->result
340 );
348 341
342 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
343 fh = (SV *)gv;
344 }
345
349 PUSHMARK (SP); 346 PUSHs (fh);
350 XPUSHs (sv_2mortal (fh));
351 } 347 }
352 break; 348 break;
353 349
354 case REQ_GROUP: 350 case EIO_GROUP:
355 req->fd = 2; /* mark group as finished */ 351 req->int1 = 2; /* mark group as finished */
356 352
357 if (req->data) 353 if (req->sv1)
358 { 354 {
359 int i; 355 int i;
360 AV *av = (AV *)req->data; 356 AV *av = (AV *)req->sv1;
361 357
362 EXTEND (SP, AvFILL (av) + 1); 358 EXTEND (SP, AvFILL (av) + 1);
363 for (i = 0; i <= AvFILL (av); ++i) 359 for (i = 0; i <= AvFILL (av); ++i)
364 PUSHs (*av_fetch (av, i, 0)); 360 PUSHs (*av_fetch (av, i, 0));
365 } 361 }
366 break; 362 break;
367 363
368 case REQ_NOP: 364 case EIO_NOP:
369 case REQ_BUSY: 365 case EIO_BUSY:
370 break; 366 break;
367
368 case EIO_READLINK:
369 if (req->result > 0)
370 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
371 break;
372
373 case EIO_STAT:
374 case EIO_LSTAT:
375 case EIO_FSTAT:
376 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
377 PL_laststatval = req->result;
378 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
379 PUSHs (sv_2mortal (newSViv (req->result)));
380 break;
381
382 case EIO_READ:
383 {
384 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
385 *SvEND (req->sv2) = 0;
386 SvPOK_only (req->sv2);
387 SvSETMAGIC (req->sv2);
388 PUSHs (sv_2mortal (newSViv (req->result)));
389 }
390 break;
391
392 case EIO_DUP2:
393 if (req->result > 0)
394 req->result = 0;
395 /* FALLTHROUGH */
371 396
372 default: 397 default:
373 PUSHs (sv_2mortal (newSViv (req->result))); 398 PUSHs (sv_2mortal (newSViv (req->result)));
374 break; 399 break;
375 } 400 }
376 401
402 errno = req->errorno;
377 403
378 PUTBACK; 404 PUTBACK;
379 call_sv (req->callback, G_VOID | G_EVAL); 405 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
380 SPAGAIN; 406 SPAGAIN;
381 407
382 FREETMPS; 408 FREETMPS;
383 LEAVE; 409 LEAVE;
410
411 PUTBACK;
384 } 412 }
385 413
386 if (req->grp) 414 return !!SvTRUE (ERRSV);
387 {
388 aio_req grp = req->grp;
389
390 /* unlink request */
391 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
392 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
393
394 if (grp->grp_first == req)
395 grp->grp_first = req->grp_next;
396
397 aio_grp_dec (grp);
398 }
399
400 if (SvTRUE (ERRSV))
401 {
402 req_free (req);
403 croak (0);
404 }
405} 415}
406 416
407static void req_free (aio_req req) 417static void req_destroy (aio_req req)
408{ 418{
409 if (req->self) 419 if (req->self)
410 { 420 {
411 sv_unmagic (req->self, PERL_MAGIC_ext); 421 sv_unmagic (req->self, PERL_MAGIC_ext);
412 SvREFCNT_dec (req->self); 422 SvREFCNT_dec (req->self);
413 } 423 }
414 424
415 SvREFCNT_dec (req->data);
416 SvREFCNT_dec (req->fh); 425 SvREFCNT_dec (req->sv1);
417 SvREFCNT_dec (req->fh2); 426 SvREFCNT_dec (req->sv2);
418 SvREFCNT_dec (req->callback); 427 SvREFCNT_dec (req->callback);
419 Safefree (req->statdata);
420
421 if (req->type == REQ_READDIR && req->result >= 0)
422 free (req->data2ptr);
423 428
424 Safefree (req); 429 Safefree (req);
425} 430}
426 431
427static void req_cancel (aio_req req) 432static void req_cancel_subs (aio_req grp)
428{ 433{
429 req->flags |= FLAG_CANCELLED; 434 aio_req sub;
430 435
431 if (req->type == REQ_GROUP) 436 if (grp->type != EIO_GROUP)
437 return;
438
439 SvREFCNT_dec (grp->sv2);
440 grp->sv2 = 0;
441
442 eio_grp_cancel (grp);
443}
444
445static void
446create_respipe (void)
447{
448 if (s_epipe_renew (&respipe))
449 croak ("unable to initialize result pipe");
450
451 respipe_osf [0] = S_TO_SOCKET (respipe.fd [0]);
452 respipe_osf [1] = S_TO_SOCKET (respipe.fd [1]);
453}
454
455static void poll_wait (void)
456{
457 while (eio_nreqs ())
432 { 458 {
433 aio_req sub; 459 int size;
434 460
435 for (sub = req->grp_first; sub; sub = sub->grp_next) 461 X_LOCK (reslock);
436 req_cancel (sub); 462 size = res_queue.size;
463 X_UNLOCK (reslock);
464
465 if (size)
466 return;
467
468 etp_maybe_start_thread ();
469
470 s_epipe_wait (&respipe);
437 } 471 }
438} 472}
439 473
440static int poll_cb () 474static int poll_cb (void)
441{ 475{
442 dSP;
443 int count = 0;
444 int do_croak = 0;
445 aio_req req;
446
447 for (;;) 476 for (;;)
448 { 477 {
449 pthread_mutex_lock (&reslock); 478 int res = eio_poll ();
450 req = reqq_shift (&res_queue);
451 479
452 if (req) 480 if (res > 0)
453 {
454 if (!res_queue.size)
455 {
456 /* read any signals sent by the worker threads */
457 char buf [32];
458 while (read (respipe [0], buf, 32) == 32)
459 ;
460 }
461 }
462
463 pthread_mutex_unlock (&reslock);
464
465 if (!req)
466 break; 481 croak (0);
467 482
468 --nreqs; 483 if (!max_outstanding || max_outstanding > eio_nreqs ())
484 return res;
469 485
470 if (req->type == REQ_QUIT) 486 poll_wait ();
471 started--;
472 else if (req->type == REQ_GROUP && req->length)
473 {
474 req->fd = 1; /* mark request as delayed */
475 continue;
476 }
477 else
478 {
479 if (req->type == REQ_READ)
480 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
481
482 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
483 SvREADONLY_off (req->data);
484
485 if (req->statdata)
486 {
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(req->statdata);
490 }
491
492 req_invoke (req);
493
494 count++;
495 }
496
497 req_free (req);
498 } 487 }
499
500 return count;
501}
502
503static void *aio_proc(void *arg);
504
505static void start_thread (void)
506{
507 sigset_t fullsigset, oldsigset;
508 pthread_t tid;
509 pthread_attr_t attr;
510
511 pthread_attr_init (&attr);
512 pthread_attr_setstacksize (&attr, STACKSIZE);
513 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
514
515 sigfillset (&fullsigset);
516 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
517
518 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
519 started++;
520
521 sigprocmask (SIG_SETMASK, &oldsigset, 0);
522}
523
524static void req_send (aio_req req)
525{
526 while (started < wanted && nreqs >= started)
527 start_thread ();
528
529 ++nreqs;
530
531 pthread_mutex_lock (&reqlock);
532 reqq_push (&req_queue, req);
533 pthread_cond_signal (&reqwait);
534 pthread_mutex_unlock (&reqlock);
535
536 if (nreqs > max_outstanding)
537 for (;;)
538 {
539 poll_cb ();
540
541 if (nreqs <= max_outstanding)
542 break;
543
544 poll_wait ();
545 }
546}
547
548static void end_thread (void)
549{
550 aio_req req;
551
552 Newz (0, req, 1, aio_cb);
553
554 req->type = REQ_QUIT;
555 req->pri = PRI_MAX + PRI_BIAS;
556
557 req_send (req);
558}
559
560static void min_parallel (int nthreads)
561{
562 if (wanted < nthreads)
563 wanted = nthreads;
564}
565
566static void max_parallel (int nthreads)
567{
568 int cur = started;
569
570 if (wanted > nthreads)
571 wanted = nthreads;
572
573 while (cur > wanted)
574 {
575 end_thread ();
576 cur--;
577 }
578
579 while (started > wanted)
580 {
581 poll_wait ();
582 poll_cb ();
583 }
584}
585
586static void create_pipe ()
587{
588 if (pipe (respipe))
589 croak ("unable to initialize result pipe");
590
591 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
592 croak ("cannot set result pipe to nonblocking mode");
593
594 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
595 croak ("cannot set result pipe to nonblocking mode");
596}
597
598/*****************************************************************************/
599/* work around various missing functions */
600
601#if !HAVE_PREADWRITE
602# define pread aio_pread
603# define pwrite aio_pwrite
604
605/*
606 * make our pread/pwrite safe against themselves, but not against
607 * normal read/write by using a mutex. slows down execution a lot,
608 * but that's your problem, not mine.
609 */
610static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
611
612static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
613{
614 ssize_t res;
615 off_t ooffset;
616
617 pthread_mutex_lock (&preadwritelock);
618 ooffset = lseek (fd, 0, SEEK_CUR);
619 lseek (fd, offset, SEEK_SET);
620 res = read (fd, buf, count);
621 lseek (fd, ooffset, SEEK_SET);
622 pthread_mutex_unlock (&preadwritelock);
623
624 return res;
625}
626
627static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
628{
629 ssize_t res;
630 off_t ooffset;
631
632 pthread_mutex_lock (&preadwritelock);
633 ooffset = lseek (fd, 0, SEEK_CUR);
634 lseek (fd, offset, SEEK_SET);
635 res = write (fd, buf, count);
636 lseek (fd, offset, SEEK_SET);
637 pthread_mutex_unlock (&preadwritelock);
638
639 return res;
640}
641#endif
642
643#if !HAVE_FDATASYNC
644# define fdatasync fsync
645#endif
646
647#if !HAVE_READAHEAD
648# define readahead aio_readahead
649
650static ssize_t readahead (int fd, off_t offset, size_t count)
651{
652 dBUF;
653
654 while (count > 0)
655 {
656 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
657
658 pread (fd, aio_buf, len, offset);
659 offset += len;
660 count -= len;
661 }
662
663 fBUF;
664
665 errno = 0;
666}
667#endif
668
669#if !HAVE_READDIR_R
670# define readdir_r aio_readdir_r
671
672static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
673
674static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
675{
676 struct dirent *e;
677 int errorno;
678
679 pthread_mutex_lock (&readdirlock);
680
681 e = readdir (dirp);
682 errorno = errno;
683
684 if (e)
685 {
686 *res = ent;
687 strcpy (ent->d_name, e->d_name);
688 }
689 else
690 *res = 0;
691
692 pthread_mutex_unlock (&readdirlock);
693
694 errno = errorno;
695 return e ? 0 : -1;
696}
697#endif
698
699/* sendfile always needs emulation */
700static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
701{
702 ssize_t res;
703
704 if (!count)
705 return 0;
706
707#if HAVE_SENDFILE
708# if __linux
709 res = sendfile (ofd, ifd, &offset, count);
710
711# elif __freebsd
712 /*
713 * Of course, the freebsd sendfile is a dire hack with no thoughts
714 * wasted on making it similar to other I/O functions.
715 */
716 {
717 off_t sbytes;
718 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
719
720 if (res < 0 && sbytes)
721 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
722 res = sbytes;
723 }
724
725# elif __hpux
726 res = sendfile (ofd, ifd, offset, count, 0, 0);
727
728# elif __solaris
729 {
730 struct sendfilevec vec;
731 size_t sbytes;
732
733 vec.sfv_fd = ifd;
734 vec.sfv_flag = 0;
735 vec.sfv_off = offset;
736 vec.sfv_len = count;
737
738 res = sendfilev (ofd, &vec, 1, &sbytes);
739
740 if (res < 0 && sbytes)
741 res = sbytes;
742 }
743
744# endif
745#else
746 res = -1;
747 errno = ENOSYS;
748#endif
749
750 if (res < 0
751 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
752#if __solaris
753 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
754#endif
755 )
756 )
757 {
758 /* emulate sendfile. this is a major pain in the ass */
759 dBUF;
760
761 res = 0;
762
763 while (count)
764 {
765 ssize_t cnt;
766
767 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
768
769 if (cnt <= 0)
770 {
771 if (cnt && !res) res = -1;
772 break;
773 }
774
775 cnt = write (ofd, aio_buf, cnt);
776
777 if (cnt <= 0)
778 {
779 if (cnt && !res) res = -1;
780 break;
781 }
782
783 offset += cnt;
784 res += cnt;
785 count -= cnt;
786 }
787
788 fBUF;
789 }
790
791 return res;
792}
793
794/* read a full directory */
795static int scandir_ (const char *path, void **namesp)
796{
797 DIR *dirp;
798 union
799 {
800 struct dirent d;
801 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
802 } *u;
803 struct dirent *entp;
804 char *name, *names;
805 int memlen = 4096;
806 int memofs = 0;
807 int res = 0;
808 int errorno;
809
810 dirp = opendir (path);
811 if (!dirp)
812 return -1;
813
814 u = malloc (sizeof (*u));
815 names = malloc (memlen);
816
817 if (u && names)
818 for (;;)
819 {
820 errno = 0;
821 readdir_r (dirp, &u->d, &entp);
822
823 if (!entp)
824 break;
825
826 name = entp->d_name;
827
828 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
829 {
830 int len = strlen (name) + 1;
831
832 res++;
833
834 while (memofs + len > memlen)
835 {
836 memlen *= 2;
837 names = realloc (names, memlen);
838 if (!names)
839 break;
840 }
841
842 memcpy (names + memofs, name, len);
843 memofs += len;
844 }
845 }
846
847 errorno = errno;
848 free (u);
849 closedir (dirp);
850
851 if (errorno)
852 {
853 free (names);
854 errno = errorno;
855 res = -1;
856 }
857
858 *namesp = (void *)names;
859 return res;
860}
861
862/*****************************************************************************/
863
864static void *aio_proc (void *thr_arg)
865{
866 aio_req req;
867 int type;
868
869 do
870 {
871 pthread_mutex_lock (&reqlock);
872
873 for (;;)
874 {
875 req = reqq_shift (&req_queue);
876
877 if (req)
878 break;
879
880 pthread_cond_wait (&reqwait, &reqlock);
881 }
882
883 pthread_mutex_unlock (&reqlock);
884
885 errno = 0; /* strictly unnecessary */
886 type = req->type; /* remember type for QUIT check */
887
888 if (!(req->flags & FLAG_CANCELLED))
889 switch (type)
890 {
891 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
892 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
893
894 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
895 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
896
897 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
898 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
899 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
900
901 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
902 case REQ_CLOSE: req->result = close (req->fd); break;
903 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
904 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
905 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
906 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
907 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
908
909 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
910 case REQ_FSYNC: req->result = fsync (req->fd); break;
911 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
912
913 case REQ_BUSY:
914 {
915 struct timeval tv;
916
917 tv.tv_sec = req->fd;
918 tv.tv_usec = req->fd2;
919
920 req->result = select (0, 0, 0, 0, &tv);
921 }
922
923 case REQ_GROUP:
924 case REQ_NOP:
925 case REQ_QUIT:
926 break;
927
928 default:
929 req->result = ENOSYS;
930 break;
931 }
932
933 req->errorno = errno;
934
935 pthread_mutex_lock (&reslock);
936
937 if (!reqq_push (&res_queue, req))
938 /* write a dummy byte to the pipe so fh becomes ready */
939 write (respipe [1], &respipe, 1);
940
941 pthread_mutex_unlock (&reslock);
942 }
943 while (type != REQ_QUIT);
944
945 return 0;
946}
947
948/*****************************************************************************/
949
950static void atfork_prepare (void)
951{
952 pthread_mutex_lock (&reqlock);
953 pthread_mutex_lock (&reslock);
954#if !HAVE_PREADWRITE
955 pthread_mutex_lock (&preadwritelock);
956#endif
957#if !HAVE_READDIR_R
958 pthread_mutex_lock (&readdirlock);
959#endif
960}
961
962static void atfork_parent (void)
963{
964#if !HAVE_READDIR_R
965 pthread_mutex_unlock (&readdirlock);
966#endif
967#if !HAVE_PREADWRITE
968 pthread_mutex_unlock (&preadwritelock);
969#endif
970 pthread_mutex_unlock (&reslock);
971 pthread_mutex_unlock (&reqlock);
972} 488}
973 489
974static void atfork_child (void) 490static void atfork_child (void)
975{ 491{
976 aio_req prv;
977
978 started = 0;
979
980 while (prv = reqq_shift (&req_queue))
981 req_free (prv);
982
983 while (prv = reqq_shift (&res_queue))
984 req_free (prv);
985
986 close (respipe [0]);
987 close (respipe [1]);
988 create_pipe (); 492 create_respipe ();
493}
989 494
990 atfork_parent (); 495static SV *
496get_cb (SV *cb_sv)
497{
498 SvGETMAGIC (cb_sv);
499 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
991} 500}
992 501
993#define dREQ \ 502#define dREQ \
503 SV *cb_cv; \
994 aio_req req; \ 504 aio_req req; \
995 int req_pri = next_pri; \ 505 int req_pri = next_pri; \
996 next_pri = DEFAULT_PRI + PRI_BIAS; \ 506 next_pri = EIO_PRI_DEFAULT; \
997 \ 507 \
998 if (SvOK (callback) && !SvROK (callback)) \ 508 cb_cv = get_cb (callback); \
999 croak ("callback must be undef or of reference type"); \
1000 \ 509 \
1001 Newz (0, req, 1, aio_cb); \ 510 Newz (0, req, 1, eio_req); \
1002 if (!req) \ 511 if (!req) \
1003 croak ("out of memory during aio_req allocation"); \ 512 croak ("out of memory during eio_req allocation"); \
1004 \ 513 \
1005 req->callback = newSVsv (callback); \ 514 req->callback = SvREFCNT_inc (cb_cv); \
1006 req->pri = req_pri 515 req->pri = req_pri
1007 516
1008#define REQ_SEND \ 517#define REQ_SEND \
518 PUTBACK; \
1009 req_send (req); \ 519 req_submit (req); \
520 SPAGAIN; \
1010 \ 521 \
1011 if (GIMME_V != G_VOID) \ 522 if (GIMME_V != G_VOID) \
1012 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 523 XPUSHs (req_sv (req, AIO_REQ_KLASS));
1013 524
1014MODULE = IO::AIO PACKAGE = IO::AIO 525MODULE = IO::AIO PACKAGE = IO::AIO
1015 526
1016PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
1017 528
1018BOOT: 529BOOT:
1019{ 530{
531 static const struct {
532 const char *name;
533 IV iv;
534 } *civ, const_iv[] = {
535# define const_iv(name, value) { # name, (IV) value },
536# define const_eio(name) { # name, (IV) EIO_ ## name },
537 const_iv (EXDEV , EXDEV)
538 const_iv (ENOSYS , ENOSYS)
539 const_iv (O_RDONLY, O_RDONLY)
540 const_iv (O_WRONLY, O_WRONLY)
541 const_iv (O_CREAT , O_CREAT)
542 const_iv (O_TRUNC , O_TRUNC)
543#ifndef _WIN32
544 const_iv (S_IFIFO , S_IFIFO)
545#endif
546 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
547 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
548 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
549 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
550 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
551 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
552
553 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
554 const_eio (SYNC_FILE_RANGE_WRITE)
555 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
556
557 const_eio (READDIR_DENTS)
558 const_eio (READDIR_DIRS_FIRST)
559 const_eio (READDIR_STAT_ORDER)
560 const_eio (READDIR_FOUND_UNKNOWN)
561
562 const_eio (DT_UNKNOWN)
563 const_eio (DT_FIFO)
564 const_eio (DT_CHR)
565 const_eio (DT_DIR)
566 const_eio (DT_BLK)
567 const_eio (DT_REG)
568 const_eio (DT_LNK)
569 const_eio (DT_SOCK)
570 const_eio (DT_WHT)
571 };
572
1020 HV *stash = gv_stashpv ("IO::AIO", 1); 573 stash = gv_stashpv ("IO::AIO", 1);
1021 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1022 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1023 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1024 574
575 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
576 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
577
1025 create_pipe (); 578 create_respipe ();
1026 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1027}
1028 579
580 if (eio_init (want_poll, done_poll) < 0)
581 croak ("IO::AIO: unable to initialise eio library");
582
583 /* atfork child called in fifo order, so before eio's handler */
584 X_THREAD_ATFORK (0, 0, atfork_child);
585}
586
1029void 587void
1030min_parallel (nthreads) 588max_poll_reqs (int nreqs)
1031 int nthreads
1032 PROTOTYPE: $ 589 PROTOTYPE: $
590 CODE:
591 eio_set_max_poll_reqs (nreqs);
1033 592
1034void 593void
1035max_parallel (nthreads) 594max_poll_time (double nseconds)
1036 int nthreads
1037 PROTOTYPE: $ 595 PROTOTYPE: $
1038
1039int
1040max_outstanding (nreqs)
1041 int nreqs
1042 PROTOTYPE: $
1043 CODE: 596 CODE:
1044 RETVAL = max_outstanding; 597 eio_set_max_poll_time (nseconds);
598
599void
600min_parallel (int nthreads)
601 PROTOTYPE: $
602 CODE:
603 eio_set_min_parallel (nthreads);
604
605void
606max_parallel (int nthreads)
607 PROTOTYPE: $
608 CODE:
609 eio_set_max_parallel (nthreads);
610
611void
612max_idle (int nthreads)
613 PROTOTYPE: $
614 CODE:
615 eio_set_max_idle (nthreads);
616
617void
618max_outstanding (int maxreqs)
619 PROTOTYPE: $
620 CODE:
1045 max_outstanding = nreqs; 621 max_outstanding = maxreqs;
1046 622
1047void 623void
1048aio_open (pathname,flags,mode,callback=&PL_sv_undef) 624aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1049 SV * pathname
1050 int flags
1051 int mode
1052 SV * callback
1053 PROTOTYPE: $$$;$ 625 PROTOTYPE: $$$;$
1054 PPCODE: 626 PPCODE:
1055{ 627{
1056 dREQ; 628 dREQ;
1057 629
1058 req->type = REQ_OPEN; 630 req->type = EIO_OPEN;
1059 req->data = newSVsv (pathname); 631 req->sv1 = newSVsv (pathname);
1060 req->dataptr = SvPVbyte_nolen (req->data); 632 req->ptr1 = SvPVbyte_nolen (req->sv1);
1061 req->fd = flags; 633 req->int1 = flags;
1062 req->mode = mode; 634 req->int2 = mode;
1063 635
1064 REQ_SEND; 636 REQ_SEND;
1065} 637}
1066 638
1067void 639void
1068aio_close (fh,callback=&PL_sv_undef) 640aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1069 SV * fh
1070 SV * callback
1071 PROTOTYPE: $;$ 641 PROTOTYPE: $;$
1072 ALIAS: 642 ALIAS:
1073 aio_close = REQ_CLOSE
1074 aio_fsync = REQ_FSYNC 643 aio_fsync = EIO_FSYNC
1075 aio_fdatasync = REQ_FDATASYNC 644 aio_fdatasync = EIO_FDATASYNC
1076 PPCODE: 645 PPCODE:
1077{ 646{
647 int fd = s_fileno_croak (fh, 0);
1078 dREQ; 648 dREQ;
1079 649
1080 req->type = ix; 650 req->type = ix;
1081 req->fh = newSVsv (fh); 651 req->sv1 = newSVsv (fh);
1082 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 652 req->int1 = fd;
1083 653
1084 REQ_SEND (req); 654 REQ_SEND (req);
1085} 655}
1086 656
1087void 657void
658aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
659 PROTOTYPE: $$$$;$
660 PPCODE:
661{
662 int fd = s_fileno_croak (fh, 0);
663 dREQ;
664
665 req->type = EIO_SYNC_FILE_RANGE;
666 req->sv1 = newSVsv (fh);
667 req->int1 = fd;
668 req->offs = offset;
669 req->size = nbytes;
670 req->int2 = flags;
671
672 REQ_SEND (req);
673}
674
675void
676aio_close (SV *fh, SV *callback=&PL_sv_undef)
677 PROTOTYPE: $;$
678 PPCODE:
679{
680 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
681 int fd = s_fileno_croak (fh, 0);
682 dREQ;
683
684 if (close_pipe < 0)
685 {
686 int pipefd [2];
687
688 if (pipe (pipefd) < 0
689 || close (pipefd [1]) < 0
690 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
691 abort (); /*D*/
692
693 close_pipe = pipefd [0];
694 }
695
696 req->type = EIO_DUP2;
697 req->int1 = close_pipe;
698 req->sv2 = newSVsv (fh);
699 req->int2 = fd;
700
701 REQ_SEND (req);
702}
703
704void
1088aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 705aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1089 SV * fh
1090 UV offset
1091 UV length
1092 SV * data
1093 UV dataoffset
1094 SV * callback
1095 ALIAS: 706 ALIAS:
1096 aio_read = REQ_READ 707 aio_read = EIO_READ
1097 aio_write = REQ_WRITE 708 aio_write = EIO_WRITE
1098 PROTOTYPE: $$$$$;$ 709 PROTOTYPE: $$$$$;$
1099 PPCODE: 710 PPCODE:
1100{ 711{
1101 aio_req req;
1102 STRLEN svlen; 712 STRLEN svlen;
713 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
1103 char *svptr = SvPVbyte (data, svlen); 714 char *svptr = SvPVbyte (data, svlen);
1104 715 UV len = SvUV (length);
1105 SvUPGRADE (data, SVt_PV);
1106 SvPOK_on (data);
1107 716
1108 if (dataoffset < 0) 717 if (dataoffset < 0)
1109 dataoffset += svlen; 718 dataoffset += svlen;
1110 719
1111 if (dataoffset < 0 || dataoffset > svlen) 720 if (dataoffset < 0 || dataoffset > svlen)
1112 croak ("data offset outside of string"); 721 croak ("dataoffset outside of data scalar");
1113 722
1114 if (ix == REQ_WRITE) 723 if (ix == EIO_WRITE)
1115 { 724 {
1116 /* write: check length and adjust. */ 725 /* write: check length and adjust. */
1117 if (length < 0 || length + dataoffset > svlen) 726 if (!SvOK (length) || len + dataoffset > svlen)
1118 length = svlen - dataoffset; 727 len = svlen - dataoffset;
1119 } 728 }
1120 else 729 else
1121 { 730 {
1122 /* read: grow scalar as necessary */ 731 /* read: check type and grow scalar as necessary */
732 SvUPGRADE (data, SVt_PV);
1123 svptr = SvGROW (data, length + dataoffset); 733 svptr = SvGROW (data, len + dataoffset + 1);
1124 } 734 }
1125
1126 if (length < 0)
1127 croak ("length must not be negative");
1128 735
1129 { 736 {
1130 dREQ; 737 dREQ;
1131 738
1132 req->type = ix; 739 req->type = ix;
1133 req->fh = newSVsv (fh); 740 req->sv1 = newSVsv (fh);
1134 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 741 req->int1 = fd;
1135 : IoOFP (sv_2io (fh))); 742 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1136 req->offset = offset; 743 req->size = len;
1137 req->length = length;
1138 req->data = SvREFCNT_inc (data); 744 req->sv2 = SvREFCNT_inc (data);
1139 req->dataptr = (char *)svptr + dataoffset; 745 req->ptr2 = (char *)svptr + dataoffset;
746 req->stroffset = dataoffset;
1140 747
1141 if (!SvREADONLY (data)) 748 if (!SvREADONLY (data))
1142 { 749 {
1143 SvREADONLY_on (data); 750 SvREADONLY_on (data);
1144 req->data2ptr = (void *)data; 751 req->flags |= FLAG_SV2_RO_OFF;
1145 } 752 }
1146 753
1147 REQ_SEND; 754 REQ_SEND;
1148 } 755 }
1149} 756}
1150 757
1151void 758void
759aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
760 PROTOTYPE: $$;$
761 PPCODE:
762{
763 SV *data;
764 dREQ;
765
766 req->type = EIO_READLINK;
767 req->sv1 = newSVsv (path);
768 req->ptr1 = SvPVbyte_nolen (req->sv1);
769
770 REQ_SEND;
771}
772
773void
1152aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 774aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1153 SV * out_fh
1154 SV * in_fh
1155 UV in_offset
1156 UV length
1157 SV * callback
1158 PROTOTYPE: $$$$;$ 775 PROTOTYPE: $$$$;$
1159 PPCODE: 776 PPCODE:
1160{ 777{
778 int ifd = s_fileno_croak (in_fh , 0);
779 int ofd = s_fileno_croak (out_fh, 1);
1161 dREQ; 780 dREQ;
1162 781
1163 req->type = REQ_SENDFILE; 782 req->type = EIO_SENDFILE;
1164 req->fh = newSVsv (out_fh); 783 req->sv1 = newSVsv (out_fh);
1165 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 784 req->int1 = ofd;
1166 req->fh2 = newSVsv (in_fh); 785 req->sv2 = newSVsv (in_fh);
1167 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 786 req->int2 = ifd;
1168 req->offset = in_offset; 787 req->offs = in_offset;
1169 req->length = length; 788 req->size = length;
1170 789
1171 REQ_SEND; 790 REQ_SEND;
1172} 791}
1173 792
1174void 793void
1175aio_readahead (fh,offset,length,callback=&PL_sv_undef) 794aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1176 SV * fh
1177 UV offset
1178 IV length
1179 SV * callback
1180 PROTOTYPE: $$$;$ 795 PROTOTYPE: $$$;$
1181 PPCODE: 796 PPCODE:
1182{ 797{
798 int fd = s_fileno_croak (fh, 0);
1183 dREQ; 799 dREQ;
1184 800
1185 req->type = REQ_READAHEAD; 801 req->type = EIO_READAHEAD;
1186 req->fh = newSVsv (fh); 802 req->sv1 = newSVsv (fh);
1187 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 803 req->int1 = fd;
1188 req->offset = offset; 804 req->offs = offset;
1189 req->length = length; 805 req->size = length;
1190 806
1191 REQ_SEND; 807 REQ_SEND;
1192} 808}
1193 809
1194void 810void
1195aio_stat (fh_or_path,callback=&PL_sv_undef) 811aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1196 SV * fh_or_path
1197 SV * callback
1198 ALIAS: 812 ALIAS:
1199 aio_stat = REQ_STAT 813 aio_stat = EIO_STAT
1200 aio_lstat = REQ_LSTAT 814 aio_lstat = EIO_LSTAT
1201 PPCODE: 815 PPCODE:
1202{ 816{
1203 dREQ; 817 dREQ;
1204 818
1205 New (0, req->statdata, 1, Stat_t); 819 req->sv1 = newSVsv (fh_or_path);
1206 if (!req->statdata)
1207 {
1208 req_free (req);
1209 croak ("out of memory during aio_req->statdata allocation");
1210 }
1211 820
1212 if (SvPOK (fh_or_path)) 821 if (SvPOK (req->sv1))
1213 { 822 {
1214 req->type = ix; 823 req->type = ix;
1215 req->data = newSVsv (fh_or_path);
1216 req->dataptr = SvPVbyte_nolen (req->data); 824 req->ptr1 = SvPVbyte_nolen (req->sv1);
1217 } 825 }
1218 else 826 else
1219 { 827 {
1220 req->type = REQ_FSTAT; 828 req->type = EIO_FSTAT;
1221 req->fh = newSVsv (fh_or_path);
1222 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 829 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1223 } 830 }
1224 831
1225 REQ_SEND; 832 REQ_SEND;
1226} 833}
1227 834
1228void 835void
836aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
837 PPCODE:
838{
839 dREQ;
840
841 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
842 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
843 req->sv1 = newSVsv (fh_or_path);
844
845 if (SvPOK (req->sv1))
846 {
847 req->type = EIO_UTIME;
848 req->ptr1 = SvPVbyte_nolen (req->sv1);
849 }
850 else
851 {
852 req->type = EIO_FUTIME;
853 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
854 }
855
856 REQ_SEND;
857}
858
859void
860aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
861 PPCODE:
862{
863 dREQ;
864
865 req->sv1 = newSVsv (fh_or_path);
866 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
867
868 if (SvPOK (req->sv1))
869 {
870 req->type = EIO_TRUNCATE;
871 req->ptr1 = SvPVbyte_nolen (req->sv1);
872 }
873 else
874 {
875 req->type = EIO_FTRUNCATE;
876 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
877 }
878
879 REQ_SEND;
880}
881
882void
883aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
884 ALIAS:
885 aio_chmod = EIO_CHMOD
886 aio_mkdir = EIO_MKDIR
887 PPCODE:
888{
889 dREQ;
890
891 req->int2 = mode;
892 req->sv1 = newSVsv (fh_or_path);
893
894 if (SvPOK (req->sv1))
895 {
896 req->type = ix;
897 req->ptr1 = SvPVbyte_nolen (req->sv1);
898 }
899 else
900 {
901 req->type = EIO_FCHMOD;
902 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
903 }
904
905 REQ_SEND;
906}
907
908void
909aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
910 PPCODE:
911{
912 dREQ;
913
914 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
915 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
916 req->sv1 = newSVsv (fh_or_path);
917
918 if (SvPOK (req->sv1))
919 {
920 req->type = EIO_CHOWN;
921 req->ptr1 = SvPVbyte_nolen (req->sv1);
922 }
923 else
924 {
925 req->type = EIO_FCHOWN;
926 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
927 }
928
929 REQ_SEND;
930}
931
932void
933aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
934 PPCODE:
935{
936 dREQ;
937
938 req->type = EIO_READDIR;
939 req->sv1 = newSVsv (pathname);
940 req->ptr1 = SvPVbyte_nolen (req->sv1);
941 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
942
943 if (flags & EIO_READDIR_DENTS)
944 req->int1 |= EIO_READDIR_CUSTOM2;
945
946 REQ_SEND;
947}
948
949void
1229aio_unlink (pathname,callback=&PL_sv_undef) 950aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1230 SV * pathname
1231 SV * callback
1232 ALIAS: 951 ALIAS:
1233 aio_unlink = REQ_UNLINK 952 aio_unlink = EIO_UNLINK
1234 aio_rmdir = REQ_RMDIR 953 aio_rmdir = EIO_RMDIR
1235 aio_readdir = REQ_READDIR 954 aio_readdir = EIO_READDIR
1236 PPCODE: 955 PPCODE:
1237{ 956{
1238 dREQ; 957 dREQ;
1239 958
1240 req->type = ix; 959 req->type = ix;
1241 req->data = newSVsv (pathname); 960 req->sv1 = newSVsv (pathname);
1242 req->dataptr = SvPVbyte_nolen (req->data); 961 req->ptr1 = SvPVbyte_nolen (req->sv1);
962
963 REQ_SEND;
964}
965
966void
967aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
968 ALIAS:
969 aio_link = EIO_LINK
970 aio_symlink = EIO_SYMLINK
971 aio_rename = EIO_RENAME
972 PPCODE:
973{
974 dREQ;
975
976 req->type = ix;
977 req->sv1 = newSVsv (oldpath);
978 req->ptr1 = SvPVbyte_nolen (req->sv1);
979 req->sv2 = newSVsv (newpath);
980 req->ptr2 = SvPVbyte_nolen (req->sv2);
1243 981
1244 REQ_SEND; 982 REQ_SEND;
1245} 983}
1246 984
1247void 985void
1248aio_link (oldpath,newpath,callback=&PL_sv_undef) 986aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1249 SV * oldpath
1250 SV * newpath
1251 SV * callback
1252 ALIAS:
1253 aio_link = REQ_LINK
1254 aio_symlink = REQ_SYMLINK
1255 aio_rename = REQ_RENAME
1256 PPCODE: 987 PPCODE:
1257{ 988{
1258 dREQ; 989 dREQ;
1259 990
1260 req->type = ix; 991 req->type = EIO_MKNOD;
1261 req->fh = newSVsv (oldpath); 992 req->sv1 = newSVsv (pathname);
1262 req->data2ptr = SvPVbyte_nolen (req->fh); 993 req->ptr1 = SvPVbyte_nolen (req->sv1);
1263 req->data = newSVsv (newpath); 994 req->int2 = (mode_t)mode;
1264 req->dataptr = SvPVbyte_nolen (req->data); 995 req->offs = dev;
1265 996
1266 REQ_SEND; 997 REQ_SEND;
1267} 998}
1268 999
1269void 1000void
1270aio_busy (delay,callback=&PL_sv_undef) 1001aio_busy (double delay, SV *callback=&PL_sv_undef)
1271 double delay
1272 SV * callback
1273 PPCODE: 1002 PPCODE:
1274{ 1003{
1275 dREQ; 1004 dREQ;
1276 1005
1277 req->type = REQ_BUSY; 1006 req->type = EIO_BUSY;
1278 req->fd = delay < 0. ? 0 : delay; 1007 req->nv1 = delay < 0. ? 0. : delay;
1279 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1280 1008
1281 REQ_SEND; 1009 REQ_SEND;
1282} 1010}
1283 1011
1284void 1012void
1285aio_group (callback=&PL_sv_undef) 1013aio_group (SV *callback=&PL_sv_undef)
1286 SV * callback
1287 PROTOTYPE: ;$ 1014 PROTOTYPE: ;$
1288 PPCODE: 1015 PPCODE:
1289{ 1016{
1290 dREQ; 1017 dREQ;
1291 1018
1292 req->type = REQ_GROUP; 1019 req->type = EIO_GROUP;
1020
1293 req_send (req); 1021 req_submit (req);
1294
1295 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1022 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1296} 1023}
1297 1024
1298void 1025void
1299aio_nop (callback=&PL_sv_undef) 1026aio_nop (SV *callback=&PL_sv_undef)
1300 SV * callback 1027 ALIAS:
1028 aio_nop = EIO_NOP
1029 aio_sync = EIO_SYNC
1301 PPCODE: 1030 PPCODE:
1302{ 1031{
1303 dREQ; 1032 dREQ;
1304 1033
1305 req->type = REQ_NOP; 1034 req->type = ix;
1306 1035
1307 REQ_SEND; 1036 REQ_SEND;
1308} 1037}
1309 1038
1310void 1039int
1311aioreq_pri (int pri = DEFAULT_PRI) 1040aioreq_pri (int pri = 0)
1312 CODE: 1041 PROTOTYPE: ;$
1042 CODE:
1043 RETVAL = next_pri;
1044 if (items > 0)
1045 {
1313 if (pri < PRI_MIN) pri = PRI_MIN; 1046 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
1314 if (pri > PRI_MAX) pri = PRI_MAX; 1047 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
1315 next_pri = pri + PRI_BIAS; 1048 next_pri = pri;
1049 }
1050 OUTPUT:
1051 RETVAL
1316 1052
1317void 1053void
1318aioreq_nice (int nice = 0) 1054aioreq_nice (int nice = 0)
1319 CODE: 1055 CODE:
1320 nice = next_pri - nice; 1056 nice = next_pri - nice;
1321 if (nice < PRI_MIN) nice = PRI_MIN; 1057 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1322 if (nice > PRI_MAX) nice = PRI_MAX; 1058 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1323 next_pri = nice + PRI_BIAS; 1059 next_pri = nice;
1324 1060
1325void 1061void
1326flush () 1062flush ()
1327 PROTOTYPE: 1063 PROTOTYPE:
1328 CODE: 1064 CODE:
1329 while (nreqs) 1065 while (eio_nreqs ())
1330 { 1066 {
1331 poll_wait (); 1067 poll_wait ();
1332 poll_cb (); 1068 poll_cb ();
1333 } 1069 }
1334 1070
1335void 1071int
1336poll() 1072poll()
1337 PROTOTYPE: 1073 PROTOTYPE:
1338 CODE: 1074 CODE:
1339 if (nreqs)
1340 {
1341 poll_wait (); 1075 poll_wait ();
1342 poll_cb (); 1076 RETVAL = poll_cb ();
1343 } 1077 OUTPUT:
1078 RETVAL
1344 1079
1345int 1080int
1346poll_fileno() 1081poll_fileno()
1347 PROTOTYPE: 1082 PROTOTYPE:
1348 CODE: 1083 CODE:
1349 RETVAL = respipe [0]; 1084 RETVAL = s_epipe_fd (&respipe);
1350 OUTPUT: 1085 OUTPUT:
1351 RETVAL 1086 RETVAL
1352 1087
1353int 1088int
1354poll_cb(...) 1089poll_cb(...)
1360 1095
1361void 1096void
1362poll_wait() 1097poll_wait()
1363 PROTOTYPE: 1098 PROTOTYPE:
1364 CODE: 1099 CODE:
1365 if (nreqs)
1366 poll_wait (); 1100 poll_wait ();
1367 1101
1368int 1102int
1369nreqs() 1103nreqs()
1370 PROTOTYPE: 1104 PROTOTYPE:
1371 CODE: 1105 CODE:
1372 RETVAL = nreqs; 1106 RETVAL = eio_nreqs ();
1373 OUTPUT: 1107 OUTPUT:
1374 RETVAL 1108 RETVAL
1375 1109
1110int
1111nready()
1112 PROTOTYPE:
1113 CODE:
1114 RETVAL = eio_nready ();
1115 OUTPUT:
1116 RETVAL
1117
1118int
1119npending()
1120 PROTOTYPE:
1121 CODE:
1122 RETVAL = eio_npending ();
1123 OUTPUT:
1124 RETVAL
1125
1126int
1127nthreads()
1128 PROTOTYPE:
1129 CODE:
1130 RETVAL = eio_nthreads ();
1131 OUTPUT:
1132 RETVAL
1133
1134int
1135fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1136 PROTOTYPE: $$$$
1137 CODE:
1138#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1139 RETVAL = posix_fadvise (fh, offset, length, advice);
1140#else
1141 RETVAL = errno = ENOSYS;
1142#endif
1143 OUTPUT:
1144 RETVAL
1145
1146ssize_t
1147sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1148 PROTOTYPE: $$$$
1149 CODE:
1150 eio_sendfile_sync (ofh, ifh, offset, count);
1151
1152void _on_next_submit (SV *cb)
1153 CODE:
1154 SvREFCNT_dec (on_next_submit);
1155 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1156
1376PROTOTYPES: DISABLE 1157PROTOTYPES: DISABLE
1377 1158
1378MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1159MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1379 1160
1380void 1161void
1381cancel (aio_req_ornot req) 1162cancel (aio_req_ornot req)
1382 CODE: 1163 CODE:
1383 req_cancel (req); 1164 eio_cancel (req);
1384 1165
1385void 1166void
1386cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1167cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1387 CODE: 1168 PPCODE:
1169{
1170 if (GIMME_V != G_VOID)
1171 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1172
1173 if (items > 1)
1174 {
1175 SV *cb_cv =get_cb (callback);
1176
1388 SvREFCNT_dec (req->callback); 1177 SvREFCNT_dec (req->callback);
1389 req->callback = newSVsv (callback); 1178 req->callback = SvREFCNT_inc (cb_cv);
1179 }
1180}
1390 1181
1391MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1182MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1392 1183
1393void 1184void
1394add (aio_req grp, ...) 1185add (aio_req grp, ...)
1395 PPCODE: 1186 PPCODE:
1396{ 1187{
1397 int i; 1188 int i;
1398 aio_req req;
1399 1189
1400 if (grp->fd == 2) 1190 if (grp->int1 == 2)
1401 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1191 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1402 1192
1403 for (i = 1; i < items; ++i ) 1193 for (i = 1; i < items; ++i )
1404 { 1194 {
1195 aio_req req;
1196
1405 if (GIMME_V != G_VOID) 1197 if (GIMME_V != G_VOID)
1406 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1198 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1407 1199
1408 req = SvAIO_REQ (ST (i)); 1200 req = SvAIO_REQ (ST (i));
1409 1201
1410 if (req) 1202 if (req)
1411 { 1203 eio_grp_add (grp, req);
1412 ++grp->length;
1413 req->grp = grp;
1414
1415 req->grp_prev = 0;
1416 req->grp_next = grp->grp_first;
1417
1418 if (grp->grp_first)
1419 grp->grp_first->grp_prev = req;
1420
1421 grp->grp_first = req;
1422 } 1204 }
1423 }
1424} 1205}
1206
1207void
1208cancel_subs (aio_req_ornot req)
1209 CODE:
1210 req_cancel_subs (req);
1425 1211
1426void 1212void
1427result (aio_req grp, ...) 1213result (aio_req grp, ...)
1428 CODE: 1214 CODE:
1429{ 1215{
1430 int i; 1216 int i;
1217 AV *av;
1218
1219 grp->errorno = errno;
1220
1431 AV *av = newAV (); 1221 av = newAV ();
1222 av_extend (av, items - 1);
1432 1223
1433 for (i = 1; i < items; ++i ) 1224 for (i = 1; i < items; ++i )
1434 av_push (av, newSVsv (ST (i))); 1225 av_push (av, newSVsv (ST (i)));
1435 1226
1436 SvREFCNT_dec (grp->data); 1227 SvREFCNT_dec (grp->sv1);
1437 grp->data = (SV *)av; 1228 grp->sv1 = (SV *)av;
1438} 1229}
1230
1231void
1232errno (aio_req grp, int errorno = errno)
1233 CODE:
1234 grp->errorno = errorno;
1439 1235
1440void 1236void
1441limit (aio_req grp, int limit) 1237limit (aio_req grp, int limit)
1442 CODE: 1238 CODE:
1443 grp->fd2 = limit; 1239 eio_grp_limit (grp, limit);
1444 aio_grp_feed (grp);
1445 1240
1446void 1241void
1447feed (aio_req grp, SV *callback=&PL_sv_undef) 1242feed (aio_req grp, SV *callback=&PL_sv_undef)
1448 CODE: 1243 CODE:
1449{ 1244{
1450 SvREFCNT_dec (grp->fh2); 1245 SvREFCNT_dec (grp->sv2);
1451 grp->fh2 = newSVsv (callback); 1246 grp->sv2 = newSVsv (callback);
1247 grp->feed = aio_grp_feed;
1452 1248
1453 if (grp->fd2 <= 0) 1249 if (grp->int2 <= 0)
1454 grp->fd2 = 2; 1250 grp->int2 = 2;
1455 1251
1456 aio_grp_feed (grp); 1252 eio_grp_limit (grp, grp->int2);
1457} 1253}
1458 1254

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines