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.11 by root, Wed Jul 20 21:55:27 2005 UTC vs.
Revision 1.30 by root, Thu Aug 18 16:32:10 2005 UTC

1#define _XOPEN_SOURCE 500 1#define _REENTRANT 1
2#include <errno.h>
2 3
3#include "EXTERN.h" 4#include "EXTERN.h"
4#include "perl.h" 5#include "perl.h"
5#include "XSUB.h" 6#include "XSUB.h"
7
8#include "autoconf/config.h"
6 9
7#include <sys/types.h> 10#include <sys/types.h>
8#include <sys/stat.h> 11#include <sys/stat.h>
9 12
10#include <unistd.h> 13#include <unistd.h>
11#include <fcntl.h> 14#include <fcntl.h>
12#include <signal.h> 15#include <signal.h>
13#include <sched.h> 16#include <sched.h>
14#if __linux
15#include <sys/syscall.h>
16#endif
17 17
18#include <pthread.h> 18#include <pthread.h>
19 19
20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
29 29
30enum { 30enum {
31 REQ_QUIT, 31 REQ_QUIT,
32 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
36}; 38};
37 39
38typedef struct aio_cb { 40typedef struct aio_cb {
39 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
40 42
44 off_t offset; 46 off_t offset;
45 size_t length; 47 size_t length;
46 ssize_t result; 48 ssize_t result;
47 mode_t mode; /* open */ 49 mode_t mode; /* open */
48 int errorno; 50 int errorno;
49 SV *data, *callback; 51 SV *data, *callback, *fh;
50 void *dataptr; 52 void *dataptr, *data2ptr;
51 STRLEN dataoffset; 53 STRLEN dataoffset;
52 54
53 Stat_t *statdata; 55 Stat_t *statdata;
54} aio_cb; 56} aio_cb;
55 57
56typedef aio_cb *aio_req; 58typedef aio_cb *aio_req;
57 59
58static int started; 60static int started, wanted;
59static volatile int nreqs; 61static volatile int nreqs;
60static int max_outstanding = 1<<30; 62static int max_outstanding = 1<<30;
61static int respipe [2]; 63static int respipe [2];
62 64
63static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
65static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 67static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
66 68
67static volatile aio_req reqs, reqe; /* queue start, queue end */ 69static volatile aio_req reqs, reqe; /* queue start, queue end */
68static volatile aio_req ress, rese; /* queue start, queue end */ 70static volatile aio_req ress, rese; /* queue start, queue end */
69 71
72static void free_req (aio_req req)
73{
74 if (req->data)
75 SvREFCNT_dec (req->data);
76
77 if (req->fh)
78 SvREFCNT_dec (req->fh);
79
80 if (req->statdata)
81 Safefree (req->statdata);
82
83 if (req->callback)
84 SvREFCNT_dec (req->callback);
85
86 Safefree (req);
87}
88
70static void 89static void
71poll_wait () 90poll_wait ()
72{ 91{
73 if (nreqs && !ress) 92 if (nreqs && !ress)
74 { 93 {
83static int 102static int
84poll_cb () 103poll_cb ()
85{ 104{
86 dSP; 105 dSP;
87 int count = 0; 106 int count = 0;
107 int do_croak = 0;
88 aio_req req, prv; 108 aio_req req;
89 109
90 static int rl;//D 110 for (;;)
91 //printf ("%d ENTER\n", ++rl);//D 111 {
92
93 pthread_mutex_lock (&reslock); 112 pthread_mutex_lock (&reslock);
113 req = ress;
94 114
95 { 115 if (req)
116 {
117 ress = req->next;
118
119 if (!ress)
120 {
96 /* read any signals sent by the worker threads */ 121 /* read any signals sent by the worker threads */
97 char buf [32]; 122 char buf [32];
98 while (read (respipe [0], buf, 32) > 0) 123 while (read (respipe [0], buf, 32) == 32)
124 ;
125
126 rese = 0;
127 }
99 ; 128 }
100 }
101 129
102 req = ress;
103 ress = rese = 0;
104
105 pthread_mutex_unlock (&reslock); 130 pthread_mutex_unlock (&reslock);
106 131
107 while (req) 132 if (!req)
108 { 133 break;
134
109 nreqs--; 135 nreqs--;
110 //printf ("%d count %d %p->%p\n", rl, count, req, req->next);//D
111 136
112 if (req->type == REQ_QUIT) 137 if (req->type == REQ_QUIT)
113 started--; 138 started--;
114 else 139 else
115 { 140 {
116 int errorno = errno; 141 int errorno = errno;
117 errno = req->errorno; 142 errno = req->errorno;
118 143
119 if (req->type == REQ_READ) 144 if (req->type == REQ_READ)
120 SvCUR_set (req->data, req->dataoffset 145 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
121 + req->result > 0 ? req->result : 0);
122 146
147 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
148 SvREADONLY_off (req->data);
149
123 if (req->data) 150 if (req->statdata)
124 SvREFCNT_dec (req->data);
125
126 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
127 { 151 {
128 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 152 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
129 PL_laststatval = req->result; 153 PL_laststatval = req->result;
130 PL_statcache = *(req->statdata); 154 PL_statcache = *(req->statdata);
131
132 Safefree (req->statdata);
133 } 155 }
134 156
157 ENTER;
135 PUSHMARK (SP); 158 PUSHMARK (SP);
136 XPUSHs (sv_2mortal (newSViv (req->result))); 159 XPUSHs (sv_2mortal (newSViv (req->result)));
137 160
138 if (req->type == REQ_OPEN) 161 if (req->type == REQ_OPEN)
139 { 162 {
142 165
143 PUTBACK; 166 PUTBACK;
144 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 167 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
145 SPAGAIN; 168 SPAGAIN;
146 169
147 fh = POPs; 170 fh = SvREFCNT_inc (POPs);
148 171
149 PUSHMARK (SP); 172 PUSHMARK (SP);
150 XPUSHs (fh); 173 XPUSHs (sv_2mortal (fh));
151 } 174 }
152 175
153 if (SvOK (req->callback)) 176 if (SvOK (req->callback))
154 { 177 {
155 PUTBACK; 178 PUTBACK;
156 call_sv (req->callback, G_VOID | G_EVAL); 179 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN; 180 SPAGAIN;
181
182 if (SvTRUE (ERRSV))
183 {
184 free_req (req);
185 croak (0);
186 }
158 } 187 }
188
159 189 LEAVE;
160 if (req->callback)
161 SvREFCNT_dec (req->callback);
162 190
163 errno = errorno; 191 errno = errorno;
164 count++; 192 count++;
165 } 193 }
166 194
167 prv = req; 195 free_req (req);
168 req = req->next;
169 Safefree (prv);
170
171 /* TODO: croak on errors? */
172 } 196 }
173 197
174 //printf ("%d LEAVE %p %p\n", rl--, ress, rese);//D
175 return count; 198 return count;
176} 199}
177 200
178static void *aio_proc(void *arg); 201static void *aio_proc(void *arg);
179 202
184 pthread_t tid; 207 pthread_t tid;
185 pthread_attr_t attr; 208 pthread_attr_t attr;
186 209
187 pthread_attr_init (&attr); 210 pthread_attr_init (&attr);
188 pthread_attr_setstacksize (&attr, STACKSIZE); 211 pthread_attr_setstacksize (&attr, STACKSIZE);
189 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 212// pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
190 213
191 sigfillset (&fullsigset); 214 sigfillset (&fullsigset);
192 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 215 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
193 216
194 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 217 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
198} 221}
199 222
200static void 223static void
201send_req (aio_req req) 224send_req (aio_req req)
202{ 225{
226 while (started < wanted && nreqs >= started)
227 start_thread ();
228
203 nreqs++; 229 nreqs++;
204 230
205 pthread_mutex_lock (&reqlock); 231 pthread_mutex_lock (&reqlock);
206 232
207 req->next = 0; 233 req->next = 0;
215 reqe = reqs = req; 241 reqe = reqs = req;
216 242
217 pthread_cond_signal (&reqwait); 243 pthread_cond_signal (&reqwait);
218 pthread_mutex_unlock (&reqlock); 244 pthread_mutex_unlock (&reqlock);
219 245
220 while (nreqs > max_outstanding) 246 if (nreqs > max_outstanding)
247 for (;;)
248 {
249 poll_cb ();
250
251 if (nreqs <= max_outstanding)
252 break;
253
254 poll_wait ();
255 }
256}
257
258static void
259end_thread (void)
260{
261 aio_req req;
262 Newz (0, req, 1, aio_cb);
263 req->type = REQ_QUIT;
264
265 send_req (req);
266}
267
268static void min_parallel (int nthreads)
269{
270 if (wanted < nthreads)
271 wanted = nthreads;
272}
273
274static void max_parallel (int nthreads)
275{
276 int cur = started;
277
278 if (wanted > nthreads)
279 wanted = nthreads;
280
281 while (cur > wanted)
282 {
283 end_thread ();
284 cur--;
285 }
286
287 while (started > wanted)
221 { 288 {
222 poll_wait (); 289 poll_wait ();
223 poll_cb (); 290 poll_cb ();
224 } 291 }
225} 292}
226 293
227static void 294static void create_pipe ()
228end_thread (void)
229{ 295{
296 if (pipe (respipe))
297 croak ("unable to initialize result pipe");
298
299 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
300 croak ("cannot set result pipe to nonblocking mode");
301
302 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
303 croak ("cannot set result pipe to nonblocking mode");
304}
305
306static void atfork_prepare (void)
307{
308 pthread_mutex_lock (&reqlock);
309 pthread_mutex_lock (&reslock);
310}
311
312static void atfork_parent (void)
313{
314 pthread_mutex_unlock (&reslock);
315 pthread_mutex_unlock (&reqlock);
316}
317
318static void atfork_child (void)
319{
230 aio_req req; 320 aio_req prv;
231 New (0, req, 1, aio_cb);
232 req->type = REQ_QUIT;
233 321
234 send_req (req); 322 started = 0;
235}
236 323
237static void 324 while (reqs)
238read_write (int dowrite, int fd, off_t offset, size_t length, 325 {
239 SV *data, STRLEN dataoffset, SV *callback) 326 prv = reqs;
240{ 327 reqs = prv->next;
241 aio_req req; 328 free_req (prv);
242 STRLEN svlen; 329 }
243 char *svptr = SvPV (data, svlen);
244 330
245 SvUPGRADE (data, SVt_PV); 331 reqs = reqe = 0;
246 SvPOK_on (data); 332
333 while (ress)
334 {
335 prv = ress;
336 ress = prv->next;
337 free_req (prv);
338 }
339
340 ress = rese = 0;
247 341
248 if (dataoffset < 0) 342 close (respipe [0]);
343 close (respipe [1]);
344 create_pipe ();
345
346 atfork_parent ();
347}
348
349/*****************************************************************************/
350/* work around various missing functions */
351
352#if !HAVE_PREADWRITE
353# define pread aio_pread
354# define pwrite aio_pwrite
355
356/*
357 * make our pread/pwrite safe against themselves, but not against
358 * normal read/write by using a mutex. slows down execution a lot,
359 * but that's your problem, not mine.
360 */
361static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
362
363static ssize_t
364pread (int fd, void *buf, size_t count, off_t offset)
365{
366 ssize_t res;
367 off_t ooffset;
368
369 pthread_mutex_lock (&iolock);
370 ooffset = lseek (fd, 0, SEEK_CUR);
371 lseek (fd, offset, SEEK_SET);
372 res = read (fd, buf, count);
373 lseek (fd, ooffset, SEEK_SET);
374 pthread_mutex_unlock (&iolock);
375
376 return res;
377}
378
379static ssize_t
380pwrite (int fd, void *buf, size_t count, off_t offset)
381{
382 ssize_t res;
383 off_t ooffset;
384
385 pthread_mutex_lock (&iolock);
386 ooffset = lseek (fd, 0, SEEK_CUR);
387 lseek (fd, offset, SEEK_SET);
388 res = write (fd, buf, count);
389 lseek (fd, offset, SEEK_SET);
390 pthread_mutex_unlock (&iolock);
391
392 return res;
393}
394#endif
395
396#if !HAVE_FDATASYNC
397# define fdatasync fsync
398#endif
399
400#if !HAVE_READAHEAD
401# define readahead aio_readahead
402
403static char readahead_buf[4096];
404
405static ssize_t
406readahead (int fd, off_t offset, size_t count)
407{
408 while (count > 0)
409 {
410 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
411
412 pread (fd, readahead_buf, len, offset);
249 dataoffset += svlen; 413 offset += len;
250 414 count -= len;
251 if (dataoffset < 0 || dataoffset > svlen)
252 croak ("data offset outside of string");
253
254 if (dowrite)
255 { 415 }
256 /* write: check length and adjust. */
257 if (length < 0 || length + dataoffset > svlen)
258 length = svlen - dataoffset;
259 }
260 else
261 {
262 /* read: grow scalar as necessary */
263 svptr = SvGROW (data, length + dataoffset);
264 }
265 416
266 if (length < 0) 417 errno = 0;
267 croak ("length must not be negative");
268
269 Newz (0, req, 1, aio_cb);
270
271 if (!req)
272 croak ("out of memory during aio_req allocation");
273
274 req->type = dowrite ? REQ_WRITE : REQ_READ;
275 req->fd = fd;
276 req->offset = offset;
277 req->length = length;
278 req->data = SvREFCNT_inc (data);
279 req->dataptr = (char *)svptr + dataoffset;
280 req->callback = SvREFCNT_inc (callback);
281
282 send_req (req);
283} 418}
419#endif
420
421/*****************************************************************************/
284 422
285static void * 423static void *
286aio_proc (void *thr_arg) 424aio_proc (void *thr_arg)
287{ 425{
288 aio_req req; 426 aio_req req;
316 454
317 switch (type) 455 switch (type)
318 { 456 {
319 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 457 case REQ_READ: req->result = pread (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; 458 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
321#if SYS_readahead 459
322 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 460 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
323#else
324 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
325#endif
326 461
327 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 462 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
328 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 463 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
329 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 464 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
330 465
331 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 466 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
332 case REQ_CLOSE: req->result = close (req->fd); break; 467 case REQ_CLOSE: req->result = close (req->fd); break;
333 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 468 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
469 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
470 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
334 471
472 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
335 case REQ_FSYNC: req->result = fsync (req->fd); break; 473 case REQ_FSYNC: req->result = fsync (req->fd); break;
336 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
337 474
338 case REQ_QUIT: 475 case REQ_QUIT:
339 break; 476 break;
340 477
341 default: 478 default:
367 while (type != REQ_QUIT); 504 while (type != REQ_QUIT);
368 505
369 return 0; 506 return 0;
370} 507}
371 508
509#define dREQ \
510 aio_req req; \
511 \
512 if (SvOK (callback) && !SvROK (callback)) \
513 croak ("clalback must be undef or of reference type"); \
514 \
515 Newz (0, req, 1, aio_cb); \
516 if (!req) \
517 croak ("out of memory during aio_req allocation"); \
518 \
519 req->callback = newSVsv (callback);
520
372MODULE = IO::AIO PACKAGE = IO::AIO 521MODULE = IO::AIO PACKAGE = IO::AIO
373 522
374PROTOTYPES: ENABLE 523PROTOTYPES: ENABLE
375 524
376BOOT: 525BOOT:
377{ 526{
378 if (pipe (respipe)) 527 create_pipe ();
379 croak ("unable to initialize result pipe"); 528 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
380
381 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
382 croak ("cannot set result pipe to nonblocking mode");
383
384 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
385 croak ("cannot set result pipe to nonblocking mode");
386} 529}
387 530
388void 531void
389min_parallel(nthreads) 532min_parallel(nthreads)
390 int nthreads 533 int nthreads
391 PROTOTYPE: $ 534 PROTOTYPE: $
392 CODE:
393 while (nthreads > started)
394 start_thread ();
395 535
396void 536void
397max_parallel(nthreads) 537max_parallel(nthreads)
398 int nthreads 538 int nthreads
399 PROTOTYPE: $ 539 PROTOTYPE: $
400 CODE:
401{
402 int cur = started;
403 while (cur > nthreads)
404 {
405 end_thread ();
406 cur--;
407 }
408
409 while (started > nthreads)
410 {
411 poll_wait ();
412 poll_cb ();
413 }
414}
415 540
416int 541int
417max_outstanding(nreqs) 542max_outstanding(nreqs)
418 int nreqs 543 int nreqs
419 PROTOTYPE: $ 544 PROTOTYPE: $
428 int mode 553 int mode
429 SV * callback 554 SV * callback
430 PROTOTYPE: $$$;$ 555 PROTOTYPE: $$$;$
431 CODE: 556 CODE:
432{ 557{
433 aio_req req; 558 dREQ;
434
435 Newz (0, req, 1, aio_cb);
436
437 if (!req)
438 croak ("out of memory during aio_req allocation");
439 559
440 req->type = REQ_OPEN; 560 req->type = REQ_OPEN;
441 req->data = newSVsv (pathname); 561 req->data = newSVsv (pathname);
442 req->dataptr = SvPV_nolen (req->data); 562 req->dataptr = SvPVbyte_nolen (req->data);
443 req->fd = flags; 563 req->fd = flags;
444 req->mode = mode; 564 req->mode = mode;
445 req->callback = SvREFCNT_inc (callback);
446 565
447 send_req (req); 566 send_req (req);
448} 567}
449 568
450void 569void
451aio_close(fh,callback=&PL_sv_undef) 570aio_close(fh,callback=&PL_sv_undef)
452 InputStream fh 571 SV * fh
453 SV * callback 572 SV * callback
454 PROTOTYPE: $;$ 573 PROTOTYPE: $;$
455 ALIAS: 574 ALIAS:
456 aio_close = REQ_CLOSE 575 aio_close = REQ_CLOSE
457 aio_fsync = REQ_FSYNC 576 aio_fsync = REQ_FSYNC
458 aio_fdatasync = REQ_FDATASYNC 577 aio_fdatasync = REQ_FDATASYNC
459 CODE: 578 CODE:
460{ 579{
461 aio_req req; 580 dREQ;
462
463 Newz (0, req, 1, aio_cb);
464
465 if (!req)
466 croak ("out of memory during aio_req allocation");
467 581
468 req->type = ix; 582 req->type = ix;
583 req->fh = newSVsv (fh);
469 req->fd = PerlIO_fileno (fh); 584 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
470 req->callback = SvREFCNT_inc (callback);
471 585
472 send_req (req); 586 send_req (req);
473} 587}
474 588
475void 589void
476aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 590aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
477 InputStream fh 591 SV * fh
478 UV offset 592 UV offset
479 IV length 593 IV length
480 SV * data 594 SV * data
481 IV dataoffset 595 IV dataoffset
482 SV * callback 596 SV * callback
597 ALIAS:
598 aio_read = REQ_READ
599 aio_write = REQ_WRITE
483 PROTOTYPE: $$$$$;$ 600 PROTOTYPE: $$$$$;$
484 CODE: 601 CODE:
485 read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 602{
603 aio_req req;
604 STRLEN svlen;
605 char *svptr = SvPVbyte (data, svlen);
486 606
487void 607 SvUPGRADE (data, SVt_PV);
488aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 608 SvPOK_on (data);
489 OutputStream fh 609
490 UV offset 610 if (dataoffset < 0)
491 IV length 611 dataoffset += svlen;
492 SV * data 612
493 IV dataoffset 613 if (dataoffset < 0 || dataoffset > svlen)
494 SV * callback 614 croak ("data offset outside of string");
495 PROTOTYPE: $$$$$;$ 615
496 CODE: 616 if (ix == REQ_WRITE)
497 read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 617 {
618 /* write: check length and adjust. */
619 if (length < 0 || length + dataoffset > svlen)
620 length = svlen - dataoffset;
621 }
622 else
623 {
624 /* read: grow scalar as necessary */
625 svptr = SvGROW (data, length + dataoffset);
626 }
627
628 if (length < 0)
629 croak ("length must not be negative");
630
631 {
632 dREQ;
633
634 req->type = ix;
635 req->fh = newSVsv (fh);
636 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
637 : IoOFP (sv_2io (fh)));
638 req->offset = offset;
639 req->length = length;
640 req->data = SvREFCNT_inc (data);
641 req->dataptr = (char *)svptr + dataoffset;
642
643 if (!SvREADONLY (data))
644 {
645 SvREADONLY_on (data);
646 req->data2ptr = (void *)data;
647 }
648
649 send_req (req);
650 }
651}
498 652
499void 653void
500aio_readahead(fh,offset,length,callback=&PL_sv_undef) 654aio_readahead(fh,offset,length,callback=&PL_sv_undef)
501 InputStream fh 655 SV * fh
502 UV offset 656 UV offset
503 IV length 657 IV length
504 SV * callback 658 SV * callback
505 PROTOTYPE: $$$;$ 659 PROTOTYPE: $$$;$
506 CODE: 660 CODE:
507{ 661{
508 aio_req req; 662 dREQ;
509
510 if (length < 0)
511 croak ("length must not be negative");
512
513 Newz (0, req, 1, aio_cb);
514
515 if (!req)
516 croak ("out of memory during aio_req allocation");
517 663
518 req->type = REQ_READAHEAD; 664 req->type = REQ_READAHEAD;
665 req->fh = newSVsv (fh);
519 req->fd = PerlIO_fileno (fh); 666 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
520 req->offset = offset; 667 req->offset = offset;
521 req->length = length; 668 req->length = length;
522 req->callback = SvREFCNT_inc (callback);
523 669
524 send_req (req); 670 send_req (req);
525} 671}
526 672
527void 673void
531 ALIAS: 677 ALIAS:
532 aio_stat = REQ_STAT 678 aio_stat = REQ_STAT
533 aio_lstat = REQ_LSTAT 679 aio_lstat = REQ_LSTAT
534 CODE: 680 CODE:
535{ 681{
536 aio_req req; 682 dREQ;
537
538 Newz (0, req, 1, aio_cb);
539
540 if (!req)
541 croak ("out of memory during aio_req allocation");
542 683
543 New (0, req->statdata, 1, Stat_t); 684 New (0, req->statdata, 1, Stat_t);
544
545 if (!req->statdata) 685 if (!req->statdata)
686 {
687 free_req (req);
546 croak ("out of memory during aio_req->statdata allocation"); 688 croak ("out of memory during aio_req->statdata allocation");
689 }
547 690
548 if (SvPOK (fh_or_path)) 691 if (SvPOK (fh_or_path))
549 { 692 {
550 req->type = ix; 693 req->type = ix;
551 req->data = newSVsv (fh_or_path); 694 req->data = newSVsv (fh_or_path);
552 req->dataptr = SvPV_nolen (req->data); 695 req->dataptr = SvPVbyte_nolen (req->data);
553 } 696 }
554 else 697 else
555 { 698 {
556 req->type = REQ_FSTAT; 699 req->type = REQ_FSTAT;
700 req->fh = newSVsv (fh_or_path);
557 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 701 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
558 } 702 }
559
560 req->callback = SvREFCNT_inc (callback);
561 703
562 send_req (req); 704 send_req (req);
563} 705}
564 706
565void 707void
566aio_unlink(pathname,callback=&PL_sv_undef) 708aio_unlink(pathname,callback=&PL_sv_undef)
567 SV * pathname 709 SV * pathname
568 SV * callback 710 SV * callback
711 ALIAS:
712 aio_unlink = REQ_UNLINK
713 aio_rmdir = REQ_RMDIR
569 CODE: 714 CODE:
570{ 715{
571 aio_req req; 716 dREQ;
572 717
573 Newz (0, req, 1, aio_cb); 718 req->type = ix;
719 req->data = newSVsv (pathname);
720 req->dataptr = SvPVbyte_nolen (req->data);
574 721
575 if (!req) 722 send_req (req);
576 croak ("out of memory during aio_req allocation"); 723}
724
725void
726aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
727 SV * oldpath
728 SV * newpath
729 SV * callback
730 CODE:
731{
732 dREQ;
577 733
578 req->type = REQ_UNLINK; 734 req->type = REQ_SYMLINK;
735 req->fh = newSVsv (oldpath);
736 req->data2ptr = SvPVbyte_nolen (req->fh);
579 req->data = newSVsv (pathname); 737 req->data = newSVsv (newpath);
580 req->dataptr = SvPV_nolen (req->data); 738 req->dataptr = SvPVbyte_nolen (req->data);
581 req->callback = SvREFCNT_inc (callback);
582 739
583 send_req (req); 740 send_req (req);
584} 741}
585 742
586void 743void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines