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.9 by root, Tue Jul 12 11:02:54 2005 UTC vs.
Revision 1.135 by root, Sun Apr 19 13:06:15 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines