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

Diff Legend

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