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

Diff Legend

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