ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.49 by pcg, Sun Nov 23 03:34:13 2003 UTC vs.
Revision 1.76 by root, Thu Oct 26 08:45:56 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#include "patchlevel.h" 9#include "patchlevel.h"
6 10
7#if PATCHLEVEL < 6 11#if PERL_VERSION < 6
8# ifndef PL_ppaddr 12# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr 13# define PL_ppaddr ppaddr
10# endif 14# endif
11# ifndef call_sv 15# ifndef call_sv
12# define call_sv perl_call_sv 16# define call_sv perl_call_sv
… …
23# ifndef IS_PADCONST 27# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
25# endif 29# endif
26#endif 30#endif
27 31
28#include "libcoro/coro.c"
29
30#include <signal.h> 32#include <errno.h>
31 33
32#ifdef HAVE_MMAP 34#ifdef HAVE_MMAP
33# include <unistd.h> 35# include <unistd.h>
34# include <sys/mman.h> 36# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS 37# ifndef MAP_ANONYMOUS
… …
39# undef HAVE_MMAP 41# undef HAVE_MMAP
40# endif 42# endif
41# endif 43# endif
42#endif 44#endif
43 45
44#define MAY_FLUSH /* increases codesize and is rarely used */
45
46#define SUB_INIT "Coro::State::initialize" 46#define SUB_INIT "Coro::State::initialize"
47#define UCORO_STATE "_coro_state" 47#define UCORO_STATE "_coro_state"
48 48
49/* The next macro should declare a variable stacklevel that contains and approximation 49/* The next macro should declare a variable stacklevel that contains and approximation
50 * to the current C stack pointer. Its property is that it changes with each call 50 * to the current C stack pointer. Its property is that it changes with each call
… …
55 55
56#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
57 57
58#include "CoroAPI.h" 58#include "CoroAPI.h"
59 59
60#ifdef USE_ITHREADS
61static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else
65# define LOCK (void)0
66# define UNLOCK (void)0
67#endif
68
60static struct CoroAPI coroapi; 69static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash;
72static SV *ucoro_state_sv;
73static U32 ucoro_state_hash;
74static SV *coro_mortal; /* will be freed after next transfer */
61 75
62/* this is actually not only the c stack but also c registers etc... */ 76/* this is actually not only the c stack but also c registers etc... */
63typedef struct { 77typedef struct {
64 int refcnt; /* pointer reference counter */ 78 int refcnt; /* pointer reference counter */
65 int usecnt; /* shared by how many coroutines */ 79 int usecnt; /* shared by how many coroutines */
… …
95 AV *mainstack; 109 AV *mainstack;
96 SV **stack_sp; 110 SV **stack_sp;
97 OP *op; 111 OP *op;
98 SV **curpad; 112 SV **curpad;
99 AV *comppad; 113 AV *comppad;
114 CV *compcv;
100 SV **stack_base; 115 SV **stack_base;
101 SV **stack_max; 116 SV **stack_max;
102 SV **tmps_stack; 117 SV **tmps_stack;
103 I32 tmps_floor; 118 I32 tmps_floor;
104 I32 tmps_ix; 119 I32 tmps_ix;
… …
113 I32 savestack_ix; 128 I32 savestack_ix;
114 I32 savestack_max; 129 I32 savestack_max;
115 OP **retstack; 130 OP **retstack;
116 I32 retstack_ix; 131 I32 retstack_ix;
117 I32 retstack_max; 132 I32 retstack_max;
133 PMOP *curpm;
118 COP *curcop; 134 COP *curcop;
119 JMPENV *top_env; 135 JMPENV *top_env;
120 136
121 /* data associated with this coroutine (initial args) */ 137 /* data associated with this coroutine (initial args) */
122 AV *args; 138 AV *args;
123}; 139};
124 140
125typedef struct coro *Coro__State; 141typedef struct coro *Coro__State;
126typedef struct coro *Coro__State_or_hashref; 142typedef struct coro *Coro__State_or_hashref;
127 143
128static AV *main_mainstack; /* used to differentiate between $main and others */
129static HV *coro_state_stash;
130static SV *ucoro_state_sv;
131static U32 ucoro_state_hash;
132static HV *padlist_cache;
133static SV *coro_mortal; /* will be freed after next transfer */
134
135/* mostly copied from op.c:cv_clone2 */ 144/* mostly copied from op.c:cv_clone2 */
136STATIC AV * 145STATIC AV *
137clone_padlist (AV *protopadlist) 146clone_padlist (pTHX_ AV *protopadlist)
138{ 147{
139 AV *av; 148 AV *av;
140 I32 ix; 149 I32 ix;
141 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 150 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
142 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 151 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
… …
161 av_store (newpadlist, 1, (SV *) newpad); 170 av_store (newpadlist, 1, (SV *) newpad);
162 171
163 av = newAV (); /* will be @_ */ 172 av = newAV (); /* will be @_ */
164 av_extend (av, 0); 173 av_extend (av, 0);
165 av_store (newpad, 0, (SV *) av); 174 av_store (newpad, 0, (SV *) av);
166 AvFLAGS (av) = AVf_REIFY; 175 AvREIFY_on (av);
167 176
168 for (ix = fpad; ix > 0; ix--) 177 for (ix = fpad; ix > 0; ix--)
169 { 178 {
170 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 179 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
180
171 if (namesv && namesv != &PL_sv_undef) 181 if (namesv && namesv != &PL_sv_undef)
172 { 182 {
173 char *name = SvPVX (namesv); /* XXX */ 183 char *name = SvPVX (namesv); /* XXX */
184
174 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 185 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
175 { /* lexical from outside? */ 186 { /* lexical from outside? */
176 npad[ix] = SvREFCNT_inc (ppad[ix]); 187 npad[ix] = SvREFCNT_inc (ppad[ix]);
177 } 188 }
178 else 189 else
… …
184 sv = (SV *) newAV (); 195 sv = (SV *) newAV ();
185 else if (*name == '%') 196 else if (*name == '%')
186 sv = (SV *) newHV (); 197 sv = (SV *) newHV ();
187 else 198 else
188 sv = NEWSV (0, 0); 199 sv = NEWSV (0, 0);
200
189#ifdef SvPADBUSY 201#ifdef SvPADBUSY
190 if (!SvPADBUSY (sv)) 202 if (!SvPADBUSY (sv))
191#endif 203#endif
192 SvPADMY_on (sv); 204 SvPADMY_on (sv);
205
193 npad[ix] = sv; 206 npad[ix] = sv;
194 } 207 }
195 } 208 }
196 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 209 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
197 { 210 {
… …
226#endif 239#endif
227 240
228 return newpadlist; 241 return newpadlist;
229} 242}
230 243
231#ifdef MAY_FLUSH
232STATIC void 244STATIC void
233free_padlist (AV *padlist) 245free_padlist (pTHX_ AV *padlist)
234{ 246{
235 /* may be during global destruction */ 247 /* may be during global destruction */
236 if (SvREFCNT(padlist)) 248 if (SvREFCNT (padlist))
237 { 249 {
238 I32 i = AvFILLp(padlist); 250 I32 i = AvFILLp (padlist);
239 while (i >= 0) 251 while (i >= 0)
240 { 252 {
241 SV **svp = av_fetch(padlist, i--, FALSE); 253 SV **svp = av_fetch (padlist, i--, FALSE);
242 SV *sv = svp ? *svp : Nullsv;
243 if (sv) 254 if (svp)
255 {
256 SV *sv;
257 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
244 SvREFCNT_dec(sv); 258 SvREFCNT_dec (sv);
259
260 SvREFCNT_dec (*svp);
261 }
245 } 262 }
246 263
247 SvREFCNT_dec((SV*)padlist); 264 SvREFCNT_dec ((SV*)padlist);
248 } 265 }
249} 266}
250#endif 267
268STATIC int
269coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
270{
271 AV *padlist;
272 AV *av = (AV *)mg->mg_obj;
273
274 /* casting is fun. */
275 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
276 free_padlist (aTHX_ padlist);
277
278 SvREFCNT_dec (av);
279
280 return 0;
281}
282
283#define PERL_MAGIC_coro PERL_MAGIC_ext
284
285static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
251 286
252/* the next two functions merely cache the padlists */ 287/* the next two functions merely cache the padlists */
253STATIC void 288STATIC void
254get_padlist (CV *cv) 289get_padlist (pTHX_ CV *cv)
255{ 290{
256 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 291 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
257 292
258 if (he && AvFILLp ((AV *)*he) >= 0) 293 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
259 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 294 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
260 else 295 else
261 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 296 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
262} 297}
263 298
264STATIC void 299STATIC void
265put_padlist (CV *cv) 300put_padlist (pTHX_ CV *cv)
266{ 301{
267 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 302 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
268 303
269 if (SvTYPE (*he) != SVt_PVAV) 304 if (!mg)
270 { 305 {
271 SvREFCNT_dec (*he); 306 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
307 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
308 mg->mg_virtual = &vtbl_coro;
272 *he = (SV *)newAV (); 309 mg->mg_obj = (SV *)newAV ();
273 } 310 }
274 311
275 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 312 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
276} 313}
277
278#ifdef MAY_FLUSH
279STATIC void
280flush_padlist_cache ()
281{
282 HV *hv = padlist_cache;
283 padlist_cache = newHV ();
284
285 if (hv_iterinit (hv))
286 {
287 HE *he;
288 AV *padlist;
289
290 while (!!(he = hv_iternext (hv)))
291 {
292 AV *av = (AV *)HeVAL(he);
293
294 /* casting is fun. */
295 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
296 free_padlist (padlist);
297 }
298 }
299
300 SvREFCNT_dec (hv);
301}
302#endif
303 314
304#define SB do { 315#define SB do {
305#define SE } while (0) 316#define SE } while (0)
306 317
307#define LOAD(state) load_state(aTHX_ (state)); 318#define LOAD(state) load_state(aTHX_ (state));
… …
320 PL_mainstack = c->mainstack; 331 PL_mainstack = c->mainstack;
321 PL_stack_sp = c->stack_sp; 332 PL_stack_sp = c->stack_sp;
322 PL_op = c->op; 333 PL_op = c->op;
323 PL_curpad = c->curpad; 334 PL_curpad = c->curpad;
324 PL_comppad = c->comppad; 335 PL_comppad = c->comppad;
336 PL_compcv = c->compcv;
325 PL_stack_base = c->stack_base; 337 PL_stack_base = c->stack_base;
326 PL_stack_max = c->stack_max; 338 PL_stack_max = c->stack_max;
327 PL_tmps_stack = c->tmps_stack; 339 PL_tmps_stack = c->tmps_stack;
328 PL_tmps_floor = c->tmps_floor; 340 PL_tmps_floor = c->tmps_floor;
329 PL_tmps_ix = c->tmps_ix; 341 PL_tmps_ix = c->tmps_ix;
… …
335 PL_scopestack_ix = c->scopestack_ix; 347 PL_scopestack_ix = c->scopestack_ix;
336 PL_scopestack_max = c->scopestack_max; 348 PL_scopestack_max = c->scopestack_max;
337 PL_savestack = c->savestack; 349 PL_savestack = c->savestack;
338 PL_savestack_ix = c->savestack_ix; 350 PL_savestack_ix = c->savestack_ix;
339 PL_savestack_max = c->savestack_max; 351 PL_savestack_max = c->savestack_max;
352#if PERL_VERSION < 9
340 PL_retstack = c->retstack; 353 PL_retstack = c->retstack;
341 PL_retstack_ix = c->retstack_ix; 354 PL_retstack_ix = c->retstack_ix;
342 PL_retstack_max = c->retstack_max; 355 PL_retstack_max = c->retstack_max;
356#endif
357 PL_curpm = c->curpm;
343 PL_curcop = c->curcop; 358 PL_curcop = c->curcop;
344 PL_top_env = c->top_env; 359 PL_top_env = c->top_env;
345 360
346 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 361 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
347 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 362 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
356 { 371 {
357 AV *padlist = (AV *)POPs; 372 AV *padlist = (AV *)POPs;
358 373
359 if (padlist) 374 if (padlist)
360 { 375 {
361 put_padlist (cv); /* mark this padlist as available */ 376 put_padlist (aTHX_ cv); /* mark this padlist as available */
362 CvPADLIST(cv) = padlist; 377 CvPADLIST(cv) = padlist;
363#ifdef USE_THREADS
364 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
365#endif
366 } 378 }
367 379
368 ++CvDEPTH(cv); 380 ++CvDEPTH(cv);
369 } 381 }
370 382
… …
397 if (CxTYPE(cx) == CXt_SUB) 409 if (CxTYPE(cx) == CXt_SUB)
398 { 410 {
399 CV *cv = cx->blk_sub.cv; 411 CV *cv = cx->blk_sub.cv;
400 if (CvDEPTH(cv)) 412 if (CvDEPTH(cv))
401 { 413 {
402#ifdef USE_THREADS
403 /*XPUSHs ((SV *)CvOWNER(cv));*/
404 /*CvOWNER(cv) = 0;*/
405 /*error must unlock this cv etc.. etc...*/
406#endif
407 EXTEND (SP, CvDEPTH(cv)*2); 414 EXTEND (SP, CvDEPTH(cv)*2);
408 415
409 while (--CvDEPTH(cv)) 416 while (--CvDEPTH(cv))
410 { 417 {
411 /* this tells the restore code to increment CvDEPTH */ 418 /* this tells the restore code to increment CvDEPTH */
… …
414 } 421 }
415 422
416 PUSHs ((SV *)CvPADLIST(cv)); 423 PUSHs ((SV *)CvPADLIST(cv));
417 PUSHs ((SV *)cv); 424 PUSHs ((SV *)cv);
418 425
419 get_padlist (cv); /* this is a monster */ 426 get_padlist (aTHX_ cv); /* this is a monster */
420 } 427 }
421 } 428 }
422#ifdef CXt_FORMAT 429#ifdef CXt_FORMAT
423 else if (CxTYPE(cx) == CXt_FORMAT) 430 else if (CxTYPE(cx) == CXt_FORMAT)
424 { 431 {
… …
452 c->mainstack = PL_mainstack; 459 c->mainstack = PL_mainstack;
453 c->stack_sp = PL_stack_sp; 460 c->stack_sp = PL_stack_sp;
454 c->op = PL_op; 461 c->op = PL_op;
455 c->curpad = PL_curpad; 462 c->curpad = PL_curpad;
456 c->comppad = PL_comppad; 463 c->comppad = PL_comppad;
464 c->compcv = PL_compcv;
457 c->stack_base = PL_stack_base; 465 c->stack_base = PL_stack_base;
458 c->stack_max = PL_stack_max; 466 c->stack_max = PL_stack_max;
459 c->tmps_stack = PL_tmps_stack; 467 c->tmps_stack = PL_tmps_stack;
460 c->tmps_floor = PL_tmps_floor; 468 c->tmps_floor = PL_tmps_floor;
461 c->tmps_ix = PL_tmps_ix; 469 c->tmps_ix = PL_tmps_ix;
… …
467 c->scopestack_ix = PL_scopestack_ix; 475 c->scopestack_ix = PL_scopestack_ix;
468 c->scopestack_max = PL_scopestack_max; 476 c->scopestack_max = PL_scopestack_max;
469 c->savestack = PL_savestack; 477 c->savestack = PL_savestack;
470 c->savestack_ix = PL_savestack_ix; 478 c->savestack_ix = PL_savestack_ix;
471 c->savestack_max = PL_savestack_max; 479 c->savestack_max = PL_savestack_max;
480#if PERL_VERSION < 9
472 c->retstack = PL_retstack; 481 c->retstack = PL_retstack;
473 c->retstack_ix = PL_retstack_ix; 482 c->retstack_ix = PL_retstack_ix;
474 c->retstack_max = PL_retstack_max; 483 c->retstack_max = PL_retstack_max;
484#endif
485 c->curpm = PL_curpm;
475 c->curcop = PL_curcop; 486 c->curcop = PL_curcop;
476 c->top_env = PL_top_env; 487 c->top_env = PL_top_env;
477} 488}
478 489
479/* 490/*
480 * allocate various perl stacks. This is an exact copy 491 * allocate various perl stacks. This is an exact copy
481 * of perl.c:init_stacks, except that it uses less memory 492 * of perl.c:init_stacks, except that it uses less memory
482 * on the assumption that coroutines do not usually need 493 * on the (sometimes correct) assumption that coroutines do
483 * a lot of stackspace. 494 * not usually need a lot of stackspace.
484 */ 495 */
485STATIC void 496STATIC void
486coro_init_stacks (pTHX) 497coro_init_stacks (pTHX)
487{ 498{
499 LOCK;
500
488 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 501 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
489 PL_curstackinfo->si_type = PERLSI_MAIN; 502 PL_curstackinfo->si_type = PERLSI_MAIN;
490 PL_curstack = PL_curstackinfo->si_stack; 503 PL_curstack = PL_curstackinfo->si_stack;
491 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
492 505
… …
513 526
514 New(54,PL_savestack,96,ANY); 527 New(54,PL_savestack,96,ANY);
515 PL_savestack_ix = 0; 528 PL_savestack_ix = 0;
516 PL_savestack_max = 96; 529 PL_savestack_max = 96;
517 530
531#if PERL_VERSION < 9
518 New(54,PL_retstack,8,OP*); 532 New(54,PL_retstack,8,OP*);
519 PL_retstack_ix = 0; 533 PL_retstack_ix = 0;
520 PL_retstack_max = 8; 534 PL_retstack_max = 8;
535#endif
536
537 UNLOCK;
521} 538}
522 539
523/* 540/*
524 * destroy the stacks, the callchain etc... 541 * destroy the stacks, the callchain etc...
525 */ 542 */
… …
527destroy_stacks(pTHX) 544destroy_stacks(pTHX)
528{ 545{
529 if (!IN_DESTRUCT) 546 if (!IN_DESTRUCT)
530 { 547 {
531 /* is this ugly, I ask? */ 548 /* is this ugly, I ask? */
532 while (PL_scopestack_ix) 549 LEAVE_SCOPE (0);
533 LEAVE;
534 550
535 /* sure it is, but more important: is it correct?? :/ */ 551 /* sure it is, but more important: is it correct?? :/ */
536 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
537 FREETMPS; 552 FREETMPS;
553
554 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
538 } 555 }
539 556
540 while (PL_curstackinfo->si_next) 557 while (PL_curstackinfo->si_next)
541 PL_curstackinfo = PL_curstackinfo->si_next; 558 PL_curstackinfo = PL_curstackinfo->si_next;
542 559
543 while (PL_curstackinfo) 560 while (PL_curstackinfo)
544 { 561 {
545 PERL_SI *p = PL_curstackinfo->si_prev; 562 PERL_SI *p = PL_curstackinfo->si_prev;
546 563
547 { 564 { /*D*//*remove*/
548 dSP; 565 dSP;
549 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 566 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
550 PUTBACK; /* possibly superfluous */ 567 PUTBACK; /* possibly superfluous */
551 } 568 }
552 569
553 if (!IN_DESTRUCT) 570 if (!IN_DESTRUCT)
554 { 571 {
555 dounwind(-1); 572 dounwind (-1);/*D*//*remove*/
556 SvREFCNT_dec(PL_curstackinfo->si_stack); 573 SvREFCNT_dec (PL_curstackinfo->si_stack);
557 } 574 }
558 575
559 Safefree(PL_curstackinfo->si_cxstack); 576 Safefree (PL_curstackinfo->si_cxstack);
560 Safefree(PL_curstackinfo); 577 Safefree (PL_curstackinfo);
561 PL_curstackinfo = p; 578 PL_curstackinfo = p;
562 } 579 }
563 580
564 Safefree(PL_tmps_stack); 581 Safefree (PL_tmps_stack);
565 Safefree(PL_markstack); 582 Safefree (PL_markstack);
566 Safefree(PL_scopestack); 583 Safefree (PL_scopestack);
567 Safefree(PL_savestack); 584 Safefree (PL_savestack);
585#if PERL_VERSION < 9
568 Safefree(PL_retstack); 586 Safefree (PL_retstack);
587#endif
569} 588}
570 589
571static void 590static void
572allocate_stack (Coro__State ctx, int alloc) 591allocate_stack (Coro__State ctx, int alloc)
573{ 592{
… …
576 New (0, stack, 1, coro_stack); 595 New (0, stack, 1, coro_stack);
577 596
578 stack->refcnt = 1; 597 stack->refcnt = 1;
579 stack->usecnt = 1; 598 stack->usecnt = 1;
580 stack->gencnt = ctx->gencnt = 0; 599 stack->gencnt = ctx->gencnt = 0;
600
581 if (alloc) 601 if (alloc)
582 { 602 {
583#if HAVE_MMAP 603#if HAVE_MMAP
584 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 604 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */
585 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 605 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
586 if (stack->sptr == (void *)-1) 606 if (stack->sptr == (void *)-1)
587#endif 607#endif
588 { 608 {
589 /*FIXME*//*D*//* reasonable stack size! */
590 stack->ssize = -4096 * sizeof (long); 609 stack->ssize = - (STACKSIZE * (long)sizeof (long));
591 New (0, stack->sptr, 4096, long); 610 New (0, stack->sptr, STACKSIZE, long);
592 } 611 }
593 } 612 }
594 else 613 else
595 stack->sptr = 0; 614 stack->sptr = 0;
596 615
… …
626setup_coro (void *arg) 645setup_coro (void *arg)
627{ 646{
628 /* 647 /*
629 * emulate part of the perl startup here. 648 * emulate part of the perl startup here.
630 */ 649 */
650 dTHX;
631 dSP; 651 dSP;
632 Coro__State ctx = (Coro__State)arg; 652 Coro__State ctx = (Coro__State)arg;
633 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 653 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
634 654
635 coro_init_stacks (aTHX); 655 coro_init_stacks (aTHX);
636 /*PL_curcop = 0;*/ 656 /*PL_curcop = 0;*/
637 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 657 /*PL_in_eval = PL_in_eval;*/ /* inherit */
638 SvREFCNT_dec (GvAV (PL_defgv)); 658 SvREFCNT_dec (GvAV (PL_defgv));
… …
684continue_coro (void *arg) 704continue_coro (void *arg)
685{ 705{
686 /* 706 /*
687 * this is a _very_ stripped down perl interpreter ;) 707 * this is a _very_ stripped down perl interpreter ;)
688 */ 708 */
709 dTHX;
689 Coro__State ctx = (Coro__State)arg; 710 Coro__State ctx = (Coro__State)arg;
690 JMPENV coro_start_env;
691 711
692 PL_top_env = &ctx->start_env; 712 PL_top_env = &ctx->start_env;
693 713
694 ctx->cursp = 0; 714 ctx->cursp = 0;
695 PL_op = PL_op->op_next; 715 PL_op = PL_op->op_next;
… …
697 717
698 abort (); 718 abort ();
699} 719}
700 720
701STATIC void 721STATIC void
702transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 722transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
703{ 723{
704 dSTACKLEVEL; 724 dSTACKLEVEL;
705 static struct coro *xnext;
706 725
707 if (prev != next) 726 if (prev != next)
708 { 727 {
709 xnext = next;
710
711 if (next->mainstack) 728 if (next->mainstack)
712 { 729 {
730 LOCK;
713 SAVE (prev, flags); 731 SAVE (prev, flags);
714 LOAD (next); 732 LOAD (next);
733 UNLOCK;
715 734
716 /* mark this state as in-use */ 735 /* mark this state as in-use */
717 next->mainstack = 0; 736 next->mainstack = 0;
718 next->tmps_ix = -2; 737 next->tmps_ix = -2;
719 738
… …
738 continue_coro, (void *)next, 757 continue_coro, (void *)next,
739 next->stack->sptr, labs (next->stack->ssize)); 758 next->stack->sptr, labs (next->stack->ssize));
740 } 759 }
741 760
742 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 761 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
762 prev->cursp = stacklevel;
743 /* don't add any code here */ 763 /* don't add any code here */
744 } 764 }
745 765 else
766 next->cursp = stacklevel;
746 } 767 }
747 else if (next->tmps_ix == -2) 768 else if (next->tmps_ix == -2)
748 croak ("tried to transfer to running coroutine"); 769 croak ("tried to transfer to running coroutine");
749 else 770 else
750 { 771 {
772 LOCK;
751 SAVE (prev, -1); /* first get rid of the old state */ 773 SAVE (prev, -1); /* first get rid of the old state */
774 UNLOCK;
752 775
753 if (flags & TRANSFER_SAVE_CCTXT) 776 if (flags & TRANSFER_SAVE_CCTXT)
754 { 777 {
755 if (!prev->stack) 778 if (!prev->stack)
756 allocate_stack (prev, 0); 779 allocate_stack (prev, 0);
… …
758 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 781 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
759 { 782 {
760 PL_top_env = &next->start_env; 783 PL_top_env = &next->start_env;
761 784
762 setup_coro (next); 785 setup_coro (next);
786 next->cursp = stacklevel;
763 787
764 prev->stack->refcnt++; 788 prev->stack->refcnt++;
765 prev->stack->usecnt++; 789 prev->stack->usecnt++;
766 next->stack = prev->stack; 790 next->stack = prev->stack;
767 next->gencnt = prev->gencnt; 791 next->gencnt = prev->gencnt;
… …
772 allocate_stack (next, 1); 796 allocate_stack (next, 1);
773 coro_create (&(next->stack->cctx), 797 coro_create (&(next->stack->cctx),
774 setup_coro, (void *)next, 798 setup_coro, (void *)next,
775 next->stack->sptr, labs (next->stack->ssize)); 799 next->stack->sptr, labs (next->stack->ssize));
776 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 800 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
801 prev->cursp = stacklevel;
777 /* don't add any code here */ 802 /* don't add any code here */
778 } 803 }
779 } 804 }
780 else 805 else
806 {
781 setup_coro (next); 807 setup_coro (next);
808 next->cursp = stacklevel;
809 }
782 } 810 }
783
784 /*
785 * xnext is now either prev or next, depending on wether
786 * we switched the c stack or not. that's why I use a global
787 * variable, that should become thread-specific at one point.
788 */
789 xnext->cursp = stacklevel;
790 } 811 }
791 812
813 LOCK;
792 if (coro_mortal) 814 if (coro_mortal)
793 { 815 {
794 SvREFCNT_dec (coro_mortal); 816 SvREFCNT_dec (coro_mortal);
795 coro_mortal = 0; 817 coro_mortal = 0;
796 } 818 }
819 UNLOCK;
797} 820}
798 821
799#define SV_CORO(sv,func) \ 822#define SV_CORO(sv,func) \
800 do { \ 823 do { \
801 if (SvROK (sv)) \ 824 if (SvROK (sv)) \
802 sv = SvRV (sv); \ 825 sv = SvRV (sv); \
803 \ 826 \
804 if (SvTYPE(sv) == SVt_PVHV) \ 827 if (SvTYPE (sv) == SVt_PVHV) \
805 { \ 828 { \
806 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 829 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
807 \ 830 \
808 if (!he) \ 831 if (!he) \
809 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 832 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
810 \ 833 \
811 (sv) = SvRV (HeVAL(he)); \ 834 (sv) = SvRV (HeVAL(he)); \
812 } \ 835 } \
813 \ 836 \
814 /* must also be changed inside Coro::Cont::yield */ \ 837 /* must also be changed inside Coro::Cont::yield */ \
815 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 838 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
816 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 839 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
817 \ 840 \
818 } while(0) 841 } while(0)
819 842
820#define SvSTATE(sv) (struct coro *)SvIV (sv) 843#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
821 844
822static void 845static void
823api_transfer(pTHX_ SV *prev, SV *next, int flags) 846api_transfer(pTHX_ SV *prev, SV *next, int flags)
824{ 847{
825 SV_CORO (prev, "Coro::transfer"); 848 SV_CORO (prev, "Coro::transfer");
826 SV_CORO (next, "Coro::transfer"); 849 SV_CORO (next, "Coro::transfer");
827 850
828 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 851 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
829} 852}
830 853
831/** Coro ********************************************************************/ 854/** Coro ********************************************************************/
832 855
833#define PRIO_MAX 3 856#define PRIO_MAX 3
… …
841static GV *coro_current, *coro_idle; 864static GV *coro_current, *coro_idle;
842static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 865static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
843static int coro_nready; 866static int coro_nready;
844 867
845static void 868static void
846coro_enq (SV *sv) 869coro_enq (pTHX_ SV *sv)
847{ 870{
871 SV **xprio;
872 int prio;
873
848 if (SvTYPE (sv) == SVt_PVHV) 874 if (SvTYPE (sv) != SVt_PVHV)
849 {
850 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
851 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
852
853 prio = prio > PRIO_MAX ? PRIO_MAX
854 : prio < PRIO_MIN ? PRIO_MIN
855 : prio;
856
857 av_push (coro_ready [prio - PRIO_MIN], sv);
858 coro_nready++;
859
860 return;
861 }
862
863 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 875 croak ("Coro::ready tried to enqueue something that is not a coroutine");
876
877 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
878 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
879
880 prio = prio > PRIO_MAX ? PRIO_MAX
881 : prio < PRIO_MIN ? PRIO_MIN
882 : prio;
883
884 av_push (coro_ready [prio - PRIO_MIN], sv);
885 coro_nready++;
864} 886}
865 887
866static SV * 888static SV *
867coro_deq (int min_prio) 889coro_deq (pTHX_ int min_prio)
868{ 890{
869 int prio = PRIO_MAX - PRIO_MIN; 891 int prio = PRIO_MAX - PRIO_MIN;
870 892
871 min_prio -= PRIO_MIN; 893 min_prio -= PRIO_MIN;
872 if (min_prio < 0) 894 if (min_prio < 0)
… …
883} 905}
884 906
885static void 907static void
886api_ready (SV *coro) 908api_ready (SV *coro)
887{ 909{
910 dTHX;
911
888 if (SvROK (coro)) 912 if (SvROK (coro))
889 coro = SvRV (coro); 913 coro = SvRV (coro);
890 914
915 LOCK;
891 coro_enq (SvREFCNT_inc (coro)); 916 coro_enq (aTHX_ SvREFCNT_inc (coro));
917 UNLOCK;
892} 918}
893 919
894static void 920static void
895api_schedule (void) 921api_schedule (void)
896{ 922{
923 dTHX;
924
897 SV *prev, *next; 925 SV *prev, *next;
898 926
927 LOCK;
928
899 prev = SvRV (GvSV (coro_current)); 929 prev = SvRV (GvSV (coro_current));
900 next = coro_deq (PRIO_MIN); 930 next = coro_deq (aTHX_ PRIO_MIN);
901 931
902 if (!next) 932 if (!next)
903 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 933 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
904 934
905 /* free this only after the transfer */ 935 /* free this only after the transfer */
… …
908 938
909 SvRV (GvSV (coro_current)) = next; 939 SvRV (GvSV (coro_current)) = next;
910 940
911 SV_CORO (next, "Coro::schedule"); 941 SV_CORO (next, "Coro::schedule");
912 942
943 UNLOCK;
944
913 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 945 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
914 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 946 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
915} 947}
916 948
917static void 949static void
918api_cede (void) 950api_cede (void)
919{ 951{
952 dTHX;
953
954 LOCK;
920 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 955 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
956 UNLOCK;
921 957
922 api_schedule (); 958 api_schedule ();
923} 959}
924 960
925MODULE = Coro::State PACKAGE = Coro::State 961MODULE = Coro::State PACKAGE = Coro::State
926 962
927PROTOTYPES: ENABLE 963PROTOTYPES: ENABLE
928 964
929BOOT: 965BOOT:
930{ /* {} necessary for stoopid perl-5.6.x */ 966{ /* {} necessary for stoopid perl-5.6.x */
967#ifdef USE_ITHREADS
968 MUTEX_INIT (&coro_mutex);
969#endif
970
931 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 971 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
932 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 972 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
933 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 973 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
934 974
935 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 975 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
936 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 976 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
937 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 977 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
938 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 978 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
939
940 if (!padlist_cache)
941 padlist_cache = newHV ();
942 979
943 main_mainstack = PL_mainstack; 980 main_mainstack = PL_mainstack;
944 981
945 coroapi.ver = CORO_API_VERSION; 982 coroapi.ver = CORO_API_VERSION;
946 coroapi.transfer = api_transfer; 983 coroapi.transfer = api_transfer;
… …
957 croak ("Coro::State::_newprocess expects an arrayref"); 994 croak ("Coro::State::_newprocess expects an arrayref");
958 995
959 Newz (0, coro, 1, struct coro); 996 Newz (0, coro, 1, struct coro);
960 997
961 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 998 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
962 coro->mainstack = 0; /* actual work is done inside transfer */ 999 /*coro->mainstack = 0; *//*actual work is done inside transfer */
963 coro->stack = 0; 1000 /*coro->stack = 0;*/
964 1001
965 /* same as JMPENV_BOOTSTRAP */ 1002 /* same as JMPENV_BOOTSTRAP */
966 /* we might be able to recycle start_env, but safe is safe */ 1003 /* we might be able to recycle start_env, but safe is safe */
967 //Zero(&coro->start_env, 1, JMPENV); 1004 /*Zero(&coro->start_env, 1, JMPENV);*/
968 coro->start_env.je_ret = -1; 1005 coro->start_env.je_ret = -1;
969 coro->start_env.je_mustcatch = TRUE; 1006 coro->start_env.je_mustcatch = TRUE;
970 1007
971 RETVAL = coro; 1008 RETVAL = coro;
972 OUTPUT: 1009 OUTPUT:
… …
993 if (coro->mainstack && coro->mainstack != main_mainstack) 1030 if (coro->mainstack && coro->mainstack != main_mainstack)
994 { 1031 {
995 struct coro temp; 1032 struct coro temp;
996 1033
997 PUTBACK; 1034 PUTBACK;
998 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1035 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
999 LOAD(aTHX_ coro); 1036 LOAD (aTHX_ coro);
1000 SPAGAIN; 1037 SPAGAIN;
1001 1038
1002 destroy_stacks (aTHX); 1039 destroy_stacks (aTHX);
1003 1040
1004 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1041 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1005 SPAGAIN; 1042 SPAGAIN;
1006 1043
1007 coro->mainstack = 0; 1044 coro->mainstack = 0;
1008 } 1045 }
1009 1046
1010 deallocate_stack (coro); 1047 deallocate_stack (coro);
1011 SvREFCNT_dec (coro->args); 1048 SvREFCNT_dec (coro->args);
1012 Safefree (coro); 1049 Safefree (coro);
1013
1014void
1015flush()
1016 CODE:
1017#ifdef MAY_FLUSH
1018 flush_padlist_cache ();
1019#endif
1020 1050
1021void 1051void
1022_exit(code) 1052_exit(code)
1023 int code 1053 int code
1024 PROTOTYPE: $ 1054 PROTOTYPE: $
1025 CODE: 1055 CODE:
1026#if defined(__GLIBC__) || _POSIX_C_SOURCE
1027 _exit (code); 1056 _exit (code);
1028#else
1029 signal (SIGTERM, SIG_DFL);
1030 raise (SIGTERM);
1031 exit (code);
1032#endif
1033 1057
1034MODULE = Coro::State PACKAGE = Coro::Cont 1058MODULE = Coro::State PACKAGE = Coro::Cont
1035 1059
1036# this is slightly dirty (should expose a c-level api) 1060# this is slightly dirty (should expose a c-level api)
1037 1061
1038void 1062void
1039yield(...) 1063yield(...)
1040 PROTOTYPE: @ 1064 PROTOTYPE: @
1041 CODE: 1065 CODE:
1042 static SV *returnstk; 1066 SV *yieldstack;
1043 SV *sv; 1067 SV *sv;
1044 AV *defav = GvAV (PL_defgv); 1068 AV *defav = GvAV (PL_defgv);
1045 struct coro *prev, *next; 1069 struct coro *prev, *next;
1046 1070
1047 if (!returnstk) 1071 yieldstack = *hv_fetch (
1048 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1072 (HV *)SvRV (GvSV (coro_current)),
1073 "yieldstack", sizeof ("yieldstack") - 1,
1074 0
1075 );
1049 1076
1050 /* set up @_ -- ugly */ 1077 /* set up @_ -- ugly */
1051 av_clear (defav); 1078 av_clear (defav);
1052 av_fill (defav, items - 1); 1079 av_fill (defav, items - 1);
1053 while (items--) 1080 while (items--)
1054 av_store (defav, items, SvREFCNT_inc (ST(items))); 1081 av_store (defav, items, SvREFCNT_inc (ST(items)));
1055 1082
1056 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1057 sv = av_pop ((AV *)SvRV (returnstk)); 1083 sv = av_pop ((AV *)SvRV (yieldstack));
1058 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1084 prev = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))));
1059 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1085 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
1060 SvREFCNT_dec (sv); 1086 SvREFCNT_dec (sv);
1061 1087
1062 transfer(aTHX_ prev, next, 0); 1088 transfer (aTHX_ prev, next, 0);
1063 1089
1064MODULE = Coro::State PACKAGE = Coro 1090MODULE = Coro::State PACKAGE = Coro
1065 1091
1066# this is slightly dirty (should expose a c-level api) 1092# this is slightly dirty (should expose a c-level api)
1067 1093
… …
1096 sv_setiv(sv, (IV)&coroapi); 1122 sv_setiv(sv, (IV)&coroapi);
1097 SvREADONLY_on(sv); 1123 SvREADONLY_on(sv);
1098 } 1124 }
1099} 1125}
1100 1126
1127#if !PERL_MICRO
1128
1101void 1129void
1102ready(self) 1130ready(self)
1103 SV * self 1131 SV * self
1104 PROTOTYPE: $ 1132 PROTOTYPE: $
1105 CODE: 1133 CODE:
1106 api_ready (self); 1134 api_ready (self);
1135
1136#endif
1107 1137
1108int 1138int
1109nready(...) 1139nready(...)
1110 PROTOTYPE: 1140 PROTOTYPE:
1111 CODE: 1141 CODE:
… …
1123cede(...) 1153cede(...)
1124 PROTOTYPE: 1154 PROTOTYPE:
1125 CODE: 1155 CODE:
1126 api_cede (); 1156 api_cede ();
1127 1157
1158# and these are hacks
1159SV *
1160_aio_get_state ()
1161 CODE:
1162{
1163 struct {
1164 int errorno;
1165 int laststype;
1166 int laststatval;
1167 Stat_t statcache;
1168 } data;
1169
1170 data.errorno = errno;
1171 data.laststype = PL_laststype;
1172 data.laststatval = PL_laststatval;
1173 data.statcache = PL_statcache;
1174
1175 RETVAL = newSVpvn ((char *)&data, sizeof data);
1176}
1177 OUTPUT:
1178 RETVAL
1179
1180void
1181_aio_set_state (char *data_)
1182 PROTOTYPE: $
1183 CODE:
1184{
1185 struct {
1186 int errorno;
1187 int laststype;
1188 int laststatval;
1189 Stat_t statcache;
1190 } *data = (void *)data_;
1191
1192 errno = data->errorno;
1193 PL_laststype = data->laststype;
1194 PL_laststatval = data->laststatval;
1195 PL_statcache = data->statcache;
1196}

Diff Legend

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