ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Linux-AIO/AIO.xs
(Generate patch)

Comparing Linux-AIO/AIO.xs (file contents):
Revision 1.21 by root, Fri Aug 6 17:18:08 2004 UTC vs.
Revision 1.25 by root, Thu Jul 7 22:24:09 2005 UTC

… …
13 13
14typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 14typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
15typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 15typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
16typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 16typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */
17 17
18#define STACKSIZE 1024 /* yeah */ 18// 128 seems to be enough most everywhere. alpha needs 256.
19#define STACKSIZE (256 * sizeof (long))
19 20
20enum { 21enum {
21 REQ_QUIT, 22 REQ_QUIT,
22 REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE, 23 REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE,
23 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK 24 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK
… …
62 aio_thread *thr; 63 aio_thread *thr;
63 64
64 New (0, thr, 1, aio_thread); 65 New (0, thr, 1, aio_thread);
65 66
66 if (clone (aio_proc, 67 if (clone (aio_proc,
67 &(thr->stack[STACKSIZE]), 68 &(thr->stack[STACKSIZE - sizeof (long)]),
68 CLONE_VM|CLONE_FS|CLONE_FILES, 69 CLONE_VM|CLONE_FS|CLONE_FILES,
69 thr) >= 0) 70 thr) >= 0)
70 started++; 71 started++;
71 else 72 else
72 Safefree (thr); 73 Safefree (thr);
… …
88{ 89{
89 nreqs++; 90 nreqs++;
90 req->next = 0; 91 req->next = 0;
91 92
92 if (qe) 93 if (qe)
94 {
93 qe->next = req; 95 qe->next = req;
96 qe = req;
97 }
94 else 98 else
95 qe = qs = req; 99 qe = qs = req;
96 100
97 send_reqs (); 101 send_reqs ();
98} 102}
… …
154 req->callback = SvREFCNT_inc (callback); 158 req->callback = SvREFCNT_inc (callback);
155 159
156 send_req (req); 160 send_req (req);
157} 161}
158 162
163static void
164poll_wait ()
165{
166 fd_set rfd;
167 FD_ZERO(&rfd);
168 FD_SET(respipe[0], &rfd);
169
170 select (respipe[0] + 1, &rfd, 0, 0, 0);
171}
172
159static int 173static int
160poll_cb (pTHX) 174poll_cb (pTHX)
161{ 175{
162 dSP; 176 dSP;
163 int count = 0; 177 int count = 0;
164 aio_req req; 178 aio_req req;
165 179
166 while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req)) 180 while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req))
167 { 181 {
182 nreqs--;
183
168 if (req->type == REQ_QUIT) 184 if (req->type == REQ_QUIT)
169 { 185 {
170 Safefree (req->thread); 186 Safefree (req->thread);
171 started--; 187 started--;
172 } 188 }
… …
199 215
200 if (req->callback) 216 if (req->callback)
201 SvREFCNT_dec (req->callback); 217 SvREFCNT_dec (req->callback);
202 218
203 errno = errorno; 219 errno = errorno;
204 nreqs--;
205 count++; 220 count++;
206 } 221 }
207 222
208 Safefree (req); 223 Safefree (req);
209 } 224 }
… …
217static sigset_t fullsigset; 232static sigset_t fullsigset;
218 233
219#undef errno 234#undef errno
220#include <asm/unistd.h> 235#include <asm/unistd.h>
221#include <sys/prctl.h> 236#include <sys/prctl.h>
237
238#if __alpha || __ia64 || __hppa || __sparc64__ || __v850__
239# define stat kernelstat
240# define stat64 kernelstat64
241# include <asm/stat.h>
242# undef stat
243# undef stat64
244#else
245# define kernelstat stat
246# define kernelstat64 stat64
247#endif
222 248
223#define COPY_STATDATA \ 249#define COPY_STATDATA \
224 req->statdata->st_dev = statdata.st_dev; \ 250 req->statdata->st_dev = statdata.st_dev; \
225 req->statdata->st_ino = statdata.st_ino; \ 251 req->statdata->st_ino = statdata.st_ino; \
226 req->statdata->st_mode = statdata.st_mode; \ 252 req->statdata->st_mode = statdata.st_mode; \
… …
248 _syscall3(int,write,int,fd,char *,buf,size_t,count) 274 _syscall3(int,write,int,fd,char *,buf,size_t,count)
249 275
250 _syscall3(int,open,char *,pathname,int,flags,mode_t,mode) 276 _syscall3(int,open,char *,pathname,int,flags,mode_t,mode)
251 _syscall1(int,close,int,fd) 277 _syscall1(int,close,int,fd)
252 278
253#ifdef __NR_pread64 279#if __NR_pread64
254 _syscall5(int,pread64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi) 280 _syscall5(int,pread64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi)
255 _syscall5(int,pwrite64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi) 281 _syscall5(int,pwrite64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi)
256#elif __NR_pread 282#elif __NR_pread
257 _syscall4(int,pread,int,fd,char *,buf,size_t,count,offset_t,offset) 283 _syscall4(int,pread,int,fd,char *,buf,size_t,count,offset_t,offset)
258 _syscall4(int,pwrite,int,fd,char *,buf,size_t,count,offset_t,offset) 284 _syscall4(int,pwrite,int,fd,char *,buf,size_t,count,offset_t,offset)
259#else 285#else
260# error "neither pread nor pread64 defined" 286# error "neither pread nor pread64 defined"
261#endif 287#endif
262 288
263 289
264#ifdef __NR_stat64 290#if __NR_stat64
265 _syscall2(int,stat64, const char *, filename, struct stat64 *, buf) 291 _syscall2(int,stat64, const char *, filename, struct kernelstat64 *, buf)
266 _syscall2(int,lstat64, const char *, filename, struct stat64 *, buf) 292 _syscall2(int,lstat64, const char *, filename, struct kernelstat64 *, buf)
267 _syscall2(int,fstat64, int, fd, struct stat64 *, buf) 293 _syscall2(int,fstat64, int, fd, struct kernelstat64 *, buf)
268#elif __NR_stat 294#elif __NR_stat
269 _syscall2(int,stat, const char *, filename, struct stat *, buf) 295 _syscall2(int,stat, const char *, filename, struct kernelstat *, buf)
270 _syscall2(int,lstat, const char *, filename, struct stat *, buf) 296 _syscall2(int,lstat, const char *, filename, struct kernelstat *, buf)
271 _syscall2(int,fstat, int, fd, struct stat *, buf) 297 _syscall2(int,fstat, int, fd, struct kernelstat *, buf)
272#else 298#else
273# error "neither stat64 nor stat defined" 299# error "neither stat64 nor stat defined"
274#endif 300#endif
275 301
276 _syscall1(int,unlink, char *, filename); 302 _syscall1(int,unlink, char *, filename);
… …
284 req->thread = thr; 310 req->thread = thr;
285 errno = 0; /* strictly unnecessary */ 311 errno = 0; /* strictly unnecessary */
286 312
287 switch (req->type) 313 switch (req->type)
288 { 314 {
289#ifdef __NR_pread64 315#if __NR_pread64
290 case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); break; 316 case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); break;
291 case REQ_WRITE: req->result = pwrite64(req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); break; 317 case REQ_WRITE: req->result = pwrite64(req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); break;
292#else 318#else
293 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 319 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
294 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 320 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
295#endif 321#endif
296#ifdef __NR_stat64 322#if __NR_stat64
297 struct stat64 statdata; 323 struct kernelstat64 statdata;
298 case REQ_STAT: req->result = stat64 (req->dataptr, &statdata); COPY_STATDATA; break; 324 case REQ_STAT: req->result = stat64 (req->dataptr, &statdata); COPY_STATDATA; break;
299 case REQ_LSTAT: req->result = lstat64 (req->dataptr, &statdata); COPY_STATDATA; break; 325 case REQ_LSTAT: req->result = lstat64 (req->dataptr, &statdata); COPY_STATDATA; break;
300 case REQ_FSTAT: req->result = fstat64 (req->fd, &statdata); COPY_STATDATA; break; 326 case REQ_FSTAT: req->result = fstat64 (req->fd, &statdata); COPY_STATDATA; break;
301#else 327#else
302 struct stat statdata; 328 struct kernelstat statdata;
303 case REQ_STAT: req->result = stat (req->dataptr, &statdata); COPY_STATDATA; break; 329 case REQ_STAT: req->result = stat (req->dataptr, &statdata); COPY_STATDATA; break;
304 case REQ_LSTAT: req->result = lstat (req->dataptr, &statdata); COPY_STATDATA; break; 330 case REQ_LSTAT: req->result = lstat (req->dataptr, &statdata); COPY_STATDATA; break;
305 case REQ_FSTAT: req->result = fstat (req->fd, &statdata); COPY_STATDATA; break; 331 case REQ_FSTAT: req->result = fstat (req->fd, &statdata); COPY_STATDATA; break;
306#endif 332#endif
307 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 333 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
… …
361 cur--; 387 cur--;
362 } 388 }
363 389
364 while (started > nthreads) 390 while (started > nthreads)
365 { 391 {
366 fd_set rfd; 392 poll_wait ();
367 FD_ZERO(&rfd);
368 FD_SET(respipe[0], &rfd);
369
370 select (respipe[0] + 1, &rfd, 0, 0, 0);
371 poll_cb (aTHX); 393 poll_cb (aTHX);
372 } 394 }
373 395
374void 396void
375aio_open(pathname,flags,mode,callback) 397aio_open(pathname,flags,mode,callback)
… …
508 CODE: 530 CODE:
509 RETVAL = poll_cb (aTHX); 531 RETVAL = poll_cb (aTHX);
510 OUTPUT: 532 OUTPUT:
511 RETVAL 533 RETVAL
512 534
535void
536poll_wait()
537 PROTOTYPE:
538 CODE:
539 poll_wait ();
540
513int 541int
514nreqs() 542nreqs()
515 PROTOTYPE: 543 PROTOTYPE:
516 CODE: 544 CODE:
517 RETVAL = nreqs; 545 RETVAL = nreqs;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines