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.97 by root, Sun Jan 7 22:59:57 2007 UTC vs.
Revision 1.170 by root, Wed Aug 4 16:09:36 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines