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.10 by root, Wed Jul 13 00:13:09 2005 UTC vs.
Revision 1.138 by root, Tue Apr 21 20:06:05 2009 UTC

1#include "libeio/xthread.h"
2
3#include <errno.h>
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#define _XOPEN_SOURCE 500 9#include <stddef.h>
6 10#include <stdlib.h>
11#include <errno.h>
7#include <sys/types.h> 12#include <sys/types.h>
8#include <sys/stat.h> 13#include <sys/stat.h>
9
10#include <unistd.h> 14#include <limits.h>
11#include <fcntl.h> 15#include <fcntl.h>
12#include <signal.h>
13#include <sched.h> 16#include <sched.h>
14#if __linux 17
18/* perl namespace pollution */
19#undef VERSION
20
21#ifdef _WIN32
22
23# define EIO_STRUCT_DIRENT Direntry_t
24# undef malloc
25# undef free
26
27// perl overrides all those nice win32 functions
28# undef open
29# undef read
30# undef write
31# undef send
32# undef recv
33# undef stat
34# undef fstat
35# define lstat stat
36# undef truncate
37# undef ftruncate
38# undef open
39# undef close
40# undef unlink
41# undef rmdir
42# undef rename
43# undef lseek
44
45# define chown(a,b,c) (errno = ENOSYS, -1)
46# define fchown(a,b,c) (errno = ENOSYS, -1)
47# define fchmod(a,b) (errno = ENOSYS, -1)
48# define symlink(a,b) (errno = ENOSYS, -1)
49# define readlink(a,b,c) (errno = ENOSYS, -1)
50# define mknod(a,b,c) (errno = ENOSYS, -1)
51# define truncate(a,b) (errno = ENOSYS, -1)
52# define ftruncate(fd,o) chsize ((fd), (o))
53# define fsync(fd) _commit (fd)
54# define opendir(fd) (errno = ENOSYS, 0)
55# define readdir(fd) (errno = ENOSYS, -1)
56# define closedir(fd) (errno = ENOSYS, -1)
57# define mkdir(a,b) mkdir (a)
58
59#else
60
61# include <sys/time.h>
15#include <sys/syscall.h> 62# include <sys/select.h>
63# include <unistd.h>
64# include <utime.h>
65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent
67
16#endif 68#endif
17 69
18#include <pthread.h> 70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
19 75
20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 76#define EIO_STRUCT_STAT Stat_t
21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
22typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */
23 77
24#if __ia64 78/* use NV for 32 bit perls as it allows larger offsets */
25# define STACKSIZE 65536 79#if IVSIZE >= 8
80# define SvVAL64 SvIV
26#else 81#else
27# define STACKSIZE 4096 82# define SvVAL64 SvNV
28#endif 83#endif
29 84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
98static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */
100
101#define AIO_REQ_KLASS "IO::AIO::REQ"
102#define AIO_GRP_KLASS "IO::AIO::GRP"
103
104#define EIO_REQ_MEMBERS \
105 SV *callback; \
106 SV *sv1, *sv2; \
107 STRLEN stroffset; \
108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
111
112#include "libeio/eio.h"
113
114static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req)
116static void req_destroy (eio_req *grp);
117#define EIO_DESTROY(req) req_destroy (req)
118
30enum { 119enum {
31 REQ_QUIT, 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
32 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK,
35 REQ_FSYNC, REQ_FDATASYNC,
36}; 121};
37 122
38typedef struct aio_cb { 123#include "libeio/eio.c"
39 struct aio_cb *volatile next;
40 124
41 int type;
42
43 int fd;
44 off_t offset;
45 size_t length;
46 ssize_t result;
47 mode_t mode; /* open */
48 int errorno;
49 SV *data, *callback;
50 void *dataptr;
51 STRLEN dataoffset;
52
53 Stat_t *statdata;
54} aio_cb;
55
56typedef aio_cb *aio_req; 125typedef eio_req *aio_req;
126typedef eio_req *aio_req_ornot;
57 127
58static int started; 128static SV *on_next_submit;
59static int nreqs; 129static int next_pri = EIO_PRI_DEFAULT;
60static int max_outstanding = 1<<30; 130static int max_outstanding;
61static int respipe [2];
62 131
63static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
64static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
65static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
66 133
67static volatile aio_req reqs, reqe; /* queue start, queue end */ 134static void req_destroy (aio_req req);
68static volatile aio_req ress, rese; /* queue start, queue end */ 135static void req_cancel (aio_req req);
136
137static void want_poll (void)
138{
139 /* write a dummy byte to the pipe so fh becomes ready */
140 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
141}
142
143static void done_poll (void)
144{
145 /* read any signals sent by the worker threads */
146 char buf [4];
147 while (respipe_read (respipe [0], buf, 4) == 4)
148 ;
149}
150
151/* must be called at most once */
152static SV *req_sv (aio_req req, const char *klass)
153{
154 if (!req->self)
155 {
156 req->self = (SV *)newHV ();
157 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
158 }
159
160 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
161}
162
163static aio_req SvAIO_REQ (SV *sv)
164{
165 MAGIC *mg;
166
167 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
168 croak ("object of class " AIO_REQ_KLASS " expected");
169
170 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
171
172 return mg ? (aio_req)mg->mg_ptr : 0;
173}
174
175static void aio_grp_feed (aio_req grp)
176{
177 if (grp->sv2 && SvOK (grp->sv2))
178 {
179 dSP;
180
181 ENTER;
182 SAVETMPS;
183 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185 PUTBACK;
186 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN;
188 FREETMPS;
189 LEAVE;
190 }
191}
192
193static void req_submit (eio_req *req)
194{
195 eio_submit (req);
196
197 if (expect_false (on_next_submit))
198 {
199 dSP;
200 SV *cb = sv_2mortal (on_next_submit);
201
202 on_next_submit = 0;
203
204 PUSHMARK (SP);
205 PUTBACK;
206 call_sv (cb, G_DISCARD | G_EVAL);
207 }
208}
209
210static int req_invoke (eio_req *req)
211{
212 dSP;
213
214 if (req->flags & FLAG_SV2_RO_OFF)
215 SvREADONLY_off (req->sv2);
216
217 if (!EIO_CANCELLED (req) && req->callback)
218 {
219 ENTER;
220 SAVETMPS;
221 PUSHMARK (SP);
222 EXTEND (SP, 1);
223
224 switch (req->type)
225 {
226 case EIO_READDIR:
227 {
228 SV *rv = &PL_sv_undef;
229
230 if (req->result >= 0)
231 {
232 int i;
233 char *buf = req->ptr2;
234 AV *av = newAV ();
235
236 av_extend (av, req->result - 1);
237
238 for (i = 0; i < req->result; ++i)
239 {
240 SV *sv = newSVpv (buf, 0);
241
242 av_store (av, i, sv);
243 buf += SvCUR (sv) + 1;
244 }
245
246 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 }
248
249 PUSHs (rv);
250 }
251 break;
252
253 case EIO_OPEN:
254 {
255 /* convert fd to fh */
256 SV *fh = &PL_sv_undef;
257
258 if (req->result >= 0)
259 {
260 GV *gv = (GV *)sv_newmortal ();
261 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
262 char sym [64];
263 int symlen;
264
265 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);
266 gv_init (gv, stash, sym, symlen, 0);
267
268 symlen = snprintf (
269 sym,
270 sizeof (sym),
271 "%s&=%d",
272 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273 req->result
274 );
275
276 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277 fh = (SV *)gv;
278 }
279
280 PUSHs (fh);
281 }
282 break;
283
284 case EIO_GROUP:
285 req->int1 = 2; /* mark group as finished */
286
287 if (req->sv1)
288 {
289 int i;
290 AV *av = (AV *)req->sv1;
291
292 EXTEND (SP, AvFILL (av) + 1);
293 for (i = 0; i <= AvFILL (av); ++i)
294 PUSHs (*av_fetch (av, i, 0));
295 }
296 break;
297
298 case EIO_NOP:
299 case EIO_BUSY:
300 break;
301
302 case EIO_READLINK:
303 if (req->result > 0)
304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
305 break;
306
307 case EIO_STAT:
308 case EIO_LSTAT:
309 case EIO_FSTAT:
310 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
311 PL_laststatval = req->result;
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result)));
314 break;
315
316 case EIO_READ:
317 {
318 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
324 break;
325
326 case EIO_DUP2:
327 if (req->result > 0)
328 req->result = 0;
329 /* FALLTHROUGH */
330
331 default:
332 PUSHs (sv_2mortal (newSViv (req->result)));
333 break;
334 }
335
336 errno = req->errorno;
337
338 PUTBACK;
339 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
340 SPAGAIN;
341
342 FREETMPS;
343 LEAVE;
344
345 PUTBACK;
346 }
347
348 return !!SvTRUE (ERRSV);
349}
350
351static void req_destroy (aio_req req)
352{
353 if (req->self)
354 {
355 sv_unmagic (req->self, PERL_MAGIC_ext);
356 SvREFCNT_dec (req->self);
357 }
358
359 SvREFCNT_dec (req->sv1);
360 SvREFCNT_dec (req->sv2);
361 SvREFCNT_dec (req->callback);
362
363 Safefree (req);
364}
365
366static void req_cancel_subs (aio_req grp)
367{
368 aio_req sub;
369
370 if (grp->type != EIO_GROUP)
371 return;
372
373 SvREFCNT_dec (grp->sv2);
374 grp->sv2 = 0;
375
376 eio_grp_cancel (grp);
377}
378
379#ifdef USE_SOCKETS_AS_HANDLES
380# define TO_SOCKET(x) (win32_get_osfhandle (x))
381#else
382# define TO_SOCKET(x) (x)
383#endif
69 384
70static void 385static void
71poll_wait () 386create_respipe (void)
72{ 387{
73 if (!nreqs) 388 int old_readfd = respipe [0];
74 return;
75 389
390 if (respipe [1] >= 0)
391 respipe_close (TO_SOCKET (respipe [1]));
392
393#ifdef _WIN32
394 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
395#else
396 if (pipe (respipe))
397#endif
398 croak ("unable to initialize result pipe");
399
400 if (old_readfd >= 0)
401 {
402 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
403 croak ("unable to initialize result pipe(2)");
404
405 respipe_close (respipe [0]);
406 respipe [0] = old_readfd;
407 }
408
409#ifdef _WIN32
410 int arg = 1;
411 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
412 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
413#else
414 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
415 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
416#endif
417 croak ("unable to initialize result pipe(3)");
418
419 respipe_osf [0] = TO_SOCKET (respipe [0]);
420 respipe_osf [1] = TO_SOCKET (respipe [1]);
421}
422
423static void poll_wait (void)
424{
76 fd_set rfd; 425 fd_set rfd;
426
427 while (eio_nreqs ())
428 {
429 int size;
430
431 X_LOCK (reslock);
432 size = res_queue.size;
433 X_UNLOCK (reslock);
434
435 if (size)
436 return;
437
438 etp_maybe_start_thread ();
439
77 FD_ZERO(&rfd); 440 FD_ZERO (&rfd);
78 FD_SET(respipe [0], &rfd); 441 FD_SET (respipe [0], &rfd);
79 442
80 select (respipe [0] + 1, &rfd, 0, 0, 0); 443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
81}
82
83static int
84poll_cb ()
85{
86 dSP;
87 int count = 0;
88 aio_req req;
89
90 {
91 /* read and signals sent by the worker threads */
92 char buf [32];
93 while (read (respipe [0], buf, 32) > 0)
94 ;
95 } 444 }
445}
96 446
447static int poll_cb (void)
448{
97 for (;;) 449 for (;;)
98 { 450 {
99 pthread_mutex_lock (&reslock); 451 int res = eio_poll ();
100 452
101 req = ress;
102
103 if (ress) 453 if (res > 0)
104 {
105 ress = ress->next;
106 if (!ress) rese = 0;
107 }
108
109 pthread_mutex_unlock (&reslock);
110
111 if (!req)
112 break; 454 croak (0);
113 455
114 nreqs--; 456 if (!max_outstanding || max_outstanding > eio_nreqs ())
457 return res;
115 458
116 if (req->type == REQ_QUIT) 459 poll_wait ();
117 started--;
118 else
119 {
120 int errorno = errno;
121 errno = req->errorno;
122
123 if (req->type == REQ_READ)
124 SvCUR_set (req->data, req->dataoffset
125 + req->result > 0 ? req->result : 0);
126
127 if (req->data)
128 SvREFCNT_dec (req->data);
129
130 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
131 {
132 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
133 PL_laststatval = req->result;
134 PL_statcache = *(req->statdata);
135
136 Safefree (req->statdata);
137 }
138
139 PUSHMARK (SP);
140 XPUSHs (sv_2mortal (newSViv (req->result)));
141
142 if (req->type == REQ_OPEN)
143 {
144 /* convert fd to fh */
145 SV *fh;
146
147 PUTBACK;
148 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
149 SPAGAIN;
150
151 fh = POPs;
152
153 PUSHMARK (SP);
154 XPUSHs (fh);
155 }
156
157 if (SvOK (req->callback))
158 {
159 PUTBACK;
160 call_sv (req->callback, G_VOID | G_EVAL);
161 SPAGAIN;
162 }
163
164 if (req->callback)
165 SvREFCNT_dec (req->callback);
166
167 errno = errorno;
168 count++;
169 }
170
171 Safefree (req);
172 } 460 }
173
174 return count;
175} 461}
176 462
177static void *aio_proc(void *arg); 463static void atfork_child (void)
178
179static void
180start_thread (void)
181{ 464{
182 sigset_t fullsigset, oldsigset; 465 create_respipe ();
183 pthread_t tid;
184 pthread_attr_t attr;
185
186 pthread_attr_init (&attr);
187 pthread_attr_setstacksize (&attr, STACKSIZE);
188 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
189
190 sigfillset (&fullsigset);
191 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
192
193 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
194 started++;
195
196 sigprocmask (SIG_SETMASK, &oldsigset, 0);
197} 466}
198 467
199static void 468static SV *
200send_req (aio_req req) 469get_cb (SV *cb_sv)
201{ 470{
202 nreqs++; 471 HV *st;
472 GV *gvp;
473 CV *cv;
203 474
204 pthread_mutex_lock (&reqlock); 475 if (!SvOK (cb_sv))
476 return 0;
205 477
206 req->next = 0; 478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
207 479
208 if (reqe) 480 if (!cv)
209 { 481 croak ("IO::AIO callback must be undef or a CODE reference");
210 reqe->next = req;
211 reqe = req;
212 }
213 else
214 reqe = reqs = req;
215 482
216 pthread_cond_signal (&reqwait); 483 return (SV *)cv;
217 pthread_mutex_unlock (&reqlock);
218
219 while (nreqs > max_outstanding)
220 {
221 poll_wait ();
222 poll_cb ();
223 }
224} 484}
225 485
226static void 486#define dREQ \
227end_thread (void) 487 SV *cb_cv; \
228{
229 aio_req req; 488 aio_req req; \
230 New (0, req, 1, aio_cb); 489 int req_pri = next_pri; \
231 req->type = REQ_QUIT; 490 next_pri = EIO_PRI_DEFAULT; \
232 491 \
233 send_req (req); 492 cb_cv = get_cb (callback); \
234} 493 \
235
236static void
237read_write (int dowrite, int fd, off_t offset, size_t length,
238 SV *data, STRLEN dataoffset, SV *callback)
239{
240 aio_req req;
241 STRLEN svlen;
242 char *svptr = SvPV (data, svlen);
243
244 SvUPGRADE (data, SVt_PV);
245 SvPOK_on (data);
246
247 if (dataoffset < 0)
248 dataoffset += svlen;
249
250 if (dataoffset < 0 || dataoffset > svlen)
251 croak ("data offset outside of string");
252
253 if (dowrite)
254 {
255 /* write: check length and adjust. */
256 if (length < 0 || length + dataoffset > svlen)
257 length = svlen - dataoffset;
258 }
259 else
260 {
261 /* read: grow scalar as necessary */
262 svptr = SvGROW (data, length + dataoffset);
263 }
264
265 if (length < 0)
266 croak ("length must not be negative");
267
268 Newz (0, req, 1, aio_cb); 494 Newz (0, req, 1, eio_req); \
269 495 if (!req) \
270 if (!req)
271 croak ("out of memory during aio_req allocation"); 496 croak ("out of memory during eio_req allocation"); \
272 497 \
273 req->type = dowrite ? REQ_WRITE : REQ_READ;
274 req->fd = fd;
275 req->offset = offset;
276 req->length = length;
277 req->data = SvREFCNT_inc (data);
278 req->dataptr = (char *)svptr + dataoffset;
279 req->callback = SvREFCNT_inc (callback); 498 req->callback = SvREFCNT_inc (cb_cv); \
499 req->pri = req_pri
280 500
281 send_req (req); 501#define REQ_SEND \
282} 502 PUTBACK; \
503 req_submit (req); \
504 SPAGAIN; \
505 \
506 if (GIMME_V != G_VOID) \
507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
283 508
284static void * 509static int
285aio_proc (void *thr_arg) 510extract_fd (SV *fh, int wr)
286{ 511{
287 aio_req req; 512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
288 int type;
289 513
290 do 514 if (fd < 0)
291 { 515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
292 pthread_mutex_lock (&reqlock);
293 516
294 for (;;) 517 return fd;
295 { 518}
296 req = reqs;
297 519
298 if (reqs) 520MODULE = IO::AIO PACKAGE = IO::AIO
299 {
300 reqs = reqs->next;
301 if (!reqs) reqe = 0;
302 }
303 521
304 if (req) 522PROTOTYPES: ENABLE
305 break;
306 523
307 pthread_cond_wait (&reqwait, &reqlock); 524BOOT:
308 } 525{
526 stash = gv_stashpv ("IO::AIO", 1);
309 527
310 pthread_mutex_unlock (&reqlock); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
311 529 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
312 errno = 0; /* strictly unnecessary */ 530 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
313 531 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
314 type = req->type; 532 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
315 533#ifndef _WIN32
316 switch (type) 534 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
317 {
318 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
319 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
320#if SYS_readahead
321 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
322#else
323 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
324#endif 535#endif
536 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
537 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
325 540
326 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 541 create_respipe ();
327 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
328 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
329 542
330 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 543 if (eio_init (want_poll, done_poll) < 0)
331 case REQ_CLOSE: req->result = close (req->fd); break; 544 croak ("IO::AIO: unable to initialise eio library");
332 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
333 545
334 case REQ_FSYNC: req->result = fsync (req->fd); break; 546 /* atfork child called in fifo order, so before eio's handler */
335 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 547 X_THREAD_ATFORK (0, 0, atfork_child);
336
337 case REQ_QUIT:
338 break;
339
340 default:
341 req->result = ENOSYS;
342 break;
343 }
344
345 req->errorno = errno;
346
347 pthread_mutex_lock (&reslock);
348
349 req->next = 0;
350
351 if (rese)
352 {
353 rese->next = req;
354 rese = req;
355 }
356 else
357 {
358 rese = ress = req;
359
360 /* write a dummy byte to the pipe so fh becomes ready */
361 write (respipe [1], &respipe, 1);
362 }
363
364 pthread_mutex_unlock (&reslock);
365 }
366 while (type != REQ_QUIT);
367
368 return 0;
369} 548}
370 549
371MODULE = IO::AIO PACKAGE = IO::AIO
372
373PROTOTYPES: ENABLE
374
375BOOT:
376{
377 if (pipe (respipe))
378 croak ("unable to initialize result pipe");
379
380 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
381 croak ("cannot set result pipe to nonblocking mode");
382
383 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
384 croak ("cannot set result pipe to nonblocking mode");
385}
386
387void 550void
388min_parallel(nthreads) 551max_poll_reqs (int nreqs)
389 int nthreads
390 PROTOTYPE: $ 552 PROTOTYPE: $
391 CODE: 553 CODE:
392 while (nthreads > started) 554 eio_set_max_poll_reqs (nreqs);
393 start_thread ();
394 555
395void 556void
396max_parallel(nthreads) 557max_poll_time (double nseconds)
397 int nthreads
398 PROTOTYPE: $ 558 PROTOTYPE: $
399 CODE: 559 CODE:
560 eio_set_max_poll_time (nseconds);
561
562void
563min_parallel (int nthreads)
564 PROTOTYPE: $
565 CODE:
566 eio_set_min_parallel (nthreads);
567
568void
569max_parallel (int nthreads)
570 PROTOTYPE: $
571 CODE:
572 eio_set_max_parallel (nthreads);
573
574void
575max_idle (int nthreads)
576 PROTOTYPE: $
577 CODE:
578 eio_set_max_idle (nthreads);
579
580void
581max_outstanding (int maxreqs)
582 PROTOTYPE: $
583 CODE:
584 max_outstanding = maxreqs;
585
586void
587aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
588 PROTOTYPE: $$$;$
589 PPCODE:
400{ 590{
401 int cur = started; 591 dREQ;
402 while (cur > nthreads) 592
403 { 593 req->type = EIO_OPEN;
404 end_thread (); 594 req->sv1 = newSVsv (pathname);
595 req->ptr1 = SvPVbyte_nolen (req->sv1);
596 req->int1 = flags;
597 req->int2 = mode;
598
599 REQ_SEND;
600}
601
602void
603aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$
605 ALIAS:
606 aio_fsync = EIO_FSYNC
607 aio_fdatasync = EIO_FDATASYNC
608 PPCODE:
609{
610 int fd = extract_fd (fh, 0);
611 dREQ;
612
613 req->type = ix;
614 req->sv1 = newSVsv (fh);
615 req->int1 = fd;
616
617 REQ_SEND (req);
618}
619
620void
621aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
622 PROTOTYPE: $$$$;$
623 PPCODE:
624{
625 int fd = extract_fd (fh, 0);
626 dREQ;
627
628 req->type = EIO_SYNC_FILE_RANGE;
629 req->sv1 = newSVsv (fh);
630 req->int1 = fd;
631 req->offs = SvVAL64 (offset);
632 req->size = SvVAL64 (nbytes);
633 req->int2 = flags;
634
635 REQ_SEND (req);
636}
637
638void
639aio_close (SV *fh, SV *callback=&PL_sv_undef)
640 PROTOTYPE: $;$
641 PPCODE:
642{
643 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
644 int fd = extract_fd (fh, 0);
645 dREQ;
646
647 if (close_pipe < 0)
648 {
649 int pipefd [2];
650
651 if (pipe (pipefd) < 0
652 || close (pipefd [1]) < 0
653 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
654 abort (); /*D*/
655
656 close_pipe = pipefd [0];
657 }
658
659 req->type = EIO_DUP2;
660 req->int1 = close_pipe;
661 req->sv2 = newSVsv (fh);
662 req->int2 = fd;
663
664 REQ_SEND (req);
665}
666
667void
668aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
669 ALIAS:
670 aio_read = EIO_READ
671 aio_write = EIO_WRITE
672 PROTOTYPE: $$$$$;$
673 PPCODE:
674{
675 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE);
677 char *svptr = SvPVbyte (data, svlen);
678 UV len = SvUV (length);
679
680 if (dataoffset < 0)
681 dataoffset += svlen;
682
683 if (dataoffset < 0 || dataoffset > svlen)
684 croak ("dataoffset outside of data scalar");
685
686 if (ix == EIO_WRITE)
687 {
688 /* write: check length and adjust. */
689 if (!SvOK (length) || len + dataoffset > svlen)
690 len = svlen - dataoffset;
691 }
692 else
693 {
694 /* read: check type and grow scalar as necessary */
695 SvUPGRADE (data, SVt_PV);
696 svptr = SvGROW (data, len + dataoffset + 1);
697 }
698
699 if (len < 0)
700 croak ("length must not be negative");
701
702 {
703 dREQ;
704
705 req->type = ix;
706 req->sv1 = newSVsv (fh);
707 req->int1 = fd;
708 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
709 req->size = len;
710 req->sv2 = SvREFCNT_inc (data);
711 req->ptr2 = (char *)svptr + dataoffset;
712 req->stroffset = dataoffset;
713
714 if (!SvREADONLY (data))
405 cur--; 715 {
716 SvREADONLY_on (data);
717 req->flags |= FLAG_SV2_RO_OFF;
406 } 718 }
407 719
408 while (started > nthreads) 720 REQ_SEND;
721 }
722}
723
724void
725aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
726 PROTOTYPE: $$;$
727 PPCODE:
728{
729 SV *data;
730 dREQ;
731
732 req->type = EIO_READLINK;
733 req->sv1 = newSVsv (path);
734 req->ptr1 = SvPVbyte_nolen (req->sv1);
735
736 REQ_SEND;
737}
738
739void
740aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
741 PROTOTYPE: $$$$;$
742 PPCODE:
743{
744 int ifd = extract_fd (in_fh , 0);
745 int ofd = extract_fd (out_fh, 0);
746 dREQ;
747
748 req->type = EIO_SENDFILE;
749 req->sv1 = newSVsv (out_fh);
750 req->int1 = ofd;
751 req->sv2 = newSVsv (in_fh);
752 req->int2 = ifd;
753 req->offs = SvVAL64 (in_offset);
754 req->size = length;
755
756 REQ_SEND;
757}
758
759void
760aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
761 PROTOTYPE: $$$;$
762 PPCODE:
763{
764 int fd = extract_fd (fh, 0);
765 dREQ;
766
767 req->type = EIO_READAHEAD;
768 req->sv1 = newSVsv (fh);
769 req->int1 = fd;
770 req->offs = SvVAL64 (offset);
771 req->size = length;
772
773 REQ_SEND;
774}
775
776void
777aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
778 ALIAS:
779 aio_stat = EIO_STAT
780 aio_lstat = EIO_LSTAT
781 PPCODE:
782{
783 dREQ;
784
785 req->sv1 = newSVsv (fh_or_path);
786
787 if (SvPOK (req->sv1))
788 {
789 req->type = ix;
790 req->ptr1 = SvPVbyte_nolen (req->sv1);
791 }
792 else
793 {
794 req->type = EIO_FSTAT;
795 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
796 }
797
798 REQ_SEND;
799}
800
801void
802aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
803 PPCODE:
804{
805 dREQ;
806
807 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
808 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
809 req->sv1 = newSVsv (fh_or_path);
810
811 if (SvPOK (req->sv1))
812 {
813 req->type = EIO_UTIME;
814 req->ptr1 = SvPVbyte_nolen (req->sv1);
815 }
816 else
817 {
818 req->type = EIO_FUTIME;
819 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
820 }
821
822 REQ_SEND;
823}
824
825void
826aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
827 PPCODE:
828{
829 dREQ;
830
831 req->sv1 = newSVsv (fh_or_path);
832 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
833
834 if (SvPOK (req->sv1))
835 {
836 req->type = EIO_TRUNCATE;
837 req->ptr1 = SvPVbyte_nolen (req->sv1);
838 }
839 else
840 {
841 req->type = EIO_FTRUNCATE;
842 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
843 }
844
845 REQ_SEND;
846}
847
848void
849aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
850 ALIAS:
851 aio_chmod = EIO_CHMOD
852 aio_mkdir = EIO_MKDIR
853 PPCODE:
854{
855 dREQ;
856
857 req->int2 = mode;
858 req->sv1 = newSVsv (fh_or_path);
859
860 if (SvPOK (req->sv1))
861 {
862 req->type = ix;
863 req->ptr1 = SvPVbyte_nolen (req->sv1);
864 }
865 else
866 {
867 req->type = EIO_FCHMOD;
868 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
869 }
870
871 REQ_SEND;
872}
873
874void
875aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
876 PPCODE:
877{
878 dREQ;
879
880 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
881 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
882 req->sv1 = newSVsv (fh_or_path);
883
884 if (SvPOK (req->sv1))
885 {
886 req->type = EIO_CHOWN;
887 req->ptr1 = SvPVbyte_nolen (req->sv1);
888 }
889 else
890 {
891 req->type = EIO_FCHOWN;
892 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
893 }
894
895 REQ_SEND;
896}
897
898void
899aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
900 ALIAS:
901 aio_unlink = EIO_UNLINK
902 aio_rmdir = EIO_RMDIR
903 aio_readdir = EIO_READDIR
904 PPCODE:
905{
906 dREQ;
907
908 req->type = ix;
909 req->sv1 = newSVsv (pathname);
910 req->ptr1 = SvPVbyte_nolen (req->sv1);
911
912 REQ_SEND;
913}
914
915void
916aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
917 ALIAS:
918 aio_link = EIO_LINK
919 aio_symlink = EIO_SYMLINK
920 aio_rename = EIO_RENAME
921 PPCODE:
922{
923 dREQ;
924
925 req->type = ix;
926 req->sv1 = newSVsv (oldpath);
927 req->ptr1 = SvPVbyte_nolen (req->sv1);
928 req->sv2 = newSVsv (newpath);
929 req->ptr2 = SvPVbyte_nolen (req->sv2);
930
931 REQ_SEND;
932}
933
934void
935aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
936 PPCODE:
937{
938 dREQ;
939
940 req->type = EIO_MKNOD;
941 req->sv1 = newSVsv (pathname);
942 req->ptr1 = SvPVbyte_nolen (req->sv1);
943 req->int2 = (mode_t)mode;
944 req->offs = dev;
945
946 REQ_SEND;
947}
948
949void
950aio_busy (double delay, SV *callback=&PL_sv_undef)
951 PPCODE:
952{
953 dREQ;
954
955 req->type = EIO_BUSY;
956 req->nv1 = delay < 0. ? 0. : delay;
957
958 REQ_SEND;
959}
960
961void
962aio_group (SV *callback=&PL_sv_undef)
963 PROTOTYPE: ;$
964 PPCODE:
965{
966 dREQ;
967
968 req->type = EIO_GROUP;
969
970 req_submit (req);
971 XPUSHs (req_sv (req, AIO_GRP_KLASS));
972}
973
974void
975aio_nop (SV *callback=&PL_sv_undef)
976 ALIAS:
977 aio_nop = EIO_NOP
978 aio_sync = EIO_SYNC
979 PPCODE:
980{
981 dREQ;
982
983 req->type = ix;
984
985 REQ_SEND;
986}
987
988int
989aioreq_pri (int pri = 0)
990 PROTOTYPE: ;$
991 CODE:
992 RETVAL = next_pri;
993 if (items > 0)
994 {
995 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
996 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
997 next_pri = pri;
998 }
999 OUTPUT:
1000 RETVAL
1001
1002void
1003aioreq_nice (int nice = 0)
1004 CODE:
1005 nice = next_pri - nice;
1006 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1007 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1008 next_pri = nice;
1009
1010void
1011flush ()
1012 PROTOTYPE:
1013 CODE:
1014 while (eio_nreqs ())
409 { 1015 {
410 poll_wait (); 1016 poll_wait ();
411 poll_cb (); 1017 poll_cb ();
412 } 1018 }
413}
414 1019
415int 1020int
416max_outstanding(nreqs)
417 int nreqs
418 PROTOTYPE: $
419 CODE:
420 RETVAL = max_outstanding;
421 max_outstanding = nreqs;
422
423void
424aio_open(pathname,flags,mode,callback=&PL_sv_undef)
425 SV * pathname
426 int flags
427 int mode
428 SV * callback
429 PROTOTYPE: $$$;$
430 CODE:
431{
432 aio_req req;
433
434 Newz (0, req, 1, aio_cb);
435
436 if (!req)
437 croak ("out of memory during aio_req allocation");
438
439 req->type = REQ_OPEN;
440 req->data = newSVsv (pathname);
441 req->dataptr = SvPV_nolen (req->data);
442 req->fd = flags;
443 req->mode = mode;
444 req->callback = SvREFCNT_inc (callback);
445
446 send_req (req);
447}
448
449void
450aio_close(fh,callback=&PL_sv_undef)
451 InputStream fh
452 SV * callback
453 PROTOTYPE: $;$
454 ALIAS:
455 aio_close = REQ_CLOSE
456 aio_fsync = REQ_FSYNC
457 aio_fdatasync = REQ_FDATASYNC
458 CODE:
459{
460 aio_req req;
461
462 Newz (0, req, 1, aio_cb);
463
464 if (!req)
465 croak ("out of memory during aio_req allocation");
466
467 req->type = ix;
468 req->fd = PerlIO_fileno (fh);
469 req->callback = SvREFCNT_inc (callback);
470
471 send_req (req);
472}
473
474void
475aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
476 InputStream fh
477 UV offset
478 IV length
479 SV * data
480 IV dataoffset
481 SV * callback
482 PROTOTYPE: $$$$$;$
483 CODE:
484 read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
485
486void
487aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
488 OutputStream fh
489 UV offset
490 IV length
491 SV * data
492 IV dataoffset
493 SV * callback
494 PROTOTYPE: $$$$$;$
495 CODE:
496 read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
497
498void
499aio_readahead(fh,offset,length,callback=&PL_sv_undef)
500 InputStream fh
501 UV offset
502 IV length
503 SV * callback
504 PROTOTYPE: $$$;$
505 CODE:
506{
507 aio_req req;
508
509 if (length < 0)
510 croak ("length must not be negative");
511
512 Newz (0, req, 1, aio_cb);
513
514 if (!req)
515 croak ("out of memory during aio_req allocation");
516
517 req->type = REQ_READAHEAD;
518 req->fd = PerlIO_fileno (fh);
519 req->offset = offset;
520 req->length = length;
521 req->callback = SvREFCNT_inc (callback);
522
523 send_req (req);
524}
525
526void
527aio_stat(fh_or_path,callback=&PL_sv_undef)
528 SV * fh_or_path
529 SV * callback
530 ALIAS:
531 aio_stat = REQ_STAT
532 aio_lstat = REQ_LSTAT
533 CODE:
534{
535 aio_req req;
536
537 Newz (0, req, 1, aio_cb);
538
539 if (!req)
540 croak ("out of memory during aio_req allocation");
541
542 New (0, req->statdata, 1, Stat_t);
543
544 if (!req->statdata)
545 croak ("out of memory during aio_req->statdata allocation");
546
547 if (SvPOK (fh_or_path))
548 {
549 req->type = ix;
550 req->data = newSVsv (fh_or_path);
551 req->dataptr = SvPV_nolen (req->data);
552 }
553 else
554 {
555 req->type = REQ_FSTAT;
556 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
557 }
558
559 req->callback = SvREFCNT_inc (callback);
560
561 send_req (req);
562}
563
564void
565aio_unlink(pathname,callback=&PL_sv_undef)
566 SV * pathname
567 SV * callback
568 CODE:
569{
570 aio_req req;
571
572 Newz (0, req, 1, aio_cb);
573
574 if (!req)
575 croak ("out of memory during aio_req allocation");
576
577 req->type = REQ_UNLINK;
578 req->data = newSVsv (pathname);
579 req->dataptr = SvPV_nolen (req->data);
580 req->callback = SvREFCNT_inc (callback);
581
582 send_req (req);
583}
584
585void
586flush()
587 PROTOTYPE:
588 CODE:
589 while (nreqs)
590 {
591 poll_wait ();
592 poll_cb ();
593 }
594
595void
596poll() 1021poll()
597 PROTOTYPE: 1022 PROTOTYPE:
598 CODE: 1023 CODE:
599 if (nreqs)
600 {
601 poll_wait (); 1024 poll_wait ();
602 poll_cb (); 1025 RETVAL = poll_cb ();
603 } 1026 OUTPUT:
1027 RETVAL
604 1028
605int 1029int
606poll_fileno() 1030poll_fileno()
607 PROTOTYPE: 1031 PROTOTYPE:
608 CODE: 1032 CODE:
620 1044
621void 1045void
622poll_wait() 1046poll_wait()
623 PROTOTYPE: 1047 PROTOTYPE:
624 CODE: 1048 CODE:
625 if (nreqs)
626 poll_wait (); 1049 poll_wait ();
627 1050
628int 1051int
629nreqs() 1052nreqs()
630 PROTOTYPE: 1053 PROTOTYPE:
631 CODE: 1054 CODE:
632 RETVAL = nreqs; 1055 RETVAL = eio_nreqs ();
633 OUTPUT: 1056 OUTPUT:
634 RETVAL 1057 RETVAL
635 1058
1059int
1060nready()
1061 PROTOTYPE:
1062 CODE:
1063 RETVAL = eio_nready ();
1064 OUTPUT:
1065 RETVAL
1066
1067int
1068npending()
1069 PROTOTYPE:
1070 CODE:
1071 RETVAL = eio_npending ();
1072 OUTPUT:
1073 RETVAL
1074
1075int
1076nthreads()
1077 PROTOTYPE:
1078 CODE:
1079 RETVAL = eio_nthreads ();
1080 OUTPUT:
1081 RETVAL
1082
1083void _on_next_submit (SV *cb)
1084 CODE:
1085 SvREFCNT_dec (on_next_submit);
1086 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1087
1088PROTOTYPES: DISABLE
1089
1090MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1091
1092void
1093cancel (aio_req_ornot req)
1094 CODE:
1095 eio_cancel (req);
1096
1097void
1098cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1099 PPCODE:
1100{
1101 if (GIMME_V != G_VOID)
1102 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1103
1104 if (items > 1)
1105 {
1106 SV *cb_cv = get_cb (callback);
1107
1108 SvREFCNT_dec (req->callback);
1109 req->callback = SvREFCNT_inc (cb_cv);
1110 }
1111}
1112
1113MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1114
1115void
1116add (aio_req grp, ...)
1117 PPCODE:
1118{
1119 int i;
1120
1121 if (grp->int1 == 2)
1122 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1123
1124 for (i = 1; i < items; ++i )
1125 {
1126 aio_req req;
1127
1128 if (GIMME_V != G_VOID)
1129 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1130
1131 req = SvAIO_REQ (ST (i));
1132
1133 if (req)
1134 eio_grp_add (grp, req);
1135 }
1136}
1137
1138void
1139cancel_subs (aio_req_ornot req)
1140 CODE:
1141 req_cancel_subs (req);
1142
1143void
1144result (aio_req grp, ...)
1145 CODE:
1146{
1147 int i;
1148 AV *av;
1149
1150 grp->errorno = errno;
1151
1152 av = newAV ();
1153
1154 for (i = 1; i < items; ++i )
1155 av_push (av, newSVsv (ST (i)));
1156
1157 SvREFCNT_dec (grp->sv1);
1158 grp->sv1 = (SV *)av;
1159}
1160
1161void
1162errno (aio_req grp, int errorno = errno)
1163 CODE:
1164 grp->errorno = errorno;
1165
1166void
1167limit (aio_req grp, int limit)
1168 CODE:
1169 eio_grp_limit (grp, limit);
1170
1171void
1172feed (aio_req grp, SV *callback=&PL_sv_undef)
1173 CODE:
1174{
1175 SvREFCNT_dec (grp->sv2);
1176 grp->sv2 = newSVsv (callback);
1177 grp->feed = aio_grp_feed;
1178
1179 if (grp->int2 <= 0)
1180 grp->int2 = 2;
1181
1182 eio_grp_limit (grp, grp->int2);
1183}
1184

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines