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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines