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.57 by root, Mon Oct 23 18:38:15 2006 UTC vs.
Revision 1.77 by root, Thu Oct 26 13:25:40 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines