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

Diff Legend

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