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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines