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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines