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.290 by root, Tue Nov 18 05:51:38 2008 UTC vs.
Revision 1.339 by root, Mon Dec 15 00:28:30 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
… …
164static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
165static JMPENV *main_top_env; 174static JMPENV *main_top_env;
166static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
167static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
168 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
169static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
170static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
171static SV *rv_diehook; 184static SV *rv_diehook;
172static SV *rv_warnhook; 185static SV *rv_warnhook;
173static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
174 187
175/* async_pool helper stuff */ 188/* async_pool helper stuff */
176static SV *sv_pool_rss; 189static SV *sv_pool_rss;
177static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
178static 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;
179 196
180/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
181static SV *sv_activity; 198static SV *sv_activity;
182 199
183static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
212 int valgrind_id; 229 int valgrind_id;
213#endif 230#endif
214 unsigned char flags; 231 unsigned char flags;
215} coro_cctx; 232} coro_cctx;
216 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
217enum { 238enum {
218 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
219 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
220 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
221 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
… …
226{ 247{
227 SV *defsv; 248 SV *defsv;
228 AV *defav; 249 AV *defav;
229 SV *errsv; 250 SV *errsv;
230 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
231#define VAR(name,type) type name; 253#define VAR(name,type) type name;
232# include "state.h" 254# include "state.h"
233#undef VAR 255#undef VAR
234} perl_slots; 256} perl_slots;
235 257
… …
243 /* state data */ 265 /* state data */
244 struct CoroSLF slf_frame; /* saved slf frame */ 266 struct CoroSLF slf_frame; /* saved slf frame */
245 AV *mainstack; 267 AV *mainstack;
246 perl_slots *slot; /* basically the saved sp */ 268 perl_slots *slot; /* basically the saved sp */
247 269
270 CV *startcv; /* the CV to execute */
248 AV *args; /* data associated with this coroutine (initial args) */ 271 AV *args; /* data associated with this coroutine (initial args) */
249 int refcnt; /* coroutines are refcounted, yes */ 272 int refcnt; /* coroutines are refcounted, yes */
250 int flags; /* CF_ flags */ 273 int flags; /* CF_ flags */
251 HV *hv; /* the perl hash associated with this coro, if any */ 274 HV *hv; /* the perl hash associated with this coro, if any */
252 void (*on_destroy)(pTHX_ struct coro *coro); 275 void (*on_destroy)(pTHX_ struct coro *coro);
253 276
254 /* statistics */ 277 /* statistics */
255 int usecount; /* number of transfers to this coro */ 278 int usecount; /* number of transfers to this coro */
256 279
257 /* coro process data */ 280 /* coro process data */
258 int prio; 281 int prio;
259 SV *throw; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
283 SV *rouse_cb;
260 284
261 /* async_pool */ 285 /* async_pool */
262 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
289
290 /* on_enter/on_leave */
291 AV *on_enter;
292 AV *on_leave;
263 293
264 /* linked list */ 294 /* linked list */
265 struct coro *next, *prev; 295 struct coro *next, *prev;
266}; 296};
267 297
… …
270 300
271/* the following variables are effectively part of the perl context */ 301/* the following variables are effectively part of the perl context */
272/* and get copied between struct coro and these variables */ 302/* and get copied between struct coro and these variables */
273/* the mainr easonw e don't support windows process emulation */ 303/* the mainr easonw e don't support windows process emulation */
274static struct CoroSLF slf_frame; /* the current slf frame */ 304static struct CoroSLF slf_frame; /* the current slf frame */
275static SV *coro_throw;
276 305
277/** Coro ********************************************************************/ 306/** Coro ********************************************************************/
278 307
279#define PRIO_MAX 3 308#define PRIO_MAX 3
280#define PRIO_HIGH 1 309#define PRIO_HIGH 1
… …
285 314
286/* for Coro.pm */ 315/* for Coro.pm */
287static SV *coro_current; 316static SV *coro_current;
288static SV *coro_readyhook; 317static SV *coro_readyhook;
289static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
319static CV *cv_coro_run, *cv_coro_terminate;
290static struct coro *coro_first; 320static struct coro *coro_first;
291#define coro_nready coroapi.nready 321#define coro_nready coroapi.nready
292 322
293/** lowlevel stuff **********************************************************/ 323/** lowlevel stuff **********************************************************/
294 324
… …
320 get_hv (name, create); 350 get_hv (name, create);
321#endif 351#endif
322 return get_hv (name, create); 352 return get_hv (name, create);
323} 353}
324 354
355/* may croak */
356INLINE CV *
357coro_sv_2cv (pTHX_ SV *sv)
358{
359 HV *st;
360 GV *gvp;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362
363 if (!cv)
364 croak ("code reference expected");
365
366 return cv;
367}
368
369/*****************************************************************************/
370/* magic glue */
371
372#define CORO_MAGIC_type_cv 26
373#define CORO_MAGIC_type_state PERL_MAGIC_ext
374
375#define CORO_MAGIC_NN(sv, type) \
376 (expect_true (SvMAGIC (sv)->mg_type == type) \
377 ? SvMAGIC (sv) \
378 : mg_find (sv, type))
379
380#define CORO_MAGIC(sv, type) \
381 (expect_true (SvMAGIC (sv)) \
382 ? CORO_MAGIC_NN (sv, type) \
383 : 0)
384
385#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
386#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
387
388INLINE struct coro *
389SvSTATE_ (pTHX_ SV *coro)
390{
391 HV *stash;
392 MAGIC *mg;
393
394 if (SvROK (coro))
395 coro = SvRV (coro);
396
397 if (expect_false (SvTYPE (coro) != SVt_PVHV))
398 croak ("Coro::State object required");
399
400 stash = SvSTASH (coro);
401 if (expect_false (stash != coro_stash && stash != coro_state_stash))
402 {
403 /* very slow, but rare, check */
404 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
405 croak ("Coro::State object required");
406 }
407
408 mg = CORO_MAGIC_state (coro);
409 return (struct coro *)mg->mg_ptr;
410}
411
412#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
413
414/* faster than SvSTATE, but expects a coroutine hv */
415#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
416#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
417
418/*****************************************************************************/
419/* padlist management and caching */
420
325static AV * 421static AV *
326coro_clone_padlist (pTHX_ CV *cv) 422coro_derive_padlist (pTHX_ CV *cv)
327{ 423{
328 AV *padlist = CvPADLIST (cv); 424 AV *padlist = CvPADLIST (cv);
329 AV *newpadlist, *newpad; 425 AV *newpadlist, *newpad;
330 426
331 newpadlist = newAV (); 427 newpadlist = newAV ();
… …
336 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 432 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
337#endif 433#endif
338 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 434 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
339 --AvFILLp (padlist); 435 --AvFILLp (padlist);
340 436
341 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 437 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
342 av_store (newpadlist, 1, (SV *)newpad); 438 av_store (newpadlist, 1, (SV *)newpad);
343 439
344 return newpadlist; 440 return newpadlist;
345} 441}
346 442
347static void 443static void
348free_padlist (pTHX_ AV *padlist) 444free_padlist (pTHX_ AV *padlist)
349{ 445{
350 /* may be during global destruction */ 446 /* may be during global destruction */
351 if (SvREFCNT (padlist)) 447 if (!IN_DESTRUCT)
352 { 448 {
353 I32 i = AvFILLp (padlist); 449 I32 i = AvFILLp (padlist);
354 while (i >= 0) 450
451 while (i > 0) /* special-case index 0 */
355 { 452 {
356 SV **svp = av_fetch (padlist, i--, FALSE); 453 /* we try to be extra-careful here */
357 if (svp) 454 AV *av = (AV *)AvARRAY (padlist)[i--];
358 { 455 I32 j = AvFILLp (av);
359 SV *sv; 456
360 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 457 while (j >= 0)
458 SvREFCNT_dec (AvARRAY (av)[j--]);
459
460 AvFILLp (av) = -1;
361 SvREFCNT_dec (sv); 461 SvREFCNT_dec (av);
362
363 SvREFCNT_dec (*svp);
364 }
365 } 462 }
366 463
464 SvREFCNT_dec (AvARRAY (padlist)[0]);
465
466 AvFILLp (padlist) = -1;
367 SvREFCNT_dec ((SV*)padlist); 467 SvREFCNT_dec ((SV*)padlist);
368 } 468 }
369} 469}
370 470
371static int 471static int
… …
380 480
381 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 481 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
382 482
383 return 0; 483 return 0;
384} 484}
385
386#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 485
389static MGVTBL coro_cv_vtbl = { 486static MGVTBL coro_cv_vtbl = {
390 0, 0, 0, 0, 487 0, 0, 0, 0,
391 coro_cv_free 488 coro_cv_free
392}; 489};
393
394#define CORO_MAGIC_NN(sv, type) \
395 (expect_true (SvMAGIC (sv)->mg_type == type) \
396 ? SvMAGIC (sv) \
397 : mg_find (sv, type))
398
399#define CORO_MAGIC(sv, type) \
400 (expect_true (SvMAGIC (sv)) \
401 ? CORO_MAGIC_NN (sv, type) \
402 : 0)
403
404#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
405#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
406
407INLINE struct coro *
408SvSTATE_ (pTHX_ SV *coro)
409{
410 HV *stash;
411 MAGIC *mg;
412
413 if (SvROK (coro))
414 coro = SvRV (coro);
415
416 if (expect_false (SvTYPE (coro) != SVt_PVHV))
417 croak ("Coro::State object required");
418
419 stash = SvSTASH (coro);
420 if (expect_false (stash != coro_stash && stash != coro_state_stash))
421 {
422 /* very slow, but rare, check */
423 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
424 croak ("Coro::State object required");
425 }
426
427 mg = CORO_MAGIC_state (coro);
428 return (struct coro *)mg->mg_ptr;
429}
430
431#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
432
433/* faster than SvSTATE, but expects a coroutine hv */
434#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
435#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
436 490
437/* the next two functions merely cache the padlists */ 491/* the next two functions merely cache the padlists */
438static void 492static void
439get_padlist (pTHX_ CV *cv) 493get_padlist (pTHX_ CV *cv)
440{ 494{
… …
446 else 500 else
447 { 501 {
448#if CORO_PREFER_PERL_FUNCTIONS 502#if CORO_PREFER_PERL_FUNCTIONS
449 /* this is probably cleaner? but also slower! */ 503 /* this is probably cleaner? but also slower! */
450 /* in practise, it seems to be less stable */ 504 /* in practise, it seems to be less stable */
451 CV *cp = Perl_cv_clone (cv); 505 CV *cp = Perl_cv_clone (aTHX_ cv);
452 CvPADLIST (cv) = CvPADLIST (cp); 506 CvPADLIST (cv) = CvPADLIST (cp);
453 CvPADLIST (cp) = 0; 507 CvPADLIST (cp) = 0;
454 SvREFCNT_dec (cp); 508 SvREFCNT_dec (cp);
455#else 509#else
456 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 510 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
457#endif 511#endif
458 } 512 }
459} 513}
460 514
461static void 515static void
… …
468 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 522 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
469 523
470 av = (AV *)mg->mg_obj; 524 av = (AV *)mg->mg_obj;
471 525
472 if (expect_false (AvFILLp (av) >= AvMAX (av))) 526 if (expect_false (AvFILLp (av) >= AvMAX (av)))
473 av_extend (av, AvMAX (av) + 1); 527 av_extend (av, AvFILLp (av) + 1);
474 528
475 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
476} 530}
477 531
478/** load & save, init *******************************************************/ 532/** load & save, init *******************************************************/
533
534static void
535on_enterleave_call (pTHX_ SV *cb);
479 536
480static void 537static void
481load_perl (pTHX_ Coro__State c) 538load_perl (pTHX_ Coro__State c)
482{ 539{
483 perl_slots *slot = c->slot; 540 perl_slots *slot = c->slot;
484 c->slot = 0; 541 c->slot = 0;
485 542
486 PL_mainstack = c->mainstack; 543 PL_mainstack = c->mainstack;
487 544
488 GvSV (PL_defgv) = slot->defsv; 545 GvSV (PL_defgv) = slot->defsv;
489 GvAV (PL_defgv) = slot->defav; 546 GvAV (PL_defgv) = slot->defav;
490 GvSV (PL_errgv) = slot->errsv; 547 GvSV (PL_errgv) = slot->errsv;
491 GvSV (irsgv) = slot->irsgv; 548 GvSV (irsgv) = slot->irsgv;
549 GvHV (PL_hintgv) = slot->hinthv;
492 550
493 #define VAR(name,type) PL_ ## name = slot->name; 551 #define VAR(name,type) PL_ ## name = slot->name;
494 # include "state.h" 552 # include "state.h"
495 #undef VAR 553 #undef VAR
496 554
… …
509 567
510 PUTBACK; 568 PUTBACK;
511 } 569 }
512 570
513 slf_frame = c->slf_frame; 571 slf_frame = c->slf_frame;
514 coro_throw = c->throw; 572 CORO_THROW = c->except;
573
574 if (expect_false (c->on_enter))
575 {
576 int i;
577
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (AvARRAY (c->on_enter)[i]);
580 }
515} 581}
516 582
517static void 583static void
518save_perl (pTHX_ Coro__State c) 584save_perl (pTHX_ Coro__State c)
519{ 585{
520 c->throw = coro_throw; 586 if (expect_false (c->on_leave))
587 {
588 int i;
589
590 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (AvARRAY (c->on_leave)[i]);
592 }
593
594 c->except = CORO_THROW;
521 c->slf_frame = slf_frame; 595 c->slf_frame = slf_frame;
522 596
523 { 597 {
524 dSP; 598 dSP;
525 I32 cxix = cxstack_ix; 599 I32 cxix = cxstack_ix;
… …
582 c->mainstack = PL_mainstack; 656 c->mainstack = PL_mainstack;
583 657
584 { 658 {
585 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
586 660
587 slot->defav = GvAV (PL_defgv); 661 slot->defav = GvAV (PL_defgv);
588 slot->defsv = DEFSV; 662 slot->defsv = DEFSV;
589 slot->errsv = ERRSV; 663 slot->errsv = ERRSV;
590 slot->irsgv = GvSV (irsgv); 664 slot->irsgv = GvSV (irsgv);
665 slot->hinthv = GvHV (PL_hintgv);
591 666
592 #define VAR(name,type) slot->name = PL_ ## name; 667 #define VAR(name,type) slot->name = PL_ ## name;
593 # include "state.h" 668 # include "state.h"
594 #undef VAR 669 #undef VAR
595 } 670 }
… …
600 * of perl.c:init_stacks, except that it uses less memory 675 * of perl.c:init_stacks, except that it uses less memory
601 * on the (sometimes correct) assumption that coroutines do 676 * on the (sometimes correct) assumption that coroutines do
602 * not usually need a lot of stackspace. 677 * not usually need a lot of stackspace.
603 */ 678 */
604#if CORO_PREFER_PERL_FUNCTIONS 679#if CORO_PREFER_PERL_FUNCTIONS
605# define coro_init_stacks init_stacks 680# define coro_init_stacks(thx) init_stacks ()
606#else 681#else
607static void 682static void
608coro_init_stacks (pTHX) 683coro_init_stacks (pTHX)
609{ 684{
610 PL_curstackinfo = new_stackinfo(32, 8); 685 PL_curstackinfo = new_stackinfo(32, 8);
… …
673#if !PERL_VERSION_ATLEAST (5,10,0) 748#if !PERL_VERSION_ATLEAST (5,10,0)
674 Safefree (PL_retstack); 749 Safefree (PL_retstack);
675#endif 750#endif
676} 751}
677 752
753#define CORO_RSS \
754 rss += sizeof (SYM (curstackinfo)); \
755 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
756 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
757 rss += SYM (tmps_max) * sizeof (SV *); \
758 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
759 rss += SYM (scopestack_max) * sizeof (I32); \
760 rss += SYM (savestack_max) * sizeof (ANY);
761
678static size_t 762static size_t
679coro_rss (pTHX_ struct coro *coro) 763coro_rss (pTHX_ struct coro *coro)
680{ 764{
681 size_t rss = sizeof (*coro); 765 size_t rss = sizeof (*coro);
682 766
683 if (coro->mainstack) 767 if (coro->mainstack)
684 { 768 {
685 perl_slots tmp_slot;
686 perl_slots *slot;
687
688 if (coro->flags & CF_RUNNING) 769 if (coro->flags & CF_RUNNING)
689 { 770 {
690 slot = &tmp_slot; 771 #define SYM(sym) PL_ ## sym
691 772 CORO_RSS;
692 #define VAR(name,type) slot->name = PL_ ## name;
693 # include "state.h"
694 #undef VAR 773 #undef SYM
695 } 774 }
696 else 775 else
697 slot = coro->slot;
698
699 if (slot)
700 { 776 {
701 rss += sizeof (slot->curstackinfo); 777 #define SYM(sym) coro->slot->sym
702 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 778 CORO_RSS;
703 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 779 #undef SYM
704 rss += slot->tmps_max * sizeof (SV *);
705 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
706 rss += slot->scopestack_max * sizeof (I32);
707 rss += slot->savestack_max * sizeof (ANY);
708
709#if !PERL_VERSION_ATLEAST (5,10,0)
710 rss += slot->retstack_max * sizeof (OP *);
711#endif
712 } 780 }
713 } 781 }
714 782
715 return rss; 783 return rss;
716} 784}
… …
729#endif 797#endif
730 798
731/* 799/*
732 * This overrides the default magic get method of %SIG elements. 800 * This overrides the default magic get method of %SIG elements.
733 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 801 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
734 * and instead of tryign to save and restore the hash elements, we just provide 802 * and instead of trying to save and restore the hash elements, we just provide
735 * readback here. 803 * readback here.
736 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
737 * not expecting this to actually change the hook. This is a potential problem
738 * when a schedule happens then, but we ignore this.
739 */ 804 */
740static int 805static int
741coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 806coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
742{ 807{
743 const char *s = MgPV_nolen_const (mg); 808 const char *s = MgPV_nolen_const (mg);
… …
796 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 861 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
797 862
798 if (svp) 863 if (svp)
799 { 864 {
800 SV *old = *svp; 865 SV *old = *svp;
801 *svp = newSVsv (sv); 866 *svp = SvOK (sv) ? newSVsv (sv) : 0;
802 SvREFCNT_dec (old); 867 SvREFCNT_dec (old);
803 return 0; 868 return 0;
804 } 869 }
805 } 870 }
806 871
… …
816 881
817static int 882static int
818slf_check_nop (pTHX_ struct CoroSLF *frame) 883slf_check_nop (pTHX_ struct CoroSLF *frame)
819{ 884{
820 return 0; 885 return 0;
886}
887
888static int
889slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{
891 return 1;
821} 892}
822 893
823static UNOP coro_setup_op; 894static UNOP coro_setup_op;
824 895
825static void NOINLINE /* noinline to keep it out of the transfer fast path */ 896static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
832 903
833 PL_runops = RUNOPS_DEFAULT; 904 PL_runops = RUNOPS_DEFAULT;
834 PL_curcop = &PL_compiling; 905 PL_curcop = &PL_compiling;
835 PL_in_eval = EVAL_NULL; 906 PL_in_eval = EVAL_NULL;
836 PL_comppad = 0; 907 PL_comppad = 0;
908 PL_comppad_name = 0;
909 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0;
837 PL_curpm = 0; 911 PL_curpm = 0;
838 PL_curpad = 0; 912 PL_curpad = 0;
839 PL_localizing = 0; 913 PL_localizing = 0;
840 PL_dirty = 0; 914 PL_dirty = 0;
841 PL_restartop = 0; 915 PL_restartop = 0;
842#if PERL_VERSION_ATLEAST (5,10,0) 916#if PERL_VERSION_ATLEAST (5,10,0)
843 PL_parser = 0; 917 PL_parser = 0;
844#endif 918#endif
919 PL_hints = 0;
845 920
846 /* recreate the die/warn hooks */ 921 /* recreate the die/warn hooks */
847 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 922 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
848 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 923 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
849 924
850 GvSV (PL_defgv) = newSV (0); 925 GvSV (PL_defgv) = newSV (0);
851 GvAV (PL_defgv) = coro->args; coro->args = 0; 926 GvAV (PL_defgv) = coro->args; coro->args = 0;
852 GvSV (PL_errgv) = newSV (0); 927 GvSV (PL_errgv) = newSV (0);
853 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 928 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
929 GvHV (PL_hintgv) = 0;
854 PL_rs = newSVsv (GvSV (irsgv)); 930 PL_rs = newSVsv (GvSV (irsgv));
855 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 931 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
856 932
857 { 933 {
858 dSP; 934 dSP;
859 UNOP myop; 935 UNOP myop;
860 936
861 Zero (&myop, 1, UNOP); 937 Zero (&myop, 1, UNOP);
862 myop.op_next = Nullop; 938 myop.op_next = Nullop;
939 myop.op_type = OP_ENTERSUB;
863 myop.op_flags = OPf_WANT_VOID; 940 myop.op_flags = OPf_WANT_VOID;
864 941
865 PUSHMARK (SP); 942 PUSHMARK (SP);
866 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 943 PUSHs ((SV *)coro->startcv);
867 PUTBACK; 944 PUTBACK;
868 PL_op = (OP *)&myop; 945 PL_op = (OP *)&myop;
869 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 946 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
870 SPAGAIN;
871 } 947 }
872 948
873 /* this newly created coroutine might be run on an existing cctx which most 949 /* this newly created coroutine might be run on an existing cctx which most
874 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 950 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
875 */ 951 */
876 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 952 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
877 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 953 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
878 954
879 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 955 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
956 coro_setup_op.op_next = PL_op;
880 coro_setup_op.op_type = OP_CUSTOM; 957 coro_setup_op.op_type = OP_ENTERSUB;
881 coro_setup_op.op_ppaddr = pp_slf; 958 coro_setup_op.op_ppaddr = pp_slf;
882 coro_setup_op.op_next = PL_op; 959 /* no flags etc. required, as an init function won't be called */
883 960
884 PL_op = (OP *)&coro_setup_op; 961 PL_op = (OP *)&coro_setup_op;
885 962
886 /* copy throw, in case it was set before coro_setup */ 963 /* copy throw, in case it was set before coro_setup */
887 coro_throw = coro->throw; 964 CORO_THROW = coro->except;
888} 965}
889 966
890static void 967static void
891coro_destruct (pTHX_ struct coro *coro) 968coro_unwind_stacks (pTHX)
892{ 969{
893 if (!IN_DESTRUCT) 970 if (!IN_DESTRUCT)
894 { 971 {
895 /* restore all saved variables and stuff */ 972 /* restore all saved variables and stuff */
896 LEAVE_SCOPE (0); 973 LEAVE_SCOPE (0);
… …
904 POPSTACK_TO (PL_mainstack); 981 POPSTACK_TO (PL_mainstack);
905 982
906 /* unwind main stack */ 983 /* unwind main stack */
907 dounwind (-1); 984 dounwind (-1);
908 } 985 }
986}
987
988static void
989coro_destruct_perl (pTHX_ struct coro *coro)
990{
991 coro_unwind_stacks (aTHX);
909 992
910 SvREFCNT_dec (GvSV (PL_defgv)); 993 SvREFCNT_dec (GvSV (PL_defgv));
911 SvREFCNT_dec (GvAV (PL_defgv)); 994 SvREFCNT_dec (GvAV (PL_defgv));
912 SvREFCNT_dec (GvSV (PL_errgv)); 995 SvREFCNT_dec (GvSV (PL_errgv));
913 SvREFCNT_dec (PL_defoutgv); 996 SvREFCNT_dec (PL_defoutgv);
914 SvREFCNT_dec (PL_rs); 997 SvREFCNT_dec (PL_rs);
915 SvREFCNT_dec (GvSV (irsgv)); 998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
916 1000
917 SvREFCNT_dec (PL_diehook); 1001 SvREFCNT_dec (PL_diehook);
918 SvREFCNT_dec (PL_warnhook); 1002 SvREFCNT_dec (PL_warnhook);
919 1003
920 SvREFCNT_dec (coro->saved_deffh); 1004 SvREFCNT_dec (coro->saved_deffh);
921 SvREFCNT_dec (coro_throw); 1005 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av);
922 1008
923 coro_destruct_stacks (aTHX); 1009 coro_destruct_stacks (aTHX);
924} 1010}
925 1011
926INLINE void 1012INLINE void
… …
936static int 1022static int
937runops_trace (pTHX) 1023runops_trace (pTHX)
938{ 1024{
939 COP *oldcop = 0; 1025 COP *oldcop = 0;
940 int oldcxix = -2; 1026 int oldcxix = -2;
941 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
942 coro_cctx *cctx = coro->cctx;
943 1027
944 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1028 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
945 { 1029 {
946 PERL_ASYNC_CHECK (); 1030 PERL_ASYNC_CHECK ();
947 1031
948 if (cctx->flags & CC_TRACE_ALL) 1032 if (cctx_current->flags & CC_TRACE_ALL)
949 { 1033 {
950 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1034 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
951 { 1035 {
952 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1036 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
953 SV **bot, **top; 1037 SV **bot, **top;
954 AV *av = newAV (); /* return values */ 1038 AV *av = newAV (); /* return values */
955 SV **cb; 1039 SV **cb;
… …
992 1076
993 if (PL_curcop != &PL_compiling) 1077 if (PL_curcop != &PL_compiling)
994 { 1078 {
995 SV **cb; 1079 SV **cb;
996 1080
997 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1081 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
998 { 1082 {
999 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1083 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1000 1084
1001 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1085 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1002 { 1086 {
1003 runops_proc_t old_runops = PL_runops;
1004 dSP; 1087 dSP;
1005 GV *gv = CvGV (cx->blk_sub.cv); 1088 GV *gv = CvGV (cx->blk_sub.cv);
1006 SV *fullname = sv_2mortal (newSV (0)); 1089 SV *fullname = sv_2mortal (newSV (0));
1007 1090
1008 if (isGV (gv)) 1091 if (isGV (gv))
… …
1013 SAVETMPS; 1096 SAVETMPS;
1014 EXTEND (SP, 3); 1097 EXTEND (SP, 3);
1015 PUSHMARK (SP); 1098 PUSHMARK (SP);
1016 PUSHs (&PL_sv_yes); 1099 PUSHs (&PL_sv_yes);
1017 PUSHs (fullname); 1100 PUSHs (fullname);
1018 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1101 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1019 PUTBACK; 1102 PUTBACK;
1020 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1103 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1021 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1104 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1022 SPAGAIN; 1105 SPAGAIN;
1023 FREETMPS; 1106 FREETMPS;
… …
1026 } 1109 }
1027 1110
1028 oldcxix = cxstack_ix; 1111 oldcxix = cxstack_ix;
1029 } 1112 }
1030 1113
1031 if (cctx->flags & CC_TRACE_LINE) 1114 if (cctx_current->flags & CC_TRACE_LINE)
1032 { 1115 {
1033 dSP; 1116 dSP;
1034 1117
1035 PL_runops = RUNOPS_DEFAULT; 1118 PL_runops = RUNOPS_DEFAULT;
1036 ENTER; 1119 ENTER;
… …
1055 1138
1056 TAINT_NOT; 1139 TAINT_NOT;
1057 return 0; 1140 return 0;
1058} 1141}
1059 1142
1060static struct coro_cctx *cctx_ssl_cctx;
1061static struct CoroSLF cctx_ssl_frame; 1143static struct CoroSLF cctx_ssl_frame;
1062 1144
1063static void 1145static void
1064slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1146slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1065{ 1147{
1066 ta->prev = (struct coro *)cctx_ssl_cctx;
1067 ta->next = 0; 1148 ta->prev = 0;
1068} 1149}
1069 1150
1070static int 1151static int
1071slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1152slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1072{ 1153{
1073 *frame = cctx_ssl_frame; 1154 *frame = cctx_ssl_frame;
1074 1155
1075 return 0; 1156 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1076} 1157}
1077 1158
1078/* initialises PL_top_env and injects a pseudo-slf-call to sett he stacklevel */ 1159/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1079static void NOINLINE 1160static void NOINLINE
1080cctx_prepare (pTHX_ coro_cctx *cctx) 1161cctx_prepare (pTHX)
1081{ 1162{
1082 PL_top_env = &PL_start_env; 1163 PL_top_env = &PL_start_env;
1083 1164
1084 if (cctx->flags & CC_TRACE) 1165 if (cctx_current->flags & CC_TRACE)
1085 PL_runops = runops_trace; 1166 PL_runops = runops_trace;
1086 1167
1087 /* we already must be in an SLF call, there is no other valid way 1168 /* we already must be executing an SLF op, there is no other valid way
1088 * that can lead to creation of a new cctx */ 1169 * that can lead to creation of a new cctx */
1089 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1170 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1090 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1171 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1091 1172
1092 cctx_ssl_cctx = cctx; 1173 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1093 cctx_ssl_frame = slf_frame; 1174 cctx_ssl_frame = slf_frame;
1094 1175
1095 slf_frame.prepare = slf_prepare_set_stacklevel; 1176 slf_frame.prepare = slf_prepare_set_stacklevel;
1096 slf_frame.check = slf_check_set_stacklevel; 1177 slf_frame.check = slf_check_set_stacklevel;
1097} 1178}
… …
1120 /* normally we would need to skip the entersub here */ 1201 /* normally we would need to skip the entersub here */
1121 /* not doing so will re-execute it, which is exactly what we want */ 1202 /* not doing so will re-execute it, which is exactly what we want */
1122 /* PL_nop = PL_nop->op_next */ 1203 /* PL_nop = PL_nop->op_next */
1123 1204
1124 /* inject a fake subroutine call to cctx_init */ 1205 /* inject a fake subroutine call to cctx_init */
1125 cctx_prepare (aTHX_ (coro_cctx *)arg); 1206 cctx_prepare (aTHX);
1126 1207
1127 /* cctx_run is the alternative tail of transfer() */ 1208 /* cctx_run is the alternative tail of transfer() */
1128 transfer_tail (aTHX); 1209 transfer_tail (aTHX);
1129 1210
1130 /* somebody or something will hit me for both perl_run and PL_restartop */ 1211 /* somebody or something will hit me for both perl_run and PL_restartop */
1131 PL_restartop = PL_op; 1212 PL_restartop = PL_op;
1132 perl_run (PL_curinterp); 1213 perl_run (PL_curinterp);
1214 /*
1215 * Unfortunately, there is no way to get at the return values of the
1216 * coro body here, as perl_run destroys these
1217 */
1133 1218
1134 /* 1219 /*
1135 * If perl-run returns we assume exit() was being called or the coro 1220 * If perl-run returns we assume exit() was being called or the coro
1136 * fell off the end, which seems to be the only valid (non-bug) 1221 * fell off the end, which seems to be the only valid (non-bug)
1137 * reason for perl_run to return. We try to exit by jumping to the 1222 * reason for perl_run to return. We try to exit by jumping to the
1138 * bootstrap-time "top" top_env, as we cannot restore the "main" 1223 * bootstrap-time "top" top_env, as we cannot restore the "main"
1139 * coroutine as Coro has no such concept 1224 * coroutine as Coro has no such concept.
1225 * This actually isn't valid with the pthread backend, but OSes requiring
1226 * that backend are too broken to do it in a standards-compliant way.
1140 */ 1227 */
1141 PL_top_env = main_top_env; 1228 PL_top_env = main_top_env;
1142 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1229 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1143 } 1230 }
1144} 1231}
… …
1221cctx_destroy (coro_cctx *cctx) 1308cctx_destroy (coro_cctx *cctx)
1222{ 1309{
1223 if (!cctx) 1310 if (!cctx)
1224 return; 1311 return;
1225 1312
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1314
1226 --cctx_count; 1315 --cctx_count;
1227 coro_destroy (&cctx->cctx); 1316 coro_destroy (&cctx->cctx);
1228 1317
1229 /* coro_transfer creates new, empty cctx's */ 1318 /* coro_transfer creates new, empty cctx's */
1230 if (cctx->sptr) 1319 if (cctx->sptr)
… …
1293 /* TODO: throwing up here is considered harmful */ 1382 /* TODO: throwing up here is considered harmful */
1294 1383
1295 if (expect_true (prev != next)) 1384 if (expect_true (prev != next))
1296 { 1385 {
1297 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1298 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1387 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1299 1388
1300 if (expect_false (next->flags & CF_RUNNING)) 1389 if (expect_false (next->flags & CF_RUNNING))
1301 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1302 1391
1303 if (expect_false (next->flags & CF_DESTROYED)) 1392 if (expect_false (next->flags & CF_DESTROYED))
… …
1315transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1404transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1316{ 1405{
1317 dSTACKLEVEL; 1406 dSTACKLEVEL;
1318 1407
1319 /* sometimes transfer is only called to set idle_sp */ 1408 /* sometimes transfer is only called to set idle_sp */
1320 if (expect_false (!next)) 1409 if (expect_false (!prev))
1321 { 1410 {
1322 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1411 cctx_current->idle_sp = STACKLEVEL;
1323 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1412 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1324 } 1413 }
1325 else if (expect_true (prev != next)) 1414 else if (expect_true (prev != next))
1326 { 1415 {
1327 coro_cctx *prev__cctx; 1416 coro_cctx *cctx_prev;
1328 1417
1329 if (expect_false (prev->flags & CF_NEW)) 1418 if (expect_false (prev->flags & CF_NEW))
1330 { 1419 {
1331 /* create a new empty/source context */ 1420 /* create a new empty/source context */
1332 prev->cctx = cctx_new_empty ();
1333 prev->flags &= ~CF_NEW; 1421 prev->flags &= ~CF_NEW;
1334 prev->flags |= CF_RUNNING; 1422 prev->flags |= CF_RUNNING;
1335 } 1423 }
1336 1424
1337 prev->flags &= ~CF_RUNNING; 1425 prev->flags &= ~CF_RUNNING;
… …
1348 coro_setup (aTHX_ next); 1436 coro_setup (aTHX_ next);
1349 } 1437 }
1350 else 1438 else
1351 load_perl (aTHX_ next); 1439 load_perl (aTHX_ next);
1352 1440
1353 prev__cctx = prev->cctx;
1354
1355 /* possibly untie and reuse the cctx */ 1441 /* possibly untie and reuse the cctx */
1356 if (expect_true ( 1442 if (expect_true (
1357 prev__cctx->idle_sp == (void *)stacklevel 1443 cctx_current->idle_sp == STACKLEVEL
1358 && !(prev__cctx->flags & CC_TRACE) 1444 && !(cctx_current->flags & CC_TRACE)
1359 && !force_cctx 1445 && !force_cctx
1360 )) 1446 ))
1361 { 1447 {
1362 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1448 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1363 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1449 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1364 1450
1365 prev->cctx = 0;
1366
1367 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1451 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1368 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1452 /* without this the next cctx_get might destroy the running cctx while still in use */
1369 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1453 if (expect_false (CCTX_EXPIRED (cctx_current)))
1370 if (!next->cctx) 1454 if (expect_true (!next->cctx))
1371 next->cctx = cctx_get (aTHX); 1455 next->cctx = cctx_get (aTHX);
1372 1456
1373 cctx_put (prev__cctx); 1457 cctx_put (cctx_current);
1374 } 1458 }
1459 else
1460 prev->cctx = cctx_current;
1375 1461
1376 ++next->usecount; 1462 ++next->usecount;
1377 1463
1378 if (expect_true (!next->cctx)) 1464 cctx_prev = cctx_current;
1379 next->cctx = cctx_get (aTHX); 1465 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1380 1466
1381 if (expect_false (prev__cctx != next->cctx)) 1467 next->cctx = 0;
1468
1469 if (expect_false (cctx_prev != cctx_current))
1382 { 1470 {
1383 prev__cctx->top_env = PL_top_env; 1471 cctx_prev->top_env = PL_top_env;
1384 PL_top_env = next->cctx->top_env; 1472 PL_top_env = cctx_current->top_env;
1385 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1473 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1386 } 1474 }
1387 1475
1388 transfer_tail (aTHX); 1476 transfer_tail (aTHX);
1389 } 1477 }
1390} 1478}
… …
1412 --coro_nready; 1500 --coro_nready;
1413 } 1501 }
1414 else 1502 else
1415 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1503 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1416 1504
1417 if (coro->mainstack && coro->mainstack != main_mainstack) 1505 if (coro->mainstack
1506 && coro->mainstack != main_mainstack
1507 && coro->slot
1508 && !PL_dirty)
1418 { 1509 {
1419 struct coro temp; 1510 struct coro *current = SvSTATE_current;
1420 1511
1421 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1422 1513
1423 save_perl (aTHX_ &temp); 1514 save_perl (aTHX_ current);
1424 load_perl (aTHX_ coro); 1515 load_perl (aTHX_ coro);
1425 1516
1426 coro_destruct (aTHX_ coro); 1517 coro_destruct_perl (aTHX_ coro);
1427 1518
1428 load_perl (aTHX_ &temp); 1519 load_perl (aTHX_ current);
1429 1520
1430 coro->slot = 0; 1521 coro->slot = 0;
1431 } 1522 }
1432 1523
1433 cctx_destroy (coro->cctx); 1524 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv);
1434 SvREFCNT_dec (coro->args); 1526 SvREFCNT_dec (coro->args);
1527 SvREFCNT_dec (CORO_THROW);
1435 1528
1436 if (coro->next) coro->next->prev = coro->prev; 1529 if (coro->next) coro->next->prev = coro->prev;
1437 if (coro->prev) coro->prev->next = coro->next; 1530 if (coro->prev) coro->prev->next = coro->next;
1438 if (coro == coro_first) coro_first = coro->next; 1531 if (coro == coro_first) coro_first = coro->next;
1439 1532
… …
1493 1586
1494 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1495 TRANSFER (ta, 1); 1588 TRANSFER (ta, 1);
1496} 1589}
1497 1590
1591/*****************************************************************************/
1592/* gensub: simple closure generation utility */
1593
1594#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1595
1596/* create a closure from XS, returns a code reference */
1597/* the arg can be accessed via GENSUB_ARG from the callback */
1598/* the callback must use dXSARGS/XSRETURN */
1599static SV *
1600gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1601{
1602 CV *cv = (CV *)newSV (0);
1603
1604 sv_upgrade ((SV *)cv, SVt_PVCV);
1605
1606 CvANON_on (cv);
1607 CvISXSUB_on (cv);
1608 CvXSUB (cv) = xsub;
1609 GENSUB_ARG = arg;
1610
1611 return newRV_noinc ((SV *)cv);
1612}
1613
1498/** Coro ********************************************************************/ 1614/** Coro ********************************************************************/
1499 1615
1500INLINE void 1616INLINE void
1501coro_enq (pTHX_ struct coro *coro) 1617coro_enq (pTHX_ struct coro *coro)
1502{ 1618{
… …
1520{ 1636{
1521 struct coro *coro; 1637 struct coro *coro;
1522 SV *sv_hook; 1638 SV *sv_hook;
1523 void (*xs_hook)(void); 1639 void (*xs_hook)(void);
1524 1640
1525 if (SvROK (coro_sv))
1526 coro_sv = SvRV (coro_sv);
1527
1528 coro = SvSTATE (coro_sv); 1641 coro = SvSTATE (coro_sv);
1529 1642
1530 if (coro->flags & CF_READY) 1643 if (coro->flags & CF_READY)
1531 return 0; 1644 return 0;
1532 1645
… …
1563api_is_ready (pTHX_ SV *coro_sv) 1676api_is_ready (pTHX_ SV *coro_sv)
1564{ 1677{
1565 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1678 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1566} 1679}
1567 1680
1681/* expects to own a reference to next->hv */
1568INLINE void 1682INLINE void
1569prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1683prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1570{ 1684{
1571 SV *prev_sv, *next_sv;
1572
1573 for (;;)
1574 {
1575 next_sv = coro_deq (aTHX);
1576
1577 /* nothing to schedule: call the idle handler */
1578 if (expect_false (!next_sv))
1579 {
1580 dSP;
1581
1582 ENTER;
1583 SAVETMPS;
1584
1585 PUSHMARK (SP);
1586 PUTBACK;
1587 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1588
1589 FREETMPS;
1590 LEAVE;
1591 continue;
1592 }
1593
1594 ta->next = SvSTATE_hv (next_sv);
1595
1596 /* cannot transfer to destroyed coros, skip and look for next */
1597 if (expect_false (ta->next->flags & CF_DESTROYED))
1598 {
1599 SvREFCNT_dec (next_sv);
1600 /* coro_nready has already been taken care of by destroy */
1601 continue;
1602 }
1603
1604 --coro_nready;
1605 break;
1606 }
1607
1608 /* free this only after the transfer */
1609 prev_sv = SvRV (coro_current); 1685 SV *prev_sv = SvRV (coro_current);
1686
1610 ta->prev = SvSTATE_hv (prev_sv); 1687 ta->prev = SvSTATE_hv (prev_sv);
1688 ta->next = next;
1689
1611 TRANSFER_CHECK (*ta); 1690 TRANSFER_CHECK (*ta);
1612 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1691
1613 ta->next->flags &= ~CF_READY;
1614 SvRV_set (coro_current, next_sv); 1692 SvRV_set (coro_current, (SV *)next->hv);
1615 1693
1616 free_coro_mortal (aTHX); 1694 free_coro_mortal (aTHX);
1617 coro_mortal = prev_sv; 1695 coro_mortal = prev_sv;
1618} 1696}
1619 1697
1698static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{
1701 for (;;)
1702 {
1703 SV *next_sv = coro_deq (aTHX);
1704
1705 if (expect_true (next_sv))
1706 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1712 else
1713 {
1714 next->flags &= ~CF_READY;
1715 --coro_nready;
1716
1717 prepare_schedule_to (aTHX_ ta, next);
1718 break;
1719 }
1720 }
1721 else
1722 {
1723 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle)))
1726 {
1727 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1728 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready;
1730 }
1731 else
1732 {
1733 dSP;
1734
1735 ENTER;
1736 SAVETMPS;
1737
1738 PUSHMARK (SP);
1739 PUTBACK;
1740 call_sv (sv_idle, G_VOID | G_DISCARD);
1741
1742 FREETMPS;
1743 LEAVE;
1744 }
1745 }
1746 }
1747}
1748
1620INLINE void 1749INLINE void
1621prepare_cede (pTHX_ struct coro_transfer_args *ta) 1750prepare_cede (pTHX_ struct coro_transfer_args *ta)
1622{ 1751{
1623 api_ready (aTHX_ coro_current); 1752 api_ready (aTHX_ coro_current);
1624 prepare_schedule (aTHX_ ta); 1753 prepare_schedule (aTHX_ ta);
… …
1643{ 1772{
1644 struct coro_transfer_args ta; 1773 struct coro_transfer_args ta;
1645 1774
1646 prepare_schedule (aTHX_ &ta); 1775 prepare_schedule (aTHX_ &ta);
1647 TRANSFER (ta, 1); 1776 TRANSFER (ta, 1);
1777}
1778
1779static void
1780api_schedule_to (pTHX_ SV *coro_sv)
1781{
1782 struct coro_transfer_args ta;
1783 struct coro *next = SvSTATE (coro_sv);
1784
1785 SvREFCNT_inc_NN (coro_sv);
1786 prepare_schedule_to (aTHX_ &ta, next);
1648} 1787}
1649 1788
1650static int 1789static int
1651api_cede (pTHX) 1790api_cede (pTHX)
1652{ 1791{
… …
1681static void 1820static void
1682api_trace (pTHX_ SV *coro_sv, int flags) 1821api_trace (pTHX_ SV *coro_sv, int flags)
1683{ 1822{
1684 struct coro *coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1685 1824
1825 if (coro->flags & CF_RUNNING)
1826 croak ("cannot enable tracing on a running coroutine, caught");
1827
1686 if (flags & CC_TRACE) 1828 if (flags & CC_TRACE)
1687 { 1829 {
1688 if (!coro->cctx) 1830 if (!coro->cctx)
1689 coro->cctx = cctx_new_run (); 1831 coro->cctx = cctx_new_run ();
1690 else if (!(coro->cctx->flags & CC_TRACE)) 1832 else if (!(coro->cctx->flags & CC_TRACE))
1691 croak ("cannot enable tracing on coroutine with custom stack,"); 1833 croak ("cannot enable tracing on coroutine with custom stack, caught");
1692 1834
1693 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1835 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1694 } 1836 }
1695 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1837 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1696 { 1838 {
… …
1699 if (coro->flags & CF_RUNNING) 1841 if (coro->flags & CF_RUNNING)
1700 PL_runops = RUNOPS_DEFAULT; 1842 PL_runops = RUNOPS_DEFAULT;
1701 else 1843 else
1702 coro->slot->runops = RUNOPS_DEFAULT; 1844 coro->slot->runops = RUNOPS_DEFAULT;
1703 } 1845 }
1846}
1847
1848static void
1849coro_call_on_destroy (pTHX_ struct coro *coro)
1850{
1851 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1852 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1853
1854 if (on_destroyp)
1855 {
1856 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1857
1858 while (AvFILLp (on_destroy) >= 0)
1859 {
1860 dSP; /* don't disturb outer sp */
1861 SV *cb = av_pop (on_destroy);
1862
1863 PUSHMARK (SP);
1864
1865 if (statusp)
1866 {
1867 int i;
1868 AV *status = (AV *)SvRV (*statusp);
1869 EXTEND (SP, AvFILLp (status) + 1);
1870
1871 for (i = 0; i <= AvFILLp (status); ++i)
1872 PUSHs (AvARRAY (status)[i]);
1873 }
1874
1875 PUTBACK;
1876 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1877 }
1878 }
1879}
1880
1881static void
1882slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1883{
1884 int i;
1885 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV ();
1887
1888 av_extend (av, items - 1);
1889 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i]));
1891
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1893
1894 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1895 api_ready (aTHX_ sv_manager);
1896
1897 frame->prepare = prepare_schedule;
1898 frame->check = slf_check_repeat;
1899
1900 /* as a minor optimisation, we could unwind all stacks here */
1901 /* but that puts extra pressure on pp_slf, and is not worth much */
1902 /*coro_unwind_stacks (aTHX);*/
1903}
1904
1905/*****************************************************************************/
1906/* async pool handler */
1907
1908static int
1909slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1910{
1911 HV *hv = (HV *)SvRV (coro_current);
1912 struct coro *coro = (struct coro *)frame->data;
1913
1914 if (!coro->invoke_cb)
1915 return 1; /* loop till we have invoke */
1916 else
1917 {
1918 hv_store (hv, "desc", sizeof ("desc") - 1,
1919 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1920
1921 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1922
1923 {
1924 dSP;
1925 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1926 PUTBACK;
1927 }
1928
1929 SvREFCNT_dec (GvAV (PL_defgv));
1930 GvAV (PL_defgv) = coro->invoke_av;
1931 coro->invoke_av = 0;
1932
1933 return 0;
1934 }
1935}
1936
1937static void
1938slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1939{
1940 HV *hv = (HV *)SvRV (coro_current);
1941 struct coro *coro = SvSTATE_hv ((SV *)hv);
1942
1943 if (expect_true (coro->saved_deffh))
1944 {
1945 /* subsequent iteration */
1946 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1947 coro->saved_deffh = 0;
1948
1949 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1950 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1951 {
1952 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1953 coro->invoke_av = newAV ();
1954
1955 frame->prepare = prepare_nop;
1956 }
1957 else
1958 {
1959 av_clear (GvAV (PL_defgv));
1960 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1961
1962 coro->prio = 0;
1963
1964 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1965 api_trace (aTHX_ coro_current, 0);
1966
1967 frame->prepare = prepare_schedule;
1968 av_push (av_async_pool, SvREFCNT_inc (hv));
1969 }
1970 }
1971 else
1972 {
1973 /* first iteration, simply fall through */
1974 frame->prepare = prepare_nop;
1975 }
1976
1977 frame->check = slf_check_pool_handler;
1978 frame->data = (void *)coro;
1979}
1980
1981/*****************************************************************************/
1982/* rouse callback */
1983
1984#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1985
1986static void
1987coro_rouse_callback (pTHX_ CV *cv)
1988{
1989 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG;
1991
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 {
1994 /* first call, set args */
1995 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997
1998 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001
2002 /* better take a full copy of the arguments */
2003 while (items--)
2004 av_store (av, items, newSVsv (ST (items)));
2005 }
2006
2007 XSRETURN_EMPTY;
2008}
2009
2010static int
2011slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2012{
2013 SV *data = (SV *)frame->data;
2014
2015 if (CORO_THROW)
2016 return 0;
2017
2018 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2019 return 1;
2020
2021 /* now push all results on the stack */
2022 {
2023 dSP;
2024 AV *av = (AV *)SvRV (data);
2025 int i;
2026
2027 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030
2031 /* we have stolen the elements, so ste length to zero and free */
2032 AvFILLp (av) = -1;
2033 av_undef (av);
2034
2035 PUTBACK;
2036 }
2037
2038 return 0;
2039}
2040
2041static void
2042slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2043{
2044 SV *cb;
2045
2046 if (items)
2047 cb = arg [0];
2048 else
2049 {
2050 struct coro *coro = SvSTATE_current;
2051
2052 if (!coro->rouse_cb)
2053 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2054
2055 cb = sv_2mortal (coro->rouse_cb);
2056 coro->rouse_cb = 0;
2057 }
2058
2059 if (!SvROK (cb)
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,");
2063
2064 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG;
2067
2068 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait;
2071 }
2072}
2073
2074static SV *
2075coro_new_rouse_cb (pTHX)
2076{
2077 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2081
2082 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */
2084
2085 SvREFCNT_dec (coro->rouse_cb);
2086 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2087
2088 return cb;
1704} 2089}
1705 2090
1706/*****************************************************************************/ 2091/*****************************************************************************/
1707/* schedule-like-function opcode (SLF) */ 2092/* schedule-like-function opcode (SLF) */
1708 2093
… …
1755static void 2140static void
1756slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2141slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1757{ 2142{
1758 frame->prepare = prepare_schedule; 2143 frame->prepare = prepare_schedule;
1759 frame->check = slf_check_nop; 2144 frame->check = slf_check_nop;
2145}
2146
2147static void
2148slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2149{
2150 struct coro *next = (struct coro *)slf_frame.data;
2151
2152 SvREFCNT_inc_NN (next->hv);
2153 prepare_schedule_to (aTHX_ ta, next);
2154}
2155
2156static void
2157slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2158{
2159 if (!items)
2160 croak ("Coro::schedule_to expects a coroutine argument, caught");
2161
2162 frame->data = (void *)SvSTATE (arg [0]);
2163 frame->prepare = slf_prepare_schedule_to;
2164 frame->check = slf_check_nop;
2165}
2166
2167static void
2168slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2169{
2170 api_ready (aTHX_ SvRV (coro_current));
2171
2172 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1760} 2173}
1761 2174
1762static void 2175static void
1763slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1764{ 2177{
… …
1835 } 2248 }
1836 while (slf_frame.check (aTHX_ &slf_frame)); 2249 while (slf_frame.check (aTHX_ &slf_frame));
1837 2250
1838 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2251 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1839 2252
2253 /* exception handling */
2254 if (expect_false (CORO_THROW))
2255 {
2256 SV *exception = sv_2mortal (CORO_THROW);
2257
2258 CORO_THROW = 0;
2259 sv_setsv (ERRSV, exception);
2260 croak (0);
2261 }
2262
1840 /* return value handling - mostly like entersub */ 2263 /* return value handling - mostly like entersub */
1841 /* make sure we put something on the stack in scalar context */ 2264 /* make sure we put something on the stack in scalar context */
1842 if (GIMME_V == G_SCALAR) 2265 if (GIMME_V == G_SCALAR)
1843 { 2266 {
1844 dSP; 2267 dSP;
… …
1850 bot [1] = *sp; 2273 bot [1] = *sp;
1851 2274
1852 SP = bot + 1; 2275 SP = bot + 1;
1853 2276
1854 PUTBACK; 2277 PUTBACK;
1855 }
1856
1857 /* exception handling */
1858 if (expect_false (coro_throw))
1859 {
1860 SV *exception = sv_2mortal (coro_throw);
1861
1862 coro_throw = 0;
1863 sv_setsv (ERRSV, exception);
1864 croak (0);
1865 } 2278 }
1866 2279
1867 return NORMAL; 2280 return NORMAL;
1868} 2281}
1869 2282
… …
1910 } 2323 }
1911 else 2324 else
1912 slf_argc = 0; 2325 slf_argc = 0;
1913 2326
1914 PL_op->op_ppaddr = pp_slf; 2327 PL_op->op_ppaddr = pp_slf;
1915 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2328 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1916 2329
1917 PL_op = (OP *)&slf_restore; 2330 PL_op = (OP *)&slf_restore;
2331}
2332
2333/*****************************************************************************/
2334/* dynamic wind */
2335
2336static void
2337on_enterleave_call (pTHX_ SV *cb)
2338{
2339 dSP;
2340
2341 PUSHSTACK;
2342
2343 PUSHMARK (SP);
2344 PUTBACK;
2345 call_sv (cb, G_VOID | G_DISCARD);
2346 SPAGAIN;
2347
2348 POPSTACK;
2349}
2350
2351static SV *
2352coro_avp_pop_and_free (AV **avp)
2353{
2354 AV *av = *avp;
2355 SV *res = av_pop (av);
2356
2357 if (AvFILLp (av) < 0)
2358 {
2359 *avp = 0;
2360 SvREFCNT_dec (av);
2361 }
2362
2363 return res;
2364}
2365
2366static void
2367coro_pop_on_enter (pTHX_ void *coro)
2368{
2369 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_enter);
2370 SvREFCNT_dec (cb);
2371}
2372
2373static void
2374coro_pop_on_leave (pTHX_ void *coro)
2375{
2376 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_leave);
2377 on_enterleave_call (sv_2mortal (cb));
1918} 2378}
1919 2379
1920/*****************************************************************************/ 2380/*****************************************************************************/
1921/* PerlIO::cede */ 2381/* PerlIO::cede */
1922 2382
… …
1991 PerlIOBuf_get_cnt, 2451 PerlIOBuf_get_cnt,
1992 PerlIOBuf_set_ptrcnt, 2452 PerlIOBuf_set_ptrcnt,
1993}; 2453};
1994 2454
1995/*****************************************************************************/ 2455/*****************************************************************************/
2456/* Coro::Semaphore & Coro::Signal */
2457
2458static SV *
2459coro_waitarray_new (pTHX_ int count)
2460{
2461 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2462 AV *av = newAV ();
2463 SV **ary;
2464
2465 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *);
2467 AvALLOC (av) = ary;
2468#if PERL_VERSION_ATLEAST (5,10,0)
2469 AvARRAY (av) = ary;
2470#else
2471 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2472 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2473 SvPVX ((SV *)av) = (char *)ary;
2474#endif
2475 AvMAX (av) = 1;
2476 AvFILLp (av) = 0;
2477 ary [0] = newSViv (count);
2478
2479 return newRV_noinc ((SV *)av);
2480}
2481
1996/* Coro::Semaphore */ 2482/* semaphore */
1997 2483
1998static void 2484static void
1999coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2485coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2000{ 2486{
2001 SV *count_sv = AvARRAY (av)[0]; 2487 SV *count_sv = AvARRAY (av)[0];
… …
2013 AvARRAY (av)[0] = AvARRAY (av)[1]; 2499 AvARRAY (av)[0] = AvARRAY (av)[1];
2014 AvARRAY (av)[1] = count_sv; 2500 AvARRAY (av)[1] = count_sv;
2015 cb = av_shift (av); 2501 cb = av_shift (av);
2016 2502
2017 if (SvOBJECT (cb)) 2503 if (SvOBJECT (cb))
2504 {
2018 api_ready (aTHX_ cb); 2505 api_ready (aTHX_ cb);
2019 else 2506 --count;
2020 croak ("callbacks not yet supported"); 2507 }
2508 else if (SvTYPE (cb) == SVt_PVCV)
2509 {
2510 dSP;
2511 PUSHMARK (SP);
2512 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2513 PUTBACK;
2514 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2515 }
2021 2516
2022 SvREFCNT_dec (cb); 2517 SvREFCNT_dec (cb);
2023
2024 --count;
2025 } 2518 }
2026} 2519}
2027 2520
2028static void 2521static void
2029coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2522coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2031 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2524 /* call $sem->adjust (0) to possibly wake up some other waiters */
2032 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2525 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2033} 2526}
2034 2527
2035static int 2528static int
2036slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2529slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2037{ 2530{
2038 AV *av = (AV *)frame->data; 2531 AV *av = (AV *)frame->data;
2039 SV *count_sv = AvARRAY (av)[0]; 2532 SV *count_sv = AvARRAY (av)[0];
2040 2533
2534 /* if we are about to throw, don't actually acquire the lock, just throw */
2535 if (CORO_THROW)
2536 return 0;
2041 if (SvIVX (count_sv) > 0) 2537 else if (SvIVX (count_sv) > 0)
2042 { 2538 {
2043 SvSTATE_current->on_destroy = 0; 2539 SvSTATE_current->on_destroy = 0;
2540
2541 if (acquire)
2044 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2542 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2543 else
2544 coro_semaphore_adjust (aTHX_ av, 0);
2545
2045 return 0; 2546 return 0;
2046 } 2547 }
2047 else 2548 else
2048 { 2549 {
2049 int i; 2550 int i;
… …
2058 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2559 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2059 return 1; 2560 return 1;
2060 } 2561 }
2061} 2562}
2062 2563
2063static void 2564static int
2565slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2566{
2567 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2568}
2569
2570static int
2571slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2572{
2573 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2574}
2575
2576static void
2064slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2577slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2065{ 2578{
2066 AV *av = (AV *)SvRV (arg [0]); 2579 AV *av = (AV *)SvRV (arg [0]);
2067 2580
2068 if (SvIVX (AvARRAY (av)[0]) > 0) 2581 if (SvIVX (AvARRAY (av)[0]) > 0)
2069 { 2582 {
2070 frame->data = (void *)av; 2583 frame->data = (void *)av;
2071 frame->prepare = prepare_nop; 2584 frame->prepare = prepare_nop;
2072 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2073 } 2585 }
2074 else 2586 else
2075 { 2587 {
2076 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2588 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2077 2589
2078 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2590 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2079 frame->prepare = prepare_schedule; 2591 frame->prepare = prepare_schedule;
2080 2592
2081 /* to avoid race conditions when a woken-up coro gets terminated */ 2593 /* to avoid race conditions when a woken-up coro gets terminated */
2082 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2594 /* we arrange for a temporary on_destroy that calls adjust (0) */
2083 assert (!SvSTATE_current->on_destroy);//D
2084 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2595 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2085 } 2596 }
2597}
2086 2598
2599static void
2600slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2601{
2602 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2087 frame->check = slf_check_semaphore_down; 2603 frame->check = slf_check_semaphore_down;
2088
2089} 2604}
2090 2605
2091/*****************************************************************************/ 2606static void
2092/* gensub: simple closure generation utility */ 2607slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093
2094#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2095
2096/* create a closure from XS, returns a code reference */
2097/* the arg can be accessed via GENSUB_ARG from the callback */
2098/* the callback must use dXSARGS/XSRETURN */
2099static SV *
2100gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2101{ 2608{
2102 CV *cv = (CV *)newSV (0); 2609 if (items >= 2)
2610 {
2611 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2103 2614
2104 sv_upgrade ((SV *)cv, SVt_PVCV); 2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2105 2616
2106 CvANON_on (cv); 2617 if (SvIVX (AvARRAY (av)[0]) > 0)
2107 CvISXSUB_on (cv); 2618 coro_semaphore_adjust (aTHX_ av, 0);
2108 CvXSUB (cv) = xsub;
2109 GENSUB_ARG = arg;
2110 2619
2111 return newRV_noinc ((SV *)cv); 2620 frame->prepare = prepare_nop;
2621 frame->check = slf_check_nop;
2622 }
2623 else
2624 {
2625 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2626 frame->check = slf_check_semaphore_wait;
2627 }
2628}
2629
2630/* signal */
2631
2632static void
2633coro_signal_wake (pTHX_ AV *av, int count)
2634{
2635 SvIVX (AvARRAY (av)[0]) = 0;
2636
2637 /* now signal count waiters */
2638 while (count > 0 && AvFILLp (av) > 0)
2639 {
2640 SV *cb;
2641
2642 /* swap first two elements so we can shift a waiter */
2643 cb = AvARRAY (av)[0];
2644 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb;
2646
2647 cb = av_shift (av);
2648
2649 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */
2651 SvREFCNT_dec (cb);
2652
2653 --count;
2654 }
2655}
2656
2657static int
2658slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2659{
2660 /* if we are about to throw, also stop waiting */
2661 return SvROK ((SV *)frame->data) && !CORO_THROW;
2662}
2663
2664static void
2665slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2666{
2667 AV *av = (AV *)SvRV (arg [0]);
2668
2669 if (SvIVX (AvARRAY (av)[0]))
2670 {
2671 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop;
2674 }
2675 else
2676 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */
2678
2679 av_push (av, waiter);
2680
2681 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2682 frame->prepare = prepare_schedule;
2683 frame->check = slf_check_signal_wait;
2684 }
2112} 2685}
2113 2686
2114/*****************************************************************************/ 2687/*****************************************************************************/
2115/* Coro::AIO */ 2688/* Coro::AIO */
2116 2689
… …
2131 dXSARGS; 2704 dXSARGS;
2132 AV *state = (AV *)GENSUB_ARG; 2705 AV *state = (AV *)GENSUB_ARG;
2133 SV *coro = av_pop (state); 2706 SV *coro = av_pop (state);
2134 SV *data_sv = newSV (sizeof (struct io_state)); 2707 SV *data_sv = newSV (sizeof (struct io_state));
2135 2708
2136 av_extend (state, items); 2709 av_extend (state, items - 1);
2137 2710
2138 sv_upgrade (data_sv, SVt_PV); 2711 sv_upgrade (data_sv, SVt_PV);
2139 SvCUR_set (data_sv, sizeof (struct io_state)); 2712 SvCUR_set (data_sv, sizeof (struct io_state));
2140 SvPOK_only (data_sv); 2713 SvPOK_only (data_sv);
2141 2714
… …
2166static int 2739static int
2167slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2740slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2168{ 2741{
2169 AV *state = (AV *)frame->data; 2742 AV *state = (AV *)frame->data;
2170 2743
2744 /* if we are about to throw, return early */
2745 /* this does not cancel the aio request, but at least */
2746 /* it quickly returns */
2747 if (CORO_THROW)
2748 return 0;
2749
2171 /* one element that is an RV? repeat! */ 2750 /* one element that is an RV? repeat! */
2172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2751 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2173 return 1; 2752 return 1;
2174 2753
2175 /* restore status */ 2754 /* restore status */
… …
2270 XSRETURN_EMPTY; 2849 XSRETURN_EMPTY;
2271} 2850}
2272 2851
2273/*****************************************************************************/ 2852/*****************************************************************************/
2274 2853
2854#if CORO_CLONE
2855# include "clone.c"
2856#endif
2857
2275MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2276 2859
2277PROTOTYPES: DISABLE 2860PROTOTYPES: DISABLE
2278 2861
2279BOOT: 2862BOOT:
… …
2283 coro_thx = PERL_GET_CONTEXT; 2866 coro_thx = PERL_GET_CONTEXT;
2284# endif 2867# endif
2285#endif 2868#endif
2286 BOOT_PAGESIZE; 2869 BOOT_PAGESIZE;
2287 2870
2871 cctx_current = cctx_new_empty ();
2872
2288 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2873 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2289 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2874 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2290 2875
2291 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2876 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2292 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2877 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2311 2896
2312 { 2897 {
2313 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2898 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2314 2899
2315 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2900 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2316 hv_store_ent (PL_custom_op_names, slf, 2901 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2317 newSVpv ("coro_slf", 0), 0);
2318 2902
2319 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2903 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2320 hv_store_ent (PL_custom_op_descs, slf, 2904 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2321 newSVpv ("coro schedule like function", 0), 0);
2322 } 2905 }
2323 2906
2324 coroapi.ver = CORO_API_VERSION; 2907 coroapi.ver = CORO_API_VERSION;
2325 coroapi.rev = CORO_API_REVISION; 2908 coroapi.rev = CORO_API_REVISION;
2326 2909
… …
2345 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2346} 2929}
2347 2930
2348SV * 2931SV *
2349new (char *klass, ...) 2932new (char *klass, ...)
2933 ALIAS:
2934 Coro::new = 1
2350 CODE: 2935 CODE:
2351{ 2936{
2352 struct coro *coro; 2937 struct coro *coro;
2353 MAGIC *mg; 2938 MAGIC *mg;
2354 HV *hv; 2939 HV *hv;
2940 CV *cb;
2355 int i; 2941 int i;
2942
2943 if (items > 1)
2944 {
2945 cb = coro_sv_2cv (aTHX_ ST (1));
2946
2947 if (!ix)
2948 {
2949 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2951
2952 if (!CvROOT (cb))
2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2955 }
2356 2956
2357 Newz (0, coro, 1, struct coro); 2957 Newz (0, coro, 1, struct coro);
2358 coro->args = newAV (); 2958 coro->args = newAV ();
2359 coro->flags = CF_NEW; 2959 coro->flags = CF_NEW;
2360 2960
… …
2365 coro->hv = hv = newHV (); 2965 coro->hv = hv = newHV ();
2366 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2966 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2367 mg->mg_flags |= MGf_DUP; 2967 mg->mg_flags |= MGf_DUP;
2368 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2369 2969
2970 if (items > 1)
2971 {
2370 av_extend (coro->args, items - 1); 2972 av_extend (coro->args, items - 1 + ix - 1);
2973
2974 if (ix)
2975 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run;
2978 }
2979
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981
2371 for (i = 1; i < items; i++) 2982 for (i = 2; i < items; i++)
2372 av_push (coro->args, newSVsv (ST (i))); 2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2373} 2985}
2374 OUTPUT: 2986 OUTPUT:
2375 RETVAL 2987 RETVAL
2376 2988
2377void 2989void
… …
2390void 3002void
2391_exit (int code) 3003_exit (int code)
2392 PROTOTYPE: $ 3004 PROTOTYPE: $
2393 CODE: 3005 CODE:
2394 _exit (code); 3006 _exit (code);
3007
3008SV *
3009clone (Coro::State coro)
3010 CODE:
3011{
3012#if CORO_CLONE
3013 struct coro *ncoro = coro_clone (aTHX_ coro);
3014 MAGIC *mg;
3015 /* TODO: too much duplication */
3016 ncoro->hv = newHV ();
3017 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3018 mg->mg_flags |= MGf_DUP;
3019 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3020#else
3021 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3022#endif
3023}
3024 OUTPUT:
3025 RETVAL
2395 3026
2396int 3027int
2397cctx_stacksize (int new_stacksize = 0) 3028cctx_stacksize (int new_stacksize = 0)
2398 PROTOTYPE: ;$ 3029 PROTOTYPE: ;$
2399 CODE: 3030 CODE:
… …
2449 eval = 1 3080 eval = 1
2450 CODE: 3081 CODE:
2451{ 3082{
2452 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2453 { 3084 {
2454 struct coro temp; 3085 struct coro *current = SvSTATE_current;
2455 3086
2456 if (!(coro->flags & CF_RUNNING)) 3087 if (current != coro)
2457 { 3088 {
2458 PUTBACK; 3089 PUTBACK;
2459 save_perl (aTHX_ &temp); 3090 save_perl (aTHX_ current);
2460 load_perl (aTHX_ coro); 3091 load_perl (aTHX_ coro);
3092 SPAGAIN;
2461 } 3093 }
2462 3094
2463 {
2464 dSP;
2465 ENTER;
2466 SAVETMPS;
2467 PUTBACK;
2468 PUSHSTACK; 3095 PUSHSTACK;
3096
2469 PUSHMARK (SP); 3097 PUSHMARK (SP);
3098 PUTBACK;
2470 3099
2471 if (ix) 3100 if (ix)
2472 eval_sv (coderef, 0); 3101 eval_sv (coderef, 0);
2473 else 3102 else
2474 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2475 3104
3105 SPAGAIN;
2476 POPSTACK; 3106 POPSTACK;
2477 SPAGAIN;
2478 FREETMPS;
2479 LEAVE;
2480 PUTBACK;
2481 }
2482 3107
2483 if (!(coro->flags & CF_RUNNING)) 3108 if (current != coro)
2484 { 3109 {
3110 PUTBACK;
2485 save_perl (aTHX_ coro); 3111 save_perl (aTHX_ coro);
2486 load_perl (aTHX_ &temp); 3112 load_perl (aTHX_ current);
2487 SPAGAIN; 3113 SPAGAIN;
2488 } 3114 }
2489 } 3115 }
2490} 3116}
2491 3117
… …
2506throw (Coro::State self, SV *throw = &PL_sv_undef) 3132throw (Coro::State self, SV *throw = &PL_sv_undef)
2507 PROTOTYPE: $;$ 3133 PROTOTYPE: $;$
2508 CODE: 3134 CODE:
2509{ 3135{
2510 struct coro *current = SvSTATE_current; 3136 struct coro *current = SvSTATE_current;
2511 SV **throwp = self == current ? &coro_throw : &self->throw; 3137 SV **throwp = self == current ? &CORO_THROW : &self->except;
2512 SvREFCNT_dec (*throwp); 3138 SvREFCNT_dec (*throwp);
2513 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2514} 3140}
2515 3141
2516void 3142void
… …
2520 3146
2521SV * 3147SV *
2522has_cctx (Coro::State coro) 3148has_cctx (Coro::State coro)
2523 PROTOTYPE: $ 3149 PROTOTYPE: $
2524 CODE: 3150 CODE:
2525 RETVAL = boolSV (!!coro->cctx); 3151 /* maybe manage the running flag differently */
3152 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2526 OUTPUT: 3153 OUTPUT:
2527 RETVAL 3154 RETVAL
2528 3155
2529int 3156int
2530is_traced (Coro::State coro) 3157is_traced (Coro::State coro)
… …
2550 3177
2551void 3178void
2552force_cctx () 3179force_cctx ()
2553 PROTOTYPE: 3180 PROTOTYPE:
2554 CODE: 3181 CODE:
2555 SvSTATE_current->cctx->idle_sp = 0; 3182 cctx_current->idle_sp = 0;
2556 3183
2557void 3184void
2558swap_defsv (Coro::State self) 3185swap_defsv (Coro::State self)
2559 PROTOTYPE: $ 3186 PROTOTYPE: $
2560 ALIAS: 3187 ALIAS:
… …
2575 3202
2576BOOT: 3203BOOT:
2577{ 3204{
2578 int i; 3205 int i;
2579 3206
2580 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2581 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2582 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2583 3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2584 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2585 SvREADONLY_on (coro_current); 3212 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3213 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3214 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216
3217 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3220 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2586 3221
2587 coro_stash = gv_stashpv ("Coro", TRUE); 3222 coro_stash = gv_stashpv ("Coro", TRUE);
2588 3223
2589 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2590 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2598 3233
2599 { 3234 {
2600 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2601 3236
2602 coroapi.schedule = api_schedule; 3237 coroapi.schedule = api_schedule;
3238 coroapi.schedule_to = api_schedule_to;
2603 coroapi.cede = api_cede; 3239 coroapi.cede = api_cede;
2604 coroapi.cede_notself = api_cede_notself; 3240 coroapi.cede_notself = api_cede_notself;
2605 coroapi.ready = api_ready; 3241 coroapi.ready = api_ready;
2606 coroapi.is_ready = api_is_ready; 3242 coroapi.is_ready = api_is_ready;
2607 coroapi.nready = coro_nready; 3243 coroapi.nready = coro_nready;
2608 coroapi.current = coro_current; 3244 coroapi.current = coro_current;
2609 3245
2610 GCoroAPI = &coroapi; 3246 /*GCoroAPI = &coroapi;*/
2611 sv_setiv (sv, (IV)&coroapi); 3247 sv_setiv (sv, (IV)&coroapi);
2612 SvREADONLY_on (sv); 3248 SvREADONLY_on (sv);
2613 } 3249 }
2614} 3250}
3251
3252void
3253terminate (...)
3254 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2615 3256
2616void 3257void
2617schedule (...) 3258schedule (...)
2618 CODE: 3259 CODE:
2619 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3260 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2620 3261
2621void 3262void
3263schedule_to (...)
3264 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3266
3267void
3268cede_to (...)
3269 CODE:
3270 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3271
3272void
2622cede (...) 3273cede (...)
2623 CODE: 3274 CODE:
2624 CORO_EXECUTE_SLF_XS (slf_init_cede); 3275 CORO_EXECUTE_SLF_XS (slf_init_cede);
2625 3276
2626void 3277void
2627cede_notself (...) 3278cede_notself (...)
2628 CODE: 3279 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281
3282void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
2630 3287
2631void 3288void
2632_set_current (SV *current) 3289_set_current (SV *current)
2633 PROTOTYPE: $ 3290 PROTOTYPE: $
2634 CODE: 3291 CODE:
… …
2679 CODE: 3336 CODE:
2680 RETVAL = coro_nready; 3337 RETVAL = coro_nready;
2681 OUTPUT: 3338 OUTPUT:
2682 RETVAL 3339 RETVAL
2683 3340
2684# for async_pool speedup
2685void 3341void
2686_pool_1 (SV *cb) 3342_pool_handler (...)
2687 CODE: 3343 CODE:
2688{ 3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2689 HV *hv = (HV *)SvRV (coro_current);
2690 struct coro *coro = SvSTATE_hv ((SV *)hv);
2691 AV *defav = GvAV (PL_defgv);
2692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2693 AV *invoke_av;
2694 int i, len;
2695 3345
2696 if (!invoke) 3346void
3347async_pool (SV *cv, ...)
3348 PROTOTYPE: &@
3349 PPCODE:
3350{
3351 HV *hv = (HV *)av_pop (av_async_pool);
3352 AV *av = newAV ();
3353 SV *cb = ST (0);
3354 int i;
3355
3356 av_extend (av, items - 2);
3357 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359
3360 if ((SV *)hv == &PL_sv_undef)
2697 { 3361 {
2698 SV *old = PL_diehook; 3362 PUSHMARK (SP);
2699 PL_diehook = 0; 3363 EXTEND (SP, 2);
2700 SvREFCNT_dec (old); 3364 PUSHs (sv_Coro);
2701 croak ("\3async_pool terminate\2\n"); 3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2702 } 3371 }
2703 3372
2704 SvREFCNT_dec (coro->saved_deffh);
2705 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2706
2707 hv_store (hv, "desc", sizeof ("desc") - 1,
2708 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2709
2710 invoke_av = (AV *)SvRV (invoke);
2711 len = av_len (invoke_av);
2712
2713 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2714
2715 if (len > 0)
2716 { 3373 {
2717 av_fill (defav, len - 1); 3374 struct coro *coro = SvSTATE_hv (hv);
2718 for (i = 0; i < len; ++i) 3375
2719 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3376 assert (!coro->invoke_cb);
3377 assert (!coro->invoke_av);
3378 coro->invoke_cb = SvREFCNT_inc (cb);
3379 coro->invoke_av = av;
2720 } 3380 }
3381
3382 api_ready (aTHX_ (SV *)hv);
3383
3384 if (GIMME_V != G_VOID)
3385 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3386 else
3387 SvREFCNT_dec (hv);
2721} 3388}
3389
3390SV *
3391rouse_cb ()
3392 PROTOTYPE:
3393 CODE:
3394 RETVAL = coro_new_rouse_cb (aTHX);
3395 OUTPUT:
3396 RETVAL
2722 3397
2723void 3398void
2724_pool_2 (SV *cb) 3399rouse_wait (...)
3400 PROTOTYPE: ;$
3401 PPCODE:
3402 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3403
3404void
3405on_enter (SV *block)
3406 ALIAS:
3407 on_leave = 1
3408 PROTOTYPE: &
2725 CODE: 3409 CODE:
2726{ 3410{
2727 HV *hv = (HV *)SvRV (coro_current);
2728 struct coro *coro = SvSTATE_hv ((SV *)hv); 3411 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2729 3413
2730 sv_setsv (cb, &PL_sv_undef); 3414 block = (SV *)coro_sv_2cv (block);
2731 3415
2732 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3416 if (!*avp)
2733 coro->saved_deffh = 0; 3417 *avp = newAV ();
2734 3418
2735 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3419 av_push (*avp, SvREFCNT_inc (block));
2736 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2737 {
2738 SV *old = PL_diehook;
2739 PL_diehook = 0;
2740 SvREFCNT_dec (old);
2741 croak ("\3async_pool terminate\2\n");
2742 }
2743 3420
2744 av_clear (GvAV (PL_defgv)); 3421 if (!ix)
2745 hv_store (hv, "desc", sizeof ("desc") - 1, 3422 on_enterleave_call (aTHX_ block);
2746 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2747 3423
2748 coro->prio = 0; 3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
2749 3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2750 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
2751 api_trace (aTHX_ coro_current, 0);
2752
2753 av_push (av_async_pool, newSVsv (coro_current));
2754} 3427}
2755 3428
2756 3429
2757MODULE = Coro::State PACKAGE = PerlIO::cede 3430MODULE = Coro::State PACKAGE = PerlIO::cede
2758 3431
… …
2761 3434
2762 3435
2763MODULE = Coro::State PACKAGE = Coro::Semaphore 3436MODULE = Coro::State PACKAGE = Coro::Semaphore
2764 3437
2765SV * 3438SV *
2766new (SV *klass, SV *count_ = 0) 3439new (SV *klass, SV *count = 0)
2767 CODE: 3440 CODE:
2768{ 3441 RETVAL = sv_bless (
2769 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),
2770 AV *av = newAV (); 3443 GvSTASH (CvGV (cv))
2771 SV **ary; 3444 );
3445 OUTPUT:
3446 RETVAL
2772 3447
2773 /* unfortunately, building manually saves memory */ 3448# helper for Coro::Channel
2774 Newx (ary, 2, SV *); 3449SV *
2775 AvALLOC (av) = ary; 3450_alloc (int count)
2776 AvARRAY (av) = ary; 3451 CODE:
2777 AvMAX (av) = 1; 3452 RETVAL = coro_waitarray_new (aTHX_ count);
2778 AvFILLp (av) = 0;
2779 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2780
2781 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2782}
2783 OUTPUT: 3453 OUTPUT:
2784 RETVAL 3454 RETVAL
2785 3455
2786SV * 3456SV *
2787count (SV *self) 3457count (SV *self)
… …
2796 adjust = 1 3466 adjust = 1
2797 CODE: 3467 CODE:
2798 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3468 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2799 3469
2800void 3470void
2801down (SV *self) 3471down (...)
2802 CODE: 3472 CODE:
2803 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3473 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3474
3475void
3476wait (...)
3477 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2804 3479
2805void 3480void
2806try (SV *self) 3481try (SV *self)
2807 PPCODE: 3482 PPCODE:
2808{ 3483{
… …
2820 XSRETURN_NO; 3495 XSRETURN_NO;
2821} 3496}
2822 3497
2823void 3498void
2824waiters (SV *self) 3499waiters (SV *self)
2825 CODE: 3500 PPCODE:
2826{ 3501{
2827 AV *av = (AV *)SvRV (self); 3502 AV *av = (AV *)SvRV (self);
3503 int wcount = AvFILLp (av) + 1 - 1;
2828 3504
2829 if (GIMME_V == G_SCALAR) 3505 if (GIMME_V == G_SCALAR)
2830 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3506 XPUSHs (sv_2mortal (newSViv (wcount)));
2831 else 3507 else
2832 { 3508 {
2833 int i; 3509 int i;
2834 EXTEND (SP, AvFILLp (av) + 1 - 1); 3510 EXTEND (SP, wcount);
2835 for (i = 1; i <= AvFILLp (av); ++i) 3511 for (i = 1; i <= wcount; ++i)
2836 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2837 } 3513 }
2838} 3514}
3515
3516MODULE = Coro::State PACKAGE = Coro::Signal
3517
3518SV *
3519new (SV *klass)
3520 CODE:
3521 RETVAL = sv_bless (
3522 coro_waitarray_new (aTHX_ 0),
3523 GvSTASH (CvGV (cv))
3524 );
3525 OUTPUT:
3526 RETVAL
3527
3528void
3529wait (...)
3530 CODE:
3531 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3532
3533void
3534broadcast (SV *self)
3535 CODE:
3536{
3537 AV *av = (AV *)SvRV (self);
3538 coro_signal_wake (aTHX_ av, AvFILLp (av));
3539}
3540
3541void
3542send (SV *self)
3543 CODE:
3544{
3545 AV *av = (AV *)SvRV (self);
3546
3547 if (AvFILLp (av))
3548 coro_signal_wake (aTHX_ av, 1);
3549 else
3550 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3551}
3552
3553IV
3554awaited (SV *self)
3555 CODE:
3556 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3557 OUTPUT:
3558 RETVAL
2839 3559
2840 3560
2841MODULE = Coro::State PACKAGE = Coro::AnyEvent 3561MODULE = Coro::State PACKAGE = Coro::AnyEvent
2842 3562
2843BOOT: 3563BOOT:
… …
2871 3591
2872void 3592void
2873_register (char *target, char *proto, SV *req) 3593_register (char *target, char *proto, SV *req)
2874 CODE: 3594 CODE:
2875{ 3595{
2876 HV *st; 3596 CV *req_cv = coro_sv_2cv (aTHX_ req);
2877 GV *gvp;
2878 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2879 /* newXSproto doesn't return the CV on 5.8 */ 3597 /* newXSproto doesn't return the CV on 5.8 */
2880 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2881 sv_setpv ((SV *)slf_cv, proto); 3599 sv_setpv ((SV *)slf_cv, proto);
2882 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3600 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2883} 3601}

Diff Legend

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