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.15 by root, Sat Jul 23 18:19:56 2005 UTC vs.
Revision 1.134 by root, Sun Apr 19 13:05:06 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
8#include <unistd.h> 14#include <limits.h>
9#include <fcntl.h> 15#include <fcntl.h>
10#include <signal.h>
11#include <sched.h> 16#include <sched.h>
12#if __linux 17
18/* perl namespace pollution */
19#undef VERSION
20
21#ifdef _WIN32
22
23# define EIO_STRUCT_DIRENT Direntry_t
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
59#else
60
61# include <sys/time.h>
13#include <sys/syscall.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
14#endif 68#endif
15 69
16#include <pthread.h> 70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
17 75
18typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 76#define EIO_STRUCT_STAT Stat_t
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 77
22#if __ia64 78/* use NV for 32 bit perls as it allows larger offsets */
23# define STACKSIZE 65536 79#if IVSIZE >= 8
80# define SvVAL64 SvIV
24#else 81#else
25# define STACKSIZE 4096 82# define SvVAL64 SvNV
26#endif 83#endif
27 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, *fh;
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 volatile 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);
67 136
68static void 137static void want_poll (void)
69poll_wait ()
70{ 138{
71 if (nreqs && !ress) 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)
72 { 155 {
73 fd_set rfd; 156 req->self = (SV *)newHV ();
74 FD_ZERO(&rfd); 157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
75 FD_SET(respipe [0], &rfd);
76
77 select (respipe [0] + 1, &rfd, 0, 0, 0);
78 } 158 }
79}
80 159
81static int 160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
82poll_cb () 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)
83{ 211{
84 dSP; 212 dSP;
85 int count = 0;
86 aio_req req, prv;
87 213
88 pthread_mutex_lock (&reslock); 214 if (req->flags & FLAG_SV2_RO_OFF)
215 SvREADONLY_off (req->sv2);
89 216
90 { 217 if (!EIO_CANCELLED (req) && req->callback)
91 /* read any signals sent by the worker threads */
92 char buf [32];
93 while (read (respipe [0], buf, 32) > 0)
94 ;
95 }
96
97 req = ress;
98 ress = rese = 0;
99
100 pthread_mutex_unlock (&reslock);
101
102 while (req)
103 { 218 {
104 nreqs--; 219 ENTER;
220 SAVETMPS;
221 PUSHMARK (SP);
222 EXTEND (SP, 1);
105 223
106 if (req->type == REQ_QUIT) 224 switch (req->type)
107 started--;
108 else
109 { 225 {
110 int errorno = errno; 226 case EIO_READDIR:
111 errno = req->errorno;
112
113 if (req->type == REQ_READ)
114 SvCUR_set (req->data, req->dataoffset
115 + req->result > 0 ? req->result : 0);
116
117 if (req->data)
118 SvREFCNT_dec (req->data);
119
120 if (req->fh)
121 SvREFCNT_dec (req->fh);
122
123 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
124 { 227 {
125 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 228 SV *rv = &PL_sv_undef;
126 PL_laststatval = req->result;
127 PL_statcache = *(req->statdata);
128 229
129 Safefree (req->statdata); 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);
130 } 250 }
251 break;
131 252
132 ENTER; 253 case EIO_OPEN:
133 PUSHMARK (SP);
134 XPUSHs (sv_2mortal (newSViv (req->result)));
135
136 if (req->type == REQ_OPEN)
137 { 254 {
138 /* convert fd to fh */ 255 /* convert fd to fh */
139 SV *fh; 256 SV *fh = &PL_sv_undef;
140 257
141 PUTBACK; 258 if (req->result >= 0)
142 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 259 {
143 SPAGAIN; 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);
144 267
145 fh = SvREFCNT_inc (POPs); 268 symlen = snprintf (
269 sym,
270 sizeof (sym),
271 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result
274 );
146 275
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv;
278 }
279
147 PUSHMARK (SP); 280 PUSHs (fh);
148 XPUSHs (sv_2mortal (fh));
149 } 281 }
150
151 if (SvOK (req->callback))
152 {
153 PUTBACK;
154 call_sv (req->callback, G_VOID | G_EVAL);
155 SPAGAIN;
156 }
157
158 LEAVE;
159
160 if (req->callback)
161 SvREFCNT_dec (req->callback);
162
163 errno = errorno;
164 count++;
165 }
166
167 prv = req;
168 req = req->next;
169 Safefree (prv);
170
171 /* TODO: croak on errors? */
172 }
173
174 return count;
175}
176
177static void *aio_proc(void *arg);
178
179static void
180start_thread (void)
181{
182 sigset_t fullsigset, oldsigset;
183 pthread_t tid;
184 pthread_attr_t attr;
185
186 pthread_attr_init (&attr);
187 pthread_attr_setstacksize (&attr, STACKSIZE);
188 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
189
190 sigfillset (&fullsigset);
191 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
192
193 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
194 started++;
195
196 sigprocmask (SIG_SETMASK, &oldsigset, 0);
197}
198
199static void
200send_req (aio_req req)
201{
202 nreqs++;
203
204 pthread_mutex_lock (&reqlock);
205
206 req->next = 0;
207
208 if (reqe)
209 {
210 reqe->next = req;
211 reqe = req;
212 }
213 else
214 reqe = reqs = req;
215
216 pthread_cond_signal (&reqwait);
217 pthread_mutex_unlock (&reqlock);
218
219 while (nreqs > max_outstanding)
220 {
221 poll_wait ();
222 poll_cb ();
223 }
224}
225
226static void
227end_thread (void)
228{
229 aio_req req;
230 New (0, req, 1, aio_cb);
231 req->type = REQ_QUIT;
232
233 send_req (req);
234}
235
236static void *
237aio_proc (void *thr_arg)
238{
239 aio_req req;
240 int type;
241
242 do
243 {
244 pthread_mutex_lock (&reqlock);
245
246 for (;;)
247 {
248 req = reqs;
249
250 if (reqs)
251 {
252 reqs = reqs->next;
253 if (!reqs) reqe = 0;
254 }
255
256 if (req)
257 break; 282 break;
258 283
259 pthread_cond_wait (&reqwait, &reqlock); 284 case EIO_GROUP:
260 } 285 req->int1 = 2; /* mark group as finished */
261 286
262 pthread_mutex_unlock (&reqlock); 287 if (req->sv1)
263
264 errno = 0; /* strictly unnecessary */
265
266 type = req->type;
267
268 switch (type)
269 { 288 {
270 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 289 int i;
271 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 290 AV *av = (AV *)req->sv1;
272#if SYS_readahead
273 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
274#else
275 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
276#endif
277 291
278 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 292 EXTEND (SP, AvFILL (av) + 1);
279 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 293 for (i = 0; i <= AvFILL (av); ++i)
280 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 294 PUSHs (*av_fetch (av, i, 0));
281 295 }
282 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
283 case REQ_CLOSE: req->result = close (req->fd); break;
284 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
285
286 case REQ_FSYNC: req->result = fsync (req->fd); break;
287 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
288
289 case REQ_QUIT:
290 break; 296 break;
291 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
292 default: 327 default:
293 req->result = ENOSYS; 328 PUSHs (sv_2mortal (newSViv (req->result)));
294 break; 329 break;
295 } 330 }
296 331
297 req->errorno = errno; 332 errno = req->errorno;
298 333
299 pthread_mutex_lock (&reslock); 334 PUTBACK;
335 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
336 SPAGAIN;
300 337
301 req->next = 0; 338 FREETMPS;
339 LEAVE;
302 340
303 if (rese) 341 PUTBACK;
304 {
305 rese->next = req;
306 rese = req;
307 }
308 else
309 {
310 rese = ress = req;
311
312 /* write a dummy byte to the pipe so fh becomes ready */
313 write (respipe [1], &respipe, 1);
314 }
315
316 pthread_mutex_unlock (&reslock);
317 } 342 }
318 while (type != REQ_QUIT);
319 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
380
381static void
382create_respipe (void)
383{
384 int old_readfd = respipe [0];
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{
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
436 FD_ZERO (&rfd);
437 FD_SET (respipe [0], &rfd);
438
439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
440 }
441}
442
443static int poll_cb (void)
444{
445 for (;;)
446 {
447 int res = eio_poll ();
448
449 if (res > 0)
450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
456 }
457}
458
459static void atfork_child (void)
460{
461 create_respipe ();
462}
463
464static SV *
465get_cb (SV *cb_sv)
466{
467 HV *st;
468 GV *gvp;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
320 return 0; 472 return 0;
321}
322 473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480}
481
482#define dREQ \
483 SV *cb_cv; \
484 aio_req req; \
485 int req_pri = next_pri; \
486 next_pri = EIO_PRI_DEFAULT; \
487 \
488 cb_cv = get_cb (callback); \
489 \
490 Newz (0, req, 1, eio_req); \
491 if (!req) \
492 croak ("out of memory during eio_req allocation"); \
493 \
494 req->callback = SvREFCNT_inc (cb_cv); \
495 req->pri = req_pri
496
497#define REQ_SEND \
498 PUTBACK; \
499 req_submit (req); \
500 SPAGAIN; \
501 \
502 if (GIMME_V != G_VOID) \
503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
504
323MODULE = IO::AIO PACKAGE = IO::AIO 505MODULE = IO::AIO PACKAGE = IO::AIO
324 506
325PROTOTYPES: ENABLE 507PROTOTYPES: ENABLE
326 508
327BOOT: 509BOOT:
328{ 510{
329 if (pipe (respipe)) 511 stash = gv_stashpv ("IO::AIO", 1);
330 croak ("unable to initialize result pipe");
331 512
332 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) 513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
333 croak ("cannot set result pipe to nonblocking mode"); 514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
518#ifndef _WIN32
519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
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));
334 525
335 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 526 create_respipe ();
336 croak ("cannot set result pipe to nonblocking mode");
337}
338 527
528 if (eio_init (want_poll, done_poll) < 0)
529 croak ("IO::AIO: unable to initialise eio library");
530
531 /* atfork child called in fifo order, so before eio's handler */
532 X_THREAD_ATFORK (0, 0, atfork_child);
533}
534
339void 535void
340min_parallel(nthreads) 536max_poll_reqs (int nreqs)
341 int nthreads
342 PROTOTYPE: $ 537 PROTOTYPE: $
343 CODE: 538 CODE:
344 while (nthreads > started) 539 eio_set_max_poll_reqs (nreqs);
345 start_thread ();
346 540
347void 541void
348max_parallel(nthreads) 542max_poll_time (double nseconds)
349 int nthreads
350 PROTOTYPE: $ 543 PROTOTYPE: $
351 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:
352{ 575{
353 int cur = started; 576 dREQ;
354 while (cur > nthreads) 577
355 { 578 req->type = EIO_OPEN;
356 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 = df;
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))
357 cur--; 708 {
709 SvREADONLY_on (data);
710 req->flags |= FLAG_SV2_RO_OFF;
358 } 711 }
359 712
360 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 ())
361 { 1005 {
362 poll_wait (); 1006 poll_wait ();
363 poll_cb (); 1007 poll_cb ();
364 } 1008 }
365}
366 1009
367int 1010int
368max_outstanding(nreqs)
369 int nreqs
370 PROTOTYPE: $
371 CODE:
372 RETVAL = max_outstanding;
373 max_outstanding = nreqs;
374
375void
376aio_open(pathname,flags,mode,callback=&PL_sv_undef)
377 SV * pathname
378 int flags
379 int mode
380 SV * callback
381 PROTOTYPE: $$$;$
382 CODE:
383{
384 aio_req req;
385
386 Newz (0, req, 1, aio_cb);
387
388 if (!req)
389 croak ("out of memory during aio_req allocation");
390
391 req->type = REQ_OPEN;
392 req->data = newSVsv (pathname);
393 req->dataptr = SvPV_nolen (req->data);
394 req->fd = flags;
395 req->mode = mode;
396 req->callback = SvREFCNT_inc (callback);
397
398 send_req (req);
399}
400
401void
402aio_close(fh,callback=&PL_sv_undef)
403 SV * fh
404 SV * callback
405 PROTOTYPE: $;$
406 ALIAS:
407 aio_close = REQ_CLOSE
408 aio_fsync = REQ_FSYNC
409 aio_fdatasync = REQ_FDATASYNC
410 CODE:
411{
412 aio_req req;
413
414 Newz (0, req, 1, aio_cb);
415
416 if (!req)
417 croak ("out of memory during aio_req allocation");
418
419 req->type = ix;
420 req->fh = newSVsv (fh);
421 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
422 req->callback = SvREFCNT_inc (callback);
423
424 send_req (req);
425}
426
427void
428aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
429 SV * fh
430 UV offset
431 IV length
432 SV * data
433 IV dataoffset
434 SV * callback
435 ALIAS:
436 aio_read = REQ_READ
437 aio_write = REQ_WRITE
438 PROTOTYPE: $$$$$;$
439 CODE:
440{
441 aio_req req;
442 STRLEN svlen;
443 char *svptr = SvPV (data, svlen);
444
445 SvUPGRADE (data, SVt_PV);
446 SvPOK_on (data);
447
448 if (dataoffset < 0)
449 dataoffset += svlen;
450
451 if (dataoffset < 0 || dataoffset > svlen)
452 croak ("data offset outside of string");
453
454 if (ix == REQ_WRITE)
455 {
456 /* write: check length and adjust. */
457 if (length < 0 || length + dataoffset > svlen)
458 length = svlen - dataoffset;
459 }
460 else
461 {
462 /* read: grow scalar as necessary */
463 svptr = SvGROW (data, length + dataoffset);
464 }
465
466 if (length < 0)
467 croak ("length must not be negative");
468
469 Newz (0, req, 1, aio_cb);
470
471 if (!req)
472 croak ("out of memory during aio_req allocation");
473
474 req->type = ix;
475 req->fh = newSVsv (fh);
476 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
477 : IoOFP (sv_2io (fh)));
478 req->offset = offset;
479 req->length = length;
480 req->data = SvREFCNT_inc (data);
481 req->dataptr = (char *)svptr + dataoffset;
482 req->callback = SvREFCNT_inc (callback);
483
484 send_req (req);
485}
486
487void
488aio_readahead(fh,offset,length,callback=&PL_sv_undef)
489 SV * fh
490 UV offset
491 IV length
492 SV * callback
493 PROTOTYPE: $$$;$
494 CODE:
495{
496 aio_req req;
497
498 if (length < 0)
499 croak ("length must not be negative");
500
501 Newz (0, req, 1, aio_cb);
502
503 if (!req)
504 croak ("out of memory during aio_req allocation");
505
506 req->type = REQ_READAHEAD;
507 req->fh = newSVsv (fh);
508 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
509 req->offset = offset;
510 req->length = length;
511 req->callback = SvREFCNT_inc (callback);
512
513 send_req (req);
514}
515
516void
517aio_stat(fh_or_path,callback=&PL_sv_undef)
518 SV * fh_or_path
519 SV * callback
520 ALIAS:
521 aio_stat = REQ_STAT
522 aio_lstat = REQ_LSTAT
523 CODE:
524{
525 aio_req req;
526
527 Newz (0, req, 1, aio_cb);
528
529 if (!req)
530 croak ("out of memory during aio_req allocation");
531
532 New (0, req->statdata, 1, Stat_t);
533
534 if (!req->statdata)
535 croak ("out of memory during aio_req->statdata allocation");
536
537 if (SvPOK (fh_or_path))
538 {
539 req->type = ix;
540 req->data = newSVsv (fh_or_path);
541 req->dataptr = SvPV_nolen (req->data);
542 }
543 else
544 {
545 req->type = REQ_FSTAT;
546 req->fh = newSVsv (fh_or_path);
547 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
548 }
549
550 req->callback = SvREFCNT_inc (callback);
551
552 send_req (req);
553}
554
555void
556aio_unlink(pathname,callback=&PL_sv_undef)
557 SV * pathname
558 SV * callback
559 CODE:
560{
561 aio_req req;
562
563 Newz (0, req, 1, aio_cb);
564
565 if (!req)
566 croak ("out of memory during aio_req allocation");
567
568 req->type = REQ_UNLINK;
569 req->data = newSVsv (pathname);
570 req->dataptr = SvPV_nolen (req->data);
571 req->callback = SvREFCNT_inc (callback);
572
573 send_req (req);
574}
575
576void
577flush()
578 PROTOTYPE:
579 CODE:
580 while (nreqs)
581 {
582 poll_wait ();
583 poll_cb ();
584 }
585
586void
587poll() 1011poll()
588 PROTOTYPE: 1012 PROTOTYPE:
589 CODE: 1013 CODE:
590 if (nreqs)
591 {
592 poll_wait (); 1014 poll_wait ();
593 poll_cb (); 1015 RETVAL = poll_cb ();
594 } 1016 OUTPUT:
1017 RETVAL
595 1018
596int 1019int
597poll_fileno() 1020poll_fileno()
598 PROTOTYPE: 1021 PROTOTYPE:
599 CODE: 1022 CODE:
611 1034
612void 1035void
613poll_wait() 1036poll_wait()
614 PROTOTYPE: 1037 PROTOTYPE:
615 CODE: 1038 CODE:
616 if (nreqs)
617 poll_wait (); 1039 poll_wait ();
618 1040
619int 1041int
620nreqs() 1042nreqs()
621 PROTOTYPE: 1043 PROTOTYPE:
622 CODE: 1044 CODE:
623 RETVAL = nreqs; 1045 RETVAL = eio_nreqs ();
624 OUTPUT: 1046 OUTPUT:
625 RETVAL 1047 RETVAL
626 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