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.41 by root, Tue Nov 27 02:51:03 2001 UTC vs.
Revision 1.60 by root, Mon Aug 9 02:41:27 2004 UTC

1#define PERL_NO_GET_CONTEXT
2
1#include "EXTERN.h" 3#include "EXTERN.h"
2#include "perl.h" 4#include "perl.h"
3#include "XSUB.h" 5#include "XSUB.h"
6
7#include "patchlevel.h"
8
9#if PATCHLEVEL < 6
10# ifndef PL_ppaddr
11# define PL_ppaddr ppaddr
12# endif
13# ifndef call_sv
14# define call_sv perl_call_sv
15# endif
16# ifndef get_sv
17# define get_sv perl_get_sv
18# endif
19# ifndef get_cv
20# define get_cv perl_get_cv
21# endif
22# ifndef IS_PADGV
23# define IS_PADGV(v) 0
24# endif
25# ifndef IS_PADCONST
26# define IS_PADCONST(v) 0
27# endif
28#endif
4 29
5#include "libcoro/coro.c" 30#include "libcoro/coro.c"
6 31
7#include <signal.h> 32#include <signal.h>
8 33
… …
16# undef HAVE_MMAP 41# undef HAVE_MMAP
17# endif 42# endif
18# endif 43# endif
19#endif 44#endif
20 45
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 46#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 47#define UCORO_STATE "_coro_state"
25 48
26/* 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
27 * 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
… …
32 55
33#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
34 57
35#include "CoroAPI.h" 58#include "CoroAPI.h"
36 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 0
66# define UNLOCK 0
67#endif
68
37static 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 */
38 75
39/* 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... */
40typedef struct { 77typedef struct {
41 int refcnt; /* pointer reference counter */ 78 int refcnt; /* pointer reference counter */
42 int usecnt; /* shared by how many coroutines */ 79 int usecnt; /* shared by how many coroutines */
… …
47 void *sptr; 84 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 85 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 86} coro_stack;
50 87
51struct coro { 88struct coro {
89 /* the top-level JMPENV for each coroutine, needed to catch dies. */
90 JMPENV start_env;
91
52 /* the optional C context */ 92 /* the optional C context */
53 coro_stack *stack; 93 coro_stack *stack;
54 void *cursp; 94 void *cursp;
55 int gencnt; 95 int gencnt;
56 96
… …
68 AV *curstack; 108 AV *curstack;
69 AV *mainstack; 109 AV *mainstack;
70 SV **stack_sp; 110 SV **stack_sp;
71 OP *op; 111 OP *op;
72 SV **curpad; 112 SV **curpad;
113 AV *comppad;
73 SV **stack_base; 114 SV **stack_base;
74 SV **stack_max; 115 SV **stack_max;
75 SV **tmps_stack; 116 SV **tmps_stack;
76 I32 tmps_floor; 117 I32 tmps_floor;
77 I32 tmps_ix; 118 I32 tmps_ix;
… …
96}; 137};
97 138
98typedef struct coro *Coro__State; 139typedef struct coro *Coro__State;
99typedef struct coro *Coro__State_or_hashref; 140typedef struct coro *Coro__State_or_hashref;
100 141
101static AV *main_mainstack; /* used to differentiate between $main and others */
102static HV *coro_state_stash;
103static SV *ucoro_state_sv;
104static U32 ucoro_state_hash;
105static HV *padlist_cache;
106static SV *coro_mortal; /* will be freed after next transfer */
107
108/* mostly copied from op.c:cv_clone2 */ 142/* mostly copied from op.c:cv_clone2 */
109STATIC AV * 143STATIC AV *
110clone_padlist (AV *protopadlist) 144clone_padlist (pTHX_ AV *protopadlist)
111{ 145{
112 AV *av; 146 AV *av;
113 I32 ix; 147 I32 ix;
114 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 148 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
115 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 149 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
… …
139 AvFLAGS (av) = AVf_REIFY; 173 AvFLAGS (av) = AVf_REIFY;
140 174
141 for (ix = fpad; ix > 0; ix--) 175 for (ix = fpad; ix > 0; ix--)
142 { 176 {
143 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 177 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
178
144 if (namesv && namesv != &PL_sv_undef) 179 if (namesv && namesv != &PL_sv_undef)
145 { 180 {
146 char *name = SvPVX (namesv); /* XXX */ 181 char *name = SvPVX (namesv); /* XXX */
182
147 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 183 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
148 { /* lexical from outside? */ 184 { /* lexical from outside? */
149 npad[ix] = SvREFCNT_inc (ppad[ix]); 185 npad[ix] = SvREFCNT_inc (ppad[ix]);
150 } 186 }
151 else 187 else
… …
157 sv = (SV *) newAV (); 193 sv = (SV *) newAV ();
158 else if (*name == '%') 194 else if (*name == '%')
159 sv = (SV *) newHV (); 195 sv = (SV *) newHV ();
160 else 196 else
161 sv = NEWSV (0, 0); 197 sv = NEWSV (0, 0);
198
199#ifdef SvPADBUSY
162 if (!SvPADBUSY (sv)) 200 if (!SvPADBUSY (sv))
201#endif
163 SvPADMY_on (sv); 202 SvPADMY_on (sv);
203
164 npad[ix] = sv; 204 npad[ix] = sv;
165 } 205 }
166 } 206 }
167 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 207 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
168 { 208 {
… …
197#endif 237#endif
198 238
199 return newpadlist; 239 return newpadlist;
200} 240}
201 241
202#ifdef MAY_FLUSH
203STATIC void 242STATIC void
204free_padlist (AV *padlist) 243free_padlist (pTHX_ AV *padlist)
205{ 244{
206 /* may be during global destruction */ 245 /* may be during global destruction */
207 if (SvREFCNT(padlist)) 246 if (SvREFCNT (padlist))
208 { 247 {
209 I32 i = AvFILLp(padlist); 248 I32 i = AvFILLp (padlist);
210 while (i >= 0) 249 while (i >= 0)
211 { 250 {
212 SV **svp = av_fetch(padlist, i--, FALSE); 251 SV **svp = av_fetch (padlist, i--, FALSE);
213 SV *sv = svp ? *svp : Nullsv;
214 if (sv) 252 if (svp)
253 {
254 SV *sv;
255 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
215 SvREFCNT_dec(sv); 256 SvREFCNT_dec (sv);
257
258 SvREFCNT_dec (*svp);
259 }
216 } 260 }
217 261
218 SvREFCNT_dec((SV*)padlist); 262 SvREFCNT_dec ((SV*)padlist);
219 } 263 }
220} 264}
221#endif 265
266STATIC int
267coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
268{
269 AV *padlist;
270 AV *av = (AV *)mg->mg_obj;
271
272 /* casting is fun. */
273 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
274 free_padlist (aTHX_ padlist);
275}
276
277#define PERL_MAGIC_coro PERL_MAGIC_ext
278
279static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
222 280
223/* the next two functions merely cache the padlists */ 281/* the next two functions merely cache the padlists */
224STATIC void 282STATIC void
225get_padlist (CV *cv) 283get_padlist (pTHX_ CV *cv)
226{ 284{
227 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 285 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
228 286
229 if (he && AvFILLp ((AV *)*he) >= 0) 287 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
230 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 288 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
231 else 289 else
232 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 290 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
233} 291}
234 292
235STATIC void 293STATIC void
236put_padlist (CV *cv) 294put_padlist (pTHX_ CV *cv)
237{ 295{
238 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 296 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
239 297
240 if (SvTYPE (*he) != SVt_PVAV) 298 if (!mg)
241 { 299 {
242 SvREFCNT_dec (*he); 300 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
301 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
302 mg->mg_virtual = &vtbl_coro;
243 *he = (SV *)newAV (); 303 mg->mg_obj = (SV *)newAV ();
244 } 304 }
245 305
246 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 306 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
247} 307}
248
249#ifdef MAY_FLUSH
250STATIC void
251flush_padlist_cache ()
252{
253 HV *hv = padlist_cache;
254 padlist_cache = newHV ();
255
256 if (hv_iterinit (hv))
257 {
258 HE *he;
259 AV *padlist;
260
261 while (!!(he = hv_iternext (hv)))
262 {
263 AV *av = (AV *)HeVAL(he);
264
265 /* casting is fun. */
266 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
267 free_padlist (padlist);
268 }
269 }
270
271 SvREFCNT_dec (hv);
272}
273#endif
274 308
275#define SB do { 309#define SB do {
276#define SE } while (0) 310#define SE } while (0)
277 311
278#define LOAD(state) load_state(aTHX_ (state)); 312#define LOAD(state) load_state(aTHX_ (state));
279#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 313#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
280 314
281#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 315#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
282 316
283static void 317static void
284load_state(pTHX_ Coro__State c) 318load_state(pTHX_ Coro__State c)
285{ 319{
286 PL_dowarn = c->dowarn; 320 PL_dowarn = c->dowarn;
… …
290 PL_curstack = c->curstack; 324 PL_curstack = c->curstack;
291 PL_mainstack = c->mainstack; 325 PL_mainstack = c->mainstack;
292 PL_stack_sp = c->stack_sp; 326 PL_stack_sp = c->stack_sp;
293 PL_op = c->op; 327 PL_op = c->op;
294 PL_curpad = c->curpad; 328 PL_curpad = c->curpad;
329 PL_comppad = c->comppad;
295 PL_stack_base = c->stack_base; 330 PL_stack_base = c->stack_base;
296 PL_stack_max = c->stack_max; 331 PL_stack_max = c->stack_max;
297 PL_tmps_stack = c->tmps_stack; 332 PL_tmps_stack = c->tmps_stack;
298 PL_tmps_floor = c->tmps_floor; 333 PL_tmps_floor = c->tmps_floor;
299 PL_tmps_ix = c->tmps_ix; 334 PL_tmps_ix = c->tmps_ix;
… …
326 { 361 {
327 AV *padlist = (AV *)POPs; 362 AV *padlist = (AV *)POPs;
328 363
329 if (padlist) 364 if (padlist)
330 { 365 {
331 put_padlist (cv); /* mark this padlist as available */ 366 put_padlist (aTHX_ cv); /* mark this padlist as available */
332 CvPADLIST(cv) = padlist; 367 CvPADLIST(cv) = padlist;
333#ifdef USE_THREADS
334 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
335#endif
336 } 368 }
337 369
338 ++CvDEPTH(cv); 370 ++CvDEPTH(cv);
339 } 371 }
340 372
… …
367 if (CxTYPE(cx) == CXt_SUB) 399 if (CxTYPE(cx) == CXt_SUB)
368 { 400 {
369 CV *cv = cx->blk_sub.cv; 401 CV *cv = cx->blk_sub.cv;
370 if (CvDEPTH(cv)) 402 if (CvDEPTH(cv))
371 { 403 {
372#ifdef USE_THREADS
373 /*XPUSHs ((SV *)CvOWNER(cv));*/
374 /*CvOWNER(cv) = 0;*/
375 /*error must unlock this cv etc.. etc...*/
376#endif
377 EXTEND (SP, CvDEPTH(cv)*2); 404 EXTEND (SP, CvDEPTH(cv)*2);
378 405
379 while (--CvDEPTH(cv)) 406 while (--CvDEPTH(cv))
380 { 407 {
381 /* this tells the restore code to increment CvDEPTH */ 408 /* this tells the restore code to increment CvDEPTH */
… …
384 } 411 }
385 412
386 PUSHs ((SV *)CvPADLIST(cv)); 413 PUSHs ((SV *)CvPADLIST(cv));
387 PUSHs ((SV *)cv); 414 PUSHs ((SV *)cv);
388 415
389 get_padlist (cv); /* this is a monster */ 416 get_padlist (aTHX_ cv); /* this is a monster */
390 } 417 }
391 } 418 }
419#ifdef CXt_FORMAT
392 else if (CxTYPE(cx) == CXt_FORMAT) 420 else if (CxTYPE(cx) == CXt_FORMAT)
393 { 421 {
394 /* I never used formats, so how should I know how these are implemented? */ 422 /* I never used formats, so how should I know how these are implemented? */
395 /* my bold guess is as a simple, plain sub... */ 423 /* my bold guess is as a simple, plain sub... */
396 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 424 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
397 } 425 }
426#endif
398 } 427 }
399 428
400 if (top_si->si_type == PERLSI_MAIN) 429 if (top_si->si_type == PERLSI_MAIN)
401 break; 430 break;
402 431
… …
419 c->curstack = PL_curstack; 448 c->curstack = PL_curstack;
420 c->mainstack = PL_mainstack; 449 c->mainstack = PL_mainstack;
421 c->stack_sp = PL_stack_sp; 450 c->stack_sp = PL_stack_sp;
422 c->op = PL_op; 451 c->op = PL_op;
423 c->curpad = PL_curpad; 452 c->curpad = PL_curpad;
453 c->comppad = PL_comppad;
424 c->stack_base = PL_stack_base; 454 c->stack_base = PL_stack_base;
425 c->stack_max = PL_stack_max; 455 c->stack_max = PL_stack_max;
426 c->tmps_stack = PL_tmps_stack; 456 c->tmps_stack = PL_tmps_stack;
427 c->tmps_floor = PL_tmps_floor; 457 c->tmps_floor = PL_tmps_floor;
428 c->tmps_ix = PL_tmps_ix; 458 c->tmps_ix = PL_tmps_ix;
… …
444} 474}
445 475
446/* 476/*
447 * allocate various perl stacks. This is an exact copy 477 * allocate various perl stacks. This is an exact copy
448 * of perl.c:init_stacks, except that it uses less memory 478 * of perl.c:init_stacks, except that it uses less memory
449 * on the assumption that coroutines do not usually need 479 * on the (sometimes correct) assumption that coroutines do
450 * a lot of stackspace. 480 * not usually need a lot of stackspace.
451 */ 481 */
452STATIC void 482STATIC void
453coro_init_stacks (pTHX) 483coro_init_stacks (pTHX)
454{ 484{
485 LOCK;
486
455 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 487 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
456 PL_curstackinfo->si_type = PERLSI_MAIN; 488 PL_curstackinfo->si_type = PERLSI_MAIN;
457 PL_curstack = PL_curstackinfo->si_stack; 489 PL_curstack = PL_curstackinfo->si_stack;
458 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 490 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
459 491
… …
468 500
469 New(54,PL_markstack,16,I32); 501 New(54,PL_markstack,16,I32);
470 PL_markstack_ptr = PL_markstack; 502 PL_markstack_ptr = PL_markstack;
471 PL_markstack_max = PL_markstack + 16; 503 PL_markstack_max = PL_markstack + 16;
472 504
505#ifdef SET_MARK_OFFSET
473 SET_MARK_OFFSET; 506 SET_MARK_OFFSET;
507#endif
474 508
475 New(54,PL_scopestack,16,I32); 509 New(54,PL_scopestack,16,I32);
476 PL_scopestack_ix = 0; 510 PL_scopestack_ix = 0;
477 PL_scopestack_max = 16; 511 PL_scopestack_max = 16;
478 512
… …
481 PL_savestack_max = 96; 515 PL_savestack_max = 96;
482 516
483 New(54,PL_retstack,8,OP*); 517 New(54,PL_retstack,8,OP*);
484 PL_retstack_ix = 0; 518 PL_retstack_ix = 0;
485 PL_retstack_max = 8; 519 PL_retstack_max = 8;
520
521 UNLOCK;
486} 522}
487 523
488/* 524/*
489 * destroy the stacks, the callchain etc... 525 * destroy the stacks, the callchain etc...
490 * still there is a memleak of 128 bytes...
491 */ 526 */
492STATIC void 527STATIC void
493destroy_stacks(pTHX) 528destroy_stacks(pTHX)
494{ 529{
495 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
496 { 531 {
497 /* is this ugly, I ask? */ 532 /* is this ugly, I ask? */
498 while (PL_scopestack_ix) 533 LEAVE_SCOPE (0);
499 LEAVE;
500 534
501 /* sure it is, but more important: is it correct?? :/ */ 535 /* sure it is, but more important: is it correct?? :/ */
502 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
503 FREETMPS; 536 FREETMPS;
537
538 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
504 } 539 }
505 540
506 while (PL_curstackinfo->si_next) 541 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 542 PL_curstackinfo = PL_curstackinfo->si_next;
508 543
509 while (PL_curstackinfo) 544 while (PL_curstackinfo)
510 { 545 {
511 PERL_SI *p = PL_curstackinfo->si_prev; 546 PERL_SI *p = PL_curstackinfo->si_prev;
512 547
513 { 548 { /*D*//*remove*/
514 dSP; 549 dSP;
515 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 550 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
516 PUTBACK; /* possibly superfluous */ 551 PUTBACK; /* possibly superfluous */
517 } 552 }
518 553
519 if (!IN_DESTRUCT) 554 if (!IN_DESTRUCT)
520 { 555 {
521 dounwind(-1); 556 dounwind (-1);/*D*//*remove*/
522 SvREFCNT_dec(PL_curstackinfo->si_stack); 557 SvREFCNT_dec (PL_curstackinfo->si_stack);
523 } 558 }
524 559
525 Safefree(PL_curstackinfo->si_cxstack); 560 Safefree (PL_curstackinfo->si_cxstack);
526 Safefree(PL_curstackinfo); 561 Safefree (PL_curstackinfo);
527 PL_curstackinfo = p; 562 PL_curstackinfo = p;
528 } 563 }
529 564
530 Safefree(PL_tmps_stack); 565 Safefree (PL_tmps_stack);
531 Safefree(PL_markstack); 566 Safefree (PL_markstack);
532 Safefree(PL_scopestack); 567 Safefree (PL_scopestack);
533 Safefree(PL_savestack); 568 Safefree (PL_savestack);
534 Safefree(PL_retstack); 569 Safefree (PL_retstack);
535} 570}
536 571
537static void 572static void
538allocate_stack (Coro__State ctx, int alloc) 573allocate_stack (Coro__State ctx, int alloc)
539{ 574{
… …
542 New (0, stack, 1, coro_stack); 577 New (0, stack, 1, coro_stack);
543 578
544 stack->refcnt = 1; 579 stack->refcnt = 1;
545 stack->usecnt = 1; 580 stack->usecnt = 1;
546 stack->gencnt = ctx->gencnt = 0; 581 stack->gencnt = ctx->gencnt = 0;
582
547 if (alloc) 583 if (alloc)
548 { 584 {
549#if HAVE_MMAP 585#if HAVE_MMAP
550 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 586 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
551 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 587 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
552 if (stack->sptr == (void *)-1) 588 if (stack->sptr == (void *)-1)
553#endif 589#endif
554 { 590 {
555 /*FIXME*//*D*//* reasonable stack size! */ 591 /*FIXME*//*D*//* reasonable stack size! */
556 stack->ssize = -4096 * sizeof (long); 592 stack->ssize = - (8192 * sizeof (long));
557 New (0, stack->sptr, 4096, long); 593 New (0, stack->sptr, 8192, long);
558 } 594 }
559 } 595 }
560 else 596 else
561 stack->sptr = 0; 597 stack->sptr = 0;
562 598
… …
576 { 612 {
577#ifdef HAVE_MMAP 613#ifdef HAVE_MMAP
578 if (stack->ssize > 0 && stack->sptr) 614 if (stack->ssize > 0 && stack->sptr)
579 munmap (stack->sptr, stack->ssize); 615 munmap (stack->sptr, stack->ssize);
580 else 616 else
581#else 617#endif
582 Safefree (stack->sptr); 618 Safefree (stack->sptr);
583#endif 619
584 Safefree (stack); 620 Safefree (stack);
585 } 621 }
586 else if (ctx->gencnt == stack->gencnt) 622 else if (ctx->gencnt == stack->gencnt)
587 --stack->usecnt; 623 --stack->usecnt;
588 } 624 }
… …
592setup_coro (void *arg) 628setup_coro (void *arg)
593{ 629{
594 /* 630 /*
595 * emulate part of the perl startup here. 631 * emulate part of the perl startup here.
596 */ 632 */
633 dTHX;
597 dSP; 634 dSP;
598 Coro__State ctx = (Coro__State)arg; 635 Coro__State ctx = (Coro__State)arg;
599 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 636 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
600 637
601 coro_init_stacks (aTHX); 638 coro_init_stacks (aTHX);
602 /*PL_curcop = 0;*/ 639 /*PL_curcop = 0;*/
603 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 640 /*PL_in_eval = PL_in_eval;*/ /* inherit */
604 SvREFCNT_dec (GvAV (PL_defgv)); 641 SvREFCNT_dec (GvAV (PL_defgv));
605 GvAV (PL_defgv) = ctx->args; 642 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
606 643
607 SPAGAIN; 644 SPAGAIN;
608 645
609 if (ctx->stack) 646 if (ctx->stack)
610 { 647 {
… …
637 * that doesn't matter, though, since it is only 674 * that doesn't matter, though, since it is only
638 * pp_nextstate and we never return... 675 * pp_nextstate and we never return...
639 * ah yes, and I don't care anyways ;) 676 * ah yes, and I don't care anyways ;)
640 */ 677 */
641 PUTBACK; 678 PUTBACK;
642 PL_op = pp_entersub(); 679 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
643 SPAGAIN; 680 SPAGAIN;
644 681
645 ENTER; /* necessary e.g. for dounwind */ 682 ENTER; /* necessary e.g. for dounwind */
646 } 683 }
647} 684}
… …
650continue_coro (void *arg) 687continue_coro (void *arg)
651{ 688{
652 /* 689 /*
653 * this is a _very_ stripped down perl interpreter ;) 690 * this is a _very_ stripped down perl interpreter ;)
654 */ 691 */
692 dTHX;
655 Coro__State ctx = (Coro__State)arg; 693 Coro__State ctx = (Coro__State)arg;
656 JMPENV coro_start_env; 694 JMPENV coro_start_env;
657 695
658 /* same as JMPENV_BOOTSTRAP */
659 Zero(&coro_start_env, 1, JMPENV);
660 coro_start_env.je_ret = -1;
661 coro_start_env.je_mustcatch = TRUE;
662 PL_top_env = &coro_start_env; 696 PL_top_env = &ctx->start_env;
663 697
664 ctx->cursp = 0; 698 ctx->cursp = 0;
665 PL_op = PL_op->op_next; 699 PL_op = PL_op->op_next;
666 CALLRUNOPS(aTHX); 700 CALLRUNOPS(aTHX);
667 701
668 abort (); 702 abort ();
669} 703}
670 704
671STATIC void 705STATIC void
672transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 706transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
673{ 707{
674 dSTACKLEVEL; 708 dSTACKLEVEL;
675 static struct coro *xnext;
676 709
677 if (prev != next) 710 if (prev != next)
678 { 711 {
679 xnext = next;
680
681 if (next->mainstack) 712 if (next->mainstack)
682 { 713 {
714 LOCK;
683 SAVE (prev, flags); 715 SAVE (prev, flags);
684 LOAD (next); 716 LOAD (next);
717 UNLOCK;
685 718
686 /* mark this state as in-use */ 719 /* mark this state as in-use */
687 next->mainstack = 0; 720 next->mainstack = 0;
688 next->tmps_ix = -2; 721 next->tmps_ix = -2;
689 722
… …
708 continue_coro, (void *)next, 741 continue_coro, (void *)next,
709 next->stack->sptr, labs (next->stack->ssize)); 742 next->stack->sptr, labs (next->stack->ssize));
710 } 743 }
711 744
712 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 745 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
746 prev->cursp = stacklevel;
713 /* don't add any code here */ 747 /* don't add any code here */
714 } 748 }
715 749 else
750 next->cursp = stacklevel;
716 } 751 }
717 else if (next->tmps_ix == -2) 752 else if (next->tmps_ix == -2)
718 croak ("tried to transfer to running coroutine"); 753 croak ("tried to transfer to running coroutine");
719 else 754 else
720 { 755 {
756 LOCK;
721 SAVE (prev, -1); /* first get rid of the old state */ 757 SAVE (prev, -1); /* first get rid of the old state */
758 UNLOCK;
722 759
723 if (flags & TRANSFER_SAVE_CCTXT) 760 if (flags & TRANSFER_SAVE_CCTXT)
724 { 761 {
725 if (!prev->stack) 762 if (!prev->stack)
726 allocate_stack (prev, 0); 763 allocate_stack (prev, 0);
727 764
728 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 765 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
729 { 766 {
767 PL_top_env = &next->start_env;
768
730 setup_coro (next); 769 setup_coro (next);
770 next->cursp = stacklevel;
731 771
732 prev->stack->refcnt++; 772 prev->stack->refcnt++;
733 prev->stack->usecnt++; 773 prev->stack->usecnt++;
734 next->stack = prev->stack; 774 next->stack = prev->stack;
735 next->gencnt = prev->gencnt; 775 next->gencnt = prev->gencnt;
736 } 776 }
737 else 777 else
738 { 778 {
779 assert (!next->stack);
739 allocate_stack (next, 1); 780 allocate_stack (next, 1);
740 coro_create (&(next->stack->cctx), 781 coro_create (&(next->stack->cctx),
741 setup_coro, (void *)next, 782 setup_coro, (void *)next,
742 next->stack->sptr, labs (next->stack->ssize)); 783 next->stack->sptr, labs (next->stack->ssize));
743 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 784 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
785 prev->cursp = stacklevel;
744 /* don't add any code here */ 786 /* don't add any code here */
745 } 787 }
746 } 788 }
747 else 789 else
790 {
748 setup_coro (next); 791 setup_coro (next);
792 next->cursp = stacklevel;
793 }
749 } 794 }
750
751 /*
752 * xnext is now either prev or next, depending on wether
753 * we switched the c stack or not. that's why I use a global
754 * variable, that should become thread-specific at one point.
755 */
756 xnext->cursp = stacklevel;
757 } 795 }
758 796
797 LOCK;
759 if (coro_mortal) 798 if (coro_mortal)
760 { 799 {
761 SvREFCNT_dec (coro_mortal); 800 SvREFCNT_dec (coro_mortal);
762 coro_mortal = 0; 801 coro_mortal = 0;
763 } 802 }
803 UNLOCK;
764} 804}
765 805
766#define SV_CORO(sv,func) \ 806#define SV_CORO(sv,func) \
767 do { \ 807 do { \
768 if (SvROK (sv)) \ 808 if (SvROK (sv)) \
769 sv = SvRV (sv); \ 809 sv = SvRV (sv); \
770 \ 810 \
771 if (SvTYPE(sv) == SVt_PVHV) \ 811 if (SvTYPE (sv) == SVt_PVHV) \
772 { \ 812 { \
773 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 813 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
774 \ 814 \
775 if (!he) \ 815 if (!he) \
776 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 816 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
777 \ 817 \
778 (sv) = SvRV (HeVAL(he)); \ 818 (sv) = SvRV (HeVAL(he)); \
779 } \ 819 } \
780 \ 820 \
781 /* must also be changed inside Coro::Cont::yield */ \ 821 /* must also be changed inside Coro::Cont::yield */ \
782 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 822 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
783 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 823 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
784 \ 824 \
785 } while(0) 825 } while(0)
786 826
787#define SvSTATE(sv) (struct coro *)SvIV (sv) 827#define SvSTATE(sv) (struct coro *)SvIV (sv)
… …
790api_transfer(pTHX_ SV *prev, SV *next, int flags) 830api_transfer(pTHX_ SV *prev, SV *next, int flags)
791{ 831{
792 SV_CORO (prev, "Coro::transfer"); 832 SV_CORO (prev, "Coro::transfer");
793 SV_CORO (next, "Coro::transfer"); 833 SV_CORO (next, "Coro::transfer");
794 834
795 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 835 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
796} 836}
797 837
798/** Coro ********************************************************************/ 838/** Coro ********************************************************************/
799 839
800#define PRIO_MAX 3 840#define PRIO_MAX 3
… …
808static GV *coro_current, *coro_idle; 848static GV *coro_current, *coro_idle;
809static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 849static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
810static int coro_nready; 850static int coro_nready;
811 851
812static void 852static void
813coro_enq (SV *sv) 853coro_enq (pTHX_ SV *sv)
814{ 854{
815 if (SvTYPE (sv) == SVt_PVHV) 855 if (SvTYPE (sv) == SVt_PVHV)
816 { 856 {
817 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 857 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
818 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 858 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
… …
829 869
830 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 870 croak ("Coro::ready tried to enqueue something that is not a coroutine");
831} 871}
832 872
833static SV * 873static SV *
834coro_deq (int min_prio) 874coro_deq (pTHX_ int min_prio)
835{ 875{
836 int prio = PRIO_MAX - PRIO_MIN; 876 int prio = PRIO_MAX - PRIO_MIN;
837 877
838 min_prio -= PRIO_MIN; 878 min_prio -= PRIO_MIN;
839 if (min_prio < 0) 879 if (min_prio < 0)
… …
850} 890}
851 891
852static void 892static void
853api_ready (SV *coro) 893api_ready (SV *coro)
854{ 894{
895 dTHX;
896
855 if (SvROK (coro)) 897 if (SvROK (coro))
856 coro = SvRV (coro); 898 coro = SvRV (coro);
857 899
900 LOCK;
858 coro_enq (SvREFCNT_inc (coro)); 901 coro_enq (aTHX_ SvREFCNT_inc (coro));
902 UNLOCK;
859} 903}
860 904
861static void 905static void
862api_schedule (void) 906api_schedule (void)
863{ 907{
908 dTHX;
909
864 SV *prev, *next; 910 SV *prev, *next;
865 911
912 LOCK;
913
866 prev = SvRV (GvSV (coro_current)); 914 prev = SvRV (GvSV (coro_current));
867 next = coro_deq (PRIO_MIN); 915 next = coro_deq (aTHX_ PRIO_MIN);
868 916
869 if (!next) 917 if (!next)
870 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 918 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
871 919
872 /* free this only after the transfer */ 920 /* free this only after the transfer */
… …
875 923
876 SvRV (GvSV (coro_current)) = next; 924 SvRV (GvSV (coro_current)) = next;
877 925
878 SV_CORO (next, "Coro::schedule"); 926 SV_CORO (next, "Coro::schedule");
879 927
928 UNLOCK;
929
880 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 930 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
881 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 931 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
882} 932}
883 933
884static void 934static void
885api_cede (void) 935api_cede (void)
886{ 936{
937 dTHX;
938
939 LOCK;
887 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 940 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
941 UNLOCK;
888 942
889 api_schedule (); 943 api_schedule ();
890} 944}
891 945
892MODULE = Coro::State PACKAGE = Coro::State 946MODULE = Coro::State PACKAGE = Coro::State
893 947
894PROTOTYPES: ENABLE 948PROTOTYPES: ENABLE
895 949
896BOOT: 950BOOT:
897{ /* {} necessary for stoopid perl-5.6.x */ 951{ /* {} necessary for stoopid perl-5.6.x */
952#ifdef USE_ITHREADS
953 MUTEX_INIT (&coro_mutex);
954#endif
955
898 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 956 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
899 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 957 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
900 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 958 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
901 959
902 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 960 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
903 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 961 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
904 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 962 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
905 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 963 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
906
907 if (!padlist_cache)
908 padlist_cache = newHV ();
909 964
910 main_mainstack = PL_mainstack; 965 main_mainstack = PL_mainstack;
911 966
912 coroapi.ver = CORO_API_VERSION; 967 coroapi.ver = CORO_API_VERSION;
913 coroapi.transfer = api_transfer; 968 coroapi.transfer = api_transfer;
… …
921 Coro__State coro; 976 Coro__State coro;
922 977
923 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 978 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
924 croak ("Coro::State::_newprocess expects an arrayref"); 979 croak ("Coro::State::_newprocess expects an arrayref");
925 980
926 New (0, coro, 1, struct coro); 981 Newz (0, coro, 1, struct coro);
927 982
928 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 983 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
929 coro->mainstack = 0; /* actual work is done inside transfer */ 984 /*coro->mainstack = 0; *//*actual work is done inside transfer */
930 coro->stack = 0; 985 /*coro->stack = 0;*/
986
987 /* same as JMPENV_BOOTSTRAP */
988 /* we might be able to recycle start_env, but safe is safe */
989 /*Zero(&coro->start_env, 1, JMPENV);*/
990 coro->start_env.je_ret = -1;
991 coro->start_env.je_mustcatch = TRUE;
931 992
932 RETVAL = coro; 993 RETVAL = coro;
933 OUTPUT: 994 OUTPUT:
934 RETVAL 995 RETVAL
935 996
… …
954 if (coro->mainstack && coro->mainstack != main_mainstack) 1015 if (coro->mainstack && coro->mainstack != main_mainstack)
955 { 1016 {
956 struct coro temp; 1017 struct coro temp;
957 1018
958 PUTBACK; 1019 PUTBACK;
959 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1020 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
960 LOAD(aTHX_ coro); 1021 LOAD (aTHX_ coro);
961 SPAGAIN; 1022 SPAGAIN;
962 1023
963 destroy_stacks (aTHX); 1024 destroy_stacks (aTHX);
964 1025
965 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1026 LOAD ((&temp)); /* this will get rid of defsv etc.. */
966 SPAGAIN; 1027 SPAGAIN;
967 1028
968 coro->mainstack = 0; 1029 coro->mainstack = 0;
969 } 1030 }
970 1031
971 deallocate_stack (coro); 1032 deallocate_stack (coro);
972 1033 SvREFCNT_dec (coro->args);
973 Safefree (coro); 1034 Safefree (coro);
974
975void
976flush()
977 CODE:
978#ifdef MAY_FLUSH
979 flush_padlist_cache ();
980#endif
981 1035
982void 1036void
983_exit(code) 1037_exit(code)
984 int code 1038 int code
985 PROTOTYPE: $ 1039 PROTOTYPE: $
986 CODE: 1040 CODE:
987#if defined(__GLIBC__) || _POSIX_C_SOURCE
988 _exit (code); 1041 _exit (code);
989#else
990 signal (SIGTERM, SIG_DFL);
991 raise (SIGTERM);
992 exit (code);
993#endif
994 1042
995MODULE = Coro::State PACKAGE = Coro::Cont 1043MODULE = Coro::State PACKAGE = Coro::Cont
996 1044
997# this is slightly dirty (should expose a c-level api) 1045# this is slightly dirty (should expose a c-level api)
998 1046
… …
1004 SV *sv; 1052 SV *sv;
1005 AV *defav = GvAV (PL_defgv); 1053 AV *defav = GvAV (PL_defgv);
1006 struct coro *prev, *next; 1054 struct coro *prev, *next;
1007 1055
1008 if (!returnstk) 1056 if (!returnstk)
1009 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1057 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1010 1058
1011 /* set up @_ -- ugly */ 1059 /* set up @_ -- ugly */
1012 av_clear (defav); 1060 av_clear (defav);
1013 av_fill (defav, items - 1); 1061 av_fill (defav, items - 1);
1014 while (items--) 1062 while (items--)
1015 av_store (defav, items, SvREFCNT_inc (ST(items))); 1063 av_store (defav, items, SvREFCNT_inc (ST(items)));
1016 1064
1017 mg_get (returnstk); /* isn't documentation wrong for mg_get? */ 1065 SvGETMAGIC (returnstk); /* isn't documentation wrong for mg_get? */
1018 sv = av_pop ((AV *)SvRV (returnstk)); 1066 sv = av_pop ((AV *)SvRV (returnstk));
1019 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1067 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1020 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1068 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1021 SvREFCNT_dec (sv); 1069 SvREFCNT_dec (sv);
1022 1070
1023 transfer(aTHX_ prev, next, 0); 1071 transfer (aTHX_ prev, next, 0);
1024 1072
1025MODULE = Coro::State PACKAGE = Coro 1073MODULE = Coro::State PACKAGE = Coro
1026 1074
1027# this is slightly dirty (should expose a c-level api) 1075# this is slightly dirty (should expose a c-level api)
1028 1076
… …
1057 sv_setiv(sv, (IV)&coroapi); 1105 sv_setiv(sv, (IV)&coroapi);
1058 SvREADONLY_on(sv); 1106 SvREADONLY_on(sv);
1059 } 1107 }
1060} 1108}
1061 1109
1110#if !PERL_MICRO
1111
1062void 1112void
1063ready(self) 1113ready(self)
1064 SV * self 1114 SV * self
1065 PROTOTYPE: $ 1115 PROTOTYPE: $
1066 CODE: 1116 CODE:
1067 api_ready (self); 1117 api_ready (self);
1118
1119#endif
1068 1120
1069int 1121int
1070nready(...) 1122nready(...)
1071 PROTOTYPE: 1123 PROTOTYPE:
1072 CODE: 1124 CODE:

Diff Legend

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