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.26 by root, Wed Aug 17 03:52:20 2005 UTC vs.
Revision 1.33 by root, Mon Aug 22 23:21:57 2005 UTC

… …
4#include "EXTERN.h" 4#include "EXTERN.h"
5#include "perl.h" 5#include "perl.h"
6#include "XSUB.h" 6#include "XSUB.h"
7 7
8#include "autoconf/config.h" 8#include "autoconf/config.h"
9
10#include <pthread.h>
9 11
10#include <sys/types.h> 12#include <sys/types.h>
11#include <sys/stat.h> 13#include <sys/stat.h>
12 14
13#include <unistd.h> 15#include <unistd.h>
14#include <fcntl.h> 16#include <fcntl.h>
15#include <signal.h> 17#include <signal.h>
16#include <sched.h> 18#include <sched.h>
17 19
18#include <pthread.h> 20#if HAVE_SENDFILE
19 21# if __linux
20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 22# include <sys/sendfile.h>
21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 23# elif __freebsd
22typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 24# include <sys/socket.h>
25# include <sys/uio.h>
26# elif __hpux
27# include <sys/socket.h>
28# endif
29#endif
23 30
24#if __ia64 31#if __ia64
25# define STACKSIZE 65536 32# define STACKSIZE 65536
26#else 33#else
27# define STACKSIZE 4096 34# define STACKSIZE 4096
… …
29 36
30enum { 37enum {
31 REQ_QUIT, 38 REQ_QUIT,
32 REQ_OPEN, REQ_CLOSE, 39 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD, 40 REQ_READ, REQ_WRITE, REQ_READAHEAD,
41 REQ_SENDFILE,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 42 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35 REQ_FSYNC, REQ_FDATASYNC, 43 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR, 44 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK, 45 REQ_SYMLINK,
38}; 46};
… …
40typedef struct aio_cb { 48typedef struct aio_cb {
41 struct aio_cb *volatile next; 49 struct aio_cb *volatile next;
42 50
43 int type; 51 int type;
44 52
45 int fd; 53 int fd, fd2;
46 off_t offset; 54 off_t offset;
47 size_t length; 55 size_t length;
48 ssize_t result; 56 ssize_t result;
49 mode_t mode; /* open */ 57 mode_t mode; /* open */
50 int errorno; 58 int errorno;
51 SV *data, *callback, *fh; 59 SV *data, *callback;
60 SV *fh, *fh2;
52 void *dataptr, *data2ptr; 61 void *dataptr, *data2ptr;
53 STRLEN dataoffset; 62 STRLEN dataoffset;
54 63
55 Stat_t *statdata; 64 Stat_t *statdata;
56} aio_cb; 65} aio_cb;
57 66
58typedef aio_cb *aio_req; 67typedef aio_cb *aio_req;
59 68
60static int started; 69static int started, wanted;
61static volatile int nreqs; 70static volatile int nreqs;
62static int max_outstanding = 1<<30; 71static int max_outstanding = 1<<30;
63static int respipe [2]; 72static int respipe [2];
64 73
65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 74static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 75static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
67static pthread_mutex_t frklock = PTHREAD_MUTEX_INITIALIZER;
68static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 76static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
69 77
70static volatile aio_req reqs, reqe; /* queue start, queue end */ 78static volatile aio_req reqs, reqe; /* queue start, queue end */
71static volatile aio_req ress, rese; /* queue start, queue end */ 79static volatile aio_req ress, rese; /* queue start, queue end */
72 80
… …
76 SvREFCNT_dec (req->data); 84 SvREFCNT_dec (req->data);
77 85
78 if (req->fh) 86 if (req->fh)
79 SvREFCNT_dec (req->fh); 87 SvREFCNT_dec (req->fh);
80 88
81 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) 89 if (req->fh2)
90 SvREFCNT_dec (req->fh2);
91
92 if (req->statdata)
82 Safefree (req->statdata); 93 Safefree (req->statdata);
83 94
84 if (req->callback) 95 if (req->callback)
85 SvREFCNT_dec (req->callback); 96 SvREFCNT_dec (req->callback);
86 97
… …
104poll_cb () 115poll_cb ()
105{ 116{
106 dSP; 117 dSP;
107 int count = 0; 118 int count = 0;
108 int do_croak = 0; 119 int do_croak = 0;
109 aio_req req, prv; 120 aio_req req;
110 121
111 pthread_mutex_lock (&reslock); 122 for (;;)
112
113 {
114 /* read any signals sent by the worker threads */
115 char buf [32];
116 while (read (respipe [0], buf, 32) == 32)
117 ;
118 }
119
120 req = ress;
121 ress = rese = 0;
122
123 pthread_mutex_unlock (&reslock);
124
125 while (req)
126 { 123 {
124 pthread_mutex_lock (&reslock);
125 req = ress;
126
127 if (req)
128 {
129 ress = req->next;
130
131 if (!ress)
132 {
133 /* read any signals sent by the worker threads */
134 char buf [32];
135 while (read (respipe [0], buf, 32) == 32)
136 ;
137
138 rese = 0;
139 }
140 }
141
142 pthread_mutex_unlock (&reslock);
143
144 if (!req)
145 break;
146
127 nreqs--; 147 nreqs--;
128 148
129 if (req->type == REQ_QUIT) 149 if (req->type == REQ_QUIT)
130 started--; 150 started--;
131 else 151 else
132 { 152 {
133 int errorno = errno; 153 int errorno = errno;
134 errno = req->errorno; 154 errno = req->errorno;
135 155
136 if (req->type == REQ_READ) 156 if (req->type == REQ_READ)
137 SvCUR_set (req->data, req->dataoffset 157 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
138 + req->result > 0 ? req->result : 0);
139 158
140 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) 159 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
160 SvREADONLY_off (req->data);
161
162 if (req->statdata)
141 { 163 {
142 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 164 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
143 PL_laststatval = req->result; 165 PL_laststatval = req->result;
144 PL_statcache = *(req->statdata); 166 PL_statcache = *(req->statdata);
145 } 167 }
… …
166 if (SvOK (req->callback)) 188 if (SvOK (req->callback))
167 { 189 {
168 PUTBACK; 190 PUTBACK;
169 call_sv (req->callback, G_VOID | G_EVAL); 191 call_sv (req->callback, G_VOID | G_EVAL);
170 SPAGAIN; 192 SPAGAIN;
193
194 if (SvTRUE (ERRSV))
195 {
196 free_req (req);
197 croak (0);
198 }
171 } 199 }
172 200
173 LEAVE; 201 LEAVE;
174 202
175 do_croak = SvTRUE (ERRSV);
176
177 errno = errorno; 203 errno = errorno;
178 count++; 204 count++;
179 } 205 }
180 206
181 prv = req;
182 req = req->next;
183 free_req (prv); 207 free_req (req);
184
185 if (do_croak)
186 croak (0);
187 } 208 }
188 209
189 return count; 210 return count;
190} 211}
191 212
… …
212} 233}
213 234
214static void 235static void
215send_req (aio_req req) 236send_req (aio_req req)
216{ 237{
238 while (started < wanted && nreqs >= started)
239 start_thread ();
240
217 nreqs++; 241 nreqs++;
218 242
219 pthread_mutex_lock (&reqlock); 243 pthread_mutex_lock (&reqlock);
220 244
221 req->next = 0; 245 req->next = 0;
… …
229 reqe = reqs = req; 253 reqe = reqs = req;
230 254
231 pthread_cond_signal (&reqwait); 255 pthread_cond_signal (&reqwait);
232 pthread_mutex_unlock (&reqlock); 256 pthread_mutex_unlock (&reqlock);
233 257
234 while (nreqs > max_outstanding) 258 if (nreqs > max_outstanding)
259 for (;;)
260 {
261 poll_cb ();
262
263 if (nreqs <= max_outstanding)
264 break;
265
266 poll_wait ();
267 }
268}
269
270static void
271end_thread (void)
272{
273 aio_req req;
274 Newz (0, req, 1, aio_cb);
275 req->type = REQ_QUIT;
276
277 send_req (req);
278}
279
280static void min_parallel (int nthreads)
281{
282 if (wanted < nthreads)
283 wanted = nthreads;
284}
285
286static void max_parallel (int nthreads)
287{
288 int cur = started;
289
290 if (wanted > nthreads)
291 wanted = nthreads;
292
293 while (cur > wanted)
294 {
295 end_thread ();
296 cur--;
297 }
298
299 while (started > wanted)
235 { 300 {
236 poll_wait (); 301 poll_wait ();
237 poll_cb (); 302 poll_cb ();
238 } 303 }
239} 304}
240 305
241static void
242end_thread (void)
243{
244 aio_req req;
245 Newz (0, req, 1, aio_cb);
246 req->type = REQ_QUIT;
247
248 send_req (req);
249}
250
251
252static void min_parallel (int nthreads)
253{
254 while (nthreads > started)
255 start_thread ();
256}
257
258static void max_parallel (int nthreads)
259{
260 int cur = started;
261 while (cur > nthreads)
262 {
263 end_thread ();
264 cur--;
265 }
266
267 while (started > nthreads)
268 {
269 poll_wait ();
270 poll_cb ();
271 }
272}
273
274static void create_pipe () 306static void create_pipe ()
275{ 307{
276 if (pipe (respipe)) 308 if (pipe (respipe))
277 croak ("unable to initialize result pipe"); 309 croak ("unable to initialize result pipe");
278 310
… …
283 croak ("cannot set result pipe to nonblocking mode"); 315 croak ("cannot set result pipe to nonblocking mode");
284} 316}
285 317
286static void atfork_prepare (void) 318static void atfork_prepare (void)
287{ 319{
288 pthread_mutex_lock (&frklock);
289 pthread_mutex_lock (&reqlock); 320 pthread_mutex_lock (&reqlock);
290 pthread_mutex_lock (&reslock); 321 pthread_mutex_lock (&reslock);
291} 322}
292 323
293static void atfork_parent (void) 324static void atfork_parent (void)
294{ 325{
295 pthread_mutex_unlock (&reslock); 326 pthread_mutex_unlock (&reslock);
296 pthread_mutex_unlock (&reqlock); 327 pthread_mutex_unlock (&reqlock);
297 pthread_mutex_unlock (&frklock);
298} 328}
299 329
300static void atfork_child (void) 330static void atfork_child (void)
301{ 331{
302 int restart = started; 332 aio_req prv;
333
303 started = 0; 334 started = 0;
304 335
305 while (reqs) 336 while (reqs)
306 { 337 {
307 free_req (reqs); 338 prv = reqs;
308 reqs = reqs->next; 339 reqs = prv->next;
340 free_req (prv);
309 } 341 }
310 342
311 reqs = reqe = 0; 343 reqs = reqe = 0;
312 344
313 while (ress) 345 while (ress)
314 { 346 {
315 free_req (ress); 347 prv = ress;
316 ress = ress->next; 348 ress = prv->next;
349 free_req (prv);
317 } 350 }
318 351
319 ress = rese = 0; 352 ress = rese = 0;
320 353
321 close (respipe [0]); 354 close (respipe [0]);
322 close (respipe [1]); 355 close (respipe [1]);
323
324 create_pipe (); 356 create_pipe ();
325 357
326 atfork_parent (); 358 atfork_parent ();
327
328 min_parallel (restart);
329} 359}
330 360
331/*****************************************************************************/ 361/*****************************************************************************/
332/* work around various missing functions */ 362/* work around various missing functions */
333 363
… …
398 428
399 errno = 0; 429 errno = 0;
400} 430}
401#endif 431#endif
402 432
433/* sendfile always needs emulation */
434static ssize_t
435sendfile_ (int ofd, int ifd, off_t offset, size_t count)
436{
437 ssize_t res;
438
439 if (!count)
440 return 0;
441
442#if __linux
443 res = sendfile (ofd, ifd, &offset, count);
444
445#elif __freebsd
446 /*
447 * Of course, the freebsd sendfile is a dire hack with no thoughts
448 * wasted on making it similar to other i/o functions.
449 */
450 {
451 off_t sbytes;
452 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
453
454 if (!res && errno == EAGAIN)
455 /* maybe on others, too, as usual, the manpage leaves you guessing */
456 res = sbytes;
457 }
458
459#elif __hpux
460 res = sendfile (ofd, ifd, offset, count, 0, 0);
461
462#else
463 res = -1;
464 errno = ENOSYS;
465#endif
466
467 if (res < 0 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK))
468 {
469 /* emulate sendfile. this is a major pain in the ass */
470 char *buf = malloc (4096);
471 res = 0;
472
473 for (;;)
474 {
475 ssize_t cnt;
476
477 cnt = pread (ifd, buf, 4096, offset);
478
479 if (cnt <= 0)
480 {
481 if (cnt && !res) res = -1;
482 break;
483 }
484
485 cnt = write (ofd, buf, cnt);
486
487 if (cnt <= 0)
488 {
489 if (cnt && !res) res = -1;
490 break;
491 }
492
493 offset += cnt;
494 res += cnt;
495 }
496
497 {
498 int errorno = errno;
499 free (buf);
500 errno = errorno;
501 }
502 }
503
504 return res;
505}
506
403/*****************************************************************************/ 507/*****************************************************************************/
404 508
405static void * 509static void *
406aio_proc (void *thr_arg) 510aio_proc (void *thr_arg)
407{ 511{
… …
438 { 542 {
439 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 543 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
440 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 544 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
441 545
442 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 546 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
547 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
443 548
444 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 549 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
445 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 550 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
446 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 551 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
447 552
… …
496 \ 601 \
497 Newz (0, req, 1, aio_cb); \ 602 Newz (0, req, 1, aio_cb); \
498 if (!req) \ 603 if (!req) \
499 croak ("out of memory during aio_req allocation"); \ 604 croak ("out of memory during aio_req allocation"); \
500 \ 605 \
501 req->callback = SvREFCNT_inc (callback); 606 req->callback = newSVsv (callback);
502 607
503MODULE = IO::AIO PACKAGE = IO::AIO 608MODULE = IO::AIO PACKAGE = IO::AIO
504 609
505PROTOTYPES: ENABLE 610PROTOTYPES: ENABLE
506 611
… …
570 675
571void 676void
572aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 677aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
573 SV * fh 678 SV * fh
574 UV offset 679 UV offset
575 IV length 680 UV length
576 SV * data 681 SV * data
577 IV dataoffset 682 UV dataoffset
578 SV * callback 683 SV * callback
579 ALIAS: 684 ALIAS:
580 aio_read = REQ_READ 685 aio_read = REQ_READ
581 aio_write = REQ_WRITE 686 aio_write = REQ_WRITE
582 PROTOTYPE: $$$$$;$ 687 PROTOTYPE: $$$$$;$
… …
619 : IoOFP (sv_2io (fh))); 724 : IoOFP (sv_2io (fh)));
620 req->offset = offset; 725 req->offset = offset;
621 req->length = length; 726 req->length = length;
622 req->data = SvREFCNT_inc (data); 727 req->data = SvREFCNT_inc (data);
623 req->dataptr = (char *)svptr + dataoffset; 728 req->dataptr = (char *)svptr + dataoffset;
624 req->callback = SvREFCNT_inc (callback); 729
730 if (!SvREADONLY (data))
731 {
732 SvREADONLY_on (data);
733 req->data2ptr = (void *)data;
734 }
625 735
626 send_req (req); 736 send_req (req);
627 } 737 }
738}
739
740void
741aio_sendfile(out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
742 SV * out_fh
743 SV * in_fh
744 UV in_offset
745 UV length
746 SV * callback
747 PROTOTYPE: $$$$;$
748 CODE:
749{
750 dREQ;
751
752 req->type = REQ_SENDFILE;
753 req->fh = newSVsv (out_fh);
754 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
755 req->fh2 = newSVsv (in_fh);
756 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
757 req->offset = in_offset;
758 req->length = length;
759
760 send_req (req);
628} 761}
629 762
630void 763void
631aio_readahead(fh,offset,length,callback=&PL_sv_undef) 764aio_readahead(fh,offset,length,callback=&PL_sv_undef)
632 SV * fh 765 SV * fh
… …
658{ 791{
659 dREQ; 792 dREQ;
660 793
661 New (0, req->statdata, 1, Stat_t); 794 New (0, req->statdata, 1, Stat_t);
662 if (!req->statdata) 795 if (!req->statdata)
796 {
797 free_req (req);
663 croak ("out of memory during aio_req->statdata allocation (sorry, i just leaked memory, too)"); 798 croak ("out of memory during aio_req->statdata allocation");
799 }
664 800
665 if (SvPOK (fh_or_path)) 801 if (SvPOK (fh_or_path))
666 { 802 {
667 req->type = ix; 803 req->type = ix;
668 req->data = newSVsv (fh_or_path); 804 req->data = newSVsv (fh_or_path);

Diff Legend

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