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.315 by root, Thu Nov 20 05:25:17 2008 UTC vs.
Revision 1.367 by root, Mon Aug 3 09:19:57 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
114#endif 58#endif
115 59
116#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
130#else 74#else
131# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
133#endif 77#endif
134 78
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
136 80
137#if __GNUC__ >= 3 81#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 84# define INLINE static inline
141#else 85#else
142# define attribute(x) 86# define attribute(x)
143# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
144# define INLINE static 88# define INLINE static
… …
156# if CORO_PTHREAD 100# if CORO_PTHREAD
157static void *coro_thx; 101static void *coro_thx;
158# endif 102# endif
159#endif 103#endif
160 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
161static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
162 117
163/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
166 121
… …
170static AV *main_mainstack; /* used to differentiate between $main and others */ 125static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 126static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 129
130static AV *av_destroy; /* destruction queue */
131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
133
175static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 136static SV *rv_diehook;
178static SV *rv_warnhook; 137static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 138static HV *hv_sig; /* %SIG */
180 139
181/* async_pool helper stuff */ 140/* async_pool helper stuff */
182static SV *sv_pool_rss; 141static SV *sv_pool_rss;
183static SV *sv_pool_size; 142static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 143static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 144static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 145static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 146static CV *cv_pool_handler;
188static CV *cv_coro_state_new; 147static CV *cv_coro_state_new;
189 148
190/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
191static SV *sv_activity; 150static SV *sv_activity;
151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
192 157
193static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
195 160
196enum { 161enum {
… …
222 int valgrind_id; 187 int valgrind_id;
223#endif 188#endif
224 unsigned char flags; 189 unsigned char flags;
225} coro_cctx; 190} coro_cctx;
226 191
192coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
227enum { 196enum {
228 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
231 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
232}; 202};
233 203
234/* the structure where most of the perl state is stored, overlaid on the cxstack */ 204/* the structure where most of the perl state is stored, overlaid on the cxstack */
235typedef struct 205typedef struct
236{ 206{
237 SV *defsv; 207 SV *defsv;
238 AV *defav; 208 AV *defav;
239 SV *errsv; 209 SV *errsv;
240 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
241#define VAR(name,type) type name; 212#define VAR(name,type) type name;
242# include "state.h" 213# include "state.h"
243#undef VAR 214#undef VAR
244} perl_slots; 215} perl_slots;
245 216
… …
247 218
248/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
249struct coro { 220struct coro {
250 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
252 226
253 /* state data */ 227 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 229 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
… …
273 /* async_pool */ 247 /* async_pool */
274 SV *saved_deffh; 248 SV *saved_deffh;
275 SV *invoke_cb; 249 SV *invoke_cb;
276 AV *invoke_av; 250 AV *invoke_av;
277 251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* times */
257 coro_ts t_cpu, t_real;
258
278 /* linked list */ 259 /* linked list */
279 struct coro *next, *prev; 260 struct coro *next, *prev;
280}; 261};
281 262
282typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
… …
287/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
289 270
290/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
291 272
292#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
298 279
299/* for Coro.pm */ 280/* for Coro.pm */
300static SV *coro_current; 281static SV *coro_current;
301static SV *coro_readyhook; 282static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
304static struct coro *coro_first; 285static struct coro *coro_first;
305#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
287
288/** Coro::Select ************************************************************/
289
290static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select;
292
293/* horrible hack, but if it works... */
294static OP *
295coro_pp_sselect (aTHX)
296{
297 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select);
300 PUTBACK;
301
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX);
306}
306 307
307/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
308 309
309static SV * 310static SV *
310coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
334 get_hv (name, create); 335 get_hv (name, create);
335#endif 336#endif
336 return get_hv (name, create); 337 return get_hv (name, create);
337} 338}
338 339
339/* may croak */ 340INLINE void
340INLINE CV * 341coro_times_update ()
341coro_sv_2cv (pTHX_ SV *sv)
342{ 342{
343#ifdef coro_clock_gettime
344 struct timespec ts;
345
346 ts.tv_sec = ts.tv_nsec = 0;
347 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
348 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
349
350 ts.tv_sec = ts.tv_nsec = 0;
351 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
352 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
353#else
354 dTHX;
355 UV tv[2];
356
357 u2time (aTHX_ tv);
358 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000;
360#endif
361}
362
363INLINE void
364coro_times_add (struct coro *c)
365{
366 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0];
369
370 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0];
373}
374
375INLINE void
376coro_times_sub (struct coro *c)
377{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0];
381
382 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
383 c->t_cpu [1] -= time_cpu [1];
384 c->t_cpu [0] -= time_cpu [0];
385}
386
387/*****************************************************************************/
388/* magic glue */
389
390#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext
392
393#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \
396 : mg_find (sv, type))
397
398#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \
401 : 0)
402
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405
406INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro)
408{
343 HV *st; 409 HV *stash;
344 GV *gvp; 410 MAGIC *mg;
345 return sv_2cv (sv, &st, &gvp, 0); 411
412 if (SvROK (coro))
413 coro = SvRV (coro);
414
415 if (expect_false (SvTYPE (coro) != SVt_PVHV))
416 croak ("Coro::State object required");
417
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr;
346} 428}
429
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431
432/* faster than SvSTATE, but expects a coroutine hv */
433#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435
436/*****************************************************************************/
437/* padlist management and caching */
347 438
348static AV * 439static AV *
349coro_clone_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
350{ 441{
351 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 443 AV *newpadlist, *newpad;
353 444
354 newpadlist = newAV (); 445 newpadlist = newAV ();
… …
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 451#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 453 --AvFILLp (padlist);
363 454
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
366 457
367 return newpadlist; 458 return newpadlist;
368} 459}
369 460
370static void 461static void
371free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
372{ 463{
373 /* may be during global destruction */ 464 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
375 { 466 {
376 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
377 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
378 { 470 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
380 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 473 I32 j = AvFILLp (av);
382 SV *sv; 474
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 480 }
389 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
391 } 486 }
392} 487}
393 488
394static int 489static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 491{
397 AV *padlist; 492 AV *padlist;
398 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return 0;
399 498
400 /* casting is fun. */ 499 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
403 502
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 504
406 return 0; 505 return 0;
407} 506}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 507
412static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 509 0, 0, 0, 0,
414 coro_cv_free 510 coro_cv_free
415}; 511};
416
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459 512
460/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
461static void 514static void
462get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
463{ 516{
… …
474 CV *cp = Perl_cv_clone (aTHX_ cv); 527 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 528 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 529 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 530 SvREFCNT_dec (cp);
478#else 531#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 533#endif
481 } 534 }
482} 535}
483 536
484static void 537static void
… …
491 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
492 545
493 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
494 547
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
497 550
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 552}
500 553
501/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
502 558
503static void 559static void
504load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
505{ 561{
506 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
507 c->slot = 0; 563 c->slot = 0;
508 564
509 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
510 566
511 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
515 572
516 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 574 # include "state.h"
518 #undef VAR 575 #undef VAR
519 576
… …
533 PUTBACK; 590 PUTBACK;
534 } 591 }
535 592
536 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 594 CORO_THROW = c->except;
595
596 if (expect_false (enable_times))
597 {
598 if (expect_false (!times_valid))
599 coro_times_update ();
600
601 coro_times_sub (c);
602 }
603
604 if (expect_false (c->on_enter))
605 {
606 int i;
607
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 }
538} 611}
539 612
540static void 613static void
541save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
542{ 615{
616 if (expect_false (c->on_leave))
617 {
618 int i;
619
620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 }
623
624 times_valid = 0;
625
626 if (expect_false (enable_times))
627 {
628 coro_times_update (); times_valid = 1;
629 coro_times_add (c);
630 }
631
543 c->except = CORO_THROW; 632 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
545 634
546 { 635 {
547 dSP; 636 dSP;
… …
560 { 649 {
561 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
562 { 651 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
564 653
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 655 {
567 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
568 657
569 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
570 { 659 {
… …
594 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
595 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
598 { 687 {
599 int i; 688 unsigned int i;
600 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
601 CXINC; 690 CXINC;
602 } 691 }
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
604 693
605 c->mainstack = PL_mainstack; 694 c->mainstack = PL_mainstack;
606 695
607 { 696 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 698
610 slot->defav = GvAV (PL_defgv); 699 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 700 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 701 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
614 704
615 #define VAR(name,type) slot->name = PL_ ## name; 705 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 706 # include "state.h"
617 #undef VAR 707 #undef VAR
618 } 708 }
… …
745#endif 835#endif
746 836
747/* 837/*
748 * This overrides the default magic get method of %SIG elements. 838 * This overrides the default magic get method of %SIG elements.
749 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
750 * and instead of tryign to save and restore the hash elements, we just provide 840 * and instead of trying to save and restore the hash elements, we just provide
751 * readback here. 841 * readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 842 */
756static int 843static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 845{
759 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 900
814 if (svp) 901 if (svp)
815 { 902 {
816 SV *old = *svp; 903 SV *old = *svp;
817 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
819 return 0; 906 return 0;
820 } 907 }
821 } 908 }
822 909
… …
832 919
833static int 920static int
834slf_check_nop (pTHX_ struct CoroSLF *frame) 921slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 922{
836 return 0; 923 return 0;
924}
925
926static int
927slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{
929 return 1;
837} 930}
838 931
839static UNOP coro_setup_op; 932static UNOP coro_setup_op;
840 933
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 934static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
848 941
849 PL_runops = RUNOPS_DEFAULT; 942 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 943 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 944 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 945 PL_comppad = 0;
946 PL_comppad_name = 0;
947 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 949 PL_curpm = 0;
854 PL_curpad = 0; 950 PL_curpad = 0;
855 PL_localizing = 0; 951 PL_localizing = 0;
856 PL_dirty = 0; 952 PL_dirty = 0;
857 PL_restartop = 0; 953 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 954#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 955 PL_parser = 0;
860#endif 956#endif
957 PL_hints = 0;
861 958
862 /* recreate the die/warn hooks */ 959 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
865 962
866 GvSV (PL_defgv) = newSV (0); 963 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 964 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 965 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0;
870 PL_rs = newSVsv (GvSV (irsgv)); 968 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 970
873 { 971 {
874 dSP; 972 dSP;
… …
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
894 992
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
896 coro_setup_op.op_next = PL_op; 994 coro_setup_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 995 coro_setup_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 996 coro_setup_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 997 /* no flags etc. required, as an init function won't be called */
900 998
901 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
902 1000
903 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
904 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
905}
906 1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
907static void 1011static void
908coro_destruct (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
909{ 1013{
910 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
911 { 1015 {
912 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
922 1026
923 /* unwind main stack */ 1027 /* unwind main stack */
924 dounwind (-1); 1028 dounwind (-1);
925 } 1029 }
1030}
926 1031
927 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
930 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1036
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1037 {
1038 struct coro *current = SvSTATE_current;
1039
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041
1042 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro);
1044
1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
1047
1048 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs;
1054 svf [5] = GvSV (irsgv);
1055 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf));
1059
1060 load_perl (aTHX_ current);
1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
937 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
941 1073 }
942 coro_destruct_stacks (aTHX);
943} 1074}
944 1075
945INLINE void 1076INLINE void
946free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
947{ 1078{
… …
955static int 1086static int
956runops_trace (pTHX) 1087runops_trace (pTHX)
957{ 1088{
958 COP *oldcop = 0; 1089 COP *oldcop = 0;
959 int oldcxix = -2; 1090 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1091
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1092 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1093 {
965 PERL_ASYNC_CHECK (); 1094 PERL_ASYNC_CHECK ();
966 1095
967 if (cctx->flags & CC_TRACE_ALL) 1096 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1097 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1098 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1099 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1100 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1101 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1102 AV *av = newAV (); /* return values */
974 SV **cb; 1103 SV **cb;
… …
1011 1140
1012 if (PL_curcop != &PL_compiling) 1141 if (PL_curcop != &PL_compiling)
1013 { 1142 {
1014 SV **cb; 1143 SV **cb;
1015 1144
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1146 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1148
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1150 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1151 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1152 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1153 SV *fullname = sv_2mortal (newSV (0));
1026 1154
1027 if (isGV (gv)) 1155 if (isGV (gv))
… …
1045 } 1173 }
1046 1174
1047 oldcxix = cxstack_ix; 1175 oldcxix = cxstack_ix;
1048 } 1176 }
1049 1177
1050 if (cctx->flags & CC_TRACE_LINE) 1178 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1179 {
1052 dSP; 1180 dSP;
1053 1181
1054 PL_runops = RUNOPS_DEFAULT; 1182 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1183 ENTER;
… …
1074 1202
1075 TAINT_NOT; 1203 TAINT_NOT;
1076 return 0; 1204 return 0;
1077} 1205}
1078 1206
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1207static struct CoroSLF cctx_ssl_frame;
1081 1208
1082static void 1209static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1210slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1211{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1212 ta->prev = 0;
1087} 1213}
1088 1214
1089static int 1215static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1216slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1217{
… …
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1221}
1096 1222
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1224static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1225cctx_prepare (pTHX)
1100{ 1226{
1101 PL_top_env = &PL_start_env; 1227 PL_top_env = &PL_start_env;
1102 1228
1103 if (cctx->flags & CC_TRACE) 1229 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1230 PL_runops = runops_trace;
1105 1231
1106 /* we already must be executing an SLF op, there is no other valid way 1232 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1233 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1234 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1235 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1236
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1237 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1238 cctx_ssl_frame = slf_frame;
1114 1239
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1240 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1241 slf_frame.check = slf_check_set_stacklevel;
1117} 1242}
… …
1140 /* normally we would need to skip the entersub here */ 1265 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1266 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1267 /* PL_nop = PL_nop->op_next */
1143 1268
1144 /* inject a fake subroutine call to cctx_init */ 1269 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1270 cctx_prepare (aTHX);
1146 1271
1147 /* cctx_run is the alternative tail of transfer() */ 1272 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1273 transfer_tail (aTHX);
1149 1274
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1275 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1153 /* 1278 /*
1154 * Unfortunately, there is no way to get at the return values of the 1279 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1280 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1281 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1282 */
1157 1283
1158 /* 1284 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1285 * If perl-run returns we assume exit() was being called or the coro
1160 * fell off the end, which seems to be the only valid (non-bug) 1286 * fell off the end, which seems to be the only valid (non-bug)
1161 * reason for perl_run to return. We try to exit by jumping to the 1287 * reason for perl_run to return. We try to exit by jumping to the
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1288 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * coroutine as Coro has no such concept 1289 * coroutine as Coro has no such concept.
1290 * This actually isn't valid with the pthread backend, but OSes requiring
1291 * that backend are too broken to do it in a standards-compliant way.
1164 */ 1292 */
1165 PL_top_env = main_top_env; 1293 PL_top_env = main_top_env;
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1294 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1295 }
1168} 1296}
… …
1245cctx_destroy (coro_cctx *cctx) 1373cctx_destroy (coro_cctx *cctx)
1246{ 1374{
1247 if (!cctx) 1375 if (!cctx)
1248 return; 1376 return;
1249 1377
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1379
1250 --cctx_count; 1380 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1381 coro_destroy (&cctx->cctx);
1252 1382
1253 /* coro_transfer creates new, empty cctx's */ 1383 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1384 if (cctx->sptr)
… …
1317 /* TODO: throwing up here is considered harmful */ 1447 /* TODO: throwing up here is considered harmful */
1318 1448
1319 if (expect_true (prev != next)) 1449 if (expect_true (prev != next))
1320 { 1450 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1453
1324 if (expect_false (next->flags & CF_RUNNING))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED)) 1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1456
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1457#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1458 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1460#endif
… …
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1467{
1341 dSTACKLEVEL; 1468 dSTACKLEVEL;
1342 1469
1343 /* sometimes transfer is only called to set idle_sp */ 1470 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1471 if (expect_false (!prev))
1345 { 1472 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1473 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1474 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1475 }
1349 else if (expect_true (prev != next)) 1476 else if (expect_true (prev != next))
1350 { 1477 {
1351 coro_cctx *prev__cctx; 1478 coro_cctx *cctx_prev;
1352 1479
1353 if (expect_false (prev->flags & CF_NEW)) 1480 if (expect_false (prev->flags & CF_NEW))
1354 { 1481 {
1355 /* create a new empty/source context */ 1482 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1483 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1484 prev->flags |= CF_RUNNING;
1359 } 1485 }
1360 1486
1361 prev->flags &= ~CF_RUNNING; 1487 prev->flags &= ~CF_RUNNING;
… …
1372 coro_setup (aTHX_ next); 1498 coro_setup (aTHX_ next);
1373 } 1499 }
1374 else 1500 else
1375 load_perl (aTHX_ next); 1501 load_perl (aTHX_ next);
1376 1502
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1503 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1504 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1505 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1506 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1507 && !force_cctx
1384 )) 1508 ))
1385 { 1509 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1510 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1511 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1512
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1513 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1514 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1515 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1516 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1517 next->cctx = cctx_get (aTHX);
1396 1518
1397 cctx_put (prev__cctx); 1519 cctx_put (cctx_current);
1398 } 1520 }
1521 else
1522 prev->cctx = cctx_current;
1399 1523
1400 ++next->usecount; 1524 ++next->usecount;
1401 1525
1402 if (expect_true (!next->cctx)) 1526 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1528
1405 if (expect_false (prev__cctx != next->cctx)) 1529 next->cctx = 0;
1530
1531 if (expect_false (cctx_prev != cctx_current))
1406 { 1532 {
1407 prev__cctx->top_env = PL_top_env; 1533 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1534 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1536 }
1411 1537
1412 transfer_tail (aTHX); 1538 transfer_tail (aTHX);
1413 } 1539 }
1414} 1540}
… …
1422coro_state_destroy (pTHX_ struct coro *coro) 1548coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1549{
1424 if (coro->flags & CF_DESTROYED) 1550 if (coro->flags & CF_DESTROYED)
1425 return 0; 1551 return 0;
1426 1552
1427 if (coro->on_destroy) 1553 if (coro->on_destroy && !PL_dirty)
1428 coro->on_destroy (aTHX_ coro); 1554 coro->on_destroy (aTHX_ coro);
1429 1555
1430 coro->flags |= CF_DESTROYED; 1556 coro->flags |= CF_DESTROYED;
1431 1557
1432 if (coro->flags & CF_READY) 1558 if (coro->flags & CF_READY)
… …
1436 --coro_nready; 1562 --coro_nready;
1437 } 1563 }
1438 else 1564 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1565 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1566
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1567 if (coro->mainstack
1442 { 1568 && coro->mainstack != main_mainstack
1443 struct coro temp; 1569 && coro->slot
1444 1570 && !PL_dirty)
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1446
1447 save_perl (aTHX_ &temp);
1448 load_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro); 1571 coro_destruct_perl (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1572
1457 cctx_destroy (coro->cctx); 1573 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1574 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1575 SvREFCNT_dec (coro->args);
1460 SvREFCNT_dec (CORO_THROW); 1576 SvREFCNT_dec (CORO_THROW);
… …
1519 1635
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1636 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1637 TRANSFER (ta, 1);
1522} 1638}
1523 1639
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1640/** Coro ********************************************************************/
1548 1641
1549INLINE void 1642INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1551{ 1644{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1646
1555INLINE SV * 1647 SvREFCNT_inc_NN (coro->hv);
1648
1649 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro;
1652}
1653
1654INLINE struct coro *
1556coro_deq (pTHX) 1655coro_deq (pTHX)
1557{ 1656{
1558 int prio; 1657 int prio;
1559 1658
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1660 {
1562 return av_shift (coro_ready [prio]); 1661 struct coro **ready = coro_ready [prio];
1662
1663 if (ready [0])
1664 {
1665 struct coro *coro = ready [0];
1666 ready [0] = coro->next_ready;
1667 return coro;
1668 }
1669 }
1563 1670
1564 return 0; 1671 return 0;
1672}
1673
1674static void
1675invoke_sv_ready_hook_helper (void)
1676{
1677 dTHX;
1678 dSP;
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1565} 1689}
1566 1690
1567static int 1691static int
1568api_ready (pTHX_ SV *coro_sv) 1692api_ready (pTHX_ SV *coro_sv)
1569{ 1693{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1694 struct coro *coro = SvSTATE (coro_sv);
1578 1695
1579 if (coro->flags & CF_READY) 1696 if (coro->flags & CF_READY)
1580 return 0; 1697 return 0;
1581 1698
1582 coro->flags |= CF_READY; 1699 coro->flags |= CF_READY;
1583 1700
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1701 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1702
1590 if (sv_hook) 1703 if (!coro_nready++)
1591 { 1704 if (coroapi.readyhook)
1592 dSP; 1705 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1706
1608 return 1; 1707 return 1;
1609} 1708}
1610 1709
1611static int 1710static int
1612api_is_ready (pTHX_ SV *coro_sv) 1711api_is_ready (pTHX_ SV *coro_sv)
1613{ 1712{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1713 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1714}
1616 1715
1716/* expects to own a reference to next->hv */
1617INLINE void 1717INLINE void
1618prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1619{ 1719{
1620 SV *prev_sv, *next_sv;
1621
1622 for (;;)
1623 {
1624 next_sv = coro_deq (aTHX);
1625
1626 /* nothing to schedule: call the idle handler */
1627 if (expect_false (!next_sv))
1628 {
1629 dSP;
1630
1631 ENTER;
1632 SAVETMPS;
1633
1634 PUSHMARK (SP);
1635 PUTBACK;
1636 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1637
1638 FREETMPS;
1639 LEAVE;
1640 continue;
1641 }
1642
1643 ta->next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (ta->next->flags & CF_DESTROYED))
1647 {
1648 SvREFCNT_dec (next_sv);
1649 /* coro_nready has already been taken care of by destroy */
1650 continue;
1651 }
1652
1653 --coro_nready;
1654 break;
1655 }
1656
1657 /* free this only after the transfer */
1658 prev_sv = SvRV (coro_current); 1720 SV *prev_sv = SvRV (coro_current);
1721
1659 ta->prev = SvSTATE_hv (prev_sv); 1722 ta->prev = SvSTATE_hv (prev_sv);
1723 ta->next = next;
1724
1660 TRANSFER_CHECK (*ta); 1725 TRANSFER_CHECK (*ta);
1661 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1726
1662 ta->next->flags &= ~CF_READY;
1663 SvRV_set (coro_current, next_sv); 1727 SvRV_set (coro_current, (SV *)next->hv);
1664 1728
1665 free_coro_mortal (aTHX); 1729 free_coro_mortal (aTHX);
1666 coro_mortal = prev_sv; 1730 coro_mortal = prev_sv;
1667} 1731}
1668 1732
1733static void
1734prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1735{
1736 for (;;)
1737 {
1738 struct coro *next = coro_deq (aTHX);
1739
1740 if (expect_true (next))
1741 {
1742 /* cannot transfer to destroyed coros, skip and look for next */
1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1745 else
1746 {
1747 next->flags &= ~CF_READY;
1748 --coro_nready;
1749
1750 prepare_schedule_to (aTHX_ ta, next);
1751 break;
1752 }
1753 }
1754 else
1755 {
1756 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle)))
1759 {
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready;
1763 }
1764 else
1765 {
1766 dSP;
1767
1768 ENTER;
1769 SAVETMPS;
1770
1771 PUSHMARK (SP);
1772 PUTBACK;
1773 call_sv (sv_idle, G_VOID | G_DISCARD);
1774
1775 FREETMPS;
1776 LEAVE;
1777 }
1778 }
1779 }
1780}
1781
1669INLINE void 1782INLINE void
1670prepare_cede (pTHX_ struct coro_transfer_args *ta) 1783prepare_cede (pTHX_ struct coro_transfer_args *ta)
1671{ 1784{
1672 api_ready (aTHX_ coro_current); 1785 api_ready (aTHX_ coro_current);
1673 prepare_schedule (aTHX_ ta); 1786 prepare_schedule (aTHX_ ta);
… …
1692{ 1805{
1693 struct coro_transfer_args ta; 1806 struct coro_transfer_args ta;
1694 1807
1695 prepare_schedule (aTHX_ &ta); 1808 prepare_schedule (aTHX_ &ta);
1696 TRANSFER (ta, 1); 1809 TRANSFER (ta, 1);
1810}
1811
1812static void
1813api_schedule_to (pTHX_ SV *coro_sv)
1814{
1815 struct coro_transfer_args ta;
1816 struct coro *next = SvSTATE (coro_sv);
1817
1818 SvREFCNT_inc_NN (coro_sv);
1819 prepare_schedule_to (aTHX_ &ta, next);
1697} 1820}
1698 1821
1699static int 1822static int
1700api_cede (pTHX) 1823api_cede (pTHX)
1701{ 1824{
… …
1730static void 1853static void
1731api_trace (pTHX_ SV *coro_sv, int flags) 1854api_trace (pTHX_ SV *coro_sv, int flags)
1732{ 1855{
1733 struct coro *coro = SvSTATE (coro_sv); 1856 struct coro *coro = SvSTATE (coro_sv);
1734 1857
1858 if (coro->flags & CF_RUNNING)
1859 croak ("cannot enable tracing on a running coroutine, caught");
1860
1735 if (flags & CC_TRACE) 1861 if (flags & CC_TRACE)
1736 { 1862 {
1737 if (!coro->cctx) 1863 if (!coro->cctx)
1738 coro->cctx = cctx_new_run (); 1864 coro->cctx = cctx_new_run ();
1739 else if (!(coro->cctx->flags & CC_TRACE)) 1865 else if (!(coro->cctx->flags & CC_TRACE))
1740 croak ("cannot enable tracing on coroutine with custom stack,"); 1866 croak ("cannot enable tracing on coroutine with custom stack, caught");
1741 1867
1742 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1868 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1743 } 1869 }
1744 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1870 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1745 { 1871 {
… …
1748 if (coro->flags & CF_RUNNING) 1874 if (coro->flags & CF_RUNNING)
1749 PL_runops = RUNOPS_DEFAULT; 1875 PL_runops = RUNOPS_DEFAULT;
1750 else 1876 else
1751 coro->slot->runops = RUNOPS_DEFAULT; 1877 coro->slot->runops = RUNOPS_DEFAULT;
1752 } 1878 }
1879}
1880
1881static void
1882coro_call_on_destroy (pTHX_ struct coro *coro)
1883{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886
1887 if (on_destroyp)
1888 {
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890
1891 while (AvFILLp (on_destroy) >= 0)
1892 {
1893 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP);
1897
1898 if (statusp)
1899 {
1900 int i;
1901 AV *status = (AV *)SvRV (*statusp);
1902 EXTEND (SP, AvFILLp (status) + 1);
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 }
1907
1908 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1910 }
1911 }
1912}
1913
1914static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1916{
1917 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV ();
1920
1921 av_extend (av, items - 1);
1922 for (i = 0; i < items; ++i)
1923 av_push (av, SvREFCNT_inc_NN (arg [i]));
1924
1925 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1926
1927 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1928 api_ready (aTHX_ sv_manager);
1929
1930 frame->prepare = prepare_schedule;
1931 frame->check = slf_check_repeat;
1932
1933 /* as a minor optimisation, we could unwind all stacks here */
1934 /* but that puts extra pressure on pp_slf, and is not worth much */
1935 /*coro_unwind_stacks (aTHX);*/
1753} 1936}
1754 1937
1755/*****************************************************************************/ 1938/*****************************************************************************/
1756/* async pool handler */ 1939/* async pool handler */
1757 1940
… …
1835 2018
1836static void 2019static void
1837coro_rouse_callback (pTHX_ CV *cv) 2020coro_rouse_callback (pTHX_ CV *cv)
1838{ 2021{
1839 dXSARGS; 2022 dXSARGS;
1840 SV *data = (SV *)GENSUB_ARG; 2023 SV *data = (SV *)S_GENSUB_ARG;
1841 2024
1842 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2025 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1843 { 2026 {
1844 /* first call, set args */ 2027 /* first call, set args */
2028 SV *coro = SvRV (data);
1845 AV *av = newAV (); 2029 AV *av = newAV ();
1846 SV *coro = SvRV (data);
1847 2030
1848 SvRV_set (data, (SV *)av); 2031 SvRV_set (data, (SV *)av);
1849 api_ready (aTHX_ coro);
1850 SvREFCNT_dec (coro);
1851 2032
1852 /* better take a full copy of the arguments */ 2033 /* better take a full copy of the arguments */
1853 while (items--) 2034 while (items--)
1854 av_store (av, items, newSVsv (ST (items))); 2035 av_store (av, items, newSVsv (ST (items)));
2036
2037 api_ready (aTHX_ coro);
2038 SvREFCNT_dec (coro);
1855 } 2039 }
1856 2040
1857 XSRETURN_EMPTY; 2041 XSRETURN_EMPTY;
1858} 2042}
1859 2043
… …
1876 2060
1877 EXTEND (SP, AvFILLp (av) + 1); 2061 EXTEND (SP, AvFILLp (av) + 1);
1878 for (i = 0; i <= AvFILLp (av); ++i) 2062 for (i = 0; i <= AvFILLp (av); ++i)
1879 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2063 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1880 2064
1881 /* we have stolen the elements, so ste length to zero and free */ 2065 /* we have stolen the elements, so set length to zero and free */
1882 AvFILLp (av) = -1; 2066 AvFILLp (av) = -1;
1883 av_undef (av); 2067 av_undef (av);
1884 2068
1885 PUTBACK; 2069 PUTBACK;
1886 } 2070 }
… …
1910 || SvTYPE (SvRV (cb)) != SVt_PVCV 2094 || SvTYPE (SvRV (cb)) != SVt_PVCV
1911 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2095 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1912 croak ("Coro::rouse_wait called with illegal callback argument,"); 2096 croak ("Coro::rouse_wait called with illegal callback argument,");
1913 2097
1914 { 2098 {
1915 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2099 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1916 SV *data = (SV *)GENSUB_ARG; 2100 SV *data = (SV *)S_GENSUB_ARG;
1917 2101
1918 frame->data = (void *)data; 2102 frame->data = (void *)data;
1919 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2103 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1920 frame->check = slf_check_rouse_wait; 2104 frame->check = slf_check_rouse_wait;
1921 } 2105 }
… …
1925coro_new_rouse_cb (pTHX) 2109coro_new_rouse_cb (pTHX)
1926{ 2110{
1927 HV *hv = (HV *)SvRV (coro_current); 2111 HV *hv = (HV *)SvRV (coro_current);
1928 struct coro *coro = SvSTATE_hv (hv); 2112 struct coro *coro = SvSTATE_hv (hv);
1929 SV *data = newRV_inc ((SV *)hv); 2113 SV *data = newRV_inc ((SV *)hv);
1930 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2114 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1931 2115
1932 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2116 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1933 SvREFCNT_dec (data); /* magicext increases the refcount */ 2117 SvREFCNT_dec (data); /* magicext increases the refcount */
1934 2118
1935 SvREFCNT_dec (coro->rouse_cb); 2119 SvREFCNT_dec (coro->rouse_cb);
… …
1990static void 2174static void
1991slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2175slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1992{ 2176{
1993 frame->prepare = prepare_schedule; 2177 frame->prepare = prepare_schedule;
1994 frame->check = slf_check_nop; 2178 frame->check = slf_check_nop;
2179}
2180
2181static void
2182slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2183{
2184 struct coro *next = (struct coro *)slf_frame.data;
2185
2186 SvREFCNT_inc_NN (next->hv);
2187 prepare_schedule_to (aTHX_ ta, next);
2188}
2189
2190static void
2191slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2192{
2193 if (!items)
2194 croak ("Coro::schedule_to expects a coroutine argument, caught");
2195
2196 frame->data = (void *)SvSTATE (arg [0]);
2197 frame->prepare = slf_prepare_schedule_to;
2198 frame->check = slf_check_nop;
2199}
2200
2201static void
2202slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2203{
2204 api_ready (aTHX_ SvRV (coro_current));
2205
2206 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1995} 2207}
1996 2208
1997static void 2209static void
1998slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2210slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1999{ 2211{
… …
2145 } 2357 }
2146 else 2358 else
2147 slf_argc = 0; 2359 slf_argc = 0;
2148 2360
2149 PL_op->op_ppaddr = pp_slf; 2361 PL_op->op_ppaddr = pp_slf;
2150 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2362 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2151 2363
2152 PL_op = (OP *)&slf_restore; 2364 PL_op = (OP *)&slf_restore;
2365}
2366
2367/*****************************************************************************/
2368/* dynamic wind */
2369
2370static void
2371on_enterleave_call (pTHX_ SV *cb)
2372{
2373 dSP;
2374
2375 PUSHSTACK;
2376
2377 PUSHMARK (SP);
2378 PUTBACK;
2379 call_sv (cb, G_VOID | G_DISCARD);
2380 SPAGAIN;
2381
2382 POPSTACK;
2383}
2384
2385static SV *
2386coro_avp_pop_and_free (pTHX_ AV **avp)
2387{
2388 AV *av = *avp;
2389 SV *res = av_pop (av);
2390
2391 if (AvFILLp (av) < 0)
2392 {
2393 *avp = 0;
2394 SvREFCNT_dec (av);
2395 }
2396
2397 return res;
2398}
2399
2400static void
2401coro_pop_on_enter (pTHX_ void *coro)
2402{
2403 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2404 SvREFCNT_dec (cb);
2405}
2406
2407static void
2408coro_pop_on_leave (pTHX_ void *coro)
2409{
2410 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2411 on_enterleave_call (aTHX_ sv_2mortal (cb));
2153} 2412}
2154 2413
2155/*****************************************************************************/ 2414/*****************************************************************************/
2156/* PerlIO::cede */ 2415/* PerlIO::cede */
2157 2416
… …
2231/* Coro::Semaphore & Coro::Signal */ 2490/* Coro::Semaphore & Coro::Signal */
2232 2491
2233static SV * 2492static SV *
2234coro_waitarray_new (pTHX_ int count) 2493coro_waitarray_new (pTHX_ int count)
2235{ 2494{
2236 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2495 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2237 AV *av = newAV (); 2496 AV *av = newAV ();
2238 SV **ary; 2497 SV **ary;
2239 2498
2240 /* unfortunately, building manually saves memory */ 2499 /* unfortunately, building manually saves memory */
2241 Newx (ary, 2, SV *); 2500 Newx (ary, 2, SV *);
2242 AvALLOC (av) = ary; 2501 AvALLOC (av) = ary;
2502#if PERL_VERSION_ATLEAST (5,10,0)
2243 /*AvARRAY (av) = ary;*/ 2503 AvARRAY (av) = ary;
2504#else
2244 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2505 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2506 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2507 SvPVX ((SV *)av) = (char *)ary;
2508#endif
2245 AvMAX (av) = 1; 2509 AvMAX (av) = 1;
2246 AvFILLp (av) = 0; 2510 AvFILLp (av) = 0;
2247 ary [0] = newSViv (count); 2511 ary [0] = newSViv (count);
2248 2512
2249 return newRV_noinc ((SV *)av); 2513 return newRV_noinc ((SV *)av);
… …
2378{ 2642{
2379 if (items >= 2) 2643 if (items >= 2)
2380 { 2644 {
2381 /* callback form */ 2645 /* callback form */
2382 AV *av = (AV *)SvRV (arg [0]); 2646 AV *av = (AV *)SvRV (arg [0]);
2383 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2647 SV *cb_cv = s_get_cv_croak (arg [1]);
2384 2648
2385 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2649 av_push (av, SvREFCNT_inc_NN (cb_cv));
2386 2650
2387 if (SvIVX (AvARRAY (av)[0]) > 0) 2651 if (SvIVX (AvARRAY (av)[0]) > 0)
2388 coro_semaphore_adjust (aTHX_ av, 0); 2652 coro_semaphore_adjust (aTHX_ av, 0);
2389 2653
2390 frame->prepare = prepare_nop; 2654 frame->prepare = prepare_nop;
… …
2414 AvARRAY (av)[0] = AvARRAY (av)[1]; 2678 AvARRAY (av)[0] = AvARRAY (av)[1];
2415 AvARRAY (av)[1] = cb; 2679 AvARRAY (av)[1] = cb;
2416 2680
2417 cb = av_shift (av); 2681 cb = av_shift (av);
2418 2682
2683 if (SvTYPE (cb) == SVt_PVCV)
2684 {
2685 dSP;
2686 PUSHMARK (SP);
2687 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2688 PUTBACK;
2689 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2690 }
2691 else
2692 {
2419 api_ready (aTHX_ cb); 2693 api_ready (aTHX_ cb);
2420 sv_setiv (cb, 0); /* signal waiter */ 2694 sv_setiv (cb, 0); /* signal waiter */
2695 }
2696
2421 SvREFCNT_dec (cb); 2697 SvREFCNT_dec (cb);
2422 2698
2423 --count; 2699 --count;
2424 } 2700 }
2425} 2701}
… …
2434static void 2710static void
2435slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2711slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2436{ 2712{
2437 AV *av = (AV *)SvRV (arg [0]); 2713 AV *av = (AV *)SvRV (arg [0]);
2438 2714
2715 if (items >= 2)
2716 {
2717 SV *cb_cv = s_get_cv_croak (arg [1]);
2718 av_push (av, SvREFCNT_inc_NN (cb_cv));
2719
2439 if (SvIVX (AvARRAY (av)[0])) 2720 if (SvIVX (AvARRAY (av)[0]))
2721 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2722
2723 frame->prepare = prepare_nop;
2724 frame->check = slf_check_nop;
2725 }
2726 else if (SvIVX (AvARRAY (av)[0]))
2440 { 2727 {
2441 SvIVX (AvARRAY (av)[0]) = 0; 2728 SvIVX (AvARRAY (av)[0]) = 0;
2442 frame->prepare = prepare_nop; 2729 frame->prepare = prepare_nop;
2443 frame->check = slf_check_nop; 2730 frame->check = slf_check_nop;
2444 } 2731 }
2445 else 2732 else
2446 { 2733 {
2447 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2734 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2448 2735
2449 av_push (av, waiter); 2736 av_push (av, waiter);
2450 2737
2451 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2738 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2452 frame->prepare = prepare_schedule; 2739 frame->prepare = prepare_schedule;
… …
2470 2757
2471static void 2758static void
2472coro_aio_callback (pTHX_ CV *cv) 2759coro_aio_callback (pTHX_ CV *cv)
2473{ 2760{
2474 dXSARGS; 2761 dXSARGS;
2475 AV *state = (AV *)GENSUB_ARG; 2762 AV *state = (AV *)S_GENSUB_ARG;
2476 SV *coro = av_pop (state); 2763 SV *coro = av_pop (state);
2477 SV *data_sv = newSV (sizeof (struct io_state)); 2764 SV *data_sv = newSV (sizeof (struct io_state));
2478 2765
2479 av_extend (state, items - 1); 2766 av_extend (state, items - 1);
2480 2767
… …
2594 2881
2595 for (i = 0; i < items; ++i) 2882 for (i = 0; i < items; ++i)
2596 PUSHs (arg [i]); 2883 PUSHs (arg [i]);
2597 2884
2598 /* now push the callback closure */ 2885 /* now push the callback closure */
2599 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2886 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2600 2887
2601 /* now call the AIO function - we assume our request is uncancelable */ 2888 /* now call the AIO function - we assume our request is uncancelable */
2602 PUTBACK; 2889 PUTBACK;
2603 call_sv ((SV *)req, G_VOID | G_DISCARD); 2890 call_sv ((SV *)req, G_VOID | G_DISCARD);
2604 } 2891 }
… …
2618 2905
2619 XSRETURN_EMPTY; 2906 XSRETURN_EMPTY;
2620} 2907}
2621 2908
2622/*****************************************************************************/ 2909/*****************************************************************************/
2910
2911#if CORO_CLONE
2912# include "clone.c"
2913#endif
2623 2914
2624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2915MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2625 2916
2626PROTOTYPES: DISABLE 2917PROTOTYPES: DISABLE
2627 2918
… …
2632 coro_thx = PERL_GET_CONTEXT; 2923 coro_thx = PERL_GET_CONTEXT;
2633# endif 2924# endif
2634#endif 2925#endif
2635 BOOT_PAGESIZE; 2926 BOOT_PAGESIZE;
2636 2927
2928 cctx_current = cctx_new_empty ();
2929
2637 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2930 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2638 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2931 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2639 2932
2640 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2933 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2641 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2934 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2660 2953
2661 { 2954 {
2662 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2955 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2663 2956
2664 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2957 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2665 hv_store_ent (PL_custom_op_names, slf, 2958 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2666 newSVpv ("coro_slf", 0), 0);
2667 2959
2668 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2960 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2669 hv_store_ent (PL_custom_op_descs, slf, 2961 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2670 newSVpv ("coro schedule like function", 0), 0);
2671 } 2962 }
2672 2963
2673 coroapi.ver = CORO_API_VERSION; 2964 coroapi.ver = CORO_API_VERSION;
2674 coroapi.rev = CORO_API_REVISION; 2965 coroapi.rev = CORO_API_REVISION;
2675 2966
… …
2687 2978
2688 if (!svp) croak ("Time::HiRes is required"); 2979 if (!svp) croak ("Time::HiRes is required");
2689 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2980 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2690 2981
2691 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2982 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2983
2984 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2985 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2692 } 2986 }
2693 2987
2694 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2695} 2989}
2696 2990
2697SV * 2991SV *
2698new (char *klass, ...) 2992new (char *klass, ...)
2699 ALIAS: 2993 ALIAS:
… …
2701 CODE: 2995 CODE:
2702{ 2996{
2703 struct coro *coro; 2997 struct coro *coro;
2704 MAGIC *mg; 2998 MAGIC *mg;
2705 HV *hv; 2999 HV *hv;
2706 CV *cb; 3000 SV *cb;
2707 int i; 3001 int i;
2708 3002
2709 if (items > 1) 3003 if (items > 1)
2710 { 3004 {
2711 cb = coro_sv_2cv (aTHX_ ST (1)); 3005 cb = s_get_cv_croak (ST (1));
2712 3006
2713 if (!ix) 3007 if (!ix)
2714 { 3008 {
2715 if (CvISXSUB (cb)) 3009 if (CvISXSUB (cb))
2716 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3010 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2738 av_extend (coro->args, items - 1 + ix - 1); 3032 av_extend (coro->args, items - 1 + ix - 1);
2739 3033
2740 if (ix) 3034 if (ix)
2741 { 3035 {
2742 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3036 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2743 cb = cv_coro_run; 3037 cb = (SV *)cv_coro_run;
2744 } 3038 }
2745 3039
2746 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3040 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2747 3041
2748 for (i = 2; i < items; i++) 3042 for (i = 2; i < items; i++)
… …
2768void 3062void
2769_exit (int code) 3063_exit (int code)
2770 PROTOTYPE: $ 3064 PROTOTYPE: $
2771 CODE: 3065 CODE:
2772 _exit (code); 3066 _exit (code);
3067
3068SV *
3069clone (Coro::State coro)
3070 CODE:
3071{
3072#if CORO_CLONE
3073 struct coro *ncoro = coro_clone (aTHX_ coro);
3074 MAGIC *mg;
3075 /* TODO: too much duplication */
3076 ncoro->hv = newHV ();
3077 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3078 mg->mg_flags |= MGf_DUP;
3079 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3080#else
3081 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3082#endif
3083}
3084 OUTPUT:
3085 RETVAL
2773 3086
2774int 3087int
2775cctx_stacksize (int new_stacksize = 0) 3088cctx_stacksize (int new_stacksize = 0)
2776 PROTOTYPE: ;$ 3089 PROTOTYPE: ;$
2777 CODE: 3090 CODE:
… …
2827 eval = 1 3140 eval = 1
2828 CODE: 3141 CODE:
2829{ 3142{
2830 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2831 { 3144 {
2832 struct coro temp; 3145 struct coro *current = SvSTATE_current;
2833 3146
2834 if (!(coro->flags & CF_RUNNING)) 3147 if (current != coro)
2835 { 3148 {
2836 PUTBACK; 3149 PUTBACK;
2837 save_perl (aTHX_ &temp); 3150 save_perl (aTHX_ current);
2838 load_perl (aTHX_ coro); 3151 load_perl (aTHX_ coro);
3152 SPAGAIN;
2839 } 3153 }
2840 3154
2841 {
2842 dSP;
2843 ENTER;
2844 SAVETMPS;
2845 PUTBACK;
2846 PUSHSTACK; 3155 PUSHSTACK;
3156
2847 PUSHMARK (SP); 3157 PUSHMARK (SP);
3158 PUTBACK;
2848 3159
2849 if (ix) 3160 if (ix)
2850 eval_sv (coderef, 0); 3161 eval_sv (coderef, 0);
2851 else 3162 else
2852 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3163 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2853 3164
2854 POPSTACK; 3165 POPSTACK;
2855 SPAGAIN; 3166 SPAGAIN;
2856 FREETMPS;
2857 LEAVE;
2858 PUTBACK;
2859 }
2860 3167
2861 if (!(coro->flags & CF_RUNNING)) 3168 if (current != coro)
2862 { 3169 {
3170 PUTBACK;
2863 save_perl (aTHX_ coro); 3171 save_perl (aTHX_ coro);
2864 load_perl (aTHX_ &temp); 3172 load_perl (aTHX_ current);
2865 SPAGAIN; 3173 SPAGAIN;
2866 } 3174 }
2867 } 3175 }
2868} 3176}
2869 3177
… …
2873 ALIAS: 3181 ALIAS:
2874 is_ready = CF_READY 3182 is_ready = CF_READY
2875 is_running = CF_RUNNING 3183 is_running = CF_RUNNING
2876 is_new = CF_NEW 3184 is_new = CF_NEW
2877 is_destroyed = CF_DESTROYED 3185 is_destroyed = CF_DESTROYED
3186 is_suspended = CF_SUSPENDED
2878 CODE: 3187 CODE:
2879 RETVAL = boolSV (coro->flags & ix); 3188 RETVAL = boolSV (coro->flags & ix);
2880 OUTPUT: 3189 OUTPUT:
2881 RETVAL 3190 RETVAL
2882 3191
… …
2886 CODE: 3195 CODE:
2887{ 3196{
2888 struct coro *current = SvSTATE_current; 3197 struct coro *current = SvSTATE_current;
2889 SV **throwp = self == current ? &CORO_THROW : &self->except; 3198 SV **throwp = self == current ? &CORO_THROW : &self->except;
2890 SvREFCNT_dec (*throwp); 3199 SvREFCNT_dec (*throwp);
3200 SvGETMAGIC (throw);
2891 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2892} 3202}
2893 3203
2894void 3204void
2895api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2898 3208
2899SV * 3209SV *
2900has_cctx (Coro::State coro) 3210has_cctx (Coro::State coro)
2901 PROTOTYPE: $ 3211 PROTOTYPE: $
2902 CODE: 3212 CODE:
2903 RETVAL = boolSV (!!coro->cctx); 3213 /* maybe manage the running flag differently */
3214 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2904 OUTPUT: 3215 OUTPUT:
2905 RETVAL 3216 RETVAL
2906 3217
2907int 3218int
2908is_traced (Coro::State coro) 3219is_traced (Coro::State coro)
… …
2928 3239
2929void 3240void
2930force_cctx () 3241force_cctx ()
2931 PROTOTYPE: 3242 PROTOTYPE:
2932 CODE: 3243 CODE:
2933 SvSTATE_current->cctx->idle_sp = 0; 3244 cctx_current->idle_sp = 0;
2934 3245
2935void 3246void
2936swap_defsv (Coro::State self) 3247swap_defsv (Coro::State self)
2937 PROTOTYPE: $ 3248 PROTOTYPE: $
2938 ALIAS: 3249 ALIAS:
… …
2946 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3257 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2947 3258
2948 SV *tmp = *src; *src = *dst; *dst = tmp; 3259 SV *tmp = *src; *src = *dst; *dst = tmp;
2949 } 3260 }
2950 3261
3262void
3263cancel (Coro::State self)
3264 CODE:
3265 coro_state_destroy (aTHX_ self);
3266 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3267
3268
3269SV *
3270enable_times (int enabled = enable_times)
3271 CODE:
3272{
3273 RETVAL = boolSV (enable_times);
3274
3275 if (enabled != enable_times)
3276 {
3277 enable_times = enabled;
3278
3279 coro_times_update ();
3280 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3281 }
3282}
3283 OUTPUT:
3284 RETVAL
3285
3286void
3287times (Coro::State self)
3288 PPCODE:
3289{
3290 struct coro *current = SvSTATE (coro_current);
3291
3292 if (expect_false (current == self))
3293 {
3294 coro_times_update ();
3295 coro_times_add (SvSTATE (coro_current));
3296 }
3297
3298 EXTEND (SP, 2);
3299 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3300 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3301
3302 if (expect_false (current == self))
3303 coro_times_sub (SvSTATE (coro_current));
3304}
2951 3305
2952MODULE = Coro::State PACKAGE = Coro 3306MODULE = Coro::State PACKAGE = Coro
2953 3307
2954BOOT: 3308BOOT:
2955{ 3309{
2956 int i;
2957
2958 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2959 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2960 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2961 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2962 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3313 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2963 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3314 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3315 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3316 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3317 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3318 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2964 3319
2965 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3320 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2966 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3321 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2967 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3322 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2968 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3323 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2969 3324
2970 coro_stash = gv_stashpv ("Coro", TRUE); 3325 coro_stash = gv_stashpv ("Coro", TRUE);
2971 3326
2972 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2973 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2974 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3329 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2975 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3330 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2976 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3331 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2977 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3332 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2978
2979 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2980 coro_ready[i] = newAV ();
2981 3333
2982 { 3334 {
2983 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3335 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2984 3336
2985 coroapi.schedule = api_schedule; 3337 coroapi.schedule = api_schedule;
3338 coroapi.schedule_to = api_schedule_to;
2986 coroapi.cede = api_cede; 3339 coroapi.cede = api_cede;
2987 coroapi.cede_notself = api_cede_notself; 3340 coroapi.cede_notself = api_cede_notself;
2988 coroapi.ready = api_ready; 3341 coroapi.ready = api_ready;
2989 coroapi.is_ready = api_is_ready; 3342 coroapi.is_ready = api_is_ready;
2990 coroapi.nready = coro_nready; 3343 coroapi.nready = coro_nready;
… …
2995 SvREADONLY_on (sv); 3348 SvREADONLY_on (sv);
2996 } 3349 }
2997} 3350}
2998 3351
2999void 3352void
3353terminate (...)
3354 CODE:
3355 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3356
3357void
3000schedule (...) 3358schedule (...)
3001 CODE: 3359 CODE:
3002 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3360 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3361
3362void
3363schedule_to (...)
3364 CODE:
3365 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3366
3367void
3368cede_to (...)
3369 CODE:
3370 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3003 3371
3004void 3372void
3005cede (...) 3373cede (...)
3006 CODE: 3374 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_cede); 3375 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3021void 3389void
3022_set_readyhook (SV *hook) 3390_set_readyhook (SV *hook)
3023 PROTOTYPE: $ 3391 PROTOTYPE: $
3024 CODE: 3392 CODE:
3025 SvREFCNT_dec (coro_readyhook); 3393 SvREFCNT_dec (coro_readyhook);
3394 SvGETMAGIC (hook);
3395 if (SvOK (hook))
3396 {
3026 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3397 coro_readyhook = newSVsv (hook);
3398 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3399 }
3400 else
3401 {
3402 coro_readyhook = 0;
3403 CORO_READYHOOK = 0;
3404 }
3027 3405
3028int 3406int
3029prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
3030 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
3031 ALIAS: 3409 ALIAS:
… …
3037 if (items > 1) 3415 if (items > 1)
3038 { 3416 {
3039 if (ix) 3417 if (ix)
3040 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
3041 3419
3042 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3043 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3044 3422
3045 coro->prio = newprio; 3423 coro->prio = newprio;
3046 } 3424 }
3047} 3425}
3048 OUTPUT: 3426 OUTPUT:
… …
3061 PROTOTYPE: 3439 PROTOTYPE:
3062 CODE: 3440 CODE:
3063 RETVAL = coro_nready; 3441 RETVAL = coro_nready;
3064 OUTPUT: 3442 OUTPUT:
3065 RETVAL 3443 RETVAL
3444
3445void
3446suspend (Coro::State self)
3447 PROTOTYPE: $
3448 CODE:
3449 self->flags |= CF_SUSPENDED;
3450
3451void
3452resume (Coro::State self)
3453 PROTOTYPE: $
3454 CODE:
3455 self->flags &= ~CF_SUSPENDED;
3066 3456
3067void 3457void
3068_pool_handler (...) 3458_pool_handler (...)
3069 CODE: 3459 CODE:
3070 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3460 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3125rouse_wait (...) 3515rouse_wait (...)
3126 PROTOTYPE: ;$ 3516 PROTOTYPE: ;$
3127 PPCODE: 3517 PPCODE:
3128 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3518 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3129 3519
3520void
3521on_enter (SV *block)
3522 ALIAS:
3523 on_leave = 1
3524 PROTOTYPE: &
3525 CODE:
3526{
3527 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529
3530 block = s_get_cv_croak (block);
3531
3532 if (!*avp)
3533 *avp = newAV ();
3534
3535 av_push (*avp, SvREFCNT_inc (block));
3536
3537 if (!ix)
3538 on_enterleave_call (aTHX_ block);
3539
3540 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3541 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3542 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3543}
3544
3130 3545
3131MODULE = Coro::State PACKAGE = PerlIO::cede 3546MODULE = Coro::State PACKAGE = PerlIO::cede
3132 3547
3133BOOT: 3548BOOT:
3134 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3549 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3137MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
3138 3553
3139SV * 3554SV *
3140new (SV *klass, SV *count = 0) 3555new (SV *klass, SV *count = 0)
3141 CODE: 3556 CODE:
3557{
3558 int semcnt = 1;
3559
3560 if (count)
3561 {
3562 SvGETMAGIC (count);
3563
3564 if (SvOK (count))
3565 semcnt = SvIV (count);
3566 }
3567
3142 RETVAL = sv_bless ( 3568 RETVAL = sv_bless (
3143 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3569 coro_waitarray_new (aTHX_ semcnt),
3144 GvSTASH (CvGV (cv)) 3570 GvSTASH (CvGV (cv))
3145 ); 3571 );
3572}
3146 OUTPUT: 3573 OUTPUT:
3147 RETVAL 3574 RETVAL
3148 3575
3149# helper for Coro::Channel 3576# helper for Coro::Channel and others
3150SV * 3577SV *
3151_alloc (int count) 3578_alloc (int count)
3152 CODE: 3579 CODE:
3153 RETVAL = coro_waitarray_new (aTHX_ count); 3580 RETVAL = coro_waitarray_new (aTHX_ count);
3154 OUTPUT: 3581 OUTPUT:
… …
3212 for (i = 1; i <= wcount; ++i) 3639 for (i = 1; i <= wcount; ++i)
3213 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3640 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3214 } 3641 }
3215} 3642}
3216 3643
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645
3646void
3647_may_delete (SV *sem, int count, int extra_refs)
3648 PPCODE:
3649{
3650 AV *av = (AV *)SvRV (sem);
3651
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES;
3656
3657 XSRETURN_NO;
3658}
3659
3217MODULE = Coro::State PACKAGE = Coro::Signal 3660MODULE = Coro::State PACKAGE = Coro::Signal
3218 3661
3219SV * 3662SV *
3220new (SV *klass) 3663new (SV *klass)
3221 CODE: 3664 CODE:
… …
3292 3735
3293void 3736void
3294_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
3295 CODE: 3738 CODE:
3296{ 3739{
3297 CV *req_cv = coro_sv_2cv (aTHX_ req); 3740 SV *req_cv = s_get_cv_croak (req);
3298 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
3299 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3300 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
3301 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3744 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3302} 3745}
3303 3746
3747MODULE = Coro::State PACKAGE = Coro::Select
3748
3749void
3750patch_pp_sselect ()
3751 CODE:
3752 if (!coro_old_pp_sselect)
3753 {
3754 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3755 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3756 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3757 }
3758
3759void
3760unpatch_pp_sselect ()
3761 CODE:
3762 if (coro_old_pp_sselect)
3763 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0;
3766 }
3767
3768

Diff Legend

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