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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines