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.79 by root, Thu Oct 26 16:28:33 2006 UTC vs.
Revision 1.136 by root, Sun Apr 19 13:15:55 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines