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.67 by root, Tue Oct 24 03:17:39 2006 UTC vs.
Revision 1.148 by root, Wed Jun 17 01:14:48 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines