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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines