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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines