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.293 by root, Tue Nov 18 06:10:03 2008 UTC vs.
Revision 1.334 by root, Fri Nov 28 23:30:55 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;
263 289
264 /* linked list */ 290 /* linked list */
265 struct coro *next, *prev; 291 struct coro *next, *prev;
266}; 292};
267 293
… …
270 296
271/* the following variables are effectively part of the perl context */ 297/* the following variables are effectively part of the perl context */
272/* and get copied between struct coro and these variables */ 298/* and get copied between struct coro and these variables */
273/* the mainr easonw e don't support windows process emulation */ 299/* the mainr easonw e don't support windows process emulation */
274static struct CoroSLF slf_frame; /* the current slf frame */ 300static struct CoroSLF slf_frame; /* the current slf frame */
275static SV *coro_throw;
276 301
277/** Coro ********************************************************************/ 302/** Coro ********************************************************************/
278 303
279#define PRIO_MAX 3 304#define PRIO_MAX 3
280#define PRIO_HIGH 1 305#define PRIO_HIGH 1
… …
285 310
286/* for Coro.pm */ 311/* for Coro.pm */
287static SV *coro_current; 312static SV *coro_current;
288static SV *coro_readyhook; 313static SV *coro_readyhook;
289static 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;
290static struct coro *coro_first; 316static struct coro *coro_first;
291#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
292 318
293/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
294 320
… …
320 get_hv (name, create); 346 get_hv (name, create);
321#endif 347#endif
322 return get_hv (name, create); 348 return get_hv (name, create);
323} 349}
324 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
325static AV * 412static AV *
326coro_clone_padlist (pTHX_ CV *cv) 413coro_derive_padlist (pTHX_ CV *cv)
327{ 414{
328 AV *padlist = CvPADLIST (cv); 415 AV *padlist = CvPADLIST (cv);
329 AV *newpadlist, *newpad; 416 AV *newpadlist, *newpad;
330 417
331 newpadlist = newAV (); 418 newpadlist = newAV ();
… …
336 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
337#endif 424#endif
338 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
339 --AvFILLp (padlist); 426 --AvFILLp (padlist);
340 427
341 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
342 av_store (newpadlist, 1, (SV *)newpad); 429 av_store (newpadlist, 1, (SV *)newpad);
343 430
344 return newpadlist; 431 return newpadlist;
345} 432}
346 433
347static void 434static void
348free_padlist (pTHX_ AV *padlist) 435free_padlist (pTHX_ AV *padlist)
349{ 436{
350 /* may be during global destruction */ 437 /* may be during global destruction */
351 if (SvREFCNT (padlist)) 438 if (!IN_DESTRUCT)
352 { 439 {
353 I32 i = AvFILLp (padlist); 440 I32 i = AvFILLp (padlist);
354 while (i >= 0) 441
442 while (i > 0) /* special-case index 0 */
355 { 443 {
356 SV **svp = av_fetch (padlist, i--, FALSE); 444 /* we try to be extra-careful here */
357 if (svp) 445 AV *av = (AV *)AvARRAY (padlist)[i--];
358 { 446 I32 j = AvFILLp (av);
359 SV *sv; 447
360 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 448 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]);
450
451 AvFILLp (av) = -1;
361 SvREFCNT_dec (sv); 452 SvREFCNT_dec (av);
362
363 SvREFCNT_dec (*svp);
364 }
365 } 453 }
366 454
455 SvREFCNT_dec (AvARRAY (padlist)[0]);
456
457 AvFILLp (padlist) = -1;
367 SvREFCNT_dec ((SV*)padlist); 458 SvREFCNT_dec ((SV*)padlist);
368 } 459 }
369} 460}
370 461
371static int 462static int
… …
380 471
381 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
382 473
383 return 0; 474 return 0;
384} 475}
385
386#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 476
389static MGVTBL coro_cv_vtbl = { 477static MGVTBL coro_cv_vtbl = {
390 0, 0, 0, 0, 478 0, 0, 0, 0,
391 coro_cv_free 479 coro_cv_free
392}; 480};
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 481
437/* the next two functions merely cache the padlists */ 482/* the next two functions merely cache the padlists */
438static void 483static void
439get_padlist (pTHX_ CV *cv) 484get_padlist (pTHX_ CV *cv)
440{ 485{
… …
446 else 491 else
447 { 492 {
448#if CORO_PREFER_PERL_FUNCTIONS 493#if CORO_PREFER_PERL_FUNCTIONS
449 /* this is probably cleaner? but also slower! */ 494 /* this is probably cleaner? but also slower! */
450 /* in practise, it seems to be less stable */ 495 /* in practise, it seems to be less stable */
451 CV *cp = Perl_cv_clone (cv); 496 CV *cp = Perl_cv_clone (aTHX_ cv);
452 CvPADLIST (cv) = CvPADLIST (cp); 497 CvPADLIST (cv) = CvPADLIST (cp);
453 CvPADLIST (cp) = 0; 498 CvPADLIST (cp) = 0;
454 SvREFCNT_dec (cp); 499 SvREFCNT_dec (cp);
455#else 500#else
456 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
457#endif 502#endif
458 } 503 }
459} 504}
460 505
461static void 506static void
… …
468 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);
469 514
470 av = (AV *)mg->mg_obj; 515 av = (AV *)mg->mg_obj;
471 516
472 if (expect_false (AvFILLp (av) >= AvMAX (av))) 517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
473 av_extend (av, AvMAX (av) + 1); 518 av_extend (av, AvFILLp (av) + 1);
474 519
475 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
476} 521}
477 522
478/** load & save, init *******************************************************/ 523/** load & save, init *******************************************************/
… …
483 perl_slots *slot = c->slot; 528 perl_slots *slot = c->slot;
484 c->slot = 0; 529 c->slot = 0;
485 530
486 PL_mainstack = c->mainstack; 531 PL_mainstack = c->mainstack;
487 532
488 GvSV (PL_defgv) = slot->defsv; 533 GvSV (PL_defgv) = slot->defsv;
489 GvAV (PL_defgv) = slot->defav; 534 GvAV (PL_defgv) = slot->defav;
490 GvSV (PL_errgv) = slot->errsv; 535 GvSV (PL_errgv) = slot->errsv;
491 GvSV (irsgv) = slot->irsgv; 536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
492 538
493 #define VAR(name,type) PL_ ## name = slot->name; 539 #define VAR(name,type) PL_ ## name = slot->name;
494 # include "state.h" 540 # include "state.h"
495 #undef VAR 541 #undef VAR
496 542
… …
509 555
510 PUTBACK; 556 PUTBACK;
511 } 557 }
512 558
513 slf_frame = c->slf_frame; 559 slf_frame = c->slf_frame;
514 coro_throw = c->throw; 560 CORO_THROW = c->except;
515} 561}
516 562
517static void 563static void
518save_perl (pTHX_ Coro__State c) 564save_perl (pTHX_ Coro__State c)
519{ 565{
520 c->throw = coro_throw; 566 c->except = CORO_THROW;
521 c->slf_frame = slf_frame; 567 c->slf_frame = slf_frame;
522 568
523 { 569 {
524 dSP; 570 dSP;
525 I32 cxix = cxstack_ix; 571 I32 cxix = cxstack_ix;
… …
582 c->mainstack = PL_mainstack; 628 c->mainstack = PL_mainstack;
583 629
584 { 630 {
585 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
586 632
587 slot->defav = GvAV (PL_defgv); 633 slot->defav = GvAV (PL_defgv);
588 slot->defsv = DEFSV; 634 slot->defsv = DEFSV;
589 slot->errsv = ERRSV; 635 slot->errsv = ERRSV;
590 slot->irsgv = GvSV (irsgv); 636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
591 638
592 #define VAR(name,type) slot->name = PL_ ## name; 639 #define VAR(name,type) slot->name = PL_ ## name;
593 # include "state.h" 640 # include "state.h"
594 #undef VAR 641 #undef VAR
595 } 642 }
… …
600 * of perl.c:init_stacks, except that it uses less memory 647 * of perl.c:init_stacks, except that it uses less memory
601 * on the (sometimes correct) assumption that coroutines do 648 * on the (sometimes correct) assumption that coroutines do
602 * not usually need a lot of stackspace. 649 * not usually need a lot of stackspace.
603 */ 650 */
604#if CORO_PREFER_PERL_FUNCTIONS 651#if CORO_PREFER_PERL_FUNCTIONS
605# define coro_init_stacks init_stacks 652# define coro_init_stacks(thx) init_stacks ()
606#else 653#else
607static void 654static void
608coro_init_stacks (pTHX) 655coro_init_stacks (pTHX)
609{ 656{
610 PL_curstackinfo = new_stackinfo(32, 8); 657 PL_curstackinfo = new_stackinfo(32, 8);
… …
673#if !PERL_VERSION_ATLEAST (5,10,0) 720#if !PERL_VERSION_ATLEAST (5,10,0)
674 Safefree (PL_retstack); 721 Safefree (PL_retstack);
675#endif 722#endif
676} 723}
677 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
678static size_t 734static size_t
679coro_rss (pTHX_ struct coro *coro) 735coro_rss (pTHX_ struct coro *coro)
680{ 736{
681 size_t rss = sizeof (*coro); 737 size_t rss = sizeof (*coro);
682 738
683 if (coro->mainstack) 739 if (coro->mainstack)
684 { 740 {
685 perl_slots tmp_slot;
686 perl_slots *slot;
687
688 if (coro->flags & CF_RUNNING) 741 if (coro->flags & CF_RUNNING)
689 { 742 {
690 slot = &tmp_slot; 743 #define SYM(sym) PL_ ## sym
691 744 CORO_RSS;
692 #define VAR(name,type) slot->name = PL_ ## name;
693 # include "state.h"
694 #undef VAR 745 #undef SYM
695 } 746 }
696 else 747 else
697 slot = coro->slot;
698
699 if (slot)
700 { 748 {
701 rss += sizeof (slot->curstackinfo); 749 #define SYM(sym) coro->slot->sym
702 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 750 CORO_RSS;
703 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 751 #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 } 752 }
713 } 753 }
714 754
715 return rss; 755 return rss;
716} 756}
… …
818slf_check_nop (pTHX_ struct CoroSLF *frame) 858slf_check_nop (pTHX_ struct CoroSLF *frame)
819{ 859{
820 return 0; 860 return 0;
821} 861}
822 862
863static int
864slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{
866 return 1;
867}
868
823static UNOP coro_setup_op; 869static UNOP coro_setup_op;
824 870
825static void NOINLINE /* noinline to keep it out of the transfer fast path */ 871static void NOINLINE /* noinline to keep it out of the transfer fast path */
826coro_setup (pTHX_ struct coro *coro) 872coro_setup (pTHX_ struct coro *coro)
827{ 873{
… …
832 878
833 PL_runops = RUNOPS_DEFAULT; 879 PL_runops = RUNOPS_DEFAULT;
834 PL_curcop = &PL_compiling; 880 PL_curcop = &PL_compiling;
835 PL_in_eval = EVAL_NULL; 881 PL_in_eval = EVAL_NULL;
836 PL_comppad = 0; 882 PL_comppad = 0;
883 PL_comppad_name = 0;
884 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0;
837 PL_curpm = 0; 886 PL_curpm = 0;
838 PL_curpad = 0; 887 PL_curpad = 0;
839 PL_localizing = 0; 888 PL_localizing = 0;
840 PL_dirty = 0; 889 PL_dirty = 0;
841 PL_restartop = 0; 890 PL_restartop = 0;
842#if PERL_VERSION_ATLEAST (5,10,0) 891#if PERL_VERSION_ATLEAST (5,10,0)
843 PL_parser = 0; 892 PL_parser = 0;
844#endif 893#endif
894 PL_hints = 0;
845 895
846 /* recreate the die/warn hooks */ 896 /* recreate the die/warn hooks */
847 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
848 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
849 899
850 GvSV (PL_defgv) = newSV (0); 900 GvSV (PL_defgv) = newSV (0);
851 GvAV (PL_defgv) = coro->args; coro->args = 0; 901 GvAV (PL_defgv) = coro->args; coro->args = 0;
852 GvSV (PL_errgv) = newSV (0); 902 GvSV (PL_errgv) = newSV (0);
853 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0;
854 PL_rs = newSVsv (GvSV (irsgv)); 905 PL_rs = newSVsv (GvSV (irsgv));
855 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
856 907
857 { 908 {
858 dSP; 909 dSP;
859 UNOP myop; 910 UNOP myop;
860 911
861 Zero (&myop, 1, UNOP); 912 Zero (&myop, 1, UNOP);
862 myop.op_next = Nullop; 913 myop.op_next = Nullop;
914 myop.op_type = OP_ENTERSUB;
863 myop.op_flags = OPf_WANT_VOID; 915 myop.op_flags = OPf_WANT_VOID;
864 916
865 PUSHMARK (SP); 917 PUSHMARK (SP);
866 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 918 PUSHs ((SV *)coro->startcv);
867 PUTBACK; 919 PUTBACK;
868 PL_op = (OP *)&myop; 920 PL_op = (OP *)&myop;
869 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 921 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
870 SPAGAIN;
871 } 922 }
872 923
873 /* this newly created coroutine might be run on an existing cctx which most 924 /* this newly created coroutine might be run on an existing cctx which most
874 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 925 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
875 */ 926 */
876 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
877 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
878 929
879 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
931 coro_setup_op.op_next = PL_op;
880 coro_setup_op.op_type = OP_CUSTOM; 932 coro_setup_op.op_type = OP_ENTERSUB;
881 coro_setup_op.op_ppaddr = pp_slf; 933 coro_setup_op.op_ppaddr = pp_slf;
882 coro_setup_op.op_next = PL_op; 934 /* no flags etc. required, as an init function won't be called */
883 935
884 PL_op = (OP *)&coro_setup_op; 936 PL_op = (OP *)&coro_setup_op;
885 937
886 /* copy throw, in case it was set before coro_setup */ 938 /* copy throw, in case it was set before coro_setup */
887 coro_throw = coro->throw; 939 CORO_THROW = coro->except;
888} 940}
889 941
890static void 942static void
891coro_destruct (pTHX_ struct coro *coro) 943coro_destruct_perl (pTHX_ struct coro *coro)
892{ 944{
893 if (!IN_DESTRUCT) 945 if (!IN_DESTRUCT)
894 { 946 {
895 /* restore all saved variables and stuff */ 947 /* restore all saved variables and stuff */
896 LEAVE_SCOPE (0); 948 LEAVE_SCOPE (0);
… …
911 SvREFCNT_dec (GvAV (PL_defgv)); 963 SvREFCNT_dec (GvAV (PL_defgv));
912 SvREFCNT_dec (GvSV (PL_errgv)); 964 SvREFCNT_dec (GvSV (PL_errgv));
913 SvREFCNT_dec (PL_defoutgv); 965 SvREFCNT_dec (PL_defoutgv);
914 SvREFCNT_dec (PL_rs); 966 SvREFCNT_dec (PL_rs);
915 SvREFCNT_dec (GvSV (irsgv)); 967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
916 969
917 SvREFCNT_dec (PL_diehook); 970 SvREFCNT_dec (PL_diehook);
918 SvREFCNT_dec (PL_warnhook); 971 SvREFCNT_dec (PL_warnhook);
919 972
920 SvREFCNT_dec (coro->saved_deffh); 973 SvREFCNT_dec (coro->saved_deffh);
921 SvREFCNT_dec (coro_throw); 974 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av);
922 977
923 coro_destruct_stacks (aTHX); 978 coro_destruct_stacks (aTHX);
924} 979}
925 980
926INLINE void 981INLINE void
… …
936static int 991static int
937runops_trace (pTHX) 992runops_trace (pTHX)
938{ 993{
939 COP *oldcop = 0; 994 COP *oldcop = 0;
940 int oldcxix = -2; 995 int oldcxix = -2;
941 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
942 coro_cctx *cctx = coro->cctx;
943 996
944 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 997 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
945 { 998 {
946 PERL_ASYNC_CHECK (); 999 PERL_ASYNC_CHECK ();
947 1000
948 if (cctx->flags & CC_TRACE_ALL) 1001 if (cctx_current->flags & CC_TRACE_ALL)
949 { 1002 {
950 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1003 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
951 { 1004 {
952 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1005 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
953 SV **bot, **top; 1006 SV **bot, **top;
954 AV *av = newAV (); /* return values */ 1007 AV *av = newAV (); /* return values */
955 SV **cb; 1008 SV **cb;
… …
992 1045
993 if (PL_curcop != &PL_compiling) 1046 if (PL_curcop != &PL_compiling)
994 { 1047 {
995 SV **cb; 1048 SV **cb;
996 1049
997 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1050 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
998 { 1051 {
999 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1052 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1000 1053
1001 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1054 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1002 { 1055 {
1003 runops_proc_t old_runops = PL_runops;
1004 dSP; 1056 dSP;
1005 GV *gv = CvGV (cx->blk_sub.cv); 1057 GV *gv = CvGV (cx->blk_sub.cv);
1006 SV *fullname = sv_2mortal (newSV (0)); 1058 SV *fullname = sv_2mortal (newSV (0));
1007 1059
1008 if (isGV (gv)) 1060 if (isGV (gv))
… …
1013 SAVETMPS; 1065 SAVETMPS;
1014 EXTEND (SP, 3); 1066 EXTEND (SP, 3);
1015 PUSHMARK (SP); 1067 PUSHMARK (SP);
1016 PUSHs (&PL_sv_yes); 1068 PUSHs (&PL_sv_yes);
1017 PUSHs (fullname); 1069 PUSHs (fullname);
1018 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1070 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1019 PUTBACK; 1071 PUTBACK;
1020 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1072 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1021 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1073 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1022 SPAGAIN; 1074 SPAGAIN;
1023 FREETMPS; 1075 FREETMPS;
… …
1026 } 1078 }
1027 1079
1028 oldcxix = cxstack_ix; 1080 oldcxix = cxstack_ix;
1029 } 1081 }
1030 1082
1031 if (cctx->flags & CC_TRACE_LINE) 1083 if (cctx_current->flags & CC_TRACE_LINE)
1032 { 1084 {
1033 dSP; 1085 dSP;
1034 1086
1035 PL_runops = RUNOPS_DEFAULT; 1087 PL_runops = RUNOPS_DEFAULT;
1036 ENTER; 1088 ENTER;
… …
1055 1107
1056 TAINT_NOT; 1108 TAINT_NOT;
1057 return 0; 1109 return 0;
1058} 1110}
1059 1111
1060static struct coro_cctx *cctx_ssl_cctx;
1061static struct CoroSLF cctx_ssl_frame; 1112static struct CoroSLF cctx_ssl_frame;
1062 1113
1063static void 1114static void
1064slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1115slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1065{ 1116{
1066 ta->prev = (struct coro *)cctx_ssl_cctx;
1067 ta->next = 0; 1117 ta->prev = 0;
1068} 1118}
1069 1119
1070static int 1120static int
1071slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1121slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1072{ 1122{
1073 *frame = cctx_ssl_frame; 1123 *frame = cctx_ssl_frame;
1074 1124
1075 return 1; /* execute the restored frame - there must be one */ 1125 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1076} 1126}
1077 1127
1078/* initialises PL_top_env and injects a pseudo-slf-call to sett he stacklevel */ 1128/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1079static void NOINLINE 1129static void NOINLINE
1080cctx_prepare (pTHX_ coro_cctx *cctx) 1130cctx_prepare (pTHX)
1081{ 1131{
1082 PL_top_env = &PL_start_env; 1132 PL_top_env = &PL_start_env;
1083 1133
1084 if (cctx->flags & CC_TRACE) 1134 if (cctx_current->flags & CC_TRACE)
1085 PL_runops = runops_trace; 1135 PL_runops = runops_trace;
1086 1136
1087 /* we already must be executing an SLF op, there is no other valid way 1137 /* we already must be executing an SLF op, there is no other valid way
1088 * that can lead to creation of a new cctx */ 1138 * that can lead to creation of a new cctx */
1089 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1139 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1090 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1140 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1091 1141
1092 cctx_ssl_cctx = cctx; 1142 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1093 cctx_ssl_frame = slf_frame; 1143 cctx_ssl_frame = slf_frame;
1094 1144
1095 slf_frame.prepare = slf_prepare_set_stacklevel; 1145 slf_frame.prepare = slf_prepare_set_stacklevel;
1096 slf_frame.check = slf_check_set_stacklevel; 1146 slf_frame.check = slf_check_set_stacklevel;
1097} 1147}
… …
1120 /* normally we would need to skip the entersub here */ 1170 /* normally we would need to skip the entersub here */
1121 /* not doing so will re-execute it, which is exactly what we want */ 1171 /* not doing so will re-execute it, which is exactly what we want */
1122 /* PL_nop = PL_nop->op_next */ 1172 /* PL_nop = PL_nop->op_next */
1123 1173
1124 /* inject a fake subroutine call to cctx_init */ 1174 /* inject a fake subroutine call to cctx_init */
1125 cctx_prepare (aTHX_ (coro_cctx *)arg); 1175 cctx_prepare (aTHX);
1126 1176
1127 /* cctx_run is the alternative tail of transfer() */ 1177 /* cctx_run is the alternative tail of transfer() */
1128 transfer_tail (aTHX); 1178 transfer_tail (aTHX);
1129 1179
1130 /* somebody or something will hit me for both perl_run and PL_restartop */ 1180 /* somebody or something will hit me for both perl_run and PL_restartop */
1131 PL_restartop = PL_op; 1181 PL_restartop = PL_op;
1132 perl_run (PL_curinterp); 1182 perl_run (PL_curinterp);
1183 /*
1184 * Unfortunately, there is no way to get at the return values of the
1185 * coro body here, as perl_run destroys these
1186 */
1133 1187
1134 /* 1188 /*
1135 * If perl-run returns we assume exit() was being called or the coro 1189 * If perl-run returns we assume exit() was being called or the coro
1136 * fell off the end, which seems to be the only valid (non-bug) 1190 * fell off the end, which seems to be the only valid (non-bug)
1137 * reason for perl_run to return. We try to exit by jumping to the 1191 * reason for perl_run to return. We try to exit by jumping to the
1138 * bootstrap-time "top" top_env, as we cannot restore the "main" 1192 * bootstrap-time "top" top_env, as we cannot restore the "main"
1139 * coroutine as Coro has no such concept 1193 * coroutine as Coro has no such concept.
1194 * This actually isn't valid with the pthread backend, but OSes requiring
1195 * that backend are too broken to do it in a standards-compliant way.
1140 */ 1196 */
1141 PL_top_env = main_top_env; 1197 PL_top_env = main_top_env;
1142 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1143 } 1199 }
1144} 1200}
… …
1221cctx_destroy (coro_cctx *cctx) 1277cctx_destroy (coro_cctx *cctx)
1222{ 1278{
1223 if (!cctx) 1279 if (!cctx)
1224 return; 1280 return;
1225 1281
1282 assert (cctx != cctx_current);//D temporary
1283
1226 --cctx_count; 1284 --cctx_count;
1227 coro_destroy (&cctx->cctx); 1285 coro_destroy (&cctx->cctx);
1228 1286
1229 /* coro_transfer creates new, empty cctx's */ 1287 /* coro_transfer creates new, empty cctx's */
1230 if (cctx->sptr) 1288 if (cctx->sptr)
… …
1293 /* TODO: throwing up here is considered harmful */ 1351 /* TODO: throwing up here is considered harmful */
1294 1352
1295 if (expect_true (prev != next)) 1353 if (expect_true (prev != next))
1296 { 1354 {
1297 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1355 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,"); 1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1299 1357
1300 if (expect_false (next->flags & CF_RUNNING)) 1358 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,"); 1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1302 1360
1303 if (expect_false (next->flags & CF_DESTROYED)) 1361 if (expect_false (next->flags & CF_DESTROYED))
… …
1315transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1316{ 1374{
1317 dSTACKLEVEL; 1375 dSTACKLEVEL;
1318 1376
1319 /* sometimes transfer is only called to set idle_sp */ 1377 /* sometimes transfer is only called to set idle_sp */
1320 if (expect_false (!next)) 1378 if (expect_false (!prev))
1321 { 1379 {
1322 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1380 cctx_current->idle_sp = STACKLEVEL;
1323 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1324 } 1382 }
1325 else if (expect_true (prev != next)) 1383 else if (expect_true (prev != next))
1326 { 1384 {
1327 coro_cctx *prev__cctx; 1385 coro_cctx *cctx_prev;
1328 1386
1329 if (expect_false (prev->flags & CF_NEW)) 1387 if (expect_false (prev->flags & CF_NEW))
1330 { 1388 {
1331 /* create a new empty/source context */ 1389 /* create a new empty/source context */
1332 prev->cctx = cctx_new_empty ();
1333 prev->flags &= ~CF_NEW; 1390 prev->flags &= ~CF_NEW;
1334 prev->flags |= CF_RUNNING; 1391 prev->flags |= CF_RUNNING;
1335 } 1392 }
1336 1393
1337 prev->flags &= ~CF_RUNNING; 1394 prev->flags &= ~CF_RUNNING;
… …
1348 coro_setup (aTHX_ next); 1405 coro_setup (aTHX_ next);
1349 } 1406 }
1350 else 1407 else
1351 load_perl (aTHX_ next); 1408 load_perl (aTHX_ next);
1352 1409
1353 prev__cctx = prev->cctx; 1410 assert (!prev->cctx);//D temporary
1354 1411
1355 /* possibly untie and reuse the cctx */ 1412 /* possibly untie and reuse the cctx */
1356 if (expect_true ( 1413 if (expect_true (
1357 prev__cctx->idle_sp == (void *)stacklevel 1414 cctx_current->idle_sp == STACKLEVEL
1358 && !(prev__cctx->flags & CC_TRACE) 1415 && !(cctx_current->flags & CC_TRACE)
1359 && !force_cctx 1416 && !force_cctx
1360 )) 1417 ))
1361 { 1418 {
1362 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1419 /* 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)); 1420 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1364 1421
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 */ 1422 /* 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 */ 1423 /* without this the next cctx_get might destroy the running cctx while still in use */
1369 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1424 if (expect_false (CCTX_EXPIRED (cctx_current)))
1370 if (!next->cctx) 1425 if (expect_true (!next->cctx))
1371 next->cctx = cctx_get (aTHX); 1426 next->cctx = cctx_get (aTHX);
1372 1427
1373 cctx_put (prev__cctx); 1428 cctx_put (cctx_current);
1374 } 1429 }
1430 else
1431 prev->cctx = cctx_current;
1375 1432
1376 ++next->usecount; 1433 ++next->usecount;
1377 1434
1378 if (expect_true (!next->cctx)) 1435 cctx_prev = cctx_current;
1379 next->cctx = cctx_get (aTHX); 1436 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1380 1437
1381 if (expect_false (prev__cctx != next->cctx)) 1438 next->cctx = 0;
1439
1440 if (expect_false (cctx_prev != cctx_current))
1382 { 1441 {
1383 prev__cctx->top_env = PL_top_env; 1442 cctx_prev->top_env = PL_top_env;
1384 PL_top_env = next->cctx->top_env; 1443 PL_top_env = cctx_current->top_env;
1385 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1444 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1386 } 1445 }
1387 1446
1388 transfer_tail (aTHX); 1447 transfer_tail (aTHX);
1389 } 1448 }
1390} 1449}
… …
1412 --coro_nready; 1471 --coro_nready;
1413 } 1472 }
1414 else 1473 else
1415 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1416 1475
1417 if (coro->mainstack && coro->mainstack != main_mainstack) 1476 if (coro->mainstack
1477 && coro->mainstack != main_mainstack
1478 && !PL_dirty)
1418 { 1479 {
1419 struct coro temp; 1480 struct coro temp;
1420 1481
1421 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1482 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1422 1483
1423 save_perl (aTHX_ &temp); 1484 save_perl (aTHX_ &temp);
1424 load_perl (aTHX_ coro); 1485 load_perl (aTHX_ coro);
1425 1486
1426 coro_destruct (aTHX_ coro); 1487 coro_destruct_perl (aTHX_ coro);
1427 1488
1428 load_perl (aTHX_ &temp); 1489 load_perl (aTHX_ &temp);
1429 1490
1430 coro->slot = 0; 1491 coro->slot = 0;
1431 } 1492 }
1432 1493
1433 cctx_destroy (coro->cctx); 1494 cctx_destroy (coro->cctx);
1495 SvREFCNT_dec (coro->startcv);
1434 SvREFCNT_dec (coro->args); 1496 SvREFCNT_dec (coro->args);
1497 SvREFCNT_dec (CORO_THROW);
1435 1498
1436 if (coro->next) coro->next->prev = coro->prev; 1499 if (coro->next) coro->next->prev = coro->prev;
1437 if (coro->prev) coro->prev->next = coro->next; 1500 if (coro->prev) coro->prev->next = coro->next;
1438 if (coro == coro_first) coro_first = coro->next; 1501 if (coro == coro_first) coro_first = coro->next;
1439 1502
… …
1493 1556
1494 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1557 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1495 TRANSFER (ta, 1); 1558 TRANSFER (ta, 1);
1496} 1559}
1497 1560
1561/*****************************************************************************/
1562/* gensub: simple closure generation utility */
1563
1564#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1565
1566/* create a closure from XS, returns a code reference */
1567/* the arg can be accessed via GENSUB_ARG from the callback */
1568/* the callback must use dXSARGS/XSRETURN */
1569static SV *
1570gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1571{
1572 CV *cv = (CV *)newSV (0);
1573
1574 sv_upgrade ((SV *)cv, SVt_PVCV);
1575
1576 CvANON_on (cv);
1577 CvISXSUB_on (cv);
1578 CvXSUB (cv) = xsub;
1579 GENSUB_ARG = arg;
1580
1581 return newRV_noinc ((SV *)cv);
1582}
1583
1498/** Coro ********************************************************************/ 1584/** Coro ********************************************************************/
1499 1585
1500INLINE void 1586INLINE void
1501coro_enq (pTHX_ struct coro *coro) 1587coro_enq (pTHX_ struct coro *coro)
1502{ 1588{
… …
1520{ 1606{
1521 struct coro *coro; 1607 struct coro *coro;
1522 SV *sv_hook; 1608 SV *sv_hook;
1523 void (*xs_hook)(void); 1609 void (*xs_hook)(void);
1524 1610
1525 if (SvROK (coro_sv))
1526 coro_sv = SvRV (coro_sv);
1527
1528 coro = SvSTATE (coro_sv); 1611 coro = SvSTATE (coro_sv);
1529 1612
1530 if (coro->flags & CF_READY) 1613 if (coro->flags & CF_READY)
1531 return 0; 1614 return 0;
1532 1615
… …
1563api_is_ready (pTHX_ SV *coro_sv) 1646api_is_ready (pTHX_ SV *coro_sv)
1564{ 1647{
1565 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1648 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1566} 1649}
1567 1650
1651/* expects to own a reference to next->hv */
1568INLINE void 1652INLINE void
1569prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1653prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1570{ 1654{
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); 1655 SV *prev_sv = SvRV (coro_current);
1656
1610 ta->prev = SvSTATE_hv (prev_sv); 1657 ta->prev = SvSTATE_hv (prev_sv);
1658 ta->next = next;
1659
1611 TRANSFER_CHECK (*ta); 1660 TRANSFER_CHECK (*ta);
1612 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1661
1613 ta->next->flags &= ~CF_READY;
1614 SvRV_set (coro_current, next_sv); 1662 SvRV_set (coro_current, (SV *)next->hv);
1615 1663
1616 free_coro_mortal (aTHX); 1664 free_coro_mortal (aTHX);
1617 coro_mortal = prev_sv; 1665 coro_mortal = prev_sv;
1618} 1666}
1619 1667
1668static void
1669prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1670{
1671 for (;;)
1672 {
1673 SV *next_sv = coro_deq (aTHX);
1674
1675 if (expect_true (next_sv))
1676 {
1677 struct coro *next = SvSTATE_hv (next_sv);
1678
1679 /* cannot transfer to destroyed coros, skip and look for next */
1680 if (expect_false (next->flags & CF_DESTROYED))
1681 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1682 else
1683 {
1684 next->flags &= ~CF_READY;
1685 --coro_nready;
1686
1687 prepare_schedule_to (aTHX_ ta, next);
1688 break;
1689 }
1690 }
1691 else
1692 {
1693 /* nothing to schedule: call the idle handler */
1694 if (SvROK (sv_idle)
1695 && SvOBJECT (SvRV (sv_idle)))
1696 {
1697 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1698 api_ready (aTHX_ SvRV (sv_idle));
1699 --coro_nready;
1700 }
1701 else
1702 {
1703 dSP;
1704
1705 ENTER;
1706 SAVETMPS;
1707
1708 PUSHMARK (SP);
1709 PUTBACK;
1710 call_sv (sv_idle, G_VOID | G_DISCARD);
1711
1712 FREETMPS;
1713 LEAVE;
1714 }
1715 }
1716 }
1717}
1718
1620INLINE void 1719INLINE void
1621prepare_cede (pTHX_ struct coro_transfer_args *ta) 1720prepare_cede (pTHX_ struct coro_transfer_args *ta)
1622{ 1721{
1623 api_ready (aTHX_ coro_current); 1722 api_ready (aTHX_ coro_current);
1624 prepare_schedule (aTHX_ ta); 1723 prepare_schedule (aTHX_ ta);
… …
1643{ 1742{
1644 struct coro_transfer_args ta; 1743 struct coro_transfer_args ta;
1645 1744
1646 prepare_schedule (aTHX_ &ta); 1745 prepare_schedule (aTHX_ &ta);
1647 TRANSFER (ta, 1); 1746 TRANSFER (ta, 1);
1747}
1748
1749static void
1750api_schedule_to (pTHX_ SV *coro_sv)
1751{
1752 struct coro_transfer_args ta;
1753 struct coro *next = SvSTATE (coro_sv);
1754
1755 SvREFCNT_inc_NN (coro_sv);
1756 prepare_schedule_to (aTHX_ &ta, next);
1648} 1757}
1649 1758
1650static int 1759static int
1651api_cede (pTHX) 1760api_cede (pTHX)
1652{ 1761{
… …
1681static void 1790static void
1682api_trace (pTHX_ SV *coro_sv, int flags) 1791api_trace (pTHX_ SV *coro_sv, int flags)
1683{ 1792{
1684 struct coro *coro = SvSTATE (coro_sv); 1793 struct coro *coro = SvSTATE (coro_sv);
1685 1794
1795 if (coro->flags & CF_RUNNING)
1796 croak ("cannot enable tracing on a running coroutine, caught");
1797
1686 if (flags & CC_TRACE) 1798 if (flags & CC_TRACE)
1687 { 1799 {
1688 if (!coro->cctx) 1800 if (!coro->cctx)
1689 coro->cctx = cctx_new_run (); 1801 coro->cctx = cctx_new_run ();
1690 else if (!(coro->cctx->flags & CC_TRACE)) 1802 else if (!(coro->cctx->flags & CC_TRACE))
1691 croak ("cannot enable tracing on coroutine with custom stack,"); 1803 croak ("cannot enable tracing on coroutine with custom stack, caught");
1692 1804
1693 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1805 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1694 } 1806 }
1695 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1807 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1696 { 1808 {
… …
1699 if (coro->flags & CF_RUNNING) 1811 if (coro->flags & CF_RUNNING)
1700 PL_runops = RUNOPS_DEFAULT; 1812 PL_runops = RUNOPS_DEFAULT;
1701 else 1813 else
1702 coro->slot->runops = RUNOPS_DEFAULT; 1814 coro->slot->runops = RUNOPS_DEFAULT;
1703 } 1815 }
1816}
1817
1818static void
1819coro_call_on_destroy (pTHX_ struct coro *coro)
1820{
1821 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1822 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1823
1824 if (on_destroyp)
1825 {
1826 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1827
1828 while (AvFILLp (on_destroy) >= 0)
1829 {
1830 dSP; /* don't disturb outer sp */
1831 SV *cb = av_pop (on_destroy);
1832
1833 PUSHMARK (SP);
1834
1835 if (statusp)
1836 {
1837 int i;
1838 AV *status = (AV *)SvRV (*statusp);
1839 EXTEND (SP, AvFILLp (status) + 1);
1840
1841 for (i = 0; i <= AvFILLp (status); ++i)
1842 PUSHs (AvARRAY (status)[i]);
1843 }
1844
1845 PUTBACK;
1846 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1847 }
1848 }
1849}
1850
1851static void
1852slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1853{
1854 int i;
1855 HV *hv = (HV *)SvRV (coro_current);
1856 AV *av = newAV ();
1857
1858 av_extend (av, items - 1);
1859 for (i = 0; i < items; ++i)
1860 av_push (av, SvREFCNT_inc_NN (arg [i]));
1861
1862 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1863
1864 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1865 api_ready (aTHX_ sv_manager);
1866
1867 frame->prepare = prepare_schedule;
1868 frame->check = slf_check_repeat;
1869}
1870
1871/*****************************************************************************/
1872/* async pool handler */
1873
1874static int
1875slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1876{
1877 HV *hv = (HV *)SvRV (coro_current);
1878 struct coro *coro = (struct coro *)frame->data;
1879
1880 if (!coro->invoke_cb)
1881 return 1; /* loop till we have invoke */
1882 else
1883 {
1884 hv_store (hv, "desc", sizeof ("desc") - 1,
1885 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1886
1887 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1888
1889 {
1890 dSP;
1891 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1892 PUTBACK;
1893 }
1894
1895 SvREFCNT_dec (GvAV (PL_defgv));
1896 GvAV (PL_defgv) = coro->invoke_av;
1897 coro->invoke_av = 0;
1898
1899 return 0;
1900 }
1901}
1902
1903static void
1904slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1905{
1906 HV *hv = (HV *)SvRV (coro_current);
1907 struct coro *coro = SvSTATE_hv ((SV *)hv);
1908
1909 if (expect_true (coro->saved_deffh))
1910 {
1911 /* subsequent iteration */
1912 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1913 coro->saved_deffh = 0;
1914
1915 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1916 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1917 {
1918 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1919 coro->invoke_av = newAV ();
1920
1921 frame->prepare = prepare_nop;
1922 }
1923 else
1924 {
1925 av_clear (GvAV (PL_defgv));
1926 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1927
1928 coro->prio = 0;
1929
1930 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1931 api_trace (aTHX_ coro_current, 0);
1932
1933 frame->prepare = prepare_schedule;
1934 av_push (av_async_pool, SvREFCNT_inc (hv));
1935 }
1936 }
1937 else
1938 {
1939 /* first iteration, simply fall through */
1940 frame->prepare = prepare_nop;
1941 }
1942
1943 frame->check = slf_check_pool_handler;
1944 frame->data = (void *)coro;
1945}
1946
1947/*****************************************************************************/
1948/* rouse callback */
1949
1950#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1951
1952static void
1953coro_rouse_callback (pTHX_ CV *cv)
1954{
1955 dXSARGS;
1956 SV *data = (SV *)GENSUB_ARG;
1957
1958 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1959 {
1960 /* first call, set args */
1961 AV *av = newAV ();
1962 SV *coro = SvRV (data);
1963
1964 SvRV_set (data, (SV *)av);
1965 api_ready (aTHX_ coro);
1966 SvREFCNT_dec (coro);
1967
1968 /* better take a full copy of the arguments */
1969 while (items--)
1970 av_store (av, items, newSVsv (ST (items)));
1971 }
1972
1973 XSRETURN_EMPTY;
1974}
1975
1976static int
1977slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1978{
1979 SV *data = (SV *)frame->data;
1980
1981 if (CORO_THROW)
1982 return 0;
1983
1984 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1985 return 1;
1986
1987 /* now push all results on the stack */
1988 {
1989 dSP;
1990 AV *av = (AV *)SvRV (data);
1991 int i;
1992
1993 EXTEND (SP, AvFILLp (av) + 1);
1994 for (i = 0; i <= AvFILLp (av); ++i)
1995 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1996
1997 /* we have stolen the elements, so ste length to zero and free */
1998 AvFILLp (av) = -1;
1999 av_undef (av);
2000
2001 PUTBACK;
2002 }
2003
2004 return 0;
2005}
2006
2007static void
2008slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2009{
2010 SV *cb;
2011
2012 if (items)
2013 cb = arg [0];
2014 else
2015 {
2016 struct coro *coro = SvSTATE_current;
2017
2018 if (!coro->rouse_cb)
2019 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2020
2021 cb = sv_2mortal (coro->rouse_cb);
2022 coro->rouse_cb = 0;
2023 }
2024
2025 if (!SvROK (cb)
2026 || SvTYPE (SvRV (cb)) != SVt_PVCV
2027 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2028 croak ("Coro::rouse_wait called with illegal callback argument,");
2029
2030 {
2031 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2032 SV *data = (SV *)GENSUB_ARG;
2033
2034 frame->data = (void *)data;
2035 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2036 frame->check = slf_check_rouse_wait;
2037 }
2038}
2039
2040static SV *
2041coro_new_rouse_cb (pTHX)
2042{
2043 HV *hv = (HV *)SvRV (coro_current);
2044 struct coro *coro = SvSTATE_hv (hv);
2045 SV *data = newRV_inc ((SV *)hv);
2046 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2047
2048 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2049 SvREFCNT_dec (data); /* magicext increases the refcount */
2050
2051 SvREFCNT_dec (coro->rouse_cb);
2052 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2053
2054 return cb;
1704} 2055}
1705 2056
1706/*****************************************************************************/ 2057/*****************************************************************************/
1707/* schedule-like-function opcode (SLF) */ 2058/* schedule-like-function opcode (SLF) */
1708 2059
… …
1755static void 2106static void
1756slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2107slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1757{ 2108{
1758 frame->prepare = prepare_schedule; 2109 frame->prepare = prepare_schedule;
1759 frame->check = slf_check_nop; 2110 frame->check = slf_check_nop;
2111}
2112
2113static void
2114slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2115{
2116 struct coro *next = (struct coro *)slf_frame.data;
2117
2118 SvREFCNT_inc_NN (next->hv);
2119 prepare_schedule_to (aTHX_ ta, next);
2120}
2121
2122static void
2123slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2124{
2125 if (!items)
2126 croak ("Coro::schedule_to expects a coroutine argument, caught");
2127
2128 frame->data = (void *)SvSTATE (arg [0]);
2129 frame->prepare = slf_prepare_schedule_to;
2130 frame->check = slf_check_nop;
2131}
2132
2133static void
2134slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2135{
2136 api_ready (aTHX_ SvRV (coro_current));
2137
2138 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1760} 2139}
1761 2140
1762static void 2141static void
1763slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2142slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1764{ 2143{
… …
1835 } 2214 }
1836 while (slf_frame.check (aTHX_ &slf_frame)); 2215 while (slf_frame.check (aTHX_ &slf_frame));
1837 2216
1838 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2217 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1839 2218
2219 /* exception handling */
2220 if (expect_false (CORO_THROW))
2221 {
2222 SV *exception = sv_2mortal (CORO_THROW);
2223
2224 CORO_THROW = 0;
2225 sv_setsv (ERRSV, exception);
2226 croak (0);
2227 }
2228
1840 /* return value handling - mostly like entersub */ 2229 /* return value handling - mostly like entersub */
1841 /* make sure we put something on the stack in scalar context */ 2230 /* make sure we put something on the stack in scalar context */
1842 if (GIMME_V == G_SCALAR) 2231 if (GIMME_V == G_SCALAR)
1843 { 2232 {
1844 dSP; 2233 dSP;
… …
1850 bot [1] = *sp; 2239 bot [1] = *sp;
1851 2240
1852 SP = bot + 1; 2241 SP = bot + 1;
1853 2242
1854 PUTBACK; 2243 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 } 2244 }
1866 2245
1867 return NORMAL; 2246 return NORMAL;
1868} 2247}
1869 2248
… …
1910 } 2289 }
1911 else 2290 else
1912 slf_argc = 0; 2291 slf_argc = 0;
1913 2292
1914 PL_op->op_ppaddr = pp_slf; 2293 PL_op->op_ppaddr = pp_slf;
1915 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2294 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1916 2295
1917 PL_op = (OP *)&slf_restore; 2296 PL_op = (OP *)&slf_restore;
1918} 2297}
1919 2298
1920/*****************************************************************************/ 2299/*****************************************************************************/
… …
1991 PerlIOBuf_get_cnt, 2370 PerlIOBuf_get_cnt,
1992 PerlIOBuf_set_ptrcnt, 2371 PerlIOBuf_set_ptrcnt,
1993}; 2372};
1994 2373
1995/*****************************************************************************/ 2374/*****************************************************************************/
2375/* Coro::Semaphore & Coro::Signal */
2376
2377static SV *
2378coro_waitarray_new (pTHX_ int count)
2379{
2380 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2381 AV *av = newAV ();
2382 SV **ary;
2383
2384 /* unfortunately, building manually saves memory */
2385 Newx (ary, 2, SV *);
2386 AvALLOC (av) = ary;
2387#if PERL_VERSION_ATLEAST (5,10,0)
2388 AvARRAY (av) = ary;
2389#else
2390 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2391 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2392 SvPVX ((SV *)av) = (char *)ary;
2393#endif
2394 AvMAX (av) = 1;
2395 AvFILLp (av) = 0;
2396 ary [0] = newSViv (count);
2397
2398 return newRV_noinc ((SV *)av);
2399}
2400
1996/* Coro::Semaphore */ 2401/* semaphore */
1997 2402
1998static void 2403static void
1999coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2404coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2000{ 2405{
2001 SV *count_sv = AvARRAY (av)[0]; 2406 SV *count_sv = AvARRAY (av)[0];
… …
2013 AvARRAY (av)[0] = AvARRAY (av)[1]; 2418 AvARRAY (av)[0] = AvARRAY (av)[1];
2014 AvARRAY (av)[1] = count_sv; 2419 AvARRAY (av)[1] = count_sv;
2015 cb = av_shift (av); 2420 cb = av_shift (av);
2016 2421
2017 if (SvOBJECT (cb)) 2422 if (SvOBJECT (cb))
2423 {
2018 api_ready (aTHX_ cb); 2424 api_ready (aTHX_ cb);
2019 else 2425 --count;
2020 croak ("callbacks not yet supported"); 2426 }
2427 else if (SvTYPE (cb) == SVt_PVCV)
2428 {
2429 dSP;
2430 PUSHMARK (SP);
2431 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2432 PUTBACK;
2433 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2434 }
2021 2435
2022 SvREFCNT_dec (cb); 2436 SvREFCNT_dec (cb);
2023
2024 --count;
2025 } 2437 }
2026} 2438}
2027 2439
2028static void 2440static void
2029coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2441coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2031 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2443 /* call $sem->adjust (0) to possibly wake up some other waiters */
2032 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2444 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2033} 2445}
2034 2446
2035static int 2447static int
2036slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2448slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2037{ 2449{
2038 AV *av = (AV *)frame->data; 2450 AV *av = (AV *)frame->data;
2039 SV *count_sv = AvARRAY (av)[0]; 2451 SV *count_sv = AvARRAY (av)[0];
2040 2452
2453 /* if we are about to throw, don't actually acquire the lock, just throw */
2454 if (CORO_THROW)
2455 return 0;
2041 if (SvIVX (count_sv) > 0) 2456 else if (SvIVX (count_sv) > 0)
2042 { 2457 {
2043 SvSTATE_current->on_destroy = 0; 2458 SvSTATE_current->on_destroy = 0;
2459
2460 if (acquire)
2044 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2461 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2462 else
2463 coro_semaphore_adjust (aTHX_ av, 0);
2464
2045 return 0; 2465 return 0;
2046 } 2466 }
2047 else 2467 else
2048 { 2468 {
2049 int i; 2469 int i;
… …
2058 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2478 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2059 return 1; 2479 return 1;
2060 } 2480 }
2061} 2481}
2062 2482
2063static void 2483static int
2484slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2485{
2486 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2487}
2488
2489static int
2490slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2491{
2492 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2493}
2494
2495static void
2064slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2496slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2065{ 2497{
2066 AV *av = (AV *)SvRV (arg [0]); 2498 AV *av = (AV *)SvRV (arg [0]);
2067 2499
2068 if (SvIVX (AvARRAY (av)[0]) > 0) 2500 if (SvIVX (AvARRAY (av)[0]) > 0)
2069 { 2501 {
2070 frame->data = (void *)av; 2502 frame->data = (void *)av;
2071 frame->prepare = prepare_nop; 2503 frame->prepare = prepare_nop;
2072 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2073 } 2504 }
2074 else 2505 else
2075 { 2506 {
2076 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2507 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2077 2508
2078 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2509 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2079 frame->prepare = prepare_schedule; 2510 frame->prepare = prepare_schedule;
2080 2511
2081 /* to avoid race conditions when a woken-up coro gets terminated */ 2512 /* to avoid race conditions when a woken-up coro gets terminated */
2082 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2513 /* 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; 2514 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2085 } 2515 }
2516}
2086 2517
2518static void
2519slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2520{
2521 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2087 frame->check = slf_check_semaphore_down; 2522 frame->check = slf_check_semaphore_down;
2088
2089} 2523}
2090 2524
2091/*****************************************************************************/ 2525static void
2092/* gensub: simple closure generation utility */ 2526slf_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{ 2527{
2102 CV *cv = (CV *)newSV (0); 2528 if (items >= 2)
2529 {
2530 /* callback form */
2531 AV *av = (AV *)SvRV (arg [0]);
2532 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2103 2533
2104 sv_upgrade ((SV *)cv, SVt_PVCV); 2534 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2105 2535
2106 CvANON_on (cv); 2536 if (SvIVX (AvARRAY (av)[0]) > 0)
2107 CvISXSUB_on (cv); 2537 coro_semaphore_adjust (aTHX_ av, 0);
2108 CvXSUB (cv) = xsub;
2109 GENSUB_ARG = arg;
2110 2538
2111 return newRV_noinc ((SV *)cv); 2539 frame->prepare = prepare_nop;
2540 frame->check = slf_check_nop;
2541 }
2542 else
2543 {
2544 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2545 frame->check = slf_check_semaphore_wait;
2546 }
2547}
2548
2549/* signal */
2550
2551static void
2552coro_signal_wake (pTHX_ AV *av, int count)
2553{
2554 SvIVX (AvARRAY (av)[0]) = 0;
2555
2556 /* now signal count waiters */
2557 while (count > 0 && AvFILLp (av) > 0)
2558 {
2559 SV *cb;
2560
2561 /* swap first two elements so we can shift a waiter */
2562 cb = AvARRAY (av)[0];
2563 AvARRAY (av)[0] = AvARRAY (av)[1];
2564 AvARRAY (av)[1] = cb;
2565
2566 cb = av_shift (av);
2567
2568 api_ready (aTHX_ cb);
2569 sv_setiv (cb, 0); /* signal waiter */
2570 SvREFCNT_dec (cb);
2571
2572 --count;
2573 }
2574}
2575
2576static int
2577slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2578{
2579 /* if we are about to throw, also stop waiting */
2580 return SvROK ((SV *)frame->data) && !CORO_THROW;
2581}
2582
2583static void
2584slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2585{
2586 AV *av = (AV *)SvRV (arg [0]);
2587
2588 if (SvIVX (AvARRAY (av)[0]))
2589 {
2590 SvIVX (AvARRAY (av)[0]) = 0;
2591 frame->prepare = prepare_nop;
2592 frame->check = slf_check_nop;
2593 }
2594 else
2595 {
2596 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */
2597
2598 av_push (av, waiter);
2599
2600 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2601 frame->prepare = prepare_schedule;
2602 frame->check = slf_check_signal_wait;
2603 }
2112} 2604}
2113 2605
2114/*****************************************************************************/ 2606/*****************************************************************************/
2115/* Coro::AIO */ 2607/* Coro::AIO */
2116 2608
… …
2131 dXSARGS; 2623 dXSARGS;
2132 AV *state = (AV *)GENSUB_ARG; 2624 AV *state = (AV *)GENSUB_ARG;
2133 SV *coro = av_pop (state); 2625 SV *coro = av_pop (state);
2134 SV *data_sv = newSV (sizeof (struct io_state)); 2626 SV *data_sv = newSV (sizeof (struct io_state));
2135 2627
2136 av_extend (state, items); 2628 av_extend (state, items - 1);
2137 2629
2138 sv_upgrade (data_sv, SVt_PV); 2630 sv_upgrade (data_sv, SVt_PV);
2139 SvCUR_set (data_sv, sizeof (struct io_state)); 2631 SvCUR_set (data_sv, sizeof (struct io_state));
2140 SvPOK_only (data_sv); 2632 SvPOK_only (data_sv);
2141 2633
… …
2166static int 2658static int
2167slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2659slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2168{ 2660{
2169 AV *state = (AV *)frame->data; 2661 AV *state = (AV *)frame->data;
2170 2662
2663 /* if we are about to throw, return early */
2664 /* this does not cancel the aio request, but at least */
2665 /* it quickly returns */
2666 if (CORO_THROW)
2667 return 0;
2668
2171 /* one element that is an RV? repeat! */ 2669 /* one element that is an RV? repeat! */
2172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2670 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2173 return 1; 2671 return 1;
2174 2672
2175 /* restore status */ 2673 /* restore status */
… …
2270 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2271} 2769}
2272 2770
2273/*****************************************************************************/ 2771/*****************************************************************************/
2274 2772
2773#if CORO_CLONE
2774# include "clone.c"
2775#endif
2776
2275MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2777MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2276 2778
2277PROTOTYPES: DISABLE 2779PROTOTYPES: DISABLE
2278 2780
2279BOOT: 2781BOOT:
… …
2283 coro_thx = PERL_GET_CONTEXT; 2785 coro_thx = PERL_GET_CONTEXT;
2284# endif 2786# endif
2285#endif 2787#endif
2286 BOOT_PAGESIZE; 2788 BOOT_PAGESIZE;
2287 2789
2790 cctx_current = cctx_new_empty ();
2791
2288 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2792 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2289 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2793 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2290 2794
2291 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2795 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; 2796 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2311 2815
2312 { 2816 {
2313 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2817 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2314 2818
2315 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2819 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2316 hv_store_ent (PL_custom_op_names, slf, 2820 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2317 newSVpv ("coro_slf", 0), 0);
2318 2821
2319 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2822 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2320 hv_store_ent (PL_custom_op_descs, slf, 2823 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2321 newSVpv ("coro schedule like function", 0), 0);
2322 } 2824 }
2323 2825
2324 coroapi.ver = CORO_API_VERSION; 2826 coroapi.ver = CORO_API_VERSION;
2325 coroapi.rev = CORO_API_REVISION; 2827 coroapi.rev = CORO_API_REVISION;
2326 2828
… …
2345 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2847 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2346} 2848}
2347 2849
2348SV * 2850SV *
2349new (char *klass, ...) 2851new (char *klass, ...)
2852 ALIAS:
2853 Coro::new = 1
2350 CODE: 2854 CODE:
2351{ 2855{
2352 struct coro *coro; 2856 struct coro *coro;
2353 MAGIC *mg; 2857 MAGIC *mg;
2354 HV *hv; 2858 HV *hv;
2859 CV *cb;
2355 int i; 2860 int i;
2861
2862 if (items > 1)
2863 {
2864 cb = coro_sv_2cv (aTHX_ ST (1));
2865
2866 if (!ix)
2867 {
2868 if (CvISXSUB (cb))
2869 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2870
2871 if (!CvROOT (cb))
2872 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2873 }
2874 }
2356 2875
2357 Newz (0, coro, 1, struct coro); 2876 Newz (0, coro, 1, struct coro);
2358 coro->args = newAV (); 2877 coro->args = newAV ();
2359 coro->flags = CF_NEW; 2878 coro->flags = CF_NEW;
2360 2879
… …
2365 coro->hv = hv = newHV (); 2884 coro->hv = hv = newHV ();
2366 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2885 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2367 mg->mg_flags |= MGf_DUP; 2886 mg->mg_flags |= MGf_DUP;
2368 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2887 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2369 2888
2889 if (items > 1)
2890 {
2370 av_extend (coro->args, items - 1); 2891 av_extend (coro->args, items - 1 + ix - 1);
2892
2893 if (ix)
2894 {
2895 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2896 cb = cv_coro_run;
2897 }
2898
2899 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2900
2371 for (i = 1; i < items; i++) 2901 for (i = 2; i < items; i++)
2372 av_push (coro->args, newSVsv (ST (i))); 2902 av_push (coro->args, newSVsv (ST (i)));
2903 }
2373} 2904}
2374 OUTPUT: 2905 OUTPUT:
2375 RETVAL 2906 RETVAL
2376 2907
2377void 2908void
… …
2390void 2921void
2391_exit (int code) 2922_exit (int code)
2392 PROTOTYPE: $ 2923 PROTOTYPE: $
2393 CODE: 2924 CODE:
2394 _exit (code); 2925 _exit (code);
2926
2927SV *
2928clone (Coro::State coro)
2929 CODE:
2930{
2931#if CORO_CLONE
2932 struct coro *ncoro = coro_clone (aTHX_ coro);
2933 MAGIC *mg;
2934 /* TODO: too much duplication */
2935 ncoro->hv = newHV ();
2936 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2937 mg->mg_flags |= MGf_DUP;
2938 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2939#else
2940 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2941#endif
2942}
2943 OUTPUT:
2944 RETVAL
2395 2945
2396int 2946int
2397cctx_stacksize (int new_stacksize = 0) 2947cctx_stacksize (int new_stacksize = 0)
2398 PROTOTYPE: ;$ 2948 PROTOTYPE: ;$
2399 CODE: 2949 CODE:
… …
2506throw (Coro::State self, SV *throw = &PL_sv_undef) 3056throw (Coro::State self, SV *throw = &PL_sv_undef)
2507 PROTOTYPE: $;$ 3057 PROTOTYPE: $;$
2508 CODE: 3058 CODE:
2509{ 3059{
2510 struct coro *current = SvSTATE_current; 3060 struct coro *current = SvSTATE_current;
2511 SV **throwp = self == current ? &coro_throw : &self->throw; 3061 SV **throwp = self == current ? &CORO_THROW : &self->except;
2512 SvREFCNT_dec (*throwp); 3062 SvREFCNT_dec (*throwp);
2513 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3063 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2514} 3064}
2515 3065
2516void 3066void
… …
2520 3070
2521SV * 3071SV *
2522has_cctx (Coro::State coro) 3072has_cctx (Coro::State coro)
2523 PROTOTYPE: $ 3073 PROTOTYPE: $
2524 CODE: 3074 CODE:
2525 RETVAL = boolSV (!!coro->cctx); 3075 /* maybe manage the running flag differently */
3076 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2526 OUTPUT: 3077 OUTPUT:
2527 RETVAL 3078 RETVAL
2528 3079
2529int 3080int
2530is_traced (Coro::State coro) 3081is_traced (Coro::State coro)
… …
2550 3101
2551void 3102void
2552force_cctx () 3103force_cctx ()
2553 PROTOTYPE: 3104 PROTOTYPE:
2554 CODE: 3105 CODE:
2555 SvSTATE_current->cctx->idle_sp = 0; 3106 cctx_current->idle_sp = 0;
2556 3107
2557void 3108void
2558swap_defsv (Coro::State self) 3109swap_defsv (Coro::State self)
2559 PROTOTYPE: $ 3110 PROTOTYPE: $
2560 ALIAS: 3111 ALIAS:
… …
2575 3126
2576BOOT: 3127BOOT:
2577{ 3128{
2578 int i; 3129 int i;
2579 3130
2580 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2581 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3131 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2582 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3132 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2583 3133 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3134 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2584 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3135 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2585 SvREADONLY_on (coro_current); 3136 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3137 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3138 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3139 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3140
3141 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3142 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3143 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3144 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2586 3145
2587 coro_stash = gv_stashpv ("Coro", TRUE); 3146 coro_stash = gv_stashpv ("Coro", TRUE);
2588 3147
2589 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3148 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2590 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3149 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2598 3157
2599 { 3158 {
2600 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3159 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2601 3160
2602 coroapi.schedule = api_schedule; 3161 coroapi.schedule = api_schedule;
3162 coroapi.schedule_to = api_schedule_to;
2603 coroapi.cede = api_cede; 3163 coroapi.cede = api_cede;
2604 coroapi.cede_notself = api_cede_notself; 3164 coroapi.cede_notself = api_cede_notself;
2605 coroapi.ready = api_ready; 3165 coroapi.ready = api_ready;
2606 coroapi.is_ready = api_is_ready; 3166 coroapi.is_ready = api_is_ready;
2607 coroapi.nready = coro_nready; 3167 coroapi.nready = coro_nready;
2608 coroapi.current = coro_current; 3168 coroapi.current = coro_current;
2609 3169
2610 GCoroAPI = &coroapi; 3170 /*GCoroAPI = &coroapi;*/
2611 sv_setiv (sv, (IV)&coroapi); 3171 sv_setiv (sv, (IV)&coroapi);
2612 SvREADONLY_on (sv); 3172 SvREADONLY_on (sv);
2613 } 3173 }
2614} 3174}
3175
3176void
3177terminate (...)
3178 CODE:
3179 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2615 3180
2616void 3181void
2617schedule (...) 3182schedule (...)
2618 CODE: 3183 CODE:
2619 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3184 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2620 3185
2621void 3186void
3187schedule_to (...)
3188 CODE:
3189 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3190
3191void
3192cede_to (...)
3193 CODE:
3194 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3195
3196void
2622cede (...) 3197cede (...)
2623 CODE: 3198 CODE:
2624 CORO_EXECUTE_SLF_XS (slf_init_cede); 3199 CORO_EXECUTE_SLF_XS (slf_init_cede);
2625 3200
2626void 3201void
2627cede_notself (...) 3202cede_notself (...)
2628 CODE: 3203 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3204 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3205
3206void
3207_cancel (Coro::State self)
3208 CODE:
3209 coro_state_destroy (aTHX_ self);
3210 coro_call_on_destroy (aTHX_ self);
2630 3211
2631void 3212void
2632_set_current (SV *current) 3213_set_current (SV *current)
2633 PROTOTYPE: $ 3214 PROTOTYPE: $
2634 CODE: 3215 CODE:
… …
2679 CODE: 3260 CODE:
2680 RETVAL = coro_nready; 3261 RETVAL = coro_nready;
2681 OUTPUT: 3262 OUTPUT:
2682 RETVAL 3263 RETVAL
2683 3264
2684# for async_pool speedup
2685void 3265void
2686_pool_1 (SV *cb) 3266_pool_handler (...)
2687 CODE: 3267 CODE:
2688{ 3268 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 3269
2696 if (!invoke) 3270void
3271async_pool (SV *cv, ...)
3272 PROTOTYPE: &@
3273 PPCODE:
3274{
3275 HV *hv = (HV *)av_pop (av_async_pool);
3276 AV *av = newAV ();
3277 SV *cb = ST (0);
3278 int i;
3279
3280 av_extend (av, items - 2);
3281 for (i = 1; i < items; ++i)
3282 av_push (av, SvREFCNT_inc_NN (ST (i)));
3283
3284 if ((SV *)hv == &PL_sv_undef)
2697 { 3285 {
2698 SV *old = PL_diehook; 3286 PUSHMARK (SP);
2699 PL_diehook = 0; 3287 EXTEND (SP, 2);
2700 SvREFCNT_dec (old); 3288 PUSHs (sv_Coro);
2701 croak ("\3async_pool terminate\2\n"); 3289 PUSHs ((SV *)cv_pool_handler);
3290 PUTBACK;
3291 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3292 SPAGAIN;
3293
3294 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2702 } 3295 }
2703 3296
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 { 3297 {
2717 av_fill (defav, len - 1); 3298 struct coro *coro = SvSTATE_hv (hv);
2718 for (i = 0; i < len; ++i) 3299
2719 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3300 assert (!coro->invoke_cb);
3301 assert (!coro->invoke_av);
3302 coro->invoke_cb = SvREFCNT_inc (cb);
3303 coro->invoke_av = av;
2720 } 3304 }
3305
3306 api_ready (aTHX_ (SV *)hv);
3307
3308 if (GIMME_V != G_VOID)
3309 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3310 else
3311 SvREFCNT_dec (hv);
2721} 3312}
3313
3314SV *
3315rouse_cb ()
3316 PROTOTYPE:
3317 CODE:
3318 RETVAL = coro_new_rouse_cb (aTHX);
3319 OUTPUT:
3320 RETVAL
2722 3321
2723void 3322void
2724_pool_2 (SV *cb) 3323rouse_wait (...)
3324 PROTOTYPE: ;$
2725 CODE: 3325 PPCODE:
2726{ 3326 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2727 HV *hv = (HV *)SvRV (coro_current);
2728 struct coro *coro = SvSTATE_hv ((SV *)hv);
2729
2730 sv_setsv (cb, &PL_sv_undef);
2731
2732 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2733 coro->saved_deffh = 0;
2734
2735 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
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
2744 av_clear (GvAV (PL_defgv));
2745 hv_store (hv, "desc", sizeof ("desc") - 1,
2746 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2747
2748 coro->prio = 0;
2749
2750 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2751 api_trace (aTHX_ coro_current, 0);
2752
2753 av_push (av_async_pool, newSVsv (coro_current));
2754}
2755 3327
2756 3328
2757MODULE = Coro::State PACKAGE = PerlIO::cede 3329MODULE = Coro::State PACKAGE = PerlIO::cede
2758 3330
2759BOOT: 3331BOOT:
… …
2761 3333
2762 3334
2763MODULE = Coro::State PACKAGE = Coro::Semaphore 3335MODULE = Coro::State PACKAGE = Coro::Semaphore
2764 3336
2765SV * 3337SV *
2766new (SV *klass, SV *count_ = 0) 3338new (SV *klass, SV *count = 0)
2767 CODE: 3339 CODE:
2768{ 3340 RETVAL = sv_bless (
2769 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3341 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),
2770 AV *av = newAV (); 3342 GvSTASH (CvGV (cv))
2771 SV **ary; 3343 );
3344 OUTPUT:
3345 RETVAL
2772 3346
2773 /* unfortunately, building manually saves memory */ 3347# helper for Coro::Channel
2774 Newx (ary, 2, SV *); 3348SV *
2775 AvALLOC (av) = ary; 3349_alloc (int count)
2776 AvARRAY (av) = ary; 3350 CODE:
2777 AvMAX (av) = 1; 3351 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: 3352 OUTPUT:
2784 RETVAL 3353 RETVAL
2785 3354
2786SV * 3355SV *
2787count (SV *self) 3356count (SV *self)
… …
2796 adjust = 1 3365 adjust = 1
2797 CODE: 3366 CODE:
2798 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3367 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2799 3368
2800void 3369void
2801down (SV *self) 3370down (...)
2802 CODE: 3371 CODE:
2803 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3372 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3373
3374void
3375wait (...)
3376 CODE:
3377 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2804 3378
2805void 3379void
2806try (SV *self) 3380try (SV *self)
2807 PPCODE: 3381 PPCODE:
2808{ 3382{
… …
2820 XSRETURN_NO; 3394 XSRETURN_NO;
2821} 3395}
2822 3396
2823void 3397void
2824waiters (SV *self) 3398waiters (SV *self)
2825 CODE: 3399 PPCODE:
2826{ 3400{
2827 AV *av = (AV *)SvRV (self); 3401 AV *av = (AV *)SvRV (self);
3402 int wcount = AvFILLp (av) + 1 - 1;
2828 3403
2829 if (GIMME_V == G_SCALAR) 3404 if (GIMME_V == G_SCALAR)
2830 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3405 XPUSHs (sv_2mortal (newSViv (wcount)));
2831 else 3406 else
2832 { 3407 {
2833 int i; 3408 int i;
2834 EXTEND (SP, AvFILLp (av) + 1 - 1); 3409 EXTEND (SP, wcount);
2835 for (i = 1; i <= AvFILLp (av); ++i) 3410 for (i = 1; i <= wcount; ++i)
2836 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3411 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2837 } 3412 }
2838} 3413}
3414
3415MODULE = Coro::State PACKAGE = Coro::Signal
3416
3417SV *
3418new (SV *klass)
3419 CODE:
3420 RETVAL = sv_bless (
3421 coro_waitarray_new (aTHX_ 0),
3422 GvSTASH (CvGV (cv))
3423 );
3424 OUTPUT:
3425 RETVAL
3426
3427void
3428wait (...)
3429 CODE:
3430 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3431
3432void
3433broadcast (SV *self)
3434 CODE:
3435{
3436 AV *av = (AV *)SvRV (self);
3437 coro_signal_wake (aTHX_ av, AvFILLp (av));
3438}
3439
3440void
3441send (SV *self)
3442 CODE:
3443{
3444 AV *av = (AV *)SvRV (self);
3445
3446 if (AvFILLp (av))
3447 coro_signal_wake (aTHX_ av, 1);
3448 else
3449 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3450}
3451
3452IV
3453awaited (SV *self)
3454 CODE:
3455 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3456 OUTPUT:
3457 RETVAL
2839 3458
2840 3459
2841MODULE = Coro::State PACKAGE = Coro::AnyEvent 3460MODULE = Coro::State PACKAGE = Coro::AnyEvent
2842 3461
2843BOOT: 3462BOOT:
… …
2871 3490
2872void 3491void
2873_register (char *target, char *proto, SV *req) 3492_register (char *target, char *proto, SV *req)
2874 CODE: 3493 CODE:
2875{ 3494{
2876 HV *st; 3495 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 */ 3496 /* newXSproto doesn't return the CV on 5.8 */
2880 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3497 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2881 sv_setpv ((SV *)slf_cv, proto); 3498 sv_setpv ((SV *)slf_cv, proto);
2882 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3499 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2883} 3500}

Diff Legend

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