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.59 by root, Mon Oct 23 18:56:27 2006 UTC vs.
Revision 1.75 by root, Thu Oct 26 06:44:48 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"
39/* used for struct dirent, AIX doesn't provide it */ 47/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 48#ifndef NAME_MAX
41# define NAME_MAX 4096 49# define NAME_MAX 4096
42#endif 50#endif
43 51
52#ifndef PTHREAD_STACK_MIN
53/* care for broken platforms, e.g. windows */
54# define PTHREAD_STACK_MIN 16384
55#endif
56
44#if __ia64 57#if __ia64
45# define STACKSIZE 65536 58# define STACKSIZE 65536
59#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
60# define STACKSIZE PTHREAD_STACK_MIN
46#else 61#else
47# define STACKSIZE 8192 62# define STACKSIZE 16384
48#endif 63#endif
64
65/* buffer size for various temporary buffers */
66#define AIO_BUFSIZE 65536
67
68#define dBUF \
69 char *aio_buf; \
70 LOCK (wrklock); \
71 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
72 UNLOCK (wrklock); \
73 if (!aio_buf) \
74 return -1;
49 75
50enum { 76enum {
51 REQ_QUIT, 77 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 78 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 79 REQ_READ, REQ_WRITE, REQ_READAHEAD,
56 REQ_FSYNC, REQ_FDATASYNC, 82 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 83 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 84 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 85 REQ_LINK, REQ_SYMLINK,
60 REQ_GROUP, REQ_NOP, 86 REQ_GROUP, REQ_NOP,
61 REQ_SLEEP, 87 REQ_BUSY,
62}; 88};
63 89
64#define AIO_REQ_KLASS "IO::AIO::REQ" 90#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 91#define AIO_GRP_KLASS "IO::AIO::GRP"
66 92
67typedef struct aio_cb 93typedef struct aio_cb
68{ 94{
69 struct aio_cb *volatile next; 95 struct aio_cb *volatile next;
70
71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 96
75 SV *data, *callback; 97 SV *data, *callback;
76 SV *fh, *fh2; 98 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 99 void *dataptr, *data2ptr;
78 Stat_t *statdata; 100 Stat_t *statdata;
79 off_t offset; 101 off_t offset;
80 size_t length; 102 size_t length;
81 ssize_t result; 103 ssize_t result;
82 104
105 STRLEN dataoffset;
83 int type; 106 int type;
84 int fd, fd2; 107 int fd, fd2;
85 int errorno; 108 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 109 mode_t mode; /* open */
110
111 unsigned char flags;
88 unsigned char pri; 112 unsigned char pri;
89 unsigned char flags; 113
114 SV *self; /* the perl counterpart of this request, if any */
115 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
90} aio_cb; 116} aio_cb;
91 117
92enum { 118enum {
93 FLAG_CANCELLED = 0x01, 119 FLAG_CANCELLED = 0x01,
94}; 120};
95 121
96typedef aio_cb *aio_req; 122typedef aio_cb *aio_req;
97typedef aio_cb *aio_req_ornot; 123typedef aio_cb *aio_req_ornot;
98 124
125enum {
126 PRI_MIN = -4,
127 PRI_MAX = 4,
128
129 DEFAULT_PRI = 0,
130 PRI_BIAS = -PRI_MIN,
131 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
132};
133
134static int next_pri = DEFAULT_PRI + PRI_BIAS;
135
99static int started, wanted; 136static int started, wanted;
100static volatile int nreqs; 137static volatile int nreqs;
101static int max_outstanding = 1<<30;
102static int respipe [2]; 138static int respipe [2];
103 139
140#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
141# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
142#else
143# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
144#endif
145
146#define LOCK(mutex) pthread_mutex_lock (&(mutex))
147#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
148
149/* worker threasd management */
150static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
151
152typedef struct worker {
153 /* locked by wrklock */
154 struct worker *prev, *next;
155
156 pthread_t tid;
157
158 /* locked by reslock, reqlock or wrklock */
159 aio_req req; /* currently processed request */
160 void *dbuf;
161 DIR *dirp;
162} worker;
163
164static worker wrk_first = { &wrk_first, &wrk_first, 0 };
165
166static void worker_clear (worker *wrk)
167{
168 if (wrk->dirp)
169 {
170 closedir (wrk->dirp);
171 wrk->dirp = 0;
172 }
173
174 if (wrk->dbuf)
175 {
176 free (wrk->dbuf);
177 wrk->dbuf = 0;
178 }
179}
180
181static void worker_free (worker *wrk)
182{
183 wrk->next->prev = wrk->prev;
184 wrk->prev->next = wrk->next;
185
186 free (wrk);
187}
188
104static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 189static pthread_mutex_t reslock = AIO_MUTEX_INIT;
105static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 190static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
106static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 191static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
107 192
108static volatile aio_req reqs, reqe; /* queue start, queue end */ 193/*
109static volatile aio_req ress, rese; /* queue start, queue end */ 194 * a somewhat faster data structure might be nice, but
195 * with 8 priorities this actually needs <20 insns
196 * per shift, the most expensive operation.
197 */
198typedef struct {
199 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
200 int size;
201} reqq;
110 202
203static reqq req_queue;
204static reqq res_queue;
205
206int reqq_push (reqq *q, aio_req req)
207{
208 int pri = req->pri;
209 req->next = 0;
210
211 if (q->qe[pri])
212 {
213 q->qe[pri]->next = req;
214 q->qe[pri] = req;
215 }
216 else
217 q->qe[pri] = q->qs[pri] = req;
218
219 return q->size++;
220}
221
222aio_req reqq_shift (reqq *q)
223{
224 int pri;
225
226 if (!q->size)
227 return 0;
228
229 --q->size;
230
231 for (pri = NUM_PRI; pri--; )
232 {
233 aio_req req = q->qs[pri];
234
235 if (req)
236 {
237 if (!(q->qs[pri] = req->next))
238 q->qe[pri] = 0;
239
240 return req;
241 }
242 }
243
244 abort ();
245}
246
247static int poll_cb ();
111static void req_invoke (aio_req req); 248static void req_invoke (aio_req req);
112static void req_free (aio_req req); 249static void req_free (aio_req req);
250static void req_cancel (aio_req req);
113 251
114/* must be called at most once */ 252/* must be called at most once */
115static SV *req_sv (aio_req req, const char *klass) 253static SV *req_sv (aio_req req, const char *klass)
116{ 254{
117 if (!req->self) 255 if (!req->self)
148 ENTER; 286 ENTER;
149 SAVETMPS; 287 SAVETMPS;
150 PUSHMARK (SP); 288 PUSHMARK (SP);
151 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 289 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
152 PUTBACK; 290 PUTBACK;
153 call_sv (grp->fh2, G_VOID | G_EVAL); 291 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
154 SPAGAIN; 292 SPAGAIN;
155 FREETMPS; 293 FREETMPS;
156 LEAVE; 294 LEAVE;
157 } 295 }
158 296
181 } 319 }
182} 320}
183 321
184static void poll_wait () 322static void poll_wait ()
185{ 323{
186 if (nreqs && !ress)
187 {
188 fd_set rfd; 324 fd_set rfd;
325
326 while (nreqs)
327 {
328 int size;
329#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
330 LOCK (reslock);
331#endif
332 size = res_queue.size;
333#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
334 UNLOCK (reslock);
335#endif
336
337 if (size)
338 return;
339
189 FD_ZERO(&rfd); 340 FD_ZERO(&rfd);
190 FD_SET(respipe [0], &rfd); 341 FD_SET(respipe [0], &rfd);
191 342
192 select (respipe [0] + 1, &rfd, 0, 0, 0); 343 select (respipe [0] + 1, &rfd, 0, 0, 0);
193 } 344 }
194} 345}
195 346
196static void req_invoke (aio_req req) 347static void req_invoke (aio_req req)
197{ 348{
198 dSP; 349 dSP;
199 int errorno = errno;
200 350
201 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 351 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
202 return; 352 {
203
204 errno = req->errorno; 353 errno = req->errorno;
205 354
206 ENTER; 355 ENTER;
207 SAVETMPS; 356 SAVETMPS;
208 PUSHMARK (SP); 357 PUSHMARK (SP);
209 EXTEND (SP, 1); 358 EXTEND (SP, 1);
210 359
211 switch (req->type) 360 switch (req->type)
212 {
213 case REQ_READDIR:
214 { 361 {
215 SV *rv = &PL_sv_undef; 362 case REQ_READDIR:
216
217 if (req->result >= 0)
218 { 363 {
219 char *buf = req->data2ptr; 364 SV *rv = &PL_sv_undef;
220 AV *av = newAV ();
221 365
222 while (req->result) 366 if (req->result >= 0)
223 { 367 {
368 int i;
369 char *buf = req->data2ptr;
370 AV *av = newAV ();
371
372 av_extend (av, req->result - 1);
373
374 for (i = 0; i < req->result; ++i)
375 {
224 SV *sv = newSVpv (buf, 0); 376 SV *sv = newSVpv (buf, 0);
225 377
226 av_push (av, sv); 378 av_store (av, i, sv);
227 buf += SvCUR (sv) + 1; 379 buf += SvCUR (sv) + 1;
228 req->result--; 380 }
381
382 rv = sv_2mortal (newRV_noinc ((SV *)av));
229 } 383 }
230 384
231 rv = sv_2mortal (newRV_noinc ((SV *)av)); 385 PUSHs (rv);
232 } 386 }
387 break;
233 388
234 PUSHs (rv); 389 case REQ_OPEN:
390 {
391 /* convert fd to fh */
392 SV *fh;
393
394 PUSHs (sv_2mortal (newSViv (req->result)));
395 PUTBACK;
396 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
397 SPAGAIN;
398
399 fh = SvREFCNT_inc (POPs);
400
401 PUSHMARK (SP);
402 XPUSHs (sv_2mortal (fh));
403 }
404 break;
405
406 case REQ_GROUP:
407 req->fd = 2; /* mark group as finished */
408
409 if (req->data)
410 {
411 int i;
412 AV *av = (AV *)req->data;
413
414 EXTEND (SP, AvFILL (av) + 1);
415 for (i = 0; i <= AvFILL (av); ++i)
416 PUSHs (*av_fetch (av, i, 0));
417 }
418 break;
419
420 case REQ_NOP:
421 case REQ_BUSY:
422 break;
423
424 default:
425 PUSHs (sv_2mortal (newSViv (req->result)));
426 break;
235 } 427 }
236 break;
237 428
238 case REQ_OPEN:
239 {
240 /* convert fd to fh */
241 SV *fh;
242 429
243 PUSHs (sv_2mortal (newSViv (req->result)));
244 PUTBACK; 430 PUTBACK;
245 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
246 SPAGAIN;
247
248 fh = SvREFCNT_inc (POPs);
249
250 PUSHMARK (SP);
251 XPUSHs (sv_2mortal (fh));
252 }
253 break;
254
255 case REQ_GROUP:
256 req->fd = 2; /* mark group as finished */
257
258 if (req->data)
259 {
260 int i;
261 AV *av = (AV *)req->data;
262
263 EXTEND (SP, AvFILL (av) + 1);
264 for (i = 0; i <= AvFILL (av); ++i)
265 PUSHs (*av_fetch (av, i, 0));
266 }
267 break;
268
269 case REQ_NOP:
270 case REQ_SLEEP:
271 break;
272
273 default:
274 PUSHs (sv_2mortal (newSViv (req->result)));
275 break;
276 }
277
278
279 PUTBACK;
280 call_sv (req->callback, G_VOID | G_EVAL); 431 call_sv (req->callback, G_VOID | G_EVAL);
281 SPAGAIN; 432 SPAGAIN;
282 433
283 FREETMPS; 434 FREETMPS;
284 LEAVE; 435 LEAVE;
285
286 errno = errorno;
287
288 if (SvTRUE (ERRSV))
289 { 436 }
290 req_free (req);
291 croak (0);
292 }
293}
294 437
295static void req_free (aio_req req)
296{
297 if (req->grp) 438 if (req->grp)
298 { 439 {
299 aio_req grp = req->grp; 440 aio_req grp = req->grp;
300 441
301 /* unlink request */ 442 /* unlink request */
306 grp->grp_first = req->grp_next; 447 grp->grp_first = req->grp_next;
307 448
308 aio_grp_dec (grp); 449 aio_grp_dec (grp);
309 } 450 }
310 451
452 if (SvTRUE (ERRSV))
453 {
454 req_free (req);
455 croak (0);
456 }
457}
458
459static void req_free (aio_req req)
460{
311 if (req->self) 461 if (req->self)
312 { 462 {
313 sv_unmagic (req->self, PERL_MAGIC_ext); 463 sv_unmagic (req->self, PERL_MAGIC_ext);
314 SvREFCNT_dec (req->self); 464 SvREFCNT_dec (req->self);
315 } 465 }
318 SvREFCNT_dec (req->fh); 468 SvREFCNT_dec (req->fh);
319 SvREFCNT_dec (req->fh2); 469 SvREFCNT_dec (req->fh2);
320 SvREFCNT_dec (req->callback); 470 SvREFCNT_dec (req->callback);
321 Safefree (req->statdata); 471 Safefree (req->statdata);
322 472
323 if (req->type == REQ_READDIR && req->result >= 0) 473 if (req->type == REQ_READDIR)
324 free (req->data2ptr); 474 free (req->data2ptr);
325 475
326 Safefree (req); 476 Safefree (req);
327} 477}
328 478
479static void req_cancel_subs (aio_req grp)
480{
481 aio_req sub;
482
483 if (grp->type != REQ_GROUP)
484 return;
485
486 SvREFCNT_dec (grp->fh2);
487 grp->fh2 = 0;
488
489 for (sub = grp->grp_first; sub; sub = sub->grp_next)
490 req_cancel (sub);
491}
492
329static void req_cancel (aio_req req) 493static void req_cancel (aio_req req)
330{ 494{
331 req->flags |= FLAG_CANCELLED; 495 req->flags |= FLAG_CANCELLED;
332 496
333 if (req->type == REQ_GROUP) 497 req_cancel_subs (req);
334 {
335 aio_req sub;
336
337 for (sub = req->grp_first; sub; sub = sub->grp_next)
338 req_cancel (sub);
339 }
340} 498}
341 499
342static int poll_cb () 500static int poll_cb ()
343{ 501{
344 dSP; 502 dSP;
346 int do_croak = 0; 504 int do_croak = 0;
347 aio_req req; 505 aio_req req;
348 506
349 for (;;) 507 for (;;)
350 { 508 {
351 pthread_mutex_lock (&reslock); 509 LOCK (reslock);
352 req = ress; 510 req = reqq_shift (&res_queue);
353 511
354 if (req) 512 if (req)
355 { 513 {
356 ress = req->next;
357
358 if (!ress) 514 if (!res_queue.size)
359 { 515 {
360 /* read any signals sent by the worker threads */ 516 /* read any signals sent by the worker threads */
361 char buf [32]; 517 char buf [32];
362 while (read (respipe [0], buf, 32) == 32) 518 while (read (respipe [0], buf, 32) == 32)
363 ; 519 ;
364
365 rese = 0;
366 } 520 }
367 } 521 }
368 522
369 pthread_mutex_unlock (&reslock); 523 UNLOCK (reslock);
370 524
371 if (!req) 525 if (!req)
372 break; 526 break;
373 527
374 --nreqs; 528 --nreqs;
409static void *aio_proc(void *arg); 563static void *aio_proc(void *arg);
410 564
411static void start_thread (void) 565static void start_thread (void)
412{ 566{
413 sigset_t fullsigset, oldsigset; 567 sigset_t fullsigset, oldsigset;
414 pthread_t tid;
415 pthread_attr_t attr; 568 pthread_attr_t attr;
569
570 worker *wrk = calloc (1, sizeof (worker));
571
572 if (!wrk)
573 croak ("unable to allocate worker thread data");
416 574
417 pthread_attr_init (&attr); 575 pthread_attr_init (&attr);
418 pthread_attr_setstacksize (&attr, STACKSIZE); 576 pthread_attr_setstacksize (&attr, STACKSIZE);
419 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 577 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
420 578
421 sigfillset (&fullsigset); 579 sigfillset (&fullsigset);
580
581 LOCK (wrklock);
422 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 582 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
423 583
424 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 584 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
585 {
586 wrk->prev = &wrk_first;
587 wrk->next = wrk_first.next;
588 wrk_first.next->prev = wrk;
589 wrk_first.next = wrk;
425 started++; 590 started++;
591 }
592 else
593 free (wrk);
426 594
427 sigprocmask (SIG_SETMASK, &oldsigset, 0); 595 sigprocmask (SIG_SETMASK, &oldsigset, 0);
596 UNLOCK (wrklock);
428} 597}
429 598
430static void req_send (aio_req req) 599static void req_send (aio_req req)
431{ 600{
432 while (started < wanted && nreqs >= started) 601 while (started < wanted && nreqs >= started)
433 start_thread (); 602 start_thread ();
434 603
435 ++nreqs; 604 ++nreqs;
436 605
437 pthread_mutex_lock (&reqlock); 606 LOCK (reqlock);
438 607 reqq_push (&req_queue, req);
439 req->next = 0;
440
441 if (reqe)
442 {
443 reqe->next = req;
444 reqe = req;
445 }
446 else
447 reqe = reqs = req;
448
449 pthread_cond_signal (&reqwait); 608 pthread_cond_signal (&reqwait);
450 pthread_mutex_unlock (&reqlock); 609 UNLOCK (reqlock);
451
452 if (nreqs > max_outstanding)
453 for (;;)
454 {
455 poll_cb ();
456
457 if (nreqs <= max_outstanding)
458 break;
459
460 poll_wait ();
461 }
462} 610}
463 611
464static void end_thread (void) 612static void end_thread (void)
465{ 613{
466 aio_req req; 614 aio_req req;
615
467 Newz (0, req, 1, aio_cb); 616 Newz (0, req, 1, aio_cb);
617
468 req->type = REQ_QUIT; 618 req->type = REQ_QUIT;
619 req->pri = PRI_MAX + PRI_BIAS;
469 620
470 req_send (req); 621 req_send (req);
471} 622}
472 623
473static void min_parallel (int nthreads) 624static void min_parallel (int nthreads)
525static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 676static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
526{ 677{
527 ssize_t res; 678 ssize_t res;
528 off_t ooffset; 679 off_t ooffset;
529 680
530 pthread_mutex_lock (&preadwritelock); 681 LOCK (preadwritelock);
531 ooffset = lseek (fd, 0, SEEK_CUR); 682 ooffset = lseek (fd, 0, SEEK_CUR);
532 lseek (fd, offset, SEEK_SET); 683 lseek (fd, offset, SEEK_SET);
533 res = read (fd, buf, count); 684 res = read (fd, buf, count);
534 lseek (fd, ooffset, SEEK_SET); 685 lseek (fd, ooffset, SEEK_SET);
535 pthread_mutex_unlock (&preadwritelock); 686 UNLOCK (preadwritelock);
536 687
537 return res; 688 return res;
538} 689}
539 690
540static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 691static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
541{ 692{
542 ssize_t res; 693 ssize_t res;
543 off_t ooffset; 694 off_t ooffset;
544 695
545 pthread_mutex_lock (&preadwritelock); 696 LOCK (preadwritelock);
546 ooffset = lseek (fd, 0, SEEK_CUR); 697 ooffset = lseek (fd, 0, SEEK_CUR);
547 lseek (fd, offset, SEEK_SET); 698 lseek (fd, offset, SEEK_SET);
548 res = write (fd, buf, count); 699 res = write (fd, buf, count);
549 lseek (fd, offset, SEEK_SET); 700 lseek (fd, offset, SEEK_SET);
550 pthread_mutex_unlock (&preadwritelock); 701 UNLOCK (preadwritelock);
551 702
552 return res; 703 return res;
553} 704}
554#endif 705#endif
555 706
556#if !HAVE_FDATASYNC 707#if !HAVE_FDATASYNC
557# define fdatasync fsync 708# define fdatasync fsync
558#endif 709#endif
559 710
560#if !HAVE_READAHEAD 711#if !HAVE_READAHEAD
561# define readahead aio_readahead 712# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
562 713
563static ssize_t readahead (int fd, off_t offset, size_t count) 714static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
564{ 715{
565 char readahead_buf[4096]; 716 dBUF;
566 717
567 while (count > 0) 718 while (count > 0)
568 { 719 {
569 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 720 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
570 721
571 pread (fd, readahead_buf, len, offset); 722 pread (fd, aio_buf, len, offset);
572 offset += len; 723 offset += len;
573 count -= len; 724 count -= len;
574 } 725 }
575 726
576 errno = 0; 727 errno = 0;
577} 728}
729
578#endif 730#endif
579 731
580#if !HAVE_READDIR_R 732#if !HAVE_READDIR_R
581# define readdir_r aio_readdir_r 733# define readdir_r aio_readdir_r
582 734
585static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 737static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
586{ 738{
587 struct dirent *e; 739 struct dirent *e;
588 int errorno; 740 int errorno;
589 741
590 pthread_mutex_lock (&readdirlock); 742 LOCK (readdirlock);
591 743
592 e = readdir (dirp); 744 e = readdir (dirp);
593 errorno = errno; 745 errorno = errno;
594 746
595 if (e) 747 if (e)
598 strcpy (ent->d_name, e->d_name); 750 strcpy (ent->d_name, e->d_name);
599 } 751 }
600 else 752 else
601 *res = 0; 753 *res = 0;
602 754
603 pthread_mutex_unlock (&readdirlock); 755 UNLOCK (readdirlock);
604 756
605 errno = errorno; 757 errno = errorno;
606 return e ? 0 : -1; 758 return e ? 0 : -1;
607} 759}
608#endif 760#endif
609 761
610/* sendfile always needs emulation */ 762/* sendfile always needs emulation */
611static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 763static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
612{ 764{
613 ssize_t res; 765 ssize_t res;
614 766
615 if (!count) 767 if (!count)
616 return 0; 768 return 0;
665#endif 817#endif
666 ) 818 )
667 ) 819 )
668 { 820 {
669 /* emulate sendfile. this is a major pain in the ass */ 821 /* emulate sendfile. this is a major pain in the ass */
670 char buf[4096]; 822 dBUF;
823
671 res = 0; 824 res = 0;
672 825
673 while (count) 826 while (count)
674 { 827 {
675 ssize_t cnt; 828 ssize_t cnt;
676 829
677 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 830 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
678 831
679 if (cnt <= 0) 832 if (cnt <= 0)
680 { 833 {
681 if (cnt && !res) res = -1; 834 if (cnt && !res) res = -1;
682 break; 835 break;
683 } 836 }
684 837
685 cnt = write (ofd, buf, cnt); 838 cnt = write (ofd, aio_buf, cnt);
686 839
687 if (cnt <= 0) 840 if (cnt <= 0)
688 { 841 {
689 if (cnt && !res) res = -1; 842 if (cnt && !res) res = -1;
690 break; 843 break;
698 851
699 return res; 852 return res;
700} 853}
701 854
702/* read a full directory */ 855/* read a full directory */
703static int scandir_ (const char *path, void **namesp) 856static void scandir_ (aio_req req, worker *self)
704{ 857{
705 DIR *dirp = opendir (path); 858 DIR *dirp;
706 union 859 union
707 { 860 {
708 struct dirent d; 861 struct dirent d;
709 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 862 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
710 } u; 863 } *u;
711 struct dirent *entp; 864 struct dirent *entp;
712 char *name, *names; 865 char *name, *names;
713 int memlen = 4096; 866 int memlen = 4096;
714 int memofs = 0; 867 int memofs = 0;
715 int res = 0; 868 int res = 0;
716 int errorno; 869 int errorno;
717 870
718 if (!dirp) 871 LOCK (wrklock);
719 return -1; 872 self->dirp = dirp = opendir (req->dataptr);
873 self->dbuf = u = malloc (sizeof (*u));
874 UNLOCK (wrklock);
720 875
721 names = malloc (memlen); 876 req->data2ptr = names = malloc (memlen);
722 877
878 if (dirp && u && names)
723 for (;;) 879 for (;;)
724 { 880 {
881 errno = 0;
725 errno = 0, readdir_r (dirp, &u.d, &entp); 882 readdir_r (dirp, &u->d, &entp);
726 883
727 if (!entp) 884 if (!entp)
728 break; 885 break;
729 886
730 name = entp->d_name; 887 name = entp->d_name;
731 888
732 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 889 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
733 { 890 {
734 int len = strlen (name) + 1; 891 int len = strlen (name) + 1;
735 892
736 res++; 893 res++;
737 894
738 while (memofs + len > memlen) 895 while (memofs + len > memlen)
739 { 896 {
740 memlen *= 2; 897 memlen *= 2;
898 LOCK (wrklock);
741 names = realloc (names, memlen); 899 req->data2ptr = names = realloc (names, memlen);
900 UNLOCK (wrklock);
901
742 if (!names) 902 if (!names)
743 break; 903 break;
744 } 904 }
745 905
746 memcpy (names + memofs, name, len); 906 memcpy (names + memofs, name, len);
747 memofs += len; 907 memofs += len;
748 } 908 }
749 } 909 }
750 910
751 errorno = errno;
752 closedir (dirp);
753
754 if (errorno) 911 if (errno)
755 {
756 free (names);
757 errno = errorno;
758 res = -1; 912 res = -1;
759 } 913
760 914 req->result = res;
761 *namesp = (void *)names;
762 return res;
763} 915}
764 916
765/*****************************************************************************/ 917/*****************************************************************************/
766 918
767static void *aio_proc (void *thr_arg) 919static void *aio_proc (void *thr_arg)
768{ 920{
769 aio_req req; 921 aio_req req;
770 int type; 922 int type;
923 worker *self = (worker *)thr_arg;
771 924
772 do 925 do
773 { 926 {
774 pthread_mutex_lock (&reqlock); 927 LOCK (reqlock);
775 928
776 for (;;) 929 for (;;)
777 { 930 {
778 req = reqs; 931 self->req = req = reqq_shift (&req_queue);
779
780 if (reqs)
781 {
782 reqs = reqs->next;
783 if (!reqs) reqe = 0;
784 }
785 932
786 if (req) 933 if (req)
787 break; 934 break;
788 935
789 pthread_cond_wait (&reqwait, &reqlock); 936 pthread_cond_wait (&reqwait, &reqlock);
790 } 937 }
791 938
792 pthread_mutex_unlock (&reqlock); 939 UNLOCK (reqlock);
793 940
794 errno = 0; /* strictly unnecessary */ 941 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
795 943
796 if (!(req->flags & FLAG_CANCELLED)) 944 if (!(req->flags & FLAG_CANCELLED))
797 switch (type = req->type) /* remember type for QUIT check */ 945 switch (type)
798 { 946 {
799 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
800 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 948 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
801 949
802 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
803 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 951 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
804 952
805 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
806 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
807 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
808 956
814 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
815 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
816 964
817 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
818 case REQ_FSYNC: req->result = fsync (req->fd); break; 966 case REQ_FSYNC: req->result = fsync (req->fd); break;
819 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 967 case REQ_READDIR: scandir_ (req, self); break;
820 968
821 case REQ_SLEEP: 969 case REQ_BUSY:
822 { 970 {
823 struct timeval tv; 971 struct timeval tv;
824 972
825 tv.tv_sec = req->fd; 973 tv.tv_sec = req->fd;
826 tv.tv_usec = req->fd2; 974 tv.tv_usec = req->fd2;
838 break; 986 break;
839 } 987 }
840 988
841 req->errorno = errno; 989 req->errorno = errno;
842 990
843 pthread_mutex_lock (&reslock); 991 LOCK (reslock);
844 992
845 req->next = 0; 993 if (!reqq_push (&res_queue, req))
846
847 if (rese)
848 {
849 rese->next = req;
850 rese = req;
851 }
852 else
853 {
854 rese = ress = req;
855
856 /* write a dummy byte to the pipe so fh becomes ready */ 994 /* write a dummy byte to the pipe so fh becomes ready */
857 write (respipe [1], &respipe, 1); 995 write (respipe [1], &respipe, 1);
858 }
859 996
860 pthread_mutex_unlock (&reslock); 997 self->req = 0;
998 worker_clear (self);
999
1000 UNLOCK (reslock);
861 } 1001 }
862 while (type != REQ_QUIT); 1002 while (type != REQ_QUIT);
863 1003
1004 LOCK (wrklock);
1005 worker_free (self);
1006 UNLOCK (wrklock);
1007
864 return 0; 1008 return 0;
865} 1009}
866 1010
867/*****************************************************************************/ 1011/*****************************************************************************/
868 1012
869static void atfork_prepare (void) 1013static void atfork_prepare (void)
870{ 1014{
871 pthread_mutex_lock (&reqlock); 1015 LOCK (wrklock);
872 pthread_mutex_lock (&reslock); 1016 LOCK (reqlock);
1017 LOCK (reslock);
873#if !HAVE_PREADWRITE 1018#if !HAVE_PREADWRITE
874 pthread_mutex_lock (&preadwritelock); 1019 LOCK (preadwritelock);
875#endif 1020#endif
876#if !HAVE_READDIR_R 1021#if !HAVE_READDIR_R
877 pthread_mutex_lock (&readdirlock); 1022 LOCK (readdirlock);
878#endif 1023#endif
879} 1024}
880 1025
881static void atfork_parent (void) 1026static void atfork_parent (void)
882{ 1027{
883#if !HAVE_READDIR_R 1028#if !HAVE_READDIR_R
884 pthread_mutex_unlock (&readdirlock); 1029 UNLOCK (readdirlock);
885#endif 1030#endif
886#if !HAVE_PREADWRITE 1031#if !HAVE_PREADWRITE
887 pthread_mutex_unlock (&preadwritelock); 1032 UNLOCK (preadwritelock);
888#endif 1033#endif
889 pthread_mutex_unlock (&reslock); 1034 UNLOCK (reslock);
890 pthread_mutex_unlock (&reqlock); 1035 UNLOCK (reqlock);
1036 UNLOCK (wrklock);
891} 1037}
892 1038
893static void atfork_child (void) 1039static void atfork_child (void)
894{ 1040{
895 aio_req prv; 1041 aio_req prv;
896 1042
1043 while (prv = reqq_shift (&req_queue))
1044 req_free (prv);
1045
1046 while (prv = reqq_shift (&res_queue))
1047 req_free (prv);
1048
1049 while (wrk_first.next != &wrk_first)
1050 {
1051 worker *wrk = wrk_first.next;
1052
1053 if (wrk->req)
1054 req_free (wrk->req);
1055
1056 worker_clear (wrk);
1057 worker_free (wrk);
1058 }
1059
897 started = 0; 1060 started = 0;
898 1061 nreqs = 0;
899 while (reqs)
900 {
901 prv = reqs;
902 reqs = prv->next;
903 req_free (prv);
904 }
905
906 reqs = reqe = 0;
907
908 while (ress)
909 {
910 prv = ress;
911 ress = prv->next;
912 req_free (prv);
913 }
914
915 ress = rese = 0;
916 1062
917 close (respipe [0]); 1063 close (respipe [0]);
918 close (respipe [1]); 1064 close (respipe [1]);
919 create_pipe (); 1065 create_pipe ();
920 1066
921 atfork_parent (); 1067 atfork_parent ();
922} 1068}
923 1069
924#define dREQ \ 1070#define dREQ \
925 aio_req req; \ 1071 aio_req req; \
1072 int req_pri = next_pri; \
1073 next_pri = DEFAULT_PRI + PRI_BIAS; \
926 \ 1074 \
927 if (SvOK (callback) && !SvROK (callback)) \ 1075 if (SvOK (callback) && !SvROK (callback)) \
928 croak ("callback must be undef or of reference type"); \ 1076 croak ("callback must be undef or of reference type"); \
929 \ 1077 \
930 Newz (0, req, 1, aio_cb); \ 1078 Newz (0, req, 1, aio_cb); \
931 if (!req) \ 1079 if (!req) \
932 croak ("out of memory during aio_req allocation"); \ 1080 croak ("out of memory during aio_req allocation"); \
933 \ 1081 \
934 req->callback = newSVsv (callback) 1082 req->callback = newSVsv (callback); \
1083 req->pri = req_pri
935 1084
936#define REQ_SEND \ 1085#define REQ_SEND \
937 req_send (req); \ 1086 req_send (req); \
938 \ 1087 \
939 if (GIMME_V != G_VOID) \ 1088 if (GIMME_V != G_VOID) \
961 1110
962void 1111void
963max_parallel (nthreads) 1112max_parallel (nthreads)
964 int nthreads 1113 int nthreads
965 PROTOTYPE: $ 1114 PROTOTYPE: $
966
967int
968max_outstanding (nreqs)
969 int nreqs
970 PROTOTYPE: $
971 CODE:
972 RETVAL = max_outstanding;
973 max_outstanding = nreqs;
974 1115
975void 1116void
976aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1117aio_open (pathname,flags,mode,callback=&PL_sv_undef)
977 SV * pathname 1118 SV * pathname
978 int flags 1119 int flags
1193 1334
1194 REQ_SEND; 1335 REQ_SEND;
1195} 1336}
1196 1337
1197void 1338void
1198aio_sleep (delay,callback=&PL_sv_undef) 1339aio_busy (delay,callback=&PL_sv_undef)
1199 double delay 1340 double delay
1200 SV * callback 1341 SV * callback
1201 PPCODE: 1342 PPCODE:
1202{ 1343{
1203 dREQ; 1344 dREQ;
1204 1345
1205 req->type = REQ_SLEEP; 1346 req->type = REQ_BUSY;
1206 req->fd = delay < 0. ? 0 : delay; 1347 req->fd = delay < 0. ? 0 : delay;
1207 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1208 1349
1209 REQ_SEND; 1350 REQ_SEND;
1210} 1351}
1214 SV * callback 1355 SV * callback
1215 PROTOTYPE: ;$ 1356 PROTOTYPE: ;$
1216 PPCODE: 1357 PPCODE:
1217{ 1358{
1218 dREQ; 1359 dREQ;
1360
1219 req->type = REQ_GROUP; 1361 req->type = REQ_GROUP;
1220 req_send (req); 1362 req_send (req);
1363
1221 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1364 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1222} 1365}
1223 1366
1224void 1367void
1225aio_nop (callback=&PL_sv_undef) 1368aio_nop (callback=&PL_sv_undef)
1230 1373
1231 req->type = REQ_NOP; 1374 req->type = REQ_NOP;
1232 1375
1233 REQ_SEND; 1376 REQ_SEND;
1234} 1377}
1378
1379void
1380aioreq_pri (int pri = DEFAULT_PRI)
1381 CODE:
1382 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS;
1385
1386void
1387aioreq_nice (int nice = 0)
1388 CODE:
1389 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS;
1235 1393
1236void 1394void
1237flush () 1395flush ()
1238 PROTOTYPE: 1396 PROTOTYPE:
1239 CODE: 1397 CODE:
1288 1446
1289MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1447MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1290 1448
1291void 1449void
1292cancel (aio_req_ornot req) 1450cancel (aio_req_ornot req)
1293 PROTOTYPE:
1294 CODE: 1451 CODE:
1295 req_cancel (req); 1452 req_cancel (req);
1296 1453
1297void 1454void
1298cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1455cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1334 } 1491 }
1335 } 1492 }
1336} 1493}
1337 1494
1338void 1495void
1496cancel_subs (aio_req_ornot req)
1497 CODE:
1498 req_cancel_subs (req);
1499
1500void
1339result (aio_req grp, ...) 1501result (aio_req grp, ...)
1340 CODE: 1502 CODE:
1341{ 1503{
1342 int i; 1504 int i;
1343 AV *av = newAV (); 1505 AV *av = newAV ();
1348 SvREFCNT_dec (grp->data); 1510 SvREFCNT_dec (grp->data);
1349 grp->data = (SV *)av; 1511 grp->data = (SV *)av;
1350} 1512}
1351 1513
1352void 1514void
1353feed_limit (aio_req grp, int limit) 1515limit (aio_req grp, int limit)
1354 CODE: 1516 CODE:
1355 grp->fd2 = limit; 1517 grp->fd2 = limit;
1356 aio_grp_feed (grp); 1518 aio_grp_feed (grp);
1357 1519
1358void 1520void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines