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.11 by root, Wed Jul 20 21:55:27 2005 UTC vs.
Revision 1.133 by root, Wed Oct 22 18:15:36 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines