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.60 by root, Mon Oct 23 20:05:27 2006 UTC vs.
Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC

1#define _REENTRANT 1 1#include "libeio/xthread.h"
2
2#include <errno.h> 3#include <errno.h>
3 4
4#include "EXTERN.h" 5#include "EXTERN.h"
5#include "perl.h" 6#include "perl.h"
6#include "XSUB.h" 7#include "XSUB.h"
7 8
8#include "autoconf/config.h"
9
10#include <pthread.h>
11
12#include <stddef.h> 9#include <stddef.h>
10#include <stdlib.h>
13#include <errno.h> 11#include <errno.h>
14#include <sys/time.h>
15#include <sys/select.h>
16#include <sys/types.h> 12#include <sys/types.h>
17#include <sys/stat.h> 13#include <sys/stat.h>
18#include <limits.h> 14#include <limits.h>
19#include <unistd.h>
20#include <fcntl.h> 15#include <fcntl.h>
21#include <signal.h>
22#include <sched.h> 16#include <sched.h>
23 17
24#if HAVE_SENDFILE 18/* perl namespace pollution */
25# if __linux 19#undef VERSION
26# include <sys/sendfile.h> 20
27# elif __freebsd 21#ifdef _WIN32
28# include <sys/socket.h> 22
29# include <sys/uio.h> 23# define EIO_STRUCT_DIRENT Direntry_t
30# elif __hpux 24# undef malloc
31# include <sys/socket.h> 25# undef free
32# elif __solaris /* not yet */ 26
33# include <sys/sendfile.h> 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
34# else 59#else
35# error sendfile support requested but not available 60
36# endif 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
37#endif 68#endif
38 69
39/* used for struct dirent, AIX doesn't provide it */ 70/* perl stupidly overrides readdir and maybe others */
40#ifndef NAME_MAX 71/* with thread-unsafe versions, imagine that :( */
41# define NAME_MAX 4096 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 VAL64 IV
81# define SvVAL64 SvIV
82# define newSVval64 newSViv
83#else
84# define VAL64 NV
85# define SvVAL64 SvNV
86# define newSVval64 newSVnv
42#endif 87#endif
43 88
44#if __ia64 89/*****************************************************************************/
45# define STACKSIZE 65536 90
91#if __GNUC__ >= 3
92# define expect(expr,value) __builtin_expect ((expr),(value))
46#else 93#else
47# define STACKSIZE 8192 94# define expect(expr,value) (expr)
48#endif 95#endif
49 96
50enum { 97#define expect_false(expr) expect ((expr) != 0, 0)
51 REQ_QUIT, 98#define expect_true(expr) expect ((expr) != 0, 1)
52 REQ_OPEN, REQ_CLOSE, 99
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 100/*****************************************************************************/
54 REQ_SENDFILE, 101
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 102static HV *stash;
56 REQ_FSYNC, REQ_FDATASYNC, 103typedef SV SV8; /* byte-sv, used for argument-checking */
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 104typedef int aio_rfd; /* read file desriptor */
58 REQ_READDIR, 105typedef int aio_wfd; /* write file descriptor */
59 REQ_LINK, REQ_SYMLINK,
60 REQ_GROUP, REQ_NOP,
61 REQ_SLEEP,
62};
63 106
64#define AIO_REQ_KLASS "IO::AIO::REQ" 107#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 108#define AIO_GRP_KLASS "IO::AIO::GRP"
66 109
67typedef struct aio_cb 110#define EIO_REQ_MEMBERS \
68{
69 struct aio_cb *volatile next;
70
71 SV *data, *callback; 111 SV *callback; \
72 SV *fh, *fh2; 112 SV *sv1, *sv2; \
73 void *dataptr, *data2ptr;
74 Stat_t *statdata;
75 off_t offset;
76 size_t length;
77 ssize_t result;
78
79 STRLEN dataoffset; 113 STRLEN stroffset; \
80 int type; 114 SV *self;
81 int fd, fd2;
82 int errorno;
83 mode_t mode; /* open */
84 115
85 unsigned char flags; 116#define EIO_NO_WRAPPERS 1
86 unsigned char pri;
87 117
88 SV *self; /* the perl counterpart of this request, if any */ 118#include "libeio/eio.h"
89 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 119
90} aio_cb; 120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122# define NO_FADVISE 1
123#endif
124
125#ifndef POSIX_FADV_SEQUENTIAL
126# define POSIX_FADV_SEQUENTIAL 0
127#endif
128
129#ifndef POSIX_FADV_RANDOM
130# define POSIX_FADV_RANDOM 0
131#endif
132
133#ifndef POSIX_FADV_NOREUSE
134# define POSIX_FADV_NOREUSE 0
135#endif
136
137#ifndef POSIX_FADV_WILLNEED
138# define POSIX_FADV_WILLNEED 0
139#endif
140
141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0
143#endif
144
145static int req_invoke (eio_req *req);
146#define EIO_FINISH(req) req_invoke (req)
147static void req_destroy (eio_req *grp);
148#define EIO_DESTROY(req) req_destroy (req)
91 149
92enum { 150enum {
93 FLAG_CANCELLED = 0x01, 151 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
94}; 152};
95 153
154#include "libeio/eio.c"
155
96typedef aio_cb *aio_req; 156typedef eio_req *aio_req;
97typedef aio_cb *aio_req_ornot; 157typedef eio_req *aio_req_ornot;
98 158
99enum { 159static SV *on_next_submit;
100 PRI_MIN = 4, 160static int next_pri = EIO_PRI_DEFAULT;
101 PRI_MAX = -4,
102
103 DEFAULT_PRI = 0,
104 PRI_BIAS = PRI_MIN,
105};
106
107static int next_pri = DEFAULT_PRI + PRI_BIAS;
108
109static int started, wanted;
110static volatile int nreqs;
111static int max_outstanding = 1<<30; 161static int max_outstanding;
112static int respipe [2];
113 162
114static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 163static int respipe_osf [2], respipe [2] = { -1, -1 };
115static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
116static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
117 164
118static volatile aio_req reqs, reqe; /* queue start, queue end */ 165static void req_destroy (aio_req req);
119static volatile aio_req ress, rese; /* queue start, queue end */
120
121static void req_invoke (aio_req req); 166static void req_cancel (aio_req req);
122static void req_free (aio_req req); 167
168static void want_poll (void)
169{
170 /* write a dummy byte to the pipe so fh becomes ready */
171 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
172}
173
174static void done_poll (void)
175{
176 /* read any signals sent by the worker threads */
177 char buf [4];
178 while (respipe_read (respipe [0], buf, 4) == 4)
179 ;
180}
123 181
124/* must be called at most once */ 182/* must be called at most once */
125static SV *req_sv (aio_req req, const char *klass) 183static SV *req_sv (aio_req req, const char *klass)
126{ 184{
127 if (!req->self) 185 if (!req->self)
145 return mg ? (aio_req)mg->mg_ptr : 0; 203 return mg ? (aio_req)mg->mg_ptr : 0;
146} 204}
147 205
148static void aio_grp_feed (aio_req grp) 206static void aio_grp_feed (aio_req grp)
149{ 207{
150 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 208 if (grp->sv2 && SvOK (grp->sv2))
151 { 209 {
152 int old_len = grp->length; 210 dSP;
153 211
154 if (grp->fh2 && SvOK (grp->fh2)) 212 ENTER;
213 SAVETMPS;
214 PUSHMARK (SP);
215 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
216 PUTBACK;
217 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
218 SPAGAIN;
219 FREETMPS;
220 LEAVE;
221 }
222}
223
224static void req_submit (eio_req *req)
225{
226 eio_submit (req);
227
228 if (expect_false (on_next_submit))
229 {
230 dSP;
231 SV *cb = sv_2mortal (on_next_submit);
232
233 on_next_submit = 0;
234
235 PUSHMARK (SP);
236 PUTBACK;
237 call_sv (cb, G_DISCARD | G_EVAL);
238 }
239}
240
241static int req_invoke (eio_req *req)
242{
243 dSP;
244
245 if (req->flags & FLAG_SV2_RO_OFF)
246 SvREADONLY_off (req->sv2);
247
248 if (!EIO_CANCELLED (req) && req->callback)
249 {
250 ENTER;
251 SAVETMPS;
252 PUSHMARK (SP);
253 EXTEND (SP, 1);
254
255 switch (req->type)
155 { 256 {
156 dSP; 257 case EIO_READDIR:
258 {
259 SV *rv = &PL_sv_undef;
157 260
158 ENTER; 261 if (req->result >= 0)
159 SAVETMPS; 262 {
160 PUSHMARK (SP); 263 int i;
161 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 264 char *names = (char *)req->ptr2;
162 PUTBACK; 265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
163 call_sv (grp->fh2, G_VOID | G_EVAL); 266 AV *av = newAV ();
164 SPAGAIN; 267
165 FREETMPS; 268 av_extend (av, req->result - 1);
166 LEAVE; 269
270 for (i = 0; i < req->result; ++i)
271 {
272 if (req->int1 & EIO_READDIR_DENTS)
273 {
274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
275
276 if (req->int1 & EIO_READDIR_CUSTOM2)
277 {
278 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
279 AV *avent = newAV ();
280
281 av_extend (avent, 2);
282
283 if (!sv_type [ent->type])
284 {
285 sv_type [ent->type] = newSViv (ent->type);
286 SvREADONLY_on (sv_type [ent->type]);
287 }
288
289 av_store (avent, 0, namesv);
290 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
291 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
292
293 av_store (av, i, newRV_noinc ((SV *)avent));
294 }
295 else
296 av_store (av, i, namesv);
297
298 ++ent;
299 }
300 else
301 {
302 SV *name = newSVpv (names, 0);
303 av_store (av, i, name);
304 names += SvCUR (name) + 1;
305 }
306 }
307
308 rv = sv_2mortal (newRV_noinc ((SV *)av));
309 }
310
311 PUSHs (rv);
312
313 if (req->int1 & EIO_READDIR_CUSTOM1)
314 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
315 }
316 break;
317
318 case EIO_OPEN:
319 {
320 /* convert fd to fh */
321 SV *fh = &PL_sv_undef;
322
323 if (req->result >= 0)
324 {
325 GV *gv = (GV *)sv_newmortal ();
326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
327 char sym [64];
328 int symlen;
329
330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
331 gv_init (gv, stash, sym, symlen, 0);
332
333 symlen = snprintf (
334 sym,
335 sizeof (sym),
336 "%s&=%d",
337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
338 (int)req->result
339 );
340
341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
342 fh = (SV *)gv;
343 }
344
345 PUSHs (fh);
346 }
347 break;
348
349 case EIO_GROUP:
350 req->int1 = 2; /* mark group as finished */
351
352 if (req->sv1)
353 {
354 int i;
355 AV *av = (AV *)req->sv1;
356
357 EXTEND (SP, AvFILL (av) + 1);
358 for (i = 0; i <= AvFILL (av); ++i)
359 PUSHs (*av_fetch (av, i, 0));
360 }
361 break;
362
363 case EIO_NOP:
364 case EIO_BUSY:
365 break;
366
367 case EIO_READLINK:
368 if (req->result > 0)
369 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
370 break;
371
372 case EIO_STAT:
373 case EIO_LSTAT:
374 case EIO_FSTAT:
375 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
376 PL_laststatval = req->result;
377 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
378 PUSHs (sv_2mortal (newSViv (req->result)));
379 break;
380
381 case EIO_READ:
382 {
383 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
384 *SvEND (req->sv2) = 0;
385 SvPOK_only (req->sv2);
386 SvSETMAGIC (req->sv2);
387 PUSHs (sv_2mortal (newSViv (req->result)));
388 }
389 break;
390
391 case EIO_DUP2:
392 if (req->result > 0)
393 req->result = 0;
394 /* FALLTHROUGH */
395
396 default:
397 PUSHs (sv_2mortal (newSViv (req->result)));
398 break;
167 } 399 }
168 400
169 /* stop if no progress has been made */ 401 errno = req->errorno;
170 if (old_len == grp->length) 402
171 { 403 PUTBACK;
172 SvREFCNT_dec (grp->fh2); 404 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
173 grp->fh2 = 0; 405 SPAGAIN;
174 break; 406
175 } 407 FREETMPS;
408 LEAVE;
409
410 PUTBACK;
176 } 411 }
177}
178 412
179static void aio_grp_dec (aio_req grp) 413 return !!SvTRUE (ERRSV);
180{
181 --grp->length;
182
183 /* call feeder, if applicable */
184 aio_grp_feed (grp);
185
186 /* finish, if done */
187 if (!grp->length && grp->fd)
188 {
189 req_invoke (grp);
190 req_free (grp);
191 }
192} 414}
193 415
194static void poll_wait ()
195{
196 while (nreqs)
197 {
198 aio_req req;
199 pthread_mutex_lock (&reslock);
200 req = ress;
201 pthread_mutex_unlock (&reslock);
202
203 if (req)
204 return;
205
206 fd_set rfd;
207 FD_ZERO(&rfd);
208 FD_SET(respipe [0], &rfd);
209
210 select (respipe [0] + 1, &rfd, 0, 0, 0);
211 }
212}
213
214static void req_invoke (aio_req req)
215{
216 dSP;
217 int errorno = errno;
218
219 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
220 return;
221
222 errno = req->errorno;
223
224 ENTER;
225 SAVETMPS;
226 PUSHMARK (SP);
227 EXTEND (SP, 1);
228
229 switch (req->type)
230 {
231 case REQ_READDIR:
232 {
233 SV *rv = &PL_sv_undef;
234
235 if (req->result >= 0)
236 {
237 char *buf = req->data2ptr;
238 AV *av = newAV ();
239
240 while (req->result)
241 {
242 SV *sv = newSVpv (buf, 0);
243
244 av_push (av, sv);
245 buf += SvCUR (sv) + 1;
246 req->result--;
247 }
248
249 rv = sv_2mortal (newRV_noinc ((SV *)av));
250 }
251
252 PUSHs (rv);
253 }
254 break;
255
256 case REQ_OPEN:
257 {
258 /* convert fd to fh */
259 SV *fh;
260
261 PUSHs (sv_2mortal (newSViv (req->result)));
262 PUTBACK;
263 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
264 SPAGAIN;
265
266 fh = SvREFCNT_inc (POPs);
267
268 PUSHMARK (SP);
269 XPUSHs (sv_2mortal (fh));
270 }
271 break;
272
273 case REQ_GROUP:
274 req->fd = 2; /* mark group as finished */
275
276 if (req->data)
277 {
278 int i;
279 AV *av = (AV *)req->data;
280
281 EXTEND (SP, AvFILL (av) + 1);
282 for (i = 0; i <= AvFILL (av); ++i)
283 PUSHs (*av_fetch (av, i, 0));
284 }
285 break;
286
287 case REQ_NOP:
288 case REQ_SLEEP:
289 break;
290
291 default:
292 PUSHs (sv_2mortal (newSViv (req->result)));
293 break;
294 }
295
296
297 PUTBACK;
298 call_sv (req->callback, G_VOID | G_EVAL);
299 SPAGAIN;
300
301 FREETMPS;
302 LEAVE;
303
304 errno = errorno;
305
306 if (SvTRUE (ERRSV))
307 {
308 req_free (req);
309 croak (0);
310 }
311}
312
313static void req_free (aio_req req) 416static void req_destroy (aio_req req)
314{ 417{
315 if (req->grp)
316 {
317 aio_req grp = req->grp;
318
319 /* unlink request */
320 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
321 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
322
323 if (grp->grp_first == req)
324 grp->grp_first = req->grp_next;
325
326 aio_grp_dec (grp);
327 }
328
329 if (req->self) 418 if (req->self)
330 { 419 {
331 sv_unmagic (req->self, PERL_MAGIC_ext); 420 sv_unmagic (req->self, PERL_MAGIC_ext);
332 SvREFCNT_dec (req->self); 421 SvREFCNT_dec (req->self);
333 } 422 }
334 423
335 SvREFCNT_dec (req->data);
336 SvREFCNT_dec (req->fh); 424 SvREFCNT_dec (req->sv1);
337 SvREFCNT_dec (req->fh2); 425 SvREFCNT_dec (req->sv2);
338 SvREFCNT_dec (req->callback); 426 SvREFCNT_dec (req->callback);
339 Safefree (req->statdata);
340
341 if (req->type == REQ_READDIR && req->result >= 0)
342 free (req->data2ptr);
343 427
344 Safefree (req); 428 Safefree (req);
345} 429}
346 430
347static void req_cancel (aio_req req) 431static void req_cancel_subs (aio_req grp)
348{ 432{
349 req->flags |= FLAG_CANCELLED; 433 aio_req sub;
350 434
351 if (req->type == REQ_GROUP) 435 if (grp->type != EIO_GROUP)
436 return;
437
438 SvREFCNT_dec (grp->sv2);
439 grp->sv2 = 0;
440
441 eio_grp_cancel (grp);
442}
443
444#ifdef USE_SOCKETS_AS_HANDLES
445# define TO_SOCKET(x) (win32_get_osfhandle (x))
446#else
447# define TO_SOCKET(x) (x)
448#endif
449
450static void
451create_respipe (void)
452{
453 int old_readfd = respipe [0];
454
455 if (respipe [1] >= 0)
456 respipe_close (TO_SOCKET (respipe [1]));
457
458#ifdef _WIN32
459 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
460#else
461 if (pipe (respipe))
462#endif
463 croak ("unable to initialize result pipe");
464
465 if (old_readfd >= 0)
352 { 466 {
353 aio_req sub; 467 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
468 croak ("unable to initialize result pipe(2)");
354 469
355 for (sub = req->grp_first; sub; sub = sub->grp_next) 470 respipe_close (respipe [0]);
356 req_cancel (sub); 471 respipe [0] = old_readfd;
357 } 472 }
358}
359 473
474#ifdef _WIN32
475 int arg = 1;
476 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
477 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
478#else
479 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
480 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
481#endif
482 croak ("unable to initialize result pipe(3)");
483
484 respipe_osf [0] = TO_SOCKET (respipe [0]);
485 respipe_osf [1] = TO_SOCKET (respipe [1]);
486}
487
488static void poll_wait (void)
489{
490 fd_set rfd;
491
492 while (eio_nreqs ())
493 {
494 int size;
495
496 X_LOCK (reslock);
497 size = res_queue.size;
498 X_UNLOCK (reslock);
499
500 if (size)
501 return;
502
503 etp_maybe_start_thread ();
504
505 FD_ZERO (&rfd);
506 FD_SET (respipe [0], &rfd);
507
508 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
509 }
510}
511
360static int poll_cb () 512static int poll_cb (void)
361{ 513{
362 dSP;
363 int count = 0;
364 int do_croak = 0;
365 aio_req req;
366
367 for (;;) 514 for (;;)
368 { 515 {
369 pthread_mutex_lock (&reslock); 516 int res = eio_poll ();
370 req = ress;
371 517
372 if (req) 518 if (res > 0)
373 {
374 ress = req->next;
375
376 if (!ress)
377 {
378 /* read any signals sent by the worker threads */
379 char buf [32];
380 while (read (respipe [0], buf, 32) == 32)
381 ;
382
383 rese = 0;
384 }
385 }
386
387 pthread_mutex_unlock (&reslock);
388
389 if (!req)
390 break; 519 croak (0);
391 520
392 --nreqs; 521 if (!max_outstanding || max_outstanding > eio_nreqs ())
522 return res;
393 523
394 if (req->type == REQ_QUIT) 524 poll_wait ();
395 started--;
396 else if (req->type == REQ_GROUP && req->length)
397 {
398 req->fd = 1; /* mark request as delayed */
399 continue;
400 }
401 else
402 {
403 if (req->type == REQ_READ)
404 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
405
406 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
407 SvREADONLY_off (req->data);
408
409 if (req->statdata)
410 {
411 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
412 PL_laststatval = req->result;
413 PL_statcache = *(req->statdata);
414 }
415
416 req_invoke (req);
417
418 count++;
419 }
420
421 req_free (req);
422 } 525 }
423
424 return count;
425} 526}
426 527
427static void *aio_proc(void *arg);
428
429static void start_thread (void) 528static void atfork_child (void)
430{ 529{
431 sigset_t fullsigset, oldsigset; 530 create_respipe ();
432 pthread_t tid;
433 pthread_attr_t attr;
434
435 pthread_attr_init (&attr);
436 pthread_attr_setstacksize (&attr, STACKSIZE);
437 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
438
439 sigfillset (&fullsigset);
440 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
441
442 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
443 started++;
444
445 sigprocmask (SIG_SETMASK, &oldsigset, 0);
446} 531}
447 532
448static void req_send (aio_req req) 533static SV *
534get_cb (SV *cb_sv)
449{ 535{
450 while (started < wanted && nreqs >= started) 536 HV *st;
451 start_thread (); 537 GV *gvp;
538 CV *cv;
452 539
453 ++nreqs; 540 if (!SvOK (cb_sv))
454
455 pthread_mutex_lock (&reqlock);
456
457 req->next = 0;
458
459 if (reqe)
460 {
461 reqe->next = req;
462 reqe = req;
463 }
464 else
465 reqe = reqs = req;
466
467 pthread_cond_signal (&reqwait);
468 pthread_mutex_unlock (&reqlock);
469
470 if (nreqs > max_outstanding)
471 for (;;)
472 {
473 poll_cb ();
474
475 if (nreqs <= max_outstanding)
476 break;
477
478 poll_wait ();
479 }
480}
481
482static void end_thread (void)
483{
484 aio_req req;
485 Newz (0, req, 1, aio_cb);
486 req->type = REQ_QUIT;
487
488 req_send (req);
489}
490
491static void min_parallel (int nthreads)
492{
493 if (wanted < nthreads)
494 wanted = nthreads;
495}
496
497static void max_parallel (int nthreads)
498{
499 int cur = started;
500
501 if (wanted > nthreads)
502 wanted = nthreads;
503
504 while (cur > wanted)
505 {
506 end_thread ();
507 cur--;
508 }
509
510 while (started > wanted)
511 {
512 poll_wait ();
513 poll_cb ();
514 }
515}
516
517static void create_pipe ()
518{
519 if (pipe (respipe))
520 croak ("unable to initialize result pipe");
521
522 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
523 croak ("cannot set result pipe to nonblocking mode");
524
525 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
526 croak ("cannot set result pipe to nonblocking mode");
527}
528
529/*****************************************************************************/
530/* work around various missing functions */
531
532#if !HAVE_PREADWRITE
533# define pread aio_pread
534# define pwrite aio_pwrite
535
536/*
537 * make our pread/pwrite safe against themselves, but not against
538 * normal read/write by using a mutex. slows down execution a lot,
539 * but that's your problem, not mine.
540 */
541static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
542
543static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
544{
545 ssize_t res;
546 off_t ooffset;
547
548 pthread_mutex_lock (&preadwritelock);
549 ooffset = lseek (fd, 0, SEEK_CUR);
550 lseek (fd, offset, SEEK_SET);
551 res = read (fd, buf, count);
552 lseek (fd, ooffset, SEEK_SET);
553 pthread_mutex_unlock (&preadwritelock);
554
555 return res;
556}
557
558static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
559{
560 ssize_t res;
561 off_t ooffset;
562
563 pthread_mutex_lock (&preadwritelock);
564 ooffset = lseek (fd, 0, SEEK_CUR);
565 lseek (fd, offset, SEEK_SET);
566 res = write (fd, buf, count);
567 lseek (fd, offset, SEEK_SET);
568 pthread_mutex_unlock (&preadwritelock);
569
570 return res;
571}
572#endif
573
574#if !HAVE_FDATASYNC
575# define fdatasync fsync
576#endif
577
578#if !HAVE_READAHEAD
579# define readahead aio_readahead
580
581static ssize_t readahead (int fd, off_t offset, size_t count)
582{
583 char readahead_buf[4096];
584
585 while (count > 0)
586 {
587 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
588
589 pread (fd, readahead_buf, len, offset);
590 offset += len;
591 count -= len;
592 }
593
594 errno = 0;
595}
596#endif
597
598#if !HAVE_READDIR_R
599# define readdir_r aio_readdir_r
600
601static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
602
603static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
604{
605 struct dirent *e;
606 int errorno;
607
608 pthread_mutex_lock (&readdirlock);
609
610 e = readdir (dirp);
611 errorno = errno;
612
613 if (e)
614 {
615 *res = ent;
616 strcpy (ent->d_name, e->d_name);
617 }
618 else
619 *res = 0;
620
621 pthread_mutex_unlock (&readdirlock);
622
623 errno = errorno;
624 return e ? 0 : -1;
625}
626#endif
627
628/* sendfile always needs emulation */
629static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
630{
631 ssize_t res;
632
633 if (!count)
634 return 0; 541 return 0;
635 542
636#if HAVE_SENDFILE 543 cv = sv_2cv (cb_sv, &st, &gvp, 0);
637# if __linux
638 res = sendfile (ofd, ifd, &offset, count);
639 544
640# elif __freebsd 545 if (!cv)
641 /* 546 croak ("IO::AIO callback must be undef or a CODE reference");
642 * Of course, the freebsd sendfile is a dire hack with no thoughts
643 * wasted on making it similar to other I/O functions.
644 */
645 {
646 off_t sbytes;
647 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
648 547
649 if (res < 0 && sbytes) 548 return (SV *)cv;
650 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
651 res = sbytes;
652 }
653
654# elif __hpux
655 res = sendfile (ofd, ifd, offset, count, 0, 0);
656
657# elif __solaris
658 {
659 struct sendfilevec vec;
660 size_t sbytes;
661
662 vec.sfv_fd = ifd;
663 vec.sfv_flag = 0;
664 vec.sfv_off = offset;
665 vec.sfv_len = count;
666
667 res = sendfilev (ofd, &vec, 1, &sbytes);
668
669 if (res < 0 && sbytes)
670 res = sbytes;
671 }
672
673# endif
674#else
675 res = -1;
676 errno = ENOSYS;
677#endif
678
679 if (res < 0
680 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
681#if __solaris
682 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
683#endif
684 )
685 )
686 {
687 /* emulate sendfile. this is a major pain in the ass */
688 char buf[4096];
689 res = 0;
690
691 while (count)
692 {
693 ssize_t cnt;
694
695 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);
696
697 if (cnt <= 0)
698 {
699 if (cnt && !res) res = -1;
700 break;
701 }
702
703 cnt = write (ofd, buf, cnt);
704
705 if (cnt <= 0)
706 {
707 if (cnt && !res) res = -1;
708 break;
709 }
710
711 offset += cnt;
712 res += cnt;
713 count -= cnt;
714 }
715 }
716
717 return res;
718}
719
720/* read a full directory */
721static int scandir_ (const char *path, void **namesp)
722{
723 DIR *dirp = opendir (path);
724 union
725 {
726 struct dirent d;
727 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
728 } u;
729 struct dirent *entp;
730 char *name, *names;
731 int memlen = 4096;
732 int memofs = 0;
733 int res = 0;
734 int errorno;
735
736 if (!dirp)
737 return -1;
738
739 names = malloc (memlen);
740
741 for (;;)
742 {
743 errno = 0, readdir_r (dirp, &u.d, &entp);
744
745 if (!entp)
746 break;
747
748 name = entp->d_name;
749
750 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
751 {
752 int len = strlen (name) + 1;
753
754 res++;
755
756 while (memofs + len > memlen)
757 {
758 memlen *= 2;
759 names = realloc (names, memlen);
760 if (!names)
761 break;
762 }
763
764 memcpy (names + memofs, name, len);
765 memofs += len;
766 }
767 }
768
769 errorno = errno;
770 closedir (dirp);
771
772 if (errorno)
773 {
774 free (names);
775 errno = errorno;
776 res = -1;
777 }
778
779 *namesp = (void *)names;
780 return res;
781}
782
783/*****************************************************************************/
784
785static void *aio_proc (void *thr_arg)
786{
787 aio_req req;
788 int type;
789
790 do
791 {
792 pthread_mutex_lock (&reqlock);
793
794 for (;;)
795 {
796 req = reqs;
797
798 if (reqs)
799 {
800 reqs = reqs->next;
801 if (!reqs) reqe = 0;
802 }
803
804 if (req)
805 break;
806
807 pthread_cond_wait (&reqwait, &reqlock);
808 }
809
810 pthread_mutex_unlock (&reqlock);
811
812 errno = 0; /* strictly unnecessary */
813 type = req->type; /* remember type for QUIT check */
814
815 if (!(req->flags & FLAG_CANCELLED))
816 switch (type)
817 {
818 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
819 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
820
821 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
822 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
823
824 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
825 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
826 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
827
828 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
829 case REQ_CLOSE: req->result = close (req->fd); break;
830 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
831 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
832 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
833 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
834 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
835
836 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
837 case REQ_FSYNC: req->result = fsync (req->fd); break;
838 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
839
840 case REQ_SLEEP:
841 {
842 struct timeval tv;
843
844 tv.tv_sec = req->fd;
845 tv.tv_usec = req->fd2;
846
847 req->result = select (0, 0, 0, 0, &tv);
848 }
849
850 case REQ_GROUP:
851 case REQ_NOP:
852 case REQ_QUIT:
853 break;
854
855 default:
856 req->result = ENOSYS;
857 break;
858 }
859
860 req->errorno = errno;
861
862 pthread_mutex_lock (&reslock);
863
864 req->next = 0;
865
866 if (rese)
867 {
868 rese->next = req;
869 rese = req;
870 }
871 else
872 {
873 rese = ress = req;
874
875 /* write a dummy byte to the pipe so fh becomes ready */
876 write (respipe [1], &respipe, 1);
877 }
878
879 pthread_mutex_unlock (&reslock);
880 }
881 while (type != REQ_QUIT);
882
883 return 0;
884}
885
886/*****************************************************************************/
887
888static void atfork_prepare (void)
889{
890 pthread_mutex_lock (&reqlock);
891 pthread_mutex_lock (&reslock);
892#if !HAVE_PREADWRITE
893 pthread_mutex_lock (&preadwritelock);
894#endif
895#if !HAVE_READDIR_R
896 pthread_mutex_lock (&readdirlock);
897#endif
898}
899
900static void atfork_parent (void)
901{
902#if !HAVE_READDIR_R
903 pthread_mutex_unlock (&readdirlock);
904#endif
905#if !HAVE_PREADWRITE
906 pthread_mutex_unlock (&preadwritelock);
907#endif
908 pthread_mutex_unlock (&reslock);
909 pthread_mutex_unlock (&reqlock);
910}
911
912static void atfork_child (void)
913{
914 aio_req prv;
915
916 started = 0;
917
918 while (reqs)
919 {
920 prv = reqs;
921 reqs = prv->next;
922 req_free (prv);
923 }
924
925 reqs = reqe = 0;
926
927 while (ress)
928 {
929 prv = ress;
930 ress = prv->next;
931 req_free (prv);
932 }
933
934 ress = rese = 0;
935
936 close (respipe [0]);
937 close (respipe [1]);
938 create_pipe ();
939
940 atfork_parent ();
941} 549}
942 550
943#define dREQ \ 551#define dREQ \
552 SV *cb_cv; \
944 aio_req req; \ 553 aio_req req; \
945 int req_pri = next_pri; \ 554 int req_pri = next_pri; \
946 next_pri = DEFAULT_PRI + PRI_BIAS; \ 555 next_pri = EIO_PRI_DEFAULT; \
947 \ 556 \
948 if (SvOK (callback) && !SvROK (callback)) \ 557 cb_cv = get_cb (callback); \
949 croak ("callback must be undef or of reference type"); \
950 \ 558 \
951 Newz (0, req, 1, aio_cb); \ 559 Newz (0, req, 1, eio_req); \
952 if (!req) \ 560 if (!req) \
953 croak ("out of memory during aio_req allocation"); \ 561 croak ("out of memory during eio_req allocation"); \
954 \ 562 \
955 req->callback = newSVsv (callback); \ 563 req->callback = SvREFCNT_inc (cb_cv); \
956 req->pri = req_pri 564 req->pri = req_pri
957 565
958#define REQ_SEND \ 566#define REQ_SEND \
567 PUTBACK; \
959 req_send (req); \ 568 req_submit (req); \
569 SPAGAIN; \
960 \ 570 \
961 if (GIMME_V != G_VOID) \ 571 if (GIMME_V != G_VOID) \
962 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 572 XPUSHs (req_sv (req, AIO_REQ_KLASS));
963 573
574static int
575extract_fd (SV *fh, int wr)
576{
577 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
578
579 if (fd < 0)
580 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
581
582 return fd;
583}
584
964MODULE = IO::AIO PACKAGE = IO::AIO 585MODULE = IO::AIO PACKAGE = IO::AIO
965 586
966PROTOTYPES: ENABLE 587PROTOTYPES: ENABLE
967 588
968BOOT: 589BOOT:
969{ 590{
591 static const struct {
592 const char *name;
593 IV iv;
594 } *civ, const_iv[] = {
595# define const_iv(name, value) { # name, (IV) value },
596# define const_eio(name) { # name, (IV) EIO_ ## name },
597 const_iv (EXDEV , EXDEV)
598 const_iv (ENOSYS , ENOSYS)
599 const_iv (O_RDONLY, O_RDONLY)
600 const_iv (O_WRONLY, O_WRONLY)
601 const_iv (O_CREAT , O_CREAT)
602 const_iv (O_TRUNC , O_TRUNC)
603#ifndef _WIN32
604 const_iv (S_IFIFO , S_IFIFO)
605#endif
606 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
607 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
608 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
609 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
610 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
611 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
612
613 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
614 const_eio (SYNC_FILE_RANGE_WRITE)
615 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
616
617 const_eio (READDIR_DENTS)
618 const_eio (READDIR_DIRS_FIRST)
619 const_eio (READDIR_STAT_ORDER)
620 const_eio (READDIR_FOUND_UNKNOWN)
621
622 const_eio (DT_UNKNOWN)
623 const_eio (DT_FIFO)
624 const_eio (DT_CHR)
625 const_eio (DT_DIR)
626 const_eio (DT_BLK)
627 const_eio (DT_REG)
628 const_eio (DT_LNK)
629 const_eio (DT_SOCK)
630 const_eio (DT_WHT)
631 };
632
970 HV *stash = gv_stashpv ("IO::AIO", 1); 633 stash = gv_stashpv ("IO::AIO", 1);
971 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
972 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
973 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
974 634
635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
637
975 create_pipe (); 638 create_respipe ();
976 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
977}
978 639
640 if (eio_init (want_poll, done_poll) < 0)
641 croak ("IO::AIO: unable to initialise eio library");
642
643 /* atfork child called in fifo order, so before eio's handler */
644 X_THREAD_ATFORK (0, 0, atfork_child);
645}
646
979void 647void
980min_parallel (nthreads) 648max_poll_reqs (int nreqs)
981 int nthreads
982 PROTOTYPE: $ 649 PROTOTYPE: $
650 CODE:
651 eio_set_max_poll_reqs (nreqs);
983 652
984void 653void
985max_parallel (nthreads) 654max_poll_time (double nseconds)
986 int nthreads
987 PROTOTYPE: $ 655 PROTOTYPE: $
988
989int
990max_outstanding (nreqs)
991 int nreqs
992 PROTOTYPE: $
993 CODE: 656 CODE:
994 RETVAL = max_outstanding; 657 eio_set_max_poll_time (nseconds);
658
659void
660min_parallel (int nthreads)
661 PROTOTYPE: $
662 CODE:
663 eio_set_min_parallel (nthreads);
664
665void
666max_parallel (int nthreads)
667 PROTOTYPE: $
668 CODE:
669 eio_set_max_parallel (nthreads);
670
671void
672max_idle (int nthreads)
673 PROTOTYPE: $
674 CODE:
675 eio_set_max_idle (nthreads);
676
677void
678max_outstanding (int maxreqs)
679 PROTOTYPE: $
680 CODE:
995 max_outstanding = nreqs; 681 max_outstanding = maxreqs;
996 682
997void 683void
998aio_open (pathname,flags,mode,callback=&PL_sv_undef) 684aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
999 SV * pathname
1000 int flags
1001 int mode
1002 SV * callback
1003 PROTOTYPE: $$$;$ 685 PROTOTYPE: $$$;$
1004 PPCODE: 686 PPCODE:
1005{ 687{
1006 dREQ; 688 dREQ;
1007 689
1008 req->type = REQ_OPEN; 690 req->type = EIO_OPEN;
1009 req->data = newSVsv (pathname); 691 req->sv1 = newSVsv (pathname);
1010 req->dataptr = SvPVbyte_nolen (req->data); 692 req->ptr1 = SvPVbyte_nolen (req->sv1);
1011 req->fd = flags; 693 req->int1 = flags;
1012 req->mode = mode; 694 req->int2 = mode;
1013 695
1014 REQ_SEND; 696 REQ_SEND;
1015} 697}
1016 698
1017void 699void
1018aio_close (fh,callback=&PL_sv_undef) 700aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1019 SV * fh
1020 SV * callback
1021 PROTOTYPE: $;$ 701 PROTOTYPE: $;$
1022 ALIAS: 702 ALIAS:
1023 aio_close = REQ_CLOSE
1024 aio_fsync = REQ_FSYNC 703 aio_fsync = EIO_FSYNC
1025 aio_fdatasync = REQ_FDATASYNC 704 aio_fdatasync = EIO_FDATASYNC
1026 PPCODE: 705 PPCODE:
1027{ 706{
707 int fd = extract_fd (fh, 0);
1028 dREQ; 708 dREQ;
1029 709
1030 req->type = ix; 710 req->type = ix;
1031 req->fh = newSVsv (fh); 711 req->sv1 = newSVsv (fh);
1032 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 712 req->int1 = fd;
1033 713
1034 REQ_SEND (req); 714 REQ_SEND (req);
1035} 715}
1036 716
1037void 717void
718aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
719 PROTOTYPE: $$$$;$
720 PPCODE:
721{
722 int fd = extract_fd (fh, 0);
723 dREQ;
724
725 req->type = EIO_SYNC_FILE_RANGE;
726 req->sv1 = newSVsv (fh);
727 req->int1 = fd;
728 req->offs = offset;
729 req->size = nbytes;
730 req->int2 = flags;
731
732 REQ_SEND (req);
733}
734
735void
736aio_close (SV *fh, SV *callback=&PL_sv_undef)
737 PROTOTYPE: $;$
738 PPCODE:
739{
740 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
741 int fd = extract_fd (fh, 0);
742 dREQ;
743
744 if (close_pipe < 0)
745 {
746 int pipefd [2];
747
748 if (pipe (pipefd) < 0
749 || close (pipefd [1]) < 0
750 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
751 abort (); /*D*/
752
753 close_pipe = pipefd [0];
754 }
755
756 req->type = EIO_DUP2;
757 req->int1 = close_pipe;
758 req->sv2 = newSVsv (fh);
759 req->int2 = fd;
760
761 REQ_SEND (req);
762}
763
764void
1038aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 765aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1039 SV * fh
1040 UV offset
1041 UV length
1042 SV * data
1043 UV dataoffset
1044 SV * callback
1045 ALIAS: 766 ALIAS:
1046 aio_read = REQ_READ 767 aio_read = EIO_READ
1047 aio_write = REQ_WRITE 768 aio_write = EIO_WRITE
1048 PROTOTYPE: $$$$$;$ 769 PROTOTYPE: $$$$$;$
1049 PPCODE: 770 PPCODE:
1050{ 771{
1051 aio_req req;
1052 STRLEN svlen; 772 STRLEN svlen;
773 int fd = extract_fd (fh, ix == EIO_WRITE);
1053 char *svptr = SvPVbyte (data, svlen); 774 char *svptr = SvPVbyte (data, svlen);
1054 775 UV len = SvUV (length);
1055 SvUPGRADE (data, SVt_PV);
1056 SvPOK_on (data);
1057 776
1058 if (dataoffset < 0) 777 if (dataoffset < 0)
1059 dataoffset += svlen; 778 dataoffset += svlen;
1060 779
1061 if (dataoffset < 0 || dataoffset > svlen) 780 if (dataoffset < 0 || dataoffset > svlen)
1062 croak ("data offset outside of string"); 781 croak ("dataoffset outside of data scalar");
1063 782
1064 if (ix == REQ_WRITE) 783 if (ix == EIO_WRITE)
1065 { 784 {
1066 /* write: check length and adjust. */ 785 /* write: check length and adjust. */
1067 if (length < 0 || length + dataoffset > svlen) 786 if (!SvOK (length) || len + dataoffset > svlen)
1068 length = svlen - dataoffset; 787 len = svlen - dataoffset;
1069 } 788 }
1070 else 789 else
1071 { 790 {
1072 /* read: grow scalar as necessary */ 791 /* read: check type and grow scalar as necessary */
792 SvUPGRADE (data, SVt_PV);
1073 svptr = SvGROW (data, length + dataoffset); 793 svptr = SvGROW (data, len + dataoffset + 1);
1074 } 794 }
1075
1076 if (length < 0)
1077 croak ("length must not be negative");
1078 795
1079 { 796 {
1080 dREQ; 797 dREQ;
1081 798
1082 req->type = ix; 799 req->type = ix;
1083 req->fh = newSVsv (fh); 800 req->sv1 = newSVsv (fh);
1084 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 801 req->int1 = fd;
1085 : IoOFP (sv_2io (fh))); 802 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1086 req->offset = offset; 803 req->size = len;
1087 req->length = length;
1088 req->data = SvREFCNT_inc (data); 804 req->sv2 = SvREFCNT_inc (data);
1089 req->dataptr = (char *)svptr + dataoffset; 805 req->ptr2 = (char *)svptr + dataoffset;
806 req->stroffset = dataoffset;
1090 807
1091 if (!SvREADONLY (data)) 808 if (!SvREADONLY (data))
1092 { 809 {
1093 SvREADONLY_on (data); 810 SvREADONLY_on (data);
1094 req->data2ptr = (void *)data; 811 req->flags |= FLAG_SV2_RO_OFF;
1095 } 812 }
1096 813
1097 REQ_SEND; 814 REQ_SEND;
1098 } 815 }
1099} 816}
1100 817
1101void 818void
819aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
820 PROTOTYPE: $$;$
821 PPCODE:
822{
823 SV *data;
824 dREQ;
825
826 req->type = EIO_READLINK;
827 req->sv1 = newSVsv (path);
828 req->ptr1 = SvPVbyte_nolen (req->sv1);
829
830 REQ_SEND;
831}
832
833void
1102aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 834aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1103 SV * out_fh
1104 SV * in_fh
1105 UV in_offset
1106 UV length
1107 SV * callback
1108 PROTOTYPE: $$$$;$ 835 PROTOTYPE: $$$$;$
1109 PPCODE: 836 PPCODE:
1110{ 837{
838 int ifd = extract_fd (in_fh , 0);
839 int ofd = extract_fd (out_fh, 0);
1111 dREQ; 840 dREQ;
1112 841
1113 req->type = REQ_SENDFILE; 842 req->type = EIO_SENDFILE;
1114 req->fh = newSVsv (out_fh); 843 req->sv1 = newSVsv (out_fh);
1115 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 844 req->int1 = ofd;
1116 req->fh2 = newSVsv (in_fh); 845 req->sv2 = newSVsv (in_fh);
1117 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 846 req->int2 = ifd;
1118 req->offset = in_offset; 847 req->offs = in_offset;
1119 req->length = length; 848 req->size = length;
1120 849
1121 REQ_SEND; 850 REQ_SEND;
1122} 851}
1123 852
1124void 853void
1125aio_readahead (fh,offset,length,callback=&PL_sv_undef) 854aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1126 SV * fh
1127 UV offset
1128 IV length
1129 SV * callback
1130 PROTOTYPE: $$$;$ 855 PROTOTYPE: $$$;$
1131 PPCODE: 856 PPCODE:
1132{ 857{
858 int fd = extract_fd (fh, 0);
1133 dREQ; 859 dREQ;
1134 860
1135 req->type = REQ_READAHEAD; 861 req->type = EIO_READAHEAD;
1136 req->fh = newSVsv (fh); 862 req->sv1 = newSVsv (fh);
1137 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 863 req->int1 = fd;
1138 req->offset = offset; 864 req->offs = offset;
1139 req->length = length; 865 req->size = length;
1140 866
1141 REQ_SEND; 867 REQ_SEND;
1142} 868}
1143 869
1144void 870void
1145aio_stat (fh_or_path,callback=&PL_sv_undef) 871aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1146 SV * fh_or_path
1147 SV * callback
1148 ALIAS: 872 ALIAS:
1149 aio_stat = REQ_STAT 873 aio_stat = EIO_STAT
1150 aio_lstat = REQ_LSTAT 874 aio_lstat = EIO_LSTAT
1151 PPCODE: 875 PPCODE:
1152{ 876{
1153 dREQ; 877 dREQ;
1154 878
1155 New (0, req->statdata, 1, Stat_t); 879 req->sv1 = newSVsv (fh_or_path);
1156 if (!req->statdata)
1157 {
1158 req_free (req);
1159 croak ("out of memory during aio_req->statdata allocation");
1160 }
1161 880
1162 if (SvPOK (fh_or_path)) 881 if (SvPOK (req->sv1))
1163 { 882 {
1164 req->type = ix; 883 req->type = ix;
1165 req->data = newSVsv (fh_or_path);
1166 req->dataptr = SvPVbyte_nolen (req->data); 884 req->ptr1 = SvPVbyte_nolen (req->sv1);
1167 } 885 }
1168 else 886 else
1169 { 887 {
1170 req->type = REQ_FSTAT; 888 req->type = EIO_FSTAT;
1171 req->fh = newSVsv (fh_or_path);
1172 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 889 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1173 } 890 }
1174 891
1175 REQ_SEND; 892 REQ_SEND;
1176} 893}
1177 894
1178void 895void
896aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
897 PPCODE:
898{
899 dREQ;
900
901 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
902 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
903 req->sv1 = newSVsv (fh_or_path);
904
905 if (SvPOK (req->sv1))
906 {
907 req->type = EIO_UTIME;
908 req->ptr1 = SvPVbyte_nolen (req->sv1);
909 }
910 else
911 {
912 req->type = EIO_FUTIME;
913 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
914 }
915
916 REQ_SEND;
917}
918
919void
920aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
921 PPCODE:
922{
923 dREQ;
924
925 req->sv1 = newSVsv (fh_or_path);
926 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
927
928 if (SvPOK (req->sv1))
929 {
930 req->type = EIO_TRUNCATE;
931 req->ptr1 = SvPVbyte_nolen (req->sv1);
932 }
933 else
934 {
935 req->type = EIO_FTRUNCATE;
936 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
937 }
938
939 REQ_SEND;
940}
941
942void
943aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
944 ALIAS:
945 aio_chmod = EIO_CHMOD
946 aio_mkdir = EIO_MKDIR
947 PPCODE:
948{
949 dREQ;
950
951 req->int2 = mode;
952 req->sv1 = newSVsv (fh_or_path);
953
954 if (SvPOK (req->sv1))
955 {
956 req->type = ix;
957 req->ptr1 = SvPVbyte_nolen (req->sv1);
958 }
959 else
960 {
961 req->type = EIO_FCHMOD;
962 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
963 }
964
965 REQ_SEND;
966}
967
968void
969aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
970 PPCODE:
971{
972 dREQ;
973
974 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
975 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
976 req->sv1 = newSVsv (fh_or_path);
977
978 if (SvPOK (req->sv1))
979 {
980 req->type = EIO_CHOWN;
981 req->ptr1 = SvPVbyte_nolen (req->sv1);
982 }
983 else
984 {
985 req->type = EIO_FCHOWN;
986 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
987 }
988
989 REQ_SEND;
990}
991
992void
993aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
994 PPCODE:
995{
996 dREQ;
997
998 req->type = EIO_READDIR;
999 req->sv1 = newSVsv (pathname);
1000 req->ptr1 = SvPVbyte_nolen (req->sv1);
1001 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1002
1003 if (flags & EIO_READDIR_DENTS)
1004 req->int1 |= EIO_READDIR_CUSTOM2;
1005
1006 REQ_SEND;
1007}
1008
1009void
1179aio_unlink (pathname,callback=&PL_sv_undef) 1010aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1180 SV * pathname
1181 SV * callback
1182 ALIAS: 1011 ALIAS:
1183 aio_unlink = REQ_UNLINK 1012 aio_unlink = EIO_UNLINK
1184 aio_rmdir = REQ_RMDIR 1013 aio_rmdir = EIO_RMDIR
1185 aio_readdir = REQ_READDIR 1014 aio_readdir = EIO_READDIR
1186 PPCODE: 1015 PPCODE:
1187{ 1016{
1188 dREQ; 1017 dREQ;
1189 1018
1190 req->type = ix; 1019 req->type = ix;
1191 req->data = newSVsv (pathname); 1020 req->sv1 = newSVsv (pathname);
1192 req->dataptr = SvPVbyte_nolen (req->data); 1021 req->ptr1 = SvPVbyte_nolen (req->sv1);
1193 1022
1194 REQ_SEND; 1023 REQ_SEND;
1195} 1024}
1196 1025
1197void 1026void
1198aio_link (oldpath,newpath,callback=&PL_sv_undef) 1027aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1199 SV * oldpath
1200 SV * newpath
1201 SV * callback
1202 ALIAS: 1028 ALIAS:
1203 aio_link = REQ_LINK 1029 aio_link = EIO_LINK
1204 aio_symlink = REQ_SYMLINK 1030 aio_symlink = EIO_SYMLINK
1205 aio_rename = REQ_RENAME 1031 aio_rename = EIO_RENAME
1206 PPCODE: 1032 PPCODE:
1207{ 1033{
1208 dREQ; 1034 dREQ;
1209 1035
1210 req->type = ix; 1036 req->type = ix;
1211 req->fh = newSVsv (oldpath); 1037 req->sv1 = newSVsv (oldpath);
1212 req->data2ptr = SvPVbyte_nolen (req->fh); 1038 req->ptr1 = SvPVbyte_nolen (req->sv1);
1213 req->data = newSVsv (newpath); 1039 req->sv2 = newSVsv (newpath);
1214 req->dataptr = SvPVbyte_nolen (req->data); 1040 req->ptr2 = SvPVbyte_nolen (req->sv2);
1215 1041
1216 REQ_SEND; 1042 REQ_SEND;
1217} 1043}
1218 1044
1219void 1045void
1220aio_sleep (delay,callback=&PL_sv_undef) 1046aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1221 double delay
1222 SV * callback
1223 PPCODE: 1047 PPCODE:
1224{ 1048{
1225 dREQ; 1049 dREQ;
1226 1050
1227 req->type = REQ_SLEEP; 1051 req->type = EIO_MKNOD;
1228 req->fd = delay < 0. ? 0 : delay; 1052 req->sv1 = newSVsv (pathname);
1229 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1053 req->ptr1 = SvPVbyte_nolen (req->sv1);
1230 1054 req->int2 = (mode_t)mode;
1055 req->offs = dev;
1056
1231 REQ_SEND; 1057 REQ_SEND;
1232} 1058}
1233 1059
1234void 1060void
1061aio_busy (double delay, SV *callback=&PL_sv_undef)
1062 PPCODE:
1063{
1064 dREQ;
1065
1066 req->type = EIO_BUSY;
1067 req->nv1 = delay < 0. ? 0. : delay;
1068
1069 REQ_SEND;
1070}
1071
1072void
1235aio_group (callback=&PL_sv_undef) 1073aio_group (SV *callback=&PL_sv_undef)
1236 SV * callback
1237 PROTOTYPE: ;$ 1074 PROTOTYPE: ;$
1238 PPCODE: 1075 PPCODE:
1239{ 1076{
1240 dREQ; 1077 dREQ;
1241 1078
1242 req->type = REQ_GROUP; 1079 req->type = EIO_GROUP;
1080
1243 req_send (req); 1081 req_submit (req);
1244
1245 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1082 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1246} 1083}
1247 1084
1248void 1085void
1249aio_nop (callback=&PL_sv_undef) 1086aio_nop (SV *callback=&PL_sv_undef)
1250 SV * callback 1087 ALIAS:
1088 aio_nop = EIO_NOP
1089 aio_sync = EIO_SYNC
1251 PPCODE: 1090 PPCODE:
1252{ 1091{
1253 dREQ; 1092 dREQ;
1254 1093
1255 req->type = REQ_NOP; 1094 req->type = ix;
1256 1095
1257 REQ_SEND; 1096 REQ_SEND;
1258} 1097}
1259 1098
1260#if 0 1099int
1261 1100aioreq_pri (int pri = 0)
1262void 1101 PROTOTYPE: ;$
1263aio_pri (int pri = DEFAULT_PRI)
1264 CODE: 1102 CODE:
1103 RETVAL = next_pri;
1104 if (items > 0)
1105 {
1265 if (pri > PRI_MIN) pri = PRI_MIN; 1106 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
1266 if (pri < PRI_MAX) pri = PRI_MAX; 1107 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
1267 next_pri = pri + PRI_BIAS; 1108 next_pri = pri;
1109 }
1110 OUTPUT:
1111 RETVAL
1268 1112
1269#endif 1113void
1114aioreq_nice (int nice = 0)
1115 CODE:
1116 nice = next_pri - nice;
1117 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1118 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1119 next_pri = nice;
1270 1120
1271void 1121void
1272flush () 1122flush ()
1273 PROTOTYPE: 1123 PROTOTYPE:
1274 CODE: 1124 CODE:
1275 while (nreqs) 1125 while (eio_nreqs ())
1276 { 1126 {
1277 poll_wait (); 1127 poll_wait ();
1278 poll_cb (); 1128 poll_cb ();
1279 } 1129 }
1280 1130
1281void 1131int
1282poll() 1132poll()
1283 PROTOTYPE: 1133 PROTOTYPE:
1284 CODE: 1134 CODE:
1285 if (nreqs)
1286 {
1287 poll_wait (); 1135 poll_wait ();
1288 poll_cb (); 1136 RETVAL = poll_cb ();
1289 } 1137 OUTPUT:
1138 RETVAL
1290 1139
1291int 1140int
1292poll_fileno() 1141poll_fileno()
1293 PROTOTYPE: 1142 PROTOTYPE:
1294 CODE: 1143 CODE:
1306 1155
1307void 1156void
1308poll_wait() 1157poll_wait()
1309 PROTOTYPE: 1158 PROTOTYPE:
1310 CODE: 1159 CODE:
1311 if (nreqs)
1312 poll_wait (); 1160 poll_wait ();
1313 1161
1314int 1162int
1315nreqs() 1163nreqs()
1316 PROTOTYPE: 1164 PROTOTYPE:
1317 CODE: 1165 CODE:
1318 RETVAL = nreqs; 1166 RETVAL = eio_nreqs ();
1319 OUTPUT: 1167 OUTPUT:
1320 RETVAL 1168 RETVAL
1321 1169
1170int
1171nready()
1172 PROTOTYPE:
1173 CODE:
1174 RETVAL = eio_nready ();
1175 OUTPUT:
1176 RETVAL
1177
1178int
1179npending()
1180 PROTOTYPE:
1181 CODE:
1182 RETVAL = eio_npending ();
1183 OUTPUT:
1184 RETVAL
1185
1186int
1187nthreads()
1188 PROTOTYPE:
1189 CODE:
1190 RETVAL = eio_nthreads ();
1191 OUTPUT:
1192 RETVAL
1193
1194int
1195fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1196 PROTOTYPE: $$$$
1197 CODE:
1198{
1199 #if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1200 RETVAL = posix_fadvise (fh, offset, length, advice);
1201 #else
1202 RETVAL = errno = ENOSYS;
1203 #endif
1204}
1205 OUTPUT:
1206 RETVAL
1207
1208ssize_t
1209sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1210 PROTOTYPE: $$$$
1211 CODE:
1212 eio_sendfile_sync (ofh, ifh, offset, count);
1213
1214void _on_next_submit (SV *cb)
1215 CODE:
1216 SvREFCNT_dec (on_next_submit);
1217 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1218
1322PROTOTYPES: DISABLE 1219PROTOTYPES: DISABLE
1323 1220
1324MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1221MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1325 1222
1326void 1223void
1327cancel (aio_req_ornot req) 1224cancel (aio_req_ornot req)
1328 PROTOTYPE:
1329 CODE: 1225 CODE:
1330 req_cancel (req); 1226 eio_cancel (req);
1331 1227
1332void 1228void
1333cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1229cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1334 CODE: 1230 PPCODE:
1231{
1232 if (GIMME_V != G_VOID)
1233 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1234
1235 if (items > 1)
1236 {
1237 SV *cb_cv = get_cb (callback);
1238
1335 SvREFCNT_dec (req->callback); 1239 SvREFCNT_dec (req->callback);
1336 req->callback = newSVsv (callback); 1240 req->callback = SvREFCNT_inc (cb_cv);
1241 }
1242}
1337 1243
1338MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1244MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1339 1245
1340void 1246void
1341add (aio_req grp, ...) 1247add (aio_req grp, ...)
1342 PPCODE: 1248 PPCODE:
1343{ 1249{
1344 int i; 1250 int i;
1345 aio_req req;
1346 1251
1347 if (grp->fd == 2) 1252 if (grp->int1 == 2)
1348 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1253 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1349 1254
1350 for (i = 1; i < items; ++i ) 1255 for (i = 1; i < items; ++i )
1351 { 1256 {
1257 aio_req req;
1258
1352 if (GIMME_V != G_VOID) 1259 if (GIMME_V != G_VOID)
1353 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1260 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1354 1261
1355 req = SvAIO_REQ (ST (i)); 1262 req = SvAIO_REQ (ST (i));
1356 1263
1357 if (req) 1264 if (req)
1358 { 1265 eio_grp_add (grp, req);
1359 ++grp->length;
1360 req->grp = grp;
1361
1362 req->grp_prev = 0;
1363 req->grp_next = grp->grp_first;
1364
1365 if (grp->grp_first)
1366 grp->grp_first->grp_prev = req;
1367
1368 grp->grp_first = req;
1369 } 1266 }
1370 }
1371} 1267}
1268
1269void
1270cancel_subs (aio_req_ornot req)
1271 CODE:
1272 req_cancel_subs (req);
1372 1273
1373void 1274void
1374result (aio_req grp, ...) 1275result (aio_req grp, ...)
1375 CODE: 1276 CODE:
1376{ 1277{
1377 int i; 1278 int i;
1279 AV *av;
1280
1281 grp->errorno = errno;
1282
1378 AV *av = newAV (); 1283 av = newAV ();
1284 av_extend (av, items - 1);
1379 1285
1380 for (i = 1; i < items; ++i ) 1286 for (i = 1; i < items; ++i )
1381 av_push (av, newSVsv (ST (i))); 1287 av_push (av, newSVsv (ST (i)));
1382 1288
1383 SvREFCNT_dec (grp->data); 1289 SvREFCNT_dec (grp->sv1);
1384 grp->data = (SV *)av; 1290 grp->sv1 = (SV *)av;
1385} 1291}
1386 1292
1387void 1293void
1294errno (aio_req grp, int errorno = errno)
1295 CODE:
1296 grp->errorno = errorno;
1297
1298void
1388feed_limit (aio_req grp, int limit) 1299limit (aio_req grp, int limit)
1389 CODE: 1300 CODE:
1390 grp->fd2 = limit; 1301 eio_grp_limit (grp, limit);
1391 aio_grp_feed (grp);
1392 1302
1393void 1303void
1394feed (aio_req grp, SV *callback=&PL_sv_undef) 1304feed (aio_req grp, SV *callback=&PL_sv_undef)
1395 CODE: 1305 CODE:
1396{ 1306{
1397 SvREFCNT_dec (grp->fh2); 1307 SvREFCNT_dec (grp->sv2);
1398 grp->fh2 = newSVsv (callback); 1308 grp->sv2 = newSVsv (callback);
1309 grp->feed = aio_grp_feed;
1399 1310
1400 if (grp->fd2 <= 0) 1311 if (grp->int2 <= 0)
1401 grp->fd2 = 2; 1312 grp->int2 = 2;
1402 1313
1403 aio_grp_feed (grp); 1314 eio_grp_limit (grp, grp->int2);
1404} 1315}
1405 1316

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines