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

Diff Legend

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