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.70 by root, Tue Oct 24 15:15:56 2006 UTC vs.
Revision 1.212 by root, Sun Apr 8 00:11:50 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines