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.74 by root, Wed Oct 25 17:57:30 2006 UTC vs.
Revision 1.141 by root, Sat Jun 6 17:25:13 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines