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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines