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.159 by root, Sat Sep 22 14:42:56 2007 UTC vs.
Revision 1.212 by root, Wed Oct 10 04:21:33 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
… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 148static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 150static SV *coro_mortal; /* will be freed after next transfer */
136 151
152static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */
154
155static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158
137/* async_pool helper stuff */ 159/* async_pool helper stuff */
138static SV *sv_pool_rss; 160static SV *sv_pool_rss;
139static SV *sv_pool_size; 161static SV *sv_pool_size;
140static AV *av_async_pool; 162static AV *av_async_pool;
141 163
142static struct coro_cctx *cctx_first; 164static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 165static int cctx_count, cctx_idle;
166
167enum {
168 CC_MAPPED = 0x01,
169 CC_NOREUSE = 0x02, /* throw this away after tracing */
170 CC_TRACE = 0x04,
171 CC_TRACE_SUB = 0x08, /* trace sub calls */
172 CC_TRACE_LINE = 0x10, /* trace each statement */
173 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
174};
144 175
145/* this is a structure representing a c-level coroutine */ 176/* this is a structure representing a c-level coroutine */
146typedef struct coro_cctx { 177typedef struct coro_cctx {
147 struct coro_cctx *next; 178 struct coro_cctx *next;
148 179
… …
157 coro_context cctx; 188 coro_context cctx;
158 189
159#if CORO_USE_VALGRIND 190#if CORO_USE_VALGRIND
160 int valgrind_id; 191 int valgrind_id;
161#endif 192#endif
162 char inuse, mapped; 193 unsigned char flags;
163} coro_cctx; 194} coro_cctx;
164 195
165enum { 196enum {
166 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
167 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
168 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
169 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
170}; 201};
171 202
203/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct {
205 SV *defsv;
206 AV *defav;
207 SV *errsv;
208 SV *irsgv;
209#define VAR(name,type) type name;
210# include "state.h"
211#undef VAR
212} perl_slots;
213
214#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
215
172/* this is a structure representing a perl-level coroutine */ 216/* this is a structure representing a perl-level coroutine */
173struct coro { 217struct coro {
174 /* the c coroutine allocated to this perl coroutine, if any */ 218 /* the c coroutine allocated to this perl coroutine, if any */
175 coro_cctx *cctx; 219 coro_cctx *cctx;
176 220
221 /* process data */
222 AV *mainstack;
223 perl_slots *slot; /* basically the saved sp */
224
177 /* data associated with this coroutine (initial args) */ 225 AV *args; /* data associated with this coroutine (initial args) */
178 AV *args; 226 int refcnt; /* coroutines are refcounted, yes */
179 int refcnt;
180 int save; /* CORO_SAVE flags */
181 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
228 HV *hv; /* the perl hash associated with this coro, if any */
182 229
183 /* optionally saved, might be zero */ 230 /* statistics */
184 AV *defav; /* @_ */ 231 int usecount; /* number of transfers to this coro */
185 SV *defsv; /* $_ */
186 SV *errsv; /* $@ */
187 GV *deffh; /* default filehandle */
188 SV *irssv; /* $/ */
189 SV *irssv_sv; /* real $/ cache */
190
191#define VAR(name,type) type name;
192# include "state.h"
193#undef VAR
194 232
195 /* coro process data */ 233 /* coro process data */
196 int prio; 234 int prio;
235 SV *throw; /* exception to be thrown */
236
237 /* async_pool */
238 SV *saved_deffh;
197 239
198 /* linked list */ 240 /* linked list */
199 struct coro *next, *prev; 241 struct coro *next, *prev;
200 HV *hv; /* the perl hash associated with this coro, if any */
201}; 242};
202 243
203typedef struct coro *Coro__State; 244typedef struct coro *Coro__State;
204typedef struct coro *Coro__State_or_hashref; 245typedef struct coro *Coro__State_or_hashref;
205 246
… …
217static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
218static int coro_nready; 259static int coro_nready;
219static struct coro *coro_first; 260static struct coro *coro_first;
220 261
221/** lowlevel stuff **********************************************************/ 262/** lowlevel stuff **********************************************************/
263
264static SV *
265coro_get_sv (const char *name, int create)
266{
267#if PERL_VERSION_ATLEAST (5,9,0)
268 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
269 get_sv (name, create);
270#endif
271 return get_sv (name, create);
272}
273
274static AV *
275coro_get_av (const char *name, int create)
276{
277#if PERL_VERSION_ATLEAST (5,9,0)
278 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
279 get_av (name, create);
280#endif
281 return get_av (name, create);
282}
283
284static HV *
285coro_get_hv (const char *name, int create)
286{
287#if PERL_VERSION_ATLEAST (5,9,0)
288 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
289 get_hv (name, create);
290#endif
291 return get_hv (name, create);
292}
222 293
223static AV * 294static AV *
224coro_clone_padlist (pTHX_ CV *cv) 295coro_clone_padlist (pTHX_ CV *cv)
225{ 296{
226 AV *padlist = CvPADLIST (cv); 297 AV *padlist = CvPADLIST (cv);
… …
290 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
291 ? SvMAGIC (cv) \ 362 ? SvMAGIC (cv) \
292 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
293 : 0 364 : 0
294 365
366static struct coro *
367SvSTATE_ (pTHX_ SV *coro)
368{
369 HV *stash;
370 MAGIC *mg;
371
372 if (SvROK (coro))
373 coro = SvRV (coro);
374
375 if (expect_false (SvTYPE (coro) != SVt_PVHV))
376 croak ("Coro::State object required");
377
378 stash = SvSTASH (coro);
379 if (expect_false (stash != coro_stash && stash != coro_state_stash))
380 {
381 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required");
384 }
385
386 mg = CORO_MAGIC (coro);
387 return (struct coro *)mg->mg_ptr;
388}
389
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391
295/* the next two functions merely cache the padlists */ 392/* the next two functions merely cache the padlists */
296static void 393static void
297get_padlist (pTHX_ CV *cv) 394get_padlist (pTHX_ CV *cv)
298{ 395{
299 MAGIC *mg = CORO_MAGIC (cv); 396 MAGIC *mg = CORO_MAGIC (cv);
300 AV *av; 397 AV *av;
301 398
302 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
303 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
304 else 401 else
305 { 402 {
306#if CORO_PREFER_PERL_FUNCTIONS 403#if CORO_PREFER_PERL_FUNCTIONS
307 /* this is probably cleaner, but also slower? */ 404 /* this is probably cleaner, but also slower? */
… …
319put_padlist (pTHX_ CV *cv) 416put_padlist (pTHX_ CV *cv)
320{ 417{
321 MAGIC *mg = CORO_MAGIC (cv); 418 MAGIC *mg = CORO_MAGIC (cv);
322 AV *av; 419 AV *av;
323 420
324 if (!mg) 421 if (expect_false (!mg))
325 { 422 {
326 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
327 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
328 mg->mg_virtual = &vtbl_coro; 425 mg->mg_virtual = &vtbl_coro;
329 mg->mg_obj = (SV *)newAV (); 426 mg->mg_obj = (SV *)newAV ();
330 } 427 }
331 428
332 av = (AV *)mg->mg_obj; 429 av = (AV *)mg->mg_obj;
333 430
334 if (AvFILLp (av) >= AvMAX (av)) 431 if (expect_false (AvFILLp (av) >= AvMAX (av)))
335 av_extend (av, AvMAX (av) + 1); 432 av_extend (av, AvMAX (av) + 1);
336 433
337 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 434 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
338} 435}
339 436
340/** load & save, init *******************************************************/ 437/** load & save, init *******************************************************/
341 438
342#define SB do {
343#define SE } while (0)
344
345#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
346
347static void 439static void
348load_perl (pTHX_ Coro__State c) 440load_perl (pTHX_ Coro__State c)
349{ 441{
442 perl_slots *slot = c->slot;
443 c->slot = 0;
444
445 PL_mainstack = c->mainstack;
446
447 GvSV (PL_defgv) = slot->defsv;
448 GvAV (PL_defgv) = slot->defav;
449 GvSV (PL_errgv) = slot->errsv;
450 GvSV (irsgv) = slot->irsgv;
451
350#define VAR(name,type) PL_ ## name = c->name; 452 #define VAR(name,type) PL_ ## name = slot->name;
351# include "state.h" 453 # include "state.h"
352#undef VAR 454 #undef VAR
353 455
354 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
355 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
356 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
357 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
358
359 if (c->irssv)
360 {
361 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
362 {
363 SvREFCNT_dec (c->irssv);
364 c->irssv = 0;
365 }
366 else
367 {
368 REPLACE_SV (PL_rs, c->irssv);
369 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
370 sv_setsv (c->irssv_sv, PL_rs);
371 }
372 }
373 458
374 { 459 {
375 dSP; 460 dSP;
461
376 CV *cv; 462 CV *cv;
377 463
378 /* now do the ugly restore mess */ 464 /* now do the ugly restore mess */
379 while ((cv = (CV *)POPs)) 465 while (expect_true (cv = (CV *)POPs))
380 { 466 {
381 put_padlist (aTHX_ cv); /* mark this padlist as available */ 467 put_padlist (aTHX_ cv); /* mark this padlist as available */
382 CvDEPTH (cv) = PTR2IV (POPs); 468 CvDEPTH (cv) = PTR2IV (POPs);
383 CvPADLIST (cv) = (AV *)POPs; 469 CvPADLIST (cv) = (AV *)POPs;
384 } 470 }
… …
403 489
404 XPUSHs (Nullsv); 490 XPUSHs (Nullsv);
405 /* this loop was inspired by pp_caller */ 491 /* this loop was inspired by pp_caller */
406 for (;;) 492 for (;;)
407 { 493 {
408 while (cxix >= 0) 494 while (expect_true (cxix >= 0))
409 { 495 {
410 PERL_CONTEXT *cx = &ccstk[cxix--]; 496 PERL_CONTEXT *cx = &ccstk[cxix--];
411 497
412 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 498 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
413 { 499 {
414 CV *cv = cx->blk_sub.cv; 500 CV *cv = cx->blk_sub.cv;
415 501
416 if (CvDEPTH (cv)) 502 if (expect_true (CvDEPTH (cv)))
417 { 503 {
418 EXTEND (SP, 3); 504 EXTEND (SP, 3);
419 PUSHs ((SV *)CvPADLIST (cv)); 505 PUSHs ((SV *)CvPADLIST (cv));
420 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 506 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
421 PUSHs ((SV *)cv); 507 PUSHs ((SV *)cv);
… …
424 get_padlist (aTHX_ cv); 510 get_padlist (aTHX_ cv);
425 } 511 }
426 } 512 }
427 } 513 }
428 514
429 if (top_si->si_type == PERLSI_MAIN) 515 if (expect_true (top_si->si_type == PERLSI_MAIN))
430 break; 516 break;
431 517
432 top_si = top_si->si_prev; 518 top_si = top_si->si_prev;
433 ccstk = top_si->si_cxstack; 519 ccstk = top_si->si_cxstack;
434 cxix = top_si->si_cxix; 520 cxix = top_si->si_cxix;
435 } 521 }
436 522
437 PUTBACK; 523 PUTBACK;
438 } 524 }
439 525
440 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 526 /* allocate some space on the context stack for our purposes */
441 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 527 /* we manually unroll here, as usually 2 slots is enough */
442 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 528 if (SLOT_COUNT >= 1) CXINC;
443 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 529 if (SLOT_COUNT >= 2) CXINC;
444 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 530 if (SLOT_COUNT >= 3) CXINC;
531 {
532 int i;
533 for (i = 3; i < SLOT_COUNT; ++i)
534 CXINC;
535 }
536 cxstack_ix -= SLOT_COUNT; /* undo allocation */
445 537
538 c->mainstack = PL_mainstack;
539
540 {
541 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
542
543 slot->defav = GvAV (PL_defgv);
544 slot->defsv = DEFSV;
545 slot->errsv = ERRSV;
546 slot->irsgv = GvSV (irsgv);
547
446#define VAR(name,type)c->name = PL_ ## name; 548 #define VAR(name,type) slot->name = PL_ ## name;
447# include "state.h" 549 # include "state.h"
448#undef VAR 550 #undef VAR
551 }
449} 552}
450 553
451/* 554/*
452 * allocate various perl stacks. This is an exact copy 555 * allocate various perl stacks. This is an exact copy
453 * of perl.c:init_stacks, except that it uses less memory 556 * of perl.c:init_stacks, except that it uses less memory
… …
458# define coro_init_stacks init_stacks 561# define coro_init_stacks init_stacks
459#else 562#else
460static void 563static void
461coro_init_stacks (pTHX) 564coro_init_stacks (pTHX)
462{ 565{
463 PL_curstackinfo = new_stackinfo(64, 6); 566 PL_curstackinfo = new_stackinfo(32, 8);
464 PL_curstackinfo->si_type = PERLSI_MAIN; 567 PL_curstackinfo->si_type = PERLSI_MAIN;
465 PL_curstack = PL_curstackinfo->si_stack; 568 PL_curstack = PL_curstackinfo->si_stack;
466 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 569 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
467 570
468 PL_stack_base = AvARRAY(PL_curstack); 571 PL_stack_base = AvARRAY(PL_curstack);
469 PL_stack_sp = PL_stack_base; 572 PL_stack_sp = PL_stack_base;
470 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 573 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
471 574
472 New(50,PL_tmps_stack,64,SV*); 575 New(50,PL_tmps_stack,32,SV*);
473 PL_tmps_floor = -1; 576 PL_tmps_floor = -1;
474 PL_tmps_ix = -1; 577 PL_tmps_ix = -1;
475 PL_tmps_max = 64; 578 PL_tmps_max = 32;
476 579
477 New(54,PL_markstack,16,I32); 580 New(54,PL_markstack,16,I32);
478 PL_markstack_ptr = PL_markstack; 581 PL_markstack_ptr = PL_markstack;
479 PL_markstack_max = PL_markstack + 16; 582 PL_markstack_max = PL_markstack + 16;
480 583
481#ifdef SET_MARK_OFFSET 584#ifdef SET_MARK_OFFSET
482 SET_MARK_OFFSET; 585 SET_MARK_OFFSET;
483#endif 586#endif
484 587
485 New(54,PL_scopestack,16,I32); 588 New(54,PL_scopestack,8,I32);
486 PL_scopestack_ix = 0; 589 PL_scopestack_ix = 0;
487 PL_scopestack_max = 16; 590 PL_scopestack_max = 8;
488 591
489 New(54,PL_savestack,64,ANY); 592 New(54,PL_savestack,24,ANY);
490 PL_savestack_ix = 0; 593 PL_savestack_ix = 0;
491 PL_savestack_max = 64; 594 PL_savestack_max = 24;
492 595
493#if !PERL_VERSION_ATLEAST (5,9,0) 596#if !PERL_VERSION_ATLEAST (5,9,0)
494 New(54,PL_retstack,4,OP*); 597 New(54,PL_retstack,4,OP*);
495 PL_retstack_ix = 0; 598 PL_retstack_ix = 0;
496 PL_retstack_max = 4; 599 PL_retstack_max = 4;
… …
502 * destroy the stacks, the callchain etc... 605 * destroy the stacks, the callchain etc...
503 */ 606 */
504static void 607static void
505coro_destroy_stacks (pTHX) 608coro_destroy_stacks (pTHX)
506{ 609{
507 if (!IN_DESTRUCT)
508 {
509 /* restore all saved variables and stuff */
510 LEAVE_SCOPE (0);
511 assert (PL_tmps_floor == -1);
512
513 /* free all temporaries */
514 FREETMPS;
515 assert (PL_tmps_ix == -1);
516
517 /* unwind all extra stacks */
518 POPSTACK_TO (PL_mainstack);
519
520 /* unwind main stack */
521 dounwind (-1);
522 }
523
524 while (PL_curstackinfo->si_next) 610 while (PL_curstackinfo->si_next)
525 PL_curstackinfo = PL_curstackinfo->si_next; 611 PL_curstackinfo = PL_curstackinfo->si_next;
526 612
527 while (PL_curstackinfo) 613 while (PL_curstackinfo)
528 { 614 {
… …
544 Safefree (PL_retstack); 630 Safefree (PL_retstack);
545#endif 631#endif
546} 632}
547 633
548static size_t 634static size_t
549coro_rss (struct coro *coro) 635coro_rss (pTHX_ struct coro *coro)
550{ 636{
551 size_t rss = sizeof (coro); 637 size_t rss = sizeof (*coro);
552 638
553 if (coro->mainstack) 639 if (coro->mainstack)
554 { 640 {
641 perl_slots tmp_slot;
642 perl_slots *slot;
643
555 if (coro->flags & CF_RUNNING) 644 if (coro->flags & CF_RUNNING)
556 { 645 {
646 slot = &tmp_slot;
647
557 #define VAR(name,type)coro->name = PL_ ## name; 648 #define VAR(name,type) slot->name = PL_ ## name;
558 # include "state.h" 649 # include "state.h"
559 #undef VAR 650 #undef VAR
560 } 651 }
652 else
653 slot = coro->slot;
561 654
562 rss += sizeof (coro->curstackinfo); 655 rss += sizeof (slot->curstackinfo);
563 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
564 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
565 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 657 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
566 rss += coro->tmps_max * sizeof (SV *); 658 rss += slot->tmps_max * sizeof (SV *);
567 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
568 rss += coro->scopestack_max * sizeof (I32); 660 rss += slot->scopestack_max * sizeof (I32);
569 rss += coro->savestack_max * sizeof (ANY); 661 rss += slot->savestack_max * sizeof (ANY);
570 662
571#if !PERL_VERSION_ATLEAST (5,9,0) 663#if !PERL_VERSION_ATLEAST (5,9,0)
572 rss += coro->retstack_max * sizeof (OP *); 664 rss += slot->retstack_max * sizeof (OP *);
573#endif 665#endif
574 } 666 }
575 667
576 return rss; 668 return rss;
577} 669}
578 670
579/** coroutine stack handling ************************************************/ 671/** coroutine stack handling ************************************************/
580 672
581static void 673static void
582setup_coro (pTHX_ struct coro *coro) 674coro_setup (pTHX_ struct coro *coro)
583{ 675{
584 /* 676 /*
585 * emulate part of the perl startup here. 677 * emulate part of the perl startup here.
586 */ 678 */
587 coro_init_stacks (aTHX); 679 coro_init_stacks (aTHX);
588 680
681 PL_runops = RUNOPS_DEFAULT;
589 PL_curcop = &PL_compiling; 682 PL_curcop = &PL_compiling;
590 PL_in_eval = EVAL_NULL; 683 PL_in_eval = EVAL_NULL;
591 PL_comppad = 0; 684 PL_comppad = 0;
592 PL_curpm = 0; 685 PL_curpm = 0;
686 PL_curpad = 0;
593 PL_localizing = 0; 687 PL_localizing = 0;
594 PL_dirty = 0; 688 PL_dirty = 0;
595 PL_restartop = 0; 689 PL_restartop = 0;
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
692
693 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
697 PL_rs = newSVsv (GvSV (irsgv));
698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
596 699
597 { 700 {
598 dSP; 701 dSP;
599 LOGOP myop; 702 LOGOP myop;
600 703
601 SvREFCNT_dec (GvAV (PL_defgv));
602 GvAV (PL_defgv) = coro->args; coro->args = 0;
603
604 Zero (&myop, 1, LOGOP); 704 Zero (&myop, 1, LOGOP);
605 myop.op_next = Nullop; 705 myop.op_next = Nullop;
606 myop.op_flags = OPf_WANT_VOID; 706 myop.op_flags = OPf_WANT_VOID;
607 707
608 PUSHMARK (SP); 708 PUSHMARK (SP);
609 XPUSHs (av_shift (GvAV (PL_defgv))); 709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
610 PUTBACK; 710 PUTBACK;
611 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
612 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
613 SPAGAIN; 713 SPAGAIN;
614 } 714 }
615 715
616 ENTER; /* necessary e.g. for dounwind */ 716 /* this newly created coroutine might be run on an existing cctx which most
717 * likely was suspended in set_stacklevel, called from entersub.
718 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
719 * so we ENTER here for symmetry
720 */
721 ENTER;
722}
723
724static void
725coro_destroy (pTHX_ struct coro *coro)
726{
727 if (!IN_DESTRUCT)
728 {
729 /* restore all saved variables and stuff */
730 LEAVE_SCOPE (0);
731 assert (PL_tmps_floor == -1);
732
733 /* free all temporaries */
734 FREETMPS;
735 assert (PL_tmps_ix == -1);
736
737 /* unwind all extra stacks */
738 POPSTACK_TO (PL_mainstack);
739
740 /* unwind main stack */
741 dounwind (-1);
742 }
743
744 SvREFCNT_dec (GvSV (PL_defgv));
745 SvREFCNT_dec (GvAV (PL_defgv));
746 SvREFCNT_dec (GvSV (PL_errgv));
747 SvREFCNT_dec (PL_defoutgv);
748 SvREFCNT_dec (PL_rs);
749 SvREFCNT_dec (GvSV (irsgv));
750
751 SvREFCNT_dec (PL_diehook);
752 SvREFCNT_dec (PL_warnhook);
753
754 SvREFCNT_dec (coro->saved_deffh);
755 SvREFCNT_dec (coro->throw);
756
757 coro_destroy_stacks (aTHX);
617} 758}
618 759
619static void 760static void
620free_coro_mortal (pTHX) 761free_coro_mortal (pTHX)
621{ 762{
622 if (coro_mortal) 763 if (expect_true (coro_mortal))
623 { 764 {
624 SvREFCNT_dec (coro_mortal); 765 SvREFCNT_dec (coro_mortal);
625 coro_mortal = 0; 766 coro_mortal = 0;
626 } 767 }
768}
769
770static int
771runops_trace (pTHX)
772{
773 COP *oldcop = 0;
774 int oldcxix = -2;
775 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
776 coro_cctx *cctx = coro->cctx;
777
778 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
779 {
780 PERL_ASYNC_CHECK ();
781
782 if (cctx->flags & CC_TRACE_ALL)
783 {
784 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
785 {
786 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
787 SV **bot, **top;
788 AV *av = newAV (); /* return values */
789 SV **cb;
790 dSP;
791
792 GV *gv = CvGV (cx->blk_sub.cv);
793 SV *fullname = sv_2mortal (newSV (0));
794 if (isGV (gv))
795 gv_efullname3 (fullname, gv, 0);
796
797 bot = PL_stack_base + cx->blk_oldsp + 1;
798 top = cx->blk_gimme == G_ARRAY ? SP + 1
799 : cx->blk_gimme == G_SCALAR ? bot + 1
800 : bot;
801
802 av_extend (av, top - bot);
803 while (bot < top)
804 av_push (av, SvREFCNT_inc (*bot++));
805
806 PL_runops = RUNOPS_DEFAULT;
807 ENTER;
808 SAVETMPS;
809 EXTEND (SP, 3);
810 PUSHMARK (SP);
811 PUSHs (&PL_sv_no);
812 PUSHs (fullname);
813 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
814 PUTBACK;
815 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
816 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
817 SPAGAIN;
818 FREETMPS;
819 LEAVE;
820 PL_runops = runops_trace;
821 }
822
823 if (oldcop != PL_curcop)
824 {
825 oldcop = PL_curcop;
826
827 if (PL_curcop != &PL_compiling)
828 {
829 SV **cb;
830
831 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
832 {
833 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
834
835 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
836 {
837 runops_proc_t old_runops = PL_runops;
838 dSP;
839 GV *gv = CvGV (cx->blk_sub.cv);
840 SV *fullname = sv_2mortal (newSV (0));
841
842 if (isGV (gv))
843 gv_efullname3 (fullname, gv, 0);
844
845 PL_runops = RUNOPS_DEFAULT;
846 ENTER;
847 SAVETMPS;
848 EXTEND (SP, 3);
849 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes);
851 PUSHs (fullname);
852 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
853 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
855 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
856 SPAGAIN;
857 FREETMPS;
858 LEAVE;
859 PL_runops = runops_trace;
860 }
861
862 oldcxix = cxstack_ix;
863 }
864
865 if (cctx->flags & CC_TRACE_LINE)
866 {
867 dSP;
868
869 PL_runops = RUNOPS_DEFAULT;
870 ENTER;
871 SAVETMPS;
872 EXTEND (SP, 3);
873 PL_runops = RUNOPS_DEFAULT;
874 PUSHMARK (SP);
875 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
876 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
877 PUTBACK;
878 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
879 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
880 SPAGAIN;
881 FREETMPS;
882 LEAVE;
883 PL_runops = runops_trace;
884 }
885 }
886 }
887 }
888 }
889
890 TAINT_NOT;
891 return 0;
627} 892}
628 893
629/* inject a fake call to Coro::State::_cctx_init into the execution */ 894/* inject a fake call to Coro::State::_cctx_init into the execution */
630/* _cctx_init should be careful, as it could be called at almost any time */ 895/* _cctx_init should be careful, as it could be called at almost any time */
631/* during execution of a perl program */ 896/* during execution of a perl program */
632static void NOINLINE 897static void NOINLINE
633prepare_cctx (pTHX_ coro_cctx *cctx) 898cctx_prepare (pTHX_ coro_cctx *cctx)
634{ 899{
635 dSP; 900 dSP;
636 LOGOP myop; 901 LOGOP myop;
902
903 PL_top_env = &PL_start_env;
904
905 if (cctx->flags & CC_TRACE)
906 PL_runops = runops_trace;
637 907
638 Zero (&myop, 1, LOGOP); 908 Zero (&myop, 1, LOGOP);
639 myop.op_next = PL_op; 909 myop.op_next = PL_op;
640 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 910 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
641 911
… …
651 921
652/* 922/*
653 * this is a _very_ stripped down perl interpreter ;) 923 * this is a _very_ stripped down perl interpreter ;)
654 */ 924 */
655static void 925static void
656coro_run (void *arg) 926cctx_run (void *arg)
657{ 927{
658 dTHX; 928 dTHX;
659 929
660 /* coro_run is the alternative tail of transfer(), so unlock here. */ 930 /* cctx_run is the alternative tail of transfer(), so unlock here. */
661 UNLOCK; 931 UNLOCK;
662 932
663 PL_top_env = &PL_start_env; 933 /* we now skip the entersub that lead to transfer() */
934 PL_op = PL_op->op_next;
664 935
665 /* inject a fake subroutine call to cctx_init */ 936 /* inject a fake subroutine call to cctx_init */
666 prepare_cctx (aTHX_ (coro_cctx *)arg); 937 cctx_prepare (aTHX_ (coro_cctx *)arg);
667 938
668 /* somebody or something will hit me for both perl_run and PL_restartop */ 939 /* somebody or something will hit me for both perl_run and PL_restartop */
669 PL_restartop = PL_op; 940 PL_restartop = PL_op;
670 perl_run (PL_curinterp); 941 perl_run (PL_curinterp);
671 942
… …
690 ++cctx_count; 961 ++cctx_count;
691 962
692 Newz (0, cctx, 1, coro_cctx); 963 Newz (0, cctx, 1, coro_cctx);
693 964
694#if HAVE_MMAP 965#if HAVE_MMAP
695
696 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 966 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
697 /* mmap supposedly does allocate-on-write for us */ 967 /* mmap supposedly does allocate-on-write for us */
698 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 968 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
699 969
700 if (cctx->sptr != (void *)-1) 970 if (cctx->sptr != (void *)-1)
… …
702# if CORO_STACKGUARD 972# if CORO_STACKGUARD
703 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 973 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
704# endif 974# endif
705 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 975 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
706 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 976 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
707 cctx->mapped = 1; 977 cctx->flags |= CC_MAPPED;
708 } 978 }
709 else 979 else
710#endif 980#endif
711 { 981 {
712 cctx->ssize = coro_stacksize * (long)sizeof (long); 982 cctx->ssize = coro_stacksize * (long)sizeof (long);
… …
721 stack_start = cctx->sptr; 991 stack_start = cctx->sptr;
722 stack_size = cctx->ssize; 992 stack_size = cctx->ssize;
723 } 993 }
724 994
725 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 995 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
726 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 996 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
727 997
728 return cctx; 998 return cctx;
729} 999}
730 1000
731static void 1001static void
… …
739#if CORO_USE_VALGRIND 1009#if CORO_USE_VALGRIND
740 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1010 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
741#endif 1011#endif
742 1012
743#if HAVE_MMAP 1013#if HAVE_MMAP
744 if (cctx->mapped) 1014 if (cctx->flags & CC_MAPPED)
745 munmap (cctx->sptr, cctx->ssize); 1015 munmap (cctx->sptr, cctx->ssize);
746 else 1016 else
747#endif 1017#endif
748 Safefree (cctx->sptr); 1018 Safefree (cctx->sptr);
749 1019
750 Safefree (cctx); 1020 Safefree (cctx);
751} 1021}
752 1022
1023/* wether this cctx should be destructed */
1024#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1025
753static coro_cctx * 1026static coro_cctx *
754cctx_get (pTHX) 1027cctx_get (pTHX)
755{ 1028{
756 while (cctx_first) 1029 while (expect_true (cctx_first))
757 { 1030 {
758 coro_cctx *cctx = cctx_first; 1031 coro_cctx *cctx = cctx_first;
759 cctx_first = cctx->next; 1032 cctx_first = cctx->next;
760 --cctx_idle; 1033 --cctx_idle;
761 1034
762 if (cctx->ssize >= coro_stacksize) 1035 if (expect_true (!CCTX_EXPIRED (cctx)))
763 return cctx; 1036 return cctx;
764 1037
765 cctx_destroy (cctx); 1038 cctx_destroy (cctx);
766 } 1039 }
767 1040
768 PL_op = PL_op->op_next;
769 return cctx_new (); 1041 return cctx_new ();
770} 1042}
771 1043
772static void 1044static void
773cctx_put (coro_cctx *cctx) 1045cctx_put (coro_cctx *cctx)
774{ 1046{
775 /* free another cctx if overlimit */ 1047 /* free another cctx if overlimit */
776 if (cctx_idle >= MAX_IDLE_CCTX) 1048 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
777 { 1049 {
778 coro_cctx *first = cctx_first; 1050 coro_cctx *first = cctx_first;
779 cctx_first = first->next; 1051 cctx_first = first->next;
780 --cctx_idle; 1052 --cctx_idle;
781 1053
782 assert (!first->inuse);
783 cctx_destroy (first); 1054 cctx_destroy (first);
784 } 1055 }
785 1056
786 ++cctx_idle; 1057 ++cctx_idle;
787 cctx->next = cctx_first; 1058 cctx->next = cctx_first;
788 cctx_first = cctx; 1059 cctx_first = cctx;
789} 1060}
790 1061
791/** coroutine switching *****************************************************/ 1062/** coroutine switching *****************************************************/
792 1063
793/* never call directly, always through the coro_state_transfer global variable */ 1064static void
1065transfer_check (pTHX_ struct coro *prev, struct coro *next)
1066{
1067 if (expect_true (prev != next))
1068 {
1069 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1070 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1071
1072 if (expect_false (next->flags & CF_RUNNING))
1073 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1074
1075 if (expect_false (next->flags & CF_DESTROYED))
1076 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1077
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0)
1080 expect_false (PL_parser)
1081#else
1082 expect_false (PL_lex_state != LEX_NOTPARSING)
1083#endif
1084 )
1085 croak ("Coro::State::transfer called while parsing, but this is not supported");
1086 }
1087}
1088
1089/* always use the TRANSFER macro */
794static void NOINLINE 1090static void NOINLINE
795transfer (pTHX_ struct coro *prev, struct coro *next) 1091transfer (pTHX_ struct coro *prev, struct coro *next)
796{ 1092{
797 dSTACKLEVEL; 1093 dSTACKLEVEL;
798 1094
799 /* sometimes transfer is only called to set idle_sp */ 1095 /* sometimes transfer is only called to set idle_sp */
800 if (!next) 1096 if (expect_false (!next))
801 { 1097 {
802 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
803 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1099 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
804 } 1100 }
805 else if (prev != next) 1101 else if (expect_true (prev != next))
806 { 1102 {
807 coro_cctx *prev__cctx; 1103 coro_cctx *prev__cctx;
808 1104
809 if (prev->flags & CF_NEW) 1105 if (expect_false (prev->flags & CF_NEW))
810 { 1106 {
811 /* create a new empty context */ 1107 /* create a new empty context */
812 Newz (0, prev->cctx, 1, coro_cctx); 1108 Newz (0, prev->cctx, 1, coro_cctx);
813 prev->cctx->inuse = 1;
814 prev->flags &= ~CF_NEW; 1109 prev->flags &= ~CF_NEW;
815 prev->flags |= CF_RUNNING; 1110 prev->flags |= CF_RUNNING;
816 } 1111 }
817 1112
818 /*TODO: must not croak here */
819 if (!prev->flags & CF_RUNNING)
820 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
821
822 if (next->flags & CF_RUNNING)
823 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
824
825 if (next->flags & CF_DESTROYED)
826 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
827
828 prev->flags &= ~CF_RUNNING; 1113 prev->flags &= ~CF_RUNNING;
829 next->flags |= CF_RUNNING; 1114 next->flags |= CF_RUNNING;
830 1115
831 LOCK; 1116 LOCK;
832 1117
833 if (next->flags & CF_NEW) 1118 if (expect_false (next->flags & CF_NEW))
834 { 1119 {
835 /* need to start coroutine */ 1120 /* need to start coroutine */
836 next->flags &= ~CF_NEW; 1121 next->flags &= ~CF_NEW;
837 /* first get rid of the old state */ 1122 /* first get rid of the old state */
838 save_perl (aTHX_ prev); 1123 save_perl (aTHX_ prev);
839 /* setup coroutine call */ 1124 /* setup coroutine call */
840 setup_coro (aTHX_ next); 1125 coro_setup (aTHX_ next);
841 /* need a new stack */
842 assert (!next->cctx);
843 } 1126 }
844 else 1127 else
845 { 1128 {
846 /* coroutine already started */ 1129 /* coroutine already started */
847 save_perl (aTHX_ prev); 1130 save_perl (aTHX_ prev);
… …
849 } 1132 }
850 1133
851 prev__cctx = prev->cctx; 1134 prev__cctx = prev->cctx;
852 1135
853 /* possibly "free" the cctx */ 1136 /* possibly "free" the cctx */
854 if (prev__cctx->idle_sp == STACKLEVEL) 1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
855 { 1138 {
856 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1139 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
857 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1140 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
858 1141
859 prev->cctx = 0; 1142 prev->cctx = 0;
860 1143
1144 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1145 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1146 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1147 if (!next->cctx)
1148 next->cctx = cctx_get (aTHX);
1149
861 cctx_put (prev__cctx); 1150 cctx_put (prev__cctx);
862 prev__cctx->inuse = 0;
863 } 1151 }
864 1152
1153 ++next->usecount;
1154
865 if (!next->cctx) 1155 if (expect_true (!next->cctx))
866 {
867 next->cctx = cctx_get (aTHX); 1156 next->cctx = cctx_get (aTHX);
868 assert (!next->cctx->inuse);
869 next->cctx->inuse = 1;
870 }
871 1157
872 if (prev__cctx != next->cctx) 1158 if (expect_false (prev__cctx != next->cctx))
873 { 1159 {
874 prev__cctx->top_env = PL_top_env; 1160 prev__cctx->top_env = PL_top_env;
875 PL_top_env = next->cctx->top_env; 1161 PL_top_env = next->cctx->top_env;
876 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1162 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
877 } 1163 }
878 1164
879 free_coro_mortal (aTHX); 1165 free_coro_mortal (aTHX);
880 UNLOCK; 1166 UNLOCK;
1167
1168 if (expect_false (prev->throw || next->throw))
1169 {
1170 struct coro *coro = SvSTATE (coro_current);
1171
1172 if (coro->throw)
1173 {
1174 SV *exception = coro->throw;
1175 coro->throw = 0;
1176 sv_setsv (ERRSV, exception);
1177 croak (0);
1178 }
1179 }
881 } 1180 }
882} 1181}
883 1182
884struct transfer_args 1183struct transfer_args
885{ 1184{
886 struct coro *prev, *next; 1185 struct coro *prev, *next;
887}; 1186};
888 1187
889#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1188#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1189#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
890 1190
891/** high level stuff ********************************************************/ 1191/** high level stuff ********************************************************/
892 1192
893static int 1193static int
894coro_state_destroy (pTHX_ struct coro *coro) 1194coro_state_destroy (pTHX_ struct coro *coro)
… …
911 1211
912 if (coro->mainstack && coro->mainstack != main_mainstack) 1212 if (coro->mainstack && coro->mainstack != main_mainstack)
913 { 1213 {
914 struct coro temp; 1214 struct coro temp;
915 1215
916 assert (!(coro->flags & CF_RUNNING));
917
918 Zero (&temp, 1, struct coro);
919 temp.save = CORO_SAVE_ALL;
920
921 if (coro->flags & CF_RUNNING) 1216 if (coro->flags & CF_RUNNING)
922 croak ("FATAL: tried to destroy currently running coroutine"); 1217 croak ("FATAL: tried to destroy currently running coroutine");
923 1218
924 save_perl (aTHX_ &temp); 1219 save_perl (aTHX_ &temp);
925 load_perl (aTHX_ coro); 1220 load_perl (aTHX_ coro);
926 1221
927 coro_destroy_stacks (aTHX); 1222 coro_destroy (aTHX_ coro);
928 1223
929 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1224 load_perl (aTHX_ &temp);
930 1225
931 coro->mainstack = 0; 1226 coro->slot = 0;
932 } 1227 }
933 1228
934 cctx_destroy (coro->cctx); 1229 cctx_destroy (coro->cctx);
935 SvREFCNT_dec (coro->args); 1230 SvREFCNT_dec (coro->args);
936 1231
… …
977#else 1272#else
978# define MGf_DUP 0 1273# define MGf_DUP 0
979#endif 1274#endif
980}; 1275};
981 1276
982static struct coro *
983SvSTATE_ (pTHX_ SV *coro)
984{
985 HV *stash;
986 MAGIC *mg;
987
988 if (SvROK (coro))
989 coro = SvRV (coro);
990
991 stash = SvSTASH (coro);
992 if (stash != coro_stash && stash != coro_state_stash)
993 {
994 /* very slow, but rare, check */
995 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
996 croak ("Coro::State object required");
997 }
998
999 mg = CORO_MAGIC (coro);
1000 return (struct coro *)mg->mg_ptr;
1001}
1002
1003#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1004
1005static void 1277static void
1006prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1278prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1007{ 1279{
1008 ta->prev = SvSTATE (prev_sv); 1280 ta->prev = SvSTATE (prev_sv);
1009 ta->next = SvSTATE (next_sv); 1281 ta->next = SvSTATE (next_sv);
1282 TRANSFER_CHECK (*ta);
1010} 1283}
1011 1284
1012static void 1285static void
1013api_transfer (SV *prev_sv, SV *next_sv) 1286api_transfer (SV *prev_sv, SV *next_sv)
1014{ 1287{
1015 dTHX; 1288 dTHX;
1016 struct transfer_args ta; 1289 struct transfer_args ta;
1017 1290
1018 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1291 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1019 TRANSFER (ta); 1292 TRANSFER (ta);
1020}
1021
1022static int
1023api_save (SV *coro_sv, int new_save)
1024{
1025 dTHX;
1026 struct coro *coro = SvSTATE (coro_sv);
1027 int old_save = coro->save;
1028
1029 if (new_save >= 0)
1030 coro->save = new_save;
1031
1032 return old_save;
1033} 1293}
1034 1294
1035/** Coro ********************************************************************/ 1295/** Coro ********************************************************************/
1036 1296
1037static void 1297static void
… …
1096 { 1356 {
1097 LOCK; 1357 LOCK;
1098 next_sv = coro_deq (aTHX_ PRIO_MIN); 1358 next_sv = coro_deq (aTHX_ PRIO_MIN);
1099 1359
1100 /* nothing to schedule: call the idle handler */ 1360 /* nothing to schedule: call the idle handler */
1101 if (!next_sv) 1361 if (expect_false (!next_sv))
1102 { 1362 {
1103 dSP; 1363 dSP;
1104 UNLOCK; 1364 UNLOCK;
1105 1365
1106 ENTER; 1366 ENTER;
… …
1116 } 1376 }
1117 1377
1118 ta->next = SvSTATE (next_sv); 1378 ta->next = SvSTATE (next_sv);
1119 1379
1120 /* cannot transfer to destroyed coros, skip and look for next */ 1380 /* cannot transfer to destroyed coros, skip and look for next */
1121 if (ta->next->flags & CF_DESTROYED) 1381 if (expect_false (ta->next->flags & CF_DESTROYED))
1122 { 1382 {
1123 UNLOCK; 1383 UNLOCK;
1124 SvREFCNT_dec (next_sv); 1384 SvREFCNT_dec (next_sv);
1125 /* coro_nready is already taken care of by destroy */ 1385 /* coro_nready is already taken care of by destroy */
1126 continue; 1386 continue;
… …
1131 break; 1391 break;
1132 } 1392 }
1133 1393
1134 /* free this only after the transfer */ 1394 /* free this only after the transfer */
1135 prev_sv = SvRV (coro_current); 1395 prev_sv = SvRV (coro_current);
1136 SvRV_set (coro_current, next_sv);
1137 ta->prev = SvSTATE (prev_sv); 1396 ta->prev = SvSTATE (prev_sv);
1138 1397 TRANSFER_CHECK (*ta);
1139 assert (ta->next->flags & CF_READY); 1398 assert (ta->next->flags & CF_READY);
1140 ta->next->flags &= ~CF_READY; 1399 ta->next->flags &= ~CF_READY;
1400 SvRV_set (coro_current, next_sv);
1141 1401
1142 LOCK; 1402 LOCK;
1143 free_coro_mortal (aTHX); 1403 free_coro_mortal (aTHX);
1144 coro_mortal = prev_sv; 1404 coro_mortal = prev_sv;
1145 UNLOCK; 1405 UNLOCK;
… …
1182 dTHX; 1442 dTHX;
1183 struct transfer_args ta; 1443 struct transfer_args ta;
1184 1444
1185 prepare_cede (aTHX_ &ta); 1445 prepare_cede (aTHX_ &ta);
1186 1446
1187 if (ta.prev != ta.next) 1447 if (expect_true (ta.prev != ta.next))
1188 { 1448 {
1189 TRANSFER (ta); 1449 TRANSFER (ta);
1190 return 1; 1450 return 1;
1191 } 1451 }
1192 else 1452 else
… …
1206 } 1466 }
1207 else 1467 else
1208 return 0; 1468 return 0;
1209} 1469}
1210 1470
1471static void
1472api_trace (SV *coro_sv, int flags)
1473{
1474 dTHX;
1475 struct coro *coro = SvSTATE (coro_sv);
1476
1477 if (flags & CC_TRACE)
1478 {
1479 if (!coro->cctx)
1480 coro->cctx = cctx_new ();
1481 else if (!(coro->cctx->flags & CC_TRACE))
1482 croak ("cannot enable tracing on coroutine with custom stack");
1483
1484 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1485 }
1486 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1487 {
1488 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1489
1490 if (coro->flags & CF_RUNNING)
1491 PL_runops = RUNOPS_DEFAULT;
1492 else
1493 coro->slot->runops = RUNOPS_DEFAULT;
1494 }
1495}
1496
1211MODULE = Coro::State PACKAGE = Coro::State 1497MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1212 1498
1213PROTOTYPES: DISABLE 1499PROTOTYPES: DISABLE
1214 1500
1215BOOT: 1501BOOT:
1216{ 1502{
1217#ifdef USE_ITHREADS 1503#ifdef USE_ITHREADS
1218 MUTEX_INIT (&coro_mutex); 1504 MUTEX_INIT (&coro_mutex);
1219#endif 1505#endif
1220 BOOT_PAGESIZE; 1506 BOOT_PAGESIZE;
1221 1507
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510
1511 hv_sig = coro_get_hv ("SIG", TRUE);
1512 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1513 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517
1222 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1223 1519
1224 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1225 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1226 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1227 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1228 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1229 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF)); 1522 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1230 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1523 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1231 1524
1232 main_mainstack = PL_mainstack; 1525 main_mainstack = PL_mainstack;
1233 main_top_env = PL_top_env; 1526 main_top_env = PL_top_env;
1234 1527
1235 while (main_top_env->je_prev) 1528 while (main_top_env->je_prev)
1236 main_top_env = main_top_env->je_prev; 1529 main_top_env = main_top_env->je_prev;
1237 1530
1238 coroapi.ver = CORO_API_VERSION; 1531 coroapi.ver = CORO_API_VERSION;
1532 coroapi.rev = CORO_API_REVISION;
1239 coroapi.transfer = api_transfer; 1533 coroapi.transfer = api_transfer;
1240 1534
1241 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1535 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1242} 1536}
1243 1537
… …
1248 struct coro *coro; 1542 struct coro *coro;
1249 HV *hv; 1543 HV *hv;
1250 int i; 1544 int i;
1251 1545
1252 Newz (0, coro, 1, struct coro); 1546 Newz (0, coro, 1, struct coro);
1253 coro->args = newAV (); 1547 coro->args = newAV ();
1254 coro->save = CORO_SAVE_DEF;
1255 coro->flags = CF_NEW; 1548 coro->flags = CF_NEW;
1256 1549
1257 if (coro_first) coro_first->prev = coro; 1550 if (coro_first) coro_first->prev = coro;
1258 coro->next = coro_first; 1551 coro->next = coro_first;
1259 coro_first = coro; 1552 coro_first = coro;
1260 1553
1261 coro->hv = hv = newHV (); 1554 coro->hv = hv = newHV ();
1262 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1263 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1264 1557
1558 av_extend (coro->args, items - 1);
1265 for (i = 1; i < items; i++) 1559 for (i = 1; i < items; i++)
1266 av_push (coro->args, newSVsv (ST (i))); 1560 av_push (coro->args, newSVsv (ST (i)));
1267} 1561}
1268 OUTPUT: 1562 OUTPUT:
1269 RETVAL 1563 RETVAL
1270 1564
1271int 1565# these not obviously related functions are all rolled into the same xs
1272save (SV *coro, int new_save = -1) 1566# function to increase chances that they all will call transfer with the same
1273 CODE: 1567# stack offset
1274 RETVAL = api_save (coro, new_save);
1275 OUTPUT:
1276 RETVAL
1277
1278int
1279save_also (SV *coro_sv, int save_also)
1280 CODE:
1281{
1282 struct coro *coro = SvSTATE (coro_sv);
1283 RETVAL = coro->save;
1284 coro->save |= save_also;
1285}
1286 OUTPUT:
1287 RETVAL
1288
1289void 1568void
1290_set_stacklevel (...) 1569_set_stacklevel (...)
1291 ALIAS: 1570 ALIAS:
1292 Coro::State::transfer = 1 1571 Coro::State::transfer = 1
1293 Coro::schedule = 2 1572 Coro::schedule = 2
… …
1325 1604
1326 break; 1605 break;
1327 } 1606 }
1328 1607
1329 BARRIER; 1608 BARRIER;
1609 PUTBACK;
1330 TRANSFER (ta); 1610 TRANSFER (ta);
1331 1611 SPAGAIN; /* might be the sp of a different coroutine now */
1332 if (GIMME_V != G_VOID && ta.next != ta.prev) 1612 /* be extra careful not to ever do anything after TRANSFER */
1333 XSRETURN_YES;
1334} 1613}
1335 1614
1336bool 1615bool
1337_destroy (SV *coro_sv) 1616_destroy (SV *coro_sv)
1338 CODE: 1617 CODE:
… …
1379 if (coro->hv) 1658 if (coro->hv)
1380 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 1659 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1381} 1660}
1382 1661
1383void 1662void
1384_eval (Coro::State coro, SV *coderef) 1663call (Coro::State coro, SV *coderef)
1664 ALIAS:
1665 eval = 1
1385 CODE: 1666 CODE:
1386{ 1667{
1387 if (coro->mainstack) 1668 if (coro->mainstack)
1388 { 1669 {
1389 struct coro temp; 1670 struct coro temp;
1390 Zero (&temp, 1, struct coro);
1391 temp.save = CORO_SAVE_ALL;
1392 1671
1393 if (!(coro->flags & CF_RUNNING)) 1672 if (!(coro->flags & CF_RUNNING))
1394 { 1673 {
1395 save_perl (aTHX_ &temp); 1674 save_perl (aTHX_ &temp);
1396 load_perl (aTHX_ coro); 1675 load_perl (aTHX_ coro);
… …
1398 1677
1399 { 1678 {
1400 dSP; 1679 dSP;
1401 ENTER; 1680 ENTER;
1402 SAVETMPS; 1681 SAVETMPS;
1682 PUTBACK;
1683 PUSHSTACK;
1403 PUSHMARK (SP); 1684 PUSHMARK (SP);
1404 PUTBACK; 1685
1686 if (ix)
1687 eval_sv (coderef, 0);
1688 else
1405 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1689 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1690
1691 POPSTACK;
1406 SPAGAIN; 1692 SPAGAIN;
1407 FREETMPS; 1693 FREETMPS;
1408 LEAVE; 1694 LEAVE;
1409 PUTBACK; 1695 PUTBACK;
1410 } 1696 }
… …
1414 save_perl (aTHX_ coro); 1700 save_perl (aTHX_ coro);
1415 load_perl (aTHX_ &temp); 1701 load_perl (aTHX_ &temp);
1416 } 1702 }
1417 } 1703 }
1418} 1704}
1419 1705
1420SV * 1706SV *
1421is_ready (Coro::State coro) 1707is_ready (Coro::State coro)
1422 PROTOTYPE: $ 1708 PROTOTYPE: $
1423 ALIAS: 1709 ALIAS:
1424 is_ready = CF_READY 1710 is_ready = CF_READY
… …
1428 CODE: 1714 CODE:
1429 RETVAL = boolSV (coro->flags & ix); 1715 RETVAL = boolSV (coro->flags & ix);
1430 OUTPUT: 1716 OUTPUT:
1431 RETVAL 1717 RETVAL
1432 1718
1719void
1720api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1721
1722SV *
1723has_stack (Coro::State coro)
1724 PROTOTYPE: $
1725 CODE:
1726 RETVAL = boolSV (!!coro->cctx);
1727 OUTPUT:
1728 RETVAL
1729
1730int
1731is_traced (Coro::State coro)
1732 PROTOTYPE: $
1733 CODE:
1734 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1735 OUTPUT:
1736 RETVAL
1737
1433IV 1738IV
1434rss (Coro::State coro) 1739rss (Coro::State coro)
1435 PROTOTYPE: $ 1740 PROTOTYPE: $
1741 ALIAS:
1742 usecount = 1
1436 CODE: 1743 CODE:
1437 RETVAL = coro_rss (coro); 1744 switch (ix)
1745 {
1746 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1747 case 1: RETVAL = coro->usecount; break;
1748 }
1438 OUTPUT: 1749 OUTPUT:
1439 RETVAL 1750 RETVAL
1440 1751
1441 1752
1442MODULE = Coro::State PACKAGE = Coro 1753MODULE = Coro::State PACKAGE = Coro
1443 1754
1444BOOT: 1755BOOT:
1445{ 1756{
1446 int i; 1757 int i;
1447 1758
1448 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1759 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1449 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1760 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1450 av_async_pool = get_av ("Coro::async_pool", TRUE); 1761 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1451 1762
1452 coro_current = get_sv ("Coro::current", FALSE); 1763 coro_current = coro_get_sv ("Coro::current", FALSE);
1453 SvREADONLY_on (coro_current); 1764 SvREADONLY_on (coro_current);
1454 1765
1455 coro_stash = gv_stashpv ("Coro", TRUE); 1766 coro_stash = gv_stashpv ("Coro", TRUE);
1456 1767
1457 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1458 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1769 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1459 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1770 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1460 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1771 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1463 1774
1464 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1775 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1465 coro_ready[i] = newAV (); 1776 coro_ready[i] = newAV ();
1466 1777
1467 { 1778 {
1468 SV *sv = perl_get_sv("Coro::API", 1); 1779 SV *sv = perl_get_sv ("Coro::API", TRUE);
1780 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1469 1781
1470 coroapi.schedule = api_schedule; 1782 coroapi.schedule = api_schedule;
1471 coroapi.save = api_save;
1472 coroapi.cede = api_cede; 1783 coroapi.cede = api_cede;
1473 coroapi.cede_notself = api_cede_notself; 1784 coroapi.cede_notself = api_cede_notself;
1474 coroapi.ready = api_ready; 1785 coroapi.ready = api_ready;
1475 coroapi.is_ready = api_is_ready; 1786 coroapi.is_ready = api_is_ready;
1476 coroapi.nready = &coro_nready; 1787 coroapi.nready = &coro_nready;
… …
1525 CODE: 1836 CODE:
1526 RETVAL = coro_nready; 1837 RETVAL = coro_nready;
1527 OUTPUT: 1838 OUTPUT:
1528 RETVAL 1839 RETVAL
1529 1840
1841void
1842throw (Coro::State self, SV *throw = &PL_sv_undef)
1843 PROTOTYPE: $;$
1844 CODE:
1845 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847
1530# for async_pool speedup 1848# for async_pool speedup
1531SV * 1849void
1532_pool_1 (...) 1850_pool_1 (SV *cb)
1533 CODE: 1851 CODE:
1534{ 1852{
1535 int i, len; 1853 struct coro *coro = SvSTATE (coro_current);
1536 HV *hv = (HV *)SvRV (coro_current); 1854 HV *hv = (HV *)SvRV (coro_current);
1537 AV *defav = GvAV (PL_defgv); 1855 AV *defav = GvAV (PL_defgv);
1538 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1539 AV *invoke_av; 1857 AV *invoke_av;
1858 int i, len;
1540 1859
1541 if (!invoke) 1860 if (!invoke)
1542 XSRETURN_EMPTY; 1861 croak ("\3async_pool terminate\2\n");
1862
1863 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1543 1865
1544 hv_store (hv, "desc", sizeof ("desc") - 1, 1866 hv_store (hv, "desc", sizeof ("desc") - 1,
1545 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1867 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1546 1868
1547 invoke_av = (AV *)SvRV (invoke); 1869 invoke_av = (AV *)SvRV (invoke);
1548 len = av_len (invoke_av); 1870 len = av_len (invoke_av);
1549 1871
1550 av_clear (defav); 1872 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1551
1552 RETVAL = sv_2mortal (SvREFCNT_inc (AvARRAY (invoke_av)[0]));
1553 1873
1554 if (len > 0) 1874 if (len > 0)
1555 { 1875 {
1556 av_extend (defav, len); 1876 av_fill (defav, len - 1);
1557 for (i = 0; i < len; ++i) 1877 for (i = 0; i < len; ++i)
1558 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 1878 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1]));
1559 } 1879 }
1560 1880
1561 SvREFCNT_dec (invoke); 1881 SvREFCNT_dec (invoke);
1562} 1882}
1563 OUTPUT:
1564 RETVAL
1565 1883
1566void 1884void
1567_pool_2 (...) 1885_pool_2 (SV *cb)
1568 CODE: 1886 CODE:
1569{ 1887{
1570 struct coro *coro = SvSTATE (coro_current); 1888 struct coro *coro = SvSTATE (coro_current);
1571 1889
1890 sv_setsv (cb, &PL_sv_undef);
1891
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0;
1894
1572 if (coro_rss (coro) > SvIV (sv_pool_rss) 1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1573 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1574 XSRETURN_YES; 1897 croak ("\3async_pool terminate\2\n");
1575 1898
1576 av_clear (GvAV (PL_defgv)); 1899 av_clear (GvAV (PL_defgv));
1577 hv_store (SvRV (coro_current), "desc", sizeof ("desc") - 1, 1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1578 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1579 coro->save = CORO_SAVE_DEF; 1902
1580 coro->prio = 0; 1903 coro->prio = 0;
1904
1905 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1906 api_trace (coro_current, 0);
1907
1581 av_push (av_async_pool, newSVsv (coro_current)); 1908 av_push (av_async_pool, newSVsv (coro_current));
1582
1583 XSRETURN_NO;
1584} 1909}
1585 1910
1586 1911
1587MODULE = Coro::State PACKAGE = Coro::AIO 1912MODULE = Coro::State PACKAGE = Coro::AIO
1588 1913

Diff Legend

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