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.46 by pcg, Wed Nov 5 20:02:46 2003 UTC vs.
Revision 1.67 by root, Mon Dec 12 20:07:44 2005 UTC

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

Diff Legend

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