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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines