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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines