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

Diff Legend

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