ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/EV-ADNS/ADNS.xs
(Generate patch)

Comparing cvsroot/EV-ADNS/ADNS.xs (file contents):
Revision 1.7 by root, Sat Dec 1 21:01:32 2007 UTC vs.
Revision 1.16 by root, Thu Dec 20 07:13:36 2007 UTC

… …
5#include <poll.h> 5#include <poll.h>
6#include <adns.h> 6#include <adns.h>
7 7
8#include "EVAPI.h" 8#include "EVAPI.h"
9 9
10static HV *stash; 10static struct pollfd *fds;
11static adns_state ads; 11static int nfd, mfd;
12static ev_io *iow;
13static ev_timer tw;
14static ev_idle iw;
15static ev_prepare pw;
16static struct timeval tv_now;
17static int outstanding;
18
19static void
20outstanding_inc (adns_state ads)
21{
22 if (!outstanding++)
23 ev_prepare_start (EV_DEFAULT, &pw);
24}
25
26static void
27outstanding_dec (adns_state ads)
28{
29 --outstanding;
30}
12 31
13struct ctx 32struct ctx
14{ 33{
15 SV *self; 34 SV *self;
35 adns_state ads;
16 adns_query query; 36 adns_query query;
17 SV *cb; 37 SV *cb;
18}; 38};
19 39
20static SV * 40static SV *
… …
26 46
27 return newRV_noinc ((SV *)av); 47 return newRV_noinc ((SV *)av);
28} 48}
29 49
30static void 50static void
31process () 51process (adns_state ads)
32{ 52{
33 dSP; 53 dSP;
34 54
35 for (;;) 55 for (;;)
36 { 56 {
… …
45 if (r) 65 if (r)
46 break; 66 break;
47 67
48 c = (struct ctx *)ctx; 68 c = (struct ctx *)ctx;
49 cb = c->cb; 69 cb = c->cb;
50 c->cb = 0; 70 c->cb = 0; outstanding_dec (ads);
51 ev_unref ();
52 SvREFCNT_dec (c->self); 71 SvREFCNT_dec (c->self);
72
73 assert (cb);
53 74
54 PUSHMARK (SP); 75 PUSHMARK (SP);
55 76
56 EXTEND (SP, a->nrrs + 2); 77 EXTEND (SP, a->nrrs + 2);
57 PUSHs (sv_2mortal (newSViv (a->status))); 78 PUSHs (sv_2mortal (newSViv (a->status)));
… …
69 case adns_r_ptr_raw: 90 case adns_r_ptr_raw:
70 sv = newSVpv (a->rrs.str [i], 0); 91 sv = newSVpv (a->rrs.str [i], 0);
71 break; 92 break;
72 93
73 case adns_r_txt: 94 case adns_r_txt:
74 sv = newSVpvn (a->rrs.manyistr [i]->str, a->rrs.manyistr [i]->i); 95 {
96 AV *av = newAV ();
97 adns_rr_intstr *rr = a->rrs.manyistr [i];
98
99 while (rr->str)
100 {
101 av_push (av, newSVpvn (rr->str, rr->i));
102 ++rr;
103 }
104
105 sv = newRV_noinc ((SV *)av);
106 }
75 break; 107 break;
76 108
77 case adns_r_a: 109 case adns_r_a:
78 sv = newSVpv (inet_ntoa (a->rrs.inaddr [i]), 0); 110 sv = newSVpv (inet_ntoa (a->rrs.inaddr [i]), 0);
79 break; 111 break;
… …
84 116
85 case adns_r_hinfo: 117 case adns_r_hinfo:
86 { 118 {
87 /* untested */ 119 /* untested */
88 AV *av = newAV (); 120 AV *av = newAV ();
89 sv = newRV_noinc ((SV *)av);
90 adns_rr_intstrpair *rr = a->rrs.intstrpair + i; 121 adns_rr_intstrpair *rr = a->rrs.intstrpair + i;
91 122
92 av_push (av, newSVpvn (rr->array [0].str, rr->array [0].i)); 123 av_push (av, newSVpvn (rr->array [0].str, rr->array [0].i));
93 av_push (av, newSVpvn (rr->array [1].str, rr->array [1].i)); 124 av_push (av, newSVpvn (rr->array [1].str, rr->array [1].i));
125
126 sv = newRV_noinc ((SV *)av);
94 } 127 }
95 break; 128 break;
96 129
97 case adns_r_rp: 130 case adns_r_rp:
98 case adns_r_rp_raw: 131 case adns_r_rp_raw:
99 { 132 {
100 /* untested */ 133 /* untested */
101 AV *av = newAV (); 134 AV *av = newAV ();
102 sv = newRV_noinc ((SV *)av);
103 adns_rr_strpair *rr = a->rrs.strpair + i; 135 adns_rr_strpair *rr = a->rrs.strpair + i;
104 136
105 av_push (av, newSVpv (rr->array [0], 0)); 137 av_push (av, newSVpv (rr->array [0], 0));
106 av_push (av, newSVpv (rr->array [1], 0)); 138 av_push (av, newSVpv (rr->array [1], 0));
139
140 sv = newRV_noinc ((SV *)av);
107 } 141 }
108 break; 142 break;
109 143
110 case adns_r_mx: 144 case adns_r_mx:
111 { 145 {
112 AV *av = newAV (); 146 AV *av = newAV ();
113 sv = newRV_noinc ((SV *)av);
114 adns_rr_inthostaddr *rr = a->rrs.inthostaddr + i; 147 adns_rr_inthostaddr *rr = a->rrs.inthostaddr + i;
115 148
116 av_push (av, newSViv (rr->i)); 149 av_push (av, newSViv (rr->i));
117 av_push (av, ha2sv (&rr->ha)); 150 av_push (av, ha2sv (&rr->ha));
151
152 sv = newRV_noinc ((SV *)av);
118 } 153 }
119 break; 154 break;
120 155
121 case adns_r_mx_raw: 156 case adns_r_mx_raw:
122 { 157 {
123 AV *av = newAV (); 158 AV *av = newAV ();
124 sv = newRV_noinc ((SV *)av);
125 adns_rr_intstr *rr = a->rrs.intstr + i; 159 adns_rr_intstr *rr = a->rrs.intstr + i;
126 160
127 av_push (av, newSViv (rr->i)); 161 av_push (av, newSViv (rr->i));
128 av_push (av, newSVpv (rr->str, 0)); 162 av_push (av, newSVpv (rr->str, 0));
163
164 sv = newRV_noinc ((SV *)av);
129 } 165 }
130 break; 166 break;
131 167
132 case adns_r_soa: 168 case adns_r_soa:
133 case adns_r_soa_raw: 169 case adns_r_soa_raw:
134 { 170 {
135 AV *av = newAV (); 171 AV *av = newAV ();
136 sv = newRV_noinc ((SV *)av);
137 adns_rr_soa *rr = a->rrs.soa + i; 172 adns_rr_soa *rr = a->rrs.soa + i;
138 173
139 av_push (av, newSVpv (rr->mname, 0)); 174 av_push (av, newSVpv (rr->mname, 0));
140 av_push (av, newSVpv (rr->rname, 0)); 175 av_push (av, newSVpv (rr->rname, 0));
141 av_push (av, newSVuv (rr->serial)); 176 av_push (av, newSVuv (rr->serial));
142 av_push (av, newSVuv (rr->refresh)); 177 av_push (av, newSVuv (rr->refresh));
143 av_push (av, newSVuv (rr->retry)); 178 av_push (av, newSVuv (rr->retry));
144 av_push (av, newSVuv (rr->expire)); 179 av_push (av, newSVuv (rr->expire));
145 av_push (av, newSVuv (rr->minimum)); 180 av_push (av, newSVuv (rr->minimum));
181
182 sv = newRV_noinc ((SV *)av);
146 } 183 }
147 break; 184 break;
148 185
149 case adns_r_srv_raw: 186 case adns_r_srv_raw:
150 { 187 {
151 AV *av = newAV (); 188 AV *av = newAV ();
152 sv = newRV_noinc ((SV *)av);
153 adns_rr_srvraw *rr = a->rrs.srvraw + i; 189 adns_rr_srvraw *rr = a->rrs.srvraw + i;
154 190
155 av_push (av, newSViv (rr->priority)); 191 av_push (av, newSViv (rr->priority));
156 av_push (av, newSViv (rr->weight)); 192 av_push (av, newSViv (rr->weight));
157 av_push (av, newSViv (rr->port)); 193 av_push (av, newSViv (rr->port));
158 av_push (av, newSVpv (rr->host, 0)); 194 av_push (av, newSVpv (rr->host, 0));
195
196 sv = newRV_noinc ((SV *)av);
159 } 197 }
160 break; 198 break;
161 199
162 case adns_r_srv: 200 case adns_r_srv:
163 { 201 {
164 AV *av = newAV (); 202 AV *av = newAV ();
165 sv = newRV_noinc ((SV *)av);
166 adns_rr_srvha *rr = a->rrs.srvha + i; 203 adns_rr_srvha *rr = a->rrs.srvha + i;
167 204
168 av_push (av, newSViv (rr->priority)); 205 av_push (av, newSViv (rr->priority));
169 av_push (av, newSViv (rr->weight)); 206 av_push (av, newSViv (rr->weight));
170 av_push (av, newSViv (rr->port)); 207 av_push (av, newSViv (rr->port));
171 av_push (av, ha2sv (&rr->ha)); 208 av_push (av, ha2sv (&rr->ha));
209
210 sv = newRV_noinc ((SV *)av);
172 } 211 }
173 break; 212 break;
174 213
175 case adns_r_unknown: 214 case adns_r_unknown:
176 sv = newSVpvn (a->rrs.byteblock [i].data, a->rrs.byteblock [i].len); 215 sv = newSVpvn (a->rrs.byteblock [i].data, a->rrs.byteblock [i].len);
… …
189 228
190 PUTBACK; 229 PUTBACK;
191 call_sv (cb, G_VOID | G_DISCARD | G_EVAL); 230 call_sv (cb, G_VOID | G_DISCARD | G_EVAL);
192 SPAGAIN; 231 SPAGAIN;
193 232
233 if (SvTRUE (ERRSV))
234 warn ("%s", SvPV_nolen (ERRSV));
235
194 SvREFCNT_dec (cb); 236 SvREFCNT_dec (cb);
195 } 237 }
196} 238}
197 239
198static struct pollfd *fds;
199static int nfd, mfd;
200static ev_io *iow;
201static ev_timer tw;
202static ev_prepare prepare_ev;
203static struct timeval tv_now;
204
205static void 240static void
206update_now (EV_P) 241update_now (EV_P)
207{ 242{
208 ev_tstamp t = ev_now (); 243 ev_tstamp t = ev_now (EV_A);
209 244
210 tv_now.tv_sec = (long)t; 245 tv_now.tv_sec = (long)t;
211 tv_now.tv_usec = (long)((t - (ev_tstamp)tv_now.tv_sec) * 1e-6); 246 tv_now.tv_usec = (long)((t - (ev_tstamp)tv_now.tv_sec) * 1e6);
247}
248
249static void
250idle_cb (EV_P_ ev_idle *w, int revents)
251{
252 ev_idle_stop (EV_A, w);
212} 253}
213 254
214static void 255static void
215timer_cb (EV_P_ ev_timer *w, int revents) 256timer_cb (EV_P_ ev_timer *w, int revents)
216{ 257{
258 adns_state ads = (adns_state)w->data;
259 update_now (EV_A);
260
261 adns_processtimeouts (ads, &tv_now);
217} 262}
218 263
219static void 264static void
220io_cb (EV_P_ ev_io *w, int revents) 265io_cb (EV_P_ ev_io *w, int revents)
221{ 266{
267 adns_state ads = (adns_state)w->data;
222 update_now (EV_A); 268 update_now (EV_A);
223 269
224 if (revents & EV_READ ) adns_processreadable (ads, w->fd, &tv_now); 270 if (revents & EV_READ ) adns_processreadable (ads, w->fd, &tv_now);
225 if (revents & EV_WRITE) adns_processwriteable (ads, w->fd, &tv_now); 271 if (revents & EV_WRITE) adns_processwriteable (ads, w->fd, &tv_now);
226} 272}
… …
229static void 275static void
230prepare_cb (EV_P_ ev_prepare *w, int revents) 276prepare_cb (EV_P_ ev_prepare *w, int revents)
231{ 277{
232 int i; 278 int i;
233 int timeout = 3600000; 279 int timeout = 3600000;
280 adns_state ads = (adns_state)w->data;
234 281
235 if (ev_is_active (&tw)) 282 if (ev_is_active (&tw))
283 ev_timer_stop (EV_A, &tw);
284
285 if (ev_is_active (&iw))
286 ev_idle_stop (EV_A, &iw);
287
288 for (i = 0; i < nfd; ++i)
289 ev_io_stop (EV_A, iow + i);
290
291 process (ads);
292
293 if (!outstanding)
236 { 294 {
237 ev_ref ();
238 ev_timer_stop (EV_A_ &tw); 295 ev_prepare_stop (EV_A, w);
296 return;
239 } 297 }
240
241 for (i = 0; i < nfd; ++i)
242 {
243 ev_ref ();
244 ev_io_stop (EV_A_ iow + i);
245 }
246
247 process ();
248 298
249 update_now (EV_A); 299 update_now (EV_A);
250 300
251 nfd = mfd; 301 nfd = mfd;
252 302
… …
257 free (iow); iow = malloc (mfd * sizeof (ev_io)); 307 free (iow); iow = malloc (mfd * sizeof (ev_io));
258 free (fds); fds = malloc (mfd * sizeof (struct pollfd)); 308 free (fds); fds = malloc (mfd * sizeof (struct pollfd));
259 } 309 }
260 310
261 ev_timer_set (&tw, timeout * 1e-3, 0.); 311 ev_timer_set (&tw, timeout * 1e-3, 0.);
262 ev_timer_start (EV_A_ &tw); 312 ev_timer_start (EV_A, &tw);
263 ev_unref ();
264 313
265 // create one ev_io per pollfd 314 // create one ev_io per pollfd
266 for (i = 0; i < nfd; ++i) 315 for (i = 0; i < nfd; ++i)
267 { 316 {
317 ev_io *w = iow + i;
318
268 ev_io_init (iow + i, io_cb, fds [i].fd, 319 ev_io_init (w, io_cb, fds [i].fd,
269 ((fds [i].events & POLLIN ? EV_READ : 0) 320 ((fds [i].events & POLLIN ? EV_READ : 0)
270 | (fds [i].events & POLLOUT ? EV_WRITE : 0))); 321 | (fds [i].events & POLLOUT ? EV_WRITE : 0)));
271 322
323 w->data = (void *)ads;
272 ev_io_start (EV_A_ iow + i); 324 ev_io_start (EV_A, w);
273 ev_unref ();
274 } 325 }
275} 326}
327
328static HV *stash;
329static adns_state ads;
276 330
277MODULE = EV::ADNS PACKAGE = EV::ADNS 331MODULE = EV::ADNS PACKAGE = EV::ADNS
278 332
279PROTOTYPES: ENABLE 333PROTOTYPES: ENABLE
280 334
… …
368 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 422 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
369 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 423 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
370 424
371 I_EV_API ("EV::ADNS"); 425 I_EV_API ("EV::ADNS");
372 426
373 ev_prepare_init (&prepare_ev, prepare_cb); ev_prepare_start (EV_DEFAULT_ &prepare_ev); 427 adns_init (&ads, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn | adns_if_noautosys, 0);
374 ev_unref ();
375 428
429 ev_prepare_init (&pw, prepare_cb);
430 pw.data = (void *)ads;
431
432 ev_init (&iw, idle_cb); ev_set_priority (&iw, EV_MINPRI);
433 iw.data = (void *)ads;
376 ev_init (&tw, timer_cb); 434 ev_init (&tw, timer_cb);
377 435 tw.data = (void *)ads;
378 adns_init (&ads, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn | adns_if_noautosys, 0);
379} 436}
380 437
381void submit (char *owner, int type, int flags, SV *cb) 438void submit (char *owner, int type, int flags, SV *cb)
382 PPCODE: 439 PPCODE:
383{ 440{
384 SV *csv = NEWSV (0, sizeof (struct ctx)); 441 SV *csv = NEWSV (0, sizeof (struct ctx));
385 struct ctx *c = (struct ctx *)SvPVX (csv); 442 struct ctx *c = (struct ctx *)SvPVX (csv);
386 int r = adns_submit (ads, owner, type, flags, (void *)c, &c->query); 443 int r = adns_submit (ads, owner, type, flags, (void *)c, &c->query);
444
445 outstanding_inc (ads);
387 446
388 if (r) 447 if (r)
389 { 448 {
390 SvREFCNT_dec (csv); 449 SvREFCNT_dec (csv);
391 errno = r; 450 errno = r;
392 XSRETURN_EMPTY; 451 XSRETURN_EMPTY;
393 } 452 }
394 else 453 else
395 { 454 {
396 ev_ref ();
397 SvPOK_only (csv); 455 SvPOK_only (csv);
398 SvCUR_set (csv, sizeof (struct ctx)); 456 SvCUR_set (csv, sizeof (struct ctx));
399 457
400 c->self = csv; 458 c->self = csv;
401 c->cb = newSVsv (cb); 459 c->cb = newSVsv (cb);
460 c->ads = ads;
461
462 if (!ev_is_active (&iw))
463 ev_idle_start (EV_DEFAULT, &iw);
402 464
403 if (GIMME_V != G_VOID) 465 if (GIMME_V != G_VOID)
404 { 466 {
405 csv = sv_2mortal (newRV_inc (csv)); 467 csv = sv_2mortal (newRV_inc (csv));
406 sv_bless (csv, stash); 468 sv_bless (csv, stash);
… …
422 484
423 c = (struct ctx *)SvPVX (SvRV (req)); 485 c = (struct ctx *)SvPVX (SvRV (req));
424 486
425 if (c->cb) 487 if (c->cb)
426 { 488 {
427 ev_unref ();
428 SvREFCNT_dec (c->cb); 489 SvREFCNT_dec (c->cb);
429 c->cb = 0; 490 c->cb = 0; outstanding_dec (c->ads);
430 adns_cancel (c->query); 491 adns_cancel (c->query);
431 SvREFCNT_dec (c->self); 492 SvREFCNT_dec (c->self);
432 } 493 }
433} 494}
434 495

Diff Legend

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