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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines