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.43 by root, Sat Oct 21 23:06:04 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,
81 REQ_GROUP, REQ_NOP,
82 REQ_BUSY,
58}; 83};
59 84
60#define AIO_CB_KLASS "IO::AIO::CB" 85#define AIO_REQ_KLASS "IO::AIO::REQ"
86#define AIO_GRP_KLASS "IO::AIO::GRP"
61 87
62typedef struct aio_cb 88typedef struct aio_cb
63{ 89{
64 struct aio_cb *grp_prev, *grp_next;
65 struct aio_grp *grp;
66
67 struct aio_cb *volatile next; 90 struct aio_cb *volatile next;
68
69 SV *self; /* the perl counterpart of this request, if any */
70 91
71 SV *data, *callback; 92 SV *data, *callback;
72 SV *fh, *fh2; 93 SV *fh, *fh2;
73 void *dataptr, *data2ptr; 94 void *dataptr, *data2ptr;
74 Stat_t *statdata; 95 Stat_t *statdata;
75 off_t offset; 96 off_t offset;
76 size_t length; 97 size_t length;
77 ssize_t result; 98 ssize_t result;
78 99
100 STRLEN dataoffset;
79 int type; 101 int type;
80 int fd, fd2; 102 int fd, fd2;
81 int errorno; 103 int errorno;
82 STRLEN dataoffset;
83 mode_t mode; /* open */ 104 mode_t mode; /* open */
105
84 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;
85} aio_cb; 111} aio_cb;
112
113enum {
114 FLAG_CANCELLED = 0x01,
115};
86 116
87typedef aio_cb *aio_req; 117typedef aio_cb *aio_req;
88typedef 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;
89 130
90static int started, wanted; 131static int started, wanted;
91static volatile int nreqs; 132static volatile int nreqs;
92static int max_outstanding = 1<<30; 133static int max_outstanding = 1<<30;
93static int respipe [2]; 134static int respipe [2];
94 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
95static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 185static pthread_mutex_t reslock = AIO_MUTEX_INIT;
96static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 186static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
97static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 187static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
98 188
99static volatile aio_req reqs, reqe; /* queue start, queue end */ 189/*
100static volatile aio_req ress, rese; /* queue start, queue end */ 190 * a somewhat faster data structure might be nice, but
101 191 * with 8 priorities this actually needs <20 insns
192 * per shift, the most expensive operation.
193 */
102typedef struct aio_grp 194typedef struct {
103{ 195 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
104 struct aio_cb *first, *last; 196 int size;
105 SV *callback; 197} reqq;
106 int busycount;
107} aio_grp;
108 198
109static void aio_grp_begin (aio_grp *grp) 199static reqq req_queue;
110{ 200static reqq res_queue;
111 ++grp->busycount;
112}
113 201
114static void aio_grp_end (aio_grp *grp) 202int reqq_push (reqq *q, aio_req req)
115{ 203{
116 --grp->busycount; 204 int pri = req->pri;
205 req->next = 0;
117 206
118 if (grp->busycount) 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)
119 return; 223 return 0;
120 224
121 SvREFCNT_dec (grp->callback); 225 --q->size;
122 grp->callback = 0;
123}
124 226
125static aio_grp *aio_grp_new () 227 for (pri = NUM_PRI; pri--; )
126{ 228 {
127 aio_grp *grp; 229 aio_req req = q->qs[pri];
128 230
129 Newz (0, grp, 1, aio_grp); 231 if (req)
130 aio_grp_begin (grp); 232 {
233 if (!(q->qs[pri] = req->next))
234 q->qe[pri] = 0;
131 235
132 return grp; 236 return req;
237 }
238 }
239
240 abort ();
133} 241}
242
243static void req_invoke (aio_req req);
244static void req_free (aio_req req);
134 245
135/* must be called at most once */ 246/* must be called at most once */
136static SV *req_sv (aio_req req) 247static SV *req_sv (aio_req req, const char *klass)
137{ 248{
249 if (!req->self)
250 {
138 req->self = (SV *)newHV (); 251 req->self = (SV *)newHV ();
139 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 252 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
253 }
140 254
141 return sv_bless (newRV_noinc (req->self), gv_stashpv (AIO_CB_KLASS, 1)); 255 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
142} 256}
143 257
144static aio_req SvAIO_REQ (SV *sv) 258static aio_req SvAIO_REQ (SV *sv)
145{ 259{
260 MAGIC *mg;
261
146 if (!sv_derived_from (sv, AIO_CB_KLASS) || !SvROK (sv)) 262 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
147 croak ("object of class " AIO_CB_KLASS " expected"); 263 croak ("object of class " AIO_REQ_KLASS " expected");
148 264
149 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 265 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
150 266
151 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 }
152} 451}
153 452
154static void req_free (aio_req req) 453static void req_free (aio_req req)
155{ 454{
156 if (req->self) 455 if (req->self)
157 { 456 {
158 sv_unmagic (req->self, PERL_MAGIC_ext); 457 sv_unmagic (req->self, PERL_MAGIC_ext);
159 SvREFCNT_dec (req->self); 458 SvREFCNT_dec (req->self);
160 } 459 }
161 460
162 if (req->data)
163 SvREFCNT_dec (req->data); 461 SvREFCNT_dec (req->data);
164
165 if (req->fh)
166 SvREFCNT_dec (req->fh); 462 SvREFCNT_dec (req->fh);
167
168 if (req->fh2)
169 SvREFCNT_dec (req->fh2); 463 SvREFCNT_dec (req->fh2);
170
171 if (req->statdata)
172 Safefree (req->statdata);
173
174 if (req->callback)
175 SvREFCNT_dec (req->callback); 464 SvREFCNT_dec (req->callback);
465 Safefree (req->statdata);
176 466
177 if (req->type == REQ_READDIR && req->result >= 0) 467 if (req->type == REQ_READDIR)
178 free (req->data2ptr); 468 free (req->data2ptr);
179 469
180 Safefree (req); 470 Safefree (req);
181} 471}
182 472
183static void 473static void req_cancel (aio_req req)
184poll_wait ()
185{ 474{
186 if (nreqs && !ress) 475 req->flags |= FLAG_CANCELLED;
187 {
188 fd_set rfd;
189 FD_ZERO(&rfd);
190 FD_SET(respipe [0], &rfd);
191 476
192 select (respipe [0] + 1, &rfd, 0, 0, 0); 477 if (req->type == REQ_GROUP)
193 } 478 {
194} 479 aio_req sub;
195 480
196static int 481 for (sub = req->grp_first; sub; sub = sub->grp_next)
197poll_cb () 482 req_cancel (sub);
483 }
484}
485
486static int poll_cb ()
198{ 487{
199 dSP; 488 dSP;
200 int count = 0; 489 int count = 0;
201 int do_croak = 0; 490 int do_croak = 0;
202 aio_req req; 491 aio_req req;
203 492
204 for (;;) 493 for (;;)
205 { 494 {
206 pthread_mutex_lock (&reslock); 495 LOCK (reslock);
207 req = ress; 496 req = reqq_shift (&res_queue);
208 497
209 if (req) 498 if (req)
210 { 499 {
211 ress = req->next;
212
213 if (!ress) 500 if (!res_queue.size)
214 { 501 {
215 /* read any signals sent by the worker threads */ 502 /* read any signals sent by the worker threads */
216 char buf [32]; 503 char buf [32];
217 while (read (respipe [0], buf, 32) == 32) 504 while (read (respipe [0], buf, 32) == 32)
218 ; 505 ;
219
220 rese = 0;
221 } 506 }
222 } 507 }
223 508
224 pthread_mutex_unlock (&reslock); 509 UNLOCK (reslock);
225 510
226 if (!req) 511 if (!req)
227 break; 512 break;
228 513
229 nreqs--; 514 --nreqs;
230 515
231 if (req->type == REQ_QUIT) 516 if (req->type == REQ_QUIT)
232 started--; 517 started--;
518 else if (req->type == REQ_GROUP && req->length)
519 {
520 req->fd = 1; /* mark request as delayed */
521 continue;
522 }
233 else 523 else
234 { 524 {
235 int errorno = errno;
236 errno = req->errorno;
237
238 if (req->type == REQ_READ) 525 if (req->type == REQ_READ)
239 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));
240 527
241 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) 528 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
242 SvREADONLY_off (req->data); 529 SvREADONLY_off (req->data);
246 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 533 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
247 PL_laststatval = req->result; 534 PL_laststatval = req->result;
248 PL_statcache = *(req->statdata); 535 PL_statcache = *(req->statdata);
249 } 536 }
250 537
251 ENTER; 538 req_invoke (req);
252 PUSHMARK (SP);
253 539
254 if (req->type == REQ_READDIR)
255 {
256 SV *rv = &PL_sv_undef;
257
258 if (req->result >= 0)
259 {
260 char *buf = req->data2ptr;
261 AV *av = newAV ();
262
263 while (req->result)
264 {
265 SV *sv = newSVpv (buf, 0);
266
267 av_push (av, sv);
268 buf += SvCUR (sv) + 1;
269 req->result--;
270 }
271
272 rv = sv_2mortal (newRV_noinc ((SV *)av));
273 }
274
275 XPUSHs (rv);
276 }
277 else
278 {
279 XPUSHs (sv_2mortal (newSViv (req->result)));
280
281 if (req->type == REQ_OPEN)
282 {
283 /* convert fd to fh */
284 SV *fh;
285
286 PUTBACK;
287 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
288 SPAGAIN;
289
290 fh = SvREFCNT_inc (POPs);
291
292 PUSHMARK (SP);
293 XPUSHs (sv_2mortal (fh));
294 }
295 }
296
297 if (SvOK (req->callback) && !req->cancelled)
298 {
299 PUTBACK;
300 call_sv (req->callback, G_VOID | G_EVAL);
301 SPAGAIN;
302
303 if (SvTRUE (ERRSV))
304 {
305 req_free (req);
306 croak (0);
307 }
308 }
309
310 LEAVE;
311
312 errno = errorno;
313 count++; 540 count++;
314 } 541 }
315 542
316 req_free (req); 543 req_free (req);
317 } 544 }
319 return count; 546 return count;
320} 547}
321 548
322static void *aio_proc(void *arg); 549static void *aio_proc(void *arg);
323 550
324static void
325start_thread (void) 551static void start_thread (void)
326{ 552{
553 worker *wrk = calloc (1, sizeof (worker));
554
555 if (!wrk)
556 croak ("unable to allocate worker thread data");
557
327 sigset_t fullsigset, oldsigset; 558 sigset_t fullsigset, oldsigset;
328 pthread_t tid;
329 pthread_attr_t attr; 559 pthread_attr_t attr;
330 560
331 pthread_attr_init (&attr); 561 pthread_attr_init (&attr);
332 pthread_attr_setstacksize (&attr, STACKSIZE); 562 pthread_attr_setstacksize (&attr, STACKSIZE);
333 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 563 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
334 564
335 sigfillset (&fullsigset); 565 sigfillset (&fullsigset);
566
567 LOCK (wrklock);
336 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 568 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
337 569
338 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;
339 started++; 576 started++;
577 }
578 else
579 free (wrk);
340 580
341 sigprocmask (SIG_SETMASK, &oldsigset, 0); 581 sigprocmask (SIG_SETMASK, &oldsigset, 0);
582 UNLOCK (wrklock);
342} 583}
343 584
344static void
345req_send (aio_req req) 585static void req_send (aio_req req)
346{ 586{
347 while (started < wanted && nreqs >= started) 587 while (started < wanted && nreqs >= started)
348 start_thread (); 588 start_thread ();
349 589
350 nreqs++; 590 ++nreqs;
351 591
352 pthread_mutex_lock (&reqlock); 592 LOCK (reqlock);
353 593 reqq_push (&req_queue, req);
354 req->next = 0;
355
356 if (reqe)
357 {
358 reqe->next = req;
359 reqe = req;
360 }
361 else
362 reqe = reqs = req;
363
364 pthread_cond_signal (&reqwait); 594 pthread_cond_signal (&reqwait);
365 pthread_mutex_unlock (&reqlock); 595 UNLOCK (reqlock);
366 596
367 if (nreqs > max_outstanding) 597 if (nreqs > max_outstanding)
368 for (;;) 598 for (;;)
369 { 599 {
370 poll_cb (); 600 poll_cb ();
374 604
375 poll_wait (); 605 poll_wait ();
376 } 606 }
377} 607}
378 608
379static void 609static void end_thread (void)
380end_thread (void)
381{ 610{
382 aio_req req; 611 aio_req req;
612
383 Newz (0, req, 1, aio_cb); 613 Newz (0, req, 1, aio_cb);
614
384 req->type = REQ_QUIT; 615 req->type = REQ_QUIT;
616 req->pri = PRI_MAX + PRI_BIAS;
385 617
386 req_send (req); 618 req_send (req);
387} 619}
388 620
389static void min_parallel (int nthreads) 621static void min_parallel (int nthreads)
436 * 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,
437 * but that's your problem, not mine. 669 * but that's your problem, not mine.
438 */ 670 */
439static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 671static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
440 672
441static ssize_t 673static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
442pread (int fd, void *buf, size_t count, off_t offset)
443{ 674{
444 ssize_t res; 675 ssize_t res;
445 off_t ooffset; 676 off_t ooffset;
446 677
447 pthread_mutex_lock (&preadwritelock); 678 LOCK (preadwritelock);
448 ooffset = lseek (fd, 0, SEEK_CUR); 679 ooffset = lseek (fd, 0, SEEK_CUR);
449 lseek (fd, offset, SEEK_SET); 680 lseek (fd, offset, SEEK_SET);
450 res = read (fd, buf, count); 681 res = read (fd, buf, count);
451 lseek (fd, ooffset, SEEK_SET); 682 lseek (fd, ooffset, SEEK_SET);
452 pthread_mutex_unlock (&preadwritelock); 683 UNLOCK (preadwritelock);
453 684
454 return res; 685 return res;
455} 686}
456 687
457static ssize_t
458pwrite (int fd, void *buf, size_t count, off_t offset) 688static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
459{ 689{
460 ssize_t res; 690 ssize_t res;
461 off_t ooffset; 691 off_t ooffset;
462 692
463 pthread_mutex_lock (&preadwritelock); 693 LOCK (preadwritelock);
464 ooffset = lseek (fd, 0, SEEK_CUR); 694 ooffset = lseek (fd, 0, SEEK_CUR);
465 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
466 res = write (fd, buf, count); 696 res = write (fd, buf, count);
467 lseek (fd, offset, SEEK_SET); 697 lseek (fd, offset, SEEK_SET);
468 pthread_mutex_unlock (&preadwritelock); 698 UNLOCK (preadwritelock);
469 699
470 return res; 700 return res;
471} 701}
472#endif 702#endif
473 703
476#endif 706#endif
477 707
478#if !HAVE_READAHEAD 708#if !HAVE_READAHEAD
479# define readahead aio_readahead 709# define readahead aio_readahead
480 710
481static ssize_t
482readahead (int fd, off_t offset, size_t count) 711static ssize_t readahead (int fd, off_t offset, size_t count)
483{ 712{
484 char readahead_buf[4096]; 713 dBUF;
485 714
486 while (count > 0) 715 while (count > 0)
487 { 716 {
488 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 717 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
489 718
490 pread (fd, readahead_buf, len, offset); 719 pread (fd, aio_buf, len, offset);
491 offset += len; 720 offset += len;
492 count -= len; 721 count -= len;
493 } 722 }
494 723
495 errno = 0; 724 errno = 0;
499#if !HAVE_READDIR_R 728#if !HAVE_READDIR_R
500# define readdir_r aio_readdir_r 729# define readdir_r aio_readdir_r
501 730
502static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 731static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
503 732
504static int
505readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 733static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
506{ 734{
507 struct dirent *e; 735 struct dirent *e;
508 int errorno; 736 int errorno;
509 737
510 pthread_mutex_lock (&readdirlock); 738 LOCK (readdirlock);
511 739
512 e = readdir (dirp); 740 e = readdir (dirp);
513 errorno = errno; 741 errorno = errno;
514 742
515 if (e) 743 if (e)
518 strcpy (ent->d_name, e->d_name); 746 strcpy (ent->d_name, e->d_name);
519 } 747 }
520 else 748 else
521 *res = 0; 749 *res = 0;
522 750
523 pthread_mutex_unlock (&readdirlock); 751 UNLOCK (readdirlock);
524 752
525 errno = errorno; 753 errno = errorno;
526 return e ? 0 : -1; 754 return e ? 0 : -1;
527} 755}
528#endif 756#endif
529 757
530/* sendfile always needs emulation */ 758/* sendfile always needs emulation */
531static ssize_t
532sendfile_ (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)
533{ 760{
534 ssize_t res; 761 ssize_t res;
535 762
536 if (!count) 763 if (!count)
537 return 0; 764 return 0;
586#endif 813#endif
587 ) 814 )
588 ) 815 )
589 { 816 {
590 /* emulate sendfile. this is a major pain in the ass */ 817 /* emulate sendfile. this is a major pain in the ass */
591 char buf[4096]; 818 dBUF;
819
592 res = 0; 820 res = 0;
593 821
594 while (count) 822 while (count)
595 { 823 {
596 ssize_t cnt; 824 ssize_t cnt;
597 825
598 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 826 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
599 827
600 if (cnt <= 0) 828 if (cnt <= 0)
601 { 829 {
602 if (cnt && !res) res = -1; 830 if (cnt && !res) res = -1;
603 break; 831 break;
604 } 832 }
605 833
606 cnt = write (ofd, buf, cnt); 834 cnt = write (ofd, aio_buf, cnt);
607 835
608 if (cnt <= 0) 836 if (cnt <= 0)
609 { 837 {
610 if (cnt && !res) res = -1; 838 if (cnt && !res) res = -1;
611 break; 839 break;
619 847
620 return res; 848 return res;
621} 849}
622 850
623/* read a full directory */ 851/* read a full directory */
624static int 852static void scandir_ (aio_req req, worker *self)
625scandir_ (const char *path, void **namesp)
626{ 853{
627 DIR *dirp = opendir (path); 854 DIR *dirp;
628 union 855 union
629 { 856 {
630 struct dirent d; 857 struct dirent d;
631 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 858 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
632 } u; 859 } *u;
633 struct dirent *entp; 860 struct dirent *entp;
634 char *name, *names; 861 char *name, *names;
635 int memlen = 4096; 862 int memlen = 4096;
636 int memofs = 0; 863 int memofs = 0;
637 int res = 0; 864 int res = 0;
638 int errorno; 865 int errorno;
639 866
640 if (!dirp) 867 LOCK (wrklock);
641 return -1; 868 self->dirp = dirp = opendir (req->dataptr);
869 self->dbuf = u = malloc (sizeof (*u));
870 UNLOCK (wrklock);
642 871
643 names = malloc (memlen); 872 req->data2ptr = names = malloc (memlen);
644 873
874 if (dirp && u && names)
645 for (;;) 875 for (;;)
646 { 876 {
877 errno = 0;
647 errno = 0, readdir_r (dirp, &u.d, &entp); 878 readdir_r (dirp, &u->d, &entp);
648 879
649 if (!entp) 880 if (!entp)
650 break; 881 break;
651 882
652 name = entp->d_name; 883 name = entp->d_name;
653 884
654 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 885 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
655 { 886 {
656 int len = strlen (name) + 1; 887 int len = strlen (name) + 1;
657 888
658 res++; 889 res++;
659 890
660 while (memofs + len > memlen) 891 while (memofs + len > memlen)
661 { 892 {
662 memlen *= 2; 893 memlen *= 2;
894 LOCK (wrklock);
663 names = realloc (names, memlen); 895 req->data2ptr = names = realloc (names, memlen);
896 UNLOCK (wrklock);
897
664 if (!names) 898 if (!names)
665 break; 899 break;
666 } 900 }
667 901
668 memcpy (names + memofs, name, len); 902 memcpy (names + memofs, name, len);
669 memofs += len; 903 memofs += len;
670 } 904 }
671 } 905 }
672 906
673 errorno = errno;
674 closedir (dirp);
675
676 if (errorno) 907 if (errno)
677 {
678 free (names);
679 errno = errorno;
680 res = -1; 908 res = -1;
681 } 909
682 910 req->result = res;
683 *namesp = (void *)names;
684 return res;
685} 911}
686 912
687/*****************************************************************************/ 913/*****************************************************************************/
688 914
689static void *
690aio_proc (void *thr_arg) 915static void *aio_proc (void *thr_arg)
691{ 916{
692 aio_req req; 917 aio_req req;
693 int type; 918 int type;
919 worker *self = (worker *)thr_arg;
694 920
695 do 921 do
696 { 922 {
697 pthread_mutex_lock (&reqlock); 923 LOCK (reqlock);
698 924
699 for (;;) 925 for (;;)
700 { 926 {
701 req = reqs; 927 self->req = req = reqq_shift (&req_queue);
702
703 if (reqs)
704 {
705 reqs = reqs->next;
706 if (!reqs) reqe = 0;
707 }
708 928
709 if (req) 929 if (req)
710 break; 930 break;
711 931
712 pthread_cond_wait (&reqwait, &reqlock); 932 pthread_cond_wait (&reqwait, &reqlock);
713 } 933 }
714 934
715 pthread_mutex_unlock (&reqlock); 935 UNLOCK (reqlock);
716 936
717 errno = 0; /* strictly unnecessary */ 937 errno = 0; /* strictly unnecessary */
938 type = req->type; /* remember type for QUIT check */
718 939
719 if (!req->cancelled) 940 if (!(req->flags & FLAG_CANCELLED))
720 switch (req->type) 941 switch (type)
721 { 942 {
722 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;
723 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;
724 945
725 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;
726 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;
727 948
728 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 949 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
729 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 950 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
730 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 951 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
731 952
737 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 958 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
738 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 959 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
739 960
740 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 961 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
741 case REQ_FSYNC: req->result = fsync (req->fd); break; 962 case REQ_FSYNC: req->result = fsync (req->fd); break;
742 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 963 case REQ_READDIR: scandir_ (req, self); break;
743 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:
744 case REQ_QUIT: 977 case REQ_QUIT:
745 break; 978 break;
746 979
747 default: 980 default:
748 req->result = ENOSYS; 981 req->result = ENOSYS;
749 break; 982 break;
750 } 983 }
751 984
752 req->errorno = errno; 985 req->errorno = errno;
753 986
754 pthread_mutex_lock (&reslock); 987 LOCK (reslock);
755 988
756 req->next = 0; 989 if (!reqq_push (&res_queue, req))
757
758 if (rese)
759 {
760 rese->next = req;
761 rese = req;
762 }
763 else
764 {
765 rese = ress = req;
766
767 /* write a dummy byte to the pipe so fh becomes ready */ 990 /* write a dummy byte to the pipe so fh becomes ready */
768 write (respipe [1], &respipe, 1); 991 write (respipe [1], &respipe, 1);
769 }
770 992
771 pthread_mutex_unlock (&reslock); 993 self->req = 0;
994 worker_clear (self);
995
996 UNLOCK (reslock);
772 } 997 }
773 while (type != REQ_QUIT); 998 while (type != REQ_QUIT);
774 999
1000 LOCK (wrklock);
1001 worker_free (self);
1002 UNLOCK (wrklock);
1003
775 return 0; 1004 return 0;
776} 1005}
777 1006
778/*****************************************************************************/ 1007/*****************************************************************************/
779 1008
780static void atfork_prepare (void) 1009static void atfork_prepare (void)
781{ 1010{
782 pthread_mutex_lock (&reqlock); 1011 LOCK (wrklock);
783 pthread_mutex_lock (&reslock); 1012 LOCK (reqlock);
1013 LOCK (reslock);
784#if !HAVE_PREADWRITE 1014#if !HAVE_PREADWRITE
785 pthread_mutex_lock (&preadwritelock); 1015 LOCK (preadwritelock);
786#endif 1016#endif
787#if !HAVE_READDIR_R 1017#if !HAVE_READDIR_R
788 pthread_mutex_lock (&readdirlock); 1018 LOCK (readdirlock);
789#endif 1019#endif
790} 1020}
791 1021
792static void atfork_parent (void) 1022static void atfork_parent (void)
793{ 1023{
794#if !HAVE_READDIR_R 1024#if !HAVE_READDIR_R
795 pthread_mutex_unlock (&readdirlock); 1025 UNLOCK (readdirlock);
796#endif 1026#endif
797#if !HAVE_PREADWRITE 1027#if !HAVE_PREADWRITE
798 pthread_mutex_unlock (&preadwritelock); 1028 UNLOCK (preadwritelock);
799#endif 1029#endif
800 pthread_mutex_unlock (&reslock); 1030 UNLOCK (reslock);
801 pthread_mutex_unlock (&reqlock); 1031 UNLOCK (reqlock);
1032 UNLOCK (wrklock);
802} 1033}
803 1034
804static void atfork_child (void) 1035static void atfork_child (void)
805{ 1036{
806 aio_req prv; 1037 aio_req prv;
807 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
808 started = 0; 1056 started = 0;
809 1057 nreqs = 0;
810 while (reqs)
811 {
812 prv = reqs;
813 reqs = prv->next;
814 req_free (prv);
815 }
816
817 reqs = reqe = 0;
818
819 while (ress)
820 {
821 prv = ress;
822 ress = prv->next;
823 req_free (prv);
824 }
825
826 ress = rese = 0;
827 1058
828 close (respipe [0]); 1059 close (respipe [0]);
829 close (respipe [1]); 1060 close (respipe [1]);
830 create_pipe (); 1061 create_pipe ();
831 1062
832 atfork_parent (); 1063 atfork_parent ();
833} 1064}
834 1065
835#define dREQ \ 1066#define dREQ \
836 aio_req req; \ 1067 aio_req req; \
1068 int req_pri = next_pri; \
1069 next_pri = DEFAULT_PRI + PRI_BIAS; \
837 \ 1070 \
838 if (SvOK (callback) && !SvROK (callback)) \ 1071 if (SvOK (callback) && !SvROK (callback)) \
839 croak ("callback must be undef or of reference type"); \ 1072 croak ("callback must be undef or of reference type"); \
840 \ 1073 \
841 Newz (0, req, 1, aio_cb); \ 1074 Newz (0, req, 1, aio_cb); \
842 if (!req) \ 1075 if (!req) \
843 croak ("out of memory during aio_req allocation"); \ 1076 croak ("out of memory during aio_req allocation"); \
844 \ 1077 \
845 req->callback = newSVsv (callback) 1078 req->callback = newSVsv (callback); \
1079 req->pri = req_pri
846 1080
847#define REQ_SEND \ 1081#define REQ_SEND \
848 req_send (req); \ 1082 req_send (req); \
849 \ 1083 \
850 if (GIMME_V != G_VOID) \ 1084 if (GIMME_V != G_VOID) \
851 XPUSHs (req_sv (req)); 1085 XPUSHs (req_sv (req, AIO_REQ_KLASS));
852 1086
853MODULE = IO::AIO PACKAGE = IO::AIO 1087MODULE = IO::AIO PACKAGE = IO::AIO
854 1088
855PROTOTYPES: ENABLE 1089PROTOTYPES: ENABLE
856 1090
1103 req->dataptr = SvPVbyte_nolen (req->data); 1337 req->dataptr = SvPVbyte_nolen (req->data);
1104 1338
1105 REQ_SEND; 1339 REQ_SEND;
1106} 1340}
1107 1341
1108#if 0
1109
1110# undocumented, because it does not cancel active requests
1111void 1342void
1112cancel_most_requests () 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
1358aio_group (callback=&PL_sv_undef)
1359 SV * callback
1113 PROTOTYPE: 1360 PROTOTYPE: ;$
1114 CODE: 1361 PPCODE:
1115{ 1362{
1116 aio_req *req; 1363 dREQ;
1117 1364
1118 pthread_mutex_lock (&reqlock); 1365 req->type = REQ_GROUP;
1119 for (req = reqs; req; req = req->next) 1366 req_send (req);
1120 req->flags |= 1;
1121 pthread_mutex_unlock (&reqlock);
1122 1367
1123 pthread_mutex_lock (&reslock); 1368 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1124 for (req = ress; req; req = req->next)
1125 req->flags |= 1;
1126 pthread_mutex_unlock (&reslock);
1127} 1369}
1128 1370
1129#endif 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;
1130 1397
1131void 1398void
1132flush () 1399flush ()
1133 PROTOTYPE: 1400 PROTOTYPE:
1134 CODE: 1401 CODE:
1177 CODE: 1444 CODE:
1178 RETVAL = nreqs; 1445 RETVAL = nreqs;
1179 OUTPUT: 1446 OUTPUT:
1180 RETVAL 1447 RETVAL
1181 1448
1449PROTOTYPES: DISABLE
1450
1182MODULE = IO::AIO PACKAGE = IO::AIO::CB 1451MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1183 1452
1184void 1453void
1185cancel (aio_req_ornot req) 1454cancel (aio_req_ornot req)
1186 PROTOTYPE:
1187 CODE: 1455 CODE:
1188 req->cancelled = 1; 1456 req_cancel (req);
1189 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