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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines