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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines