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.45 by root, Sun Oct 22 00:19:05 2006 UTC

… …
9 9
10#include <pthread.h> 10#include <pthread.h>
11 11
12#include <stddef.h> 12#include <stddef.h>
13#include <errno.h> 13#include <errno.h>
14#include <sys/time.h>
15#include <sys/select.h>
14#include <sys/types.h> 16#include <sys/types.h>
15#include <sys/stat.h> 17#include <sys/stat.h>
16#include <limits.h> 18#include <limits.h>
17#include <unistd.h> 19#include <unistd.h>
18#include <fcntl.h> 20#include <fcntl.h>
… …
53 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 55 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
54 REQ_FSYNC, REQ_FDATASYNC, 56 REQ_FSYNC, REQ_FDATASYNC,
55 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
56 REQ_READDIR, 58 REQ_READDIR,
57 REQ_LINK, REQ_SYMLINK, 59 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP,
61 REQ_GROUP,
58}; 62};
59 63
60#define AIO_CB_KLASS "IO::AIO::CB" 64#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP"
61 66
62typedef struct aio_cb 67typedef struct aio_cb
63{ 68{
64 struct aio_cb *grp_prev, *grp_next; 69 struct aio_cb *grp, *grp_prev, *grp_next;
65 struct aio_grp *grp;
66 70
67 struct aio_cb *volatile next; 71 struct aio_cb *volatile next;
68 72
69 SV *self; /* the perl counterpart of this request, if any */ 73 SV *self; /* the perl counterpart of this request, if any */
70 74
… …
84 unsigned char cancelled; 88 unsigned char cancelled;
85} aio_cb; 89} aio_cb;
86 90
87typedef aio_cb *aio_req; 91typedef aio_cb *aio_req;
88typedef aio_cb *aio_req_ornot; 92typedef aio_cb *aio_req_ornot;
93typedef aio_cb *aio_group;
89 94
90static int started, wanted; 95static int started, wanted;
91static volatile int nreqs; 96static volatile int nreqs;
92static int max_outstanding = 1<<30; 97static int max_outstanding = 1<<30;
93static int respipe [2]; 98static int respipe [2];
… …
97static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 102static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
98 103
99static volatile aio_req reqs, reqe; /* queue start, queue end */ 104static volatile aio_req reqs, reqe; /* queue start, queue end */
100static volatile aio_req ress, rese; /* queue start, queue end */ 105static volatile aio_req ress, rese; /* queue start, queue end */
101 106
102typedef struct aio_grp 107static void req_free (aio_req req);
103{
104 struct aio_cb *first, *last;
105 SV *callback;
106 int busycount;
107} aio_grp;
108
109static void aio_grp_begin (aio_grp *grp)
110{
111 ++grp->busycount;
112}
113
114static void aio_grp_end (aio_grp *grp)
115{
116 --grp->busycount;
117
118 if (grp->busycount)
119 return;
120
121 SvREFCNT_dec (grp->callback);
122 grp->callback = 0;
123}
124
125static aio_grp *aio_grp_new ()
126{
127 aio_grp *grp;
128
129 Newz (0, grp, 1, aio_grp);
130 aio_grp_begin (grp);
131
132 return grp;
133}
134 108
135/* must be called at most once */ 109/* must be called at most once */
136static SV *req_sv (aio_req req) 110static SV *req_sv (aio_req req, const char *klass)
137{ 111{
138 req->self = (SV *)newHV (); 112 req->self = (SV *)newHV ();
139 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 113 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
140 114
141 return sv_bless (newRV_noinc (req->self), gv_stashpv (AIO_CB_KLASS, 1)); 115 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
142} 116}
143 117
144static aio_req SvAIO_REQ (SV *sv) 118static aio_req SvAIO_REQ (SV *sv)
145{ 119{
146 if (!sv_derived_from (sv, AIO_CB_KLASS) || !SvROK (sv)) 120 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
147 croak ("object of class " AIO_CB_KLASS " expected"); 121 croak ("object of class " AIO_REQ_KLASS " expected");
148 122
149 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 123 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
150 124
151 return mg ? (aio_req)mg->mg_ptr : 0; 125 return mg ? (aio_req)mg->mg_ptr : 0;
152} 126}
153 127
154static void req_free (aio_req req) 128static void poll_wait ()
155{
156 if (req->self)
157 {
158 sv_unmagic (req->self, PERL_MAGIC_ext);
159 SvREFCNT_dec (req->self);
160 }
161
162 if (req->data)
163 SvREFCNT_dec (req->data);
164
165 if (req->fh)
166 SvREFCNT_dec (req->fh);
167
168 if (req->fh2)
169 SvREFCNT_dec (req->fh2);
170
171 if (req->statdata)
172 Safefree (req->statdata);
173
174 if (req->callback)
175 SvREFCNT_dec (req->callback);
176
177 if (req->type == REQ_READDIR && req->result >= 0)
178 free (req->data2ptr);
179
180 Safefree (req);
181}
182
183static void
184poll_wait ()
185{ 129{
186 if (nreqs && !ress) 130 if (nreqs && !ress)
187 { 131 {
188 fd_set rfd; 132 fd_set rfd;
189 FD_ZERO(&rfd); 133 FD_ZERO(&rfd);
… …
191 135
192 select (respipe [0] + 1, &rfd, 0, 0, 0); 136 select (respipe [0] + 1, &rfd, 0, 0, 0);
193 } 137 }
194} 138}
195 139
196static int 140static void req_invoke (aio_req req)
197poll_cb () 141{
142 dSP;
143 int errorno = errno;
144
145 if (req->cancelled || !SvOK (req->callback))
146 return;
147
148 errno = req->errorno;
149
150 ENTER;
151 PUSHMARK (SP);
152
153 switch (req->type)
154 {
155 case REQ_READDIR:
156 {
157 SV *rv = &PL_sv_undef;
158
159 if (req->result >= 0)
160 {
161 char *buf = req->data2ptr;
162 AV *av = newAV ();
163
164 while (req->result)
165 {
166 SV *sv = newSVpv (buf, 0);
167
168 av_push (av, sv);
169 buf += SvCUR (sv) + 1;
170 req->result--;
171 }
172
173 rv = sv_2mortal (newRV_noinc ((SV *)av));
174 }
175
176 XPUSHs (rv);
177 }
178 break;
179
180 case REQ_OPEN:
181 {
182 /* convert fd to fh */
183 SV *fh;
184
185 XPUSHs (sv_2mortal (newSViv (req->result)));
186 PUTBACK;
187 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
188 SPAGAIN;
189
190 fh = SvREFCNT_inc (POPs);
191
192 PUSHMARK (SP);
193 XPUSHs (sv_2mortal (fh));
194 }
195 break;
196
197 case REQ_SLEEP:
198 case REQ_GROUP:
199 break;
200
201 default:
202 XPUSHs (sv_2mortal (newSViv (req->result)));
203 break;
204 }
205
206
207 PUTBACK;
208 call_sv (req->callback, G_VOID | G_EVAL);
209 SPAGAIN;
210
211 if (SvTRUE (ERRSV))
212 {
213 req_free (req);
214 croak (0);
215 }
216
217 LEAVE;
218
219 errno = errorno;
220}
221
222static void req_free (aio_req req)
223{
224 if (req->grp)
225 {
226 aio_req grp = req->grp;
227
228 /* unlink request */
229 req->grp_next->grp_prev = req->grp_prev;
230 req->grp_prev->grp_next = req->grp_next;
231
232 if (grp->grp_next == grp)
233 {
234 req_invoke (grp);
235 req_free (grp);
236 }
237 }
238
239 if (req->self)
240 {
241 sv_unmagic (req->self, PERL_MAGIC_ext);
242 SvREFCNT_dec (req->self);
243 }
244
245 if (req->data)
246 SvREFCNT_dec (req->data);
247
248 if (req->fh)
249 SvREFCNT_dec (req->fh);
250
251 if (req->fh2)
252 SvREFCNT_dec (req->fh2);
253
254 if (req->statdata)
255 Safefree (req->statdata);
256
257 if (req->callback)
258 SvREFCNT_dec (req->callback);
259
260 if (req->type == REQ_READDIR && req->result >= 0)
261 free (req->data2ptr);
262
263 Safefree (req);
264}
265
266static void req_cancel (aio_req req)
267{
268 req->cancelled = 1;
269
270 if (req->type == REQ_GROUP)
271 {
272 aio_req sub;
273
274 for (sub = req->grp_next; sub != req; sub = sub->grp_next)
275 req_cancel (sub);
276 }
277}
278
279static int poll_cb ()
198{ 280{
199 dSP; 281 dSP;
200 int count = 0; 282 int count = 0;
201 int do_croak = 0; 283 int do_croak = 0;
202 aio_req req; 284 aio_req req;
… …
228 310
229 nreqs--; 311 nreqs--;
230 312
231 if (req->type == REQ_QUIT) 313 if (req->type == REQ_QUIT)
232 started--; 314 started--;
315 else if (req->type == REQ_GROUP && req->grp_next != req)
316 continue;
233 else 317 else
234 { 318 {
235 int errorno = errno;
236 errno = req->errorno;
237
238 if (req->type == REQ_READ) 319 if (req->type == REQ_READ)
239 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); 320 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
240 321
241 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) 322 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
242 SvREADONLY_off (req->data); 323 SvREADONLY_off (req->data);
… …
246 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 327 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
247 PL_laststatval = req->result; 328 PL_laststatval = req->result;
248 PL_statcache = *(req->statdata); 329 PL_statcache = *(req->statdata);
249 } 330 }
250 331
251 ENTER; 332 req_invoke (req);
252 PUSHMARK (SP);
253 333
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++; 334 count++;
314 } 335 }
315 336
316 req_free (req); 337 req_free (req);
317 } 338 }
… …
319 return count; 340 return count;
320} 341}
321 342
322static void *aio_proc(void *arg); 343static void *aio_proc(void *arg);
323 344
324static void
325start_thread (void) 345static void start_thread (void)
326{ 346{
327 sigset_t fullsigset, oldsigset; 347 sigset_t fullsigset, oldsigset;
328 pthread_t tid; 348 pthread_t tid;
329 pthread_attr_t attr; 349 pthread_attr_t attr;
330 350
… …
339 started++; 359 started++;
340 360
341 sigprocmask (SIG_SETMASK, &oldsigset, 0); 361 sigprocmask (SIG_SETMASK, &oldsigset, 0);
342} 362}
343 363
344static void
345req_send (aio_req req) 364static void req_send (aio_req req)
346{ 365{
347 while (started < wanted && nreqs >= started) 366 while (started < wanted && nreqs >= started)
348 start_thread (); 367 start_thread ();
349 368
350 nreqs++; 369 nreqs++;
… …
374 393
375 poll_wait (); 394 poll_wait ();
376 } 395 }
377} 396}
378 397
379static void 398static void end_thread (void)
380end_thread (void)
381{ 399{
382 aio_req req; 400 aio_req req;
383 Newz (0, req, 1, aio_cb); 401 Newz (0, req, 1, aio_cb);
384 req->type = REQ_QUIT; 402 req->type = REQ_QUIT;
385 403
… …
436 * normal read/write by using a mutex. slows down execution a lot, 454 * normal read/write by using a mutex. slows down execution a lot,
437 * but that's your problem, not mine. 455 * but that's your problem, not mine.
438 */ 456 */
439static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 457static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
440 458
441static ssize_t 459static 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{ 460{
444 ssize_t res; 461 ssize_t res;
445 off_t ooffset; 462 off_t ooffset;
446 463
447 pthread_mutex_lock (&preadwritelock); 464 pthread_mutex_lock (&preadwritelock);
… …
452 pthread_mutex_unlock (&preadwritelock); 469 pthread_mutex_unlock (&preadwritelock);
453 470
454 return res; 471 return res;
455} 472}
456 473
457static ssize_t
458pwrite (int fd, void *buf, size_t count, off_t offset) 474static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
459{ 475{
460 ssize_t res; 476 ssize_t res;
461 off_t ooffset; 477 off_t ooffset;
462 478
463 pthread_mutex_lock (&preadwritelock); 479 pthread_mutex_lock (&preadwritelock);
… …
476#endif 492#endif
477 493
478#if !HAVE_READAHEAD 494#if !HAVE_READAHEAD
479# define readahead aio_readahead 495# define readahead aio_readahead
480 496
481static ssize_t
482readahead (int fd, off_t offset, size_t count) 497static ssize_t readahead (int fd, off_t offset, size_t count)
483{ 498{
484 char readahead_buf[4096]; 499 char readahead_buf[4096];
485 500
486 while (count > 0) 501 while (count > 0)
487 { 502 {
… …
499#if !HAVE_READDIR_R 514#if !HAVE_READDIR_R
500# define readdir_r aio_readdir_r 515# define readdir_r aio_readdir_r
501 516
502static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 517static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
503 518
504static int
505readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 519static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
506{ 520{
507 struct dirent *e; 521 struct dirent *e;
508 int errorno; 522 int errorno;
509 523
510 pthread_mutex_lock (&readdirlock); 524 pthread_mutex_lock (&readdirlock);
… …
526 return e ? 0 : -1; 540 return e ? 0 : -1;
527} 541}
528#endif 542#endif
529 543
530/* sendfile always needs emulation */ 544/* sendfile always needs emulation */
531static ssize_t
532sendfile_ (int ofd, int ifd, off_t offset, size_t count) 545static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
533{ 546{
534 ssize_t res; 547 ssize_t res;
535 548
536 if (!count) 549 if (!count)
537 return 0; 550 return 0;
… …
619 632
620 return res; 633 return res;
621} 634}
622 635
623/* read a full directory */ 636/* read a full directory */
624static int
625scandir_ (const char *path, void **namesp) 637static int scandir_ (const char *path, void **namesp)
626{ 638{
627 DIR *dirp = opendir (path); 639 DIR *dirp = opendir (path);
628 union 640 union
629 { 641 {
630 struct dirent d; 642 struct dirent d;
… …
684 return res; 696 return res;
685} 697}
686 698
687/*****************************************************************************/ 699/*****************************************************************************/
688 700
689static void *
690aio_proc (void *thr_arg) 701static void *aio_proc (void *thr_arg)
691{ 702{
692 aio_req req; 703 aio_req req;
693 int type; 704 int type;
694 705
695 do 706 do
… …
738 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 749 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
739 750
740 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 751 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
741 case REQ_FSYNC: req->result = fsync (req->fd); break; 752 case REQ_FSYNC: req->result = fsync (req->fd); break;
742 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 753 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
754
755 case REQ_SLEEP:
756 {
757 struct timeval tv;
758
759 tv.tv_sec = req->fd;
760 tv.tv_usec = req->fd2;
761
762 req->result = select (0, 0, 0, 0, &tv);
763 }
743 764
744 case REQ_QUIT: 765 case REQ_QUIT:
745 break; 766 break;
746 767
747 default: 768 default:
… …
846 867
847#define REQ_SEND \ 868#define REQ_SEND \
848 req_send (req); \ 869 req_send (req); \
849 \ 870 \
850 if (GIMME_V != G_VOID) \ 871 if (GIMME_V != G_VOID) \
851 XPUSHs (req_sv (req)); 872 XPUSHs (req_sv (req, AIO_REQ_KLASS));
852 873
853MODULE = IO::AIO PACKAGE = IO::AIO 874MODULE = IO::AIO PACKAGE = IO::AIO
854 875
855PROTOTYPES: ENABLE 876PROTOTYPES: ENABLE
856 877
… …
1103 req->dataptr = SvPVbyte_nolen (req->data); 1124 req->dataptr = SvPVbyte_nolen (req->data);
1104 1125
1105 REQ_SEND; 1126 REQ_SEND;
1106} 1127}
1107 1128
1108#if 0
1109
1110# undocumented, because it does not cancel active requests
1111void 1129void
1112cancel_most_requests () 1130aio_sleep (delay,callback=&PL_sv_undef)
1131 double delay
1132 SV * callback
1133 PPCODE:
1134{
1135 dREQ;
1136
1137 req->type = REQ_SLEEP;
1138 req->fd = delay < 0. ? 0 : delay;
1139 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1140
1141 REQ_SEND;
1142}
1143
1144void
1145aio_group (callback=&PL_sv_undef)
1146 SV * callback
1113 PROTOTYPE: 1147 PROTOTYPE: ;&
1114 CODE: 1148 PPCODE:
1115{ 1149{
1116 aio_req *req; 1150 dREQ;
1151 req->type = REQ_GROUP;
1152 req->grp_next = req;
1153 req->grp_prev = req;
1117 1154
1118 pthread_mutex_lock (&reqlock); 1155 req_send (req);
1119 for (req = reqs; req; req = req->next) 1156 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1120 req->flags |= 1;
1121 pthread_mutex_unlock (&reqlock);
1122
1123 pthread_mutex_lock (&reslock);
1124 for (req = ress; req; req = req->next)
1125 req->flags |= 1;
1126 pthread_mutex_unlock (&reslock);
1127} 1157}
1128
1129#endif
1130 1158
1131void 1159void
1132flush () 1160flush ()
1133 PROTOTYPE: 1161 PROTOTYPE:
1134 CODE: 1162 CODE:
… …
1177 CODE: 1205 CODE:
1178 RETVAL = nreqs; 1206 RETVAL = nreqs;
1179 OUTPUT: 1207 OUTPUT:
1180 RETVAL 1208 RETVAL
1181 1209
1182MODULE = IO::AIO PACKAGE = IO::AIO::CB 1210MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1183 1211
1184void 1212void
1185cancel (aio_req_ornot req) 1213cancel (aio_req_ornot req)
1186 PROTOTYPE: 1214 PROTOTYPE:
1187 CODE: 1215 CODE:
1188 req->cancelled = 1; 1216 req_cancel (req);
1189 1217
1218MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219
1220void
1221add (aio_req grp, ...)
1222 PROTOTYPE: $;@
1223 PPCODE:
1224{
1225 int i;
1226
1227 for (i = 1; i < items; ++i )
1228 {
1229 aio_req req = SvAIO_REQ (ST (i));
1230
1231 req->grp_prev = grp;
1232 req->grp_next = grp->grp_next;
1233 grp->grp_next->grp_prev = req;
1234 grp->grp_next = req;
1235
1236 req->grp = grp;
1237
1238 if (GIMME_V != G_VOID)
1239 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1240 }
1241}
1242

Diff Legend

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