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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines