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

Diff Legend

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