ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.287 by root, Mon Nov 17 07:03:12 2008 UTC vs.
Revision 1.340 by root, Mon Dec 15 00:30:40 2008 UTC

… …
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
… …
95# define GV_NOTQUAL 0 95# define GV_NOTQUAL 0
96#endif 96#endif
97#ifndef newSV 97#ifndef newSV
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
100 109
101/* 5.8.7 */ 110/* 5.8.7 */
102#ifndef SvRV_set 111#ifndef SvRV_set
103# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
104#endif 113#endif
… …
117#endif 126#endif
118 127
119/* The next macros try to return the current stack pointer, in an as 128/* The next macros try to return the current stack pointer, in an as
120 * portable way as possible. */ 129 * portable way as possible. */
121#if __GNUC__ >= 4 130#if __GNUC__ >= 4
131# define dSTACKLEVEL int stacklevel_dummy
122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0) 132# define STACKLEVEL __builtin_frame_address (0)
123#else 133#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel)
125#endif 136#endif
126 137
127#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
128 139
129#if __GNUC__ >= 3 140#if __GNUC__ >= 3
130# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
131# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline 143# define INLINE static inline
… …
140#define expect_true(expr) expect ((expr) != 0, 1) 151#define expect_true(expr) expect ((expr) != 0, 1)
141 152
142#define NOINLINE attribute ((noinline)) 153#define NOINLINE attribute ((noinline))
143 154
144#include "CoroAPI.h" 155#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */
145 157
146#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
147# if CORO_PTHREAD 159# if CORO_PTHREAD
148static void *coro_thx; 160static void *coro_thx;
149# endif 161# endif
150#endif 162#endif
151 163
152static double (*nvtime)(); /* so why doesn't it take void? */ 164static double (*nvtime)(); /* so why doesn't it take void? */
165
166/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX);
153 169
154static U32 cctx_gen; 170static U32 cctx_gen;
155static size_t cctx_stacksize = CORO_STACKSIZE; 171static size_t cctx_stacksize = CORO_STACKSIZE;
156static struct CoroAPI coroapi; 172static struct CoroAPI coroapi;
157static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
158static JMPENV *main_top_env; 174static JMPENV *main_top_env;
159static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
160static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
161 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
162static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
163static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
164static SV *rv_diehook; 184static SV *rv_diehook;
165static SV *rv_warnhook; 185static SV *rv_warnhook;
166static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
167 187
168/* async_pool helper stuff */ 188/* async_pool helper stuff */
169static SV *sv_pool_rss; 189static SV *sv_pool_rss;
170static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
171static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
172 196
173/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
174static SV *sv_activity; 198static SV *sv_activity;
175 199
176static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
205 int valgrind_id; 229 int valgrind_id;
206#endif 230#endif
207 unsigned char flags; 231 unsigned char flags;
208} coro_cctx; 232} coro_cctx;
209 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
210enum { 238enum {
211 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
212 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
213 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
214 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
… …
219{ 247{
220 SV *defsv; 248 SV *defsv;
221 AV *defav; 249 AV *defav;
222 SV *errsv; 250 SV *errsv;
223 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
224#define VAR(name,type) type name; 253#define VAR(name,type) type name;
225# include "state.h" 254# include "state.h"
226#undef VAR 255#undef VAR
227} perl_slots; 256} perl_slots;
228 257
… …
236 /* state data */ 265 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 266 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 267 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 268 perl_slots *slot; /* basically the saved sp */
240 269
270 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 271 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */ 272 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 273 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 274 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); 275 void (*on_destroy)(pTHX_ struct coro *coro);
246 276
247 /* statistics */ 277 /* statistics */
248 int usecount; /* number of transfers to this coro */ 278 int usecount; /* number of transfers to this coro */
249 279
250 /* coro process data */ 280 /* coro process data */
251 int prio; 281 int prio;
252 SV *throw; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
283 SV *rouse_cb;
253 284
254 /* async_pool */ 285 /* async_pool */
255 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
289
290 /* on_enter/on_leave */
291 AV *on_enter;
292 AV *on_leave;
256 293
257 /* linked list */ 294 /* linked list */
258 struct coro *next, *prev; 295 struct coro *next, *prev;
259}; 296};
260 297
… …
263 300
264/* the following variables are effectively part of the perl context */ 301/* the following variables are effectively part of the perl context */
265/* and get copied between struct coro and these variables */ 302/* and get copied between struct coro and these variables */
266/* the mainr easonw e don't support windows process emulation */ 303/* the mainr easonw e don't support windows process emulation */
267static struct CoroSLF slf_frame; /* the current slf frame */ 304static struct CoroSLF slf_frame; /* the current slf frame */
268static SV *coro_throw;
269 305
270/** Coro ********************************************************************/ 306/** Coro ********************************************************************/
271 307
272#define PRIO_MAX 3 308#define PRIO_MAX 3
273#define PRIO_HIGH 1 309#define PRIO_HIGH 1
… …
278 314
279/* for Coro.pm */ 315/* for Coro.pm */
280static SV *coro_current; 316static SV *coro_current;
281static SV *coro_readyhook; 317static SV *coro_readyhook;
282static 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;
283static struct coro *coro_first; 320static struct coro *coro_first;
284#define coro_nready coroapi.nready 321#define coro_nready coroapi.nready
285 322
286/** lowlevel stuff **********************************************************/ 323/** lowlevel stuff **********************************************************/
287 324
… …
313 get_hv (name, create); 350 get_hv (name, create);
314#endif 351#endif
315 return get_hv (name, create); 352 return get_hv (name, create);
316} 353}
317 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
318static AV * 421static AV *
319coro_clone_padlist (pTHX_ CV *cv) 422coro_derive_padlist (pTHX_ CV *cv)
320{ 423{
321 AV *padlist = CvPADLIST (cv); 424 AV *padlist = CvPADLIST (cv);
322 AV *newpadlist, *newpad; 425 AV *newpadlist, *newpad;
323 426
324 newpadlist = newAV (); 427 newpadlist = newAV ();
… …
329 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 432 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
330#endif 433#endif
331 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 434 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
332 --AvFILLp (padlist); 435 --AvFILLp (padlist);
333 436
334 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 437 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
335 av_store (newpadlist, 1, (SV *)newpad); 438 av_store (newpadlist, 1, (SV *)newpad);
336 439
337 return newpadlist; 440 return newpadlist;
338} 441}
339 442
340static void 443static void
341free_padlist (pTHX_ AV *padlist) 444free_padlist (pTHX_ AV *padlist)
342{ 445{
343 /* may be during global destruction */ 446 /* may be during global destruction */
344 if (SvREFCNT (padlist)) 447 if (!IN_DESTRUCT)
345 { 448 {
346 I32 i = AvFILLp (padlist); 449 I32 i = AvFILLp (padlist);
347 while (i >= 0) 450
451 while (i > 0) /* special-case index 0 */
348 { 452 {
349 SV **svp = av_fetch (padlist, i--, FALSE); 453 /* we try to be extra-careful here */
350 if (svp) 454 AV *av = (AV *)AvARRAY (padlist)[i--];
351 { 455 I32 j = AvFILLp (av);
352 SV *sv; 456
353 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 457 while (j >= 0)
458 SvREFCNT_dec (AvARRAY (av)[j--]);
459
460 AvFILLp (av) = -1;
354 SvREFCNT_dec (sv); 461 SvREFCNT_dec (av);
355
356 SvREFCNT_dec (*svp);
357 }
358 } 462 }
359 463
464 SvREFCNT_dec (AvARRAY (padlist)[0]);
465
466 AvFILLp (padlist) = -1;
360 SvREFCNT_dec ((SV*)padlist); 467 SvREFCNT_dec ((SV*)padlist);
361 } 468 }
362} 469}
363 470
364static int 471static int
… …
373 480
374 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 481 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
375 482
376 return 0; 483 return 0;
377} 484}
378
379#define CORO_MAGIC_type_cv 26
380#define CORO_MAGIC_type_state PERL_MAGIC_ext
381 485
382static MGVTBL coro_cv_vtbl = { 486static MGVTBL coro_cv_vtbl = {
383 0, 0, 0, 0, 487 0, 0, 0, 0,
384 coro_cv_free 488 coro_cv_free
385}; 489};
386
387#define CORO_MAGIC_NN(sv, type) \
388 (expect_true (SvMAGIC (sv)->mg_type == type) \
389 ? SvMAGIC (sv) \
390 : mg_find (sv, type))
391
392#define CORO_MAGIC(sv, type) \
393 (expect_true (SvMAGIC (sv)) \
394 ? CORO_MAGIC_NN (sv, type) \
395 : 0)
396
397#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
398#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
399
400INLINE struct coro *
401SvSTATE_ (pTHX_ SV *coro)
402{
403 HV *stash;
404 MAGIC *mg;
405
406 if (SvROK (coro))
407 coro = SvRV (coro);
408
409 if (expect_false (SvTYPE (coro) != SVt_PVHV))
410 croak ("Coro::State object required");
411
412 stash = SvSTASH (coro);
413 if (expect_false (stash != coro_stash && stash != coro_state_stash))
414 {
415 /* very slow, but rare, check */
416 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
417 croak ("Coro::State object required");
418 }
419
420 mg = CORO_MAGIC_state (coro);
421 return (struct coro *)mg->mg_ptr;
422}
423
424#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
425
426/* faster than SvSTATE, but expects a coroutine hv */
427#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
428#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
429 490
430/* the next two functions merely cache the padlists */ 491/* the next two functions merely cache the padlists */
431static void 492static void
432get_padlist (pTHX_ CV *cv) 493get_padlist (pTHX_ CV *cv)
433{ 494{
… …
439 else 500 else
440 { 501 {
441#if CORO_PREFER_PERL_FUNCTIONS 502#if CORO_PREFER_PERL_FUNCTIONS
442 /* this is probably cleaner? but also slower! */ 503 /* this is probably cleaner? but also slower! */
443 /* in practise, it seems to be less stable */ 504 /* in practise, it seems to be less stable */
444 CV *cp = Perl_cv_clone (cv); 505 CV *cp = Perl_cv_clone (aTHX_ cv);
445 CvPADLIST (cv) = CvPADLIST (cp); 506 CvPADLIST (cv) = CvPADLIST (cp);
446 CvPADLIST (cp) = 0; 507 CvPADLIST (cp) = 0;
447 SvREFCNT_dec (cp); 508 SvREFCNT_dec (cp);
448#else 509#else
449 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 510 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
450#endif 511#endif
451 } 512 }
452} 513}
453 514
454static void 515static void
… …
461 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);
462 523
463 av = (AV *)mg->mg_obj; 524 av = (AV *)mg->mg_obj;
464 525
465 if (expect_false (AvFILLp (av) >= AvMAX (av))) 526 if (expect_false (AvFILLp (av) >= AvMAX (av)))
466 av_extend (av, AvMAX (av) + 1); 527 av_extend (av, AvFILLp (av) + 1);
467 528
468 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
469} 530}
470 531
471/** load & save, init *******************************************************/ 532/** load & save, init *******************************************************/
533
534static void
535on_enterleave_call (pTHX_ SV *cb);
472 536
473static void 537static void
474load_perl (pTHX_ Coro__State c) 538load_perl (pTHX_ Coro__State c)
475{ 539{
476 perl_slots *slot = c->slot; 540 perl_slots *slot = c->slot;
477 c->slot = 0; 541 c->slot = 0;
478 542
479 PL_mainstack = c->mainstack; 543 PL_mainstack = c->mainstack;
480 544
481 GvSV (PL_defgv) = slot->defsv; 545 GvSV (PL_defgv) = slot->defsv;
482 GvAV (PL_defgv) = slot->defav; 546 GvAV (PL_defgv) = slot->defav;
483 GvSV (PL_errgv) = slot->errsv; 547 GvSV (PL_errgv) = slot->errsv;
484 GvSV (irsgv) = slot->irsgv; 548 GvSV (irsgv) = slot->irsgv;
549 GvHV (PL_hintgv) = slot->hinthv;
485 550
486 #define VAR(name,type) PL_ ## name = slot->name; 551 #define VAR(name,type) PL_ ## name = slot->name;
487 # include "state.h" 552 # include "state.h"
488 #undef VAR 553 #undef VAR
489 554
… …
502 567
503 PUTBACK; 568 PUTBACK;
504 } 569 }
505 570
506 slf_frame = c->slf_frame; 571 slf_frame = c->slf_frame;
507 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 (aTHX_ AvARRAY (c->on_enter)[i]);
580 }
508} 581}
509 582
510static void 583static void
511save_perl (pTHX_ Coro__State c) 584save_perl (pTHX_ Coro__State c)
512{ 585{
513 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 (aTHX_ AvARRAY (c->on_leave)[i]);
592 }
593
594 c->except = CORO_THROW;
514 c->slf_frame = slf_frame; 595 c->slf_frame = slf_frame;
515 596
516 { 597 {
517 dSP; 598 dSP;
518 I32 cxix = cxstack_ix; 599 I32 cxix = cxstack_ix;
… …
575 c->mainstack = PL_mainstack; 656 c->mainstack = PL_mainstack;
576 657
577 { 658 {
578 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
579 660
580 slot->defav = GvAV (PL_defgv); 661 slot->defav = GvAV (PL_defgv);
581 slot->defsv = DEFSV; 662 slot->defsv = DEFSV;
582 slot->errsv = ERRSV; 663 slot->errsv = ERRSV;
583 slot->irsgv = GvSV (irsgv); 664 slot->irsgv = GvSV (irsgv);
665 slot->hinthv = GvHV (PL_hintgv);
584 666
585 #define VAR(name,type) slot->name = PL_ ## name; 667 #define VAR(name,type) slot->name = PL_ ## name;
586 # include "state.h" 668 # include "state.h"
587 #undef VAR 669 #undef VAR
588 } 670 }
… …
593 * of perl.c:init_stacks, except that it uses less memory 675 * of perl.c:init_stacks, except that it uses less memory
594 * on the (sometimes correct) assumption that coroutines do 676 * on the (sometimes correct) assumption that coroutines do
595 * not usually need a lot of stackspace. 677 * not usually need a lot of stackspace.
596 */ 678 */
597#if CORO_PREFER_PERL_FUNCTIONS 679#if CORO_PREFER_PERL_FUNCTIONS
598# define coro_init_stacks init_stacks 680# define coro_init_stacks(thx) init_stacks ()
599#else 681#else
600static void 682static void
601coro_init_stacks (pTHX) 683coro_init_stacks (pTHX)
602{ 684{
603 PL_curstackinfo = new_stackinfo(32, 8); 685 PL_curstackinfo = new_stackinfo(32, 8);
… …
666#if !PERL_VERSION_ATLEAST (5,10,0) 748#if !PERL_VERSION_ATLEAST (5,10,0)
667 Safefree (PL_retstack); 749 Safefree (PL_retstack);
668#endif 750#endif
669} 751}
670 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
671static size_t 762static size_t
672coro_rss (pTHX_ struct coro *coro) 763coro_rss (pTHX_ struct coro *coro)
673{ 764{
674 size_t rss = sizeof (*coro); 765 size_t rss = sizeof (*coro);
675 766
676 if (coro->mainstack) 767 if (coro->mainstack)
677 { 768 {
678 perl_slots tmp_slot;
679 perl_slots *slot;
680
681 if (coro->flags & CF_RUNNING) 769 if (coro->flags & CF_RUNNING)
682 { 770 {
683 slot = &tmp_slot; 771 #define SYM(sym) PL_ ## sym
684 772 CORO_RSS;
685 #define VAR(name,type) slot->name = PL_ ## name;
686 # include "state.h"
687 #undef VAR 773 #undef SYM
688 } 774 }
689 else 775 else
690 slot = coro->slot;
691
692 if (slot)
693 { 776 {
694 rss += sizeof (slot->curstackinfo); 777 #define SYM(sym) coro->slot->sym
695 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 778 CORO_RSS;
696 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 779 #undef SYM
697 rss += slot->tmps_max * sizeof (SV *);
698 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
699 rss += slot->scopestack_max * sizeof (I32);
700 rss += slot->savestack_max * sizeof (ANY);
701
702#if !PERL_VERSION_ATLEAST (5,10,0)
703 rss += slot->retstack_max * sizeof (OP *);
704#endif
705 } 780 }
706 } 781 }
707 782
708 return rss; 783 return rss;
709} 784}
… …
722#endif 797#endif
723 798
724/* 799/*
725 * This overrides the default magic get method of %SIG elements. 800 * This overrides the default magic get method of %SIG elements.
726 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 801 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
727 * and instead of tryign to save and restore the hash elements, we just provide 802 * and instead of trying to save and restore the hash elements, we just provide
728 * readback here. 803 * readback here.
729 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
730 * not expecting this to actually change the hook. This is a potential problem
731 * when a schedule happens then, but we ignore this.
732 */ 804 */
733static int 805static int
734coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 806coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
735{ 807{
736 const char *s = MgPV_nolen_const (mg); 808 const char *s = MgPV_nolen_const (mg);
… …
789 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 861 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
790 862
791 if (svp) 863 if (svp)
792 { 864 {
793 SV *old = *svp; 865 SV *old = *svp;
794 *svp = newSVsv (sv); 866 *svp = SvOK (sv) ? newSVsv (sv) : 0;
795 SvREFCNT_dec (old); 867 SvREFCNT_dec (old);
796 return 0; 868 return 0;
797 } 869 }
798 } 870 }
799 871
… …
810static int 882static int
811slf_check_nop (pTHX_ struct CoroSLF *frame) 883slf_check_nop (pTHX_ struct CoroSLF *frame)
812{ 884{
813 return 0; 885 return 0;
814} 886}
887
888static int
889slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{
891 return 1;
892}
893
894static UNOP coro_setup_op;
815 895
816static 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 */
817coro_setup (pTHX_ struct coro *coro) 897coro_setup (pTHX_ struct coro *coro)
818{ 898{
819 /* 899 /*
… …
823 903
824 PL_runops = RUNOPS_DEFAULT; 904 PL_runops = RUNOPS_DEFAULT;
825 PL_curcop = &PL_compiling; 905 PL_curcop = &PL_compiling;
826 PL_in_eval = EVAL_NULL; 906 PL_in_eval = EVAL_NULL;
827 PL_comppad = 0; 907 PL_comppad = 0;
908 PL_comppad_name = 0;
909 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0;
828 PL_curpm = 0; 911 PL_curpm = 0;
829 PL_curpad = 0; 912 PL_curpad = 0;
830 PL_localizing = 0; 913 PL_localizing = 0;
831 PL_dirty = 0; 914 PL_dirty = 0;
832 PL_restartop = 0; 915 PL_restartop = 0;
833#if PERL_VERSION_ATLEAST (5,10,0) 916#if PERL_VERSION_ATLEAST (5,10,0)
834 PL_parser = 0; 917 PL_parser = 0;
835#endif 918#endif
919 PL_hints = 0;
836 920
837 /* recreate the die/warn hooks */ 921 /* recreate the die/warn hooks */
838 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 );
839 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);
840 924
841 GvSV (PL_defgv) = newSV (0); 925 GvSV (PL_defgv) = newSV (0);
842 GvAV (PL_defgv) = coro->args; coro->args = 0; 926 GvAV (PL_defgv) = coro->args; coro->args = 0;
843 GvSV (PL_errgv) = newSV (0); 927 GvSV (PL_errgv) = newSV (0);
844 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;
845 PL_rs = newSVsv (GvSV (irsgv)); 930 PL_rs = newSVsv (GvSV (irsgv));
846 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 931 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
847 932
848 { 933 {
849 dSP; 934 dSP;
850 UNOP myop; 935 UNOP myop;
851 936
852 Zero (&myop, 1, UNOP); 937 Zero (&myop, 1, UNOP);
853 myop.op_next = Nullop; 938 myop.op_next = Nullop;
939 myop.op_type = OP_ENTERSUB;
854 myop.op_flags = OPf_WANT_VOID; 940 myop.op_flags = OPf_WANT_VOID;
855 941
856 PUSHMARK (SP); 942 PUSHMARK (SP);
857 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 943 PUSHs ((SV *)coro->startcv);
858 PUTBACK; 944 PUTBACK;
859 PL_op = (OP *)&myop; 945 PL_op = (OP *)&myop;
860 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 946 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
861 SPAGAIN;
862 } 947 }
863 948
864 /* 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
865 * 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.
866 */ 951 */
867 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 */
868 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 */
869 954
870 coro_throw = coro->throw; 955 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
871} 956 coro_setup_op.op_next = PL_op;
957 coro_setup_op.op_type = OP_ENTERSUB;
958 coro_setup_op.op_ppaddr = pp_slf;
959 /* no flags etc. required, as an init function won't be called */
872 960
961 PL_op = (OP *)&coro_setup_op;
962
963 /* copy throw, in case it was set before coro_setup */
964 CORO_THROW = coro->except;
965}
966
873static void 967static void
874coro_destruct (pTHX_ struct coro *coro) 968coro_unwind_stacks (pTHX)
875{ 969{
876 if (!IN_DESTRUCT) 970 if (!IN_DESTRUCT)
877 { 971 {
878 /* restore all saved variables and stuff */ 972 /* restore all saved variables and stuff */
879 LEAVE_SCOPE (0); 973 LEAVE_SCOPE (0);
… …
887 POPSTACK_TO (PL_mainstack); 981 POPSTACK_TO (PL_mainstack);
888 982
889 /* unwind main stack */ 983 /* unwind main stack */
890 dounwind (-1); 984 dounwind (-1);
891 } 985 }
986}
987
988static void
989coro_destruct_perl (pTHX_ struct coro *coro)
990{
991 coro_unwind_stacks (aTHX);
892 992
893 SvREFCNT_dec (GvSV (PL_defgv)); 993 SvREFCNT_dec (GvSV (PL_defgv));
894 SvREFCNT_dec (GvAV (PL_defgv)); 994 SvREFCNT_dec (GvAV (PL_defgv));
895 SvREFCNT_dec (GvSV (PL_errgv)); 995 SvREFCNT_dec (GvSV (PL_errgv));
896 SvREFCNT_dec (PL_defoutgv); 996 SvREFCNT_dec (PL_defoutgv);
897 SvREFCNT_dec (PL_rs); 997 SvREFCNT_dec (PL_rs);
898 SvREFCNT_dec (GvSV (irsgv)); 998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
899 1000
900 SvREFCNT_dec (PL_diehook); 1001 SvREFCNT_dec (PL_diehook);
901 SvREFCNT_dec (PL_warnhook); 1002 SvREFCNT_dec (PL_warnhook);
902 1003
903 SvREFCNT_dec (coro->saved_deffh); 1004 SvREFCNT_dec (coro->saved_deffh);
904 SvREFCNT_dec (coro_throw); 1005 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av);
905 1008
906 coro_destruct_stacks (aTHX); 1009 coro_destruct_stacks (aTHX);
907} 1010}
908 1011
909INLINE void 1012INLINE void
… …
919static int 1022static int
920runops_trace (pTHX) 1023runops_trace (pTHX)
921{ 1024{
922 COP *oldcop = 0; 1025 COP *oldcop = 0;
923 int oldcxix = -2; 1026 int oldcxix = -2;
924 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
925 coro_cctx *cctx = coro->cctx;
926 1027
927 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1028 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
928 { 1029 {
929 PERL_ASYNC_CHECK (); 1030 PERL_ASYNC_CHECK ();
930 1031
931 if (cctx->flags & CC_TRACE_ALL) 1032 if (cctx_current->flags & CC_TRACE_ALL)
932 { 1033 {
933 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)
934 { 1035 {
935 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1036 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
936 SV **bot, **top; 1037 SV **bot, **top;
937 AV *av = newAV (); /* return values */ 1038 AV *av = newAV (); /* return values */
938 SV **cb; 1039 SV **cb;
… …
975 1076
976 if (PL_curcop != &PL_compiling) 1077 if (PL_curcop != &PL_compiling)
977 { 1078 {
978 SV **cb; 1079 SV **cb;
979 1080
980 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1081 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
981 { 1082 {
982 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1083 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
983 1084
984 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1085 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
985 { 1086 {
986 runops_proc_t old_runops = PL_runops;
987 dSP; 1087 dSP;
988 GV *gv = CvGV (cx->blk_sub.cv); 1088 GV *gv = CvGV (cx->blk_sub.cv);
989 SV *fullname = sv_2mortal (newSV (0)); 1089 SV *fullname = sv_2mortal (newSV (0));
990 1090
991 if (isGV (gv)) 1091 if (isGV (gv))
… …
996 SAVETMPS; 1096 SAVETMPS;
997 EXTEND (SP, 3); 1097 EXTEND (SP, 3);
998 PUSHMARK (SP); 1098 PUSHMARK (SP);
999 PUSHs (&PL_sv_yes); 1099 PUSHs (&PL_sv_yes);
1000 PUSHs (fullname); 1100 PUSHs (fullname);
1001 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);
1002 PUTBACK; 1102 PUTBACK;
1003 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);
1004 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);
1005 SPAGAIN; 1105 SPAGAIN;
1006 FREETMPS; 1106 FREETMPS;
… …
1009 } 1109 }
1010 1110
1011 oldcxix = cxstack_ix; 1111 oldcxix = cxstack_ix;
1012 } 1112 }
1013 1113
1014 if (cctx->flags & CC_TRACE_LINE) 1114 if (cctx_current->flags & CC_TRACE_LINE)
1015 { 1115 {
1016 dSP; 1116 dSP;
1017 1117
1018 PL_runops = RUNOPS_DEFAULT; 1118 PL_runops = RUNOPS_DEFAULT;
1019 ENTER; 1119 ENTER;
… …
1038 1138
1039 TAINT_NOT; 1139 TAINT_NOT;
1040 return 0; 1140 return 0;
1041} 1141}
1042 1142
1143static struct CoroSLF cctx_ssl_frame;
1144
1043static void 1145static void
1044prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx) 1146slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1045{ 1147{
1046 ta->prev = (struct coro *)cctx;
1047 ta->next = 0; 1148 ta->prev = 0;
1048} 1149}
1049 1150
1050/* inject a fake call to Coro::State::_cctx_init into the execution */ 1151static int
1051/* _cctx_init should be careful, as it could be called at almost any time */ 1152slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1052/* during execution of a perl program */ 1153{
1053/* also initialises PL_top_env */ 1154 *frame = cctx_ssl_frame;
1155
1156 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1157}
1158
1159/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1054static void NOINLINE 1160static void NOINLINE
1055cctx_prepare (pTHX_ coro_cctx *cctx) 1161cctx_prepare (pTHX)
1056{ 1162{
1057 dSP;
1058 UNOP myop;
1059
1060 PL_top_env = &PL_start_env; 1163 PL_top_env = &PL_start_env;
1061 1164
1062 if (cctx->flags & CC_TRACE) 1165 if (cctx_current->flags & CC_TRACE)
1063 PL_runops = runops_trace; 1166 PL_runops = runops_trace;
1064 1167
1065 Zero (&myop, 1, UNOP); 1168 /* we already must be executing an SLF op, there is no other valid way
1066 myop.op_next = PL_op; 1169 * that can lead to creation of a new cctx */
1067 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1170 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1171 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1068 1172
1069 PUSHMARK (SP); 1173 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1070 EXTEND (SP, 2); 1174 cctx_ssl_frame = slf_frame;
1071 PUSHs (sv_2mortal (newSViv ((IV)cctx))); 1175
1072 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1176 slf_frame.prepare = slf_prepare_set_stacklevel;
1073 PUTBACK; 1177 slf_frame.check = slf_check_set_stacklevel;
1074 PL_op = (OP *)&myop;
1075 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1076 SPAGAIN;
1077} 1178}
1078 1179
1079/* the tail of transfer: execute stuff we can only do after a transfer */ 1180/* the tail of transfer: execute stuff we can only do after a transfer */
1080INLINE void 1181INLINE void
1081transfer_tail (pTHX) 1182transfer_tail (pTHX)
… …
1100 /* normally we would need to skip the entersub here */ 1201 /* normally we would need to skip the entersub here */
1101 /* 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 */
1102 /* PL_nop = PL_nop->op_next */ 1203 /* PL_nop = PL_nop->op_next */
1103 1204
1104 /* inject a fake subroutine call to cctx_init */ 1205 /* inject a fake subroutine call to cctx_init */
1105 cctx_prepare (aTHX_ (coro_cctx *)arg); 1206 cctx_prepare (aTHX);
1106 1207
1107 /* cctx_run is the alternative tail of transfer() */ 1208 /* cctx_run is the alternative tail of transfer() */
1108 transfer_tail (aTHX); 1209 transfer_tail (aTHX);
1109 1210
1110 /* 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 */
1111 PL_restartop = PL_op; 1212 PL_restartop = PL_op;
1112 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 */
1113 1218
1114 /* 1219 /*
1115 * 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
1116 * 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)
1117 * 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
1118 * bootstrap-time "top" top_env, as we cannot restore the "main" 1223 * bootstrap-time "top" top_env, as we cannot restore the "main"
1119 * 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.
1120 */ 1227 */
1121 PL_top_env = main_top_env; 1228 PL_top_env = main_top_env;
1122 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 */
1123 } 1230 }
1124} 1231}
… …
1201cctx_destroy (coro_cctx *cctx) 1308cctx_destroy (coro_cctx *cctx)
1202{ 1309{
1203 if (!cctx) 1310 if (!cctx)
1204 return; 1311 return;
1205 1312
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1314
1206 --cctx_count; 1315 --cctx_count;
1207 coro_destroy (&cctx->cctx); 1316 coro_destroy (&cctx->cctx);
1208 1317
1209 /* coro_transfer creates new, empty cctx's */ 1318 /* coro_transfer creates new, empty cctx's */
1210 if (cctx->sptr) 1319 if (cctx->sptr)
… …
1273 /* TODO: throwing up here is considered harmful */ 1382 /* TODO: throwing up here is considered harmful */
1274 1383
1275 if (expect_true (prev != next)) 1384 if (expect_true (prev != next))
1276 { 1385 {
1277 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1278 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1387 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1279 1388
1280 if (expect_false (next->flags & CF_RUNNING)) 1389 if (expect_false (next->flags & CF_RUNNING))
1281 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1282 1391
1283 if (expect_false (next->flags & CF_DESTROYED)) 1392 if (expect_false (next->flags & CF_DESTROYED))
… …
1295transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1404transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1296{ 1405{
1297 dSTACKLEVEL; 1406 dSTACKLEVEL;
1298 1407
1299 /* sometimes transfer is only called to set idle_sp */ 1408 /* sometimes transfer is only called to set idle_sp */
1300 if (expect_false (!next)) 1409 if (expect_false (!prev))
1301 { 1410 {
1302 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1411 cctx_current->idle_sp = STACKLEVEL;
1303 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 */
1304 } 1413 }
1305 else if (expect_true (prev != next)) 1414 else if (expect_true (prev != next))
1306 { 1415 {
1307 coro_cctx *prev__cctx; 1416 coro_cctx *cctx_prev;
1308 1417
1309 if (expect_false (prev->flags & CF_NEW)) 1418 if (expect_false (prev->flags & CF_NEW))
1310 { 1419 {
1311 /* create a new empty/source context */ 1420 /* create a new empty/source context */
1312 prev->cctx = cctx_new_empty ();
1313 prev->flags &= ~CF_NEW; 1421 prev->flags &= ~CF_NEW;
1314 prev->flags |= CF_RUNNING; 1422 prev->flags |= CF_RUNNING;
1315 } 1423 }
1316 1424
1317 prev->flags &= ~CF_RUNNING; 1425 prev->flags &= ~CF_RUNNING;
… …
1328 coro_setup (aTHX_ next); 1436 coro_setup (aTHX_ next);
1329 } 1437 }
1330 else 1438 else
1331 load_perl (aTHX_ next); 1439 load_perl (aTHX_ next);
1332 1440
1333 prev__cctx = prev->cctx;
1334
1335 /* possibly untie and reuse the cctx */ 1441 /* possibly untie and reuse the cctx */
1336 if (expect_true ( 1442 if (expect_true (
1337 prev__cctx->idle_sp == (void *)stacklevel 1443 cctx_current->idle_sp == STACKLEVEL
1338 && !(prev__cctx->flags & CC_TRACE) 1444 && !(cctx_current->flags & CC_TRACE)
1339 && !force_cctx 1445 && !force_cctx
1340 )) 1446 ))
1341 { 1447 {
1342 /* 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 */
1343 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));
1344 1450
1345 prev->cctx = 0;
1346
1347 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1451 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1348 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1452 /* without this the next cctx_get might destroy the running cctx while still in use */
1349 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1453 if (expect_false (CCTX_EXPIRED (cctx_current)))
1350 if (!next->cctx) 1454 if (expect_true (!next->cctx))
1351 next->cctx = cctx_get (aTHX); 1455 next->cctx = cctx_get (aTHX);
1352 1456
1353 cctx_put (prev__cctx); 1457 cctx_put (cctx_current);
1354 } 1458 }
1459 else
1460 prev->cctx = cctx_current;
1355 1461
1356 ++next->usecount; 1462 ++next->usecount;
1357 1463
1358 if (expect_true (!next->cctx)) 1464 cctx_prev = cctx_current;
1359 next->cctx = cctx_get (aTHX); 1465 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1360 1466
1361 if (expect_false (prev__cctx != next->cctx)) 1467 next->cctx = 0;
1468
1469 if (expect_false (cctx_prev != cctx_current))
1362 { 1470 {
1363 prev__cctx->top_env = PL_top_env; 1471 cctx_prev->top_env = PL_top_env;
1364 PL_top_env = next->cctx->top_env; 1472 PL_top_env = cctx_current->top_env;
1365 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1473 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1366 } 1474 }
1367 1475
1368 transfer_tail (aTHX); 1476 transfer_tail (aTHX);
1369 } 1477 }
1370} 1478}
… …
1392 --coro_nready; 1500 --coro_nready;
1393 } 1501 }
1394 else 1502 else
1395 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 */
1396 1504
1397 if (coro->mainstack && coro->mainstack != main_mainstack) 1505 if (coro->mainstack
1506 && coro->mainstack != main_mainstack
1507 && coro->slot
1508 && !PL_dirty)
1398 { 1509 {
1399 struct coro temp; 1510 struct coro *current = SvSTATE_current;
1400 1511
1401 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));
1402 1513
1403 save_perl (aTHX_ &temp); 1514 save_perl (aTHX_ current);
1404 load_perl (aTHX_ coro); 1515 load_perl (aTHX_ coro);
1405 1516
1406 coro_destruct (aTHX_ coro); 1517 coro_destruct_perl (aTHX_ coro);
1407 1518
1408 load_perl (aTHX_ &temp); 1519 load_perl (aTHX_ current);
1409 1520
1410 coro->slot = 0; 1521 coro->slot = 0;
1411 } 1522 }
1412 1523
1413 cctx_destroy (coro->cctx); 1524 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv);
1414 SvREFCNT_dec (coro->args); 1526 SvREFCNT_dec (coro->args);
1527 SvREFCNT_dec (CORO_THROW);
1415 1528
1416 if (coro->next) coro->next->prev = coro->prev; 1529 if (coro->next) coro->next->prev = coro->prev;
1417 if (coro->prev) coro->prev->next = coro->next; 1530 if (coro->prev) coro->prev->next = coro->next;
1418 if (coro == coro_first) coro_first = coro->next; 1531 if (coro == coro_first) coro_first = coro->next;
1419 1532
… …
1473 1586
1474 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1475 TRANSFER (ta, 1); 1588 TRANSFER (ta, 1);
1476} 1589}
1477 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
1478/** Coro ********************************************************************/ 1614/** Coro ********************************************************************/
1479 1615
1480INLINE void 1616INLINE void
1481coro_enq (pTHX_ struct coro *coro) 1617coro_enq (pTHX_ struct coro *coro)
1482{ 1618{
… …
1500{ 1636{
1501 struct coro *coro; 1637 struct coro *coro;
1502 SV *sv_hook; 1638 SV *sv_hook;
1503 void (*xs_hook)(void); 1639 void (*xs_hook)(void);
1504 1640
1505 if (SvROK (coro_sv))
1506 coro_sv = SvRV (coro_sv);
1507
1508 coro = SvSTATE (coro_sv); 1641 coro = SvSTATE (coro_sv);
1509 1642
1510 if (coro->flags & CF_READY) 1643 if (coro->flags & CF_READY)
1511 return 0; 1644 return 0;
1512 1645
… …
1525 ENTER; 1658 ENTER;
1526 SAVETMPS; 1659 SAVETMPS;
1527 1660
1528 PUSHMARK (SP); 1661 PUSHMARK (SP);
1529 PUTBACK; 1662 PUTBACK;
1530 call_sv (sv_hook, G_DISCARD); 1663 call_sv (sv_hook, G_VOID | G_DISCARD);
1531 SPAGAIN;
1532 1664
1533 FREETMPS; 1665 FREETMPS;
1534 LEAVE; 1666 LEAVE;
1535 } 1667 }
1536 1668
… …
1544api_is_ready (pTHX_ SV *coro_sv) 1676api_is_ready (pTHX_ SV *coro_sv)
1545{ 1677{
1546 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1678 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1547} 1679}
1548 1680
1681/* expects to own a reference to next->hv */
1549INLINE void 1682INLINE void
1550prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1683prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1551{ 1684{
1552 SV *prev_sv, *next_sv;
1553
1554 for (;;)
1555 {
1556 next_sv = coro_deq (aTHX);
1557
1558 /* nothing to schedule: call the idle handler */
1559 if (expect_false (!next_sv))
1560 {
1561 dSP;
1562
1563 ENTER;
1564 SAVETMPS;
1565
1566 PUSHMARK (SP);
1567 PUTBACK;
1568 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1569 SPAGAIN;
1570
1571 FREETMPS;
1572 LEAVE;
1573 continue;
1574 }
1575
1576 ta->next = SvSTATE_hv (next_sv);
1577
1578 /* cannot transfer to destroyed coros, skip and look for next */
1579 if (expect_false (ta->next->flags & CF_DESTROYED))
1580 {
1581 SvREFCNT_dec (next_sv);
1582 /* coro_nready has already been taken care of by destroy */
1583 continue;
1584 }
1585
1586 --coro_nready;
1587 break;
1588 }
1589
1590 /* free this only after the transfer */
1591 prev_sv = SvRV (coro_current); 1685 SV *prev_sv = SvRV (coro_current);
1686
1592 ta->prev = SvSTATE_hv (prev_sv); 1687 ta->prev = SvSTATE_hv (prev_sv);
1688 ta->next = next;
1689
1593 TRANSFER_CHECK (*ta); 1690 TRANSFER_CHECK (*ta);
1594 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1691
1595 ta->next->flags &= ~CF_READY;
1596 SvRV_set (coro_current, next_sv); 1692 SvRV_set (coro_current, (SV *)next->hv);
1597 1693
1598 free_coro_mortal (aTHX); 1694 free_coro_mortal (aTHX);
1599 coro_mortal = prev_sv; 1695 coro_mortal = prev_sv;
1600} 1696}
1601 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
1602INLINE void 1749INLINE void
1603prepare_cede (pTHX_ struct coro_transfer_args *ta) 1750prepare_cede (pTHX_ struct coro_transfer_args *ta)
1604{ 1751{
1605 api_ready (aTHX_ coro_current); 1752 api_ready (aTHX_ coro_current);
1606 prepare_schedule (aTHX_ ta); 1753 prepare_schedule (aTHX_ ta);
… …
1625{ 1772{
1626 struct coro_transfer_args ta; 1773 struct coro_transfer_args ta;
1627 1774
1628 prepare_schedule (aTHX_ &ta); 1775 prepare_schedule (aTHX_ &ta);
1629 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);
1630} 1787}
1631 1788
1632static int 1789static int
1633api_cede (pTHX) 1790api_cede (pTHX)
1634{ 1791{
… …
1663static void 1820static void
1664api_trace (pTHX_ SV *coro_sv, int flags) 1821api_trace (pTHX_ SV *coro_sv, int flags)
1665{ 1822{
1666 struct coro *coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1667 1824
1825 if (coro->flags & CF_RUNNING)
1826 croak ("cannot enable tracing on a running coroutine, caught");
1827
1668 if (flags & CC_TRACE) 1828 if (flags & CC_TRACE)
1669 { 1829 {
1670 if (!coro->cctx) 1830 if (!coro->cctx)
1671 coro->cctx = cctx_new_run (); 1831 coro->cctx = cctx_new_run ();
1672 else if (!(coro->cctx->flags & CC_TRACE)) 1832 else if (!(coro->cctx->flags & CC_TRACE))
1673 croak ("cannot enable tracing on coroutine with custom stack,"); 1833 croak ("cannot enable tracing on coroutine with custom stack, caught");
1674 1834
1675 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1835 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1676 } 1836 }
1677 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1837 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1678 { 1838 {
… …
1681 if (coro->flags & CF_RUNNING) 1841 if (coro->flags & CF_RUNNING)
1682 PL_runops = RUNOPS_DEFAULT; 1842 PL_runops = RUNOPS_DEFAULT;
1683 else 1843 else
1684 coro->slot->runops = RUNOPS_DEFAULT; 1844 coro->slot->runops = RUNOPS_DEFAULT;
1685 } 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;
1686} 2089}
1687 2090
1688/*****************************************************************************/ 2091/*****************************************************************************/
1689/* schedule-like-function opcode (SLF) */ 2092/* schedule-like-function opcode (SLF) */
1690 2093
… …
1714 2117
1715 RETURNOP (slf_restore.op_first); 2118 RETURNOP (slf_restore.op_first);
1716} 2119}
1717 2120
1718static void 2121static void
1719slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1720{
1721 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1722}
1723
1724static void
1725slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1726{
1727 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1728
1729 frame->prepare = slf_prepare_set_stacklevel;
1730 frame->check = slf_check_nop;
1731 frame->data = (void *)SvIV (arg [0]);
1732}
1733
1734static void
1735slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta) 2122slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1736{ 2123{
1737 SV **arg = (SV **)slf_frame.data; 2124 SV **arg = (SV **)slf_frame.data;
1738 2125
1739 prepare_transfer (aTHX_ ta, arg [0], arg [1]); 2126 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
… …
1756 frame->prepare = prepare_schedule; 2143 frame->prepare = prepare_schedule;
1757 frame->check = slf_check_nop; 2144 frame->check = slf_check_nop;
1758} 2145}
1759 2146
1760static void 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);
2173}
2174
2175static void
1761slf_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)
1762{ 2177{
1763 frame->prepare = prepare_cede; 2178 frame->prepare = prepare_cede;
1764 frame->check = slf_check_nop; 2179 frame->check = slf_check_nop;
1765} 2180}
… …
1768slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2183slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1769{ 2184{
1770 frame->prepare = prepare_cede_notself; 2185 frame->prepare = prepare_cede_notself;
1771 frame->check = slf_check_nop; 2186 frame->check = slf_check_nop;
1772} 2187}
1773
1774/* we hijack an hopefully unused CV flag for our purposes */
1775#define CVf_SLF 0x4000
1776 2188
1777/* 2189/*
1778 * these not obviously related functions are all rolled into one 2190 * these not obviously related functions are all rolled into one
1779 * function to increase chances that they all will call transfer with the same 2191 * function to increase chances that they all will call transfer with the same
1780 * stack offset 2192 * stack offset
… …
1836 } 2248 }
1837 while (slf_frame.check (aTHX_ &slf_frame)); 2249 while (slf_frame.check (aTHX_ &slf_frame));
1838 2250
1839 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 */
1840 2252
1841 /* return value handling - mostly like entersub */
1842 {
1843 dSP;
1844 SV **bot = PL_stack_base + checkmark;
1845 int gimme = GIMME_V;
1846
1847 /* make sure we put something on the stack in scalar context */
1848 if (gimme == G_SCALAR)
1849 {
1850 if (sp == bot)
1851 XPUSHs (&PL_sv_undef);
1852
1853 SP = bot + 1;
1854 }
1855
1856 PUTBACK;
1857 }
1858
1859 /* exception handling */ 2253 /* exception handling */
1860 if (expect_false (coro_throw)) 2254 if (expect_false (CORO_THROW))
1861 { 2255 {
1862 SV *exception = sv_2mortal (coro_throw); 2256 SV *exception = sv_2mortal (CORO_THROW);
1863 2257
1864 coro_throw = 0; 2258 CORO_THROW = 0;
1865 sv_setsv (ERRSV, exception); 2259 sv_setsv (ERRSV, exception);
1866 croak (0); 2260 croak (0);
2261 }
2262
2263 /* return value handling - mostly like entersub */
2264 /* make sure we put something on the stack in scalar context */
2265 if (GIMME_V == G_SCALAR)
2266 {
2267 dSP;
2268 SV **bot = PL_stack_base + checkmark;
2269
2270 if (sp == bot) /* too few, push undef */
2271 bot [1] = &PL_sv_undef;
2272 else if (sp != bot + 1) /* too many, take last one */
2273 bot [1] = *sp;
2274
2275 SP = bot + 1;
2276
2277 PUTBACK;
1867 } 2278 }
1868 2279
1869 return NORMAL; 2280 return NORMAL;
1870} 2281}
1871 2282
… …
1912 } 2323 }
1913 else 2324 else
1914 slf_argc = 0; 2325 slf_argc = 0;
1915 2326
1916 PL_op->op_ppaddr = pp_slf; 2327 PL_op->op_ppaddr = pp_slf;
1917 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 */
1918 2329
1919 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 (pTHX_ 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 (aTHX_ &((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 (aTHX_ &((struct coro *)coro)->on_leave);
2377 on_enterleave_call (aTHX_ sv_2mortal (cb));
1920} 2378}
1921 2379
1922/*****************************************************************************/ 2380/*****************************************************************************/
1923/* PerlIO::cede */ 2381/* PerlIO::cede */
1924 2382
… …
1993 PerlIOBuf_get_cnt, 2451 PerlIOBuf_get_cnt,
1994 PerlIOBuf_set_ptrcnt, 2452 PerlIOBuf_set_ptrcnt,
1995}; 2453};
1996 2454
1997/*****************************************************************************/ 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
1998/* Coro::Semaphore */ 2482/* semaphore */
1999 2483
2000static void 2484static void
2001coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2485coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2002{ 2486{
2003 SV *count_sv = AvARRAY (av)[0]; 2487 SV *count_sv = AvARRAY (av)[0];
… …
2015 AvARRAY (av)[0] = AvARRAY (av)[1]; 2499 AvARRAY (av)[0] = AvARRAY (av)[1];
2016 AvARRAY (av)[1] = count_sv; 2500 AvARRAY (av)[1] = count_sv;
2017 cb = av_shift (av); 2501 cb = av_shift (av);
2018 2502
2019 if (SvOBJECT (cb)) 2503 if (SvOBJECT (cb))
2504 {
2020 api_ready (aTHX_ cb); 2505 api_ready (aTHX_ cb);
2021 else 2506 --count;
2022 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 }
2023 2516
2024 SvREFCNT_dec (cb); 2517 SvREFCNT_dec (cb);
2025
2026 --count;
2027 } 2518 }
2028} 2519}
2029 2520
2030static void 2521static void
2031coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2522coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2033 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2524 /* call $sem->adjust (0) to possibly wake up some other waiters */
2034 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2525 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2035} 2526}
2036 2527
2037static int 2528static int
2038slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2529slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2039{ 2530{
2040 AV *av = (AV *)frame->data; 2531 AV *av = (AV *)frame->data;
2041 SV *count_sv = AvARRAY (av)[0]; 2532 SV *count_sv = AvARRAY (av)[0];
2042 2533
2534 /* if we are about to throw, don't actually acquire the lock, just throw */
2535 if (CORO_THROW)
2536 return 0;
2043 if (SvIVX (count_sv) > 0) 2537 else if (SvIVX (count_sv) > 0)
2044 { 2538 {
2045 SvSTATE_current->on_destroy = 0; 2539 SvSTATE_current->on_destroy = 0;
2540
2541 if (acquire)
2046 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
2047 return 0; 2546 return 0;
2048 } 2547 }
2049 else 2548 else
2050 { 2549 {
2051 int i; 2550 int i;
… …
2060 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2559 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2061 return 1; 2560 return 1;
2062 } 2561 }
2063} 2562}
2064 2563
2065static 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
2066slf_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)
2067{ 2578{
2068 AV *av = (AV *)SvRV (arg [0]); 2579 AV *av = (AV *)SvRV (arg [0]);
2069 2580
2070 if (SvIVX (AvARRAY (av)[0]) > 0) 2581 if (SvIVX (AvARRAY (av)[0]) > 0)
2071 { 2582 {
2072 frame->data = (void *)av; 2583 frame->data = (void *)av;
2073 frame->prepare = prepare_nop; 2584 frame->prepare = prepare_nop;
2074 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2075 } 2585 }
2076 else 2586 else
2077 { 2587 {
2078 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2588 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2079 2589
2080 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2590 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2081 frame->prepare = prepare_schedule; 2591 frame->prepare = prepare_schedule;
2082 2592
2083 /* to avoid race conditions when a woken-up coro gets terminated */ 2593 /* to avoid race conditions when a woken-up coro gets terminated */
2084 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2594 /* we arrange for a temporary on_destroy that calls adjust (0) */
2085 assert (!SvSTATE_current->on_destroy);//D
2086 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2595 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2087 } 2596 }
2597}
2088 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);
2089 frame->check = slf_check_semaphore_down; 2603 frame->check = slf_check_semaphore_down;
2090
2091} 2604}
2092 2605
2093/*****************************************************************************/ 2606static void
2094/* gensub: simple closure generation utility */ 2607slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095
2096#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2097
2098/* create a closure from XS, returns a code reference */
2099/* the arg can be accessed via GENSUB_ARG from the callback */
2100/* the callback must use dXSARGS/XSRETURN */
2101static SV *
2102gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2103{ 2608{
2104 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]);
2105 2614
2106 sv_upgrade ((SV *)cv, SVt_PVCV); 2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2107 2616
2108 CvANON_on (cv); 2617 if (SvIVX (AvARRAY (av)[0]) > 0)
2109 CvISXSUB_on (cv); 2618 coro_semaphore_adjust (aTHX_ av, 0);
2110 CvXSUB (cv) = xsub;
2111 GENSUB_ARG = arg;
2112 2619
2113 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 }
2114} 2685}
2115 2686
2116/*****************************************************************************/ 2687/*****************************************************************************/
2117/* Coro::AIO */ 2688/* Coro::AIO */
2118 2689
… …
2133 dXSARGS; 2704 dXSARGS;
2134 AV *state = (AV *)GENSUB_ARG; 2705 AV *state = (AV *)GENSUB_ARG;
2135 SV *coro = av_pop (state); 2706 SV *coro = av_pop (state);
2136 SV *data_sv = newSV (sizeof (struct io_state)); 2707 SV *data_sv = newSV (sizeof (struct io_state));
2137 2708
2138 av_extend (state, items); 2709 av_extend (state, items - 1);
2139 2710
2140 sv_upgrade (data_sv, SVt_PV); 2711 sv_upgrade (data_sv, SVt_PV);
2141 SvCUR_set (data_sv, sizeof (struct io_state)); 2712 SvCUR_set (data_sv, sizeof (struct io_state));
2142 SvPOK_only (data_sv); 2713 SvPOK_only (data_sv);
2143 2714
… …
2168static int 2739static int
2169slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2740slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2170{ 2741{
2171 AV *state = (AV *)frame->data; 2742 AV *state = (AV *)frame->data;
2172 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
2173 /* one element that is an RV? repeat! */ 2750 /* one element that is an RV? repeat! */
2174 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2751 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2175 return 1; 2752 return 1;
2176 2753
2177 /* restore status */ 2754 /* restore status */
… …
2247 2824
2248 for (i = 0; i < items; ++i) 2825 for (i = 0; i < items; ++i)
2249 PUSHs (arg [i]); 2826 PUSHs (arg [i]);
2250 2827
2251 /* now push the callback closure */ 2828 /* now push the callback closure */
2252 PUSHs (sv_2mortal (gensub (coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2829 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2253 2830
2254 /* now call the AIO function - we assume our request is uncancelable */ 2831 /* now call the AIO function - we assume our request is uncancelable */
2255 PUTBACK; 2832 PUTBACK;
2256 call_sv ((SV *)req, G_VOID | G_DISCARD); 2833 call_sv ((SV *)req, G_VOID | G_DISCARD);
2257 } 2834 }
… …
2263} 2840}
2264 2841
2265static void 2842static void
2266coro_aio_req_xs (pTHX_ CV *cv) 2843coro_aio_req_xs (pTHX_ CV *cv)
2267{ 2844{
2268 dVAR;
2269 dXSARGS; 2845 dXSARGS;
2270 2846
2271 CORO_EXECUTE_SLF_XS (slf_init_aio_req); 2847 CORO_EXECUTE_SLF_XS (slf_init_aio_req);
2272 2848
2273 XSRETURN_EMPTY; 2849 XSRETURN_EMPTY;
2274} 2850}
2275 2851
2276/*****************************************************************************/ 2852/*****************************************************************************/
2853
2854#if CORO_CLONE
2855# include "clone.c"
2856#endif
2277 2857
2278MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2279 2859
2280PROTOTYPES: DISABLE 2860PROTOTYPES: DISABLE
2281 2861
… …
2286 coro_thx = PERL_GET_CONTEXT; 2866 coro_thx = PERL_GET_CONTEXT;
2287# endif 2867# endif
2288#endif 2868#endif
2289 BOOT_PAGESIZE; 2869 BOOT_PAGESIZE;
2290 2870
2871 cctx_current = cctx_new_empty ();
2872
2291 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2873 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2292 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2874 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2293 2875
2294 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;
2295 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;
… …
2314 2896
2315 { 2897 {
2316 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2898 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2317 2899
2318 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2900 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2319 hv_store_ent (PL_custom_op_names, slf, 2901 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2320 newSVpv ("coro_slf", 0), 0);
2321 2902
2322 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2903 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2323 hv_store_ent (PL_custom_op_descs, slf, 2904 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2324 newSVpv ("coro schedule like function", 0), 0);
2325 } 2905 }
2326 2906
2327 coroapi.ver = CORO_API_VERSION; 2907 coroapi.ver = CORO_API_VERSION;
2328 coroapi.rev = CORO_API_REVISION; 2908 coroapi.rev = CORO_API_REVISION;
2329 2909
… …
2348 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2349} 2929}
2350 2930
2351SV * 2931SV *
2352new (char *klass, ...) 2932new (char *klass, ...)
2933 ALIAS:
2934 Coro::new = 1
2353 CODE: 2935 CODE:
2354{ 2936{
2355 struct coro *coro; 2937 struct coro *coro;
2356 MAGIC *mg; 2938 MAGIC *mg;
2357 HV *hv; 2939 HV *hv;
2940 CV *cb;
2358 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 }
2359 2956
2360 Newz (0, coro, 1, struct coro); 2957 Newz (0, coro, 1, struct coro);
2361 coro->args = newAV (); 2958 coro->args = newAV ();
2362 coro->flags = CF_NEW; 2959 coro->flags = CF_NEW;
2363 2960
… …
2368 coro->hv = hv = newHV (); 2965 coro->hv = hv = newHV ();
2369 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);
2370 mg->mg_flags |= MGf_DUP; 2967 mg->mg_flags |= MGf_DUP;
2371 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2372 2969
2970 if (items > 1)
2971 {
2373 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
2374 for (i = 1; i < items; i++) 2982 for (i = 2; i < items; i++)
2375 av_push (coro->args, newSVsv (ST (i))); 2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2376} 2985}
2377 OUTPUT: 2986 OUTPUT:
2378 RETVAL 2987 RETVAL
2379
2380void
2381_set_stacklevel (...)
2382 CODE:
2383 CORO_EXECUTE_SLF_XS (slf_init_set_stacklevel);
2384 2988
2385void 2989void
2386transfer (...) 2990transfer (...)
2387 PROTOTYPE: $$ 2991 PROTOTYPE: $$
2388 CODE: 2992 CODE:
… …
2398void 3002void
2399_exit (int code) 3003_exit (int code)
2400 PROTOTYPE: $ 3004 PROTOTYPE: $
2401 CODE: 3005 CODE:
2402 _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
2403 3026
2404int 3027int
2405cctx_stacksize (int new_stacksize = 0) 3028cctx_stacksize (int new_stacksize = 0)
2406 PROTOTYPE: ;$ 3029 PROTOTYPE: ;$
2407 CODE: 3030 CODE:
… …
2457 eval = 1 3080 eval = 1
2458 CODE: 3081 CODE:
2459{ 3082{
2460 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2461 { 3084 {
2462 struct coro temp; 3085 struct coro *current = SvSTATE_current;
2463 3086
2464 if (!(coro->flags & CF_RUNNING)) 3087 if (current != coro)
2465 { 3088 {
2466 PUTBACK; 3089 PUTBACK;
2467 save_perl (aTHX_ &temp); 3090 save_perl (aTHX_ current);
2468 load_perl (aTHX_ coro); 3091 load_perl (aTHX_ coro);
3092 SPAGAIN;
2469 } 3093 }
2470 3094
2471 {
2472 dSP;
2473 ENTER;
2474 SAVETMPS;
2475 PUTBACK;
2476 PUSHSTACK; 3095 PUSHSTACK;
3096
2477 PUSHMARK (SP); 3097 PUSHMARK (SP);
3098 PUTBACK;
2478 3099
2479 if (ix) 3100 if (ix)
2480 eval_sv (coderef, 0); 3101 eval_sv (coderef, 0);
2481 else 3102 else
2482 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2483 3104
3105 SPAGAIN;
2484 POPSTACK; 3106 POPSTACK;
2485 SPAGAIN;
2486 FREETMPS;
2487 LEAVE;
2488 PUTBACK;
2489 }
2490 3107
2491 if (!(coro->flags & CF_RUNNING)) 3108 if (current != coro)
2492 { 3109 {
3110 PUTBACK;
2493 save_perl (aTHX_ coro); 3111 save_perl (aTHX_ coro);
2494 load_perl (aTHX_ &temp); 3112 load_perl (aTHX_ current);
2495 SPAGAIN; 3113 SPAGAIN;
2496 } 3114 }
2497 } 3115 }
2498} 3116}
2499 3117
… …
2514throw (Coro::State self, SV *throw = &PL_sv_undef) 3132throw (Coro::State self, SV *throw = &PL_sv_undef)
2515 PROTOTYPE: $;$ 3133 PROTOTYPE: $;$
2516 CODE: 3134 CODE:
2517{ 3135{
2518 struct coro *current = SvSTATE_current; 3136 struct coro *current = SvSTATE_current;
2519 SV **throwp = self == current ? &coro_throw : &self->throw; 3137 SV **throwp = self == current ? &CORO_THROW : &self->except;
2520 SvREFCNT_dec (*throwp); 3138 SvREFCNT_dec (*throwp);
2521 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2522} 3140}
2523 3141
2524void 3142void
… …
2528 3146
2529SV * 3147SV *
2530has_cctx (Coro::State coro) 3148has_cctx (Coro::State coro)
2531 PROTOTYPE: $ 3149 PROTOTYPE: $
2532 CODE: 3150 CODE:
2533 RETVAL = boolSV (!!coro->cctx); 3151 /* maybe manage the running flag differently */
3152 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2534 OUTPUT: 3153 OUTPUT:
2535 RETVAL 3154 RETVAL
2536 3155
2537int 3156int
2538is_traced (Coro::State coro) 3157is_traced (Coro::State coro)
… …
2558 3177
2559void 3178void
2560force_cctx () 3179force_cctx ()
2561 PROTOTYPE: 3180 PROTOTYPE:
2562 CODE: 3181 CODE:
2563 SvSTATE_current->cctx->idle_sp = 0; 3182 cctx_current->idle_sp = 0;
2564 3183
2565void 3184void
2566swap_defsv (Coro::State self) 3185swap_defsv (Coro::State self)
2567 PROTOTYPE: $ 3186 PROTOTYPE: $
2568 ALIAS: 3187 ALIAS:
… …
2583 3202
2584BOOT: 3203BOOT:
2585{ 3204{
2586 int i; 3205 int i;
2587 3206
2588 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2589 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2590 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2591 3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2592 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2593 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);
2594 3221
2595 coro_stash = gv_stashpv ("Coro", TRUE); 3222 coro_stash = gv_stashpv ("Coro", TRUE);
2596 3223
2597 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2598 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2606 3233
2607 { 3234 {
2608 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2609 3236
2610 coroapi.schedule = api_schedule; 3237 coroapi.schedule = api_schedule;
3238 coroapi.schedule_to = api_schedule_to;
2611 coroapi.cede = api_cede; 3239 coroapi.cede = api_cede;
2612 coroapi.cede_notself = api_cede_notself; 3240 coroapi.cede_notself = api_cede_notself;
2613 coroapi.ready = api_ready; 3241 coroapi.ready = api_ready;
2614 coroapi.is_ready = api_is_ready; 3242 coroapi.is_ready = api_is_ready;
2615 coroapi.nready = coro_nready; 3243 coroapi.nready = coro_nready;
2616 coroapi.current = coro_current; 3244 coroapi.current = coro_current;
2617 3245
2618 GCoroAPI = &coroapi; 3246 /*GCoroAPI = &coroapi;*/
2619 sv_setiv (sv, (IV)&coroapi); 3247 sv_setiv (sv, (IV)&coroapi);
2620 SvREADONLY_on (sv); 3248 SvREADONLY_on (sv);
2621 } 3249 }
2622} 3250}
3251
3252void
3253terminate (...)
3254 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2623 3256
2624void 3257void
2625schedule (...) 3258schedule (...)
2626 CODE: 3259 CODE:
2627 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3260 CORO_EXECUTE_SLF_XS (slf_init_schedule);
2628 3261
2629void 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
2630cede (...) 3273cede (...)
2631 CODE: 3274 CODE:
2632 CORO_EXECUTE_SLF_XS (slf_init_cede); 3275 CORO_EXECUTE_SLF_XS (slf_init_cede);
2633 3276
2634void 3277void
2635cede_notself (...) 3278cede_notself (...)
2636 CODE: 3279 CODE:
2637 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);
2638 3287
2639void 3288void
2640_set_current (SV *current) 3289_set_current (SV *current)
2641 PROTOTYPE: $ 3290 PROTOTYPE: $
2642 CODE: 3291 CODE:
… …
2687 CODE: 3336 CODE:
2688 RETVAL = coro_nready; 3337 RETVAL = coro_nready;
2689 OUTPUT: 3338 OUTPUT:
2690 RETVAL 3339 RETVAL
2691 3340
2692# for async_pool speedup
2693void 3341void
2694_pool_1 (SV *cb) 3342_pool_handler (...)
2695 CODE: 3343 CODE:
2696{ 3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2697 HV *hv = (HV *)SvRV (coro_current);
2698 struct coro *coro = SvSTATE_hv ((SV *)hv);
2699 AV *defav = GvAV (PL_defgv);
2700 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2701 AV *invoke_av;
2702 int i, len;
2703 3345
2704 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)
2705 { 3361 {
2706 SV *old = PL_diehook; 3362 PUSHMARK (SP);
2707 PL_diehook = 0; 3363 EXTEND (SP, 2);
2708 SvREFCNT_dec (old); 3364 PUSHs (sv_Coro);
2709 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));
2710 } 3371 }
2711 3372
2712 SvREFCNT_dec (coro->saved_deffh);
2713 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2714
2715 hv_store (hv, "desc", sizeof ("desc") - 1,
2716 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2717
2718 invoke_av = (AV *)SvRV (invoke);
2719 len = av_len (invoke_av);
2720
2721 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2722
2723 if (len > 0)
2724 { 3373 {
2725 av_fill (defav, len - 1); 3374 struct coro *coro = SvSTATE_hv (hv);
2726 for (i = 0; i < len; ++i) 3375
2727 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;
2728 } 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);
2729} 3388}
3389
3390SV *
3391rouse_cb ()
3392 PROTOTYPE:
3393 CODE:
3394 RETVAL = coro_new_rouse_cb (aTHX);
3395 OUTPUT:
3396 RETVAL
2730 3397
2731void 3398void
2732_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: &
2733 CODE: 3409 CODE:
2734{ 3410{
2735 HV *hv = (HV *)SvRV (coro_current);
2736 struct coro *coro = SvSTATE_hv ((SV *)hv); 3411 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2737 3413
2738 sv_setsv (cb, &PL_sv_undef); 3414 block = (SV *)coro_sv_2cv (aTHX_ block);
2739 3415
2740 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3416 if (!*avp)
2741 coro->saved_deffh = 0; 3417 *avp = newAV ();
2742 3418
2743 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3419 av_push (*avp, SvREFCNT_inc (block));
2744 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2745 {
2746 SV *old = PL_diehook;
2747 PL_diehook = 0;
2748 SvREFCNT_dec (old);
2749 croak ("\3async_pool terminate\2\n");
2750 }
2751 3420
2752 av_clear (GvAV (PL_defgv)); 3421 if (!ix)
2753 hv_store (hv, "desc", sizeof ("desc") - 1, 3422 on_enterleave_call (aTHX_ block);
2754 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2755 3423
2756 coro->prio = 0; 3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
2757 3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2758 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
2759 api_trace (aTHX_ coro_current, 0);
2760
2761 av_push (av_async_pool, newSVsv (coro_current));
2762} 3427}
2763 3428
2764 3429
2765MODULE = Coro::State PACKAGE = PerlIO::cede 3430MODULE = Coro::State PACKAGE = PerlIO::cede
2766 3431
… …
2769 3434
2770 3435
2771MODULE = Coro::State PACKAGE = Coro::Semaphore 3436MODULE = Coro::State PACKAGE = Coro::Semaphore
2772 3437
2773SV * 3438SV *
2774new (SV *klass, SV *count_ = 0) 3439new (SV *klass, SV *count = 0)
2775 CODE: 3440 CODE:
2776{ 3441 RETVAL = sv_bless (
2777 /* 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),
2778 AV *av = newAV (); 3443 GvSTASH (CvGV (cv))
2779 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1)); 3444 );
2780 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3445 OUTPUT:
2781} 3446 RETVAL
3447
3448# helper for Coro::Channel
3449SV *
3450_alloc (int count)
3451 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count);
2782 OUTPUT: 3453 OUTPUT:
2783 RETVAL 3454 RETVAL
2784 3455
2785SV * 3456SV *
2786count (SV *self) 3457count (SV *self)
… …
2795 adjust = 1 3466 adjust = 1
2796 CODE: 3467 CODE:
2797 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3468 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2798 3469
2799void 3470void
2800down (SV *self) 3471down (...)
2801 CODE: 3472 CODE:
2802 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);
2803 3479
2804void 3480void
2805try (SV *self) 3481try (SV *self)
2806 PPCODE: 3482 PPCODE:
2807{ 3483{
… …
2819 XSRETURN_NO; 3495 XSRETURN_NO;
2820} 3496}
2821 3497
2822void 3498void
2823waiters (SV *self) 3499waiters (SV *self)
2824 CODE: 3500 PPCODE:
2825{ 3501{
2826 AV *av = (AV *)SvRV (self); 3502 AV *av = (AV *)SvRV (self);
3503 int wcount = AvFILLp (av) + 1 - 1;
2827 3504
2828 if (GIMME_V == G_SCALAR) 3505 if (GIMME_V == G_SCALAR)
2829 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3506 XPUSHs (sv_2mortal (newSViv (wcount)));
2830 else 3507 else
2831 { 3508 {
2832 int i; 3509 int i;
2833 EXTEND (SP, AvFILLp (av) + 1 - 1); 3510 EXTEND (SP, wcount);
2834 for (i = 1; i <= AvFILLp (av); ++i) 3511 for (i = 1; i <= wcount; ++i)
2835 PUSHs (newSVsv (AvARRAY (av)[i])); 3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2836 } 3513 }
2837} 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
2838 3559
2839 3560
2840MODULE = Coro::State PACKAGE = Coro::AnyEvent 3561MODULE = Coro::State PACKAGE = Coro::AnyEvent
2841 3562
2842BOOT: 3563BOOT:
… …
2857 sv_setsv (sv_activity, &PL_sv_undef); 3578 sv_setsv (sv_activity, &PL_sv_undef);
2858 if (coro_nready >= incede) 3579 if (coro_nready >= incede)
2859 { 3580 {
2860 PUSHMARK (SP); 3581 PUSHMARK (SP);
2861 PUTBACK; 3582 PUTBACK;
2862 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL); 3583 call_pv ("Coro::AnyEvent::_activity", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2863 SPAGAIN;
2864 } 3584 }
2865 3585
2866 --incede; 3586 --incede;
2867} 3587}
2868 3588
… …
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; 3597 /* newXSproto doesn't return the CV on 5.8 */
2878 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2879 CV *slf_cv = newXSproto (target, coro_aio_req_xs, __FILE__, proto); 3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto);
2880 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);
2881} 3601}
2882 3602

Diff Legend

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