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.98 by root, Wed May 9 06:45:12 2007 UTC vs.
Revision 1.170 by root, Wed Aug 4 16:09:36 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines