ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines