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.81 by root, Fri Oct 27 20:10:06 2006 UTC vs.
Revision 1.115 by root, Sat May 10 18:06:41 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines