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.71 by root, Tue Oct 24 16:35:04 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines