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.24 by root, Sat Jul 2 13:16:33 2005 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// 128 seems to be enough most everywhere. alpha needs 256.
18#define STACKSIZE (128 * sizeof (long)) /* yeah */ 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
… …
231static sigset_t fullsigset; 232static sigset_t fullsigset;
232 233
233#undef errno 234#undef errno
234#include <asm/unistd.h> 235#include <asm/unistd.h>
235#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
236 248
237#define COPY_STATDATA \ 249#define COPY_STATDATA \
238 req->statdata->st_dev = statdata.st_dev; \ 250 req->statdata->st_dev = statdata.st_dev; \
239 req->statdata->st_ino = statdata.st_ino; \ 251 req->statdata->st_ino = statdata.st_ino; \
240 req->statdata->st_mode = statdata.st_mode; \ 252 req->statdata->st_mode = statdata.st_mode; \
… …
262 _syscall3(int,write,int,fd,char *,buf,size_t,count) 274 _syscall3(int,write,int,fd,char *,buf,size_t,count)
263 275
264 _syscall3(int,open,char *,pathname,int,flags,mode_t,mode) 276 _syscall3(int,open,char *,pathname,int,flags,mode_t,mode)
265 _syscall1(int,close,int,fd) 277 _syscall1(int,close,int,fd)
266 278
267#define arch64 (__ia64 || __alpha) 279#if __NR_pread64
268
269#ifdef __NR_pread64 && !arch64
270 _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)
271 _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)
272#elif __NR_pread 282#elif __NR_pread
273 _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)
274 _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)
275#else 285#else
276# error "neither pread nor pread64 defined" 286# error "neither pread nor pread64 defined"
277#endif 287#endif
278 288
279 289
280#ifdef __NR_stat64 && !arch64 290#if __NR_stat64
281 _syscall2(int,stat64, const char *, filename, struct stat64 *, buf) 291 _syscall2(int,stat64, const char *, filename, struct kernelstat64 *, buf)
282 _syscall2(int,lstat64, const char *, filename, struct stat64 *, buf) 292 _syscall2(int,lstat64, const char *, filename, struct kernelstat64 *, buf)
283 _syscall2(int,fstat64, int, fd, struct stat64 *, buf) 293 _syscall2(int,fstat64, int, fd, struct kernelstat64 *, buf)
284#elif __NR_stat 294#elif __NR_stat
285 _syscall2(int,stat, const char *, filename, struct stat *, buf) 295 _syscall2(int,stat, const char *, filename, struct kernelstat *, buf)
286 _syscall2(int,lstat, const char *, filename, struct stat *, buf) 296 _syscall2(int,lstat, const char *, filename, struct kernelstat *, buf)
287 _syscall2(int,fstat, int, fd, struct stat *, buf) 297 _syscall2(int,fstat, int, fd, struct kernelstat *, buf)
288#else 298#else
289# error "neither stat64 nor stat defined" 299# error "neither stat64 nor stat defined"
290#endif 300#endif
291 301
292 _syscall1(int,unlink, char *, filename); 302 _syscall1(int,unlink, char *, filename);
… …
300 req->thread = thr; 310 req->thread = thr;
301 errno = 0; /* strictly unnecessary */ 311 errno = 0; /* strictly unnecessary */
302 312
303 switch (req->type) 313 switch (req->type)
304 { 314 {
305#ifdef __NR_pread64 315#if __NR_pread64
306 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;
307 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;
308#else 318#else
309 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;
310 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;
311#endif 321#endif
312#ifdef __NR_stat64 322#if __NR_stat64
313 struct stat64 statdata; 323 struct kernelstat64 statdata;
314 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;
315 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;
316 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;
317#else 327#else
318 struct stat statdata; 328 struct kernelstat statdata;
319 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;
320 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;
321 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;
322#endif 332#endif
323 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;

Diff Legend

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