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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines