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.48 by root, Sun Oct 22 10:33:19 2006 UTC vs.
Revision 1.75 by root, Thu Oct 26 06:44:48 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines