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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.293 by root, Tue Nov 18 06:10:03 2008 UTC vs.
Revision 1.346 by root, Tue Jun 9 18:56:45 2009 UTC

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

Diff Legend

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