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.4 by root, Sun Jul 10 20:57:00 2005 UTC vs.
Revision 1.140 by root, Wed Jun 3 12:24:49 2009 UTC

1#define PERL_NO_GET_CONTEXT 1#include "libeio/xthread.h"
2
3#include <errno.h>
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
9#include <stddef.h>
10#include <stdlib.h>
11#include <errno.h>
7#include <sys/types.h> 12#include <sys/types.h>
8#include <sys/stat.h> 13#include <sys/stat.h>
9#include <unistd.h> 14#include <limits.h>
10#include <fcntl.h> 15#include <fcntl.h>
11#include <signal.h>
12#include <sched.h> 16#include <sched.h>
13#include <endian.h>
14 17
15#include <pthread.h> 18/* perl namespace pollution */
16#include <sys/syscall.h> 19#undef VERSION
17 20
18typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21#ifdef _WIN32
19typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
20typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */
21 22
22#if __ia64 23# define EIO_STRUCT_DIRENT Direntry_t
23# define STACKSIZE 65536 24# undef malloc
25# undef free
26
27// perl overrides all those nice win32 functions
28# undef open
29# undef read
30# undef write
31# undef send
32# undef recv
33# undef stat
34# undef fstat
35# define lstat stat
36# undef truncate
37# undef ftruncate
38# undef open
39# undef close
40# undef unlink
41# undef rmdir
42# undef rename
43# undef lseek
44
45# define chown(a,b,c) (errno = ENOSYS, -1)
46# define fchown(a,b,c) (errno = ENOSYS, -1)
47# define fchmod(a,b) (errno = ENOSYS, -1)
48# define symlink(a,b) (errno = ENOSYS, -1)
49# define readlink(a,b,c) (errno = ENOSYS, -1)
50# define mknod(a,b,c) (errno = ENOSYS, -1)
51# define truncate(a,b) (errno = ENOSYS, -1)
52# define ftruncate(fd,o) chsize ((fd), (o))
53# define fsync(fd) _commit (fd)
54# define opendir(fd) (errno = ENOSYS, 0)
55# define readdir(fd) (errno = ENOSYS, -1)
56# define closedir(fd) (errno = ENOSYS, -1)
57# define mkdir(a,b) mkdir (a)
58
24#else 59#else
25# define STACKSIZE 4096 60
61# include <sys/time.h>
62# include <sys/select.h>
63# include <unistd.h>
64# include <utime.h>
65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent
67
26#endif 68#endif
27 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
76#define EIO_STRUCT_STAT Stat_t
77
78/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8
80# define SvVAL64 SvIV
81#else
82# define SvVAL64 SvNV
83#endif
84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
98static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */
100
101#define AIO_REQ_KLASS "IO::AIO::REQ"
102#define AIO_GRP_KLASS "IO::AIO::GRP"
103
104#define EIO_REQ_MEMBERS \
105 SV *callback; \
106 SV *sv1, *sv2; \
107 STRLEN stroffset; \
108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
111
112#include "libeio/eio.h"
113
114static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req)
118
28enum { 119enum {
29 REQ_QUIT, 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
30 REQ_OPEN, REQ_CLOSE,
31 REQ_READ, REQ_WRITE, REQ_READAHEAD,
32 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK,
33 REQ_FSYNC, REQ_FDATASYNC,
34}; 121};
35 122
36typedef struct aio_cb { 123#include "libeio/eio.c"
37 struct aio_cb *volatile next;
38 124
39 int type;
40
41 int fd;
42 off_t offset;
43 size_t length;
44 ssize_t result;
45 mode_t mode; /* open */
46 int errorno;
47 SV *data, *callback;
48 void *dataptr;
49 STRLEN dataoffset;
50
51 Stat_t *statdata;
52} aio_cb;
53
54typedef aio_cb *aio_req; 125typedef eio_req *aio_req;
126typedef eio_req *aio_req_ornot;
55 127
56static int started; 128static SV *on_next_submit;
57static int nreqs; 129static int next_pri = EIO_PRI_DEFAULT;
58static int max_outstanding = 1<<30; 130static int max_outstanding;
59static int respipe [2];
60 131
61static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
62static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
63static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
64 133
65static volatile aio_req reqs, reqe; /* queue start, queue end */ 134static void req_destroy (aio_req req);
66static volatile aio_req ress, rese; /* queue start, queue end */ 135static void req_cancel (aio_req req);
136
137static void want_poll (void)
138{
139 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
141}
142
143static void done_poll (void)
144{
145 /* read any signals sent by the worker threads */
146 char buf [4];
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149}
150
151/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass)
153{
154 if (!req->self)
155 {
156 req->self = (SV *)newHV ();
157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
158 }
159
160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
161}
162
163static aio_req SvAIO_REQ (SV *sv)
164{
165 MAGIC *mg;
166
167 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
168 croak ("object of class " AIO_REQ_KLASS " expected");
169
170 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
171
172 return mg ? (aio_req)mg->mg_ptr : 0;
173}
174
175static void aio_grp_feed (aio_req grp)
176{
177 if (grp->sv2 && SvOK (grp->sv2))
178 {
179 dSP;
180
181 ENTER;
182 SAVETMPS;
183 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185 PUTBACK;
186 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN;
188 FREETMPS;
189 LEAVE;
190 }
191}
192
193static void req_submit (eio_req *req)
194{
195 eio_submit (req);
196
197 if (expect_false (on_next_submit))
198 {
199 dSP;
200 SV *cb = sv_2mortal (on_next_submit);
201
202 on_next_submit = 0;
203
204 PUSHMARK (SP);
205 PUTBACK;
206 call_sv (cb, G_DISCARD | G_EVAL);
207 }
208}
209
210static int req_invoke (eio_req *req)
211{
212 dSP;
213
214 if (req->flags & FLAG_SV2_RO_OFF)
215 SvREADONLY_off (req->sv2);
216
217 if (!EIO_CANCELLED (req) && req->callback)
218 {
219 ENTER;
220 SAVETMPS;
221 PUSHMARK (SP);
222 EXTEND (SP, 1);
223
224 switch (req->type)
225 {
226 case EIO_READDIR:
227 {
228 SV *rv = &PL_sv_undef;
229
230 if (req->result >= 0)
231 {
232 int i;
233 char *buf = req->ptr2;
234 AV *av = newAV ();
235
236 av_extend (av, req->result - 1);
237
238 for (i = 0; i < req->result; ++i)
239 {
240 SV *sv = newSVpv (buf, 0);
241
242 av_store (av, i, sv);
243 buf += SvCUR (sv) + 1;
244 }
245
246 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 }
248
249 PUSHs (rv);
250 }
251 break;
252
253 case EIO_OPEN:
254 {
255 /* convert fd to fh */
256 SV *fh = &PL_sv_undef;
257
258 if (req->result >= 0)
259 {
260 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64];
263 int symlen;
264
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);
266 gv_init (gv, stash, sym, symlen, 0);
267
268 symlen = snprintf (
269 sym,
270 sizeof (sym),
271 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result
274 );
275
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv;
278 }
279
280 PUSHs (fh);
281 }
282 break;
283
284 case EIO_GROUP:
285 req->int1 = 2; /* mark group as finished */
286
287 if (req->sv1)
288 {
289 int i;
290 AV *av = (AV *)req->sv1;
291
292 EXTEND (SP, AvFILL (av) + 1);
293 for (i = 0; i <= AvFILL (av); ++i)
294 PUSHs (*av_fetch (av, i, 0));
295 }
296 break;
297
298 case EIO_NOP:
299 case EIO_BUSY:
300 break;
301
302 case EIO_READLINK:
303 if (req->result > 0)
304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
305 break;
306
307 case EIO_STAT:
308 case EIO_LSTAT:
309 case EIO_FSTAT:
310 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
311 PL_laststatval = req->result;
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result)));
314 break;
315
316 case EIO_READ:
317 {
318 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
324 break;
325
326 case EIO_DUP2:
327 if (req->result > 0)
328 req->result = 0;
329 /* FALLTHROUGH */
330
331 default:
332 PUSHs (sv_2mortal (newSViv (req->result)));
333 break;
334 }
335
336 errno = req->errorno;
337
338 PUTBACK;
339 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
340 SPAGAIN;
341
342 FREETMPS;
343 LEAVE;
344
345 PUTBACK;
346 }
347
348 return !!SvTRUE (ERRSV);
349}
350
351static void req_destroy (aio_req req)
352{
353 if (req->self)
354 {
355 sv_unmagic (req->self, PERL_MAGIC_ext);
356 SvREFCNT_dec (req->self);
357 }
358
359 SvREFCNT_dec (req->sv1);
360 SvREFCNT_dec (req->sv2);
361 SvREFCNT_dec (req->callback);
362
363 Safefree (req);
364}
365
366static void req_cancel_subs (aio_req grp)
367{
368 aio_req sub;
369
370 if (grp->type != EIO_GROUP)
371 return;
372
373 SvREFCNT_dec (grp->sv2);
374 grp->sv2 = 0;
375
376 eio_grp_cancel (grp);
377}
378
379#ifdef USE_SOCKETS_AS_HANDLES
380# define TO_SOCKET(x) (win32_get_osfhandle (x))
381#else
382# define TO_SOCKET(x) (x)
383#endif
67 384
68static void 385static void
69poll_wait () 386create_respipe (void)
70{ 387{
71 if (!nreqs) 388 int old_readfd = respipe [0];
72 return;
73 389
390 if (respipe [1] >= 0)
391 respipe_close (TO_SOCKET (respipe [1]));
392
393#ifdef _WIN32
394 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
395#else
396 if (pipe (respipe))
397#endif
398 croak ("unable to initialize result pipe");
399
400 if (old_readfd >= 0)
401 {
402 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
403 croak ("unable to initialize result pipe(2)");
404
405 respipe_close (respipe [0]);
406 respipe [0] = old_readfd;
407 }
408
409#ifdef _WIN32
410 int arg = 1;
411 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
412 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
413#else
414 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
415 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
416#endif
417 croak ("unable to initialize result pipe(3)");
418
419 respipe_osf [0] = TO_SOCKET (respipe [0]);
420 respipe_osf [1] = TO_SOCKET (respipe [1]);
421}
422
423static void poll_wait (void)
424{
74 fd_set rfd; 425 fd_set rfd;
426
427 while (eio_nreqs ())
428 {
429 int size;
430
431 X_LOCK (reslock);
432 size = res_queue.size;
433 X_UNLOCK (reslock);
434
435 if (size)
436 return;
437
438 etp_maybe_start_thread ();
439
75 FD_ZERO(&rfd); 440 FD_ZERO (&rfd);
76 FD_SET(respipe [0], &rfd); 441 FD_SET (respipe [0], &rfd);
77 442
78 select (respipe [0] + 1, &rfd, 0, 0, 0); 443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
79}
80
81static int
82poll_cb (pTHX)
83{
84 dSP;
85 int count = 0;
86 aio_req req;
87
88 {
89 /* read and signals sent by the worker threads */
90 char buf [32];
91 while (read (respipe [0], buf, 32) > 0)
92 ;
93 } 444 }
445}
94 446
447static int poll_cb (void)
448{
95 for (;;) 449 for (;;)
96 { 450 {
97 pthread_mutex_lock (&reslock); 451 int res = eio_poll ();
98 452
99 req = ress;
100
101 if (ress) 453 if (res > 0)
102 {
103 ress = ress->next;
104 if (!ress) rese = 0;
105 }
106
107 pthread_mutex_unlock (&reslock);
108
109 if (!req)
110 break; 454 croak (0);
111 455
112 nreqs--; 456 if (!max_outstanding || max_outstanding > eio_nreqs ())
457 return res;
113 458
114 if (req->type == REQ_QUIT) 459 poll_wait ();
115 started--;
116 else
117 {
118 int errorno = errno;
119 errno = req->errorno;
120
121 if (req->type == REQ_READ)
122 SvCUR_set (req->data, req->dataoffset
123 + req->result > 0 ? req->result : 0);
124
125 if (req->data)
126 SvREFCNT_dec (req->data);
127
128 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
129 {
130 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
131 PL_laststatval = req->result;
132 PL_statcache = *(req->statdata);
133
134 Safefree (req->statdata);
135 }
136
137 PUSHMARK (SP);
138 XPUSHs (sv_2mortal (newSViv (req->result)));
139
140 if (req->type == REQ_OPEN)
141 {
142 /* convert fd to fh */
143 SV *fh;
144
145 PUTBACK;
146 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
147 SPAGAIN;
148
149 fh = POPs;
150
151 PUSHMARK (SP);
152 XPUSHs (fh);
153 }
154
155 PUTBACK;
156 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN;
158
159 if (req->callback)
160 SvREFCNT_dec (req->callback);
161
162 errno = errorno;
163 count++;
164 }
165
166 Safefree (req);
167 } 460 }
168
169 return count;
170} 461}
171 462
172static void *aio_proc(void *arg); 463static void atfork_child (void)
173
174static void
175start_thread (void)
176{ 464{
177 sigset_t fullsigset, oldsigset; 465 create_respipe ();
178 pthread_t tid;
179 pthread_attr_t attr;
180
181 pthread_attr_init (&attr);
182 pthread_attr_setstacksize (&attr, STACKSIZE);
183 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
184
185 sigfillset (&fullsigset);
186 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
187
188 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
189 started++;
190
191 sigprocmask (SIG_SETMASK, &oldsigset, 0);
192} 466}
193 467
194static void 468static SV *
195send_req (aio_req req) 469get_cb (SV *cb_sv)
196{ 470{
197 nreqs++; 471 HV *st;
472 GV *gvp;
473 CV *cv;
198 474
199 pthread_mutex_lock (&reqlock); 475 if (!SvOK (cb_sv))
476 return 0;
200 477
201 req->next = 0; 478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
202 479
203 if (reqe) 480 if (!cv)
204 { 481 croak ("IO::AIO callback must be undef or a CODE reference");
205 reqe->next = req;
206 reqe = req;
207 }
208 else
209 reqe = reqs = req;
210 482
211 pthread_cond_signal (&reqwait); 483 return (SV *)cv;
212 pthread_mutex_unlock (&reqlock);
213
214 while (nreqs > max_outstanding)
215 {
216 poll_wait ();
217 poll_cb ();
218 }
219} 484}
220 485
221static void 486#define dREQ \
222end_thread (void) 487 SV *cb_cv; \
223{
224 aio_req req; 488 aio_req req; \
225 New (0, req, 1, aio_cb); 489 int req_pri = next_pri; \
226 req->type = REQ_QUIT; 490 next_pri = EIO_PRI_DEFAULT; \
227 491 \
228 send_req (req); 492 cb_cv = get_cb (callback); \
229} 493 \
230
231static void
232read_write (pTHX_
233 int dowrite, int fd, off_t offset, size_t length,
234 SV *data, STRLEN dataoffset, SV *callback)
235{
236 aio_req req;
237 STRLEN svlen;
238 char *svptr = SvPV (data, svlen);
239
240 SvUPGRADE (data, SVt_PV);
241 SvPOK_on (data);
242
243 if (dataoffset < 0)
244 dataoffset += svlen;
245
246 if (dataoffset < 0 || dataoffset > svlen)
247 croak ("data offset outside of string");
248
249 if (dowrite)
250 {
251 /* write: check length and adjust. */
252 if (length < 0 || length + dataoffset > svlen)
253 length = svlen - dataoffset;
254 }
255 else
256 {
257 /* read: grow scalar as necessary */
258 svptr = SvGROW (data, length + dataoffset);
259 }
260
261 if (length < 0)
262 croak ("length must not be negative");
263
264 Newz (0, req, 1, aio_cb); 494 Newz (0, req, 1, eio_req); \
265 495 if (!req) \
266 if (!req)
267 croak ("out of memory during aio_req allocation"); 496 croak ("out of memory during eio_req allocation"); \
268 497 \
269 req->type = dowrite ? REQ_WRITE : REQ_READ;
270 req->fd = fd;
271 req->offset = offset;
272 req->length = length;
273 req->data = SvREFCNT_inc (data);
274 req->dataptr = (char *)svptr + dataoffset;
275 req->callback = SvREFCNT_inc (callback); 498 req->callback = SvREFCNT_inc (cb_cv); \
499 req->pri = req_pri
276 500
277 send_req (req); 501#define REQ_SEND \
278} 502 PUTBACK; \
503 req_submit (req); \
504 SPAGAIN; \
505 \
506 if (GIMME_V != G_VOID) \
507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
279 508
280static void * 509static int
281aio_proc (void *thr_arg) 510extract_fd (SV *fh, int wr)
282{ 511{
283 aio_req req; 512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
284 int type;
285 513
286 do 514 if (fd < 0)
287 { 515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
288 pthread_mutex_lock (&reqlock);
289 516
290 for (;;) 517 return fd;
291 { 518}
292 req = reqs;
293 519
294 if (reqs) 520MODULE = IO::AIO PACKAGE = IO::AIO
295 {
296 reqs = reqs->next;
297 if (!reqs) reqe = 0;
298 }
299 521
300 if (req) 522PROTOTYPES: ENABLE
301 break;
302 523
303 pthread_cond_wait (&reqwait, &reqlock); 524BOOT:
304 } 525{
526 stash = gv_stashpv ("IO::AIO", 1);
305 527
306 pthread_mutex_unlock (&reqlock); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
307 529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));
308 errno = 0; /* strictly unnecessary */ 530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
309 531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
310 type = req->type; 532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
311 533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
312 switch (type) 534#ifndef _WIN32
313 { 535 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
314 case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break;
315 case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break;
316#if SYS_readahead
317 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
318#else
319 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
320#endif 536#endif
537 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
540 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
321 541
322 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 542 create_respipe ();
323 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
324 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
325 543
326 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 544 if (eio_init (want_poll, done_poll) < 0)
327 case REQ_CLOSE: req->result = close (req->fd); break; 545 croak ("IO::AIO: unable to initialise eio library");
328 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
329 546
330 case REQ_FSYNC: req->result = fsync (req->fd); break; 547 /* atfork child called in fifo order, so before eio's handler */
331 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 548 X_THREAD_ATFORK (0, 0, atfork_child);
332
333 case REQ_QUIT:
334 break;
335
336 default:
337 req->result = ENOSYS;
338 break;
339 }
340
341 req->errorno = errno;
342
343 pthread_mutex_lock (&reslock);
344
345 req->next = 0;
346
347 if (rese)
348 {
349 rese->next = req;
350 rese = req;
351 }
352 else
353 {
354 rese = ress = req;
355
356 /* write a dummy byte to the pipe so fh becomes ready */
357 write (respipe [1], &respipe, 1);
358 }
359
360 pthread_mutex_unlock (&reslock);
361 }
362 while (type != REQ_QUIT);
363
364 return 0;
365} 549}
366 550
367MODULE = IO::AIO PACKAGE = IO::AIO
368
369BOOT:
370{
371 if (pipe (respipe))
372 croak ("unable to initialize result pipe");
373
374 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
375 croak ("cannot set result pipe to nonblocking mode");
376
377 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
378 croak ("cannot set result pipe to nonblocking mode");
379}
380
381void 551void
382min_parallel(nthreads) 552max_poll_reqs (int nreqs)
383 int nthreads
384 PROTOTYPE: $ 553 PROTOTYPE: $
385 CODE: 554 CODE:
386 while (nthreads > started) 555 eio_set_max_poll_reqs (nreqs);
387 start_thread ();
388 556
389void 557void
390max_parallel(nthreads) 558max_poll_time (double nseconds)
391 int nthreads
392 PROTOTYPE: $ 559 PROTOTYPE: $
393 CODE: 560 CODE:
561 eio_set_max_poll_time (nseconds);
562
563void
564min_parallel (int nthreads)
565 PROTOTYPE: $
566 CODE:
567 eio_set_min_parallel (nthreads);
568
569void
570max_parallel (int nthreads)
571 PROTOTYPE: $
572 CODE:
573 eio_set_max_parallel (nthreads);
574
575void
576max_idle (int nthreads)
577 PROTOTYPE: $
578 CODE:
579 eio_set_max_idle (nthreads);
580
581void
582max_outstanding (int maxreqs)
583 PROTOTYPE: $
584 CODE:
585 max_outstanding = maxreqs;
586
587void
588aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
589 PROTOTYPE: $$$;$
590 PPCODE:
394{ 591{
395 int cur = started; 592 dREQ;
396 while (cur > nthreads) 593
397 { 594 req->type = EIO_OPEN;
398 end_thread (); 595 req->sv1 = newSVsv (pathname);
596 req->ptr1 = SvPVbyte_nolen (req->sv1);
597 req->int1 = flags;
598 req->int2 = mode;
599
600 REQ_SEND;
601}
602
603void
604aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
605 PROTOTYPE: $;$
606 ALIAS:
607 aio_fsync = EIO_FSYNC
608 aio_fdatasync = EIO_FDATASYNC
609 PPCODE:
610{
611 int fd = extract_fd (fh, 0);
612 dREQ;
613
614 req->type = ix;
615 req->sv1 = newSVsv (fh);
616 req->int1 = fd;
617
618 REQ_SEND (req);
619}
620
621void
622aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $$$$;$
624 PPCODE:
625{
626 int fd = extract_fd (fh, 0);
627 dREQ;
628
629 req->type = EIO_SYNC_FILE_RANGE;
630 req->sv1 = newSVsv (fh);
631 req->int1 = fd;
632 req->offs = SvVAL64 (offset);
633 req->size = SvVAL64 (nbytes);
634 req->int2 = flags;
635
636 REQ_SEND (req);
637}
638
639void
640aio_close (SV *fh, SV *callback=&PL_sv_undef)
641 PROTOTYPE: $;$
642 PPCODE:
643{
644 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
645 int fd = extract_fd (fh, 0);
646 dREQ;
647
648 if (close_pipe < 0)
649 {
650 int pipefd [2];
651
652 if (pipe (pipefd) < 0
653 || close (pipefd [1]) < 0
654 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
655 abort (); /*D*/
656
657 close_pipe = pipefd [0];
658 }
659
660 req->type = EIO_DUP2;
661 req->int1 = close_pipe;
662 req->sv2 = newSVsv (fh);
663 req->int2 = fd;
664
665 REQ_SEND (req);
666}
667
668void
669aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
670 ALIAS:
671 aio_read = EIO_READ
672 aio_write = EIO_WRITE
673 PROTOTYPE: $$$$$;$
674 PPCODE:
675{
676 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE);
678 char *svptr = SvPVbyte (data, svlen);
679 UV len = SvUV (length);
680
681 if (dataoffset < 0)
682 dataoffset += svlen;
683
684 if (dataoffset < 0 || dataoffset > svlen)
685 croak ("dataoffset outside of data scalar");
686
687 if (ix == EIO_WRITE)
688 {
689 /* write: check length and adjust. */
690 if (!SvOK (length) || len + dataoffset > svlen)
691 len = svlen - dataoffset;
692 }
693 else
694 {
695 /* read: check type and grow scalar as necessary */
696 SvUPGRADE (data, SVt_PV);
697 svptr = SvGROW (data, len + dataoffset + 1);
698 }
699
700 {
701 dREQ;
702
703 req->type = ix;
704 req->sv1 = newSVsv (fh);
705 req->int1 = fd;
706 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
707 req->size = len;
708 req->sv2 = SvREFCNT_inc (data);
709 req->ptr2 = (char *)svptr + dataoffset;
710 req->stroffset = dataoffset;
711
712 if (!SvREADONLY (data))
399 cur--; 713 {
714 SvREADONLY_on (data);
715 req->flags |= FLAG_SV2_RO_OFF;
400 } 716 }
401 717
402 while (started > nthreads) 718 REQ_SEND;
719 }
720}
721
722void
723aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
724 PROTOTYPE: $$;$
725 PPCODE:
726{
727 SV *data;
728 dREQ;
729
730 req->type = EIO_READLINK;
731 req->sv1 = newSVsv (path);
732 req->ptr1 = SvPVbyte_nolen (req->sv1);
733
734 REQ_SEND;
735}
736
737void
738aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
739 PROTOTYPE: $$$$;$
740 PPCODE:
741{
742 int ifd = extract_fd (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0);
744 dREQ;
745
746 req->type = EIO_SENDFILE;
747 req->sv1 = newSVsv (out_fh);
748 req->int1 = ofd;
749 req->sv2 = newSVsv (in_fh);
750 req->int2 = ifd;
751 req->offs = SvVAL64 (in_offset);
752 req->size = length;
753
754 REQ_SEND;
755}
756
757void
758aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
759 PROTOTYPE: $$$;$
760 PPCODE:
761{
762 int fd = extract_fd (fh, 0);
763 dREQ;
764
765 req->type = EIO_READAHEAD;
766 req->sv1 = newSVsv (fh);
767 req->int1 = fd;
768 req->offs = SvVAL64 (offset);
769 req->size = length;
770
771 REQ_SEND;
772}
773
774void
775aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
776 ALIAS:
777 aio_stat = EIO_STAT
778 aio_lstat = EIO_LSTAT
779 PPCODE:
780{
781 dREQ;
782
783 req->sv1 = newSVsv (fh_or_path);
784
785 if (SvPOK (req->sv1))
786 {
787 req->type = ix;
788 req->ptr1 = SvPVbyte_nolen (req->sv1);
789 }
790 else
791 {
792 req->type = EIO_FSTAT;
793 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
794 }
795
796 REQ_SEND;
797}
798
799void
800aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
801 PPCODE:
802{
803 dREQ;
804
805 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
806 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
807 req->sv1 = newSVsv (fh_or_path);
808
809 if (SvPOK (req->sv1))
810 {
811 req->type = EIO_UTIME;
812 req->ptr1 = SvPVbyte_nolen (req->sv1);
813 }
814 else
815 {
816 req->type = EIO_FUTIME;
817 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
818 }
819
820 REQ_SEND;
821}
822
823void
824aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
825 PPCODE:
826{
827 dREQ;
828
829 req->sv1 = newSVsv (fh_or_path);
830 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
831
832 if (SvPOK (req->sv1))
833 {
834 req->type = EIO_TRUNCATE;
835 req->ptr1 = SvPVbyte_nolen (req->sv1);
836 }
837 else
838 {
839 req->type = EIO_FTRUNCATE;
840 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
841 }
842
843 REQ_SEND;
844}
845
846void
847aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
848 ALIAS:
849 aio_chmod = EIO_CHMOD
850 aio_mkdir = EIO_MKDIR
851 PPCODE:
852{
853 dREQ;
854
855 req->int2 = mode;
856 req->sv1 = newSVsv (fh_or_path);
857
858 if (SvPOK (req->sv1))
859 {
860 req->type = ix;
861 req->ptr1 = SvPVbyte_nolen (req->sv1);
862 }
863 else
864 {
865 req->type = EIO_FCHMOD;
866 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
867 }
868
869 REQ_SEND;
870}
871
872void
873aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
874 PPCODE:
875{
876 dREQ;
877
878 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
879 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
880 req->sv1 = newSVsv (fh_or_path);
881
882 if (SvPOK (req->sv1))
883 {
884 req->type = EIO_CHOWN;
885 req->ptr1 = SvPVbyte_nolen (req->sv1);
886 }
887 else
888 {
889 req->type = EIO_FCHOWN;
890 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
891 }
892
893 REQ_SEND;
894}
895
896void
897aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
898 ALIAS:
899 aio_unlink = EIO_UNLINK
900 aio_rmdir = EIO_RMDIR
901 aio_readdir = EIO_READDIR
902 PPCODE:
903{
904 dREQ;
905
906 req->type = ix;
907 req->sv1 = newSVsv (pathname);
908 req->ptr1 = SvPVbyte_nolen (req->sv1);
909
910 REQ_SEND;
911}
912
913void
914aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
915 ALIAS:
916 aio_link = EIO_LINK
917 aio_symlink = EIO_SYMLINK
918 aio_rename = EIO_RENAME
919 PPCODE:
920{
921 dREQ;
922
923 req->type = ix;
924 req->sv1 = newSVsv (oldpath);
925 req->ptr1 = SvPVbyte_nolen (req->sv1);
926 req->sv2 = newSVsv (newpath);
927 req->ptr2 = SvPVbyte_nolen (req->sv2);
928
929 REQ_SEND;
930}
931
932void
933aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
934 PPCODE:
935{
936 dREQ;
937
938 req->type = EIO_MKNOD;
939 req->sv1 = newSVsv (pathname);
940 req->ptr1 = SvPVbyte_nolen (req->sv1);
941 req->int2 = (mode_t)mode;
942 req->offs = dev;
943
944 REQ_SEND;
945}
946
947void
948aio_busy (double delay, SV *callback=&PL_sv_undef)
949 PPCODE:
950{
951 dREQ;
952
953 req->type = EIO_BUSY;
954 req->nv1 = delay < 0. ? 0. : delay;
955
956 REQ_SEND;
957}
958
959void
960aio_group (SV *callback=&PL_sv_undef)
961 PROTOTYPE: ;$
962 PPCODE:
963{
964 dREQ;
965
966 req->type = EIO_GROUP;
967
968 req_submit (req);
969 XPUSHs (req_sv (req, AIO_GRP_KLASS));
970}
971
972void
973aio_nop (SV *callback=&PL_sv_undef)
974 ALIAS:
975 aio_nop = EIO_NOP
976 aio_sync = EIO_SYNC
977 PPCODE:
978{
979 dREQ;
980
981 req->type = ix;
982
983 REQ_SEND;
984}
985
986int
987aioreq_pri (int pri = 0)
988 PROTOTYPE: ;$
989 CODE:
990 RETVAL = next_pri;
991 if (items > 0)
992 {
993 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
994 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
995 next_pri = pri;
996 }
997 OUTPUT:
998 RETVAL
999
1000void
1001aioreq_nice (int nice = 0)
1002 CODE:
1003 nice = next_pri - nice;
1004 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1005 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1006 next_pri = nice;
1007
1008void
1009flush ()
1010 PROTOTYPE:
1011 CODE:
1012 while (eio_nreqs ())
403 { 1013 {
404 poll_wait (); 1014 poll_wait ();
405 poll_cb (aTHX); 1015 poll_cb ();
406 } 1016 }
407}
408 1017
409int 1018int
410max_outstanding(nreqs) 1019poll()
411 int nreqs
412 PROTOTYPE: $
413 CODE:
414 RETVAL = max_outstanding;
415 max_outstanding = nreqs;
416
417void
418aio_open(pathname,flags,mode,callback)
419 SV * pathname
420 int flags
421 int mode
422 SV * callback
423 PROTOTYPE: $$$$
424 CODE:
425{
426 aio_req req;
427
428 Newz (0, req, 1, aio_cb);
429
430 if (!req)
431 croak ("out of memory during aio_req allocation");
432
433 req->type = REQ_OPEN;
434 req->data = newSVsv (pathname);
435 req->dataptr = SvPV_nolen (req->data);
436 req->fd = flags;
437 req->mode = mode;
438 req->callback = SvREFCNT_inc (callback);
439
440 send_req (req);
441}
442
443void
444aio_close(fh,callback)
445 InputStream fh
446 SV * callback
447 PROTOTYPE: $$ 1020 PROTOTYPE:
448 ALIAS:
449 aio_close = REQ_CLOSE
450 aio_fsync = REQ_FSYNC
451 aio_fdatasync = REQ_FDATASYNC
452 CODE: 1021 CODE:
453{ 1022 poll_wait ();
454 aio_req req; 1023 RETVAL = poll_cb ();
455 1024 OUTPUT:
456 Newz (0, req, 1, aio_cb); 1025 RETVAL
457
458 if (!req)
459 croak ("out of memory during aio_req allocation");
460
461 req->type = ix;
462 req->fd = PerlIO_fileno (fh);
463 req->callback = SvREFCNT_inc (callback);
464
465 send_req (req);
466}
467
468void
469aio_read(fh,offset,length,data,dataoffset,callback)
470 InputStream fh
471 UV offset
472 IV length
473 SV * data
474 IV dataoffset
475 SV * callback
476 PROTOTYPE: $$$$$$
477 CODE:
478 read_write (aTHX_ 0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
479
480void
481aio_write(fh,offset,length,data,dataoffset,callback)
482 OutputStream fh
483 UV offset
484 IV length
485 SV * data
486 IV dataoffset
487 SV * callback
488 PROTOTYPE: $$$$$$
489 CODE:
490 read_write (aTHX_ 1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
491
492void
493aio_readahead(fh,offset,length,callback)
494 InputStream fh
495 UV offset
496 IV length
497 SV * callback
498 PROTOTYPE: $$$$
499 CODE:
500{
501 aio_req req;
502
503 if (length < 0)
504 croak ("length must not be negative");
505
506 Newz (0, req, 1, aio_cb);
507
508 if (!req)
509 croak ("out of memory during aio_req allocation");
510
511 req->type = REQ_READAHEAD;
512 req->fd = PerlIO_fileno (fh);
513 req->offset = offset;
514 req->length = length;
515 req->callback = SvREFCNT_inc (callback);
516
517 send_req (req);
518}
519
520void
521aio_stat(fh_or_path,callback)
522 SV * fh_or_path
523 SV * callback
524 PROTOTYPE: $$
525 ALIAS:
526 aio_lstat = 1
527 CODE:
528{
529 aio_req req;
530
531 Newz (0, req, 1, aio_cb);
532
533 if (!req)
534 croak ("out of memory during aio_req allocation");
535
536 New (0, req->statdata, 1, Stat_t);
537
538 if (!req->statdata)
539 croak ("out of memory during aio_req->statdata allocation");
540
541 if (SvPOK (fh_or_path))
542 {
543 req->type = ix ? REQ_LSTAT : REQ_STAT;
544 req->data = newSVsv (fh_or_path);
545 req->dataptr = SvPV_nolen (req->data);
546 }
547 else
548 {
549 req->type = REQ_FSTAT;
550 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
551 }
552
553 req->callback = SvREFCNT_inc (callback);
554
555 send_req (req);
556}
557
558void
559aio_unlink(pathname,callback)
560 SV * pathname
561 SV * callback
562 PROTOTYPE: $$
563 CODE:
564{
565 aio_req req;
566
567 Newz (0, req, 1, aio_cb);
568
569 if (!req)
570 croak ("out of memory during aio_req allocation");
571
572 req->type = REQ_UNLINK;
573 req->data = newSVsv (pathname);
574 req->dataptr = SvPV_nolen (req->data);
575 req->callback = SvREFCNT_inc (callback);
576
577 send_req (req);
578}
579 1026
580int 1027int
581poll_fileno() 1028poll_fileno()
582 PROTOTYPE: 1029 PROTOTYPE:
583 CODE: 1030 CODE:
587 1034
588int 1035int
589poll_cb(...) 1036poll_cb(...)
590 PROTOTYPE: 1037 PROTOTYPE:
591 CODE: 1038 CODE:
592 RETVAL = poll_cb (aTHX); 1039 RETVAL = poll_cb ();
593 OUTPUT: 1040 OUTPUT:
594 RETVAL 1041 RETVAL
595 1042
596void 1043void
597poll_wait() 1044poll_wait()
598 PROTOTYPE: 1045 PROTOTYPE:
599 CODE: 1046 CODE:
600 if (nreqs)
601 poll_wait (); 1047 poll_wait ();
602 1048
603int 1049int
604nreqs() 1050nreqs()
605 PROTOTYPE: 1051 PROTOTYPE:
606 CODE: 1052 CODE:
607 RETVAL = nreqs; 1053 RETVAL = eio_nreqs ();
608 OUTPUT: 1054 OUTPUT:
609 RETVAL 1055 RETVAL
610 1056
1057int
1058nready()
1059 PROTOTYPE:
1060 CODE:
1061 RETVAL = eio_nready ();
1062 OUTPUT:
1063 RETVAL
1064
1065int
1066npending()
1067 PROTOTYPE:
1068 CODE:
1069 RETVAL = eio_npending ();
1070 OUTPUT:
1071 RETVAL
1072
1073int
1074nthreads()
1075 PROTOTYPE:
1076 CODE:
1077 RETVAL = eio_nthreads ();
1078 OUTPUT:
1079 RETVAL
1080
1081void _on_next_submit (SV *cb)
1082 CODE:
1083 SvREFCNT_dec (on_next_submit);
1084 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1085
1086PROTOTYPES: DISABLE
1087
1088MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1089
1090void
1091cancel (aio_req_ornot req)
1092 CODE:
1093 eio_cancel (req);
1094
1095void
1096cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1097 PPCODE:
1098{
1099 if (GIMME_V != G_VOID)
1100 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1101
1102 if (items > 1)
1103 {
1104 SV *cb_cv = get_cb (callback);
1105
1106 SvREFCNT_dec (req->callback);
1107 req->callback = SvREFCNT_inc (cb_cv);
1108 }
1109}
1110
1111MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1112
1113void
1114add (aio_req grp, ...)
1115 PPCODE:
1116{
1117 int i;
1118
1119 if (grp->int1 == 2)
1120 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1121
1122 for (i = 1; i < items; ++i )
1123 {
1124 aio_req req;
1125
1126 if (GIMME_V != G_VOID)
1127 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1128
1129 req = SvAIO_REQ (ST (i));
1130
1131 if (req)
1132 eio_grp_add (grp, req);
1133 }
1134}
1135
1136void
1137cancel_subs (aio_req_ornot req)
1138 CODE:
1139 req_cancel_subs (req);
1140
1141void
1142result (aio_req grp, ...)
1143 CODE:
1144{
1145 int i;
1146 AV *av;
1147
1148 grp->errorno = errno;
1149
1150 av = newAV ();
1151
1152 for (i = 1; i < items; ++i )
1153 av_push (av, newSVsv (ST (i)));
1154
1155 SvREFCNT_dec (grp->sv1);
1156 grp->sv1 = (SV *)av;
1157}
1158
1159void
1160errno (aio_req grp, int errorno = errno)
1161 CODE:
1162 grp->errorno = errorno;
1163
1164void
1165limit (aio_req grp, int limit)
1166 CODE:
1167 eio_grp_limit (grp, limit);
1168
1169void
1170feed (aio_req grp, SV *callback=&PL_sv_undef)
1171 CODE:
1172{
1173 SvREFCNT_dec (grp->sv2);
1174 grp->sv2 = newSVsv (callback);
1175 grp->feed = aio_grp_feed;
1176
1177 if (grp->int2 <= 0)
1178 grp->int2 = 2;
1179
1180 eio_grp_limit (grp, grp->int2);
1181}
1182

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines