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.45 by root, Sun Oct 22 00:19:05 2006 UTC vs.
Revision 1.70 by root, Tue Oct 24 15:15:56 2006 UTC

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux
5# define _GNU_SOURCE
6#endif
7
1#define _REENTRANT 1 8#define _REENTRANT 1
9
2#include <errno.h> 10#include <errno.h>
3 11
4#include "EXTERN.h" 12#include "EXTERN.h"
5#include "perl.h" 13#include "perl.h"
6#include "XSUB.h" 14#include "XSUB.h"
41# define NAME_MAX 4096 49# define NAME_MAX 4096
42#endif 50#endif
43 51
44#if __ia64 52#if __ia64
45# define STACKSIZE 65536 53# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN
46#else 56#else
47# define STACKSIZE 8192 57# define STACKSIZE 16384
48#endif 58#endif
59
60/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536
62
63#define dBUF \
64 char *aio_buf = malloc (AIO_BUFSIZE); \
65 if (!aio_buf) \
66 return -1;
67
68#define fBUF free (aio_buf)
49 69
50enum { 70enum {
51 REQ_QUIT, 71 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 72 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 73 REQ_READ, REQ_WRITE, REQ_READAHEAD,
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 75 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 76 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 77 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 78 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 79 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP, 80 REQ_GROUP, REQ_NOP,
61 REQ_GROUP, 81 REQ_BUSY,
62}; 82};
63 83
64#define AIO_REQ_KLASS "IO::AIO::REQ" 84#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 85#define AIO_GRP_KLASS "IO::AIO::GRP"
66 86
67typedef struct aio_cb 87typedef struct aio_cb
68{ 88{
69 struct aio_cb *grp, *grp_prev, *grp_next;
70
71 struct aio_cb *volatile next; 89 struct aio_cb *volatile next;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 90
75 SV *data, *callback; 91 SV *data, *callback;
76 SV *fh, *fh2; 92 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 93 void *dataptr, *data2ptr;
78 Stat_t *statdata; 94 Stat_t *statdata;
79 off_t offset; 95 off_t offset;
80 size_t length; 96 size_t length;
81 ssize_t result; 97 ssize_t result;
82 98
99 STRLEN dataoffset;
83 int type; 100 int type;
84 int fd, fd2; 101 int fd, fd2;
85 int errorno; 102 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 103 mode_t mode; /* open */
104
88 unsigned char cancelled; 105 unsigned char flags;
106 unsigned char pri;
107
108 SV *self; /* the perl counterpart of this request, if any */
109 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 110} aio_cb;
111
112enum {
113 FLAG_CANCELLED = 0x01,
114};
90 115
91typedef aio_cb *aio_req; 116typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 117typedef aio_cb *aio_req_ornot;
93typedef aio_cb *aio_group; 118
119enum {
120 PRI_MIN = -4,
121 PRI_MAX = 4,
122
123 DEFAULT_PRI = 0,
124 PRI_BIAS = -PRI_MIN,
125 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
126};
127
128static int next_pri = DEFAULT_PRI + PRI_BIAS;
94 129
95static int started, wanted; 130static int started, wanted;
96static volatile int nreqs; 131static volatile int nreqs;
97static int max_outstanding = 1<<30; 132static int max_outstanding = 1<<30;
98static int respipe [2]; 133static int respipe [2];
99 134
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif
140
100static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 141static pthread_mutex_t reslock = AIO_MUTEX_INIT;
101static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 142static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
102static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 143static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
103 144
104static volatile aio_req reqs, reqe; /* queue start, queue end */ 145/*
105static volatile aio_req ress, rese; /* queue start, queue end */ 146 * a somewhat faster data structure might be nice, but
147 * with 8 priorities this actually needs <20 insns
148 * per shift, the most expensive operation.
149 */
150typedef struct {
151 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
152 int size;
153} reqq;
106 154
155static reqq req_queue;
156static reqq res_queue;
157
158int reqq_push (reqq *q, aio_req req)
159{
160 int pri = req->pri;
161 req->next = 0;
162
163 if (q->qe[pri])
164 {
165 q->qe[pri]->next = req;
166 q->qe[pri] = req;
167 }
168 else
169 q->qe[pri] = q->qs[pri] = req;
170
171 return q->size++;
172}
173
174aio_req reqq_shift (reqq *q)
175{
176 int pri;
177
178 if (!q->size)
179 return 0;
180
181 --q->size;
182
183 for (pri = NUM_PRI; pri--; )
184 {
185 aio_req req = q->qs[pri];
186
187 if (req)
188 {
189 if (!(q->qs[pri] = req->next))
190 q->qe[pri] = 0;
191
192 return req;
193 }
194 }
195
196 abort ();
197}
198
199static void req_invoke (aio_req req);
107static void req_free (aio_req req); 200static void req_free (aio_req req);
108 201
109/* must be called at most once */ 202/* must be called at most once */
110static SV *req_sv (aio_req req, const char *klass) 203static SV *req_sv (aio_req req, const char *klass)
111{ 204{
205 if (!req->self)
206 {
112 req->self = (SV *)newHV (); 207 req->self = (SV *)newHV ();
113 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 208 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
209 }
114 210
115 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 211 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
116} 212}
117 213
118static aio_req SvAIO_REQ (SV *sv) 214static aio_req SvAIO_REQ (SV *sv)
119{ 215{
216 MAGIC *mg;
217
120 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 218 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
121 croak ("object of class " AIO_REQ_KLASS " expected"); 219 croak ("object of class " AIO_REQ_KLASS " expected");
122 220
123 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 221 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
124 222
125 return mg ? (aio_req)mg->mg_ptr : 0; 223 return mg ? (aio_req)mg->mg_ptr : 0;
126} 224}
127 225
226static void aio_grp_feed (aio_req grp)
227{
228 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
229 {
230 int old_len = grp->length;
231
232 if (grp->fh2 && SvOK (grp->fh2))
233 {
234 dSP;
235
236 ENTER;
237 SAVETMPS;
238 PUSHMARK (SP);
239 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
240 PUTBACK;
241 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
242 SPAGAIN;
243 FREETMPS;
244 LEAVE;
245 }
246
247 /* stop if no progress has been made */
248 if (old_len == grp->length)
249 {
250 SvREFCNT_dec (grp->fh2);
251 grp->fh2 = 0;
252 break;
253 }
254 }
255}
256
257static void aio_grp_dec (aio_req grp)
258{
259 --grp->length;
260
261 /* call feeder, if applicable */
262 aio_grp_feed (grp);
263
264 /* finish, if done */
265 if (!grp->length && grp->fd)
266 {
267 req_invoke (grp);
268 req_free (grp);
269 }
270}
271
128static void poll_wait () 272static void poll_wait ()
129{ 273{
130 if (nreqs && !ress)
131 {
132 fd_set rfd; 274 fd_set rfd;
275
276 while (nreqs)
277 {
278 int size;
279#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
280 pthread_mutex_lock (&reslock);
281#endif
282 size = res_queue.size;
283#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
284 pthread_mutex_unlock (&reslock);
285#endif
286
287 if (size)
288 return;
289
133 FD_ZERO(&rfd); 290 FD_ZERO(&rfd);
134 FD_SET(respipe [0], &rfd); 291 FD_SET(respipe [0], &rfd);
135 292
136 select (respipe [0] + 1, &rfd, 0, 0, 0); 293 select (respipe [0] + 1, &rfd, 0, 0, 0);
137 } 294 }
138} 295}
139 296
140static void req_invoke (aio_req req) 297static void req_invoke (aio_req req)
141{ 298{
142 dSP; 299 dSP;
143 int errorno = errno;
144 300
145 if (req->cancelled || !SvOK (req->callback)) 301 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
146 return; 302 {
147
148 errno = req->errorno; 303 errno = req->errorno;
149 304
150 ENTER; 305 ENTER;
306 SAVETMPS;
151 PUSHMARK (SP); 307 PUSHMARK (SP);
308 EXTEND (SP, 1);
152 309
153 switch (req->type) 310 switch (req->type)
154 {
155 case REQ_READDIR:
156 { 311 {
157 SV *rv = &PL_sv_undef; 312 case REQ_READDIR:
158
159 if (req->result >= 0)
160 { 313 {
161 char *buf = req->data2ptr; 314 SV *rv = &PL_sv_undef;
162 AV *av = newAV ();
163 315
164 while (req->result) 316 if (req->result >= 0)
165 { 317 {
318 char *buf = req->data2ptr;
319 AV *av = newAV ();
320
321 while (req->result)
322 {
166 SV *sv = newSVpv (buf, 0); 323 SV *sv = newSVpv (buf, 0);
167 324
168 av_push (av, sv); 325 av_push (av, sv);
169 buf += SvCUR (sv) + 1; 326 buf += SvCUR (sv) + 1;
170 req->result--; 327 req->result--;
328 }
329
330 rv = sv_2mortal (newRV_noinc ((SV *)av));
171 } 331 }
172 332
173 rv = sv_2mortal (newRV_noinc ((SV *)av)); 333 PUSHs (rv);
174 } 334 }
335 break;
175 336
176 XPUSHs (rv); 337 case REQ_OPEN:
338 {
339 /* convert fd to fh */
340 SV *fh;
341
342 PUSHs (sv_2mortal (newSViv (req->result)));
343 PUTBACK;
344 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
345 SPAGAIN;
346
347 fh = SvREFCNT_inc (POPs);
348
349 PUSHMARK (SP);
350 XPUSHs (sv_2mortal (fh));
351 }
352 break;
353
354 case REQ_GROUP:
355 req->fd = 2; /* mark group as finished */
356
357 if (req->data)
358 {
359 int i;
360 AV *av = (AV *)req->data;
361
362 EXTEND (SP, AvFILL (av) + 1);
363 for (i = 0; i <= AvFILL (av); ++i)
364 PUSHs (*av_fetch (av, i, 0));
365 }
366 break;
367
368 case REQ_NOP:
369 case REQ_BUSY:
370 break;
371
372 default:
373 PUSHs (sv_2mortal (newSViv (req->result)));
374 break;
177 } 375 }
178 break;
179 376
180 case REQ_OPEN:
181 {
182 /* convert fd to fh */
183 SV *fh;
184 377
185 XPUSHs (sv_2mortal (newSViv (req->result)));
186 PUTBACK; 378 PUTBACK;
187 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
188 SPAGAIN;
189
190 fh = SvREFCNT_inc (POPs);
191
192 PUSHMARK (SP);
193 XPUSHs (sv_2mortal (fh));
194 }
195 break;
196
197 case REQ_SLEEP:
198 case REQ_GROUP:
199 break;
200
201 default:
202 XPUSHs (sv_2mortal (newSViv (req->result)));
203 break;
204 }
205
206
207 PUTBACK;
208 call_sv (req->callback, G_VOID | G_EVAL); 379 call_sv (req->callback, G_VOID | G_EVAL);
209 SPAGAIN; 380 SPAGAIN;
381
382 FREETMPS;
383 LEAVE;
384 }
385
386 if (req->grp)
387 {
388 aio_req grp = req->grp;
389
390 /* unlink request */
391 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
392 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
393
394 if (grp->grp_first == req)
395 grp->grp_first = req->grp_next;
396
397 aio_grp_dec (grp);
398 }
210 399
211 if (SvTRUE (ERRSV)) 400 if (SvTRUE (ERRSV))
212 { 401 {
213 req_free (req); 402 req_free (req);
214 croak (0); 403 croak (0);
215 } 404 }
216
217 LEAVE;
218
219 errno = errorno;
220} 405}
221 406
222static void req_free (aio_req req) 407static void req_free (aio_req req)
223{ 408{
224 if (req->grp)
225 {
226 aio_req grp = req->grp;
227
228 /* unlink request */
229 req->grp_next->grp_prev = req->grp_prev;
230 req->grp_prev->grp_next = req->grp_next;
231
232 if (grp->grp_next == grp)
233 {
234 req_invoke (grp);
235 req_free (grp);
236 }
237 }
238
239 if (req->self) 409 if (req->self)
240 { 410 {
241 sv_unmagic (req->self, PERL_MAGIC_ext); 411 sv_unmagic (req->self, PERL_MAGIC_ext);
242 SvREFCNT_dec (req->self); 412 SvREFCNT_dec (req->self);
243 } 413 }
244 414
245 if (req->data)
246 SvREFCNT_dec (req->data); 415 SvREFCNT_dec (req->data);
247
248 if (req->fh)
249 SvREFCNT_dec (req->fh); 416 SvREFCNT_dec (req->fh);
250
251 if (req->fh2)
252 SvREFCNT_dec (req->fh2); 417 SvREFCNT_dec (req->fh2);
253
254 if (req->statdata)
255 Safefree (req->statdata);
256
257 if (req->callback)
258 SvREFCNT_dec (req->callback); 418 SvREFCNT_dec (req->callback);
419 Safefree (req->statdata);
259 420
260 if (req->type == REQ_READDIR && req->result >= 0) 421 if (req->type == REQ_READDIR && req->result >= 0)
261 free (req->data2ptr); 422 free (req->data2ptr);
262 423
263 Safefree (req); 424 Safefree (req);
264} 425}
265 426
266static void req_cancel (aio_req req) 427static void req_cancel (aio_req req)
267{ 428{
268 req->cancelled = 1; 429 req->flags |= FLAG_CANCELLED;
269 430
270 if (req->type == REQ_GROUP) 431 if (req->type == REQ_GROUP)
271 { 432 {
272 aio_req sub; 433 aio_req sub;
273 434
274 for (sub = req->grp_next; sub != req; sub = sub->grp_next) 435 for (sub = req->grp_first; sub; sub = sub->grp_next)
275 req_cancel (sub); 436 req_cancel (sub);
276 } 437 }
277} 438}
278 439
279static int poll_cb () 440static int poll_cb ()
284 aio_req req; 445 aio_req req;
285 446
286 for (;;) 447 for (;;)
287 { 448 {
288 pthread_mutex_lock (&reslock); 449 pthread_mutex_lock (&reslock);
289 req = ress; 450 req = reqq_shift (&res_queue);
290 451
291 if (req) 452 if (req)
292 { 453 {
293 ress = req->next;
294
295 if (!ress) 454 if (!res_queue.size)
296 { 455 {
297 /* read any signals sent by the worker threads */ 456 /* read any signals sent by the worker threads */
298 char buf [32]; 457 char buf [32];
299 while (read (respipe [0], buf, 32) == 32) 458 while (read (respipe [0], buf, 32) == 32)
300 ; 459 ;
301
302 rese = 0;
303 } 460 }
304 } 461 }
305 462
306 pthread_mutex_unlock (&reslock); 463 pthread_mutex_unlock (&reslock);
307 464
308 if (!req) 465 if (!req)
309 break; 466 break;
310 467
311 nreqs--; 468 --nreqs;
312 469
313 if (req->type == REQ_QUIT) 470 if (req->type == REQ_QUIT)
314 started--; 471 started--;
315 else if (req->type == REQ_GROUP && req->grp_next != req) 472 else if (req->type == REQ_GROUP && req->length)
473 {
474 req->fd = 1; /* mark request as delayed */
316 continue; 475 continue;
476 }
317 else 477 else
318 { 478 {
319 if (req->type == REQ_READ) 479 if (req->type == REQ_READ)
320 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); 480 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
321 481
364static void req_send (aio_req req) 524static void req_send (aio_req req)
365{ 525{
366 while (started < wanted && nreqs >= started) 526 while (started < wanted && nreqs >= started)
367 start_thread (); 527 start_thread ();
368 528
369 nreqs++; 529 ++nreqs;
370 530
371 pthread_mutex_lock (&reqlock); 531 pthread_mutex_lock (&reqlock);
372 532 reqq_push (&req_queue, req);
373 req->next = 0;
374
375 if (reqe)
376 {
377 reqe->next = req;
378 reqe = req;
379 }
380 else
381 reqe = reqs = req;
382
383 pthread_cond_signal (&reqwait); 533 pthread_cond_signal (&reqwait);
384 pthread_mutex_unlock (&reqlock); 534 pthread_mutex_unlock (&reqlock);
385 535
386 if (nreqs > max_outstanding) 536 if (nreqs > max_outstanding)
387 for (;;) 537 for (;;)
396} 546}
397 547
398static void end_thread (void) 548static void end_thread (void)
399{ 549{
400 aio_req req; 550 aio_req req;
551
401 Newz (0, req, 1, aio_cb); 552 Newz (0, req, 1, aio_cb);
553
402 req->type = REQ_QUIT; 554 req->type = REQ_QUIT;
555 req->pri = PRI_MAX + PRI_BIAS;
403 556
404 req_send (req); 557 req_send (req);
405} 558}
406 559
407static void min_parallel (int nthreads) 560static void min_parallel (int nthreads)
494#if !HAVE_READAHEAD 647#if !HAVE_READAHEAD
495# define readahead aio_readahead 648# define readahead aio_readahead
496 649
497static ssize_t readahead (int fd, off_t offset, size_t count) 650static ssize_t readahead (int fd, off_t offset, size_t count)
498{ 651{
499 char readahead_buf[4096]; 652 dBUF;
500 653
501 while (count > 0) 654 while (count > 0)
502 { 655 {
503 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 656 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
504 657
505 pread (fd, readahead_buf, len, offset); 658 pread (fd, aio_buf, len, offset);
506 offset += len; 659 offset += len;
507 count -= len; 660 count -= len;
508 } 661 }
662
663 fBUF;
509 664
510 errno = 0; 665 errno = 0;
511} 666}
512#endif 667#endif
513 668
599#endif 754#endif
600 ) 755 )
601 ) 756 )
602 { 757 {
603 /* emulate sendfile. this is a major pain in the ass */ 758 /* emulate sendfile. this is a major pain in the ass */
604 char buf[4096]; 759 dBUF;
760
605 res = 0; 761 res = 0;
606 762
607 while (count) 763 while (count)
608 { 764 {
609 ssize_t cnt; 765 ssize_t cnt;
610 766
611 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 767 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
612 768
613 if (cnt <= 0) 769 if (cnt <= 0)
614 { 770 {
615 if (cnt && !res) res = -1; 771 if (cnt && !res) res = -1;
616 break; 772 break;
617 } 773 }
618 774
619 cnt = write (ofd, buf, cnt); 775 cnt = write (ofd, aio_buf, cnt);
620 776
621 if (cnt <= 0) 777 if (cnt <= 0)
622 { 778 {
623 if (cnt && !res) res = -1; 779 if (cnt && !res) res = -1;
624 break; 780 break;
626 782
627 offset += cnt; 783 offset += cnt;
628 res += cnt; 784 res += cnt;
629 count -= cnt; 785 count -= cnt;
630 } 786 }
787
788 fBUF;
631 } 789 }
632 790
633 return res; 791 return res;
634} 792}
635 793
636/* read a full directory */ 794/* read a full directory */
637static int scandir_ (const char *path, void **namesp) 795static int scandir_ (const char *path, void **namesp)
638{ 796{
639 DIR *dirp = opendir (path); 797 DIR *dirp;
640 union 798 union
641 { 799 {
642 struct dirent d; 800 struct dirent d;
643 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 801 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
644 } u; 802 } *u;
645 struct dirent *entp; 803 struct dirent *entp;
646 char *name, *names; 804 char *name, *names;
647 int memlen = 4096; 805 int memlen = 4096;
648 int memofs = 0; 806 int memofs = 0;
649 int res = 0; 807 int res = 0;
650 int errorno; 808 int errorno;
651 809
810 dirp = opendir (path);
652 if (!dirp) 811 if (!dirp)
653 return -1; 812 return -1;
654 813
814 u = malloc (sizeof (*u));
655 names = malloc (memlen); 815 names = malloc (memlen);
656 816
817 if (u && names)
657 for (;;) 818 for (;;)
658 { 819 {
820 errno = 0;
659 errno = 0, readdir_r (dirp, &u.d, &entp); 821 readdir_r (dirp, &u->d, &entp);
660 822
661 if (!entp) 823 if (!entp)
662 break; 824 break;
663 825
664 name = entp->d_name; 826 name = entp->d_name;
665 827
666 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 828 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
667 { 829 {
668 int len = strlen (name) + 1; 830 int len = strlen (name) + 1;
669 831
670 res++; 832 res++;
671 833
672 while (memofs + len > memlen) 834 while (memofs + len > memlen)
673 { 835 {
674 memlen *= 2; 836 memlen *= 2;
675 names = realloc (names, memlen); 837 names = realloc (names, memlen);
676 if (!names) 838 if (!names)
677 break; 839 break;
678 } 840 }
679 841
680 memcpy (names + memofs, name, len); 842 memcpy (names + memofs, name, len);
681 memofs += len; 843 memofs += len;
682 } 844 }
683 } 845 }
684 846
685 errorno = errno; 847 errorno = errno;
848 free (u);
686 closedir (dirp); 849 closedir (dirp);
687 850
688 if (errorno) 851 if (errorno)
689 { 852 {
690 free (names); 853 free (names);
707 { 870 {
708 pthread_mutex_lock (&reqlock); 871 pthread_mutex_lock (&reqlock);
709 872
710 for (;;) 873 for (;;)
711 { 874 {
712 req = reqs; 875 req = reqq_shift (&req_queue);
713
714 if (reqs)
715 {
716 reqs = reqs->next;
717 if (!reqs) reqe = 0;
718 }
719 876
720 if (req) 877 if (req)
721 break; 878 break;
722 879
723 pthread_cond_wait (&reqwait, &reqlock); 880 pthread_cond_wait (&reqwait, &reqlock);
724 } 881 }
725 882
726 pthread_mutex_unlock (&reqlock); 883 pthread_mutex_unlock (&reqlock);
727 884
728 errno = 0; /* strictly unnecessary */ 885 errno = 0; /* strictly unnecessary */
886 type = req->type; /* remember type for QUIT check */
729 887
730 if (!req->cancelled) 888 if (!(req->flags & FLAG_CANCELLED))
731 switch (req->type) 889 switch (type)
732 { 890 {
733 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 891 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
734 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 892 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
735 893
736 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 894 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
750 908
751 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 909 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
752 case REQ_FSYNC: req->result = fsync (req->fd); break; 910 case REQ_FSYNC: req->result = fsync (req->fd); break;
753 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 911 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
754 912
755 case REQ_SLEEP: 913 case REQ_BUSY:
756 { 914 {
757 struct timeval tv; 915 struct timeval tv;
758 916
759 tv.tv_sec = req->fd; 917 tv.tv_sec = req->fd;
760 tv.tv_usec = req->fd2; 918 tv.tv_usec = req->fd2;
761 919
762 req->result = select (0, 0, 0, 0, &tv); 920 req->result = select (0, 0, 0, 0, &tv);
763 } 921 }
764 922
923 case REQ_GROUP:
924 case REQ_NOP:
765 case REQ_QUIT: 925 case REQ_QUIT:
766 break; 926 break;
767 927
768 default: 928 default:
769 req->result = ENOSYS; 929 req->result = ENOSYS;
772 932
773 req->errorno = errno; 933 req->errorno = errno;
774 934
775 pthread_mutex_lock (&reslock); 935 pthread_mutex_lock (&reslock);
776 936
777 req->next = 0; 937 if (!reqq_push (&res_queue, req))
778
779 if (rese)
780 {
781 rese->next = req;
782 rese = req;
783 }
784 else
785 {
786 rese = ress = req;
787
788 /* write a dummy byte to the pipe so fh becomes ready */ 938 /* write a dummy byte to the pipe so fh becomes ready */
789 write (respipe [1], &respipe, 1); 939 write (respipe [1], &respipe, 1);
790 }
791 940
792 pthread_mutex_unlock (&reslock); 941 pthread_mutex_unlock (&reslock);
793 } 942 }
794 while (type != REQ_QUIT); 943 while (type != REQ_QUIT);
795 944
826{ 975{
827 aio_req prv; 976 aio_req prv;
828 977
829 started = 0; 978 started = 0;
830 979
831 while (reqs) 980 while (prv = reqq_shift (&req_queue))
832 {
833 prv = reqs;
834 reqs = prv->next;
835 req_free (prv); 981 req_free (prv);
836 }
837 982
838 reqs = reqe = 0; 983 while (prv = reqq_shift (&res_queue))
839
840 while (ress)
841 {
842 prv = ress;
843 ress = prv->next;
844 req_free (prv); 984 req_free (prv);
845 } 985
846
847 ress = rese = 0;
848
849 close (respipe [0]); 986 close (respipe [0]);
850 close (respipe [1]); 987 close (respipe [1]);
851 create_pipe (); 988 create_pipe ();
852 989
853 atfork_parent (); 990 atfork_parent ();
854} 991}
855 992
856#define dREQ \ 993#define dREQ \
857 aio_req req; \ 994 aio_req req; \
995 int req_pri = next_pri; \
996 next_pri = DEFAULT_PRI + PRI_BIAS; \
858 \ 997 \
859 if (SvOK (callback) && !SvROK (callback)) \ 998 if (SvOK (callback) && !SvROK (callback)) \
860 croak ("callback must be undef or of reference type"); \ 999 croak ("callback must be undef or of reference type"); \
861 \ 1000 \
862 Newz (0, req, 1, aio_cb); \ 1001 Newz (0, req, 1, aio_cb); \
863 if (!req) \ 1002 if (!req) \
864 croak ("out of memory during aio_req allocation"); \ 1003 croak ("out of memory during aio_req allocation"); \
865 \ 1004 \
866 req->callback = newSVsv (callback) 1005 req->callback = newSVsv (callback); \
1006 req->pri = req_pri
867 1007
868#define REQ_SEND \ 1008#define REQ_SEND \
869 req_send (req); \ 1009 req_send (req); \
870 \ 1010 \
871 if (GIMME_V != G_VOID) \ 1011 if (GIMME_V != G_VOID) \
1125 1265
1126 REQ_SEND; 1266 REQ_SEND;
1127} 1267}
1128 1268
1129void 1269void
1130aio_sleep (delay,callback=&PL_sv_undef) 1270aio_busy (delay,callback=&PL_sv_undef)
1131 double delay 1271 double delay
1132 SV * callback 1272 SV * callback
1133 PPCODE: 1273 PPCODE:
1134{ 1274{
1135 dREQ; 1275 dREQ;
1136 1276
1137 req->type = REQ_SLEEP; 1277 req->type = REQ_BUSY;
1138 req->fd = delay < 0. ? 0 : delay; 1278 req->fd = delay < 0. ? 0 : delay;
1139 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1279 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1140 1280
1141 REQ_SEND; 1281 REQ_SEND;
1142} 1282}
1143 1283
1144void 1284void
1145aio_group (callback=&PL_sv_undef) 1285aio_group (callback=&PL_sv_undef)
1146 SV * callback 1286 SV * callback
1147 PROTOTYPE: ;& 1287 PROTOTYPE: ;$
1148 PPCODE: 1288 PPCODE:
1149{ 1289{
1150 dREQ; 1290 dREQ;
1291
1151 req->type = REQ_GROUP; 1292 req->type = REQ_GROUP;
1152 req->grp_next = req;
1153 req->grp_prev = req;
1154
1155 req_send (req); 1293 req_send (req);
1294
1156 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1295 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1157} 1296}
1297
1298void
1299aio_nop (callback=&PL_sv_undef)
1300 SV * callback
1301 PPCODE:
1302{
1303 dREQ;
1304
1305 req->type = REQ_NOP;
1306
1307 REQ_SEND;
1308}
1309
1310void
1311aioreq_pri (int pri = DEFAULT_PRI)
1312 CODE:
1313 if (pri < PRI_MIN) pri = PRI_MIN;
1314 if (pri > PRI_MAX) pri = PRI_MAX;
1315 next_pri = pri + PRI_BIAS;
1316
1317void
1318aioreq_nice (int nice = 0)
1319 CODE:
1320 nice = next_pri - nice;
1321 if (nice < PRI_MIN) nice = PRI_MIN;
1322 if (nice > PRI_MAX) nice = PRI_MAX;
1323 next_pri = nice + PRI_BIAS;
1158 1324
1159void 1325void
1160flush () 1326flush ()
1161 PROTOTYPE: 1327 PROTOTYPE:
1162 CODE: 1328 CODE:
1205 CODE: 1371 CODE:
1206 RETVAL = nreqs; 1372 RETVAL = nreqs;
1207 OUTPUT: 1373 OUTPUT:
1208 RETVAL 1374 RETVAL
1209 1375
1376PROTOTYPES: DISABLE
1377
1210MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1378MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1211 1379
1212void 1380void
1213cancel (aio_req_ornot req) 1381cancel (aio_req_ornot req)
1214 PROTOTYPE:
1215 CODE: 1382 CODE:
1216 req_cancel (req); 1383 req_cancel (req);
1217 1384
1385void
1386cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1387 CODE:
1388 SvREFCNT_dec (req->callback);
1389 req->callback = newSVsv (callback);
1390
1218MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1391MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219 1392
1220void 1393void
1221add (aio_req grp, ...) 1394add (aio_req grp, ...)
1222 PROTOTYPE: $;@
1223 PPCODE: 1395 PPCODE:
1224{ 1396{
1225 int i; 1397 int i;
1398 aio_req req;
1399
1400 if (grp->fd == 2)
1401 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1226 1402
1227 for (i = 1; i < items; ++i ) 1403 for (i = 1; i < items; ++i )
1228 { 1404 {
1229 aio_req req = SvAIO_REQ (ST (i));
1230
1231 req->grp_prev = grp;
1232 req->grp_next = grp->grp_next;
1233 grp->grp_next->grp_prev = req;
1234 grp->grp_next = req;
1235
1236 req->grp = grp;
1237
1238 if (GIMME_V != G_VOID) 1405 if (GIMME_V != G_VOID)
1239 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1406 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1407
1408 req = SvAIO_REQ (ST (i));
1409
1410 if (req)
1411 {
1412 ++grp->length;
1413 req->grp = grp;
1414
1415 req->grp_prev = 0;
1416 req->grp_next = grp->grp_first;
1417
1418 if (grp->grp_first)
1419 grp->grp_first->grp_prev = req;
1420
1421 grp->grp_first = req;
1422 }
1240 } 1423 }
1241} 1424}
1242 1425
1426void
1427result (aio_req grp, ...)
1428 CODE:
1429{
1430 int i;
1431 AV *av = newAV ();
1432
1433 for (i = 1; i < items; ++i )
1434 av_push (av, newSVsv (ST (i)));
1435
1436 SvREFCNT_dec (grp->data);
1437 grp->data = (SV *)av;
1438}
1439
1440void
1441limit (aio_req grp, int limit)
1442 CODE:
1443 grp->fd2 = limit;
1444 aio_grp_feed (grp);
1445
1446void
1447feed (aio_req grp, SV *callback=&PL_sv_undef)
1448 CODE:
1449{
1450 SvREFCNT_dec (grp->fh2);
1451 grp->fh2 = newSVsv (callback);
1452
1453 if (grp->fd2 <= 0)
1454 grp->fd2 = 2;
1455
1456 aio_grp_feed (grp);
1457}
1458

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines