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.64 by root, Mon Oct 23 23:54:41 2006 UTC vs.
Revision 1.156 by root, Thu Nov 12 00:01:52 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines