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.306 by root, Wed Nov 19 11:11:10 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
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;
245 282
283 /* ready queue */
284 struct coro *next_ready;
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 */
250 290
291 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 292 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 293 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 294 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 295 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 296 void (*on_destroy)(pTHX_ struct coro *coro);
256 297
257 /* statistics */ 298 /* statistics */
258 int usecount; /* number of transfers to this coro */ 299 int usecount; /* number of transfers to this coro */
259 300
262 SV *except; /* exception to be thrown */ 303 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 304 SV *rouse_cb;
264 305
265 /* async_pool */ 306 /* async_pool */
266 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;
267 317
268 /* linked list */ 318 /* linked list */
269 struct coro *next, *prev; 319 struct coro *next, *prev;
270}; 320};
271 321
277/* the mainr easonw e don't support windows process emulation */ 327/* the mainr easonw e don't support windows process emulation */
278static struct CoroSLF slf_frame; /* the current slf frame */ 328static struct CoroSLF slf_frame; /* the current slf frame */
279 329
280/** Coro ********************************************************************/ 330/** Coro ********************************************************************/
281 331
282#define PRIO_MAX 3 332#define CORO_PRIO_MAX 3
283#define PRIO_HIGH 1 333#define CORO_PRIO_HIGH 1
284#define PRIO_NORMAL 0 334#define CORO_PRIO_NORMAL 0
285#define PRIO_LOW -1 335#define CORO_PRIO_LOW -1
286#define PRIO_IDLE -3 336#define CORO_PRIO_IDLE -3
287#define PRIO_MIN -4 337#define CORO_PRIO_MIN -4
288 338
289/* for Coro.pm */ 339/* for Coro.pm */
290static SV *coro_current; 340static SV *coro_current;
291static SV *coro_readyhook; 341static SV *coro_readyhook;
292static 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;
293static struct coro *coro_first; 344static struct coro *coro_first;
294#define coro_nready coroapi.nready 345#define coro_nready coroapi.nready
295 346
296/** lowlevel stuff **********************************************************/ 347/** lowlevel stuff **********************************************************/
297 348
323 get_hv (name, create); 374 get_hv (name, create);
324#endif 375#endif
325 return get_hv (name, create); 376 return get_hv (name, create);
326} 377}
327 378
379/* may croak */
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
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 */
490
328static AV * 491static AV *
329coro_clone_padlist (pTHX_ CV *cv) 492coro_derive_padlist (pTHX_ CV *cv)
330{ 493{
331 AV *padlist = CvPADLIST (cv); 494 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 495 AV *newpadlist, *newpad;
333 496
334 newpadlist = newAV (); 497 newpadlist = newAV ();
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 502 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 503#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 504 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 505 --AvFILLp (padlist);
343 506
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 507 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 508 av_store (newpadlist, 1, (SV *)newpad);
346 509
347 return newpadlist; 510 return newpadlist;
348} 511}
349 512
350static void 513static void
351free_padlist (pTHX_ AV *padlist) 514free_padlist (pTHX_ AV *padlist)
352{ 515{
353 /* may be during global destruction */ 516 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 517 if (!IN_DESTRUCT)
355 { 518 {
356 I32 i = AvFILLp (padlist); 519 I32 i = AvFILLp (padlist);
357 while (i >= 0) 520
521 while (i > 0) /* special-case index 0 */
358 { 522 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 523 /* we try to be extra-careful here */
360 if (svp) 524 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 525 I32 j = AvFILLp (av);
362 SV *sv; 526
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 527 while (j >= 0)
528 SvREFCNT_dec (AvARRAY (av)[j--]);
529
530 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 531 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 532 }
369 533
534 SvREFCNT_dec (AvARRAY (padlist)[0]);
535
536 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 537 SvREFCNT_dec ((SV*)padlist);
371 } 538 }
372} 539}
373 540
374static int 541static int
375coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 542coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
376{ 543{
377 AV *padlist; 544 AV *padlist;
378 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;
379 550
380 /* casting is fun. */ 551 /* casting is fun. */
381 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 552 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
382 free_padlist (aTHX_ padlist); 553 free_padlist (aTHX_ padlist);
383 554
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 555 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 556
386 return 0; 557 return 0;
387} 558}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 559
392static MGVTBL coro_cv_vtbl = { 560static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 561 0, 0, 0, 0,
394 coro_cv_free 562 coro_cv_free
395}; 563};
396
397#define CORO_MAGIC_NN(sv, type) \
398 (expect_true (SvMAGIC (sv)->mg_type == type) \
399 ? SvMAGIC (sv) \
400 : mg_find (sv, type))
401
402#define CORO_MAGIC(sv, type) \
403 (expect_true (SvMAGIC (sv)) \
404 ? CORO_MAGIC_NN (sv, type) \
405 : 0)
406
407#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
408#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
409
410INLINE struct coro *
411SvSTATE_ (pTHX_ SV *coro)
412{
413 HV *stash;
414 MAGIC *mg;
415
416 if (SvROK (coro))
417 coro = SvRV (coro);
418
419 if (expect_false (SvTYPE (coro) != SVt_PVHV))
420 croak ("Coro::State object required");
421
422 stash = SvSTASH (coro);
423 if (expect_false (stash != coro_stash && stash != coro_state_stash))
424 {
425 /* very slow, but rare, check */
426 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
427 croak ("Coro::State object required");
428 }
429
430 mg = CORO_MAGIC_state (coro);
431 return (struct coro *)mg->mg_ptr;
432}
433
434#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
435
436/* faster than SvSTATE, but expects a coroutine hv */
437#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
438#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
439 564
440/* the next two functions merely cache the padlists */ 565/* the next two functions merely cache the padlists */
441static void 566static void
442get_padlist (pTHX_ CV *cv) 567get_padlist (pTHX_ CV *cv)
443{ 568{
454 CV *cp = Perl_cv_clone (aTHX_ cv); 579 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 580 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 581 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 582 SvREFCNT_dec (cp);
458#else 583#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 584 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 585#endif
461 } 586 }
462} 587}
463 588
464static void 589static void
471 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);
472 597
473 av = (AV *)mg->mg_obj; 598 av = (AV *)mg->mg_obj;
474 599
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 600 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 601 av_extend (av, AvFILLp (av) + 1);
477 602
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 603 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 604}
480 605
481/** load & save, init *******************************************************/ 606/** load & save, init *******************************************************/
607
608static void
609on_enterleave_call (pTHX_ SV *cb);
482 610
483static void 611static void
484load_perl (pTHX_ Coro__State c) 612load_perl (pTHX_ Coro__State c)
485{ 613{
486 perl_slots *slot = c->slot; 614 perl_slots *slot = c->slot;
487 c->slot = 0; 615 c->slot = 0;
488 616
489 PL_mainstack = c->mainstack; 617 PL_mainstack = c->mainstack;
490 618
491 GvSV (PL_defgv) = slot->defsv; 619 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 620 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 621 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 622 GvSV (irsgv) = slot->irsgv;
623 GvHV (PL_hintgv) = slot->hinthv;
495 624
496 #define VAR(name,type) PL_ ## name = slot->name; 625 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 626 # include "state.h"
498 #undef VAR 627 #undef VAR
499 628
513 PUTBACK; 642 PUTBACK;
514 } 643 }
515 644
516 slf_frame = c->slf_frame; 645 slf_frame = c->slf_frame;
517 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 }
518} 663}
519 664
520static void 665static void
521save_perl (pTHX_ Coro__State c) 666save_perl (pTHX_ Coro__State c)
522{ 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
523 c->except = CORO_THROW; 684 c->except = CORO_THROW;
524 c->slf_frame = slf_frame; 685 c->slf_frame = slf_frame;
525 686
526 { 687 {
527 dSP; 688 dSP;
540 { 701 {
541 while (expect_true (cxix >= 0)) 702 while (expect_true (cxix >= 0))
542 { 703 {
543 PERL_CONTEXT *cx = &ccstk[cxix--]; 704 PERL_CONTEXT *cx = &ccstk[cxix--];
544 705
545 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))
546 { 707 {
547 CV *cv = cx->blk_sub.cv; 708 CV *cv = cx->blk_sub.cv;
548 709
549 if (expect_true (CvDEPTH (cv))) 710 if (expect_true (CvDEPTH (cv)))
550 { 711 {
585 c->mainstack = PL_mainstack; 746 c->mainstack = PL_mainstack;
586 747
587 { 748 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 749 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 750
590 slot->defav = GvAV (PL_defgv); 751 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 752 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 753 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 754 slot->irsgv = GvSV (irsgv);
755 slot->hinthv = GvHV (PL_hintgv);
594 756
595 #define VAR(name,type) slot->name = PL_ ## name; 757 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 758 # include "state.h"
597 #undef VAR 759 #undef VAR
598 } 760 }
676#if !PERL_VERSION_ATLEAST (5,10,0) 838#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 839 Safefree (PL_retstack);
678#endif 840#endif
679} 841}
680 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
681static size_t 852static size_t
682coro_rss (pTHX_ struct coro *coro) 853coro_rss (pTHX_ struct coro *coro)
683{ 854{
684 size_t rss = sizeof (*coro); 855 size_t rss = sizeof (*coro);
685 856
686 if (coro->mainstack) 857 if (coro->mainstack)
687 { 858 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 859 if (coro->flags & CF_RUNNING)
692 { 860 {
693 slot = &tmp_slot; 861 #define SYM(sym) PL_ ## sym
694 862 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 863 #undef SYM
698 } 864 }
699 else 865 else
700 slot = coro->slot;
701
702 if (slot)
703 { 866 {
704 rss += sizeof (slot->curstackinfo); 867 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 868 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 869 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 870 }
716 } 871 }
717 872
718 return rss; 873 return rss;
719} 874}
732#endif 887#endif
733 888
734/* 889/*
735 * This overrides the default magic get method of %SIG elements. 890 * This overrides the default magic get method of %SIG elements.
736 * 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
737 * 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
738 * readback here. 893 * readback here.
739 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
740 * not expecting this to actually change the hook. This is a potential problem
741 * when a schedule happens then, but we ignore this.
742 */ 894 */
743static int 895static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 896coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 897{
746 const char *s = MgPV_nolen_const (mg); 898 const char *s = MgPV_nolen_const (mg);
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 951 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 952
801 if (svp) 953 if (svp)
802 { 954 {
803 SV *old = *svp; 955 SV *old = *svp;
804 *svp = newSVsv (sv); 956 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 957 SvREFCNT_dec (old);
806 return 0; 958 return 0;
807 } 959 }
808 } 960 }
809 961
819 971
820static int 972static int
821slf_check_nop (pTHX_ struct CoroSLF *frame) 973slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 974{
823 return 0; 975 return 0;
976}
977
978static int
979slf_check_repeat (pTHX_ struct CoroSLF *frame)
980{
981 return 1;
824} 982}
825 983
826static UNOP coro_setup_op; 984static UNOP coro_setup_op;
827 985
828static 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 */
835 993
836 PL_runops = RUNOPS_DEFAULT; 994 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 995 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 996 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 997 PL_comppad = 0;
998 PL_comppad_name = 0;
999 PL_comppad_name_fill = 0;
1000 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1001 PL_curpm = 0;
841 PL_curpad = 0; 1002 PL_curpad = 0;
842 PL_localizing = 0; 1003 PL_localizing = 0;
843 PL_dirty = 0; 1004 PL_dirty = 0;
844 PL_restartop = 0; 1005 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1006#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1007 PL_parser = 0;
847#endif 1008#endif
1009 PL_hints = 0;
848 1010
849 /* recreate the die/warn hooks */ 1011 /* recreate the die/warn hooks */
850 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 );
851 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);
852 1014
853 GvSV (PL_defgv) = newSV (0); 1015 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1016 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1017 GvSV (PL_errgv) = newSV (0);
856 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;
857 PL_rs = newSVsv (GvSV (irsgv)); 1020 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1021 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1022
860 { 1023 {
861 dSP; 1024 dSP;
862 UNOP myop; 1025 UNOP myop;
863 1026
864 Zero (&myop, 1, UNOP); 1027 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1028 myop.op_next = Nullop;
1029 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1030 myop.op_flags = OPf_WANT_VOID;
867 1031
868 PUSHMARK (SP); 1032 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1033 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1034 PUTBACK;
871 PL_op = (OP *)&myop; 1035 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1036 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1037 }
875 1038
876 /* this newly created coroutine might be run on an existing cctx which most 1039 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1040 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1041 */
879 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 */
880 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 */
881 1044
882 /* 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 */
883 coro_setup_op.op_next = PL_op; 1046 coro_setup_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 1047 coro_setup_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 1048 coro_setup_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 1049 /* no flags etc. required, as an init function won't be called */
887 1050
888 PL_op = (OP *)&coro_setup_op; 1051 PL_op = (OP *)&coro_setup_op;
889 1052
890 /* copy throw, in case it was set before coro_setup */ 1053 /* copy throw, in case it was set before coro_setup */
891 CORO_THROW = coro->except; 1054 CORO_THROW = coro->except;
892}
893 1055
1056 if (expect_false (enable_times))
1057 {
1058 coro_times_update ();
1059 coro_times_sub (coro);
1060 }
1061}
1062
894static void 1063static void
895coro_destruct (pTHX_ struct coro *coro) 1064coro_unwind_stacks (pTHX)
896{ 1065{
897 if (!IN_DESTRUCT) 1066 if (!IN_DESTRUCT)
898 { 1067 {
899 /* restore all saved variables and stuff */ 1068 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 1069 LEAVE_SCOPE (0);
908 POPSTACK_TO (PL_mainstack); 1077 POPSTACK_TO (PL_mainstack);
909 1078
910 /* unwind main stack */ 1079 /* unwind main stack */
911 dounwind (-1); 1080 dounwind (-1);
912 } 1081 }
1082}
913 1083
914 SvREFCNT_dec (GvSV (PL_defgv)); 1084static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 1085coro_destruct_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 1086{
917 SvREFCNT_dec (PL_defoutgv); 1087 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 1088
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 1089 {
924 SvREFCNT_dec (CORO_THROW); 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
925 SvREFCNT_dec (coro->saved_deffh); 1121 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1122 SvREFCNT_dec (coro->rouse_cb);
927 1123 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1124 SvREFCNT_dec (coro->invoke_av);
1125 }
929} 1126}
930 1127
931INLINE void 1128INLINE void
932free_coro_mortal (pTHX) 1129free_coro_mortal (pTHX)
933{ 1130{
941static int 1138static int
942runops_trace (pTHX) 1139runops_trace (pTHX)
943{ 1140{
944 COP *oldcop = 0; 1141 COP *oldcop = 0;
945 int oldcxix = -2; 1142 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1143
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1144 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1145 {
951 PERL_ASYNC_CHECK (); 1146 PERL_ASYNC_CHECK ();
952 1147
953 if (cctx->flags & CC_TRACE_ALL) 1148 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1149 {
955 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)
956 { 1151 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1152 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1153 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1154 AV *av = newAV (); /* return values */
960 SV **cb; 1155 SV **cb;
997 1192
998 if (PL_curcop != &PL_compiling) 1193 if (PL_curcop != &PL_compiling)
999 { 1194 {
1000 SV **cb; 1195 SV **cb;
1001 1196
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1197 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1198 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1199 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1200
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1201 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1202 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1203 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1204 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1205 SV *fullname = sv_2mortal (newSV (0));
1012 1206
1013 if (isGV (gv)) 1207 if (isGV (gv))
1018 SAVETMPS; 1212 SAVETMPS;
1019 EXTEND (SP, 3); 1213 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1214 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1215 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1216 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1217 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1218 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1219 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1220 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1221 SPAGAIN;
1028 FREETMPS; 1222 FREETMPS;
1031 } 1225 }
1032 1226
1033 oldcxix = cxstack_ix; 1227 oldcxix = cxstack_ix;
1034 } 1228 }
1035 1229
1036 if (cctx->flags & CC_TRACE_LINE) 1230 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1231 {
1038 dSP; 1232 dSP;
1039 1233
1040 PL_runops = RUNOPS_DEFAULT; 1234 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1235 ENTER;
1060 1254
1061 TAINT_NOT; 1255 TAINT_NOT;
1062 return 0; 1256 return 0;
1063} 1257}
1064 1258
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1259static struct CoroSLF cctx_ssl_frame;
1067 1260
1068static void 1261static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1262slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1263{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1264 ta->prev = 0;
1073} 1265}
1074 1266
1075static int 1267static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1268slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1269{
1080 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 */
1081} 1273}
1082 1274
1083/* 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 */
1084static void NOINLINE 1276static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1277cctx_prepare (pTHX)
1086{ 1278{
1087 PL_top_env = &PL_start_env; 1279 PL_top_env = &PL_start_env;
1088 1280
1089 if (cctx->flags & CC_TRACE) 1281 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1282 PL_runops = runops_trace;
1091 1283
1092 /* 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
1093 * that can lead to creation of a new cctx */ 1285 * that can lead to creation of a new cctx */
1094 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)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1287 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1288
1097 /* 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 */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1290 cctx_ssl_frame = slf_frame;
1100 1291
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1292 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1293 slf_frame.check = slf_check_set_stacklevel;
1103} 1294}
1126 /* normally we would need to skip the entersub here */ 1317 /* normally we would need to skip the entersub here */
1127 /* 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 */
1128 /* PL_nop = PL_nop->op_next */ 1319 /* PL_nop = PL_nop->op_next */
1129 1320
1130 /* inject a fake subroutine call to cctx_init */ 1321 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1322 cctx_prepare (aTHX);
1132 1323
1133 /* cctx_run is the alternative tail of transfer() */ 1324 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1325 transfer_tail (aTHX);
1135 1326
1136 /* 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 */
1137 PL_restartop = PL_op; 1328 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1329 perl_run (PL_curinterp);
1330 /*
1331 * Unfortunately, there is no way to get at the return values of the
1332 * coro body here, as perl_run destroys these
1333 */
1139 1334
1140 /* 1335 /*
1141 * 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
1142 * 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)
1143 * 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
1144 * bootstrap-time "top" top_env, as we cannot restore the "main" 1339 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * 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.
1146 */ 1343 */
1147 PL_top_env = main_top_env; 1344 PL_top_env = main_top_env;
1148 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 */
1149 } 1346 }
1150} 1347}
1227cctx_destroy (coro_cctx *cctx) 1424cctx_destroy (coro_cctx *cctx)
1228{ 1425{
1229 if (!cctx) 1426 if (!cctx)
1230 return; 1427 return;
1231 1428
1429 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1430
1232 --cctx_count; 1431 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1432 coro_destroy (&cctx->cctx);
1234 1433
1235 /* coro_transfer creates new, empty cctx's */ 1434 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1435 if (cctx->sptr)
1299 /* TODO: throwing up here is considered harmful */ 1498 /* TODO: throwing up here is considered harmful */
1300 1499
1301 if (expect_true (prev != next)) 1500 if (expect_true (prev != next))
1302 { 1501 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1502 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 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,");
1305 1504
1306 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308
1309 if (expect_false (next->flags & CF_DESTROYED)) 1505 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1310 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,");
1311 1507
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1508#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1509 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1314 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,");
1315#endif 1511#endif
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1517transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1518{
1323 dSTACKLEVEL; 1519 dSTACKLEVEL;
1324 1520
1325 /* sometimes transfer is only called to set idle_sp */ 1521 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1522 if (expect_false (!prev))
1327 { 1523 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1524 cctx_current->idle_sp = STACKLEVEL;
1329 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 */
1330 } 1526 }
1331 else if (expect_true (prev != next)) 1527 else if (expect_true (prev != next))
1332 { 1528 {
1333 coro_cctx *prev__cctx; 1529 coro_cctx *cctx_prev;
1334 1530
1335 if (expect_false (prev->flags & CF_NEW)) 1531 if (expect_false (prev->flags & CF_NEW))
1336 { 1532 {
1337 /* create a new empty/source context */ 1533 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1534 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1535 prev->flags |= CF_RUNNING;
1341 } 1536 }
1342 1537
1343 prev->flags &= ~CF_RUNNING; 1538 prev->flags &= ~CF_RUNNING;
1354 coro_setup (aTHX_ next); 1549 coro_setup (aTHX_ next);
1355 } 1550 }
1356 else 1551 else
1357 load_perl (aTHX_ next); 1552 load_perl (aTHX_ next);
1358 1553
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1554 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1555 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1556 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1557 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1558 && !force_cctx
1366 )) 1559 ))
1367 { 1560 {
1368 /* 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 */
1369 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));
1370 1563
1371 prev->cctx = 0;
1372
1373 /* 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. */
1374 /* 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 */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1566 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1567 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1568 next->cctx = cctx_get (aTHX);
1378 1569
1379 cctx_put (prev__cctx); 1570 cctx_put (cctx_current);
1380 } 1571 }
1572 else
1573 prev->cctx = cctx_current;
1381 1574
1382 ++next->usecount; 1575 ++next->usecount;
1383 1576
1384 if (expect_true (!next->cctx)) 1577 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1578 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1579
1387 if (expect_false (prev__cctx != next->cctx)) 1580 next->cctx = 0;
1581
1582 if (expect_false (cctx_prev != cctx_current))
1388 { 1583 {
1389 prev__cctx->top_env = PL_top_env; 1584 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1585 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1586 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1587 }
1393 1588
1394 transfer_tail (aTHX); 1589 transfer_tail (aTHX);
1395 } 1590 }
1396} 1591}
1404coro_state_destroy (pTHX_ struct coro *coro) 1599coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1600{
1406 if (coro->flags & CF_DESTROYED) 1601 if (coro->flags & CF_DESTROYED)
1407 return 0; 1602 return 0;
1408 1603
1409 if (coro->on_destroy) 1604 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1605 coro->on_destroy (aTHX_ coro);
1411 1606
1412 coro->flags |= CF_DESTROYED; 1607 coro->flags |= CF_DESTROYED;
1413 1608
1414 if (coro->flags & CF_READY) 1609 if (coro->flags & CF_READY)
1418 --coro_nready; 1613 --coro_nready;
1419 } 1614 }
1420 else 1615 else
1421 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 */
1422 1617
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1618 if (coro->mainstack
1424 { 1619 && coro->mainstack != main_mainstack
1425 struct coro temp; 1620 && coro->slot
1426 1621 && !PL_dirty)
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1428
1429 save_perl (aTHX_ &temp);
1430 load_perl (aTHX_ coro);
1431
1432 coro_destruct (aTHX_ coro); 1622 coro_destruct_perl (aTHX_ coro);
1433
1434 load_perl (aTHX_ &temp);
1435
1436 coro->slot = 0;
1437 }
1438 1623
1439 cctx_destroy (coro->cctx); 1624 cctx_destroy (coro->cctx);
1625 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1626 SvREFCNT_dec (coro->args);
1627 SvREFCNT_dec (CORO_THROW);
1441 1628
1442 if (coro->next) coro->next->prev = coro->prev; 1629 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1630 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1631 if (coro == coro_first) coro_first = coro->next;
1445 1632
1527/** Coro ********************************************************************/ 1714/** Coro ********************************************************************/
1528 1715
1529INLINE void 1716INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1717coro_enq (pTHX_ struct coro *coro)
1531{ 1718{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1719 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1533}
1534 1720
1535INLINE 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 *
1536coro_deq (pTHX) 1729coro_deq (pTHX)
1537{ 1730{
1538 int prio; 1731 int prio;
1539 1732
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1733 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1734 {
1542 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 }
1543 1744
1544 return 0; 1745 return 0;
1545} 1746}
1546 1747
1547static int 1748static int
1549{ 1750{
1550 struct coro *coro; 1751 struct coro *coro;
1551 SV *sv_hook; 1752 SV *sv_hook;
1552 void (*xs_hook)(void); 1753 void (*xs_hook)(void);
1553 1754
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1755 coro = SvSTATE (coro_sv);
1558 1756
1559 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1560 return 0; 1758 return 0;
1561 1759
1592api_is_ready (pTHX_ SV *coro_sv) 1790api_is_ready (pTHX_ SV *coro_sv)
1593{ 1791{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1792 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1793}
1596 1794
1795/* expects to own a reference to next->hv */
1597INLINE void 1796INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1797prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1798{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;)
1603 {
1604 next_sv = coro_deq (aTHX);
1605
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv))
1608 {
1609 dSP;
1610
1611 ENTER;
1612 SAVETMPS;
1613
1614 PUSHMARK (SP);
1615 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617
1618 FREETMPS;
1619 LEAVE;
1620 continue;
1621 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current); 1799 SV *prev_sv = SvRV (coro_current);
1800
1639 ta->prev = SvSTATE_hv (prev_sv); 1801 ta->prev = SvSTATE_hv (prev_sv);
1802 ta->next = next;
1803
1640 TRANSFER_CHECK (*ta); 1804 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1805
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1806 SvRV_set (coro_current, (SV *)next->hv);
1644 1807
1645 free_coro_mortal (aTHX); 1808 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1809 coro_mortal = prev_sv;
1647} 1810}
1648 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
1649INLINE void 1861INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1862prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1863{
1652 api_ready (aTHX_ coro_current); 1864 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1865 prepare_schedule (aTHX_ ta);
1672{ 1884{
1673 struct coro_transfer_args ta; 1885 struct coro_transfer_args ta;
1674 1886
1675 prepare_schedule (aTHX_ &ta); 1887 prepare_schedule (aTHX_ &ta);
1676 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);
1677} 1899}
1678 1900
1679static int 1901static int
1680api_cede (pTHX) 1902api_cede (pTHX)
1681{ 1903{
1710static void 1932static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1933api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1934{
1713 struct coro *coro = SvSTATE (coro_sv); 1935 struct coro *coro = SvSTATE (coro_sv);
1714 1936
1937 if (coro->flags & CF_RUNNING)
1938 croak ("cannot enable tracing on a running coroutine, caught");
1939
1715 if (flags & CC_TRACE) 1940 if (flags & CC_TRACE)
1716 { 1941 {
1717 if (!coro->cctx) 1942 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1943 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1944 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1945 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1946
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1947 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1948 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1949 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1950 {
1730 else 1955 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1956 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1957 }
1733} 1958}
1734 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
1735/*****************************************************************************/ 2093/*****************************************************************************/
1736/* rouse callback */ 2094/* rouse callback */
1737 2095
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2096#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2097
1744 SV *data = (SV *)GENSUB_ARG; 2102 SV *data = (SV *)GENSUB_ARG;
1745 2103
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2104 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2105 {
1748 /* first call, set args */ 2106 /* first call, set args */
1749 int i; 2107 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2108 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2109
1753 SvRV_set (data, (SV *)av); 2110 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2111
1757 /* better take a full copy of the arguments */ 2112 /* better take a full copy of the arguments */
1758 while (items--) 2113 while (items--)
1759 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);
1760 } 2118 }
1761 2119
1762 XSRETURN_EMPTY; 2120 XSRETURN_EMPTY;
1763} 2121}
1764 2122
1781 2139
1782 EXTEND (SP, AvFILLp (av) + 1); 2140 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2141 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2142 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2143
1786 /* 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 */
1787 AvFILLp (av) = -1; 2145 AvFILLp (av) = -1;
1788 av_undef (av); 2146 av_undef (av);
1789 2147
1790 PUTBACK; 2148 PUTBACK;
1791 } 2149 }
1895static void 2253static void
1896slf_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)
1897{ 2255{
1898 frame->prepare = prepare_schedule; 2256 frame->prepare = prepare_schedule;
1899 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);
1900} 2286}
1901 2287
1902static void 2288static void
1903slf_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)
1904{ 2290{
2050 } 2436 }
2051 else 2437 else
2052 slf_argc = 0; 2438 slf_argc = 0;
2053 2439
2054 PL_op->op_ppaddr = pp_slf; 2440 PL_op->op_ppaddr = pp_slf;
2055 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 */
2056 2442
2057 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));
2058} 2491}
2059 2492
2060/*****************************************************************************/ 2493/*****************************************************************************/
2061/* PerlIO::cede */ 2494/* PerlIO::cede */
2062 2495
2136/* Coro::Semaphore & Coro::Signal */ 2569/* Coro::Semaphore & Coro::Signal */
2137 2570
2138static SV * 2571static SV *
2139coro_waitarray_new (pTHX_ int count) 2572coro_waitarray_new (pTHX_ int count)
2140{ 2573{
2141 /* 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 */
2142 AV *av = newAV (); 2575 AV *av = newAV ();
2143 SV **ary; 2576 SV **ary;
2144 2577
2145 /* unfortunately, building manually saves memory */ 2578 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2579 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2580 AvALLOC (av) = ary;
2581#if PERL_VERSION_ATLEAST (5,10,0)
2148 /*AvARRAY (av) = ary;*/ 2582 AvARRAY (av) = ary;
2583#else
2149 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
2150 AvMAX (av) = 1; 2588 AvMAX (av) = 1;
2151 AvFILLp (av) = 0; 2589 AvFILLp (av) = 0;
2152 ary [0] = newSViv (count); 2590 ary [0] = newSViv (count);
2153 2591
2154 return newRV_noinc ((SV *)av); 2592 return newRV_noinc ((SV *)av);
2283{ 2721{
2284 if (items >= 2) 2722 if (items >= 2)
2285 { 2723 {
2286 /* callback form */ 2724 /* callback form */
2287 AV *av = (AV *)SvRV (arg [0]); 2725 AV *av = (AV *)SvRV (arg [0]);
2288 HV *st; 2726 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2289 GV *gvp;
2290 CV *cb_cv = sv_2cv (arg [1], &st, &gvp, 0);
2291 2727
2292 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2728 av_push (av, SvREFCNT_inc_NN (cb_cv));
2293 2729
2294 if (SvIVX (AvARRAY (av)[0]) > 0) 2730 if (SvIVX (AvARRAY (av)[0]) > 0)
2295 coro_semaphore_adjust (aTHX_ av, 0); 2731 coro_semaphore_adjust (aTHX_ av, 0);
2296 2732
2297 frame->prepare = prepare_nop; 2733 frame->prepare = prepare_nop;
2321 AvARRAY (av)[0] = AvARRAY (av)[1]; 2757 AvARRAY (av)[0] = AvARRAY (av)[1];
2322 AvARRAY (av)[1] = cb; 2758 AvARRAY (av)[1] = cb;
2323 2759
2324 cb = av_shift (av); 2760 cb = av_shift (av);
2325 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 {
2326 api_ready (aTHX_ cb); 2772 api_ready (aTHX_ cb);
2327 sv_setiv (cb, 0); /* signal waiter */ 2773 sv_setiv (cb, 0); /* signal waiter */
2774 }
2775
2328 SvREFCNT_dec (cb); 2776 SvREFCNT_dec (cb);
2329 2777
2330 --count; 2778 --count;
2331 } 2779 }
2332} 2780}
2341static void 2789static void
2342slf_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)
2343{ 2791{
2344 AV *av = (AV *)SvRV (arg [0]); 2792 AV *av = (AV *)SvRV (arg [0]);
2345 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
2346 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]))
2347 { 2806 {
2348 SvIVX (AvARRAY (av)[0]) = 0; 2807 SvIVX (AvARRAY (av)[0]) = 0;
2349 frame->prepare = prepare_nop; 2808 frame->prepare = prepare_nop;
2350 frame->check = slf_check_nop; 2809 frame->check = slf_check_nop;
2351 } 2810 }
2352 else 2811 else
2353 { 2812 {
2354 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2813 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2355 2814
2356 av_push (av, waiter); 2815 av_push (av, waiter);
2357 2816
2358 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 */
2359 frame->prepare = prepare_schedule; 2818 frame->prepare = prepare_schedule;
2381 dXSARGS; 2840 dXSARGS;
2382 AV *state = (AV *)GENSUB_ARG; 2841 AV *state = (AV *)GENSUB_ARG;
2383 SV *coro = av_pop (state); 2842 SV *coro = av_pop (state);
2384 SV *data_sv = newSV (sizeof (struct io_state)); 2843 SV *data_sv = newSV (sizeof (struct io_state));
2385 2844
2386 av_extend (state, items); 2845 av_extend (state, items - 1);
2387 2846
2388 sv_upgrade (data_sv, SVt_PV); 2847 sv_upgrade (data_sv, SVt_PV);
2389 SvCUR_set (data_sv, sizeof (struct io_state)); 2848 SvCUR_set (data_sv, sizeof (struct io_state));
2390 SvPOK_only (data_sv); 2849 SvPOK_only (data_sv);
2391 2850
2526 XSRETURN_EMPTY; 2985 XSRETURN_EMPTY;
2527} 2986}
2528 2987
2529/*****************************************************************************/ 2988/*****************************************************************************/
2530 2989
2990#if CORO_CLONE
2991# include "clone.c"
2992#endif
2993
2531MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2994MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2532 2995
2533PROTOTYPES: DISABLE 2996PROTOTYPES: DISABLE
2534 2997
2535BOOT: 2998BOOT:
2539 coro_thx = PERL_GET_CONTEXT; 3002 coro_thx = PERL_GET_CONTEXT;
2540# endif 3003# endif
2541#endif 3004#endif
2542 BOOT_PAGESIZE; 3005 BOOT_PAGESIZE;
2543 3006
3007 cctx_current = cctx_new_empty ();
3008
2544 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3009 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2545 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3010 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2546 3011
2547 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;
2548 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;
2567 3032
2568 { 3033 {
2569 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3034 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2570 3035
2571 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3036 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2572 hv_store_ent (PL_custom_op_names, slf, 3037 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2573 newSVpv ("coro_slf", 0), 0);
2574 3038
2575 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3039 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2576 hv_store_ent (PL_custom_op_descs, slf, 3040 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2577 newSVpv ("coro schedule like function", 0), 0);
2578 } 3041 }
2579 3042
2580 coroapi.ver = CORO_API_VERSION; 3043 coroapi.ver = CORO_API_VERSION;
2581 coroapi.rev = CORO_API_REVISION; 3044 coroapi.rev = CORO_API_REVISION;
2582 3045
2594 3057
2595 if (!svp) croak ("Time::HiRes is required"); 3058 if (!svp) croak ("Time::HiRes is required");
2596 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3059 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2597 3060
2598 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));
2599 } 3065 }
2600 3066
2601 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3067 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2602} 3068}
2603 3069
2604SV * 3070SV *
2605new (char *klass, ...) 3071new (char *klass, ...)
3072 ALIAS:
3073 Coro::new = 1
2606 CODE: 3074 CODE:
2607{ 3075{
2608 struct coro *coro; 3076 struct coro *coro;
2609 MAGIC *mg; 3077 MAGIC *mg;
2610 HV *hv; 3078 HV *hv;
3079 CV *cb;
2611 int i; 3080 int i;
3081
3082 if (items > 1)
3083 {
3084 cb = coro_sv_2cv (aTHX_ ST (1));
3085
3086 if (!ix)
3087 {
3088 if (CvISXSUB (cb))
3089 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3090
3091 if (!CvROOT (cb))
3092 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3093 }
3094 }
2612 3095
2613 Newz (0, coro, 1, struct coro); 3096 Newz (0, coro, 1, struct coro);
2614 coro->args = newAV (); 3097 coro->args = newAV ();
2615 coro->flags = CF_NEW; 3098 coro->flags = CF_NEW;
2616 3099
2621 coro->hv = hv = newHV (); 3104 coro->hv = hv = newHV ();
2622 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 3105 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2623 mg->mg_flags |= MGf_DUP; 3106 mg->mg_flags |= MGf_DUP;
2624 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3107 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2625 3108
3109 if (items > 1)
3110 {
2626 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
2627 for (i = 1; i < items; i++) 3121 for (i = 2; i < items; i++)
2628 av_push (coro->args, newSVsv (ST (i))); 3122 av_push (coro->args, newSVsv (ST (i)));
3123 }
2629} 3124}
2630 OUTPUT: 3125 OUTPUT:
2631 RETVAL 3126 RETVAL
2632 3127
2633void 3128void
2646void 3141void
2647_exit (int code) 3142_exit (int code)
2648 PROTOTYPE: $ 3143 PROTOTYPE: $
2649 CODE: 3144 CODE:
2650 _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
2651 3165
2652int 3166int
2653cctx_stacksize (int new_stacksize = 0) 3167cctx_stacksize (int new_stacksize = 0)
2654 PROTOTYPE: ;$ 3168 PROTOTYPE: ;$
2655 CODE: 3169 CODE:
2705 eval = 1 3219 eval = 1
2706 CODE: 3220 CODE:
2707{ 3221{
2708 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3222 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2709 { 3223 {
2710 struct coro temp; 3224 struct coro *current = SvSTATE_current;
2711 3225
2712 if (!(coro->flags & CF_RUNNING)) 3226 if (current != coro)
2713 { 3227 {
2714 PUTBACK; 3228 PUTBACK;
2715 save_perl (aTHX_ &temp); 3229 save_perl (aTHX_ current);
2716 load_perl (aTHX_ coro); 3230 load_perl (aTHX_ coro);
3231 SPAGAIN;
2717 } 3232 }
2718 3233
2719 {
2720 dSP;
2721 ENTER;
2722 SAVETMPS;
2723 PUTBACK;
2724 PUSHSTACK; 3234 PUSHSTACK;
3235
2725 PUSHMARK (SP); 3236 PUSHMARK (SP);
3237 PUTBACK;
2726 3238
2727 if (ix) 3239 if (ix)
2728 eval_sv (coderef, 0); 3240 eval_sv (coderef, 0);
2729 else 3241 else
2730 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3242 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2731 3243
2732 POPSTACK; 3244 POPSTACK;
2733 SPAGAIN; 3245 SPAGAIN;
2734 FREETMPS;
2735 LEAVE;
2736 PUTBACK;
2737 }
2738 3246
2739 if (!(coro->flags & CF_RUNNING)) 3247 if (current != coro)
2740 { 3248 {
3249 PUTBACK;
2741 save_perl (aTHX_ coro); 3250 save_perl (aTHX_ coro);
2742 load_perl (aTHX_ &temp); 3251 load_perl (aTHX_ current);
2743 SPAGAIN; 3252 SPAGAIN;
2744 } 3253 }
2745 } 3254 }
2746} 3255}
2747 3256
2751 ALIAS: 3260 ALIAS:
2752 is_ready = CF_READY 3261 is_ready = CF_READY
2753 is_running = CF_RUNNING 3262 is_running = CF_RUNNING
2754 is_new = CF_NEW 3263 is_new = CF_NEW
2755 is_destroyed = CF_DESTROYED 3264 is_destroyed = CF_DESTROYED
3265 is_suspended = CF_SUSPENDED
2756 CODE: 3266 CODE:
2757 RETVAL = boolSV (coro->flags & ix); 3267 RETVAL = boolSV (coro->flags & ix);
2758 OUTPUT: 3268 OUTPUT:
2759 RETVAL 3269 RETVAL
2760 3270
2764 CODE: 3274 CODE:
2765{ 3275{
2766 struct coro *current = SvSTATE_current; 3276 struct coro *current = SvSTATE_current;
2767 SV **throwp = self == current ? &CORO_THROW : &self->except; 3277 SV **throwp = self == current ? &CORO_THROW : &self->except;
2768 SvREFCNT_dec (*throwp); 3278 SvREFCNT_dec (*throwp);
3279 SvGETMAGIC (throw);
2769 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3280 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2770} 3281}
2771 3282
2772void 3283void
2773api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3284api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2776 3287
2777SV * 3288SV *
2778has_cctx (Coro::State coro) 3289has_cctx (Coro::State coro)
2779 PROTOTYPE: $ 3290 PROTOTYPE: $
2780 CODE: 3291 CODE:
2781 RETVAL = boolSV (!!coro->cctx); 3292 /* maybe manage the running flag differently */
3293 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2782 OUTPUT: 3294 OUTPUT:
2783 RETVAL 3295 RETVAL
2784 3296
2785int 3297int
2786is_traced (Coro::State coro) 3298is_traced (Coro::State coro)
2806 3318
2807void 3319void
2808force_cctx () 3320force_cctx ()
2809 PROTOTYPE: 3321 PROTOTYPE:
2810 CODE: 3322 CODE:
2811 SvSTATE_current->cctx->idle_sp = 0; 3323 cctx_current->idle_sp = 0;
2812 3324
2813void 3325void
2814swap_defsv (Coro::State self) 3326swap_defsv (Coro::State self)
2815 PROTOTYPE: $ 3327 PROTOTYPE: $
2816 ALIAS: 3328 ALIAS:
2824 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3336 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2825 3337
2826 SV *tmp = *src; *src = *dst; *dst = tmp; 3338 SV *tmp = *src; *src = *dst; *dst = tmp;
2827 } 3339 }
2828 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}
2829 3384
2830MODULE = Coro::State PACKAGE = Coro 3385MODULE = Coro::State PACKAGE = Coro
2831 3386
2832BOOT: 3387BOOT:
2833{ 3388{
2834 int i;
2835
2836 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2837 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3389 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2838 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3390 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2839 3391 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3392 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2840 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3393 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2841 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);
2842 3403
2843 coro_stash = gv_stashpv ("Coro", TRUE); 3404 coro_stash = gv_stashpv ("Coro", TRUE);
2844 3405
2845 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3406 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2846 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3407 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2847 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3408 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2848 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3409 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2849 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3410 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2850 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3411 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2851
2852 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2853 coro_ready[i] = newAV ();
2854 3412
2855 { 3413 {
2856 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3414 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2857 3415
2858 coroapi.schedule = api_schedule; 3416 coroapi.schedule = api_schedule;
3417 coroapi.schedule_to = api_schedule_to;
2859 coroapi.cede = api_cede; 3418 coroapi.cede = api_cede;
2860 coroapi.cede_notself = api_cede_notself; 3419 coroapi.cede_notself = api_cede_notself;
2861 coroapi.ready = api_ready; 3420 coroapi.ready = api_ready;
2862 coroapi.is_ready = api_is_ready; 3421 coroapi.is_ready = api_is_ready;
2863 coroapi.nready = coro_nready; 3422 coroapi.nready = coro_nready;
2868 SvREADONLY_on (sv); 3427 SvREADONLY_on (sv);
2869 } 3428 }
2870} 3429}
2871 3430
2872void 3431void
3432terminate (...)
3433 CODE:
3434 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3435
3436void
2873schedule (...) 3437schedule (...)
2874 CODE: 3438 CODE:
2875 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);
2876 3450
2877void 3451void
2878cede (...) 3452cede (...)
2879 CODE: 3453 CODE:
2880 CORO_EXECUTE_SLF_XS (slf_init_cede); 3454 CORO_EXECUTE_SLF_XS (slf_init_cede);
2894void 3468void
2895_set_readyhook (SV *hook) 3469_set_readyhook (SV *hook)
2896 PROTOTYPE: $ 3470 PROTOTYPE: $
2897 CODE: 3471 CODE:
2898 SvREFCNT_dec (coro_readyhook); 3472 SvREFCNT_dec (coro_readyhook);
3473 SvGETMAGIC (hook);
2899 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3474 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2900 3475
2901int 3476int
2902prio (Coro::State coro, int newprio = 0) 3477prio (Coro::State coro, int newprio = 0)
2903 PROTOTYPE: $;$ 3478 PROTOTYPE: $;$
2910 if (items > 1) 3485 if (items > 1)
2911 { 3486 {
2912 if (ix) 3487 if (ix)
2913 newprio = coro->prio - newprio; 3488 newprio = coro->prio - newprio;
2914 3489
2915 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3490 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2916 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3491 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2917 3492
2918 coro->prio = newprio; 3493 coro->prio = newprio;
2919 } 3494 }
2920} 3495}
2921 OUTPUT: 3496 OUTPUT:
2935 CODE: 3510 CODE:
2936 RETVAL = coro_nready; 3511 RETVAL = coro_nready;
2937 OUTPUT: 3512 OUTPUT:
2938 RETVAL 3513 RETVAL
2939 3514
2940# for async_pool speedup
2941void 3515void
2942_pool_1 (SV *cb) 3516suspend (Coro::State self)
3517 PROTOTYPE: $
2943 CODE: 3518 CODE:
2944{ 3519 self->flags |= CF_SUSPENDED;
2945 HV *hv = (HV *)SvRV (coro_current);
2946 struct coro *coro = SvSTATE_hv ((SV *)hv);
2947 AV *defav = GvAV (PL_defgv);
2948 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2949 AV *invoke_av;
2950 int i, len;
2951 3520
2952 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)
2953 { 3547 {
2954 SV *old = PL_diehook; 3548 PUSHMARK (SP);
2955 PL_diehook = 0; 3549 EXTEND (SP, 2);
2956 SvREFCNT_dec (old); 3550 PUSHs (sv_Coro);
2957 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));
2958 } 3557 }
2959 3558
2960 SvREFCNT_dec (coro->saved_deffh);
2961 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2962
2963 hv_store (hv, "desc", sizeof ("desc") - 1,
2964 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2965
2966 invoke_av = (AV *)SvRV (invoke);
2967 len = av_len (invoke_av);
2968
2969 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2970
2971 if (len > 0)
2972 { 3559 {
2973 av_fill (defav, len - 1); 3560 struct coro *coro = SvSTATE_hv (hv);
2974 for (i = 0; i < len; ++i) 3561
2975 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;
2976 } 3566 }
2977}
2978 3567
2979void 3568 api_ready (aTHX_ (SV *)hv);
2980_pool_2 (SV *cb)
2981 CODE:
2982{
2983 HV *hv = (HV *)SvRV (coro_current);
2984 struct coro *coro = SvSTATE_hv ((SV *)hv);
2985 3569
2986 sv_setsv (cb, &PL_sv_undef); 3570 if (GIMME_V != G_VOID)
2987 3571 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2988 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3572 else
2989 coro->saved_deffh = 0;
2990
2991 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2992 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2993 {
2994 SV *old = PL_diehook;
2995 PL_diehook = 0;
2996 SvREFCNT_dec (old); 3573 SvREFCNT_dec (hv);
2997 croak ("\3async_pool terminate\2\n");
2998 }
2999
3000 av_clear (GvAV (PL_defgv));
3001 hv_store (hv, "desc", sizeof ("desc") - 1,
3002 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3003
3004 coro->prio = 0;
3005
3006 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3007 api_trace (aTHX_ coro_current, 0);
3008
3009 av_push (av_async_pool, newSVsv (coro_current));
3010} 3574}
3011 3575
3012SV * 3576SV *
3013rouse_cb () 3577rouse_cb ()
3014 PROTOTYPE: 3578 PROTOTYPE:
3021rouse_wait (...) 3585rouse_wait (...)
3022 PROTOTYPE: ;$ 3586 PROTOTYPE: ;$
3023 PPCODE: 3587 PPCODE:
3024 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3588 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3025 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
3026 3615
3027MODULE = Coro::State PACKAGE = PerlIO::cede 3616MODULE = Coro::State PACKAGE = PerlIO::cede
3028 3617
3029BOOT: 3618BOOT:
3030 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3619 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3033MODULE = Coro::State PACKAGE = Coro::Semaphore 3622MODULE = Coro::State PACKAGE = Coro::Semaphore
3034 3623
3035SV * 3624SV *
3036new (SV *klass, SV *count = 0) 3625new (SV *klass, SV *count = 0)
3037 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
3038 RETVAL = sv_bless ( 3638 RETVAL = sv_bless (
3039 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3639 coro_waitarray_new (aTHX_ semcnt),
3040 GvSTASH (CvGV (cv)) 3640 GvSTASH (CvGV (cv))
3041 ); 3641 );
3642}
3042 OUTPUT: 3643 OUTPUT:
3043 RETVAL 3644 RETVAL
3044 3645
3045# helper for Coro::Channel 3646# helper for Coro::Channel and others
3046SV * 3647SV *
3047_alloc (int count) 3648_alloc (int count)
3048 CODE: 3649 CODE:
3049 RETVAL = coro_waitarray_new (aTHX_ count); 3650 RETVAL = coro_waitarray_new (aTHX_ count);
3050 OUTPUT: 3651 OUTPUT:
3108 for (i = 1; i <= wcount; ++i) 3709 for (i = 1; i <= wcount; ++i)
3109 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3710 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3110 } 3711 }
3111} 3712}
3112 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
3113MODULE = Coro::State PACKAGE = Coro::Signal 3730MODULE = Coro::State PACKAGE = Coro::Signal
3114 3731
3115SV * 3732SV *
3116new (SV *klass) 3733new (SV *klass)
3117 CODE: 3734 CODE:
3188 3805
3189void 3806void
3190_register (char *target, char *proto, SV *req) 3807_register (char *target, char *proto, SV *req)
3191 CODE: 3808 CODE:
3192{ 3809{
3193 HV *st; 3810 CV *req_cv = coro_sv_2cv (aTHX_ req);
3194 GV *gvp;
3195 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3196 /* newXSproto doesn't return the CV on 5.8 */ 3811 /* newXSproto doesn't return the CV on 5.8 */
3197 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3812 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3198 sv_setpv ((SV *)slf_cv, proto); 3813 sv_setpv ((SV *)slf_cv, proto);
3199 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);
3200} 3815}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines