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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines