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.85 by root, Sat Oct 28 23:32:29 2006 UTC vs.
Revision 1.126 by root, Thu Sep 25 07:56:07 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines