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.44 by root, Sat Oct 21 23:20:29 2006 UTC vs.
Revision 1.75 by root, Thu Oct 26 06:44:48 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines