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.47 by root, Sun Oct 22 10:10:23 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC

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