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.308 by root, Wed Nov 19 15:09:57 2008 UTC vs.
Revision 1.360 by root, Mon Jun 29 06:14:23 2009 UTC

… …
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
… …
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 143# define INLINE static inline
138#else 144#else
139# define attribute(x) 145# define attribute(x)
140# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
141# define INLINE static 147# define INLINE static
… …
153# if CORO_PTHREAD 159# if CORO_PTHREAD
154static void *coro_thx; 160static void *coro_thx;
155# endif 161# endif
156#endif 162#endif
157 163
164#ifdef __linux
165# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime
168# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
169# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif
172#endif
173
158static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
175static void (*u2time)(pTHX_ UV ret[2]);
159 176
160/* we hijack an hopefully unused CV flag for our purposes */ 177/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 178#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 179static OP *pp_slf (pTHX);
163 180
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 184static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 185static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 186static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 187static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 188
189static AV *av_destroy; /* destruction queue */
190static SV *sv_manager; /* the manager coro */
191static SV *sv_idle; /* $Coro::idle */
192
172static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 195static SV *rv_diehook;
175static SV *rv_warnhook; 196static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 197static HV *hv_sig; /* %SIG */
177 198
178/* async_pool helper stuff */ 199/* async_pool helper stuff */
179static SV *sv_pool_rss; 200static SV *sv_pool_rss;
180static SV *sv_pool_size; 201static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 203static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
182 207
183/* Coro::AnyEvent */ 208/* Coro::AnyEvent */
184static SV *sv_activity; 209static SV *sv_activity;
210
211/* enable processtime/realtime profiling */
212static char enable_times;
213typedef U32 coro_ts[2];
214static coro_ts time_real, time_cpu;
215static char times_valid;
185 216
186static struct coro_cctx *cctx_first; 217static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 218static int cctx_count, cctx_idle;
188 219
189enum { 220enum {
… …
215 int valgrind_id; 246 int valgrind_id;
216#endif 247#endif
217 unsigned char flags; 248 unsigned char flags;
218} coro_cctx; 249} coro_cctx;
219 250
251coro_cctx *cctx_current; /* the currently running cctx */
252
253/*****************************************************************************/
254
220enum { 255enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 256 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 257 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 258 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 261};
226 262
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 263/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 264typedef struct
229{ 265{
230 SV *defsv; 266 SV *defsv;
231 AV *defav; 267 AV *defav;
232 SV *errsv; 268 SV *errsv;
233 SV *irsgv; 269 SV *irsgv;
270 HV *hinthv;
234#define VAR(name,type) type name; 271#define VAR(name,type) type name;
235# include "state.h" 272# include "state.h"
236#undef VAR 273#undef VAR
237} perl_slots; 274} perl_slots;
238 275
… …
240 277
241/* this is a structure representing a perl-level coroutine */ 278/* this is a structure representing a perl-level coroutine */
242struct coro { 279struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 280 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 281 coro_cctx *cctx;
282
283 /* ready queue */
284 struct coro *next_ready;
245 285
246 /* state data */ 286 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 287 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 288 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 289 perl_slots *slot; /* basically the saved sp */
… …
263 SV *except; /* exception to be thrown */ 303 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 304 SV *rouse_cb;
265 305
266 /* async_pool */ 306 /* async_pool */
267 SV *saved_deffh; 307 SV *saved_deffh;
308 SV *invoke_cb;
309 AV *invoke_av;
310
311 /* on_enter/on_leave */
312 AV *on_enter;
313 AV *on_leave;
314
315 /* times */
316 coro_ts t_cpu, t_real;
268 317
269 /* linked list */ 318 /* linked list */
270 struct coro *next, *prev; 319 struct coro *next, *prev;
271}; 320};
272 321
… …
278/* the mainr easonw e don't support windows process emulation */ 327/* the mainr easonw e don't support windows process emulation */
279static struct CoroSLF slf_frame; /* the current slf frame */ 328static struct CoroSLF slf_frame; /* the current slf frame */
280 329
281/** Coro ********************************************************************/ 330/** Coro ********************************************************************/
282 331
283#define PRIO_MAX 3 332#define CORO_PRIO_MAX 3
284#define PRIO_HIGH 1 333#define CORO_PRIO_HIGH 1
285#define PRIO_NORMAL 0 334#define CORO_PRIO_NORMAL 0
286#define PRIO_LOW -1 335#define CORO_PRIO_LOW -1
287#define PRIO_IDLE -3 336#define CORO_PRIO_IDLE -3
288#define PRIO_MIN -4 337#define CORO_PRIO_MIN -4
289 338
290/* for Coro.pm */ 339/* for Coro.pm */
291static SV *coro_current; 340static SV *coro_current;
292static SV *coro_readyhook; 341static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 344static struct coro *coro_first;
295#define coro_nready coroapi.nready 345#define coro_nready coroapi.nready
296 346
297/** lowlevel stuff **********************************************************/ 347/** lowlevel stuff **********************************************************/
298 348
… …
326 return get_hv (name, create); 376 return get_hv (name, create);
327} 377}
328 378
329/* may croak */ 379/* may croak */
330INLINE CV * 380INLINE CV *
331coro_sv_2cv (SV *sv) 381coro_sv_2cv (pTHX_ SV *sv)
332{ 382{
333 HV *st; 383 HV *st;
334 GV *gvp; 384 GV *gvp;
335 return sv_2cv (sv, &st, &gvp, 0); 385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
336} 391}
392
393INLINE void
394coro_times_update ()
395{
396#ifdef coro_clock_gettime
397 struct timespec ts;
398
399 ts.tv_sec = ts.tv_nsec = 0;
400 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
401 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
402
403 ts.tv_sec = ts.tv_nsec = 0;
404 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else
407 UV tv[2];
408
409 u2time (aTHX_ &tv);
410 time_real [0] = tv [0];
411 time_real [1] = tv [1] * 1000;
412#endif
413}
414
415INLINE void
416coro_times_add (struct coro *c)
417{
418 c->t_real [1] += time_real [1];
419 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
420 c->t_real [0] += time_real [0];
421
422 c->t_cpu [1] += time_cpu [1];
423 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
424 c->t_cpu [0] += time_cpu [0];
425}
426
427INLINE void
428coro_times_sub (struct coro *c)
429{
430 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
431 c->t_real [1] -= time_real [1];
432 c->t_real [0] -= time_real [0];
433
434 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
435 c->t_cpu [1] -= time_cpu [1];
436 c->t_cpu [0] -= time_cpu [0];
437}
438
439/*****************************************************************************/
440/* magic glue */
441
442#define CORO_MAGIC_type_cv 26
443#define CORO_MAGIC_type_state PERL_MAGIC_ext
444
445#define CORO_MAGIC_NN(sv, type) \
446 (expect_true (SvMAGIC (sv)->mg_type == type) \
447 ? SvMAGIC (sv) \
448 : mg_find (sv, type))
449
450#define CORO_MAGIC(sv, type) \
451 (expect_true (SvMAGIC (sv)) \
452 ? CORO_MAGIC_NN (sv, type) \
453 : 0)
454
455#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
456#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
457
458INLINE struct coro *
459SvSTATE_ (pTHX_ SV *coro)
460{
461 HV *stash;
462 MAGIC *mg;
463
464 if (SvROK (coro))
465 coro = SvRV (coro);
466
467 if (expect_false (SvTYPE (coro) != SVt_PVHV))
468 croak ("Coro::State object required");
469
470 stash = SvSTASH (coro);
471 if (expect_false (stash != coro_stash && stash != coro_state_stash))
472 {
473 /* very slow, but rare, check */
474 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
475 croak ("Coro::State object required");
476 }
477
478 mg = CORO_MAGIC_state (coro);
479 return (struct coro *)mg->mg_ptr;
480}
481
482#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
483
484/* faster than SvSTATE, but expects a coroutine hv */
485#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
486#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
487
488/*****************************************************************************/
489/* padlist management and caching */
337 490
338static AV * 491static AV *
339coro_clone_padlist (pTHX_ CV *cv) 492coro_derive_padlist (pTHX_ CV *cv)
340{ 493{
341 AV *padlist = CvPADLIST (cv); 494 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 495 AV *newpadlist, *newpad;
343 496
344 newpadlist = newAV (); 497 newpadlist = newAV ();
… …
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 502 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
350#endif 503#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 504 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
352 --AvFILLp (padlist); 505 --AvFILLp (padlist);
353 506
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 507 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
355 av_store (newpadlist, 1, (SV *)newpad); 508 av_store (newpadlist, 1, (SV *)newpad);
356 509
357 return newpadlist; 510 return newpadlist;
358} 511}
359 512
360static void 513static void
361free_padlist (pTHX_ AV *padlist) 514free_padlist (pTHX_ AV *padlist)
362{ 515{
363 /* may be during global destruction */ 516 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 517 if (!IN_DESTRUCT)
365 { 518 {
366 I32 i = AvFILLp (padlist); 519 I32 i = AvFILLp (padlist);
367 while (i >= 0) 520
521 while (i > 0) /* special-case index 0 */
368 { 522 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 523 /* we try to be extra-careful here */
370 if (svp) 524 AV *av = (AV *)AvARRAY (padlist)[i--];
371 { 525 I32 j = AvFILLp (av);
372 SV *sv; 526
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 527 while (j >= 0)
528 SvREFCNT_dec (AvARRAY (av)[j--]);
529
530 AvFILLp (av) = -1;
374 SvREFCNT_dec (sv); 531 SvREFCNT_dec (av);
375
376 SvREFCNT_dec (*svp);
377 }
378 } 532 }
379 533
534 SvREFCNT_dec (AvARRAY (padlist)[0]);
535
536 AvFILLp (padlist) = -1;
380 SvREFCNT_dec ((SV*)padlist); 537 SvREFCNT_dec ((SV*)padlist);
381 } 538 }
382} 539}
383 540
384static int 541static int
385coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 542coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
386{ 543{
387 AV *padlist; 544 AV *padlist;
388 AV *av = (AV *)mg->mg_obj; 545 AV *av = (AV *)mg->mg_obj;
546
547 /* perl manages to free our internal AV and _then_ call us */
548 if (IN_DESTRUCT)
549 return;
389 550
390 /* casting is fun. */ 551 /* casting is fun. */
391 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 552 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
392 free_padlist (aTHX_ padlist); 553 free_padlist (aTHX_ padlist);
393 554
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 555 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 556
396 return 0; 557 return 0;
397} 558}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 559
402static MGVTBL coro_cv_vtbl = { 560static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 561 0, 0, 0, 0,
404 coro_cv_free 562 coro_cv_free
405}; 563};
406
407#define CORO_MAGIC_NN(sv, type) \
408 (expect_true (SvMAGIC (sv)->mg_type == type) \
409 ? SvMAGIC (sv) \
410 : mg_find (sv, type))
411
412#define CORO_MAGIC(sv, type) \
413 (expect_true (SvMAGIC (sv)) \
414 ? CORO_MAGIC_NN (sv, type) \
415 : 0)
416
417#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
418#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
419
420INLINE struct coro *
421SvSTATE_ (pTHX_ SV *coro)
422{
423 HV *stash;
424 MAGIC *mg;
425
426 if (SvROK (coro))
427 coro = SvRV (coro);
428
429 if (expect_false (SvTYPE (coro) != SVt_PVHV))
430 croak ("Coro::State object required");
431
432 stash = SvSTASH (coro);
433 if (expect_false (stash != coro_stash && stash != coro_state_stash))
434 {
435 /* very slow, but rare, check */
436 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
437 croak ("Coro::State object required");
438 }
439
440 mg = CORO_MAGIC_state (coro);
441 return (struct coro *)mg->mg_ptr;
442}
443
444#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
445
446/* faster than SvSTATE, but expects a coroutine hv */
447#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
448#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
449 564
450/* the next two functions merely cache the padlists */ 565/* the next two functions merely cache the padlists */
451static void 566static void
452get_padlist (pTHX_ CV *cv) 567get_padlist (pTHX_ CV *cv)
453{ 568{
… …
464 CV *cp = Perl_cv_clone (aTHX_ cv); 579 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 580 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 581 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 582 SvREFCNT_dec (cp);
468#else 583#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 584 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 585#endif
471 } 586 }
472} 587}
473 588
474static void 589static void
… …
481 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 596 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
482 597
483 av = (AV *)mg->mg_obj; 598 av = (AV *)mg->mg_obj;
484 599
485 if (expect_false (AvFILLp (av) >= AvMAX (av))) 600 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1); 601 av_extend (av, AvFILLp (av) + 1);
487 602
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 603 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 604}
490 605
491/** load & save, init *******************************************************/ 606/** load & save, init *******************************************************/
607
608static void
609on_enterleave_call (pTHX_ SV *cb);
492 610
493static void 611static void
494load_perl (pTHX_ Coro__State c) 612load_perl (pTHX_ Coro__State c)
495{ 613{
496 perl_slots *slot = c->slot; 614 perl_slots *slot = c->slot;
497 c->slot = 0; 615 c->slot = 0;
498 616
499 PL_mainstack = c->mainstack; 617 PL_mainstack = c->mainstack;
500 618
501 GvSV (PL_defgv) = slot->defsv; 619 GvSV (PL_defgv) = slot->defsv;
502 GvAV (PL_defgv) = slot->defav; 620 GvAV (PL_defgv) = slot->defav;
503 GvSV (PL_errgv) = slot->errsv; 621 GvSV (PL_errgv) = slot->errsv;
504 GvSV (irsgv) = slot->irsgv; 622 GvSV (irsgv) = slot->irsgv;
623 GvHV (PL_hintgv) = slot->hinthv;
505 624
506 #define VAR(name,type) PL_ ## name = slot->name; 625 #define VAR(name,type) PL_ ## name = slot->name;
507 # include "state.h" 626 # include "state.h"
508 #undef VAR 627 #undef VAR
509 628
… …
523 PUTBACK; 642 PUTBACK;
524 } 643 }
525 644
526 slf_frame = c->slf_frame; 645 slf_frame = c->slf_frame;
527 CORO_THROW = c->except; 646 CORO_THROW = c->except;
647
648 if (expect_false (enable_times))
649 {
650 if (expect_false (!times_valid))
651 coro_times_update ();
652
653 coro_times_sub (c);
654 }
655
656 if (expect_false (c->on_enter))
657 {
658 int i;
659
660 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
661 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
662 }
528} 663}
529 664
530static void 665static void
531save_perl (pTHX_ Coro__State c) 666save_perl (pTHX_ Coro__State c)
532{ 667{
668 if (expect_false (c->on_leave))
669 {
670 int i;
671
672 for (i = AvFILLp (c->on_leave); i >= 0; --i)
673 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
674 }
675
676 times_valid = 0;
677
678 if (expect_false (enable_times))
679 {
680 coro_times_update (); times_valid = 1;
681 coro_times_add (c);
682 }
683
533 c->except = CORO_THROW; 684 c->except = CORO_THROW;
534 c->slf_frame = slf_frame; 685 c->slf_frame = slf_frame;
535 686
536 { 687 {
537 dSP; 688 dSP;
… …
550 { 701 {
551 while (expect_true (cxix >= 0)) 702 while (expect_true (cxix >= 0))
552 { 703 {
553 PERL_CONTEXT *cx = &ccstk[cxix--]; 704 PERL_CONTEXT *cx = &ccstk[cxix--];
554 705
555 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 706 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
556 { 707 {
557 CV *cv = cx->blk_sub.cv; 708 CV *cv = cx->blk_sub.cv;
558 709
559 if (expect_true (CvDEPTH (cv))) 710 if (expect_true (CvDEPTH (cv)))
560 { 711 {
… …
595 c->mainstack = PL_mainstack; 746 c->mainstack = PL_mainstack;
596 747
597 { 748 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 749 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 750
600 slot->defav = GvAV (PL_defgv); 751 slot->defav = GvAV (PL_defgv);
601 slot->defsv = DEFSV; 752 slot->defsv = DEFSV;
602 slot->errsv = ERRSV; 753 slot->errsv = ERRSV;
603 slot->irsgv = GvSV (irsgv); 754 slot->irsgv = GvSV (irsgv);
755 slot->hinthv = GvHV (PL_hintgv);
604 756
605 #define VAR(name,type) slot->name = PL_ ## name; 757 #define VAR(name,type) slot->name = PL_ ## name;
606 # include "state.h" 758 # include "state.h"
607 #undef VAR 759 #undef VAR
608 } 760 }
… …
686#if !PERL_VERSION_ATLEAST (5,10,0) 838#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 839 Safefree (PL_retstack);
688#endif 840#endif
689} 841}
690 842
843#define CORO_RSS \
844 rss += sizeof (SYM (curstackinfo)); \
845 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
846 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
847 rss += SYM (tmps_max) * sizeof (SV *); \
848 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
849 rss += SYM (scopestack_max) * sizeof (I32); \
850 rss += SYM (savestack_max) * sizeof (ANY);
851
691static size_t 852static size_t
692coro_rss (pTHX_ struct coro *coro) 853coro_rss (pTHX_ struct coro *coro)
693{ 854{
694 size_t rss = sizeof (*coro); 855 size_t rss = sizeof (*coro);
695 856
696 if (coro->mainstack) 857 if (coro->mainstack)
697 { 858 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 859 if (coro->flags & CF_RUNNING)
702 { 860 {
703 slot = &tmp_slot; 861 #define SYM(sym) PL_ ## sym
704 862 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 863 #undef SYM
708 } 864 }
709 else 865 else
710 slot = coro->slot;
711
712 if (slot)
713 { 866 {
714 rss += sizeof (slot->curstackinfo); 867 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 868 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 869 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 870 }
726 } 871 }
727 872
728 return rss; 873 return rss;
729} 874}
… …
742#endif 887#endif
743 888
744/* 889/*
745 * This overrides the default magic get method of %SIG elements. 890 * This overrides the default magic get method of %SIG elements.
746 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 891 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
747 * and instead of tryign to save and restore the hash elements, we just provide 892 * and instead of trying to save and restore the hash elements, we just provide
748 * readback here. 893 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 894 */
753static int 895static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 896coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 897{
756 const char *s = MgPV_nolen_const (mg); 898 const char *s = MgPV_nolen_const (mg);
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 951 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 952
811 if (svp) 953 if (svp)
812 { 954 {
813 SV *old = *svp; 955 SV *old = *svp;
814 *svp = newSVsv (sv); 956 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 957 SvREFCNT_dec (old);
816 return 0; 958 return 0;
817 } 959 }
818 } 960 }
819 961
… …
829 971
830static int 972static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 973slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 974{
833 return 0; 975 return 0;
976}
977
978static int
979slf_check_repeat (pTHX_ struct CoroSLF *frame)
980{
981 return 1;
834} 982}
835 983
836static UNOP coro_setup_op; 984static UNOP coro_setup_op;
837 985
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 986static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
845 993
846 PL_runops = RUNOPS_DEFAULT; 994 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 995 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 996 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 997 PL_comppad = 0;
998 PL_comppad_name = 0;
999 PL_comppad_name_fill = 0;
1000 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 1001 PL_curpm = 0;
851 PL_curpad = 0; 1002 PL_curpad = 0;
852 PL_localizing = 0; 1003 PL_localizing = 0;
853 PL_dirty = 0; 1004 PL_dirty = 0;
854 PL_restartop = 0; 1005 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 1006#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 1007 PL_parser = 0;
857#endif 1008#endif
1009 PL_hints = 0;
858 1010
859 /* recreate the die/warn hooks */ 1011 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1012 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1013 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 1014
863 GvSV (PL_defgv) = newSV (0); 1015 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 1016 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 1017 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1018 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1019 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 1020 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1021 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 1022
870 { 1023 {
871 dSP; 1024 dSP;
… …
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1042 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1043 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 1044
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1045 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 1046 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 1047 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 1048 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags etc. required, as an init function won't be called */ 1049 /* no flags etc. required, as an init function won't be called */
897 1050
898 PL_op = (OP *)&coro_setup_op; 1051 PL_op = (OP *)&coro_setup_op;
899 1052
900 /* copy throw, in case it was set before coro_setup */ 1053 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 1054 CORO_THROW = coro->except;
902}
903 1055
1056 if (expect_false (enable_times))
1057 {
1058 coro_times_update ();
1059 coro_times_sub (coro);
1060 }
1061}
1062
904static void 1063static void
905coro_destruct (pTHX_ struct coro *coro) 1064coro_unwind_stacks (pTHX)
906{ 1065{
907 if (!IN_DESTRUCT) 1066 if (!IN_DESTRUCT)
908 { 1067 {
909 /* restore all saved variables and stuff */ 1068 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1069 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 1077 POPSTACK_TO (PL_mainstack);
919 1078
920 /* unwind main stack */ 1079 /* unwind main stack */
921 dounwind (-1); 1080 dounwind (-1);
922 } 1081 }
1082}
923 1083
924 SvREFCNT_dec (GvSV (PL_defgv)); 1084static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1085coro_destruct_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1086{
927 SvREFCNT_dec (PL_defoutgv); 1087 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1088
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1089 {
1090 struct coro *current = SvSTATE_current;
1091
1092 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1093
1094 save_perl (aTHX_ current);
1095 load_perl (aTHX_ coro);
1096
1097 coro_unwind_stacks (aTHX);
1098 coro_destruct_stacks (aTHX);
1099
1100 // now save some sv's to be free'd later
1101 svf [0] = GvSV (PL_defgv);
1102 svf [1] = (SV *)GvAV (PL_defgv);
1103 svf [2] = GvSV (PL_errgv);
1104 svf [3] = (SV *)PL_defoutgv;
1105 svf [4] = PL_rs;
1106 svf [5] = GvSV (irsgv);
1107 svf [6] = (SV *)GvHV (PL_hintgv);
1108 svf [7] = PL_diehook;
1109 svf [8] = PL_warnhook;
1110 assert (9 == sizeof (svf) / sizeof (*svf));
1111
1112 load_perl (aTHX_ current);
1113 }
1114
1115 {
1116 int i;
1117
1118 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1119 SvREFCNT_dec (svf [i]);
1120
934 SvREFCNT_dec (coro->saved_deffh); 1121 SvREFCNT_dec (coro->saved_deffh);
935 SvREFCNT_dec (coro->rouse_cb); 1122 SvREFCNT_dec (coro->rouse_cb);
936 1123 SvREFCNT_dec (coro->invoke_cb);
937 coro_destruct_stacks (aTHX); 1124 SvREFCNT_dec (coro->invoke_av);
1125 }
938} 1126}
939 1127
940INLINE void 1128INLINE void
941free_coro_mortal (pTHX) 1129free_coro_mortal (pTHX)
942{ 1130{
… …
950static int 1138static int
951runops_trace (pTHX) 1139runops_trace (pTHX)
952{ 1140{
953 COP *oldcop = 0; 1141 COP *oldcop = 0;
954 int oldcxix = -2; 1142 int oldcxix = -2;
955 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
956 coro_cctx *cctx = coro->cctx;
957 1143
958 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1144 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
959 { 1145 {
960 PERL_ASYNC_CHECK (); 1146 PERL_ASYNC_CHECK ();
961 1147
962 if (cctx->flags & CC_TRACE_ALL) 1148 if (cctx_current->flags & CC_TRACE_ALL)
963 { 1149 {
964 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1150 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
965 { 1151 {
966 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1152 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
967 SV **bot, **top; 1153 SV **bot, **top;
968 AV *av = newAV (); /* return values */ 1154 AV *av = newAV (); /* return values */
969 SV **cb; 1155 SV **cb;
… …
1006 1192
1007 if (PL_curcop != &PL_compiling) 1193 if (PL_curcop != &PL_compiling)
1008 { 1194 {
1009 SV **cb; 1195 SV **cb;
1010 1196
1011 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1197 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1012 { 1198 {
1013 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1199 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1014 1200
1015 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1201 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1016 { 1202 {
1017 runops_proc_t old_runops = PL_runops;
1018 dSP; 1203 dSP;
1019 GV *gv = CvGV (cx->blk_sub.cv); 1204 GV *gv = CvGV (cx->blk_sub.cv);
1020 SV *fullname = sv_2mortal (newSV (0)); 1205 SV *fullname = sv_2mortal (newSV (0));
1021 1206
1022 if (isGV (gv)) 1207 if (isGV (gv))
… …
1040 } 1225 }
1041 1226
1042 oldcxix = cxstack_ix; 1227 oldcxix = cxstack_ix;
1043 } 1228 }
1044 1229
1045 if (cctx->flags & CC_TRACE_LINE) 1230 if (cctx_current->flags & CC_TRACE_LINE)
1046 { 1231 {
1047 dSP; 1232 dSP;
1048 1233
1049 PL_runops = RUNOPS_DEFAULT; 1234 PL_runops = RUNOPS_DEFAULT;
1050 ENTER; 1235 ENTER;
… …
1069 1254
1070 TAINT_NOT; 1255 TAINT_NOT;
1071 return 0; 1256 return 0;
1072} 1257}
1073 1258
1074static struct coro_cctx *cctx_ssl_cctx;
1075static struct CoroSLF cctx_ssl_frame; 1259static struct CoroSLF cctx_ssl_frame;
1076 1260
1077static void 1261static void
1078slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1262slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1079{ 1263{
1080 ta->prev = (struct coro *)cctx_ssl_cctx;
1081 ta->next = 0; 1264 ta->prev = 0;
1082} 1265}
1083 1266
1084static int 1267static int
1085slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1268slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1086{ 1269{
… …
1089 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1272 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1090} 1273}
1091 1274
1092/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1275/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1093static void NOINLINE 1276static void NOINLINE
1094cctx_prepare (pTHX_ coro_cctx *cctx) 1277cctx_prepare (pTHX)
1095{ 1278{
1096 PL_top_env = &PL_start_env; 1279 PL_top_env = &PL_start_env;
1097 1280
1098 if (cctx->flags & CC_TRACE) 1281 if (cctx_current->flags & CC_TRACE)
1099 PL_runops = runops_trace; 1282 PL_runops = runops_trace;
1100 1283
1101 /* we already must be executing an SLF op, there is no other valid way 1284 /* we already must be executing an SLF op, there is no other valid way
1102 * that can lead to creation of a new cctx */ 1285 * that can lead to creation of a new cctx */
1103 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1286 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1104 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1287 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1105 1288
1106 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1289 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1107 cctx_ssl_cctx = cctx;
1108 cctx_ssl_frame = slf_frame; 1290 cctx_ssl_frame = slf_frame;
1109 1291
1110 slf_frame.prepare = slf_prepare_set_stacklevel; 1292 slf_frame.prepare = slf_prepare_set_stacklevel;
1111 slf_frame.check = slf_check_set_stacklevel; 1293 slf_frame.check = slf_check_set_stacklevel;
1112} 1294}
… …
1135 /* normally we would need to skip the entersub here */ 1317 /* normally we would need to skip the entersub here */
1136 /* not doing so will re-execute it, which is exactly what we want */ 1318 /* not doing so will re-execute it, which is exactly what we want */
1137 /* PL_nop = PL_nop->op_next */ 1319 /* PL_nop = PL_nop->op_next */
1138 1320
1139 /* inject a fake subroutine call to cctx_init */ 1321 /* inject a fake subroutine call to cctx_init */
1140 cctx_prepare (aTHX_ (coro_cctx *)arg); 1322 cctx_prepare (aTHX);
1141 1323
1142 /* cctx_run is the alternative tail of transfer() */ 1324 /* cctx_run is the alternative tail of transfer() */
1143 transfer_tail (aTHX); 1325 transfer_tail (aTHX);
1144 1326
1145 /* somebody or something will hit me for both perl_run and PL_restartop */ 1327 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
1153 /* 1335 /*
1154 * If perl-run returns we assume exit() was being called or the coro 1336 * If perl-run returns we assume exit() was being called or the coro
1155 * fell off the end, which seems to be the only valid (non-bug) 1337 * fell off the end, which seems to be the only valid (non-bug)
1156 * reason for perl_run to return. We try to exit by jumping to the 1338 * reason for perl_run to return. We try to exit by jumping to the
1157 * bootstrap-time "top" top_env, as we cannot restore the "main" 1339 * bootstrap-time "top" top_env, as we cannot restore the "main"
1158 * coroutine as Coro has no such concept 1340 * coroutine as Coro has no such concept.
1341 * This actually isn't valid with the pthread backend, but OSes requiring
1342 * that backend are too broken to do it in a standards-compliant way.
1159 */ 1343 */
1160 PL_top_env = main_top_env; 1344 PL_top_env = main_top_env;
1161 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1345 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1162 } 1346 }
1163} 1347}
… …
1240cctx_destroy (coro_cctx *cctx) 1424cctx_destroy (coro_cctx *cctx)
1241{ 1425{
1242 if (!cctx) 1426 if (!cctx)
1243 return; 1427 return;
1244 1428
1429 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1430
1245 --cctx_count; 1431 --cctx_count;
1246 coro_destroy (&cctx->cctx); 1432 coro_destroy (&cctx->cctx);
1247 1433
1248 /* coro_transfer creates new, empty cctx's */ 1434 /* coro_transfer creates new, empty cctx's */
1249 if (cctx->sptr) 1435 if (cctx->sptr)
… …
1312 /* TODO: throwing up here is considered harmful */ 1498 /* TODO: throwing up here is considered harmful */
1313 1499
1314 if (expect_true (prev != next)) 1500 if (expect_true (prev != next))
1315 { 1501 {
1316 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1502 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1317 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1503 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1318 1504
1319 if (expect_false (next->flags & CF_RUNNING))
1320 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1321
1322 if (expect_false (next->flags & CF_DESTROYED)) 1505 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1323 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1506 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1324 1507
1325#if !PERL_VERSION_ATLEAST (5,10,0) 1508#if !PERL_VERSION_ATLEAST (5,10,0)
1326 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1509 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1327 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1510 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1328#endif 1511#endif
… …
1334transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1517transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1335{ 1518{
1336 dSTACKLEVEL; 1519 dSTACKLEVEL;
1337 1520
1338 /* sometimes transfer is only called to set idle_sp */ 1521 /* sometimes transfer is only called to set idle_sp */
1339 if (expect_false (!next)) 1522 if (expect_false (!prev))
1340 { 1523 {
1341 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1524 cctx_current->idle_sp = STACKLEVEL;
1342 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1525 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1343 } 1526 }
1344 else if (expect_true (prev != next)) 1527 else if (expect_true (prev != next))
1345 { 1528 {
1346 coro_cctx *prev__cctx; 1529 coro_cctx *cctx_prev;
1347 1530
1348 if (expect_false (prev->flags & CF_NEW)) 1531 if (expect_false (prev->flags & CF_NEW))
1349 { 1532 {
1350 /* create a new empty/source context */ 1533 /* create a new empty/source context */
1351 prev->cctx = cctx_new_empty ();
1352 prev->flags &= ~CF_NEW; 1534 prev->flags &= ~CF_NEW;
1353 prev->flags |= CF_RUNNING; 1535 prev->flags |= CF_RUNNING;
1354 } 1536 }
1355 1537
1356 prev->flags &= ~CF_RUNNING; 1538 prev->flags &= ~CF_RUNNING;
… …
1367 coro_setup (aTHX_ next); 1549 coro_setup (aTHX_ next);
1368 } 1550 }
1369 else 1551 else
1370 load_perl (aTHX_ next); 1552 load_perl (aTHX_ next);
1371 1553
1372 prev__cctx = prev->cctx;
1373
1374 /* possibly untie and reuse the cctx */ 1554 /* possibly untie and reuse the cctx */
1375 if (expect_true ( 1555 if (expect_true (
1376 prev__cctx->idle_sp == STACKLEVEL 1556 cctx_current->idle_sp == STACKLEVEL
1377 && !(prev__cctx->flags & CC_TRACE) 1557 && !(cctx_current->flags & CC_TRACE)
1378 && !force_cctx 1558 && !force_cctx
1379 )) 1559 ))
1380 { 1560 {
1381 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1561 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1382 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1562 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1383 1563
1384 prev->cctx = 0;
1385
1386 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1564 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1387 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1565 /* without this the next cctx_get might destroy the running cctx while still in use */
1388 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1566 if (expect_false (CCTX_EXPIRED (cctx_current)))
1389 if (!next->cctx) 1567 if (expect_true (!next->cctx))
1390 next->cctx = cctx_get (aTHX); 1568 next->cctx = cctx_get (aTHX);
1391 1569
1392 cctx_put (prev__cctx); 1570 cctx_put (cctx_current);
1393 } 1571 }
1572 else
1573 prev->cctx = cctx_current;
1394 1574
1395 ++next->usecount; 1575 ++next->usecount;
1396 1576
1397 if (expect_true (!next->cctx)) 1577 cctx_prev = cctx_current;
1398 next->cctx = cctx_get (aTHX); 1578 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1399 1579
1400 if (expect_false (prev__cctx != next->cctx)) 1580 next->cctx = 0;
1581
1582 if (expect_false (cctx_prev != cctx_current))
1401 { 1583 {
1402 prev__cctx->top_env = PL_top_env; 1584 cctx_prev->top_env = PL_top_env;
1403 PL_top_env = next->cctx->top_env; 1585 PL_top_env = cctx_current->top_env;
1404 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1586 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1405 } 1587 }
1406 1588
1407 transfer_tail (aTHX); 1589 transfer_tail (aTHX);
1408 } 1590 }
1409} 1591}
… …
1417coro_state_destroy (pTHX_ struct coro *coro) 1599coro_state_destroy (pTHX_ struct coro *coro)
1418{ 1600{
1419 if (coro->flags & CF_DESTROYED) 1601 if (coro->flags & CF_DESTROYED)
1420 return 0; 1602 return 0;
1421 1603
1422 if (coro->on_destroy) 1604 if (coro->on_destroy && !PL_dirty)
1423 coro->on_destroy (aTHX_ coro); 1605 coro->on_destroy (aTHX_ coro);
1424 1606
1425 coro->flags |= CF_DESTROYED; 1607 coro->flags |= CF_DESTROYED;
1426 1608
1427 if (coro->flags & CF_READY) 1609 if (coro->flags & CF_READY)
… …
1431 --coro_nready; 1613 --coro_nready;
1432 } 1614 }
1433 else 1615 else
1434 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1616 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1435 1617
1436 if (coro->mainstack && coro->mainstack != main_mainstack) 1618 if (coro->mainstack
1437 { 1619 && coro->mainstack != main_mainstack
1438 struct coro temp; 1620 && coro->slot
1439 1621 && !PL_dirty)
1440 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1441
1442 save_perl (aTHX_ &temp);
1443 load_perl (aTHX_ coro);
1444
1445 coro_destruct (aTHX_ coro); 1622 coro_destruct_perl (aTHX_ coro);
1446
1447 load_perl (aTHX_ &temp);
1448
1449 coro->slot = 0;
1450 }
1451 1623
1452 cctx_destroy (coro->cctx); 1624 cctx_destroy (coro->cctx);
1453 SvREFCNT_dec (coro->startcv); 1625 SvREFCNT_dec (coro->startcv);
1454 SvREFCNT_dec (coro->args); 1626 SvREFCNT_dec (coro->args);
1455 SvREFCNT_dec (CORO_THROW); 1627 SvREFCNT_dec (CORO_THROW);
… …
1542/** Coro ********************************************************************/ 1714/** Coro ********************************************************************/
1543 1715
1544INLINE void 1716INLINE void
1545coro_enq (pTHX_ struct coro *coro) 1717coro_enq (pTHX_ struct coro *coro)
1546{ 1718{
1547 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1719 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1548}
1549 1720
1550INLINE SV * 1721 SvREFCNT_inc_NN (coro->hv);
1722
1723 coro->next_ready = 0;
1724 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1725 ready [1] = coro;
1726}
1727
1728INLINE struct coro *
1551coro_deq (pTHX) 1729coro_deq (pTHX)
1552{ 1730{
1553 int prio; 1731 int prio;
1554 1732
1555 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1733 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1556 if (AvFILLp (coro_ready [prio]) >= 0) 1734 {
1557 return av_shift (coro_ready [prio]); 1735 struct coro **ready = coro_ready [prio];
1736
1737 if (ready [0])
1738 {
1739 struct coro *coro = ready [0];
1740 ready [0] = coro->next_ready;
1741 return coro;
1742 }
1743 }
1558 1744
1559 return 0; 1745 return 0;
1560} 1746}
1561 1747
1562static int 1748static int
… …
1564{ 1750{
1565 struct coro *coro; 1751 struct coro *coro;
1566 SV *sv_hook; 1752 SV *sv_hook;
1567 void (*xs_hook)(void); 1753 void (*xs_hook)(void);
1568 1754
1569 if (SvROK (coro_sv))
1570 coro_sv = SvRV (coro_sv);
1571
1572 coro = SvSTATE (coro_sv); 1755 coro = SvSTATE (coro_sv);
1573 1756
1574 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1575 return 0; 1758 return 0;
1576 1759
… …
1607api_is_ready (pTHX_ SV *coro_sv) 1790api_is_ready (pTHX_ SV *coro_sv)
1608{ 1791{
1609 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1792 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1610} 1793}
1611 1794
1795/* expects to own a reference to next->hv */
1612INLINE void 1796INLINE void
1613prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1797prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1614{ 1798{
1615 SV *prev_sv, *next_sv;
1616
1617 for (;;)
1618 {
1619 next_sv = coro_deq (aTHX);
1620
1621 /* nothing to schedule: call the idle handler */
1622 if (expect_false (!next_sv))
1623 {
1624 dSP;
1625
1626 ENTER;
1627 SAVETMPS;
1628
1629 PUSHMARK (SP);
1630 PUTBACK;
1631 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1632
1633 FREETMPS;
1634 LEAVE;
1635 continue;
1636 }
1637
1638 ta->next = SvSTATE_hv (next_sv);
1639
1640 /* cannot transfer to destroyed coros, skip and look for next */
1641 if (expect_false (ta->next->flags & CF_DESTROYED))
1642 {
1643 SvREFCNT_dec (next_sv);
1644 /* coro_nready has already been taken care of by destroy */
1645 continue;
1646 }
1647
1648 --coro_nready;
1649 break;
1650 }
1651
1652 /* free this only after the transfer */
1653 prev_sv = SvRV (coro_current); 1799 SV *prev_sv = SvRV (coro_current);
1800
1654 ta->prev = SvSTATE_hv (prev_sv); 1801 ta->prev = SvSTATE_hv (prev_sv);
1802 ta->next = next;
1803
1655 TRANSFER_CHECK (*ta); 1804 TRANSFER_CHECK (*ta);
1656 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1805
1657 ta->next->flags &= ~CF_READY;
1658 SvRV_set (coro_current, next_sv); 1806 SvRV_set (coro_current, (SV *)next->hv);
1659 1807
1660 free_coro_mortal (aTHX); 1808 free_coro_mortal (aTHX);
1661 coro_mortal = prev_sv; 1809 coro_mortal = prev_sv;
1662} 1810}
1663 1811
1812static void
1813prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1814{
1815 for (;;)
1816 {
1817 struct coro *next = coro_deq (aTHX);
1818
1819 if (expect_true (next))
1820 {
1821 /* cannot transfer to destroyed coros, skip and look for next */
1822 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1823 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1824 else
1825 {
1826 next->flags &= ~CF_READY;
1827 --coro_nready;
1828
1829 prepare_schedule_to (aTHX_ ta, next);
1830 break;
1831 }
1832 }
1833 else
1834 {
1835 /* nothing to schedule: call the idle handler */
1836 if (SvROK (sv_idle)
1837 && SvOBJECT (SvRV (sv_idle)))
1838 {
1839 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1840 api_ready (aTHX_ SvRV (sv_idle));
1841 --coro_nready;
1842 }
1843 else
1844 {
1845 dSP;
1846
1847 ENTER;
1848 SAVETMPS;
1849
1850 PUSHMARK (SP);
1851 PUTBACK;
1852 call_sv (sv_idle, G_VOID | G_DISCARD);
1853
1854 FREETMPS;
1855 LEAVE;
1856 }
1857 }
1858 }
1859}
1860
1664INLINE void 1861INLINE void
1665prepare_cede (pTHX_ struct coro_transfer_args *ta) 1862prepare_cede (pTHX_ struct coro_transfer_args *ta)
1666{ 1863{
1667 api_ready (aTHX_ coro_current); 1864 api_ready (aTHX_ coro_current);
1668 prepare_schedule (aTHX_ ta); 1865 prepare_schedule (aTHX_ ta);
… …
1687{ 1884{
1688 struct coro_transfer_args ta; 1885 struct coro_transfer_args ta;
1689 1886
1690 prepare_schedule (aTHX_ &ta); 1887 prepare_schedule (aTHX_ &ta);
1691 TRANSFER (ta, 1); 1888 TRANSFER (ta, 1);
1889}
1890
1891static void
1892api_schedule_to (pTHX_ SV *coro_sv)
1893{
1894 struct coro_transfer_args ta;
1895 struct coro *next = SvSTATE (coro_sv);
1896
1897 SvREFCNT_inc_NN (coro_sv);
1898 prepare_schedule_to (aTHX_ &ta, next);
1692} 1899}
1693 1900
1694static int 1901static int
1695api_cede (pTHX) 1902api_cede (pTHX)
1696{ 1903{
… …
1725static void 1932static void
1726api_trace (pTHX_ SV *coro_sv, int flags) 1933api_trace (pTHX_ SV *coro_sv, int flags)
1727{ 1934{
1728 struct coro *coro = SvSTATE (coro_sv); 1935 struct coro *coro = SvSTATE (coro_sv);
1729 1936
1937 if (coro->flags & CF_RUNNING)
1938 croak ("cannot enable tracing on a running coroutine, caught");
1939
1730 if (flags & CC_TRACE) 1940 if (flags & CC_TRACE)
1731 { 1941 {
1732 if (!coro->cctx) 1942 if (!coro->cctx)
1733 coro->cctx = cctx_new_run (); 1943 coro->cctx = cctx_new_run ();
1734 else if (!(coro->cctx->flags & CC_TRACE)) 1944 else if (!(coro->cctx->flags & CC_TRACE))
1735 croak ("cannot enable tracing on coroutine with custom stack,"); 1945 croak ("cannot enable tracing on coroutine with custom stack, caught");
1736 1946
1737 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1947 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1738 } 1948 }
1739 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1949 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1740 { 1950 {
… …
1745 else 1955 else
1746 coro->slot->runops = RUNOPS_DEFAULT; 1956 coro->slot->runops = RUNOPS_DEFAULT;
1747 } 1957 }
1748} 1958}
1749 1959
1960static void
1961coro_call_on_destroy (pTHX_ struct coro *coro)
1962{
1963 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1964 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1965
1966 if (on_destroyp)
1967 {
1968 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1969
1970 while (AvFILLp (on_destroy) >= 0)
1971 {
1972 dSP; /* don't disturb outer sp */
1973 SV *cb = av_pop (on_destroy);
1974
1975 PUSHMARK (SP);
1976
1977 if (statusp)
1978 {
1979 int i;
1980 AV *status = (AV *)SvRV (*statusp);
1981 EXTEND (SP, AvFILLp (status) + 1);
1982
1983 for (i = 0; i <= AvFILLp (status); ++i)
1984 PUSHs (AvARRAY (status)[i]);
1985 }
1986
1987 PUTBACK;
1988 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1989 }
1990 }
1991}
1992
1993static void
1994slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1995{
1996 int i;
1997 HV *hv = (HV *)SvRV (coro_current);
1998 AV *av = newAV ();
1999
2000 av_extend (av, items - 1);
2001 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003
2004 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2005
2006 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2007 api_ready (aTHX_ sv_manager);
2008
2009 frame->prepare = prepare_schedule;
2010 frame->check = slf_check_repeat;
2011
2012 /* as a minor optimisation, we could unwind all stacks here */
2013 /* but that puts extra pressure on pp_slf, and is not worth much */
2014 /*coro_unwind_stacks (aTHX);*/
2015}
2016
2017/*****************************************************************************/
2018/* async pool handler */
2019
2020static int
2021slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2022{
2023 HV *hv = (HV *)SvRV (coro_current);
2024 struct coro *coro = (struct coro *)frame->data;
2025
2026 if (!coro->invoke_cb)
2027 return 1; /* loop till we have invoke */
2028 else
2029 {
2030 hv_store (hv, "desc", sizeof ("desc") - 1,
2031 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2032
2033 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2034
2035 {
2036 dSP;
2037 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2038 PUTBACK;
2039 }
2040
2041 SvREFCNT_dec (GvAV (PL_defgv));
2042 GvAV (PL_defgv) = coro->invoke_av;
2043 coro->invoke_av = 0;
2044
2045 return 0;
2046 }
2047}
2048
2049static void
2050slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2051{
2052 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv ((SV *)hv);
2054
2055 if (expect_true (coro->saved_deffh))
2056 {
2057 /* subsequent iteration */
2058 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2059 coro->saved_deffh = 0;
2060
2061 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2062 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2063 {
2064 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2065 coro->invoke_av = newAV ();
2066
2067 frame->prepare = prepare_nop;
2068 }
2069 else
2070 {
2071 av_clear (GvAV (PL_defgv));
2072 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2073
2074 coro->prio = 0;
2075
2076 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2077 api_trace (aTHX_ coro_current, 0);
2078
2079 frame->prepare = prepare_schedule;
2080 av_push (av_async_pool, SvREFCNT_inc (hv));
2081 }
2082 }
2083 else
2084 {
2085 /* first iteration, simply fall through */
2086 frame->prepare = prepare_nop;
2087 }
2088
2089 frame->check = slf_check_pool_handler;
2090 frame->data = (void *)coro;
2091}
2092
1750/*****************************************************************************/ 2093/*****************************************************************************/
1751/* rouse callback */ 2094/* rouse callback */
1752 2095
1753#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2096#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1754 2097
… …
1759 SV *data = (SV *)GENSUB_ARG; 2102 SV *data = (SV *)GENSUB_ARG;
1760 2103
1761 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2104 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1762 { 2105 {
1763 /* first call, set args */ 2106 /* first call, set args */
1764 int i; 2107 SV *coro = SvRV (data);
1765 AV *av = newAV (); 2108 AV *av = newAV ();
1766 SV *coro = SvRV (data);
1767 2109
1768 SvRV_set (data, (SV *)av); 2110 SvRV_set (data, (SV *)av);
1769 api_ready (aTHX_ coro);
1770 SvREFCNT_dec (coro);
1771 2111
1772 /* better take a full copy of the arguments */ 2112 /* better take a full copy of the arguments */
1773 while (items--) 2113 while (items--)
1774 av_store (av, items, newSVsv (ST (items))); 2114 av_store (av, items, newSVsv (ST (items)));
2115
2116 api_ready (aTHX_ coro);
2117 SvREFCNT_dec (coro);
1775 } 2118 }
1776 2119
1777 XSRETURN_EMPTY; 2120 XSRETURN_EMPTY;
1778} 2121}
1779 2122
… …
1796 2139
1797 EXTEND (SP, AvFILLp (av) + 1); 2140 EXTEND (SP, AvFILLp (av) + 1);
1798 for (i = 0; i <= AvFILLp (av); ++i) 2141 for (i = 0; i <= AvFILLp (av); ++i)
1799 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2142 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1800 2143
1801 /* we have stolen the elements, so ste length to zero and free */ 2144 /* we have stolen the elements, so set length to zero and free */
1802 AvFILLp (av) = -1; 2145 AvFILLp (av) = -1;
1803 av_undef (av); 2146 av_undef (av);
1804 2147
1805 PUTBACK; 2148 PUTBACK;
1806 } 2149 }
… …
1910static void 2253static void
1911slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2254slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1912{ 2255{
1913 frame->prepare = prepare_schedule; 2256 frame->prepare = prepare_schedule;
1914 frame->check = slf_check_nop; 2257 frame->check = slf_check_nop;
2258}
2259
2260static void
2261slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2262{
2263 struct coro *next = (struct coro *)slf_frame.data;
2264
2265 SvREFCNT_inc_NN (next->hv);
2266 prepare_schedule_to (aTHX_ ta, next);
2267}
2268
2269static void
2270slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2271{
2272 if (!items)
2273 croak ("Coro::schedule_to expects a coroutine argument, caught");
2274
2275 frame->data = (void *)SvSTATE (arg [0]);
2276 frame->prepare = slf_prepare_schedule_to;
2277 frame->check = slf_check_nop;
2278}
2279
2280static void
2281slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2282{
2283 api_ready (aTHX_ SvRV (coro_current));
2284
2285 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1915} 2286}
1916 2287
1917static void 2288static void
1918slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2289slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1919{ 2290{
… …
2065 } 2436 }
2066 else 2437 else
2067 slf_argc = 0; 2438 slf_argc = 0;
2068 2439
2069 PL_op->op_ppaddr = pp_slf; 2440 PL_op->op_ppaddr = pp_slf;
2070 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2441 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2071 2442
2072 PL_op = (OP *)&slf_restore; 2443 PL_op = (OP *)&slf_restore;
2444}
2445
2446/*****************************************************************************/
2447/* dynamic wind */
2448
2449static void
2450on_enterleave_call (pTHX_ SV *cb)
2451{
2452 dSP;
2453
2454 PUSHSTACK;
2455
2456 PUSHMARK (SP);
2457 PUTBACK;
2458 call_sv (cb, G_VOID | G_DISCARD);
2459 SPAGAIN;
2460
2461 POPSTACK;
2462}
2463
2464static SV *
2465coro_avp_pop_and_free (pTHX_ AV **avp)
2466{
2467 AV *av = *avp;
2468 SV *res = av_pop (av);
2469
2470 if (AvFILLp (av) < 0)
2471 {
2472 *avp = 0;
2473 SvREFCNT_dec (av);
2474 }
2475
2476 return res;
2477}
2478
2479static void
2480coro_pop_on_enter (pTHX_ void *coro)
2481{
2482 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2483 SvREFCNT_dec (cb);
2484}
2485
2486static void
2487coro_pop_on_leave (pTHX_ void *coro)
2488{
2489 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2490 on_enterleave_call (aTHX_ sv_2mortal (cb));
2073} 2491}
2074 2492
2075/*****************************************************************************/ 2493/*****************************************************************************/
2076/* PerlIO::cede */ 2494/* PerlIO::cede */
2077 2495
… …
2151/* Coro::Semaphore & Coro::Signal */ 2569/* Coro::Semaphore & Coro::Signal */
2152 2570
2153static SV * 2571static SV *
2154coro_waitarray_new (pTHX_ int count) 2572coro_waitarray_new (pTHX_ int count)
2155{ 2573{
2156 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2574 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2157 AV *av = newAV (); 2575 AV *av = newAV ();
2158 SV **ary; 2576 SV **ary;
2159 2577
2160 /* unfortunately, building manually saves memory */ 2578 /* unfortunately, building manually saves memory */
2161 Newx (ary, 2, SV *); 2579 Newx (ary, 2, SV *);
2162 AvALLOC (av) = ary; 2580 AvALLOC (av) = ary;
2581#if PERL_VERSION_ATLEAST (5,10,0)
2163 /*AvARRAY (av) = ary;*/ 2582 AvARRAY (av) = ary;
2583#else
2164 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2584 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2585 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2586 SvPVX ((SV *)av) = (char *)ary;
2587#endif
2165 AvMAX (av) = 1; 2588 AvMAX (av) = 1;
2166 AvFILLp (av) = 0; 2589 AvFILLp (av) = 0;
2167 ary [0] = newSViv (count); 2590 ary [0] = newSViv (count);
2168 2591
2169 return newRV_noinc ((SV *)av); 2592 return newRV_noinc ((SV *)av);
… …
2298{ 2721{
2299 if (items >= 2) 2722 if (items >= 2)
2300 { 2723 {
2301 /* callback form */ 2724 /* callback form */
2302 AV *av = (AV *)SvRV (arg [0]); 2725 AV *av = (AV *)SvRV (arg [0]);
2303 CV *cb_cv = coro_sv_2cv (arg [1]); 2726 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2304 2727
2305 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2728 av_push (av, SvREFCNT_inc_NN (cb_cv));
2306 2729
2307 if (SvIVX (AvARRAY (av)[0]) > 0) 2730 if (SvIVX (AvARRAY (av)[0]) > 0)
2308 coro_semaphore_adjust (aTHX_ av, 0); 2731 coro_semaphore_adjust (aTHX_ av, 0);
2309 2732
2310 frame->prepare = prepare_nop; 2733 frame->prepare = prepare_nop;
… …
2334 AvARRAY (av)[0] = AvARRAY (av)[1]; 2757 AvARRAY (av)[0] = AvARRAY (av)[1];
2335 AvARRAY (av)[1] = cb; 2758 AvARRAY (av)[1] = cb;
2336 2759
2337 cb = av_shift (av); 2760 cb = av_shift (av);
2338 2761
2762 if (SvTYPE (cb) == SVt_PVCV)
2763 {
2764 dSP;
2765 PUSHMARK (SP);
2766 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2767 PUTBACK;
2768 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2769 }
2770 else
2771 {
2339 api_ready (aTHX_ cb); 2772 api_ready (aTHX_ cb);
2340 sv_setiv (cb, 0); /* signal waiter */ 2773 sv_setiv (cb, 0); /* signal waiter */
2774 }
2775
2341 SvREFCNT_dec (cb); 2776 SvREFCNT_dec (cb);
2342 2777
2343 --count; 2778 --count;
2344 } 2779 }
2345} 2780}
… …
2354static void 2789static void
2355slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2790slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2356{ 2791{
2357 AV *av = (AV *)SvRV (arg [0]); 2792 AV *av = (AV *)SvRV (arg [0]);
2358 2793
2794 if (items >= 2)
2795 {
2796 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2797 av_push (av, SvREFCNT_inc_NN (cb_cv));
2798
2359 if (SvIVX (AvARRAY (av)[0])) 2799 if (SvIVX (AvARRAY (av)[0]))
2800 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2801
2802 frame->prepare = prepare_nop;
2803 frame->check = slf_check_nop;
2804 }
2805 else if (SvIVX (AvARRAY (av)[0]))
2360 { 2806 {
2361 SvIVX (AvARRAY (av)[0]) = 0; 2807 SvIVX (AvARRAY (av)[0]) = 0;
2362 frame->prepare = prepare_nop; 2808 frame->prepare = prepare_nop;
2363 frame->check = slf_check_nop; 2809 frame->check = slf_check_nop;
2364 } 2810 }
2365 else 2811 else
2366 { 2812 {
2367 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2813 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2368 2814
2369 av_push (av, waiter); 2815 av_push (av, waiter);
2370 2816
2371 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2817 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2372 frame->prepare = prepare_schedule; 2818 frame->prepare = prepare_schedule;
… …
2394 dXSARGS; 2840 dXSARGS;
2395 AV *state = (AV *)GENSUB_ARG; 2841 AV *state = (AV *)GENSUB_ARG;
2396 SV *coro = av_pop (state); 2842 SV *coro = av_pop (state);
2397 SV *data_sv = newSV (sizeof (struct io_state)); 2843 SV *data_sv = newSV (sizeof (struct io_state));
2398 2844
2399 av_extend (state, items); 2845 av_extend (state, items - 1);
2400 2846
2401 sv_upgrade (data_sv, SVt_PV); 2847 sv_upgrade (data_sv, SVt_PV);
2402 SvCUR_set (data_sv, sizeof (struct io_state)); 2848 SvCUR_set (data_sv, sizeof (struct io_state));
2403 SvPOK_only (data_sv); 2849 SvPOK_only (data_sv);
2404 2850
… …
2539 XSRETURN_EMPTY; 2985 XSRETURN_EMPTY;
2540} 2986}
2541 2987
2542/*****************************************************************************/ 2988/*****************************************************************************/
2543 2989
2990#if CORO_CLONE
2991# include "clone.c"
2992#endif
2993
2544MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2994MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2545 2995
2546PROTOTYPES: DISABLE 2996PROTOTYPES: DISABLE
2547 2997
2548BOOT: 2998BOOT:
… …
2552 coro_thx = PERL_GET_CONTEXT; 3002 coro_thx = PERL_GET_CONTEXT;
2553# endif 3003# endif
2554#endif 3004#endif
2555 BOOT_PAGESIZE; 3005 BOOT_PAGESIZE;
2556 3006
3007 cctx_current = cctx_new_empty ();
3008
2557 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3009 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2558 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3010 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2559 3011
2560 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3012 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2561 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3013 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2580 3032
2581 { 3033 {
2582 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3034 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2583 3035
2584 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3036 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2585 hv_store_ent (PL_custom_op_names, slf, 3037 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2586 newSVpv ("coro_slf", 0), 0);
2587 3038
2588 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3039 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2589 hv_store_ent (PL_custom_op_descs, slf, 3040 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2590 newSVpv ("coro schedule like function", 0), 0);
2591 } 3041 }
2592 3042
2593 coroapi.ver = CORO_API_VERSION; 3043 coroapi.ver = CORO_API_VERSION;
2594 coroapi.rev = CORO_API_REVISION; 3044 coroapi.rev = CORO_API_REVISION;
2595 3045
… …
2607 3057
2608 if (!svp) croak ("Time::HiRes is required"); 3058 if (!svp) croak ("Time::HiRes is required");
2609 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3059 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2610 3060
2611 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3061 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3062
3063 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3064 u2time = INT2PTR (double (*)(), SvIV (*svp));
2612 } 3065 }
2613 3066
2614 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3067 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2615} 3068}
2616 3069
2617SV * 3070SV *
2618new (char *klass, ...) 3071new (char *klass, ...)
3072 ALIAS:
3073 Coro::new = 1
2619 CODE: 3074 CODE:
2620{ 3075{
2621 struct coro *coro; 3076 struct coro *coro;
2622 MAGIC *mg; 3077 MAGIC *mg;
2623 HV *hv; 3078 HV *hv;
2624 CV *cb; 3079 CV *cb;
2625 int i; 3080 int i;
2626 3081
2627 if (items > 1) 3082 if (items > 1)
2628 { 3083 {
2629 cb = coro_sv_2cv (ST (1)); 3084 cb = coro_sv_2cv (aTHX_ ST (1));
2630 3085
3086 if (!ix)
3087 {
2631 if (CvISXSUB (cb)) 3088 if (CvISXSUB (cb))
2632 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3089 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2633 3090
2634 if (!CvROOT (cb)) 3091 if (!CvROOT (cb))
2635 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 3092 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3093 }
2636 } 3094 }
2637 3095
2638 Newz (0, coro, 1, struct coro); 3096 Newz (0, coro, 1, struct coro);
2639 coro->args = newAV (); 3097 coro->args = newAV ();
2640 coro->flags = CF_NEW; 3098 coro->flags = CF_NEW;
… …
2648 mg->mg_flags |= MGf_DUP; 3106 mg->mg_flags |= MGf_DUP;
2649 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3107 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2650 3108
2651 if (items > 1) 3109 if (items > 1)
2652 { 3110 {
2653 coro->startcv = SvREFCNT_inc_NN (cb);
2654
2655 av_extend (coro->args, items - 1); 3111 av_extend (coro->args, items - 1 + ix - 1);
3112
3113 if (ix)
3114 {
3115 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3116 cb = cv_coro_run;
3117 }
3118
3119 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3120
2656 for (i = 2; i < items; i++) 3121 for (i = 2; i < items; i++)
2657 av_push (coro->args, newSVsv (ST (i))); 3122 av_push (coro->args, newSVsv (ST (i)));
2658 } 3123 }
2659} 3124}
2660 OUTPUT: 3125 OUTPUT:
… …
2676void 3141void
2677_exit (int code) 3142_exit (int code)
2678 PROTOTYPE: $ 3143 PROTOTYPE: $
2679 CODE: 3144 CODE:
2680 _exit (code); 3145 _exit (code);
3146
3147SV *
3148clone (Coro::State coro)
3149 CODE:
3150{
3151#if CORO_CLONE
3152 struct coro *ncoro = coro_clone (aTHX_ coro);
3153 MAGIC *mg;
3154 /* TODO: too much duplication */
3155 ncoro->hv = newHV ();
3156 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3157 mg->mg_flags |= MGf_DUP;
3158 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3159#else
3160 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3161#endif
3162}
3163 OUTPUT:
3164 RETVAL
2681 3165
2682int 3166int
2683cctx_stacksize (int new_stacksize = 0) 3167cctx_stacksize (int new_stacksize = 0)
2684 PROTOTYPE: ;$ 3168 PROTOTYPE: ;$
2685 CODE: 3169 CODE:
… …
2735 eval = 1 3219 eval = 1
2736 CODE: 3220 CODE:
2737{ 3221{
2738 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3222 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2739 { 3223 {
2740 struct coro temp; 3224 struct coro *current = SvSTATE_current;
2741 3225
2742 if (!(coro->flags & CF_RUNNING)) 3226 if (current != coro)
2743 { 3227 {
2744 PUTBACK; 3228 PUTBACK;
2745 save_perl (aTHX_ &temp); 3229 save_perl (aTHX_ current);
2746 load_perl (aTHX_ coro); 3230 load_perl (aTHX_ coro);
3231 SPAGAIN;
2747 } 3232 }
2748 3233
2749 {
2750 dSP;
2751 ENTER;
2752 SAVETMPS;
2753 PUTBACK;
2754 PUSHSTACK; 3234 PUSHSTACK;
3235
2755 PUSHMARK (SP); 3236 PUSHMARK (SP);
3237 PUTBACK;
2756 3238
2757 if (ix) 3239 if (ix)
2758 eval_sv (coderef, 0); 3240 eval_sv (coderef, 0);
2759 else 3241 else
2760 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3242 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2761 3243
2762 POPSTACK; 3244 POPSTACK;
2763 SPAGAIN; 3245 SPAGAIN;
2764 FREETMPS;
2765 LEAVE;
2766 PUTBACK;
2767 }
2768 3246
2769 if (!(coro->flags & CF_RUNNING)) 3247 if (current != coro)
2770 { 3248 {
3249 PUTBACK;
2771 save_perl (aTHX_ coro); 3250 save_perl (aTHX_ coro);
2772 load_perl (aTHX_ &temp); 3251 load_perl (aTHX_ current);
2773 SPAGAIN; 3252 SPAGAIN;
2774 } 3253 }
2775 } 3254 }
2776} 3255}
2777 3256
… …
2781 ALIAS: 3260 ALIAS:
2782 is_ready = CF_READY 3261 is_ready = CF_READY
2783 is_running = CF_RUNNING 3262 is_running = CF_RUNNING
2784 is_new = CF_NEW 3263 is_new = CF_NEW
2785 is_destroyed = CF_DESTROYED 3264 is_destroyed = CF_DESTROYED
3265 is_suspended = CF_SUSPENDED
2786 CODE: 3266 CODE:
2787 RETVAL = boolSV (coro->flags & ix); 3267 RETVAL = boolSV (coro->flags & ix);
2788 OUTPUT: 3268 OUTPUT:
2789 RETVAL 3269 RETVAL
2790 3270
… …
2794 CODE: 3274 CODE:
2795{ 3275{
2796 struct coro *current = SvSTATE_current; 3276 struct coro *current = SvSTATE_current;
2797 SV **throwp = self == current ? &CORO_THROW : &self->except; 3277 SV **throwp = self == current ? &CORO_THROW : &self->except;
2798 SvREFCNT_dec (*throwp); 3278 SvREFCNT_dec (*throwp);
3279 SvGETMAGIC (throw);
2799 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3280 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2800} 3281}
2801 3282
2802void 3283void
2803api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3284api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2806 3287
2807SV * 3288SV *
2808has_cctx (Coro::State coro) 3289has_cctx (Coro::State coro)
2809 PROTOTYPE: $ 3290 PROTOTYPE: $
2810 CODE: 3291 CODE:
2811 RETVAL = boolSV (!!coro->cctx); 3292 /* maybe manage the running flag differently */
3293 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2812 OUTPUT: 3294 OUTPUT:
2813 RETVAL 3295 RETVAL
2814 3296
2815int 3297int
2816is_traced (Coro::State coro) 3298is_traced (Coro::State coro)
… …
2836 3318
2837void 3319void
2838force_cctx () 3320force_cctx ()
2839 PROTOTYPE: 3321 PROTOTYPE:
2840 CODE: 3322 CODE:
2841 SvSTATE_current->cctx->idle_sp = 0; 3323 cctx_current->idle_sp = 0;
2842 3324
2843void 3325void
2844swap_defsv (Coro::State self) 3326swap_defsv (Coro::State self)
2845 PROTOTYPE: $ 3327 PROTOTYPE: $
2846 ALIAS: 3328 ALIAS:
… …
2854 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3336 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2855 3337
2856 SV *tmp = *src; *src = *dst; *dst = tmp; 3338 SV *tmp = *src; *src = *dst; *dst = tmp;
2857 } 3339 }
2858 3340
3341void
3342cancel (Coro::State self)
3343 CODE:
3344 coro_state_destroy (aTHX_ self);
3345 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3346
3347
3348SV *
3349enable_times (int enabled = enable_times)
3350 CODE:
3351{
3352 RETVAL = boolSV (enable_times);
3353
3354 if (enabled != enable_times)
3355 {
3356 enable_times = enabled;
3357
3358 coro_times_update ();
3359 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3360 }
3361}
3362 OUTPUT:
3363 RETVAL
3364
3365void
3366times (Coro::State self)
3367 PPCODE:
3368{
3369 struct coro *current = SvSTATE (coro_current);
3370
3371 if (expect_false (current == self))
3372 {
3373 coro_times_update ();
3374 coro_times_add (SvSTATE (coro_current));
3375 }
3376
3377 EXTEND (SP, 2);
3378 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3379 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3380
3381 if (expect_false (current == self))
3382 coro_times_sub (SvSTATE (coro_current));
3383}
2859 3384
2860MODULE = Coro::State PACKAGE = Coro 3385MODULE = Coro::State PACKAGE = Coro
2861 3386
2862BOOT: 3387BOOT:
2863{ 3388{
2864 int i;
2865
2866 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2867 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3389 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2868 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3390 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2869 3391 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3392 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2870 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3393 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2871 SvREADONLY_on (coro_current); 3394 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3395 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3396 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3397 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3398
3399 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3400 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3401 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3402 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2872 3403
2873 coro_stash = gv_stashpv ("Coro", TRUE); 3404 coro_stash = gv_stashpv ("Coro", TRUE);
2874 3405
2875 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3406 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2876 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3407 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2877 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3408 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2878 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3409 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2879 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3410 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2880 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3411 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2881
2882 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2883 coro_ready[i] = newAV ();
2884 3412
2885 { 3413 {
2886 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3414 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2887 3415
2888 coroapi.schedule = api_schedule; 3416 coroapi.schedule = api_schedule;
3417 coroapi.schedule_to = api_schedule_to;
2889 coroapi.cede = api_cede; 3418 coroapi.cede = api_cede;
2890 coroapi.cede_notself = api_cede_notself; 3419 coroapi.cede_notself = api_cede_notself;
2891 coroapi.ready = api_ready; 3420 coroapi.ready = api_ready;
2892 coroapi.is_ready = api_is_ready; 3421 coroapi.is_ready = api_is_ready;
2893 coroapi.nready = coro_nready; 3422 coroapi.nready = coro_nready;
… …
2898 SvREADONLY_on (sv); 3427 SvREADONLY_on (sv);
2899 } 3428 }
2900} 3429}
2901 3430
2902void 3431void
3432terminate (...)
3433 CODE:
3434 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3435
3436void
2903schedule (...) 3437schedule (...)
2904 CODE: 3438 CODE:
2905 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3439 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3440
3441void
3442schedule_to (...)
3443 CODE:
3444 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3445
3446void
3447cede_to (...)
3448 CODE:
3449 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2906 3450
2907void 3451void
2908cede (...) 3452cede (...)
2909 CODE: 3453 CODE:
2910 CORO_EXECUTE_SLF_XS (slf_init_cede); 3454 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2924void 3468void
2925_set_readyhook (SV *hook) 3469_set_readyhook (SV *hook)
2926 PROTOTYPE: $ 3470 PROTOTYPE: $
2927 CODE: 3471 CODE:
2928 SvREFCNT_dec (coro_readyhook); 3472 SvREFCNT_dec (coro_readyhook);
3473 SvGETMAGIC (hook);
2929 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3474 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2930 3475
2931int 3476int
2932prio (Coro::State coro, int newprio = 0) 3477prio (Coro::State coro, int newprio = 0)
2933 PROTOTYPE: $;$ 3478 PROTOTYPE: $;$
… …
2940 if (items > 1) 3485 if (items > 1)
2941 { 3486 {
2942 if (ix) 3487 if (ix)
2943 newprio = coro->prio - newprio; 3488 newprio = coro->prio - newprio;
2944 3489
2945 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3490 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2946 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3491 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2947 3492
2948 coro->prio = newprio; 3493 coro->prio = newprio;
2949 } 3494 }
2950} 3495}
2951 OUTPUT: 3496 OUTPUT:
… …
2965 CODE: 3510 CODE:
2966 RETVAL = coro_nready; 3511 RETVAL = coro_nready;
2967 OUTPUT: 3512 OUTPUT:
2968 RETVAL 3513 RETVAL
2969 3514
2970# for async_pool speedup
2971void 3515void
2972_pool_1 (SV *cb) 3516suspend (Coro::State self)
3517 PROTOTYPE: $
2973 CODE: 3518 CODE:
2974{ 3519 self->flags |= CF_SUSPENDED;
2975 HV *hv = (HV *)SvRV (coro_current);
2976 struct coro *coro = SvSTATE_hv ((SV *)hv);
2977 AV *defav = GvAV (PL_defgv);
2978 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2979 AV *invoke_av;
2980 int i, len;
2981 3520
2982 if (!invoke) 3521void
3522resume (Coro::State self)
3523 PROTOTYPE: $
3524 CODE:
3525 self->flags &= ~CF_SUSPENDED;
3526
3527void
3528_pool_handler (...)
3529 CODE:
3530 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3531
3532void
3533async_pool (SV *cv, ...)
3534 PROTOTYPE: &@
3535 PPCODE:
3536{
3537 HV *hv = (HV *)av_pop (av_async_pool);
3538 AV *av = newAV ();
3539 SV *cb = ST (0);
3540 int i;
3541
3542 av_extend (av, items - 2);
3543 for (i = 1; i < items; ++i)
3544 av_push (av, SvREFCNT_inc_NN (ST (i)));
3545
3546 if ((SV *)hv == &PL_sv_undef)
2983 { 3547 {
2984 SV *old = PL_diehook; 3548 PUSHMARK (SP);
2985 PL_diehook = 0; 3549 EXTEND (SP, 2);
2986 SvREFCNT_dec (old); 3550 PUSHs (sv_Coro);
2987 croak ("\3async_pool terminate\2\n"); 3551 PUSHs ((SV *)cv_pool_handler);
3552 PUTBACK;
3553 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3554 SPAGAIN;
3555
3556 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2988 } 3557 }
2989 3558
2990 SvREFCNT_dec (coro->saved_deffh);
2991 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2992
2993 hv_store (hv, "desc", sizeof ("desc") - 1,
2994 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2995
2996 invoke_av = (AV *)SvRV (invoke);
2997 len = av_len (invoke_av);
2998
2999 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3000
3001 if (len > 0)
3002 { 3559 {
3003 av_fill (defav, len - 1); 3560 struct coro *coro = SvSTATE_hv (hv);
3004 for (i = 0; i < len; ++i) 3561
3005 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3562 assert (!coro->invoke_cb);
3563 assert (!coro->invoke_av);
3564 coro->invoke_cb = SvREFCNT_inc (cb);
3565 coro->invoke_av = av;
3006 } 3566 }
3007}
3008 3567
3009void 3568 api_ready (aTHX_ (SV *)hv);
3010_pool_2 (SV *cb)
3011 CODE:
3012{
3013 HV *hv = (HV *)SvRV (coro_current);
3014 struct coro *coro = SvSTATE_hv ((SV *)hv);
3015 3569
3016 sv_setsv (cb, &PL_sv_undef); 3570 if (GIMME_V != G_VOID)
3017 3571 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3018 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3572 else
3019 coro->saved_deffh = 0;
3020
3021 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3022 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3023 {
3024 SV *old = PL_diehook;
3025 PL_diehook = 0;
3026 SvREFCNT_dec (old); 3573 SvREFCNT_dec (hv);
3027 croak ("\3async_pool terminate\2\n");
3028 }
3029
3030 av_clear (GvAV (PL_defgv));
3031 hv_store (hv, "desc", sizeof ("desc") - 1,
3032 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3033
3034 coro->prio = 0;
3035
3036 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3037 api_trace (aTHX_ coro_current, 0);
3038
3039 av_push (av_async_pool, newSVsv (coro_current));
3040} 3574}
3041 3575
3042SV * 3576SV *
3043rouse_cb () 3577rouse_cb ()
3044 PROTOTYPE: 3578 PROTOTYPE:
… …
3051rouse_wait (...) 3585rouse_wait (...)
3052 PROTOTYPE: ;$ 3586 PROTOTYPE: ;$
3053 PPCODE: 3587 PPCODE:
3054 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3588 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3055 3589
3590void
3591on_enter (SV *block)
3592 ALIAS:
3593 on_leave = 1
3594 PROTOTYPE: &
3595 CODE:
3596{
3597 struct coro *coro = SvSTATE_current;
3598 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3599
3600 block = (SV *)coro_sv_2cv (aTHX_ block);
3601
3602 if (!*avp)
3603 *avp = newAV ();
3604
3605 av_push (*avp, SvREFCNT_inc (block));
3606
3607 if (!ix)
3608 on_enterleave_call (aTHX_ block);
3609
3610 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3611 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3612 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3613}
3614
3056 3615
3057MODULE = Coro::State PACKAGE = PerlIO::cede 3616MODULE = Coro::State PACKAGE = PerlIO::cede
3058 3617
3059BOOT: 3618BOOT:
3060 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3619 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3063MODULE = Coro::State PACKAGE = Coro::Semaphore 3622MODULE = Coro::State PACKAGE = Coro::Semaphore
3064 3623
3065SV * 3624SV *
3066new (SV *klass, SV *count = 0) 3625new (SV *klass, SV *count = 0)
3067 CODE: 3626 CODE:
3627{
3628 int semcnt = 1;
3629
3630 if (count)
3631 {
3632 SvGETMAGIC (count);
3633
3634 if (SvOK (count))
3635 semcnt = SvIV (count);
3636 }
3637
3068 RETVAL = sv_bless ( 3638 RETVAL = sv_bless (
3069 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3639 coro_waitarray_new (aTHX_ semcnt),
3070 GvSTASH (CvGV (cv)) 3640 GvSTASH (CvGV (cv))
3071 ); 3641 );
3642}
3072 OUTPUT: 3643 OUTPUT:
3073 RETVAL 3644 RETVAL
3074 3645
3075# helper for Coro::Channel 3646# helper for Coro::Channel and others
3076SV * 3647SV *
3077_alloc (int count) 3648_alloc (int count)
3078 CODE: 3649 CODE:
3079 RETVAL = coro_waitarray_new (aTHX_ count); 3650 RETVAL = coro_waitarray_new (aTHX_ count);
3080 OUTPUT: 3651 OUTPUT:
… …
3138 for (i = 1; i <= wcount; ++i) 3709 for (i = 1; i <= wcount; ++i)
3139 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3710 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3140 } 3711 }
3141} 3712}
3142 3713
3714MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3715
3716void
3717_may_delete (SV *sem, int count, int extra_refs)
3718 PPCODE:
3719{
3720 AV *av = (AV *)SvRV (sem);
3721
3722 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3723 && AvFILLp (av) == 0 /* no waiters, just count */
3724 && SvIV (AvARRAY (av)[0]) == count)
3725 XSRETURN_YES;
3726
3727 XSRETURN_NO;
3728}
3729
3143MODULE = Coro::State PACKAGE = Coro::Signal 3730MODULE = Coro::State PACKAGE = Coro::Signal
3144 3731
3145SV * 3732SV *
3146new (SV *klass) 3733new (SV *klass)
3147 CODE: 3734 CODE:
… …
3218 3805
3219void 3806void
3220_register (char *target, char *proto, SV *req) 3807_register (char *target, char *proto, SV *req)
3221 CODE: 3808 CODE:
3222{ 3809{
3223 CV *req_cv = coro_sv_2cv (req); 3810 CV *req_cv = coro_sv_2cv (aTHX_ req);
3224 /* newXSproto doesn't return the CV on 5.8 */ 3811 /* newXSproto doesn't return the CV on 5.8 */
3225 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3812 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3226 sv_setpv ((SV *)slf_cv, proto); 3813 sv_setpv ((SV *)slf_cv, proto);
3227 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3814 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3228} 3815}

Diff Legend

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