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.82 by root, Fri Oct 27 20:11:58 2006 UTC vs.
Revision 1.128 by root, Tue Sep 30 14:07:59 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines