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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines