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.103 by root, Sun Jul 8 09:09:34 2007 UTC vs.
Revision 1.115 by root, Sat May 10 18:06:41 2008 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines