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.288 by root, Mon Nov 17 07:14:50 2008 UTC vs.
Revision 1.336 by root, Thu Dec 4 17:29:40 2008 UTC

… …
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
… …
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
… …
120#endif 126#endif
121 127
122/* The next macros try to return the current stack pointer, in an as 128/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 129 * portable way as possible. */
124#if __GNUC__ >= 4 130#if __GNUC__ >= 4
131# define dSTACKLEVEL int stacklevel_dummy
125# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0) 132# define STACKLEVEL __builtin_frame_address (0)
126#else 133#else
127# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel)
128#endif 136#endif
129 137
130#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
131 139
132#if __GNUC__ >= 3 140#if __GNUC__ >= 3
133# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
134# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
135# define INLINE static inline 143# define INLINE static inline
… …
143#define expect_true(expr) expect ((expr) != 0, 1) 151#define expect_true(expr) expect ((expr) != 0, 1)
144 152
145#define NOINLINE attribute ((noinline)) 153#define NOINLINE attribute ((noinline))
146 154
147#include "CoroAPI.h" 155#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */
148 157
149#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
150# if CORO_PTHREAD 159# if CORO_PTHREAD
151static void *coro_thx; 160static void *coro_thx;
152# endif 161# endif
153#endif 162#endif
154 163
155static double (*nvtime)(); /* so why doesn't it take void? */ 164static double (*nvtime)(); /* so why doesn't it take void? */
165
166/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX);
156 169
157static U32 cctx_gen; 170static U32 cctx_gen;
158static size_t cctx_stacksize = CORO_STACKSIZE; 171static size_t cctx_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 172static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 174static JMPENV *main_top_env;
162static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
163static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
164 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
165static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook; 184static SV *rv_diehook;
168static SV *rv_warnhook; 185static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
170 187
171/* async_pool helper stuff */ 188/* async_pool helper stuff */
172static SV *sv_pool_rss; 189static SV *sv_pool_rss;
173static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
174static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
175 196
176/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
177static SV *sv_activity; 198static SV *sv_activity;
178 199
179static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
208 int valgrind_id; 229 int valgrind_id;
209#endif 230#endif
210 unsigned char flags; 231 unsigned char flags;
211} coro_cctx; 232} coro_cctx;
212 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
213enum { 238enum {
214 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
215 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
216 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
217 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
… …
222{ 247{
223 SV *defsv; 248 SV *defsv;
224 AV *defav; 249 AV *defav;
225 SV *errsv; 250 SV *errsv;
226 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
227#define VAR(name,type) type name; 253#define VAR(name,type) type name;
228# include "state.h" 254# include "state.h"
229#undef VAR 255#undef VAR
230} perl_slots; 256} perl_slots;
231 257
… …
239 /* state data */ 265 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 266 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 267 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 268 perl_slots *slot; /* basically the saved sp */
243 269
270 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 271 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */ 272 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 273 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 274 HV *hv; /* the perl hash associated with this coro, if any */
248 void (*on_destroy)(pTHX_ struct coro *coro); 275 void (*on_destroy)(pTHX_ struct coro *coro);
249 276
250 /* statistics */ 277 /* statistics */
251 int usecount; /* number of transfers to this coro */ 278 int usecount; /* number of transfers to this coro */
252 279
253 /* coro process data */ 280 /* coro process data */
254 int prio; 281 int prio;
255 SV *throw; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
283 SV *rouse_cb;
256 284
257 /* async_pool */ 285 /* async_pool */
258 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
259 289
260 /* linked list */ 290 /* linked list */
261 struct coro *next, *prev; 291 struct coro *next, *prev;
262}; 292};
263 293
… …
266 296
267/* the following variables are effectively part of the perl context */ 297/* the following variables are effectively part of the perl context */
268/* and get copied between struct coro and these variables */ 298/* and get copied between struct coro and these variables */
269/* the mainr easonw e don't support windows process emulation */ 299/* the mainr easonw e don't support windows process emulation */
270static struct CoroSLF slf_frame; /* the current slf frame */ 300static struct CoroSLF slf_frame; /* the current slf frame */
271static SV *coro_throw;
272 301
273/** Coro ********************************************************************/ 302/** Coro ********************************************************************/
274 303
275#define PRIO_MAX 3 304#define PRIO_MAX 3
276#define PRIO_HIGH 1 305#define PRIO_HIGH 1
… …
281 310
282/* for Coro.pm */ 311/* for Coro.pm */
283static SV *coro_current; 312static SV *coro_current;
284static SV *coro_readyhook; 313static SV *coro_readyhook;
285static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
315static CV *cv_coro_run, *cv_coro_terminate;
286static struct coro *coro_first; 316static struct coro *coro_first;
287#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
288 318
289/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
290 320
… …
316 get_hv (name, create); 346 get_hv (name, create);
317#endif 347#endif
318 return get_hv (name, create); 348 return get_hv (name, create);
319} 349}
320 350
351/* may croak */
352INLINE CV *
353coro_sv_2cv (pTHX_ SV *sv)
354{
355 HV *st;
356 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0);
358}
359
360/*****************************************************************************/
361/* magic glue */
362
363#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext
365
366#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \
369 : mg_find (sv, type))
370
371#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \
374 : 0)
375
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378
379INLINE struct coro *
380SvSTATE_ (pTHX_ SV *coro)
381{
382 HV *stash;
383 MAGIC *mg;
384
385 if (SvROK (coro))
386 coro = SvRV (coro);
387
388 if (expect_false (SvTYPE (coro) != SVt_PVHV))
389 croak ("Coro::State object required");
390
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr;
401}
402
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404
405/* faster than SvSTATE, but expects a coroutine hv */
406#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408
409/*****************************************************************************/
410/* padlist management and caching */
411
321static AV * 412static AV *
322coro_clone_padlist (pTHX_ CV *cv) 413coro_derive_padlist (pTHX_ CV *cv)
323{ 414{
324 AV *padlist = CvPADLIST (cv); 415 AV *padlist = CvPADLIST (cv);
325 AV *newpadlist, *newpad; 416 AV *newpadlist, *newpad;
326 417
327 newpadlist = newAV (); 418 newpadlist = newAV ();
… …
332 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
333#endif 424#endif
334 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
335 --AvFILLp (padlist); 426 --AvFILLp (padlist);
336 427
337 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
338 av_store (newpadlist, 1, (SV *)newpad); 429 av_store (newpadlist, 1, (SV *)newpad);
339 430
340 return newpadlist; 431 return newpadlist;
341} 432}
342 433
343static void 434static void
344free_padlist (pTHX_ AV *padlist) 435free_padlist (pTHX_ AV *padlist)
345{ 436{
346 /* may be during global destruction */ 437 /* may be during global destruction */
347 if (SvREFCNT (padlist)) 438 if (!IN_DESTRUCT)
348 { 439 {
349 I32 i = AvFILLp (padlist); 440 I32 i = AvFILLp (padlist);
350 while (i >= 0) 441
442 while (i > 0) /* special-case index 0 */
351 { 443 {
352 SV **svp = av_fetch (padlist, i--, FALSE); 444 /* we try to be extra-careful here */
353 if (svp) 445 AV *av = (AV *)AvARRAY (padlist)[i--];
354 { 446 I32 j = AvFILLp (av);
355 SV *sv; 447
356 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 448 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]);
450
451 AvFILLp (av) = -1;
357 SvREFCNT_dec (sv); 452 SvREFCNT_dec (av);
358
359 SvREFCNT_dec (*svp);
360 }
361 } 453 }
362 454
455 SvREFCNT_dec (AvARRAY (padlist)[0]);
456
457 AvFILLp (padlist) = -1;
363 SvREFCNT_dec ((SV*)padlist); 458 SvREFCNT_dec ((SV*)padlist);
364 } 459 }
365} 460}
366 461
367static int 462static int
… …
376 471
377 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
378 473
379 return 0; 474 return 0;
380} 475}
381
382#define CORO_MAGIC_type_cv 26
383#define CORO_MAGIC_type_state PERL_MAGIC_ext
384 476
385static MGVTBL coro_cv_vtbl = { 477static MGVTBL coro_cv_vtbl = {
386 0, 0, 0, 0, 478 0, 0, 0, 0,
387 coro_cv_free 479 coro_cv_free
388}; 480};
389
390#define CORO_MAGIC_NN(sv, type) \
391 (expect_true (SvMAGIC (sv)->mg_type == type) \
392 ? SvMAGIC (sv) \
393 : mg_find (sv, type))
394
395#define CORO_MAGIC(sv, type) \
396 (expect_true (SvMAGIC (sv)) \
397 ? CORO_MAGIC_NN (sv, type) \
398 : 0)
399
400#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
401#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
402
403INLINE struct coro *
404SvSTATE_ (pTHX_ SV *coro)
405{
406 HV *stash;
407 MAGIC *mg;
408
409 if (SvROK (coro))
410 coro = SvRV (coro);
411
412 if (expect_false (SvTYPE (coro) != SVt_PVHV))
413 croak ("Coro::State object required");
414
415 stash = SvSTASH (coro);
416 if (expect_false (stash != coro_stash && stash != coro_state_stash))
417 {
418 /* very slow, but rare, check */
419 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
420 croak ("Coro::State object required");
421 }
422
423 mg = CORO_MAGIC_state (coro);
424 return (struct coro *)mg->mg_ptr;
425}
426
427#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
428
429/* faster than SvSTATE, but expects a coroutine hv */
430#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
431#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
432 481
433/* the next two functions merely cache the padlists */ 482/* the next two functions merely cache the padlists */
434static void 483static void
435get_padlist (pTHX_ CV *cv) 484get_padlist (pTHX_ CV *cv)
436{ 485{
… …
442 else 491 else
443 { 492 {
444#if CORO_PREFER_PERL_FUNCTIONS 493#if CORO_PREFER_PERL_FUNCTIONS
445 /* this is probably cleaner? but also slower! */ 494 /* this is probably cleaner? but also slower! */
446 /* in practise, it seems to be less stable */ 495 /* in practise, it seems to be less stable */
447 CV *cp = Perl_cv_clone (cv); 496 CV *cp = Perl_cv_clone (aTHX_ cv);
448 CvPADLIST (cv) = CvPADLIST (cp); 497 CvPADLIST (cv) = CvPADLIST (cp);
449 CvPADLIST (cp) = 0; 498 CvPADLIST (cp) = 0;
450 SvREFCNT_dec (cp); 499 SvREFCNT_dec (cp);
451#else 500#else
452 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
453#endif 502#endif
454 } 503 }
455} 504}
456 505
457static void 506static void
… …
464 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 513 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
465 514
466 av = (AV *)mg->mg_obj; 515 av = (AV *)mg->mg_obj;
467 516
468 if (expect_false (AvFILLp (av) >= AvMAX (av))) 517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
469 av_extend (av, AvMAX (av) + 1); 518 av_extend (av, AvFILLp (av) + 1);
470 519
471 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
472} 521}
473 522
474/** load & save, init *******************************************************/ 523/** load & save, init *******************************************************/
… …
479 perl_slots *slot = c->slot; 528 perl_slots *slot = c->slot;
480 c->slot = 0; 529 c->slot = 0;
481 530
482 PL_mainstack = c->mainstack; 531 PL_mainstack = c->mainstack;
483 532
484 GvSV (PL_defgv) = slot->defsv; 533 GvSV (PL_defgv) = slot->defsv;
485 GvAV (PL_defgv) = slot->defav; 534 GvAV (PL_defgv) = slot->defav;
486 GvSV (PL_errgv) = slot->errsv; 535 GvSV (PL_errgv) = slot->errsv;
487 GvSV (irsgv) = slot->irsgv; 536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
488 538
489 #define VAR(name,type) PL_ ## name = slot->name; 539 #define VAR(name,type) PL_ ## name = slot->name;
490 # include "state.h" 540 # include "state.h"
491 #undef VAR 541 #undef VAR
492 542
… …
505 555
506 PUTBACK; 556 PUTBACK;
507 } 557 }
508 558
509 slf_frame = c->slf_frame; 559 slf_frame = c->slf_frame;
510 coro_throw = c->throw; 560 CORO_THROW = c->except;
511} 561}
512 562
513static void 563static void
514save_perl (pTHX_ Coro__State c) 564save_perl (pTHX_ Coro__State c)
515{ 565{
516 c->throw = coro_throw; 566 c->except = CORO_THROW;
517 c->slf_frame = slf_frame; 567 c->slf_frame = slf_frame;
518 568
519 { 569 {
520 dSP; 570 dSP;
521 I32 cxix = cxstack_ix; 571 I32 cxix = cxstack_ix;
… …
578 c->mainstack = PL_mainstack; 628 c->mainstack = PL_mainstack;
579 629
580 { 630 {
581 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
582 632
583 slot->defav = GvAV (PL_defgv); 633 slot->defav = GvAV (PL_defgv);
584 slot->defsv = DEFSV; 634 slot->defsv = DEFSV;
585 slot->errsv = ERRSV; 635 slot->errsv = ERRSV;
586 slot->irsgv = GvSV (irsgv); 636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
587 638
588 #define VAR(name,type) slot->name = PL_ ## name; 639 #define VAR(name,type) slot->name = PL_ ## name;
589 # include "state.h" 640 # include "state.h"
590 #undef VAR 641 #undef VAR
591 } 642 }
… …
596 * of perl.c:init_stacks, except that it uses less memory 647 * of perl.c:init_stacks, except that it uses less memory
597 * on the (sometimes correct) assumption that coroutines do 648 * on the (sometimes correct) assumption that coroutines do
598 * not usually need a lot of stackspace. 649 * not usually need a lot of stackspace.
599 */ 650 */
600#if CORO_PREFER_PERL_FUNCTIONS 651#if CORO_PREFER_PERL_FUNCTIONS
601# define coro_init_stacks init_stacks 652# define coro_init_stacks(thx) init_stacks ()
602#else 653#else
603static void 654static void
604coro_init_stacks (pTHX) 655coro_init_stacks (pTHX)
605{ 656{
606 PL_curstackinfo = new_stackinfo(32, 8); 657 PL_curstackinfo = new_stackinfo(32, 8);
… …
669#if !PERL_VERSION_ATLEAST (5,10,0) 720#if !PERL_VERSION_ATLEAST (5,10,0)
670 Safefree (PL_retstack); 721 Safefree (PL_retstack);
671#endif 722#endif
672} 723}
673 724
725#define CORO_RSS \
726 rss += sizeof (SYM (curstackinfo)); \
727 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
728 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
729 rss += SYM (tmps_max) * sizeof (SV *); \
730 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
731 rss += SYM (scopestack_max) * sizeof (I32); \
732 rss += SYM (savestack_max) * sizeof (ANY);
733
674static size_t 734static size_t
675coro_rss (pTHX_ struct coro *coro) 735coro_rss (pTHX_ struct coro *coro)
676{ 736{
677 size_t rss = sizeof (*coro); 737 size_t rss = sizeof (*coro);
678 738
679 if (coro->mainstack) 739 if (coro->mainstack)
680 { 740 {
681 perl_slots tmp_slot;
682 perl_slots *slot;
683
684 if (coro->flags & CF_RUNNING) 741 if (coro->flags & CF_RUNNING)
685 { 742 {
686 slot = &tmp_slot; 743 #define SYM(sym) PL_ ## sym
687 744 CORO_RSS;
688 #define VAR(name,type) slot->name = PL_ ## name;
689 # include "state.h"
690 #undef VAR 745 #undef SYM
691 } 746 }
692 else 747 else
693 slot = coro->slot;
694
695 if (slot)
696 { 748 {
697 rss += sizeof (slot->curstackinfo); 749 #define SYM(sym) coro->slot->sym
698 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 750 CORO_RSS;
699 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 751 #undef SYM
700 rss += slot->tmps_max * sizeof (SV *);
701 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
702 rss += slot->scopestack_max * sizeof (I32);
703 rss += slot->savestack_max * sizeof (ANY);
704
705#if !PERL_VERSION_ATLEAST (5,10,0)
706 rss += slot->retstack_max * sizeof (OP *);
707#endif
708 } 752 }
709 } 753 }
710 754
711 return rss; 755 return rss;
712} 756}
… …
814slf_check_nop (pTHX_ struct CoroSLF *frame) 858slf_check_nop (pTHX_ struct CoroSLF *frame)
815{ 859{
816 return 0; 860 return 0;
817} 861}
818 862
863static int
864slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{
866 return 1;
867}
868
869static UNOP coro_setup_op;
870
819static void NOINLINE /* noinline to keep it out of the transfer fast path */ 871static void NOINLINE /* noinline to keep it out of the transfer fast path */
820coro_setup (pTHX_ struct coro *coro) 872coro_setup (pTHX_ struct coro *coro)
821{ 873{
822 /* 874 /*
823 * emulate part of the perl startup here. 875 * emulate part of the perl startup here.
… …
826 878
827 PL_runops = RUNOPS_DEFAULT; 879 PL_runops = RUNOPS_DEFAULT;
828 PL_curcop = &PL_compiling; 880 PL_curcop = &PL_compiling;
829 PL_in_eval = EVAL_NULL; 881 PL_in_eval = EVAL_NULL;
830 PL_comppad = 0; 882 PL_comppad = 0;
883 PL_comppad_name = 0;
884 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0;
831 PL_curpm = 0; 886 PL_curpm = 0;
832 PL_curpad = 0; 887 PL_curpad = 0;
833 PL_localizing = 0; 888 PL_localizing = 0;
834 PL_dirty = 0; 889 PL_dirty = 0;
835 PL_restartop = 0; 890 PL_restartop = 0;
836#if PERL_VERSION_ATLEAST (5,10,0) 891#if PERL_VERSION_ATLEAST (5,10,0)
837 PL_parser = 0; 892 PL_parser = 0;
838#endif 893#endif
894 PL_hints = 0;
839 895
840 /* recreate the die/warn hooks */ 896 /* recreate the die/warn hooks */
841 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
842 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
843 899
844 GvSV (PL_defgv) = newSV (0); 900 GvSV (PL_defgv) = newSV (0);
845 GvAV (PL_defgv) = coro->args; coro->args = 0; 901 GvAV (PL_defgv) = coro->args; coro->args = 0;
846 GvSV (PL_errgv) = newSV (0); 902 GvSV (PL_errgv) = newSV (0);
847 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0;
848 PL_rs = newSVsv (GvSV (irsgv)); 905 PL_rs = newSVsv (GvSV (irsgv));
849 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
850 907
851 { 908 {
852 dSP; 909 dSP;
853 UNOP myop; 910 UNOP myop;
854 911
855 Zero (&myop, 1, UNOP); 912 Zero (&myop, 1, UNOP);
856 myop.op_next = Nullop; 913 myop.op_next = Nullop;
914 myop.op_type = OP_ENTERSUB;
857 myop.op_flags = OPf_WANT_VOID; 915 myop.op_flags = OPf_WANT_VOID;
858 916
859 PUSHMARK (SP); 917 PUSHMARK (SP);
860 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 918 PUSHs ((SV *)coro->startcv);
861 PUTBACK; 919 PUTBACK;
862 PL_op = (OP *)&myop; 920 PL_op = (OP *)&myop;
863 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 921 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
864 SPAGAIN;
865 } 922 }
866 923
867 /* this newly created coroutine might be run on an existing cctx which most 924 /* this newly created coroutine might be run on an existing cctx which most
868 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 925 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
869 */ 926 */
870 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
871 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
872 929
873 coro_throw = coro->throw; 930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
874} 931 coro_setup_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf;
934 /* no flags etc. required, as an init function won't be called */
875 935
936 PL_op = (OP *)&coro_setup_op;
937
938 /* copy throw, in case it was set before coro_setup */
939 CORO_THROW = coro->except;
940}
941
876static void 942static void
877coro_destruct (pTHX_ struct coro *coro) 943coro_destruct_perl (pTHX_ struct coro *coro)
878{ 944{
879 if (!IN_DESTRUCT) 945 if (!IN_DESTRUCT)
880 { 946 {
881 /* restore all saved variables and stuff */ 947 /* restore all saved variables and stuff */
882 LEAVE_SCOPE (0); 948 LEAVE_SCOPE (0);
… …
897 SvREFCNT_dec (GvAV (PL_defgv)); 963 SvREFCNT_dec (GvAV (PL_defgv));
898 SvREFCNT_dec (GvSV (PL_errgv)); 964 SvREFCNT_dec (GvSV (PL_errgv));
899 SvREFCNT_dec (PL_defoutgv); 965 SvREFCNT_dec (PL_defoutgv);
900 SvREFCNT_dec (PL_rs); 966 SvREFCNT_dec (PL_rs);
901 SvREFCNT_dec (GvSV (irsgv)); 967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
902 969
903 SvREFCNT_dec (PL_diehook); 970 SvREFCNT_dec (PL_diehook);
904 SvREFCNT_dec (PL_warnhook); 971 SvREFCNT_dec (PL_warnhook);
905 972
906 SvREFCNT_dec (coro->saved_deffh); 973 SvREFCNT_dec (coro->saved_deffh);
907 SvREFCNT_dec (coro_throw); 974 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av);
908 977
909 coro_destruct_stacks (aTHX); 978 coro_destruct_stacks (aTHX);
910} 979}
911 980
912INLINE void 981INLINE void
… …
922static int 991static int
923runops_trace (pTHX) 992runops_trace (pTHX)
924{ 993{
925 COP *oldcop = 0; 994 COP *oldcop = 0;
926 int oldcxix = -2; 995 int oldcxix = -2;
927 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
928 coro_cctx *cctx = coro->cctx;
929 996
930 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 997 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
931 { 998 {
932 PERL_ASYNC_CHECK (); 999 PERL_ASYNC_CHECK ();
933 1000
934 if (cctx->flags & CC_TRACE_ALL) 1001 if (cctx_current->flags & CC_TRACE_ALL)
935 { 1002 {
936 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1003 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
937 { 1004 {
938 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1005 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
939 SV **bot, **top; 1006 SV **bot, **top;
940 AV *av = newAV (); /* return values */ 1007 AV *av = newAV (); /* return values */
941 SV **cb; 1008 SV **cb;
… …
978 1045
979 if (PL_curcop != &PL_compiling) 1046 if (PL_curcop != &PL_compiling)
980 { 1047 {
981 SV **cb; 1048 SV **cb;
982 1049
983 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1050 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
984 { 1051 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1052 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 1053
987 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1054 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
988 { 1055 {
989 runops_proc_t old_runops = PL_runops;
990 dSP; 1056 dSP;
991 GV *gv = CvGV (cx->blk_sub.cv); 1057 GV *gv = CvGV (cx->blk_sub.cv);
992 SV *fullname = sv_2mortal (newSV (0)); 1058 SV *fullname = sv_2mortal (newSV (0));
993 1059
994 if (isGV (gv)) 1060 if (isGV (gv))
… …
999 SAVETMPS; 1065 SAVETMPS;
1000 EXTEND (SP, 3); 1066 EXTEND (SP, 3);
1001 PUSHMARK (SP); 1067 PUSHMARK (SP);
1002 PUSHs (&PL_sv_yes); 1068 PUSHs (&PL_sv_yes);
1003 PUSHs (fullname); 1069 PUSHs (fullname);
1004 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1070 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1005 PUTBACK; 1071 PUTBACK;
1006 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1072 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1007 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1073 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1008 SPAGAIN; 1074 SPAGAIN;
1009 FREETMPS; 1075 FREETMPS;
… …
1012 } 1078 }
1013 1079
1014 oldcxix = cxstack_ix; 1080 oldcxix = cxstack_ix;
1015 } 1081 }
1016 1082
1017 if (cctx->flags & CC_TRACE_LINE) 1083 if (cctx_current->flags & CC_TRACE_LINE)
1018 { 1084 {
1019 dSP; 1085 dSP;
1020 1086
1021 PL_runops = RUNOPS_DEFAULT; 1087 PL_runops = RUNOPS_DEFAULT;
1022 ENTER; 1088 ENTER;
… …
1041 1107
1042 TAINT_NOT; 1108 TAINT_NOT;
1043 return 0; 1109 return 0;
1044} 1110}
1045 1111
1112static struct CoroSLF cctx_ssl_frame;
1113
1046static void 1114static void
1047prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx) 1115slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1048{ 1116{
1049 ta->prev = (struct coro *)cctx;
1050 ta->next = 0; 1117 ta->prev = 0;
1051} 1118}
1052 1119
1053/* inject a fake call to Coro::State::_cctx_init into the execution */ 1120static int
1054/* _cctx_init should be careful, as it could be called at almost any time */ 1121slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1055/* during execution of a perl program */ 1122{
1056/* also initialises PL_top_env */ 1123 *frame = cctx_ssl_frame;
1124
1125 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1126}
1127
1128/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1057static void NOINLINE 1129static void NOINLINE
1058cctx_prepare (pTHX_ coro_cctx *cctx) 1130cctx_prepare (pTHX)
1059{ 1131{
1060 dSP;
1061 UNOP myop;
1062
1063 PL_top_env = &PL_start_env; 1132 PL_top_env = &PL_start_env;
1064 1133
1065 if (cctx->flags & CC_TRACE) 1134 if (cctx_current->flags & CC_TRACE)
1066 PL_runops = runops_trace; 1135 PL_runops = runops_trace;
1067 1136
1068 Zero (&myop, 1, UNOP); 1137 /* we already must be executing an SLF op, there is no other valid way
1069 myop.op_next = PL_op; 1138 * that can lead to creation of a new cctx */
1070 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1139 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1140 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1071 1141
1072 PUSHMARK (SP); 1142 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1073 EXTEND (SP, 2); 1143 cctx_ssl_frame = slf_frame;
1074 PUSHs (sv_2mortal (newSViv ((IV)cctx))); 1144
1075 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1145 slf_frame.prepare = slf_prepare_set_stacklevel;
1076 PUTBACK; 1146 slf_frame.check = slf_check_set_stacklevel;
1077 PL_op = (OP *)&myop;
1078 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1079 SPAGAIN;
1080} 1147}
1081 1148
1082/* the tail of transfer: execute stuff we can only do after a transfer */ 1149/* the tail of transfer: execute stuff we can only do after a transfer */
1083INLINE void 1150INLINE void
1084transfer_tail (pTHX) 1151transfer_tail (pTHX)
… …
1103 /* normally we would need to skip the entersub here */ 1170 /* normally we would need to skip the entersub here */
1104 /* not doing so will re-execute it, which is exactly what we want */ 1171 /* not doing so will re-execute it, which is exactly what we want */
1105 /* PL_nop = PL_nop->op_next */ 1172 /* PL_nop = PL_nop->op_next */
1106 1173
1107 /* inject a fake subroutine call to cctx_init */ 1174 /* inject a fake subroutine call to cctx_init */
1108 cctx_prepare (aTHX_ (coro_cctx *)arg); 1175 cctx_prepare (aTHX);
1109 1176
1110 /* cctx_run is the alternative tail of transfer() */ 1177 /* cctx_run is the alternative tail of transfer() */
1111 transfer_tail (aTHX); 1178 transfer_tail (aTHX);
1112 1179
1113 /* somebody or something will hit me for both perl_run and PL_restartop */ 1180 /* somebody or something will hit me for both perl_run and PL_restartop */
1114 PL_restartop = PL_op; 1181 PL_restartop = PL_op;
1115 perl_run (PL_curinterp); 1182 perl_run (PL_curinterp);
1183 /*
1184 * Unfortunately, there is no way to get at the return values of the
1185 * coro body here, as perl_run destroys these
1186 */
1116 1187
1117 /* 1188 /*
1118 * If perl-run returns we assume exit() was being called or the coro 1189 * If perl-run returns we assume exit() was being called or the coro
1119 * fell off the end, which seems to be the only valid (non-bug) 1190 * fell off the end, which seems to be the only valid (non-bug)
1120 * reason for perl_run to return. We try to exit by jumping to the 1191 * reason for perl_run to return. We try to exit by jumping to the
1121 * bootstrap-time "top" top_env, as we cannot restore the "main" 1192 * bootstrap-time "top" top_env, as we cannot restore the "main"
1122 * coroutine as Coro has no such concept 1193 * coroutine as Coro has no such concept.
1194 * This actually isn't valid with the pthread backend, but OSes requiring
1195 * that backend are too broken to do it in a standards-compliant way.
1123 */ 1196 */
1124 PL_top_env = main_top_env; 1197 PL_top_env = main_top_env;
1125 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1126 } 1199 }
1127} 1200}
… …
1204cctx_destroy (coro_cctx *cctx) 1277cctx_destroy (coro_cctx *cctx)
1205{ 1278{
1206 if (!cctx) 1279 if (!cctx)
1207 return; 1280 return;
1208 1281
1282 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1283
1209 --cctx_count; 1284 --cctx_count;
1210 coro_destroy (&cctx->cctx); 1285 coro_destroy (&cctx->cctx);
1211 1286
1212 /* coro_transfer creates new, empty cctx's */ 1287 /* coro_transfer creates new, empty cctx's */
1213 if (cctx->sptr) 1288 if (cctx->sptr)
… …
1276 /* TODO: throwing up here is considered harmful */ 1351 /* TODO: throwing up here is considered harmful */
1277 1352
1278 if (expect_true (prev != next)) 1353 if (expect_true (prev != next))
1279 { 1354 {
1280 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1281 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1282 1357
1283 if (expect_false (next->flags & CF_RUNNING)) 1358 if (expect_false (next->flags & CF_RUNNING))
1284 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1285 1360
1286 if (expect_false (next->flags & CF_DESTROYED)) 1361 if (expect_false (next->flags & CF_DESTROYED))
… …
1298transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1299{ 1374{
1300 dSTACKLEVEL; 1375 dSTACKLEVEL;
1301 1376
1302 /* sometimes transfer is only called to set idle_sp */ 1377 /* sometimes transfer is only called to set idle_sp */
1303 if (expect_false (!next)) 1378 if (expect_false (!prev))
1304 { 1379 {
1305 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1380 cctx_current->idle_sp = STACKLEVEL;
1306 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1307 } 1382 }
1308 else if (expect_true (prev != next)) 1383 else if (expect_true (prev != next))
1309 { 1384 {
1310 coro_cctx *prev__cctx; 1385 coro_cctx *cctx_prev;
1311 1386
1312 if (expect_false (prev->flags & CF_NEW)) 1387 if (expect_false (prev->flags & CF_NEW))
1313 { 1388 {
1314 /* create a new empty/source context */ 1389 /* create a new empty/source context */
1315 prev->cctx = cctx_new_empty ();
1316 prev->flags &= ~CF_NEW; 1390 prev->flags &= ~CF_NEW;
1317 prev->flags |= CF_RUNNING; 1391 prev->flags |= CF_RUNNING;
1318 } 1392 }
1319 1393
1320 prev->flags &= ~CF_RUNNING; 1394 prev->flags &= ~CF_RUNNING;
… …
1331 coro_setup (aTHX_ next); 1405 coro_setup (aTHX_ next);
1332 } 1406 }
1333 else 1407 else
1334 load_perl (aTHX_ next); 1408 load_perl (aTHX_ next);
1335 1409
1336 prev__cctx = prev->cctx;
1337
1338 /* possibly untie and reuse the cctx */ 1410 /* possibly untie and reuse the cctx */
1339 if (expect_true ( 1411 if (expect_true (
1340 prev__cctx->idle_sp == (void *)stacklevel 1412 cctx_current->idle_sp == STACKLEVEL
1341 && !(prev__cctx->flags & CC_TRACE) 1413 && !(cctx_current->flags & CC_TRACE)
1342 && !force_cctx 1414 && !force_cctx
1343 )) 1415 ))
1344 { 1416 {
1345 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1417 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1346 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1418 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1347 1419
1348 prev->cctx = 0;
1349
1350 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1420 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1351 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1421 /* without this the next cctx_get might destroy the running cctx while still in use */
1352 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1422 if (expect_false (CCTX_EXPIRED (cctx_current)))
1353 if (!next->cctx) 1423 if (expect_true (!next->cctx))
1354 next->cctx = cctx_get (aTHX); 1424 next->cctx = cctx_get (aTHX);
1355 1425
1356 cctx_put (prev__cctx); 1426 cctx_put (cctx_current);
1357 } 1427 }
1428 else
1429 prev->cctx = cctx_current;
1358 1430
1359 ++next->usecount; 1431 ++next->usecount;
1360 1432
1361 if (expect_true (!next->cctx)) 1433 cctx_prev = cctx_current;
1362 next->cctx = cctx_get (aTHX); 1434 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1363 1435
1364 if (expect_false (prev__cctx != next->cctx)) 1436 next->cctx = 0;
1437
1438 if (expect_false (cctx_prev != cctx_current))
1365 { 1439 {
1366 prev__cctx->top_env = PL_top_env; 1440 cctx_prev->top_env = PL_top_env;
1367 PL_top_env = next->cctx->top_env; 1441 PL_top_env = cctx_current->top_env;
1368 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1442 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1369 } 1443 }
1370 1444
1371 transfer_tail (aTHX); 1445 transfer_tail (aTHX);
1372 } 1446 }
1373} 1447}
… …
1395 --coro_nready; 1469 --coro_nready;
1396 } 1470 }
1397 else 1471 else
1398 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1472 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1399 1473
1400 if (coro->mainstack && coro->mainstack != main_mainstack) 1474 if (coro->mainstack
1475 && coro->mainstack != main_mainstack
1476 && coro->slot
1477 && !PL_dirty)
1401 { 1478 {
1402 struct coro temp; 1479 struct coro temp;
1403 1480
1404 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1481 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1405 1482
1406 save_perl (aTHX_ &temp); 1483 save_perl (aTHX_ &temp);
1407 load_perl (aTHX_ coro); 1484 load_perl (aTHX_ coro);
1408 1485
1409 coro_destruct (aTHX_ coro); 1486 coro_destruct_perl (aTHX_ coro);
1410 1487
1411 load_perl (aTHX_ &temp); 1488 load_perl (aTHX_ &temp);
1412 1489
1413 coro->slot = 0; 1490 coro->slot = 0;
1414 } 1491 }
1415 1492
1416 cctx_destroy (coro->cctx); 1493 cctx_destroy (coro->cctx);
1494 SvREFCNT_dec (coro->startcv);
1417 SvREFCNT_dec (coro->args); 1495 SvREFCNT_dec (coro->args);
1496 SvREFCNT_dec (CORO_THROW);
1418 1497
1419 if (coro->next) coro->next->prev = coro->prev; 1498 if (coro->next) coro->next->prev = coro->prev;
1420 if (coro->prev) coro->prev->next = coro->next; 1499 if (coro->prev) coro->prev->next = coro->next;
1421 if (coro == coro_first) coro_first = coro->next; 1500 if (coro == coro_first) coro_first = coro->next;
1422 1501
… …
1476 1555
1477 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1556 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1478 TRANSFER (ta, 1); 1557 TRANSFER (ta, 1);
1479} 1558}
1480 1559
1560/*****************************************************************************/
1561/* gensub: simple closure generation utility */
1562
1563#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1564
1565/* create a closure from XS, returns a code reference */
1566/* the arg can be accessed via GENSUB_ARG from the callback */
1567/* the callback must use dXSARGS/XSRETURN */
1568static SV *
1569gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1570{
1571 CV *cv = (CV *)newSV (0);
1572
1573 sv_upgrade ((SV *)cv, SVt_PVCV);
1574
1575 CvANON_on (cv);
1576 CvISXSUB_on (cv);
1577 CvXSUB (cv) = xsub;
1578 GENSUB_ARG = arg;
1579
1580 return newRV_noinc ((SV *)cv);
1581}
1582
1481/** Coro ********************************************************************/ 1583/** Coro ********************************************************************/
1482 1584
1483INLINE void 1585INLINE void
1484coro_enq (pTHX_ struct coro *coro) 1586coro_enq (pTHX_ struct coro *coro)
1485{ 1587{
… …
1503{ 1605{
1504 struct coro *coro; 1606 struct coro *coro;
1505 SV *sv_hook; 1607 SV *sv_hook;
1506 void (*xs_hook)(void); 1608 void (*xs_hook)(void);
1507 1609
1508 if (SvROK (coro_sv))
1509 coro_sv = SvRV (coro_sv);
1510
1511 coro = SvSTATE (coro_sv); 1610 coro = SvSTATE (coro_sv);
1512 1611
1513 if (coro->flags & CF_READY) 1612 if (coro->flags & CF_READY)
1514 return 0; 1613 return 0;
1515 1614
… …
1528 ENTER; 1627 ENTER;
1529 SAVETMPS; 1628 SAVETMPS;
1530 1629
1531 PUSHMARK (SP); 1630 PUSHMARK (SP);
1532 PUTBACK; 1631 PUTBACK;
1533 call_sv (sv_hook, G_DISCARD); 1632 call_sv (sv_hook, G_VOID | G_DISCARD);
1534 SPAGAIN;
1535 1633
1536 FREETMPS; 1634 FREETMPS;
1537 LEAVE; 1635 LEAVE;
1538 } 1636 }
1539 1637
… …
1547api_is_ready (pTHX_ SV *coro_sv) 1645api_is_ready (pTHX_ SV *coro_sv)
1548{ 1646{
1549 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1647 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1550} 1648}
1551 1649
1650/* expects to own a reference to next->hv */
1552INLINE void 1651INLINE void
1553prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1652prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1554{ 1653{
1555 SV *prev_sv, *next_sv;
1556
1557 for (;;)
1558 {
1559 next_sv = coro_deq (aTHX);
1560
1561 /* nothing to schedule: call the idle handler */
1562 if (expect_false (!next_sv))
1563 {
1564 dSP;
1565
1566 ENTER;
1567 SAVETMPS;
1568
1569 PUSHMARK (SP);
1570 PUTBACK;
1571 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1572 SPAGAIN;
1573
1574 FREETMPS;
1575 LEAVE;
1576 continue;
1577 }
1578
1579 ta->next = SvSTATE_hv (next_sv);
1580
1581 /* cannot transfer to destroyed coros, skip and look for next */
1582 if (expect_false (ta->next->flags & CF_DESTROYED))
1583 {
1584 SvREFCNT_dec (next_sv);
1585 /* coro_nready has already been taken care of by destroy */
1586 continue;
1587 }
1588
1589 --coro_nready;
1590 break;
1591 }
1592
1593 /* free this only after the transfer */
1594 prev_sv = SvRV (coro_current); 1654 SV *prev_sv = SvRV (coro_current);
1655
1595 ta->prev = SvSTATE_hv (prev_sv); 1656 ta->prev = SvSTATE_hv (prev_sv);
1657 ta->next = next;
1658
1596 TRANSFER_CHECK (*ta); 1659 TRANSFER_CHECK (*ta);
1597 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1660
1598 ta->next->flags &= ~CF_READY;
1599 SvRV_set (coro_current, next_sv); 1661 SvRV_set (coro_current, (SV *)next->hv);
1600 1662
1601 free_coro_mortal (aTHX); 1663 free_coro_mortal (aTHX);
1602 coro_mortal = prev_sv; 1664 coro_mortal = prev_sv;
1603} 1665}
1604 1666
1667static void
1668prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1669{
1670 for (;;)
1671 {
1672 SV *next_sv = coro_deq (aTHX);
1673
1674 if (expect_true (next_sv))
1675 {
1676 struct coro *next = SvSTATE_hv (next_sv);
1677
1678 /* cannot transfer to destroyed coros, skip and look for next */
1679 if (expect_false (next->flags & CF_DESTROYED))
1680 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1681 else
1682 {
1683 next->flags &= ~CF_READY;
1684 --coro_nready;
1685
1686 prepare_schedule_to (aTHX_ ta, next);
1687 break;
1688 }
1689 }
1690 else
1691 {
1692 /* nothing to schedule: call the idle handler */
1693 if (SvROK (sv_idle)
1694 && SvOBJECT (SvRV (sv_idle)))
1695 {
1696 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1697 api_ready (aTHX_ SvRV (sv_idle));
1698 --coro_nready;
1699 }
1700 else
1701 {
1702 dSP;
1703
1704 ENTER;
1705 SAVETMPS;
1706
1707 PUSHMARK (SP);
1708 PUTBACK;
1709 call_sv (sv_idle, G_VOID | G_DISCARD);
1710
1711 FREETMPS;
1712 LEAVE;
1713 }
1714 }
1715 }
1716}
1717
1605INLINE void 1718INLINE void
1606prepare_cede (pTHX_ struct coro_transfer_args *ta) 1719prepare_cede (pTHX_ struct coro_transfer_args *ta)
1607{ 1720{
1608 api_ready (aTHX_ coro_current); 1721 api_ready (aTHX_ coro_current);
1609 prepare_schedule (aTHX_ ta); 1722 prepare_schedule (aTHX_ ta);
… …
1628{ 1741{
1629 struct coro_transfer_args ta; 1742 struct coro_transfer_args ta;
1630 1743
1631 prepare_schedule (aTHX_ &ta); 1744 prepare_schedule (aTHX_ &ta);
1632 TRANSFER (ta, 1); 1745 TRANSFER (ta, 1);
1746}
1747
1748static void
1749api_schedule_to (pTHX_ SV *coro_sv)
1750{
1751 struct coro_transfer_args ta;
1752 struct coro *next = SvSTATE (coro_sv);
1753
1754 SvREFCNT_inc_NN (coro_sv);
1755 prepare_schedule_to (aTHX_ &ta, next);
1633} 1756}
1634 1757
1635static int 1758static int
1636api_cede (pTHX) 1759api_cede (pTHX)
1637{ 1760{
… …
1666static void 1789static void
1667api_trace (pTHX_ SV *coro_sv, int flags) 1790api_trace (pTHX_ SV *coro_sv, int flags)
1668{ 1791{
1669 struct coro *coro = SvSTATE (coro_sv); 1792 struct coro *coro = SvSTATE (coro_sv);
1670 1793
1794 if (coro->flags & CF_RUNNING)
1795 croak ("cannot enable tracing on a running coroutine, caught");
1796
1671 if (flags & CC_TRACE) 1797 if (flags & CC_TRACE)
1672 { 1798 {
1673 if (!coro->cctx) 1799 if (!coro->cctx)
1674 coro->cctx = cctx_new_run (); 1800 coro->cctx = cctx_new_run ();
1675 else if (!(coro->cctx->flags & CC_TRACE)) 1801 else if (!(coro->cctx->flags & CC_TRACE))
1676 croak ("cannot enable tracing on coroutine with custom stack,"); 1802 croak ("cannot enable tracing on coroutine with custom stack, caught");
1677 1803
1678 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1804 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1679 } 1805 }
1680 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1806 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1681 { 1807 {
… …
1684 if (coro->flags & CF_RUNNING) 1810 if (coro->flags & CF_RUNNING)
1685 PL_runops = RUNOPS_DEFAULT; 1811 PL_runops = RUNOPS_DEFAULT;
1686 else 1812 else
1687 coro->slot->runops = RUNOPS_DEFAULT; 1813 coro->slot->runops = RUNOPS_DEFAULT;
1688 } 1814 }
1815}
1816
1817static void
1818coro_call_on_destroy (pTHX_ struct coro *coro)
1819{
1820 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1821 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1822
1823 if (on_destroyp)
1824 {
1825 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1826
1827 while (AvFILLp (on_destroy) >= 0)
1828 {
1829 dSP; /* don't disturb outer sp */
1830 SV *cb = av_pop (on_destroy);
1831
1832 PUSHMARK (SP);
1833
1834 if (statusp)
1835 {
1836 int i;
1837 AV *status = (AV *)SvRV (*statusp);
1838 EXTEND (SP, AvFILLp (status) + 1);
1839
1840 for (i = 0; i <= AvFILLp (status); ++i)
1841 PUSHs (AvARRAY (status)[i]);
1842 }
1843
1844 PUTBACK;
1845 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1846 }
1847 }
1848}
1849
1850static void
1851slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1852{
1853 int i;
1854 HV *hv = (HV *)SvRV (coro_current);
1855 AV *av = newAV ();
1856
1857 av_extend (av, items - 1);
1858 for (i = 0; i < items; ++i)
1859 av_push (av, SvREFCNT_inc_NN (arg [i]));
1860
1861 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1862
1863 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1864 api_ready (aTHX_ sv_manager);
1865
1866 frame->prepare = prepare_schedule;
1867 frame->check = slf_check_repeat;
1868}
1869
1870/*****************************************************************************/
1871/* async pool handler */
1872
1873static int
1874slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1875{
1876 HV *hv = (HV *)SvRV (coro_current);
1877 struct coro *coro = (struct coro *)frame->data;
1878
1879 if (!coro->invoke_cb)
1880 return 1; /* loop till we have invoke */
1881 else
1882 {
1883 hv_store (hv, "desc", sizeof ("desc") - 1,
1884 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1885
1886 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1887
1888 {
1889 dSP;
1890 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1891 PUTBACK;
1892 }
1893
1894 SvREFCNT_dec (GvAV (PL_defgv));
1895 GvAV (PL_defgv) = coro->invoke_av;
1896 coro->invoke_av = 0;
1897
1898 return 0;
1899 }
1900}
1901
1902static void
1903slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{
1905 HV *hv = (HV *)SvRV (coro_current);
1906 struct coro *coro = SvSTATE_hv ((SV *)hv);
1907
1908 if (expect_true (coro->saved_deffh))
1909 {
1910 /* subsequent iteration */
1911 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1912 coro->saved_deffh = 0;
1913
1914 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1915 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1916 {
1917 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1918 coro->invoke_av = newAV ();
1919
1920 frame->prepare = prepare_nop;
1921 }
1922 else
1923 {
1924 av_clear (GvAV (PL_defgv));
1925 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1926
1927 coro->prio = 0;
1928
1929 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1930 api_trace (aTHX_ coro_current, 0);
1931
1932 frame->prepare = prepare_schedule;
1933 av_push (av_async_pool, SvREFCNT_inc (hv));
1934 }
1935 }
1936 else
1937 {
1938 /* first iteration, simply fall through */
1939 frame->prepare = prepare_nop;
1940 }
1941
1942 frame->check = slf_check_pool_handler;
1943 frame->data = (void *)coro;
1944}
1945
1946/*****************************************************************************/
1947/* rouse callback */
1948
1949#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1950
1951static void
1952coro_rouse_callback (pTHX_ CV *cv)
1953{
1954 dXSARGS;
1955 SV *data = (SV *)GENSUB_ARG;
1956
1957 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1958 {
1959 /* first call, set args */
1960 AV *av = newAV ();
1961 SV *coro = SvRV (data);
1962
1963 SvRV_set (data, (SV *)av);
1964 api_ready (aTHX_ coro);
1965 SvREFCNT_dec (coro);
1966
1967 /* better take a full copy of the arguments */
1968 while (items--)
1969 av_store (av, items, newSVsv (ST (items)));
1970 }
1971
1972 XSRETURN_EMPTY;
1973}
1974
1975static int
1976slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1977{
1978 SV *data = (SV *)frame->data;
1979
1980 if (CORO_THROW)
1981 return 0;
1982
1983 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1984 return 1;
1985
1986 /* now push all results on the stack */
1987 {
1988 dSP;
1989 AV *av = (AV *)SvRV (data);
1990 int i;
1991
1992 EXTEND (SP, AvFILLp (av) + 1);
1993 for (i = 0; i <= AvFILLp (av); ++i)
1994 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1995
1996 /* we have stolen the elements, so ste length to zero and free */
1997 AvFILLp (av) = -1;
1998 av_undef (av);
1999
2000 PUTBACK;
2001 }
2002
2003 return 0;
2004}
2005
2006static void
2007slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2008{
2009 SV *cb;
2010
2011 if (items)
2012 cb = arg [0];
2013 else
2014 {
2015 struct coro *coro = SvSTATE_current;
2016
2017 if (!coro->rouse_cb)
2018 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2019
2020 cb = sv_2mortal (coro->rouse_cb);
2021 coro->rouse_cb = 0;
2022 }
2023
2024 if (!SvROK (cb)
2025 || SvTYPE (SvRV (cb)) != SVt_PVCV
2026 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2027 croak ("Coro::rouse_wait called with illegal callback argument,");
2028
2029 {
2030 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2031 SV *data = (SV *)GENSUB_ARG;
2032
2033 frame->data = (void *)data;
2034 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2035 frame->check = slf_check_rouse_wait;
2036 }
2037}
2038
2039static SV *
2040coro_new_rouse_cb (pTHX)
2041{
2042 HV *hv = (HV *)SvRV (coro_current);
2043 struct coro *coro = SvSTATE_hv (hv);
2044 SV *data = newRV_inc ((SV *)hv);
2045 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2046
2047 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2048 SvREFCNT_dec (data); /* magicext increases the refcount */
2049
2050 SvREFCNT_dec (coro->rouse_cb);
2051 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2052
2053 return cb;
1689} 2054}
1690 2055
1691/*****************************************************************************/ 2056/*****************************************************************************/
1692/* schedule-like-function opcode (SLF) */ 2057/* schedule-like-function opcode (SLF) */
1693 2058
… …
1717 2082
1718 RETURNOP (slf_restore.op_first); 2083 RETURNOP (slf_restore.op_first);
1719} 2084}
1720 2085
1721static void 2086static void
1722slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1723{
1724 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1725}
1726
1727static void
1728slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1729{
1730 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1731
1732 frame->prepare = slf_prepare_set_stacklevel;
1733 frame->check = slf_check_nop;
1734 frame->data = (void *)SvIV (arg [0]);
1735}
1736
1737static void
1738slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta) 2087slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1739{ 2088{
1740 SV **arg = (SV **)slf_frame.data; 2089 SV **arg = (SV **)slf_frame.data;
1741 2090
1742 prepare_transfer (aTHX_ ta, arg [0], arg [1]); 2091 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
… …
1759 frame->prepare = prepare_schedule; 2108 frame->prepare = prepare_schedule;
1760 frame->check = slf_check_nop; 2109 frame->check = slf_check_nop;
1761} 2110}
1762 2111
1763static void 2112static void
2113slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2114{
2115 struct coro *next = (struct coro *)slf_frame.data;
2116
2117 SvREFCNT_inc_NN (next->hv);
2118 prepare_schedule_to (aTHX_ ta, next);
2119}
2120
2121static void
2122slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2123{
2124 if (!items)
2125 croak ("Coro::schedule_to expects a coroutine argument, caught");
2126
2127 frame->data = (void *)SvSTATE (arg [0]);
2128 frame->prepare = slf_prepare_schedule_to;
2129 frame->check = slf_check_nop;
2130}
2131
2132static void
2133slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2134{
2135 api_ready (aTHX_ SvRV (coro_current));
2136
2137 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2138}
2139
2140static void
1764slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2141slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1765{ 2142{
1766 frame->prepare = prepare_cede; 2143 frame->prepare = prepare_cede;
1767 frame->check = slf_check_nop; 2144 frame->check = slf_check_nop;
1768} 2145}
… …
1771slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2148slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1772{ 2149{
1773 frame->prepare = prepare_cede_notself; 2150 frame->prepare = prepare_cede_notself;
1774 frame->check = slf_check_nop; 2151 frame->check = slf_check_nop;
1775} 2152}
1776
1777/* we hijack an hopefully unused CV flag for our purposes */
1778#define CVf_SLF 0x4000
1779 2153
1780/* 2154/*
1781 * these not obviously related functions are all rolled into one 2155 * these not obviously related functions are all rolled into one
1782 * function to increase chances that they all will call transfer with the same 2156 * function to increase chances that they all will call transfer with the same
1783 * stack offset 2157 * stack offset
… …
1839 } 2213 }
1840 while (slf_frame.check (aTHX_ &slf_frame)); 2214 while (slf_frame.check (aTHX_ &slf_frame));
1841 2215
1842 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2216 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1843 2217
1844 /* return value handling - mostly like entersub */
1845 {
1846 dSP;
1847 SV **bot = PL_stack_base + checkmark;
1848 int gimme = GIMME_V;
1849
1850 /* make sure we put something on the stack in scalar context */
1851 if (gimme == G_SCALAR)
1852 {
1853 if (sp == bot)
1854 XPUSHs (&PL_sv_undef);
1855
1856 SP = bot + 1;
1857 }
1858
1859 PUTBACK;
1860 }
1861
1862 /* exception handling */ 2218 /* exception handling */
1863 if (expect_false (coro_throw)) 2219 if (expect_false (CORO_THROW))
1864 { 2220 {
1865 SV *exception = sv_2mortal (coro_throw); 2221 SV *exception = sv_2mortal (CORO_THROW);
1866 2222
1867 coro_throw = 0; 2223 CORO_THROW = 0;
1868 sv_setsv (ERRSV, exception); 2224 sv_setsv (ERRSV, exception);
1869 croak (0); 2225 croak (0);
2226 }
2227
2228 /* return value handling - mostly like entersub */
2229 /* make sure we put something on the stack in scalar context */
2230 if (GIMME_V == G_SCALAR)
2231 {
2232 dSP;
2233 SV **bot = PL_stack_base + checkmark;
2234
2235 if (sp == bot) /* too few, push undef */
2236 bot [1] = &PL_sv_undef;
2237 else if (sp != bot + 1) /* too many, take last one */
2238 bot [1] = *sp;
2239
2240 SP = bot + 1;
2241
2242 PUTBACK;
1870 } 2243 }
1871 2244
1872 return NORMAL; 2245 return NORMAL;
1873} 2246}
1874 2247
… …
1915 } 2288 }
1916 else 2289 else
1917 slf_argc = 0; 2290 slf_argc = 0;
1918 2291
1919 PL_op->op_ppaddr = pp_slf; 2292 PL_op->op_ppaddr = pp_slf;
1920 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2293 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1921 2294
1922 PL_op = (OP *)&slf_restore; 2295 PL_op = (OP *)&slf_restore;
1923} 2296}
1924 2297
1925/*****************************************************************************/ 2298/*****************************************************************************/
… …
1996 PerlIOBuf_get_cnt, 2369 PerlIOBuf_get_cnt,
1997 PerlIOBuf_set_ptrcnt, 2370 PerlIOBuf_set_ptrcnt,
1998}; 2371};
1999 2372
2000/*****************************************************************************/ 2373/*****************************************************************************/
2374/* Coro::Semaphore & Coro::Signal */
2375
2376static SV *
2377coro_waitarray_new (pTHX_ int count)
2378{
2379 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2380 AV *av = newAV ();
2381 SV **ary;
2382
2383 /* unfortunately, building manually saves memory */
2384 Newx (ary, 2, SV *);
2385 AvALLOC (av) = ary;
2386#if PERL_VERSION_ATLEAST (5,10,0)
2387 AvARRAY (av) = ary;
2388#else
2389 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2390 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2391 SvPVX ((SV *)av) = (char *)ary;
2392#endif
2393 AvMAX (av) = 1;
2394 AvFILLp (av) = 0;
2395 ary [0] = newSViv (count);
2396
2397 return newRV_noinc ((SV *)av);
2398}
2399
2001/* Coro::Semaphore */ 2400/* semaphore */
2002 2401
2003static void 2402static void
2004coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2403coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2005{ 2404{
2006 SV *count_sv = AvARRAY (av)[0]; 2405 SV *count_sv = AvARRAY (av)[0];
… …
2018 AvARRAY (av)[0] = AvARRAY (av)[1]; 2417 AvARRAY (av)[0] = AvARRAY (av)[1];
2019 AvARRAY (av)[1] = count_sv; 2418 AvARRAY (av)[1] = count_sv;
2020 cb = av_shift (av); 2419 cb = av_shift (av);
2021 2420
2022 if (SvOBJECT (cb)) 2421 if (SvOBJECT (cb))
2422 {
2023 api_ready (aTHX_ cb); 2423 api_ready (aTHX_ cb);
2024 else 2424 --count;
2025 croak ("callbacks not yet supported"); 2425 }
2426 else if (SvTYPE (cb) == SVt_PVCV)
2427 {
2428 dSP;
2429 PUSHMARK (SP);
2430 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2431 PUTBACK;
2432 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2433 }
2026 2434
2027 SvREFCNT_dec (cb); 2435 SvREFCNT_dec (cb);
2028
2029 --count;
2030 } 2436 }
2031} 2437}
2032 2438
2033static void 2439static void
2034coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2440coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2036 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2442 /* call $sem->adjust (0) to possibly wake up some other waiters */
2037 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2443 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2038} 2444}
2039 2445
2040static int 2446static int
2041slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2447slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2042{ 2448{
2043 AV *av = (AV *)frame->data; 2449 AV *av = (AV *)frame->data;
2044 SV *count_sv = AvARRAY (av)[0]; 2450 SV *count_sv = AvARRAY (av)[0];
2045 2451
2452 /* if we are about to throw, don't actually acquire the lock, just throw */
2453 if (CORO_THROW)
2454 return 0;
2046 if (SvIVX (count_sv) > 0) 2455 else if (SvIVX (count_sv) > 0)
2047 { 2456 {
2048 SvSTATE_current->on_destroy = 0; 2457 SvSTATE_current->on_destroy = 0;
2458
2459 if (acquire)
2049 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2460 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2461 else
2462 coro_semaphore_adjust (aTHX_ av, 0);
2463
2050 return 0; 2464 return 0;
2051 } 2465 }
2052 else 2466 else
2053 { 2467 {
2054 int i; 2468 int i;
… …
2063 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2477 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2064 return 1; 2478 return 1;
2065 } 2479 }
2066} 2480}
2067 2481
2068static void 2482static int
2483slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2484{
2485 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2486}
2487
2488static int
2489slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2490{
2491 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2492}
2493
2494static void
2069slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2495slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2070{ 2496{
2071 AV *av = (AV *)SvRV (arg [0]); 2497 AV *av = (AV *)SvRV (arg [0]);
2072 2498
2073 if (SvIVX (AvARRAY (av)[0]) > 0) 2499 if (SvIVX (AvARRAY (av)[0]) > 0)
2074 { 2500 {
2075 frame->data = (void *)av; 2501 frame->data = (void *)av;
2076 frame->prepare = prepare_nop; 2502 frame->prepare = prepare_nop;
2077 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2078 } 2503 }
2079 else 2504 else
2080 { 2505 {
2081 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2506 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2082 2507
2083 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2508 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2084 frame->prepare = prepare_schedule; 2509 frame->prepare = prepare_schedule;
2085 2510
2086 /* to avoid race conditions when a woken-up coro gets terminated */ 2511 /* to avoid race conditions when a woken-up coro gets terminated */
2087 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2512 /* we arrange for a temporary on_destroy that calls adjust (0) */
2088 assert (!SvSTATE_current->on_destroy);//D
2089 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2513 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2090 } 2514 }
2515}
2091 2516
2517static void
2518slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2519{
2520 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2092 frame->check = slf_check_semaphore_down; 2521 frame->check = slf_check_semaphore_down;
2093
2094} 2522}
2095 2523
2096/*****************************************************************************/ 2524static void
2097/* gensub: simple closure generation utility */ 2525slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2098
2099#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2100
2101/* create a closure from XS, returns a code reference */
2102/* the arg can be accessed via GENSUB_ARG from the callback */
2103/* the callback must use dXSARGS/XSRETURN */
2104static SV *
2105gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2106{ 2526{
2107 CV *cv = (CV *)newSV (0); 2527 if (items >= 2)
2528 {
2529 /* callback form */
2530 AV *av = (AV *)SvRV (arg [0]);
2531 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2108 2532
2109 sv_upgrade ((SV *)cv, SVt_PVCV); 2533 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2110 2534
2111 CvANON_on (cv); 2535 if (SvIVX (AvARRAY (av)[0]) > 0)
2112 CvISXSUB_on (cv); 2536 coro_semaphore_adjust (aTHX_ av, 0);
2113 CvXSUB (cv) = xsub;
2114 GENSUB_ARG = arg;
2115 2537
2116 return newRV_noinc ((SV *)cv); 2538 frame->prepare = prepare_nop;
2539 frame->check = slf_check_nop;
2540 }
2541 else
2542 {
2543 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2544 frame->check = slf_check_semaphore_wait;
2545 }
2546}
2547
2548/* signal */
2549
2550static void
2551coro_signal_wake (pTHX_ AV *av, int count)
2552{
2553 SvIVX (AvARRAY (av)[0]) = 0;
2554
2555 /* now signal count waiters */
2556 while (count > 0 && AvFILLp (av) > 0)
2557 {
2558 SV *cb;
2559
2560 /* swap first two elements so we can shift a waiter */
2561 cb = AvARRAY (av)[0];
2562 AvARRAY (av)[0] = AvARRAY (av)[1];
2563 AvARRAY (av)[1] = cb;
2564
2565 cb = av_shift (av);
2566
2567 api_ready (aTHX_ cb);
2568 sv_setiv (cb, 0); /* signal waiter */
2569 SvREFCNT_dec (cb);
2570
2571 --count;
2572 }
2573}
2574
2575static int
2576slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2577{
2578 /* if we are about to throw, also stop waiting */
2579 return SvROK ((SV *)frame->data) && !CORO_THROW;
2580}
2581
2582static void
2583slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2584{
2585 AV *av = (AV *)SvRV (arg [0]);
2586
2587 if (SvIVX (AvARRAY (av)[0]))
2588 {
2589 SvIVX (AvARRAY (av)[0]) = 0;
2590 frame->prepare = prepare_nop;
2591 frame->check = slf_check_nop;
2592 }
2593 else
2594 {
2595 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */
2596
2597 av_push (av, waiter);
2598
2599 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2600 frame->prepare = prepare_schedule;
2601 frame->check = slf_check_signal_wait;
2602 }
2117} 2603}
2118 2604
2119/*****************************************************************************/ 2605/*****************************************************************************/
2120/* Coro::AIO */ 2606/* Coro::AIO */
2121 2607
… …
2136 dXSARGS; 2622 dXSARGS;
2137 AV *state = (AV *)GENSUB_ARG; 2623 AV *state = (AV *)GENSUB_ARG;
2138 SV *coro = av_pop (state); 2624 SV *coro = av_pop (state);
2139 SV *data_sv = newSV (sizeof (struct io_state)); 2625 SV *data_sv = newSV (sizeof (struct io_state));
2140 2626
2141 av_extend (state, items); 2627 av_extend (state, items - 1);
2142 2628
2143 sv_upgrade (data_sv, SVt_PV); 2629 sv_upgrade (data_sv, SVt_PV);
2144 SvCUR_set (data_sv, sizeof (struct io_state)); 2630 SvCUR_set (data_sv, sizeof (struct io_state));
2145 SvPOK_only (data_sv); 2631 SvPOK_only (data_sv);
2146 2632
… …
2171static int 2657static int
2172slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2658slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2173{ 2659{
2174 AV *state = (AV *)frame->data; 2660 AV *state = (AV *)frame->data;
2175 2661
2662 /* if we are about to throw, return early */
2663 /* this does not cancel the aio request, but at least */
2664 /* it quickly returns */
2665 if (CORO_THROW)
2666 return 0;
2667
2176 /* one element that is an RV? repeat! */ 2668 /* one element that is an RV? repeat! */
2177 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2669 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2178 return 1; 2670 return 1;
2179 2671
2180 /* restore status */ 2672 /* restore status */
… …
2275 XSRETURN_EMPTY; 2767 XSRETURN_EMPTY;
2276} 2768}
2277 2769
2278/*****************************************************************************/ 2770/*****************************************************************************/
2279 2771
2772#if CORO_CLONE
2773# include "clone.c"
2774#endif
2775
2280MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2776MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2281 2777
2282PROTOTYPES: DISABLE 2778PROTOTYPES: DISABLE
2283 2779
2284BOOT: 2780BOOT:
… …
2288 coro_thx = PERL_GET_CONTEXT; 2784 coro_thx = PERL_GET_CONTEXT;
2289# endif 2785# endif
2290#endif 2786#endif
2291 BOOT_PAGESIZE; 2787 BOOT_PAGESIZE;
2292 2788
2789 cctx_current = cctx_new_empty ();
2790
2293 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2791 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2294 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2792 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2295 2793
2296 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2794 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2297 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2795 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2316 2814
2317 { 2815 {
2318 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2816 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2319 2817
2320 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2818 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2321 hv_store_ent (PL_custom_op_names, slf, 2819 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2322 newSVpv ("coro_slf", 0), 0);
2323 2820
2324 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2821 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2325 hv_store_ent (PL_custom_op_descs, slf, 2822 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2326 newSVpv ("coro schedule like function", 0), 0);
2327 } 2823 }
2328 2824
2329 coroapi.ver = CORO_API_VERSION; 2825 coroapi.ver = CORO_API_VERSION;
2330 coroapi.rev = CORO_API_REVISION; 2826 coroapi.rev = CORO_API_REVISION;
2331 2827
… …
2350 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2846 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2351} 2847}
2352 2848
2353SV * 2849SV *
2354new (char *klass, ...) 2850new (char *klass, ...)
2851 ALIAS:
2852 Coro::new = 1
2355 CODE: 2853 CODE:
2356{ 2854{
2357 struct coro *coro; 2855 struct coro *coro;
2358 MAGIC *mg; 2856 MAGIC *mg;
2359 HV *hv; 2857 HV *hv;
2858 CV *cb;
2360 int i; 2859 int i;
2860
2861 if (items > 1)
2862 {
2863 cb = coro_sv_2cv (aTHX_ ST (1));
2864
2865 if (!ix)
2866 {
2867 if (CvISXSUB (cb))
2868 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2869
2870 if (!CvROOT (cb))
2871 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2872 }
2873 }
2361 2874
2362 Newz (0, coro, 1, struct coro); 2875 Newz (0, coro, 1, struct coro);
2363 coro->args = newAV (); 2876 coro->args = newAV ();
2364 coro->flags = CF_NEW; 2877 coro->flags = CF_NEW;
2365 2878
… …
2370 coro->hv = hv = newHV (); 2883 coro->hv = hv = newHV ();
2371 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2884 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2372 mg->mg_flags |= MGf_DUP; 2885 mg->mg_flags |= MGf_DUP;
2373 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2886 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2374 2887
2888 if (items > 1)
2889 {
2375 av_extend (coro->args, items - 1); 2890 av_extend (coro->args, items - 1 + ix - 1);
2891
2892 if (ix)
2893 {
2894 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2895 cb = cv_coro_run;
2896 }
2897
2898 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2899
2376 for (i = 1; i < items; i++) 2900 for (i = 2; i < items; i++)
2377 av_push (coro->args, newSVsv (ST (i))); 2901 av_push (coro->args, newSVsv (ST (i)));
2902 }
2378} 2903}
2379 OUTPUT: 2904 OUTPUT:
2380 RETVAL 2905 RETVAL
2381
2382void
2383_set_stacklevel (...)
2384 CODE:
2385 CORO_EXECUTE_SLF_XS (slf_init_set_stacklevel);
2386 2906
2387void 2907void
2388transfer (...) 2908transfer (...)
2389 PROTOTYPE: $$ 2909 PROTOTYPE: $$
2390 CODE: 2910 CODE:
… …
2400void 2920void
2401_exit (int code) 2921_exit (int code)
2402 PROTOTYPE: $ 2922 PROTOTYPE: $
2403 CODE: 2923 CODE:
2404 _exit (code); 2924 _exit (code);
2925
2926SV *
2927clone (Coro::State coro)
2928 CODE:
2929{
2930#if CORO_CLONE
2931 struct coro *ncoro = coro_clone (aTHX_ coro);
2932 MAGIC *mg;
2933 /* TODO: too much duplication */
2934 ncoro->hv = newHV ();
2935 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2936 mg->mg_flags |= MGf_DUP;
2937 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2938#else
2939 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2940#endif
2941}
2942 OUTPUT:
2943 RETVAL
2405 2944
2406int 2945int
2407cctx_stacksize (int new_stacksize = 0) 2946cctx_stacksize (int new_stacksize = 0)
2408 PROTOTYPE: ;$ 2947 PROTOTYPE: ;$
2409 CODE: 2948 CODE:
… …
2516throw (Coro::State self, SV *throw = &PL_sv_undef) 3055throw (Coro::State self, SV *throw = &PL_sv_undef)
2517 PROTOTYPE: $;$ 3056 PROTOTYPE: $;$
2518 CODE: 3057 CODE:
2519{ 3058{
2520 struct coro *current = SvSTATE_current; 3059 struct coro *current = SvSTATE_current;
2521 SV **throwp = self == current ? &coro_throw : &self->throw; 3060 SV **throwp = self == current ? &CORO_THROW : &self->except;
2522 SvREFCNT_dec (*throwp); 3061 SvREFCNT_dec (*throwp);
2523 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3062 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2524} 3063}
2525 3064
2526void 3065void
… …
2530 3069
2531SV * 3070SV *
2532has_cctx (Coro::State coro) 3071has_cctx (Coro::State coro)
2533 PROTOTYPE: $ 3072 PROTOTYPE: $
2534 CODE: 3073 CODE:
2535 RETVAL = boolSV (!!coro->cctx); 3074 /* maybe manage the running flag differently */
3075 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2536 OUTPUT: 3076 OUTPUT:
2537 RETVAL 3077 RETVAL
2538 3078
2539int 3079int
2540is_traced (Coro::State coro) 3080is_traced (Coro::State coro)
… …
2560 3100
2561void 3101void
2562force_cctx () 3102force_cctx ()
2563 PROTOTYPE: 3103 PROTOTYPE:
2564 CODE: 3104 CODE:
2565 SvSTATE_current->cctx->idle_sp = 0; 3105 cctx_current->idle_sp = 0;
2566 3106
2567void 3107void
2568swap_defsv (Coro::State self) 3108swap_defsv (Coro::State self)
2569 PROTOTYPE: $ 3109 PROTOTYPE: $
2570 ALIAS: 3110 ALIAS:
… …
2585 3125
2586BOOT: 3126BOOT:
2587{ 3127{
2588 int i; 3128 int i;
2589 3129
2590 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2591 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3130 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2592 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3131 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2593 3132 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3133 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2594 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3134 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2595 SvREADONLY_on (coro_current); 3135 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3136 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3137 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3138 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3139
3140 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3141 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3142 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3143 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2596 3144
2597 coro_stash = gv_stashpv ("Coro", TRUE); 3145 coro_stash = gv_stashpv ("Coro", TRUE);
2598 3146
2599 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3147 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2600 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3148 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2608 3156
2609 { 3157 {
2610 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3158 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2611 3159
2612 coroapi.schedule = api_schedule; 3160 coroapi.schedule = api_schedule;
3161 coroapi.schedule_to = api_schedule_to;
2613 coroapi.cede = api_cede; 3162 coroapi.cede = api_cede;
2614 coroapi.cede_notself = api_cede_notself; 3163 coroapi.cede_notself = api_cede_notself;
2615 coroapi.ready = api_ready; 3164 coroapi.ready = api_ready;
2616 coroapi.is_ready = api_is_ready; 3165 coroapi.is_ready = api_is_ready;
2617 coroapi.nready = coro_nready; 3166 coroapi.nready = coro_nready;
2618 coroapi.current = coro_current; 3167 coroapi.current = coro_current;
2619 3168
2620 GCoroAPI = &coroapi; 3169 /*GCoroAPI = &coroapi;*/
2621 sv_setiv (sv, (IV)&coroapi); 3170 sv_setiv (sv, (IV)&coroapi);
2622 SvREADONLY_on (sv); 3171 SvREADONLY_on (sv);
2623 } 3172 }
2624} 3173}
3174
3175void
3176terminate (...)
3177 CODE:
3178 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2625 3179
2626void 3180void
2627schedule (...) 3181schedule (...)
2628 CODE: 3182 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3183 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2630 3184
2631void 3185void
3186schedule_to (...)
3187 CODE:
3188 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3189
3190void
3191cede_to (...)
3192 CODE:
3193 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3194
3195void
2632cede (...) 3196cede (...)
2633 CODE: 3197 CODE:
2634 CORO_EXECUTE_SLF_XS (slf_init_cede); 3198 CORO_EXECUTE_SLF_XS (slf_init_cede);
2635 3199
2636void 3200void
2637cede_notself (...) 3201cede_notself (...)
2638 CODE: 3202 CODE:
2639 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3203 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3204
3205void
3206_cancel (Coro::State self)
3207 CODE:
3208 coro_state_destroy (aTHX_ self);
3209 coro_call_on_destroy (aTHX_ self);
2640 3210
2641void 3211void
2642_set_current (SV *current) 3212_set_current (SV *current)
2643 PROTOTYPE: $ 3213 PROTOTYPE: $
2644 CODE: 3214 CODE:
… …
2689 CODE: 3259 CODE:
2690 RETVAL = coro_nready; 3260 RETVAL = coro_nready;
2691 OUTPUT: 3261 OUTPUT:
2692 RETVAL 3262 RETVAL
2693 3263
2694# for async_pool speedup
2695void 3264void
2696_pool_1 (SV *cb) 3265_pool_handler (...)
2697 CODE: 3266 CODE:
2698{ 3267 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2699 HV *hv = (HV *)SvRV (coro_current);
2700 struct coro *coro = SvSTATE_hv ((SV *)hv);
2701 AV *defav = GvAV (PL_defgv);
2702 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2703 AV *invoke_av;
2704 int i, len;
2705 3268
2706 if (!invoke) 3269void
3270async_pool (SV *cv, ...)
3271 PROTOTYPE: &@
3272 PPCODE:
3273{
3274 HV *hv = (HV *)av_pop (av_async_pool);
3275 AV *av = newAV ();
3276 SV *cb = ST (0);
3277 int i;
3278
3279 av_extend (av, items - 2);
3280 for (i = 1; i < items; ++i)
3281 av_push (av, SvREFCNT_inc_NN (ST (i)));
3282
3283 if ((SV *)hv == &PL_sv_undef)
2707 { 3284 {
2708 SV *old = PL_diehook; 3285 PUSHMARK (SP);
2709 PL_diehook = 0; 3286 EXTEND (SP, 2);
2710 SvREFCNT_dec (old); 3287 PUSHs (sv_Coro);
2711 croak ("\3async_pool terminate\2\n"); 3288 PUSHs ((SV *)cv_pool_handler);
3289 PUTBACK;
3290 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3291 SPAGAIN;
3292
3293 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2712 } 3294 }
2713 3295
2714 SvREFCNT_dec (coro->saved_deffh);
2715 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2716
2717 hv_store (hv, "desc", sizeof ("desc") - 1,
2718 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2719
2720 invoke_av = (AV *)SvRV (invoke);
2721 len = av_len (invoke_av);
2722
2723 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2724
2725 if (len > 0)
2726 { 3296 {
2727 av_fill (defav, len - 1); 3297 struct coro *coro = SvSTATE_hv (hv);
2728 for (i = 0; i < len; ++i) 3298
2729 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3299 assert (!coro->invoke_cb);
3300 assert (!coro->invoke_av);
3301 coro->invoke_cb = SvREFCNT_inc (cb);
3302 coro->invoke_av = av;
2730 } 3303 }
3304
3305 api_ready (aTHX_ (SV *)hv);
3306
3307 if (GIMME_V != G_VOID)
3308 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3309 else
3310 SvREFCNT_dec (hv);
2731} 3311}
3312
3313SV *
3314rouse_cb ()
3315 PROTOTYPE:
3316 CODE:
3317 RETVAL = coro_new_rouse_cb (aTHX);
3318 OUTPUT:
3319 RETVAL
2732 3320
2733void 3321void
2734_pool_2 (SV *cb) 3322rouse_wait (...)
3323 PROTOTYPE: ;$
2735 CODE: 3324 PPCODE:
2736{ 3325 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2737 HV *hv = (HV *)SvRV (coro_current);
2738 struct coro *coro = SvSTATE_hv ((SV *)hv);
2739
2740 sv_setsv (cb, &PL_sv_undef);
2741
2742 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2743 coro->saved_deffh = 0;
2744
2745 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2747 {
2748 SV *old = PL_diehook;
2749 PL_diehook = 0;
2750 SvREFCNT_dec (old);
2751 croak ("\3async_pool terminate\2\n");
2752 }
2753
2754 av_clear (GvAV (PL_defgv));
2755 hv_store (hv, "desc", sizeof ("desc") - 1,
2756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2757
2758 coro->prio = 0;
2759
2760 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2761 api_trace (aTHX_ coro_current, 0);
2762
2763 av_push (av_async_pool, newSVsv (coro_current));
2764}
2765 3326
2766 3327
2767MODULE = Coro::State PACKAGE = PerlIO::cede 3328MODULE = Coro::State PACKAGE = PerlIO::cede
2768 3329
2769BOOT: 3330BOOT:
… …
2771 3332
2772 3333
2773MODULE = Coro::State PACKAGE = Coro::Semaphore 3334MODULE = Coro::State PACKAGE = Coro::Semaphore
2774 3335
2775SV * 3336SV *
2776new (SV *klass, SV *count_ = 0) 3337new (SV *klass, SV *count = 0)
2777 CODE: 3338 CODE:
2778{ 3339 RETVAL = sv_bless (
2779 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3340 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),
2780 AV *av = newAV (); 3341 GvSTASH (CvGV (cv))
2781 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1)); 3342 );
2782 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3343 OUTPUT:
2783} 3344 RETVAL
3345
3346# helper for Coro::Channel
3347SV *
3348_alloc (int count)
3349 CODE:
3350 RETVAL = coro_waitarray_new (aTHX_ count);
2784 OUTPUT: 3351 OUTPUT:
2785 RETVAL 3352 RETVAL
2786 3353
2787SV * 3354SV *
2788count (SV *self) 3355count (SV *self)
… …
2797 adjust = 1 3364 adjust = 1
2798 CODE: 3365 CODE:
2799 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3366 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2800 3367
2801void 3368void
2802down (SV *self) 3369down (...)
2803 CODE: 3370 CODE:
2804 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3371 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3372
3373void
3374wait (...)
3375 CODE:
3376 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2805 3377
2806void 3378void
2807try (SV *self) 3379try (SV *self)
2808 PPCODE: 3380 PPCODE:
2809{ 3381{
… …
2821 XSRETURN_NO; 3393 XSRETURN_NO;
2822} 3394}
2823 3395
2824void 3396void
2825waiters (SV *self) 3397waiters (SV *self)
2826 CODE: 3398 PPCODE:
2827{ 3399{
2828 AV *av = (AV *)SvRV (self); 3400 AV *av = (AV *)SvRV (self);
3401 int wcount = AvFILLp (av) + 1 - 1;
2829 3402
2830 if (GIMME_V == G_SCALAR) 3403 if (GIMME_V == G_SCALAR)
2831 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3404 XPUSHs (sv_2mortal (newSViv (wcount)));
2832 else 3405 else
2833 { 3406 {
2834 int i; 3407 int i;
2835 EXTEND (SP, AvFILLp (av) + 1 - 1); 3408 EXTEND (SP, wcount);
2836 for (i = 1; i <= AvFILLp (av); ++i) 3409 for (i = 1; i <= wcount; ++i)
2837 PUSHs (newSVsv (AvARRAY (av)[i])); 3410 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2838 } 3411 }
2839} 3412}
3413
3414MODULE = Coro::State PACKAGE = Coro::Signal
3415
3416SV *
3417new (SV *klass)
3418 CODE:
3419 RETVAL = sv_bless (
3420 coro_waitarray_new (aTHX_ 0),
3421 GvSTASH (CvGV (cv))
3422 );
3423 OUTPUT:
3424 RETVAL
3425
3426void
3427wait (...)
3428 CODE:
3429 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3430
3431void
3432broadcast (SV *self)
3433 CODE:
3434{
3435 AV *av = (AV *)SvRV (self);
3436 coro_signal_wake (aTHX_ av, AvFILLp (av));
3437}
3438
3439void
3440send (SV *self)
3441 CODE:
3442{
3443 AV *av = (AV *)SvRV (self);
3444
3445 if (AvFILLp (av))
3446 coro_signal_wake (aTHX_ av, 1);
3447 else
3448 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3449}
3450
3451IV
3452awaited (SV *self)
3453 CODE:
3454 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3455 OUTPUT:
3456 RETVAL
2840 3457
2841 3458
2842MODULE = Coro::State PACKAGE = Coro::AnyEvent 3459MODULE = Coro::State PACKAGE = Coro::AnyEvent
2843 3460
2844BOOT: 3461BOOT:
… …
2859 sv_setsv (sv_activity, &PL_sv_undef); 3476 sv_setsv (sv_activity, &PL_sv_undef);
2860 if (coro_nready >= incede) 3477 if (coro_nready >= incede)
2861 { 3478 {
2862 PUSHMARK (SP); 3479 PUSHMARK (SP);
2863 PUTBACK; 3480 PUTBACK;
2864 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL); 3481 call_pv ("Coro::AnyEvent::_activity", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2865 SPAGAIN;
2866 } 3482 }
2867 3483
2868 --incede; 3484 --incede;
2869} 3485}
2870 3486
… …
2873 3489
2874void 3490void
2875_register (char *target, char *proto, SV *req) 3491_register (char *target, char *proto, SV *req)
2876 CODE: 3492 CODE:
2877{ 3493{
2878 HV *st; 3494 CV *req_cv = coro_sv_2cv (aTHX_ req);
2879 GV *gvp;
2880 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2881 /* newXSproto doesn't return the CV on 5.8 */ 3495 /* newXSproto doesn't return the CV on 5.8 */
2882 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3496 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2883 sv_setpv ((SV *)slf_cv, proto); 3497 sv_setpv ((SV *)slf_cv, proto);
2884 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3498 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2885} 3499}

Diff Legend

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