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.47 by root, Sun Oct 22 10:10:23 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;
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;
93 129
94static int started, wanted; 130static int started, wanted;
95static volatile int nreqs; 131static volatile int nreqs;
96static int max_outstanding = 1<<30; 132static int max_outstanding = 1<<30;
97static int respipe [2]; 133static int respipe [2];
98 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
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 141static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 142static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 143static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 144
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 145/*
104static 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;
105 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);
106static void req_free (aio_req req); 200static void req_free (aio_req req);
107 201
108/* must be called at most once */ 202/* must be called at most once */
109static SV *req_sv (aio_req req, const char *klass) 203static SV *req_sv (aio_req req, const char *klass)
110{ 204{
205 if (!req->self)
206 {
111 req->self = (SV *)newHV (); 207 req->self = (SV *)newHV ();
112 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 208 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
209 }
113 210
114 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)));
115} 212}
116 213
117static aio_req SvAIO_REQ (SV *sv) 214static aio_req SvAIO_REQ (SV *sv)
118{ 215{
216 MAGIC *mg;
217
119 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 218 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
120 croak ("object of class " AIO_REQ_KLASS " expected"); 219 croak ("object of class " AIO_REQ_KLASS " expected");
121 220
122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 221 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123 222
124 return mg ? (aio_req)mg->mg_ptr : 0; 223 return mg ? (aio_req)mg->mg_ptr : 0;
125} 224}
126 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
127static void poll_wait () 272static void poll_wait ()
128{ 273{
129 if (nreqs && !ress)
130 {
131 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
132 FD_ZERO(&rfd); 290 FD_ZERO(&rfd);
133 FD_SET(respipe [0], &rfd); 291 FD_SET(respipe [0], &rfd);
134 292
135 select (respipe [0] + 1, &rfd, 0, 0, 0); 293 select (respipe [0] + 1, &rfd, 0, 0, 0);
136 } 294 }
137} 295}
138 296
139static void req_invoke (aio_req req) 297static void req_invoke (aio_req req)
140{ 298{
141 dSP; 299 dSP;
142 int errorno = errno;
143 300
144 if (req->cancelled || !SvOK (req->callback)) 301 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
145 return; 302 {
146
147 errno = req->errorno; 303 errno = req->errorno;
148 304
149 ENTER; 305 ENTER;
306 SAVETMPS;
150 PUSHMARK (SP); 307 PUSHMARK (SP);
308 EXTEND (SP, 1);
151 309
152 switch (req->type) 310 switch (req->type)
153 {
154 case REQ_READDIR:
155 { 311 {
156 SV *rv = &PL_sv_undef; 312 case REQ_READDIR:
157
158 if (req->result >= 0)
159 { 313 {
160 char *buf = req->data2ptr; 314 SV *rv = &PL_sv_undef;
161 AV *av = newAV ();
162 315
163 while (req->result) 316 if (req->result >= 0)
164 { 317 {
318 char *buf = req->data2ptr;
319 AV *av = newAV ();
320
321 while (req->result)
322 {
165 SV *sv = newSVpv (buf, 0); 323 SV *sv = newSVpv (buf, 0);
166 324
167 av_push (av, sv); 325 av_push (av, sv);
168 buf += SvCUR (sv) + 1; 326 buf += SvCUR (sv) + 1;
169 req->result--; 327 req->result--;
328 }
329
330 rv = sv_2mortal (newRV_noinc ((SV *)av));
170 } 331 }
171 332
172 rv = sv_2mortal (newRV_noinc ((SV *)av)); 333 PUSHs (rv);
173 } 334 }
335 break;
174 336
175 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;
176 } 375 }
177 break;
178 376
179 case REQ_OPEN:
180 {
181 /* convert fd to fh */
182 SV *fh;
183 377
184 XPUSHs (sv_2mortal (newSViv (req->result)));
185 PUTBACK; 378 PUTBACK;
186 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
187 SPAGAIN;
188
189 fh = SvREFCNT_inc (POPs);
190
191 PUSHMARK (SP);
192 XPUSHs (sv_2mortal (fh));
193 }
194 break;
195
196 case REQ_SLEEP:
197 case REQ_GROUP:
198 break;
199
200 default:
201 XPUSHs (sv_2mortal (newSViv (req->result)));
202 break;
203 }
204
205
206 PUTBACK;
207 call_sv (req->callback, G_VOID | G_EVAL); 379 call_sv (req->callback, G_VOID | G_EVAL);
208 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 }
209 399
210 if (SvTRUE (ERRSV)) 400 if (SvTRUE (ERRSV))
211 { 401 {
212 req_free (req); 402 req_free (req);
213 croak (0); 403 croak (0);
214 } 404 }
215
216 LEAVE;
217
218 errno = errorno;
219} 405}
220 406
221static void req_free (aio_req req) 407static void req_free (aio_req req)
222{ 408{
223 if (req->grp)
224 {
225 aio_req grp = req->grp;
226
227 /* unlink request */
228 req->grp_next->grp_prev = req->grp_prev;
229 req->grp_prev->grp_next = req->grp_next;
230
231 if (grp->grp_next == grp && grp->fd)
232 {
233 req_invoke (grp);
234 req_free (grp);
235 }
236 }
237
238 if (req->self) 409 if (req->self)
239 { 410 {
240 sv_unmagic (req->self, PERL_MAGIC_ext); 411 sv_unmagic (req->self, PERL_MAGIC_ext);
241 SvREFCNT_dec (req->self); 412 SvREFCNT_dec (req->self);
242 } 413 }
243 414
244 if (req->data)
245 SvREFCNT_dec (req->data); 415 SvREFCNT_dec (req->data);
246
247 if (req->fh)
248 SvREFCNT_dec (req->fh); 416 SvREFCNT_dec (req->fh);
249
250 if (req->fh2)
251 SvREFCNT_dec (req->fh2); 417 SvREFCNT_dec (req->fh2);
252
253 if (req->statdata)
254 Safefree (req->statdata);
255
256 if (req->callback)
257 SvREFCNT_dec (req->callback); 418 SvREFCNT_dec (req->callback);
419 Safefree (req->statdata);
258 420
259 if (req->type == REQ_READDIR && req->result >= 0) 421 if (req->type == REQ_READDIR && req->result >= 0)
260 free (req->data2ptr); 422 free (req->data2ptr);
261 423
262 Safefree (req); 424 Safefree (req);
263} 425}
264 426
265static void req_cancel (aio_req req) 427static void req_cancel (aio_req req)
266{ 428{
267 req->cancelled = 1; 429 req->flags |= FLAG_CANCELLED;
268 430
269 if (req->type == REQ_GROUP) 431 if (req->type == REQ_GROUP)
270 { 432 {
271 aio_req sub; 433 aio_req sub;
272 434
273 for (sub = req->grp_next; sub != req; sub = sub->grp_next) 435 for (sub = req->grp_first; sub; sub = sub->grp_next)
274 req_cancel (sub); 436 req_cancel (sub);
275 } 437 }
276} 438}
277 439
278static int poll_cb () 440static int poll_cb ()
283 aio_req req; 445 aio_req req;
284 446
285 for (;;) 447 for (;;)
286 { 448 {
287 pthread_mutex_lock (&reslock); 449 pthread_mutex_lock (&reslock);
288 req = ress; 450 req = reqq_shift (&res_queue);
289 451
290 if (req) 452 if (req)
291 { 453 {
292 ress = req->next;
293
294 if (!ress) 454 if (!res_queue.size)
295 { 455 {
296 /* read any signals sent by the worker threads */ 456 /* read any signals sent by the worker threads */
297 char buf [32]; 457 char buf [32];
298 while (read (respipe [0], buf, 32) == 32) 458 while (read (respipe [0], buf, 32) == 32)
299 ; 459 ;
300
301 rese = 0;
302 } 460 }
303 } 461 }
304 462
305 pthread_mutex_unlock (&reslock); 463 pthread_mutex_unlock (&reslock);
306 464
307 if (!req) 465 if (!req)
308 break; 466 break;
309 467
310 nreqs--; 468 --nreqs;
311 469
312 if (req->type == REQ_QUIT) 470 if (req->type == REQ_QUIT)
313 started--; 471 started--;
314 else if (req->type == REQ_GROUP && req->grp_next != req) 472 else if (req->type == REQ_GROUP && req->length)
315 { 473 {
316 req->fd = 1; /* mark request as delayed */ 474 req->fd = 1; /* mark request as delayed */
317 continue; 475 continue;
318 } 476 }
319 else 477 else
366static void req_send (aio_req req) 524static void req_send (aio_req req)
367{ 525{
368 while (started < wanted && nreqs >= started) 526 while (started < wanted && nreqs >= started)
369 start_thread (); 527 start_thread ();
370 528
371 nreqs++; 529 ++nreqs;
372 530
373 pthread_mutex_lock (&reqlock); 531 pthread_mutex_lock (&reqlock);
374 532 reqq_push (&req_queue, req);
375 req->next = 0;
376
377 if (reqe)
378 {
379 reqe->next = req;
380 reqe = req;
381 }
382 else
383 reqe = reqs = req;
384
385 pthread_cond_signal (&reqwait); 533 pthread_cond_signal (&reqwait);
386 pthread_mutex_unlock (&reqlock); 534 pthread_mutex_unlock (&reqlock);
387 535
388 if (nreqs > max_outstanding) 536 if (nreqs > max_outstanding)
389 for (;;) 537 for (;;)
398} 546}
399 547
400static void end_thread (void) 548static void end_thread (void)
401{ 549{
402 aio_req req; 550 aio_req req;
551
403 Newz (0, req, 1, aio_cb); 552 Newz (0, req, 1, aio_cb);
553
404 req->type = REQ_QUIT; 554 req->type = REQ_QUIT;
555 req->pri = PRI_MAX + PRI_BIAS;
405 556
406 req_send (req); 557 req_send (req);
407} 558}
408 559
409static void min_parallel (int nthreads) 560static void min_parallel (int nthreads)
496#if !HAVE_READAHEAD 647#if !HAVE_READAHEAD
497# define readahead aio_readahead 648# define readahead aio_readahead
498 649
499static ssize_t readahead (int fd, off_t offset, size_t count) 650static ssize_t readahead (int fd, off_t offset, size_t count)
500{ 651{
501 char readahead_buf[4096]; 652 dBUF;
502 653
503 while (count > 0) 654 while (count > 0)
504 { 655 {
505 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 656 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
506 657
507 pread (fd, readahead_buf, len, offset); 658 pread (fd, aio_buf, len, offset);
508 offset += len; 659 offset += len;
509 count -= len; 660 count -= len;
510 } 661 }
662
663 fBUF;
511 664
512 errno = 0; 665 errno = 0;
513} 666}
514#endif 667#endif
515 668
601#endif 754#endif
602 ) 755 )
603 ) 756 )
604 { 757 {
605 /* emulate sendfile. this is a major pain in the ass */ 758 /* emulate sendfile. this is a major pain in the ass */
606 char buf[4096]; 759 dBUF;
760
607 res = 0; 761 res = 0;
608 762
609 while (count) 763 while (count)
610 { 764 {
611 ssize_t cnt; 765 ssize_t cnt;
612 766
613 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 767 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
614 768
615 if (cnt <= 0) 769 if (cnt <= 0)
616 { 770 {
617 if (cnt && !res) res = -1; 771 if (cnt && !res) res = -1;
618 break; 772 break;
619 } 773 }
620 774
621 cnt = write (ofd, buf, cnt); 775 cnt = write (ofd, aio_buf, cnt);
622 776
623 if (cnt <= 0) 777 if (cnt <= 0)
624 { 778 {
625 if (cnt && !res) res = -1; 779 if (cnt && !res) res = -1;
626 break; 780 break;
628 782
629 offset += cnt; 783 offset += cnt;
630 res += cnt; 784 res += cnt;
631 count -= cnt; 785 count -= cnt;
632 } 786 }
787
788 fBUF;
633 } 789 }
634 790
635 return res; 791 return res;
636} 792}
637 793
638/* read a full directory */ 794/* read a full directory */
639static int scandir_ (const char *path, void **namesp) 795static int scandir_ (const char *path, void **namesp)
640{ 796{
641 DIR *dirp = opendir (path); 797 DIR *dirp;
642 union 798 union
643 { 799 {
644 struct dirent d; 800 struct dirent d;
645 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 801 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
646 } u; 802 } *u;
647 struct dirent *entp; 803 struct dirent *entp;
648 char *name, *names; 804 char *name, *names;
649 int memlen = 4096; 805 int memlen = 4096;
650 int memofs = 0; 806 int memofs = 0;
651 int res = 0; 807 int res = 0;
652 int errorno; 808 int errorno;
653 809
810 dirp = opendir (path);
654 if (!dirp) 811 if (!dirp)
655 return -1; 812 return -1;
656 813
814 u = malloc (sizeof (*u));
657 names = malloc (memlen); 815 names = malloc (memlen);
658 816
817 if (u && names)
659 for (;;) 818 for (;;)
660 { 819 {
820 errno = 0;
661 errno = 0, readdir_r (dirp, &u.d, &entp); 821 readdir_r (dirp, &u->d, &entp);
662 822
663 if (!entp) 823 if (!entp)
664 break; 824 break;
665 825
666 name = entp->d_name; 826 name = entp->d_name;
667 827
668 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 828 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
669 { 829 {
670 int len = strlen (name) + 1; 830 int len = strlen (name) + 1;
671 831
672 res++; 832 res++;
673 833
674 while (memofs + len > memlen) 834 while (memofs + len > memlen)
675 { 835 {
676 memlen *= 2; 836 memlen *= 2;
677 names = realloc (names, memlen); 837 names = realloc (names, memlen);
678 if (!names) 838 if (!names)
679 break; 839 break;
680 } 840 }
681 841
682 memcpy (names + memofs, name, len); 842 memcpy (names + memofs, name, len);
683 memofs += len; 843 memofs += len;
684 } 844 }
685 } 845 }
686 846
687 errorno = errno; 847 errorno = errno;
848 free (u);
688 closedir (dirp); 849 closedir (dirp);
689 850
690 if (errorno) 851 if (errorno)
691 { 852 {
692 free (names); 853 free (names);
709 { 870 {
710 pthread_mutex_lock (&reqlock); 871 pthread_mutex_lock (&reqlock);
711 872
712 for (;;) 873 for (;;)
713 { 874 {
714 req = reqs; 875 req = reqq_shift (&req_queue);
715
716 if (reqs)
717 {
718 reqs = reqs->next;
719 if (!reqs) reqe = 0;
720 }
721 876
722 if (req) 877 if (req)
723 break; 878 break;
724 879
725 pthread_cond_wait (&reqwait, &reqlock); 880 pthread_cond_wait (&reqwait, &reqlock);
726 } 881 }
727 882
728 pthread_mutex_unlock (&reqlock); 883 pthread_mutex_unlock (&reqlock);
729 884
730 errno = 0; /* strictly unnecessary */ 885 errno = 0; /* strictly unnecessary */
886 type = req->type; /* remember type for QUIT check */
731 887
732 if (!req->cancelled) 888 if (!(req->flags & FLAG_CANCELLED))
733 switch (req->type) 889 switch (type)
734 { 890 {
735 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;
736 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;
737 893
738 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;
752 908
753 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 909 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
754 case REQ_FSYNC: req->result = fsync (req->fd); break; 910 case REQ_FSYNC: req->result = fsync (req->fd); break;
755 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 911 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
756 912
757 case REQ_SLEEP: 913 case REQ_BUSY:
758 { 914 {
759 struct timeval tv; 915 struct timeval tv;
760 916
761 tv.tv_sec = req->fd; 917 tv.tv_sec = req->fd;
762 tv.tv_usec = req->fd2; 918 tv.tv_usec = req->fd2;
763 919
764 req->result = select (0, 0, 0, 0, &tv); 920 req->result = select (0, 0, 0, 0, &tv);
765 } 921 }
766 922
923 case REQ_GROUP:
924 case REQ_NOP:
767 case REQ_QUIT: 925 case REQ_QUIT:
768 break; 926 break;
769 927
770 default: 928 default:
771 req->result = ENOSYS; 929 req->result = ENOSYS;
774 932
775 req->errorno = errno; 933 req->errorno = errno;
776 934
777 pthread_mutex_lock (&reslock); 935 pthread_mutex_lock (&reslock);
778 936
779 req->next = 0; 937 if (!reqq_push (&res_queue, req))
780
781 if (rese)
782 {
783 rese->next = req;
784 rese = req;
785 }
786 else
787 {
788 rese = ress = req;
789
790 /* write a dummy byte to the pipe so fh becomes ready */ 938 /* write a dummy byte to the pipe so fh becomes ready */
791 write (respipe [1], &respipe, 1); 939 write (respipe [1], &respipe, 1);
792 }
793 940
794 pthread_mutex_unlock (&reslock); 941 pthread_mutex_unlock (&reslock);
795 } 942 }
796 while (type != REQ_QUIT); 943 while (type != REQ_QUIT);
797 944
828{ 975{
829 aio_req prv; 976 aio_req prv;
830 977
831 started = 0; 978 started = 0;
832 979
833 while (reqs) 980 while (prv = reqq_shift (&req_queue))
834 {
835 prv = reqs;
836 reqs = prv->next;
837 req_free (prv); 981 req_free (prv);
838 }
839 982
840 reqs = reqe = 0; 983 while (prv = reqq_shift (&res_queue))
841
842 while (ress)
843 {
844 prv = ress;
845 ress = prv->next;
846 req_free (prv); 984 req_free (prv);
847 } 985
848
849 ress = rese = 0;
850
851 close (respipe [0]); 986 close (respipe [0]);
852 close (respipe [1]); 987 close (respipe [1]);
853 create_pipe (); 988 create_pipe ();
854 989
855 atfork_parent (); 990 atfork_parent ();
856} 991}
857 992
858#define dREQ \ 993#define dREQ \
859 aio_req req; \ 994 aio_req req; \
995 int req_pri = next_pri; \
996 next_pri = DEFAULT_PRI + PRI_BIAS; \
860 \ 997 \
861 if (SvOK (callback) && !SvROK (callback)) \ 998 if (SvOK (callback) && !SvROK (callback)) \
862 croak ("callback must be undef or of reference type"); \ 999 croak ("callback must be undef or of reference type"); \
863 \ 1000 \
864 Newz (0, req, 1, aio_cb); \ 1001 Newz (0, req, 1, aio_cb); \
865 if (!req) \ 1002 if (!req) \
866 croak ("out of memory during aio_req allocation"); \ 1003 croak ("out of memory during aio_req allocation"); \
867 \ 1004 \
868 req->callback = newSVsv (callback) 1005 req->callback = newSVsv (callback); \
1006 req->pri = req_pri
869 1007
870#define REQ_SEND \ 1008#define REQ_SEND \
871 req_send (req); \ 1009 req_send (req); \
872 \ 1010 \
873 if (GIMME_V != G_VOID) \ 1011 if (GIMME_V != G_VOID) \
1127 1265
1128 REQ_SEND; 1266 REQ_SEND;
1129} 1267}
1130 1268
1131void 1269void
1132aio_sleep (delay,callback=&PL_sv_undef) 1270aio_busy (delay,callback=&PL_sv_undef)
1133 double delay 1271 double delay
1134 SV * callback 1272 SV * callback
1135 PPCODE: 1273 PPCODE:
1136{ 1274{
1137 dREQ; 1275 dREQ;
1138 1276
1139 req->type = REQ_SLEEP; 1277 req->type = REQ_BUSY;
1140 req->fd = delay < 0. ? 0 : delay; 1278 req->fd = delay < 0. ? 0 : delay;
1141 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1279 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1142 1280
1143 REQ_SEND; 1281 REQ_SEND;
1144} 1282}
1148 SV * callback 1286 SV * callback
1149 PROTOTYPE: ;$ 1287 PROTOTYPE: ;$
1150 PPCODE: 1288 PPCODE:
1151{ 1289{
1152 dREQ; 1290 dREQ;
1291
1153 req->type = REQ_GROUP; 1292 req->type = REQ_GROUP;
1154 req->grp_next = req;
1155 req->grp_prev = req;
1156
1157 req_send (req); 1293 req_send (req);
1294
1158 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1295 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1159} 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;
1160 1324
1161void 1325void
1162flush () 1326flush ()
1163 PROTOTYPE: 1327 PROTOTYPE:
1164 CODE: 1328 CODE:
1207 CODE: 1371 CODE:
1208 RETVAL = nreqs; 1372 RETVAL = nreqs;
1209 OUTPUT: 1373 OUTPUT:
1210 RETVAL 1374 RETVAL
1211 1375
1376PROTOTYPES: DISABLE
1377
1212MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1378MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1213 1379
1214void 1380void
1215cancel (aio_req_ornot req) 1381cancel (aio_req_ornot req)
1216 PROTOTYPE:
1217 CODE: 1382 CODE:
1218 req_cancel (req); 1383 req_cancel (req);
1219 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
1220MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1391MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1221 1392
1222void 1393void
1223add (aio_req grp, ...) 1394add (aio_req grp, ...)
1224 PROTOTYPE: $;@
1225 PPCODE: 1395 PPCODE:
1226{ 1396{
1227 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");
1228 1402
1229 for (i = 1; i < items; ++i ) 1403 for (i = 1; i < items; ++i )
1230 { 1404 {
1231 if (GIMME_V != G_VOID) 1405 if (GIMME_V != G_VOID)
1232 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1406 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1233 1407
1234 aio_req req = SvAIO_REQ (ST (i)); 1408 req = SvAIO_REQ (ST (i));
1235 1409
1236 if (req) 1410 if (req)
1237 { 1411 {
1238 req->grp_prev = grp; 1412 ++grp->length;
1239 req->grp_next = grp->grp_next;
1240 grp->grp_next->grp_prev = req;
1241 grp->grp_next = req;
1242
1243 req->grp = grp; 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;
1244 } 1422 }
1245 } 1423 }
1246} 1424}
1247 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