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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines