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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines