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.41 by root, Sat Jun 24 19:14:04 2006 UTC vs.
Revision 1.66 by root, Tue Oct 24 00:34:47 2006 UTC

1#if __linux
2# define _GNU_SOURCE
3#endif
4
1#define _REENTRANT 1 5#define _REENTRANT 1
6
2#include <errno.h> 7#include <errno.h>
3 8
4#include "EXTERN.h" 9#include "EXTERN.h"
5#include "perl.h" 10#include "perl.h"
6#include "XSUB.h" 11#include "XSUB.h"
9 14
10#include <pthread.h> 15#include <pthread.h>
11 16
12#include <stddef.h> 17#include <stddef.h>
13#include <errno.h> 18#include <errno.h>
19#include <sys/time.h>
20#include <sys/select.h>
14#include <sys/types.h> 21#include <sys/types.h>
15#include <sys/stat.h> 22#include <sys/stat.h>
16#include <limits.h> 23#include <limits.h>
17#include <unistd.h> 24#include <unistd.h>
18#include <fcntl.h> 25#include <fcntl.h>
39# define NAME_MAX 4096 46# define NAME_MAX 4096
40#endif 47#endif
41 48
42#if __ia64 49#if __ia64
43# define STACKSIZE 65536 50# define STACKSIZE 65536
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN
44#else 53#else
45# define STACKSIZE 8192 54# define STACKSIZE 16384
46#endif 55#endif
56
57/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536
59
60#define dBUF \
61 char *aio_buf = malloc (AIO_BUFSIZE); \
62 if (!aio_buf) \
63 return -1;
64
65#define fBUF free (aio_buf)
47 66
48enum { 67enum {
49 REQ_QUIT, 68 REQ_QUIT,
50 REQ_OPEN, REQ_CLOSE, 69 REQ_OPEN, REQ_CLOSE,
51 REQ_READ, REQ_WRITE, REQ_READAHEAD, 70 REQ_READ, REQ_WRITE, REQ_READAHEAD,
53 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 72 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
54 REQ_FSYNC, REQ_FDATASYNC, 73 REQ_FSYNC, REQ_FDATASYNC,
55 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
56 REQ_READDIR, 75 REQ_READDIR,
57 REQ_LINK, REQ_SYMLINK, 76 REQ_LINK, REQ_SYMLINK,
77 REQ_GROUP, REQ_NOP,
78 REQ_SLEEP,
58}; 79};
59 80
81#define AIO_REQ_KLASS "IO::AIO::REQ"
82#define AIO_GRP_KLASS "IO::AIO::GRP"
83
60typedef struct aio_cb { 84typedef struct aio_cb
85{
61 struct aio_cb *volatile next; 86 struct aio_cb *volatile next;
62 87
63 int type; 88 SV *data, *callback;
64 89 SV *fh, *fh2;
65 /* should receive a cleanup, with unions */ 90 void *dataptr, *data2ptr;
66 int fd, fd2; 91 Stat_t *statdata;
67 off_t offset; 92 off_t offset;
68 size_t length; 93 size_t length;
69 ssize_t result; 94 ssize_t result;
95
96 STRLEN dataoffset;
97 int type;
98 int fd, fd2;
99 int errorno;
70 mode_t mode; /* open */ 100 mode_t mode; /* open */
71 int errorno;
72 SV *data, *callback;
73 SV *fh, *fh2;
74 void *dataptr, *data2ptr;
75 STRLEN dataoffset;
76 101
77 Stat_t *statdata; 102 unsigned char flags;
103 unsigned char pri;
104
105 SV *self; /* the perl counterpart of this request, if any */
106 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
78} aio_cb; 107} aio_cb;
79 108
109enum {
110 FLAG_CANCELLED = 0x01,
111};
112
80typedef aio_cb *aio_req; 113typedef aio_cb *aio_req;
114typedef aio_cb *aio_req_ornot;
115
116enum {
117 PRI_MIN = -4,
118 PRI_MAX = 4,
119
120 DEFAULT_PRI = 0,
121 PRI_BIAS = -PRI_MIN,
122};
123
124static int next_pri = DEFAULT_PRI + PRI_BIAS;
81 125
82static int started, wanted; 126static int started, wanted;
83static volatile int nreqs; 127static volatile int nreqs;
84static int max_outstanding = 1<<30; 128static int max_outstanding = 1<<30;
85static int respipe [2]; 129static int respipe [2];
86 130
131#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
132# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133#else
134# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135#endif
136
87static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 137static pthread_mutex_t reslock = AIO_MUTEX_INIT;
88static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 138static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
89static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 139static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
90 140
91static volatile aio_req reqs, reqe; /* queue start, queue end */ 141static volatile aio_req reqs, reqe; /* queue start, queue end */
92static volatile aio_req ress, rese; /* queue start, queue end */ 142static volatile aio_req ress, rese; /* queue start, queue end */
93 143
144static void req_invoke (aio_req req);
145static void req_free (aio_req req);
146
147/* must be called at most once */
148static SV *req_sv (aio_req req, const char *klass)
149{
150 if (!req->self)
151 {
152 req->self = (SV *)newHV ();
153 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
154 }
155
156 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
157}
158
159static aio_req SvAIO_REQ (SV *sv)
160{
161 MAGIC *mg;
162
163 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
164 croak ("object of class " AIO_REQ_KLASS " expected");
165
166 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
167
168 return mg ? (aio_req)mg->mg_ptr : 0;
169}
170
171static void aio_grp_feed (aio_req grp)
172{
173 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
174 {
175 int old_len = grp->length;
176
177 if (grp->fh2 && SvOK (grp->fh2))
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->fh2, G_VOID | G_EVAL);
187 SPAGAIN;
188 FREETMPS;
189 LEAVE;
190 }
191
192 /* stop if no progress has been made */
193 if (old_len == grp->length)
194 {
195 SvREFCNT_dec (grp->fh2);
196 grp->fh2 = 0;
197 break;
198 }
199 }
200}
201
202static void aio_grp_dec (aio_req grp)
203{
204 --grp->length;
205
206 /* call feeder, if applicable */
207 aio_grp_feed (grp);
208
209 /* finish, if done */
210 if (!grp->length && grp->fd)
211 {
212 req_invoke (grp);
213 req_free (grp);
214 }
215}
216
217static void poll_wait ()
218{
219 fd_set rfd;
220
221 while (nreqs)
222 {
223 aio_req req;
224#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
225 pthread_mutex_lock (&reslock);
226#endif
227 req = ress;
228#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
229 pthread_mutex_unlock (&reslock);
230#endif
231
232 if (req)
233 return;
234
235 FD_ZERO(&rfd);
236 FD_SET(respipe [0], &rfd);
237
238 select (respipe [0] + 1, &rfd, 0, 0, 0);
239 }
240}
241
242static void req_invoke (aio_req req)
243{
244 dSP;
245 int errorno = errno;
246
247 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
248 return;
249
250 errno = req->errorno;
251
252 ENTER;
253 SAVETMPS;
254 PUSHMARK (SP);
255 EXTEND (SP, 1);
256
257 switch (req->type)
258 {
259 case REQ_READDIR:
260 {
261 SV *rv = &PL_sv_undef;
262
263 if (req->result >= 0)
264 {
265 char *buf = req->data2ptr;
266 AV *av = newAV ();
267
268 while (req->result)
269 {
270 SV *sv = newSVpv (buf, 0);
271
272 av_push (av, sv);
273 buf += SvCUR (sv) + 1;
274 req->result--;
275 }
276
277 rv = sv_2mortal (newRV_noinc ((SV *)av));
278 }
279
280 PUSHs (rv);
281 }
282 break;
283
284 case REQ_OPEN:
285 {
286 /* convert fd to fh */
287 SV *fh;
288
289 PUSHs (sv_2mortal (newSViv (req->result)));
290 PUTBACK;
291 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
292 SPAGAIN;
293
294 fh = SvREFCNT_inc (POPs);
295
296 PUSHMARK (SP);
297 XPUSHs (sv_2mortal (fh));
298 }
299 break;
300
301 case REQ_GROUP:
302 req->fd = 2; /* mark group as finished */
303
304 if (req->data)
305 {
306 int i;
307 AV *av = (AV *)req->data;
308
309 EXTEND (SP, AvFILL (av) + 1);
310 for (i = 0; i <= AvFILL (av); ++i)
311 PUSHs (*av_fetch (av, i, 0));
312 }
313 break;
314
315 case REQ_NOP:
316 case REQ_SLEEP:
317 break;
318
319 default:
320 PUSHs (sv_2mortal (newSViv (req->result)));
321 break;
322 }
323
324
325 PUTBACK;
326 call_sv (req->callback, G_VOID | G_EVAL);
327 SPAGAIN;
328
329 FREETMPS;
330 LEAVE;
331
332 errno = errorno;
333
334 if (SvTRUE (ERRSV))
335 {
336 req_free (req);
337 croak (0);
338 }
339}
340
94static void free_req (aio_req req) 341static void req_free (aio_req req)
95{ 342{
96 if (req->data) 343 if (req->grp)
344 {
345 aio_req grp = req->grp;
346
347 /* unlink request */
348 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
349 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
350
351 if (grp->grp_first == req)
352 grp->grp_first = req->grp_next;
353
354 aio_grp_dec (grp);
355 }
356
357 if (req->self)
358 {
359 sv_unmagic (req->self, PERL_MAGIC_ext);
360 SvREFCNT_dec (req->self);
361 }
362
97 SvREFCNT_dec (req->data); 363 SvREFCNT_dec (req->data);
98
99 if (req->fh)
100 SvREFCNT_dec (req->fh); 364 SvREFCNT_dec (req->fh);
101
102 if (req->fh2)
103 SvREFCNT_dec (req->fh2); 365 SvREFCNT_dec (req->fh2);
104
105 if (req->statdata)
106 Safefree (req->statdata);
107
108 if (req->callback)
109 SvREFCNT_dec (req->callback); 366 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata);
110 368
111 if (req->type == REQ_READDIR && req->result >= 0) 369 if (req->type == REQ_READDIR && req->result >= 0)
112 free (req->data2ptr); 370 free (req->data2ptr);
113 371
114 Safefree (req); 372 Safefree (req);
115} 373}
116 374
117static void 375static void req_cancel (aio_req req)
118poll_wait ()
119{ 376{
120 if (nreqs && !ress) 377 req->flags |= FLAG_CANCELLED;
121 {
122 fd_set rfd;
123 FD_ZERO(&rfd);
124 FD_SET(respipe [0], &rfd);
125 378
126 select (respipe [0] + 1, &rfd, 0, 0, 0); 379 if (req->type == REQ_GROUP)
127 } 380 {
128} 381 aio_req sub;
129 382
130static int 383 for (sub = req->grp_first; sub; sub = sub->grp_next)
131poll_cb () 384 req_cancel (sub);
385 }
386}
387
388static int poll_cb ()
132{ 389{
133 dSP; 390 dSP;
134 int count = 0; 391 int count = 0;
135 int do_croak = 0; 392 int do_croak = 0;
136 aio_req req; 393 aio_req req;
158 pthread_mutex_unlock (&reslock); 415 pthread_mutex_unlock (&reslock);
159 416
160 if (!req) 417 if (!req)
161 break; 418 break;
162 419
163 nreqs--; 420 --nreqs;
164 421
165 if (req->type == REQ_QUIT) 422 if (req->type == REQ_QUIT)
166 started--; 423 started--;
424 else if (req->type == REQ_GROUP && req->length)
425 {
426 req->fd = 1; /* mark request as delayed */
427 continue;
428 }
167 else 429 else
168 { 430 {
169 int errorno = errno;
170 errno = req->errorno;
171
172 if (req->type == REQ_READ) 431 if (req->type == REQ_READ)
173 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); 432 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
174 433
175 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) 434 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
176 SvREADONLY_off (req->data); 435 SvREADONLY_off (req->data);
180 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 439 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
181 PL_laststatval = req->result; 440 PL_laststatval = req->result;
182 PL_statcache = *(req->statdata); 441 PL_statcache = *(req->statdata);
183 } 442 }
184 443
185 ENTER; 444 req_invoke (req);
186 PUSHMARK (SP);
187 445
188 if (req->type == REQ_READDIR)
189 {
190 SV *rv = &PL_sv_undef;
191
192 if (req->result >= 0)
193 {
194 char *buf = req->data2ptr;
195 AV *av = newAV ();
196
197 while (req->result)
198 {
199 SV *sv = newSVpv (buf, 0);
200
201 av_push (av, sv);
202 buf += SvCUR (sv) + 1;
203 req->result--;
204 }
205
206 rv = sv_2mortal (newRV_noinc ((SV *)av));
207 }
208
209 XPUSHs (rv);
210 }
211 else
212 {
213 XPUSHs (sv_2mortal (newSViv (req->result)));
214
215 if (req->type == REQ_OPEN)
216 {
217 /* convert fd to fh */
218 SV *fh;
219
220 PUTBACK;
221 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
222 SPAGAIN;
223
224 fh = SvREFCNT_inc (POPs);
225
226 PUSHMARK (SP);
227 XPUSHs (sv_2mortal (fh));
228 }
229 }
230
231 if (SvOK (req->callback))
232 {
233 PUTBACK;
234 call_sv (req->callback, G_VOID | G_EVAL);
235 SPAGAIN;
236
237 if (SvTRUE (ERRSV))
238 {
239 free_req (req);
240 croak (0);
241 }
242 }
243
244 LEAVE;
245
246 errno = errorno;
247 count++; 446 count++;
248 } 447 }
249 448
250 free_req (req); 449 req_free (req);
251 } 450 }
252 451
253 return count; 452 return count;
254} 453}
255 454
256static void *aio_proc(void *arg); 455static void *aio_proc(void *arg);
257 456
258static void
259start_thread (void) 457static void start_thread (void)
260{ 458{
261 sigset_t fullsigset, oldsigset; 459 sigset_t fullsigset, oldsigset;
262 pthread_t tid; 460 pthread_t tid;
263 pthread_attr_t attr; 461 pthread_attr_t attr;
264 462
273 started++; 471 started++;
274 472
275 sigprocmask (SIG_SETMASK, &oldsigset, 0); 473 sigprocmask (SIG_SETMASK, &oldsigset, 0);
276} 474}
277 475
278static void 476static void req_send (aio_req req)
279send_req (aio_req req)
280{ 477{
281 while (started < wanted && nreqs >= started) 478 while (started < wanted && nreqs >= started)
282 start_thread (); 479 start_thread ();
283 480
284 nreqs++; 481 ++nreqs;
285 482
286 pthread_mutex_lock (&reqlock); 483 pthread_mutex_lock (&reqlock);
287 484
288 req->next = 0; 485 req->next = 0;
289 486
308 505
309 poll_wait (); 506 poll_wait ();
310 } 507 }
311} 508}
312 509
313static void 510static void end_thread (void)
314end_thread (void)
315{ 511{
316 aio_req req; 512 aio_req req;
317 Newz (0, req, 1, aio_cb); 513 Newz (0, req, 1, aio_cb);
318 req->type = REQ_QUIT; 514 req->type = REQ_QUIT;
319 515
320 send_req (req); 516 req_send (req);
321} 517}
322 518
323static void min_parallel (int nthreads) 519static void min_parallel (int nthreads)
324{ 520{
325 if (wanted < nthreads) 521 if (wanted < nthreads)
370 * normal read/write by using a mutex. slows down execution a lot, 566 * normal read/write by using a mutex. slows down execution a lot,
371 * but that's your problem, not mine. 567 * but that's your problem, not mine.
372 */ 568 */
373static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 569static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
374 570
375static ssize_t 571static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
376pread (int fd, void *buf, size_t count, off_t offset)
377{ 572{
378 ssize_t res; 573 ssize_t res;
379 off_t ooffset; 574 off_t ooffset;
380 575
381 pthread_mutex_lock (&preadwritelock); 576 pthread_mutex_lock (&preadwritelock);
386 pthread_mutex_unlock (&preadwritelock); 581 pthread_mutex_unlock (&preadwritelock);
387 582
388 return res; 583 return res;
389} 584}
390 585
391static ssize_t
392pwrite (int fd, void *buf, size_t count, off_t offset) 586static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
393{ 587{
394 ssize_t res; 588 ssize_t res;
395 off_t ooffset; 589 off_t ooffset;
396 590
397 pthread_mutex_lock (&preadwritelock); 591 pthread_mutex_lock (&preadwritelock);
410#endif 604#endif
411 605
412#if !HAVE_READAHEAD 606#if !HAVE_READAHEAD
413# define readahead aio_readahead 607# define readahead aio_readahead
414 608
415static ssize_t
416readahead (int fd, off_t offset, size_t count) 609static ssize_t readahead (int fd, off_t offset, size_t count)
417{ 610{
418 char readahead_buf[4096]; 611 dBUF;
419 612
420 while (count > 0) 613 while (count > 0)
421 { 614 {
422 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 615 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
423 616
424 pread (fd, readahead_buf, len, offset); 617 pread (fd, aio_buf, len, offset);
425 offset += len; 618 offset += len;
426 count -= len; 619 count -= len;
427 } 620 }
428 621
622 fBUF;
623
429 errno = 0; 624 errno = 0;
430} 625}
431#endif 626#endif
432 627
433#if !HAVE_READDIR_R 628#if !HAVE_READDIR_R
434# define readdir_r aio_readdir_r 629# define readdir_r aio_readdir_r
435 630
436static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 631static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
437 632
438static int
439readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 633static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
440{ 634{
441 struct dirent *e; 635 struct dirent *e;
442 int errorno; 636 int errorno;
443 637
444 pthread_mutex_lock (&readdirlock); 638 pthread_mutex_lock (&readdirlock);
460 return e ? 0 : -1; 654 return e ? 0 : -1;
461} 655}
462#endif 656#endif
463 657
464/* sendfile always needs emulation */ 658/* sendfile always needs emulation */
465static ssize_t
466sendfile_ (int ofd, int ifd, off_t offset, size_t count) 659static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
467{ 660{
468 ssize_t res; 661 ssize_t res;
469 662
470 if (!count) 663 if (!count)
471 return 0; 664 return 0;
520#endif 713#endif
521 ) 714 )
522 ) 715 )
523 { 716 {
524 /* emulate sendfile. this is a major pain in the ass */ 717 /* emulate sendfile. this is a major pain in the ass */
525 char buf[4096]; 718 dBUF;
719
526 res = 0; 720 res = 0;
527 721
528 while (count) 722 while (count)
529 { 723 {
530 ssize_t cnt; 724 ssize_t cnt;
531 725
532 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 726 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
533 727
534 if (cnt <= 0) 728 if (cnt <= 0)
535 { 729 {
536 if (cnt && !res) res = -1; 730 if (cnt && !res) res = -1;
537 break; 731 break;
538 } 732 }
539 733
540 cnt = write (ofd, buf, cnt); 734 cnt = write (ofd, aio_buf, cnt);
541 735
542 if (cnt <= 0) 736 if (cnt <= 0)
543 { 737 {
544 if (cnt && !res) res = -1; 738 if (cnt && !res) res = -1;
545 break; 739 break;
547 741
548 offset += cnt; 742 offset += cnt;
549 res += cnt; 743 res += cnt;
550 count -= cnt; 744 count -= cnt;
551 } 745 }
746
747 fBUF;
552 } 748 }
553 749
554 return res; 750 return res;
555} 751}
556 752
557/* read a full directory */ 753/* read a full directory */
558static int
559scandir_ (const char *path, void **namesp) 754static int scandir_ (const char *path, void **namesp)
560{ 755{
561 DIR *dirp = opendir (path); 756 DIR *dirp;
562 union 757 union
563 { 758 {
564 struct dirent d; 759 struct dirent d;
565 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 760 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
566 } u; 761 } *u;
567 struct dirent *entp; 762 struct dirent *entp;
568 char *name, *names; 763 char *name, *names;
569 int memlen = 4096; 764 int memlen = 4096;
570 int memofs = 0; 765 int memofs = 0;
571 int res = 0; 766 int res = 0;
572 int errorno; 767 int errorno;
573 768
769 dirp = opendir (path);
574 if (!dirp) 770 if (!dirp)
575 return -1; 771 return -1;
576 772
773 u = malloc (sizeof (*u));
577 names = malloc (memlen); 774 names = malloc (memlen);
578 775
776 if (u && names)
579 for (;;) 777 for (;;)
580 { 778 {
779 errno = 0;
581 errno = 0, readdir_r (dirp, &u.d, &entp); 780 readdir_r (dirp, &u->d, &entp);
582 781
583 if (!entp) 782 if (!entp)
584 break; 783 break;
585 784
586 name = entp->d_name; 785 name = entp->d_name;
587 786
588 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 787 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
589 { 788 {
590 int len = strlen (name) + 1; 789 int len = strlen (name) + 1;
591 790
592 res++; 791 res++;
593 792
594 while (memofs + len > memlen) 793 while (memofs + len > memlen)
595 { 794 {
596 memlen *= 2; 795 memlen *= 2;
597 names = realloc (names, memlen); 796 names = realloc (names, memlen);
598 if (!names) 797 if (!names)
599 break; 798 break;
600 } 799 }
601 800
602 memcpy (names + memofs, name, len); 801 memcpy (names + memofs, name, len);
603 memofs += len; 802 memofs += len;
604 } 803 }
605 } 804 }
606 805
607 errorno = errno; 806 errorno = errno;
807 free (u);
608 closedir (dirp); 808 closedir (dirp);
609 809
610 if (errorno) 810 if (errorno)
611 { 811 {
612 free (names); 812 free (names);
618 return res; 818 return res;
619} 819}
620 820
621/*****************************************************************************/ 821/*****************************************************************************/
622 822
623static void *
624aio_proc (void *thr_arg) 823static void *aio_proc (void *thr_arg)
625{ 824{
626 aio_req req; 825 aio_req req;
627 int type; 826 int type;
628 827
629 do 828 do
647 } 846 }
648 847
649 pthread_mutex_unlock (&reqlock); 848 pthread_mutex_unlock (&reqlock);
650 849
651 errno = 0; /* strictly unnecessary */ 850 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */
652 852
653 type = req->type; 853 if (!(req->flags & FLAG_CANCELLED))
654
655 switch (type) 854 switch (type)
656 { 855 {
657 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 856 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
658 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 857 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
659 858
660 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 859 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
661 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 860 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
662 861
663 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 862 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
664 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 863 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
665 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 864 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
666 865
667 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 866 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
668 case REQ_CLOSE: req->result = close (req->fd); break; 867 case REQ_CLOSE: req->result = close (req->fd); break;
669 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 868 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
670 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 869 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
671 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 870 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
672 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 871 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
673 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 872 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
674 873
675 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 874 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
676 case REQ_FSYNC: req->result = fsync (req->fd); break; 875 case REQ_FSYNC: req->result = fsync (req->fd); break;
677 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 876 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
678 877
878 case REQ_SLEEP:
879 {
880 struct timeval tv;
881
882 tv.tv_sec = req->fd;
883 tv.tv_usec = req->fd2;
884
885 req->result = select (0, 0, 0, 0, &tv);
886 }
887
888 case REQ_GROUP:
889 case REQ_NOP:
679 case REQ_QUIT: 890 case REQ_QUIT:
680 break; 891 break;
681 892
682 default: 893 default:
683 req->result = ENOSYS; 894 req->result = ENOSYS;
684 break; 895 break;
685 } 896 }
686 897
687 req->errorno = errno; 898 req->errorno = errno;
688 899
689 pthread_mutex_lock (&reslock); 900 pthread_mutex_lock (&reslock);
690 901
744 955
745 while (reqs) 956 while (reqs)
746 { 957 {
747 prv = reqs; 958 prv = reqs;
748 reqs = prv->next; 959 reqs = prv->next;
749 free_req (prv); 960 req_free (prv);
750 } 961 }
751 962
752 reqs = reqe = 0; 963 reqs = reqe = 0;
753 964
754 while (ress) 965 while (ress)
755 { 966 {
756 prv = ress; 967 prv = ress;
757 ress = prv->next; 968 ress = prv->next;
758 free_req (prv); 969 req_free (prv);
759 } 970 }
760 971
761 ress = rese = 0; 972 ress = rese = 0;
762 973
763 close (respipe [0]); 974 close (respipe [0]);
767 atfork_parent (); 978 atfork_parent ();
768} 979}
769 980
770#define dREQ \ 981#define dREQ \
771 aio_req req; \ 982 aio_req req; \
983 int req_pri = next_pri; \
984 next_pri = DEFAULT_PRI + PRI_BIAS; \
772 \ 985 \
773 if (SvOK (callback) && !SvROK (callback)) \ 986 if (SvOK (callback) && !SvROK (callback)) \
774 croak ("clalback must be undef or of reference type"); \ 987 croak ("callback must be undef or of reference type"); \
775 \ 988 \
776 Newz (0, req, 1, aio_cb); \ 989 Newz (0, req, 1, aio_cb); \
777 if (!req) \ 990 if (!req) \
778 croak ("out of memory during aio_req allocation"); \ 991 croak ("out of memory during aio_req allocation"); \
779 \ 992 \
780 req->callback = newSVsv (callback); 993 req->callback = newSVsv (callback); \
994 req->pri = req_pri
995
996#define REQ_SEND \
997 req_send (req); \
998 \
999 if (GIMME_V != G_VOID) \
1000 XPUSHs (req_sv (req, AIO_REQ_KLASS));
781 1001
782MODULE = IO::AIO PACKAGE = IO::AIO 1002MODULE = IO::AIO PACKAGE = IO::AIO
783 1003
784PROTOTYPES: ENABLE 1004PROTOTYPES: ENABLE
785 1005
817 SV * pathname 1037 SV * pathname
818 int flags 1038 int flags
819 int mode 1039 int mode
820 SV * callback 1040 SV * callback
821 PROTOTYPE: $$$;$ 1041 PROTOTYPE: $$$;$
822 CODE: 1042 PPCODE:
823{ 1043{
824 dREQ; 1044 dREQ;
825 1045
826 req->type = REQ_OPEN; 1046 req->type = REQ_OPEN;
827 req->data = newSVsv (pathname); 1047 req->data = newSVsv (pathname);
828 req->dataptr = SvPVbyte_nolen (req->data); 1048 req->dataptr = SvPVbyte_nolen (req->data);
829 req->fd = flags; 1049 req->fd = flags;
830 req->mode = mode; 1050 req->mode = mode;
831 1051
832 send_req (req); 1052 REQ_SEND;
833} 1053}
834 1054
835void 1055void
836aio_close (fh,callback=&PL_sv_undef) 1056aio_close (fh,callback=&PL_sv_undef)
837 SV * fh 1057 SV * fh
839 PROTOTYPE: $;$ 1059 PROTOTYPE: $;$
840 ALIAS: 1060 ALIAS:
841 aio_close = REQ_CLOSE 1061 aio_close = REQ_CLOSE
842 aio_fsync = REQ_FSYNC 1062 aio_fsync = REQ_FSYNC
843 aio_fdatasync = REQ_FDATASYNC 1063 aio_fdatasync = REQ_FDATASYNC
844 CODE: 1064 PPCODE:
845{ 1065{
846 dREQ; 1066 dREQ;
847 1067
848 req->type = ix; 1068 req->type = ix;
849 req->fh = newSVsv (fh); 1069 req->fh = newSVsv (fh);
850 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1070 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
851 1071
852 send_req (req); 1072 REQ_SEND (req);
853} 1073}
854 1074
855void 1075void
856aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1076aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
857 SV * fh 1077 SV * fh
862 SV * callback 1082 SV * callback
863 ALIAS: 1083 ALIAS:
864 aio_read = REQ_READ 1084 aio_read = REQ_READ
865 aio_write = REQ_WRITE 1085 aio_write = REQ_WRITE
866 PROTOTYPE: $$$$$;$ 1086 PROTOTYPE: $$$$$;$
867 CODE: 1087 PPCODE:
868{ 1088{
869 aio_req req; 1089 aio_req req;
870 STRLEN svlen; 1090 STRLEN svlen;
871 char *svptr = SvPVbyte (data, svlen); 1091 char *svptr = SvPVbyte (data, svlen);
872 1092
910 { 1130 {
911 SvREADONLY_on (data); 1131 SvREADONLY_on (data);
912 req->data2ptr = (void *)data; 1132 req->data2ptr = (void *)data;
913 } 1133 }
914 1134
915 send_req (req); 1135 REQ_SEND;
916 } 1136 }
917} 1137}
918 1138
919void 1139void
920aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1140aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
922 SV * in_fh 1142 SV * in_fh
923 UV in_offset 1143 UV in_offset
924 UV length 1144 UV length
925 SV * callback 1145 SV * callback
926 PROTOTYPE: $$$$;$ 1146 PROTOTYPE: $$$$;$
927 CODE: 1147 PPCODE:
928{ 1148{
929 dREQ; 1149 dREQ;
930 1150
931 req->type = REQ_SENDFILE; 1151 req->type = REQ_SENDFILE;
932 req->fh = newSVsv (out_fh); 1152 req->fh = newSVsv (out_fh);
934 req->fh2 = newSVsv (in_fh); 1154 req->fh2 = newSVsv (in_fh);
935 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1155 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
936 req->offset = in_offset; 1156 req->offset = in_offset;
937 req->length = length; 1157 req->length = length;
938 1158
939 send_req (req); 1159 REQ_SEND;
940} 1160}
941 1161
942void 1162void
943aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1163aio_readahead (fh,offset,length,callback=&PL_sv_undef)
944 SV * fh 1164 SV * fh
945 UV offset 1165 UV offset
946 IV length 1166 IV length
947 SV * callback 1167 SV * callback
948 PROTOTYPE: $$$;$ 1168 PROTOTYPE: $$$;$
949 CODE: 1169 PPCODE:
950{ 1170{
951 dREQ; 1171 dREQ;
952 1172
953 req->type = REQ_READAHEAD; 1173 req->type = REQ_READAHEAD;
954 req->fh = newSVsv (fh); 1174 req->fh = newSVsv (fh);
955 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1175 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
956 req->offset = offset; 1176 req->offset = offset;
957 req->length = length; 1177 req->length = length;
958 1178
959 send_req (req); 1179 REQ_SEND;
960} 1180}
961 1181
962void 1182void
963aio_stat (fh_or_path,callback=&PL_sv_undef) 1183aio_stat (fh_or_path,callback=&PL_sv_undef)
964 SV * fh_or_path 1184 SV * fh_or_path
965 SV * callback 1185 SV * callback
966 ALIAS: 1186 ALIAS:
967 aio_stat = REQ_STAT 1187 aio_stat = REQ_STAT
968 aio_lstat = REQ_LSTAT 1188 aio_lstat = REQ_LSTAT
969 CODE: 1189 PPCODE:
970{ 1190{
971 dREQ; 1191 dREQ;
972 1192
973 New (0, req->statdata, 1, Stat_t); 1193 New (0, req->statdata, 1, Stat_t);
974 if (!req->statdata) 1194 if (!req->statdata)
975 { 1195 {
976 free_req (req); 1196 req_free (req);
977 croak ("out of memory during aio_req->statdata allocation"); 1197 croak ("out of memory during aio_req->statdata allocation");
978 } 1198 }
979 1199
980 if (SvPOK (fh_or_path)) 1200 if (SvPOK (fh_or_path))
981 { 1201 {
988 req->type = REQ_FSTAT; 1208 req->type = REQ_FSTAT;
989 req->fh = newSVsv (fh_or_path); 1209 req->fh = newSVsv (fh_or_path);
990 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1210 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
991 } 1211 }
992 1212
993 send_req (req); 1213 REQ_SEND;
994} 1214}
995 1215
996void 1216void
997aio_unlink (pathname,callback=&PL_sv_undef) 1217aio_unlink (pathname,callback=&PL_sv_undef)
998 SV * pathname 1218 SV * pathname
999 SV * callback 1219 SV * callback
1000 ALIAS: 1220 ALIAS:
1001 aio_unlink = REQ_UNLINK 1221 aio_unlink = REQ_UNLINK
1002 aio_rmdir = REQ_RMDIR 1222 aio_rmdir = REQ_RMDIR
1003 aio_readdir = REQ_READDIR 1223 aio_readdir = REQ_READDIR
1004 CODE: 1224 PPCODE:
1005{ 1225{
1006 dREQ; 1226 dREQ;
1007 1227
1008 req->type = ix; 1228 req->type = ix;
1009 req->data = newSVsv (pathname); 1229 req->data = newSVsv (pathname);
1010 req->dataptr = SvPVbyte_nolen (req->data); 1230 req->dataptr = SvPVbyte_nolen (req->data);
1011 1231
1012 send_req (req); 1232 REQ_SEND;
1013} 1233}
1014 1234
1015void 1235void
1016aio_link (oldpath,newpath,callback=&PL_sv_undef) 1236aio_link (oldpath,newpath,callback=&PL_sv_undef)
1017 SV * oldpath 1237 SV * oldpath
1019 SV * callback 1239 SV * callback
1020 ALIAS: 1240 ALIAS:
1021 aio_link = REQ_LINK 1241 aio_link = REQ_LINK
1022 aio_symlink = REQ_SYMLINK 1242 aio_symlink = REQ_SYMLINK
1023 aio_rename = REQ_RENAME 1243 aio_rename = REQ_RENAME
1024 CODE: 1244 PPCODE:
1025{ 1245{
1026 dREQ; 1246 dREQ;
1027 1247
1028 req->type = ix; 1248 req->type = ix;
1029 req->fh = newSVsv (oldpath); 1249 req->fh = newSVsv (oldpath);
1030 req->data2ptr = SvPVbyte_nolen (req->fh); 1250 req->data2ptr = SvPVbyte_nolen (req->fh);
1031 req->data = newSVsv (newpath); 1251 req->data = newSVsv (newpath);
1032 req->dataptr = SvPVbyte_nolen (req->data); 1252 req->dataptr = SvPVbyte_nolen (req->data);
1033 1253
1034 send_req (req); 1254 REQ_SEND;
1035} 1255}
1256
1257void
1258aio_sleep (delay,callback=&PL_sv_undef)
1259 double delay
1260 SV * callback
1261 PPCODE:
1262{
1263 dREQ;
1264
1265 req->type = REQ_SLEEP;
1266 req->fd = delay < 0. ? 0 : delay;
1267 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1268
1269 REQ_SEND;
1270}
1271
1272void
1273aio_group (callback=&PL_sv_undef)
1274 SV * callback
1275 PROTOTYPE: ;$
1276 PPCODE:
1277{
1278 dREQ;
1279
1280 req->type = REQ_GROUP;
1281 req_send (req);
1282
1283 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1284}
1285
1286void
1287aio_nop (callback=&PL_sv_undef)
1288 SV * callback
1289 PPCODE:
1290{
1291 dREQ;
1292
1293 req->type = REQ_NOP;
1294
1295 REQ_SEND;
1296}
1297
1298#if 0
1299
1300void
1301aio_pri (int pri = DEFAULT_PRI)
1302 CODE:
1303 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS;
1306
1307#endif
1036 1308
1037void 1309void
1038flush () 1310flush ()
1039 PROTOTYPE: 1311 PROTOTYPE:
1040 CODE: 1312 CODE:
1083 CODE: 1355 CODE:
1084 RETVAL = nreqs; 1356 RETVAL = nreqs;
1085 OUTPUT: 1357 OUTPUT:
1086 RETVAL 1358 RETVAL
1087 1359
1360PROTOTYPES: DISABLE
1361
1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363
1364void
1365cancel (aio_req_ornot req)
1366 CODE:
1367 req_cancel (req);
1368
1369void
1370cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1371 CODE:
1372 SvREFCNT_dec (req->callback);
1373 req->callback = newSVsv (callback);
1374
1375MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1376
1377void
1378add (aio_req grp, ...)
1379 PPCODE:
1380{
1381 int i;
1382 aio_req req;
1383
1384 if (grp->fd == 2)
1385 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1386
1387 for (i = 1; i < items; ++i )
1388 {
1389 if (GIMME_V != G_VOID)
1390 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1391
1392 req = SvAIO_REQ (ST (i));
1393
1394 if (req)
1395 {
1396 ++grp->length;
1397 req->grp = grp;
1398
1399 req->grp_prev = 0;
1400 req->grp_next = grp->grp_first;
1401
1402 if (grp->grp_first)
1403 grp->grp_first->grp_prev = req;
1404
1405 grp->grp_first = req;
1406 }
1407 }
1408}
1409
1410void
1411result (aio_req grp, ...)
1412 CODE:
1413{
1414 int i;
1415 AV *av = newAV ();
1416
1417 for (i = 1; i < items; ++i )
1418 av_push (av, newSVsv (ST (i)));
1419
1420 SvREFCNT_dec (grp->data);
1421 grp->data = (SV *)av;
1422}
1423
1424void
1425feed_limit (aio_req grp, int limit)
1426 CODE:
1427 grp->fd2 = limit;
1428 aio_grp_feed (grp);
1429
1430void
1431feed (aio_req grp, SV *callback=&PL_sv_undef)
1432 CODE:
1433{
1434 SvREFCNT_dec (grp->fh2);
1435 grp->fh2 = newSVsv (callback);
1436
1437 if (grp->fd2 <= 0)
1438 grp->fd2 = 2;
1439
1440 aio_grp_feed (grp);
1441}
1442

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines