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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines