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.176 by root, Sun Sep 30 13:50:38 2007 UTC vs.
Revision 1.209 by root, Wed Oct 10 02:58:17 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
75/* 5.8.7 */ 77/* 5.8.7 */
76#ifndef SvRV_set 78#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 79# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 80#endif
79 81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
89
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 91# undef CORO_STACKGUARD
82#endif 92#endif
83 93
84#ifndef CORO_STACKGUARD 94#ifndef CORO_STACKGUARD
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 109
100#if __GNUC__ >= 3 110#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 114#else
104# define attribute(x) 115# define attribute(x)
105# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
106#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
107 122
108#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
109 124
110#include "CoroAPI.h" 125#include "CoroAPI.h"
111 126
116#else 131#else
117# define LOCK (void)0 132# define LOCK (void)0
118# define UNLOCK (void)0 133# define UNLOCK (void)0
119#endif 134#endif
120 135
136#define strpair(const) const, sizeof (const) - 1
137
121/* helper storage struct for Coro::AIO */ 138/* helper storage struct for Coro::AIO */
122struct io_state 139struct io_state
123{ 140{
124 int errorno; 141 int errorno;
125 I32 laststype; 142 I32 laststype;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 149static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 150static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 151static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 152static SV *coro_mortal; /* will be freed after next transfer */
136 153
154static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */
156
157static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160
137/* async_pool helper stuff */ 161/* async_pool helper stuff */
138static SV *sv_pool_rss; 162static SV *sv_pool_rss;
139static SV *sv_pool_size; 163static SV *sv_pool_size;
140static AV *av_async_pool; 164static AV *av_async_pool;
141 165
142static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */
143static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle[3];
144 168
145enum { 169enum {
146 CC_MAPPED = 0x01, 170 CC_MAPPED = 0x01,
147 CC_NOREUSE = 0x02, /* throw this away after tracing */ 171 CC_NOREUSE = 0x02, /* throw this away after tracing */
148 CC_TRACE = 0x04, 172 CC_TRACE = 0x04,
176 CF_READY = 0x0002, /* coroutine is ready */ 200 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 201 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 203};
180 204
205/* the structure where most of the perl state is stored, overlaid on the cxstack */
206typedef struct {
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211#define VAR(name,type) type name;
212# include "state.h"
213#undef VAR
214} perl_slots;
215
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217
181/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
182struct coro { 219struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 220 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 221 coro_cctx *cctx;
222 int gimme;
185 223
224 /* process data */
225 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */
227
186 /* data associated with this coroutine (initial args) */ 228 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 229 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 230 int flags; /* CF_ flags */
191 231 HV *hv; /* the perl hash associated with this coro, if any */
192 /* optionally saved, might be zero */
193 AV *defav; /* @_ */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203 232
204 /* statistics */ 233 /* statistics */
205 int usecount; /* number of switches to this coro */ 234 int usecount; /* number of transfers to this coro */
206 235
207 /* coro process data */ 236 /* coro process data */
208 int prio; 237 int prio;
238 SV *throw; /* exception to be thrown */
239
240 /* async_pool */
241 SV *saved_deffh;
209 242
210 /* linked list */ 243 /* linked list */
211 struct coro *next, *prev; 244 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */
213}; 245};
214 246
215typedef struct coro *Coro__State; 247typedef struct coro *Coro__State;
216typedef struct coro *Coro__State_or_hashref; 248typedef struct coro *Coro__State_or_hashref;
217 249
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 262static int coro_nready;
231static struct coro *coro_first; 263static struct coro *coro_first;
232 264
233/** lowlevel stuff **********************************************************/ 265/** lowlevel stuff **********************************************************/
266
267static SV *
268coro_get_sv (const char *name, int create)
269{
270#if PERL_VERSION_ATLEAST (5,9,0)
271 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
272 get_sv (name, create);
273#endif
274 return get_sv (name, create);
275}
276
277static AV *
278coro_get_av (const char *name, int create)
279{
280#if PERL_VERSION_ATLEAST (5,9,0)
281 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
282 get_av (name, create);
283#endif
284 return get_av (name, create);
285}
286
287static HV *
288coro_get_hv (const char *name, int create)
289{
290#if PERL_VERSION_ATLEAST (5,9,0)
291 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
292 get_hv (name, create);
293#endif
294 return get_hv (name, create);
295}
234 296
235static AV * 297static AV *
236coro_clone_padlist (pTHX_ CV *cv) 298coro_clone_padlist (pTHX_ CV *cv)
237{ 299{
238 AV *padlist = CvPADLIST (cv); 300 AV *padlist = CvPADLIST (cv);
311 MAGIC *mg; 373 MAGIC *mg;
312 374
313 if (SvROK (coro)) 375 if (SvROK (coro))
314 coro = SvRV (coro); 376 coro = SvRV (coro);
315 377
316 if (SvTYPE (coro) != SVt_PVHV) 378 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 379 croak ("Coro::State object required");
318 380
319 stash = SvSTASH (coro); 381 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 382 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 383 {
322 /* very slow, but rare, check */ 384 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 386 croak ("Coro::State object required");
325 } 387 }
335get_padlist (pTHX_ CV *cv) 397get_padlist (pTHX_ CV *cv)
336{ 398{
337 MAGIC *mg = CORO_MAGIC (cv); 399 MAGIC *mg = CORO_MAGIC (cv);
338 AV *av; 400 AV *av;
339 401
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 404 else
343 { 405 {
344#if CORO_PREFER_PERL_FUNCTIONS 406#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 407 /* this is probably cleaner, but also slower? */
357put_padlist (pTHX_ CV *cv) 419put_padlist (pTHX_ CV *cv)
358{ 420{
359 MAGIC *mg = CORO_MAGIC (cv); 421 MAGIC *mg = CORO_MAGIC (cv);
360 AV *av; 422 AV *av;
361 423
362 if (!mg) 424 if (expect_false (!mg))
363 { 425 {
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro; 428 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV (); 429 mg->mg_obj = (SV *)newAV ();
368 } 430 }
369 431
370 av = (AV *)mg->mg_obj; 432 av = (AV *)mg->mg_obj;
371 433
372 if (AvFILLp (av) >= AvMAX (av)) 434 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 435 av_extend (av, AvMAX (av) + 1);
374 436
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 437 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 438}
377 439
378/** load & save, init *******************************************************/ 440/** load & save, init *******************************************************/
379
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384 441
385static void 442static void
386load_perl (pTHX_ Coro__State c) 443load_perl (pTHX_ Coro__State c)
387{ 444{
445 perl_slots *slot = c->slot;
446 c->slot = 0;
447
448 PL_mainstack = c->mainstack;
449
450 GvSV (PL_defgv) = slot->defsv;
451 GvAV (PL_defgv) = slot->defav;
452 GvSV (PL_errgv) = slot->errsv;
453 GvSV (irsgv) = slot->irsgv;
454
388#define VAR(name,type) PL_ ## name = c->name; 455 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 456 # include "state.h"
390#undef VAR 457 #undef VAR
391 458
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 461
412 { 462 {
413 dSP; 463 dSP;
464
414 CV *cv; 465 CV *cv;
415 466
416 /* now do the ugly restore mess */ 467 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 468 while (expect_true (cv = (CV *)POPs))
418 { 469 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 470 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 471 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 472 CvPADLIST (cv) = (AV *)POPs;
422 } 473 }
441 492
442 XPUSHs (Nullsv); 493 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 494 /* this loop was inspired by pp_caller */
444 for (;;) 495 for (;;)
445 { 496 {
446 while (cxix >= 0) 497 while (expect_true (cxix >= 0))
447 { 498 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 499 PERL_CONTEXT *cx = &ccstk[cxix--];
449 500
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 501 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 502 {
452 CV *cv = cx->blk_sub.cv; 503 CV *cv = cx->blk_sub.cv;
453 504
454 if (CvDEPTH (cv)) 505 if (expect_true (CvDEPTH (cv)))
455 { 506 {
456 EXTEND (SP, 3); 507 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 508 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 509 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 510 PUSHs ((SV *)cv);
462 get_padlist (aTHX_ cv); 513 get_padlist (aTHX_ cv);
463 } 514 }
464 } 515 }
465 } 516 }
466 517
467 if (top_si->si_type == PERLSI_MAIN) 518 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 519 break;
469 520
470 top_si = top_si->si_prev; 521 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 522 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 523 cxix = top_si->si_cxix;
473 } 524 }
474 525
475 PUTBACK; 526 PUTBACK;
476 } 527 }
477 528
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 529 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 530 /* we manually unroll here, as usually 2 slots is enough */
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 531 if (SLOT_COUNT >= 1) CXINC;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 532 if (SLOT_COUNT >= 2) CXINC;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 533 if (SLOT_COUNT >= 3) CXINC;
534 {
535 int i;
536 for (i = 3; i < SLOT_COUNT; ++i)
537 CXINC;
538 }
539 cxstack_ix -= SLOT_COUNT; /* undo allocation */
483 540
541 c->mainstack = PL_mainstack;
542
543 {
544 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
545
546 slot->defav = GvAV (PL_defgv);
547 slot->defsv = DEFSV;
548 slot->errsv = ERRSV;
549 slot->irsgv = GvSV (irsgv);
550
484#define VAR(name,type)c->name = PL_ ## name; 551 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 552 # include "state.h"
486#undef VAR 553 #undef VAR
554 }
487} 555}
488 556
489/* 557/*
490 * allocate various perl stacks. This is an exact copy 558 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 559 * of perl.c:init_stacks, except that it uses less memory
496# define coro_init_stacks init_stacks 564# define coro_init_stacks init_stacks
497#else 565#else
498static void 566static void
499coro_init_stacks (pTHX) 567coro_init_stacks (pTHX)
500{ 568{
501 PL_curstackinfo = new_stackinfo(64, 6); 569 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 570 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 571 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 572 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 573
506 PL_stack_base = AvARRAY(PL_curstack); 574 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 575 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 576 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 577
510 New(50,PL_tmps_stack,64,SV*); 578 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 579 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 580 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 581 PL_tmps_max = 32;
514 582
515 New(54,PL_markstack,16,I32); 583 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 584 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 585 PL_markstack_max = PL_markstack + 16;
518 586
519#ifdef SET_MARK_OFFSET 587#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 588 SET_MARK_OFFSET;
521#endif 589#endif
522 590
523 New(54,PL_scopestack,16,I32); 591 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 592 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 593 PL_scopestack_max = 8;
526 594
527 New(54,PL_savestack,64,ANY); 595 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 596 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 597 PL_savestack_max = 24;
530 598
531#if !PERL_VERSION_ATLEAST (5,9,0) 599#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 600 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 601 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 602 PL_retstack_max = 4;
540 * destroy the stacks, the callchain etc... 608 * destroy the stacks, the callchain etc...
541 */ 609 */
542static void 610static void
543coro_destroy_stacks (pTHX) 611coro_destroy_stacks (pTHX)
544{ 612{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 613 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 614 PL_curstackinfo = PL_curstackinfo->si_next;
564 615
565 while (PL_curstackinfo) 616 while (PL_curstackinfo)
566 { 617 {
584} 635}
585 636
586static size_t 637static size_t
587coro_rss (pTHX_ struct coro *coro) 638coro_rss (pTHX_ struct coro *coro)
588{ 639{
589 size_t rss = sizeof (coro); 640 size_t rss = sizeof (*coro);
590 641
591 if (coro->mainstack) 642 if (coro->mainstack)
592 { 643 {
644 perl_slots tmp_slot;
645 perl_slots *slot;
646
593 if (coro->flags & CF_RUNNING) 647 if (coro->flags & CF_RUNNING)
594 { 648 {
649 slot = &tmp_slot;
650
595 #define VAR(name,type)coro->name = PL_ ## name; 651 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 652 # include "state.h"
597 #undef VAR 653 #undef VAR
598 } 654 }
655 else
656 slot = coro->slot;
599 657
600 rss += sizeof (coro->curstackinfo); 658 rss += sizeof (slot->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 659 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 660 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 661 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 663 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 664 rss += slot->savestack_max * sizeof (ANY);
608 665
609#if !PERL_VERSION_ATLEAST (5,9,0) 666#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 667 rss += slot->retstack_max * sizeof (OP *);
611#endif 668#endif
612 } 669 }
613 670
614 return rss; 671 return rss;
615} 672}
616 673
617/** coroutine stack handling ************************************************/ 674/** coroutine stack handling ************************************************/
618 675
619static void 676static void
620setup_coro (pTHX_ struct coro *coro) 677coro_setup (pTHX_ struct coro *coro)
621{ 678{
622 /* 679 /*
623 * emulate part of the perl startup here. 680 * emulate part of the perl startup here.
624 */ 681 */
625 coro_init_stacks (aTHX); 682 coro_init_stacks (aTHX);
627 PL_runops = RUNOPS_DEFAULT; 684 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 685 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 686 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 687 PL_comppad = 0;
631 PL_curpm = 0; 688 PL_curpm = 0;
689 PL_curpad = 0;
632 PL_localizing = 0; 690 PL_localizing = 0;
633 PL_dirty = 0; 691 PL_dirty = 0;
634 PL_restartop = 0; 692 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
695
696 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
700 PL_rs = newSVsv (GvSV (irsgv));
701 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 702
636 { 703 {
637 dSP; 704 dSP;
638 LOGOP myop; 705 LOGOP myop;
639 706
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 707 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 708 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 709 myop.op_flags = OPf_WANT_VOID;
646 710
647 PUSHMARK (SP); 711 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 713 PUTBACK;
650 PL_op = (OP *)&myop; 714 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 716 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
653 } 731 }
732}
654 733
655 ENTER; /* necessary e.g. for dounwind */ 734static void
735coro_destroy (pTHX_ struct coro *coro)
736{
737 if (!IN_DESTRUCT)
738 {
739 /* restore all saved variables and stuff */
740 LEAVE_SCOPE (0);
741 assert (PL_tmps_floor == -1);
742
743 /* free all temporaries */
744 FREETMPS;
745 assert (PL_tmps_ix == -1);
746
747 /* unwind all extra stacks */
748 POPSTACK_TO (PL_mainstack);
749
750 /* unwind main stack */
751 dounwind (-1);
752 }
753
754 SvREFCNT_dec (GvSV (PL_defgv));
755 SvREFCNT_dec (GvAV (PL_defgv));
756 SvREFCNT_dec (GvSV (PL_errgv));
757 SvREFCNT_dec (PL_defoutgv);
758 SvREFCNT_dec (PL_rs);
759 SvREFCNT_dec (GvSV (irsgv));
760
761 SvREFCNT_dec (PL_diehook);
762 SvREFCNT_dec (PL_warnhook);
763
764 SvREFCNT_dec (coro->saved_deffh);
765 SvREFCNT_dec (coro->throw);
766
767 coro_destroy_stacks (aTHX);
656} 768}
657 769
658static void 770static void
659free_coro_mortal (pTHX) 771free_coro_mortal (pTHX)
660{ 772{
661 if (coro_mortal) 773 if (expect_true (coro_mortal))
662 { 774 {
663 SvREFCNT_dec (coro_mortal); 775 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 776 coro_mortal = 0;
665 } 777 }
666} 778}
695 bot = PL_stack_base + cx->blk_oldsp + 1; 807 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 808 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 809 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 810 : bot;
699 811
812 av_extend (av, top - bot);
700 while (bot < top) 813 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 814 av_push (av, SvREFCNT_inc (*bot++));
702 815
703 PL_runops = RUNOPS_DEFAULT; 816 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 817 ENTER;
707 PUSHMARK (SP); 820 PUSHMARK (SP);
708 PUSHs (&PL_sv_no); 821 PUSHs (&PL_sv_no);
709 PUSHs (fullname); 822 PUSHs (fullname);
710 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 823 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
711 PUTBACK; 824 PUTBACK;
712 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 825 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
713 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 826 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
714 SPAGAIN; 827 SPAGAIN;
715 FREETMPS; 828 FREETMPS;
716 LEAVE; 829 LEAVE;
717 PL_runops = runops_trace; 830 PL_runops = runops_trace;
746 PUSHMARK (SP); 859 PUSHMARK (SP);
747 PUSHs (&PL_sv_yes); 860 PUSHs (&PL_sv_yes);
748 PUSHs (fullname); 861 PUSHs (fullname);
749 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 862 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
750 PUTBACK; 863 PUTBACK;
751 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 864 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
752 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 865 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
753 SPAGAIN; 866 SPAGAIN;
754 FREETMPS; 867 FREETMPS;
755 LEAVE; 868 LEAVE;
756 PL_runops = runops_trace; 869 PL_runops = runops_trace;
770 PL_runops = RUNOPS_DEFAULT; 883 PL_runops = RUNOPS_DEFAULT;
771 PUSHMARK (SP); 884 PUSHMARK (SP);
772 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 885 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
773 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 886 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
774 PUTBACK; 887 PUTBACK;
775 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 888 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
776 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 889 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
777 SPAGAIN; 890 SPAGAIN;
778 FREETMPS; 891 FREETMPS;
779 LEAVE; 892 LEAVE;
780 PL_runops = runops_trace; 893 PL_runops = runops_trace;
790 903
791/* inject a fake call to Coro::State::_cctx_init into the execution */ 904/* inject a fake call to Coro::State::_cctx_init into the execution */
792/* _cctx_init should be careful, as it could be called at almost any time */ 905/* _cctx_init should be careful, as it could be called at almost any time */
793/* during execution of a perl program */ 906/* during execution of a perl program */
794static void NOINLINE 907static void NOINLINE
795prepare_cctx (pTHX_ coro_cctx *cctx) 908cctx_prepare (pTHX_ coro_cctx *cctx)
796{ 909{
797 dSP; 910 dSP;
798 LOGOP myop; 911 LOGOP myop;
799 912
800 PL_top_env = &PL_start_env; 913 PL_top_env = &PL_start_env;
818 931
819/* 932/*
820 * this is a _very_ stripped down perl interpreter ;) 933 * this is a _very_ stripped down perl interpreter ;)
821 */ 934 */
822static void 935static void
823coro_run (void *arg) 936cctx_run (void *arg)
824{ 937{
825 dTHX; 938 dTHX;
826 939
827 /* coro_run is the alternative tail of transfer(), so unlock here. */ 940 /* cctx_run is the alternative tail of transfer(), so unlock here. */
828 UNLOCK; 941 UNLOCK;
829 942
830 /* we now skip the entersub that lead to transfer() */ 943 /* we now skip the entersub that lead to transfer() */
831 PL_op = PL_op->op_next; 944 PL_op = PL_op->op_next;
832 945
833 /* inject a fake subroutine call to cctx_init */ 946 /* inject a fake subroutine call to cctx_init */
834 prepare_cctx (aTHX_ (coro_cctx *)arg); 947 cctx_prepare (aTHX_ (coro_cctx *)arg);
835 948
836 /* somebody or something will hit me for both perl_run and PL_restartop */ 949 /* somebody or something will hit me for both perl_run and PL_restartop */
837 PL_restartop = PL_op; 950 PL_restartop = PL_op;
838 perl_run (PL_curinterp); 951 perl_run (PL_curinterp);
839 952
858 ++cctx_count; 971 ++cctx_count;
859 972
860 Newz (0, cctx, 1, coro_cctx); 973 Newz (0, cctx, 1, coro_cctx);
861 974
862#if HAVE_MMAP 975#if HAVE_MMAP
863
864 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 976 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
865 /* mmap supposedly does allocate-on-write for us */ 977 /* mmap supposedly does allocate-on-write for us */
866 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 978 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
867 979
868 if (cctx->sptr != (void *)-1) 980 if (cctx->sptr != (void *)-1)
889 stack_start = cctx->sptr; 1001 stack_start = cctx->sptr;
890 stack_size = cctx->ssize; 1002 stack_size = cctx->ssize;
891 } 1003 }
892 1004
893 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1005 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
894 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1006 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
895 1007
896 return cctx; 1008 return cctx;
897} 1009}
898 1010
899static void 1011static void
916 Safefree (cctx->sptr); 1028 Safefree (cctx->sptr);
917 1029
918 Safefree (cctx); 1030 Safefree (cctx);
919} 1031}
920 1032
1033/* wether this cctx should be destructed */
1034#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1035
921static coro_cctx * 1036static coro_cctx *
922cctx_get (pTHX) 1037cctx_get (pTHX_ int gimme)
923{ 1038{
924 while (cctx_first) 1039 while (expect_true (cctx_first[gimme]))
925 { 1040 {
926 coro_cctx *cctx = cctx_first; 1041 coro_cctx *cctx = cctx_first[gimme];
927 cctx_first = cctx->next; 1042 cctx_first[gimme] = cctx->next;
928 --cctx_idle; 1043 --cctx_idle[gimme];
929 1044
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1045 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1046 return cctx;
932 1047
933 cctx_destroy (cctx); 1048 cctx_destroy (cctx);
934 } 1049 }
935 1050
1051 assert (!gimme);
936 return cctx_new (); 1052 return cctx_new ();
937} 1053}
938 1054
939static void 1055static void
940cctx_put (coro_cctx *cctx) 1056cctx_put (coro_cctx *cctx, int gimme)
941{ 1057{
942 /* free another cctx if overlimit */ 1058 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1059 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX))
944 { 1060 {
945 coro_cctx *first = cctx_first; 1061 coro_cctx *first = cctx_first[gimme];
946 cctx_first = first->next; 1062 cctx_first[gimme] = first->next;
947 --cctx_idle; 1063 --cctx_idle[gimme];
948 1064
949 cctx_destroy (first); 1065 cctx_destroy (first);
950 } 1066 }
951 1067
952 ++cctx_idle; 1068 ++cctx_idle[gimme];
953 cctx->next = cctx_first; 1069 cctx->next = cctx_first[gimme];
954 cctx_first = cctx; 1070 cctx_first[gimme] = cctx;
955} 1071}
956 1072
957/** coroutine switching *****************************************************/ 1073/** coroutine switching *****************************************************/
958 1074
959static void NOINLINE 1075static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1076transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1077{
962 if (prev != next) 1078 if (expect_true (prev != next))
963 { 1079 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1080 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1081 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
966 1082
967 if (next->flags & CF_RUNNING) 1083 if (expect_false (next->flags & CF_RUNNING))
968 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1084 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
969 1085
970 if (next->flags & CF_DESTROYED) 1086 if (expect_false (next->flags & CF_DESTROYED))
971 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1087 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
972 1088
1089 if (
1090#if PERL_VERSION_ATLEAST (5,9,0)
1091 expect_false (PL_parser)
1092#else
973 if (PL_lex_state != LEX_NOTPARSING) 1093 expect_false (PL_lex_state != LEX_NOTPARSING)
1094#endif
1095 )
974 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1096 croak ("Coro::State::transfer called while parsing, but this is not supported");
975 } 1097 }
976} 1098}
977 1099
978/* always use the TRANSFER macro */ 1100/* always use the TRANSFER macro */
980transfer (pTHX_ struct coro *prev, struct coro *next) 1102transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1103{
982 dSTACKLEVEL; 1104 dSTACKLEVEL;
983 1105
984 /* sometimes transfer is only called to set idle_sp */ 1106 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1107 if (expect_false (!next))
986 { 1108 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1109 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1110 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
989 } 1111 }
990 else if (prev != next) 1112 else if (expect_true (prev != next))
991 { 1113 {
992 coro_cctx *prev__cctx; 1114 coro_cctx *prev__cctx;
993 1115
994 if (prev->flags & CF_NEW) 1116 if (expect_false (prev->flags & CF_NEW))
995 { 1117 {
996 /* create a new empty context */ 1118 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1119 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1120 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1121 prev->flags |= CF_RUNNING;
1002 prev->flags &= ~CF_RUNNING; 1124 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1125 next->flags |= CF_RUNNING;
1004 1126
1005 LOCK; 1127 LOCK;
1006 1128
1007 if (next->flags & CF_NEW) 1129 if (expect_false (next->flags & CF_NEW))
1008 { 1130 {
1009 /* need to start coroutine */ 1131 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1132 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1133 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1134 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1135 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1136 coro_setup (aTHX_ next);
1015 } 1137 }
1016 else 1138 else
1017 { 1139 {
1018 /* coroutine already started */ 1140 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1141 save_perl (aTHX_ prev);
1021 } 1143 }
1022 1144
1023 prev__cctx = prev->cctx; 1145 prev__cctx = prev->cctx;
1024 1146
1025 /* possibly "free" the cctx */ 1147 /* possibly "free" the cctx */
1026 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1148 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1027 { 1149 {
1028 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1150 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1029 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1151 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1030 1152
1031 prev->cctx = 0; 1153 prev->cctx = 0;
1032 1154
1155 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1156 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1157 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1158 if (!next->cctx)
1159 next->cctx = cctx_get (aTHX_ next->gimme);
1160
1033 cctx_put (prev__cctx); 1161 cctx_put (prev__cctx, prev->gimme);
1034 } 1162 }
1035 1163
1036 ++next->usecount; 1164 ++next->usecount;
1037 1165
1038 if (!next->cctx) 1166 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1167 next->cctx = cctx_get (aTHX_ next->gimme);
1040 1168
1041 if (prev__cctx != next->cctx) 1169 if (expect_false (prev__cctx != next->cctx))
1042 { 1170 {
1043 prev__cctx->top_env = PL_top_env; 1171 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1172 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1173 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1174 }
1047 1175
1048 free_coro_mortal (aTHX); 1176 free_coro_mortal (aTHX);
1049 UNLOCK; 1177 UNLOCK;
1178
1179 if (expect_false (prev->throw || next->throw))
1180 {
1181 struct coro *coro = SvSTATE (coro_current);
1182
1183 if (coro->throw)
1184 {
1185 SV *exception = coro->throw;
1186 coro->throw = 0;
1187 sv_setsv (ERRSV, exception);
1188 croak (0);
1189 }
1190 }
1050 } 1191 }
1051} 1192}
1052 1193
1053struct transfer_args 1194struct transfer_args
1054{ 1195{
1081 1222
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1223 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1224 {
1084 struct coro temp; 1225 struct coro temp;
1085 1226
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1227 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1228 croak ("FATAL: tried to destroy currently running coroutine");
1093 1229
1094 save_perl (aTHX_ &temp); 1230 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1231 load_perl (aTHX_ coro);
1096 1232
1097 coro_destroy_stacks (aTHX); 1233 coro_destroy (aTHX_ coro);
1098 1234
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1235 load_perl (aTHX_ &temp);
1100 1236
1101 coro->mainstack = 0; 1237 coro->slot = 0;
1102 } 1238 }
1103 1239
1104 cctx_destroy (coro->cctx); 1240 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1241 SvREFCNT_dec (coro->args);
1106 1242
1165 1301
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1302 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1303 TRANSFER (ta);
1168} 1304}
1169 1305
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181}
1182
1183/** Coro ********************************************************************/ 1306/** Coro ********************************************************************/
1184 1307
1185static void 1308static void
1186coro_enq (pTHX_ SV *coro_sv) 1309coro_enq (pTHX_ SV *coro_sv)
1187{ 1310{
1244 { 1367 {
1245 LOCK; 1368 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1369 next_sv = coro_deq (aTHX_ PRIO_MIN);
1247 1370
1248 /* nothing to schedule: call the idle handler */ 1371 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1372 if (expect_false (!next_sv))
1250 { 1373 {
1251 dSP; 1374 dSP;
1252 UNLOCK; 1375 UNLOCK;
1253 1376
1254 ENTER; 1377 ENTER;
1264 } 1387 }
1265 1388
1266 ta->next = SvSTATE (next_sv); 1389 ta->next = SvSTATE (next_sv);
1267 1390
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1391 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1392 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1393 {
1271 UNLOCK; 1394 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1395 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1396 /* coro_nready is already taken care of by destroy */
1274 continue; 1397 continue;
1330 dTHX; 1453 dTHX;
1331 struct transfer_args ta; 1454 struct transfer_args ta;
1332 1455
1333 prepare_cede (aTHX_ &ta); 1456 prepare_cede (aTHX_ &ta);
1334 1457
1335 if (ta.prev != ta.next) 1458 if (expect_true (ta.prev != ta.next))
1336 { 1459 {
1337 TRANSFER (ta); 1460 TRANSFER (ta);
1338 return 1; 1461 return 1;
1339 } 1462 }
1340 else 1463 else
1376 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1499 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1377 1500
1378 if (coro->flags & CF_RUNNING) 1501 if (coro->flags & CF_RUNNING)
1379 PL_runops = RUNOPS_DEFAULT; 1502 PL_runops = RUNOPS_DEFAULT;
1380 else 1503 else
1381 coro->runops = RUNOPS_DEFAULT; 1504 coro->slot->runops = RUNOPS_DEFAULT;
1382 } 1505 }
1383} 1506}
1384 1507
1385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1508MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1386 1509
1390{ 1513{
1391#ifdef USE_ITHREADS 1514#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1515 MUTEX_INIT (&coro_mutex);
1393#endif 1516#endif
1394 BOOT_PAGESIZE; 1517 BOOT_PAGESIZE;
1518
1519 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1520 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1521
1522 hv_sig = coro_get_hv ("SIG", TRUE);
1523 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1524 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1525
1526 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1527 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1395 1528
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1529 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1530
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1531 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1532 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1533 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1534 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1535
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1404 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1408 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1409 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1410
1411 main_mainstack = PL_mainstack; 1536 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1537 main_top_env = PL_top_env;
1413 1538
1414 while (main_top_env->je_prev) 1539 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1540 main_top_env = main_top_env->je_prev;
1427 struct coro *coro; 1552 struct coro *coro;
1428 HV *hv; 1553 HV *hv;
1429 int i; 1554 int i;
1430 1555
1431 Newz (0, coro, 1, struct coro); 1556 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1557 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1558 coro->flags = CF_NEW;
1435 1559
1436 if (coro_first) coro_first->prev = coro; 1560 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1561 coro->next = coro_first;
1438 coro_first = coro; 1562 coro_first = coro;
1439 1563
1440 coro->hv = hv = newHV (); 1564 coro->hv = hv = newHV ();
1441 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1565 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1442 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1566 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1567
1568 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1569 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1570 av_push (coro->args, newSVsv (ST (i)));
1446} 1571}
1447 OUTPUT: 1572 OUTPUT:
1448 RETVAL
1449
1450int
1451save (SV *coro, int new_save = -1)
1452 CODE:
1453 RETVAL = api_save (coro, new_save);
1454 OUTPUT:
1455 RETVAL
1456
1457int
1458save_also (SV *coro_sv, int save_also)
1459 CODE:
1460{
1461 struct coro *coro = SvSTATE (coro_sv);
1462 RETVAL = coro->save;
1463 coro->save |= save_also;
1464}
1465 OUTPUT:
1466 RETVAL 1573 RETVAL
1467 1574
1468# these not obviously related functions are all rolled into the same xs 1575# these not obviously related functions are all rolled into the same xs
1469# function to increase chances that they all will call transfer with the same 1576# function to increase chances that they all will call transfer with the same
1470# stack offset 1577# stack offset
1471void 1578void
1472_set_stacklevel (...) 1579_set_stacklevel (...)
1473 ALIAS: 1580 ALIAS:
1474 Coro::State::transfer = 1 1581 Coro::State::transfer = 1
1475 Coro::schedule = 2 1582 Coro::schedule = 2
1476 Coro::cede = 3 1583 Coro::cede = 3
1477 Coro::cede_notself = 4 1584 Coro::cede_notself = 4
1585 Coro::Event::next = 5
1586 Coro::Event::next_cancel = 6
1478 CODE: 1587 PPCODE:
1479{ 1588{
1480 struct transfer_args ta; 1589 struct transfer_args ta;
1590 int again = 0;
1481 1591
1482 switch (ix) 1592 do
1483 { 1593 {
1594 switch (ix)
1595 {
1484 case 0: 1596 case 0:
1485 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1597 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1486 ta.next = 0; 1598 ta.next = 0;
1487 break; 1599 break;
1488 1600
1489 case 1: 1601 case 1:
1490 if (items != 2) 1602 if (items != 2)
1491 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1603 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1492 1604
1493 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1605 prepare_transfer (aTHX_ &ta, ST(0), ST(1));
1494 break; 1606 break;
1495 1607
1496 case 2: 1608 case 2:
1497 prepare_schedule (aTHX_ &ta); 1609 prepare_schedule (aTHX_ &ta);
1498 break; 1610 break;
1499 1611
1500 case 3: 1612 case 3:
1501 prepare_cede (aTHX_ &ta); 1613 prepare_cede (aTHX_ &ta);
1502 break; 1614 break;
1503 1615
1504 case 4: 1616 case 4:
1505 if (!prepare_cede_notself (aTHX_ &ta)) 1617 if (!prepare_cede_notself (aTHX_ &ta))
1506 XSRETURN_EMPTY; 1618 XSRETURN_EMPTY;
1507 1619
1508 break; 1620 break;
1621
1622 case 5:
1623 case 6:
1624 if (items != 1)
1625 croak ("Coro::Event::next (watcher) expects one argument, not %d", items);
1626
1627 {
1628 SV *ev = coroapi.coro_event_next (ST (0), ix == 6, GIMME_V != G_VOID);
1629
1630 if (ev)
1631 {
1632 if (GIMME_V != G_VOID)
1633 {
1634 XPUSHs (ev);
1635 XSRETURN (1);
1636 }
1637 else
1638 XSRETURN_EMPTY;
1639 }
1640 }
1641
1642 prepare_schedule (aTHX_ &ta);
1643 again = 1;
1644 break;
1645 }
1646
1647 /* our caller, entersub, caches *only* this value */
1648 ta.prev->gimme = GIMME_V == G_VOID ? 0
1649 : GIMME_V == G_SCALAR ? 1
1650 : 2;
1651
1652 /* we need to save all local variables, as we might execute a different coroutine when transfer returns */
1653 sp += 2; /* save args */
1654 EXTEND (SP, 4);
1655 PUSHs ((SV *)(intptr_t)items);
1656 PUSHs ((SV *)(intptr_t)ix);
1657 PUSHs ((SV *)(intptr_t)ax);
1658 PUSHs ((SV *)(intptr_t)again);
1659 PUTBACK;
1660 BARRIER;
1661 TRANSFER (ta);
1662 BARRIER;
1663 SPAGAIN;
1664 again = (intptr_t)POPs;
1665 ax = (intptr_t)POPs;
1666 ix = (intptr_t)POPs;
1667 items = (intptr_t)POPs;
1668 sp -= 2; /* restore args */
1509 } 1669 }
1670 while (again);
1510 1671
1511 BARRIER;
1512 TRANSFER (ta);
1513
1514 if (GIMME_V != G_VOID && ta.next != ta.prev) 1672 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1515 XSRETURN_YES; 1673 XSRETURN_YES;
1674
1675 XSRETURN_EMPTY; /* not understood why this is necessary, likely some stack handling bug */
1516} 1676}
1517 1677
1518bool 1678bool
1519_destroy (SV *coro_sv) 1679_destroy (SV *coro_sv)
1520 CODE: 1680 CODE:
1546 RETVAL 1706 RETVAL
1547 1707
1548int 1708int
1549cctx_idle () 1709cctx_idle ()
1550 CODE: 1710 CODE:
1551 RETVAL = cctx_idle; 1711 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2];
1552 OUTPUT: 1712 OUTPUT:
1553 RETVAL 1713 RETVAL
1554 1714
1555void 1715void
1556list () 1716list ()
1569 CODE: 1729 CODE:
1570{ 1730{
1571 if (coro->mainstack) 1731 if (coro->mainstack)
1572 { 1732 {
1573 struct coro temp; 1733 struct coro temp;
1574 Zero (&temp, 1, struct coro);
1575 temp.save = CORO_SAVE_ALL;
1576 1734
1577 if (!(coro->flags & CF_RUNNING)) 1735 if (!(coro->flags & CF_RUNNING))
1578 { 1736 {
1579 save_perl (aTHX_ &temp); 1737 save_perl (aTHX_ &temp);
1580 load_perl (aTHX_ coro); 1738 load_perl (aTHX_ coro);
1582 1740
1583 { 1741 {
1584 dSP; 1742 dSP;
1585 ENTER; 1743 ENTER;
1586 SAVETMPS; 1744 SAVETMPS;
1745 PUTBACK;
1746 PUSHSTACK;
1587 PUSHMARK (SP); 1747 PUSHMARK (SP);
1588 PUTBACK; 1748
1589 if (ix) 1749 if (ix)
1590 eval_sv (coderef, 0); 1750 eval_sv (coderef, 0);
1591 else 1751 else
1592 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1752 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1753
1593 SPAGAIN; 1754 POPSTACK;
1594 FREETMPS; 1755 FREETMPS;
1595 LEAVE; 1756 LEAVE;
1596 PUTBACK;
1597 } 1757 }
1598 1758
1599 if (!(coro->flags & CF_RUNNING)) 1759 if (!(coro->flags & CF_RUNNING))
1600 { 1760 {
1601 save_perl (aTHX_ coro); 1761 save_perl (aTHX_ coro);
1655 1815
1656BOOT: 1816BOOT:
1657{ 1817{
1658 int i; 1818 int i;
1659 1819
1660 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1820 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1661 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1821 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1662 av_async_pool = get_av ("Coro::async_pool", TRUE); 1822 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1663 1823
1664 coro_current = get_sv ("Coro::current", FALSE); 1824 coro_current = coro_get_sv ("Coro::current", FALSE);
1665 SvREADONLY_on (coro_current); 1825 SvREADONLY_on (coro_current);
1666 1826
1667 coro_stash = gv_stashpv ("Coro", TRUE); 1827 coro_stash = gv_stashpv ("Coro", TRUE);
1668 1828
1669 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1829 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1670 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1830 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1671 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1831 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1672 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1832 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1675 1835
1676 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1836 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1677 coro_ready[i] = newAV (); 1837 coro_ready[i] = newAV ();
1678 1838
1679 { 1839 {
1680 SV *sv = perl_get_sv("Coro::API", 1); 1840 SV *sv = perl_get_sv ("Coro::API", TRUE);
1841 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1681 1842
1682 coroapi.schedule = api_schedule; 1843 coroapi.schedule = api_schedule;
1683 coroapi.save = api_save;
1684 coroapi.cede = api_cede; 1844 coroapi.cede = api_cede;
1685 coroapi.cede_notself = api_cede_notself; 1845 coroapi.cede_notself = api_cede_notself;
1686 coroapi.ready = api_ready; 1846 coroapi.ready = api_ready;
1687 coroapi.is_ready = api_is_ready; 1847 coroapi.is_ready = api_is_ready;
1688 coroapi.nready = &coro_nready; 1848 coroapi.nready = &coro_nready;
1737 CODE: 1897 CODE:
1738 RETVAL = coro_nready; 1898 RETVAL = coro_nready;
1739 OUTPUT: 1899 OUTPUT:
1740 RETVAL 1900 RETVAL
1741 1901
1902void
1903throw (Coro::State self, SV *throw = &PL_sv_undef)
1904 PROTOTYPE: $;$
1905 CODE:
1906 SvREFCNT_dec (self->throw);
1907 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1908
1742# for async_pool speedup 1909# for async_pool speedup
1743void 1910void
1744_pool_1 (SV *cb) 1911_pool_1 (SV *cb)
1745 CODE: 1912 CODE:
1746{ 1913{
1747 int i, len; 1914 struct coro *coro = SvSTATE (coro_current);
1748 HV *hv = (HV *)SvRV (coro_current); 1915 HV *hv = (HV *)SvRV (coro_current);
1749 AV *defav = GvAV (PL_defgv); 1916 AV *defav = GvAV (PL_defgv);
1750 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1917 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1751 AV *invoke_av; 1918 AV *invoke_av;
1919 int i, len;
1752 1920
1753 if (!invoke) 1921 if (!invoke)
1754 croak ("\3terminate\2\n"); 1922 croak ("\3async_pool terminate\2\n");
1923
1924 SvREFCNT_dec (coro->saved_deffh);
1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1755 1926
1756 hv_store (hv, "desc", sizeof ("desc") - 1, 1927 hv_store (hv, "desc", sizeof ("desc") - 1,
1757 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1928 newSVpvn (strpair ("[async_pool]")), 0);
1758 1929
1759 invoke_av = (AV *)SvRV (invoke); 1930 invoke_av = (AV *)SvRV (invoke);
1760 len = av_len (invoke_av); 1931 len = av_len (invoke_av);
1761 1932
1762 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1933 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1777{ 1948{
1778 struct coro *coro = SvSTATE (coro_current); 1949 struct coro *coro = SvSTATE (coro_current);
1779 1950
1780 sv_setsv (cb, &PL_sv_undef); 1951 sv_setsv (cb, &PL_sv_undef);
1781 1952
1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1954 coro->saved_deffh = 0;
1955
1782 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1783 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1784 croak ("\3terminate\2\n"); 1958 croak ("\3async_pool terminate\2\n");
1785 1959
1786 av_clear (GvAV (PL_defgv)); 1960 av_clear (GvAV (PL_defgv));
1787 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1961 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1788 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1962 newSVpvn (strpair ("[async_pool idle]")), 0);
1789 1963
1790 coro->save = CORO_SAVE_DEF;
1791 coro->prio = 0; 1964 coro->prio = 0;
1792 1965
1793 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1966 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1794 api_trace (coro_current, 0); 1967 api_trace (coro_current, 0);
1795 1968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines