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.320 by root, Fri Nov 21 07:29:04 2008 UTC vs.
Revision 1.404 by root, Fri Jun 10 12:27:02 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
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 68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 69# undef CORO_STACKGUARD
114#endif 70#endif
115 71
116#ifndef CORO_STACKGUARD 72#ifndef CORO_STACKGUARD
… …
130#else 86#else
131# define dSTACKLEVEL volatile void *stacklevel 87# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
133#endif 89#endif
134 90
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 91#define IN_DESTRUCT PL_dirty
136
137#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value))
140# define INLINE static inline
141#else
142# define attribute(x)
143# define expect(expr,value) (expr)
144# define INLINE static
145#endif
146
147#define expect_false(expr) expect ((expr) != 0, 0)
148#define expect_true(expr) expect ((expr) != 0, 1)
149
150#define NOINLINE attribute ((noinline))
151 92
152#include "CoroAPI.h" 93#include "CoroAPI.h"
153#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
154 95
155#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
156# if CORO_PTHREAD 97# if CORO_PTHREAD
157static void *coro_thx; 98static void *coro_thx;
158# endif 99# endif
159#endif 100#endif
160 101
102#ifdef __linux
103# include <time.h> /* for timespec */
104# include <syscall.h> /* for SYS_* */
105# ifdef SYS_clock_gettime
106# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
107# define CORO_CLOCK_MONOTONIC 1
108# define CORO_CLOCK_THREAD_CPUTIME_ID 3
109# endif
110#endif
111
161static double (*nvtime)(); /* so why doesn't it take void? */ 112static double (*nvtime)(); /* so why doesn't it take void? */
113static void (*u2time)(pTHX_ UV ret[2]);
162 114
163/* we hijack an hopefully unused CV flag for our purposes */ 115/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 116#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 117static OP *pp_slf (pTHX);
118static void slf_destroy (pTHX_ struct coro *coro);
166 119
167static U32 cctx_gen; 120static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 121static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 122static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 123static AV *main_mainstack; /* used to differentiate between $main and others */
… …
172static HV *coro_state_stash, *coro_stash; 125static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 126static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 127
175static AV *av_destroy; /* destruction queue */ 128static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */ 129static SV *sv_manager; /* the manager coro */
130static SV *sv_idle; /* $Coro::idle */
177 131
178static GV *irsgv; /* $/ */ 132static GV *irsgv; /* $/ */
179static GV *stdoutgv; /* *STDOUT */ 133static GV *stdoutgv; /* *STDOUT */
180static SV *rv_diehook; 134static SV *rv_diehook;
181static SV *rv_warnhook; 135static SV *rv_warnhook;
… …
186static SV *sv_pool_size; 140static SV *sv_pool_size;
187static SV *sv_async_pool_idle; /* description string */ 141static SV *sv_async_pool_idle; /* description string */
188static AV *av_async_pool; /* idle pool */ 142static AV *av_async_pool; /* idle pool */
189static SV *sv_Coro; /* class string */ 143static SV *sv_Coro; /* class string */
190static CV *cv_pool_handler; 144static CV *cv_pool_handler;
191static CV *cv_coro_state_new;
192 145
193/* Coro::AnyEvent */ 146/* Coro::AnyEvent */
194static SV *sv_activity; 147static SV *sv_activity;
195 148
149/* enable processtime/realtime profiling */
150static char enable_times;
151typedef U32 coro_ts[2];
152static coro_ts time_real, time_cpu;
153static char times_valid;
154
196static struct coro_cctx *cctx_first; 155static struct coro_cctx *cctx_first;
197static int cctx_count, cctx_idle; 156static int cctx_count, cctx_idle;
198 157
199enum { 158enum
159{
200 CC_MAPPED = 0x01, 160 CC_MAPPED = 0x01,
201 CC_NOREUSE = 0x02, /* throw this away after tracing */ 161 CC_NOREUSE = 0x02, /* throw this away after tracing */
202 CC_TRACE = 0x04, 162 CC_TRACE = 0x04,
203 CC_TRACE_SUB = 0x08, /* trace sub calls */ 163 CC_TRACE_SUB = 0x08, /* trace sub calls */
204 CC_TRACE_LINE = 0x10, /* trace each statement */ 164 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
225 int valgrind_id; 185 int valgrind_id;
226#endif 186#endif
227 unsigned char flags; 187 unsigned char flags;
228} coro_cctx; 188} coro_cctx;
229 189
190static coro_cctx *cctx_current; /* the currently running cctx */
191
192/*****************************************************************************/
193
194static MGVTBL coro_state_vtbl;
195
230enum { 196enum
197{
231 CF_RUNNING = 0x0001, /* coroutine is running */ 198 CF_RUNNING = 0x0001, /* coroutine is running */
232 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
233 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
234 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
202 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
203 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
235}; 204};
236 205
237/* the structure where most of the perl state is stored, overlaid on the cxstack */ 206/* the structure where most of the perl state is stored, overlaid on the cxstack */
238typedef struct 207typedef struct
239{ 208{
240 SV *defsv; 209 SV *defsv;
241 AV *defav; 210 AV *defav;
242 SV *errsv; 211 SV *errsv;
243 SV *irsgv; 212 SV *irsgv;
213 HV *hinthv;
244#define VAR(name,type) type name; 214#define VAR(name,type) type name;
245# include "state.h" 215# include "state.h"
246#undef VAR 216#undef VAR
247} perl_slots; 217} perl_slots;
248 218
219// how many context stack entries do we need for perl_slots
249#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
250 221
251/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
252struct coro { 223struct coro
224{
253 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
254 coro_cctx *cctx; 226 coro_cctx *cctx;
227
228 /* ready queue */
229 struct coro *next_ready;
255 230
256 /* state data */ 231 /* state data */
257 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
258 AV *mainstack; 233 AV *mainstack;
259 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
260 235
261 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
262 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
263 int refcnt; /* coroutines are refcounted, yes */
264 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
265 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
266 void (*on_destroy)(pTHX_ struct coro *coro);
267 240
268 /* statistics */ 241 /* statistics */
269 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
270 243
271 /* coro process data */ 244 /* coro process data */
272 int prio; 245 int prio;
273 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
274 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
275 250
276 /* async_pool */ 251 /* async_pool */
277 SV *saved_deffh; 252 SV *saved_deffh;
278 SV *invoke_cb; 253 SV *invoke_cb;
279 AV *invoke_av; 254 AV *invoke_av;
280 255
256 /* on_enter/on_leave */
257 AV *on_enter;
258 AV *on_leave;
259
260 /* swap_sv */
261 AV *swap_sv;
262
263 /* times */
264 coro_ts t_cpu, t_real;
265
281 /* linked list */ 266 /* linked list */
282 struct coro *next, *prev; 267 struct coro *next, *prev;
283}; 268};
284 269
285typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
286typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
287 272
288/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
289/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
290/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
291static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
292 277
293/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
294 279
295#define PRIO_MAX 3 280#define CORO_PRIO_MAX 3
296#define PRIO_HIGH 1 281#define CORO_PRIO_HIGH 1
297#define PRIO_NORMAL 0 282#define CORO_PRIO_NORMAL 0
298#define PRIO_LOW -1 283#define CORO_PRIO_LOW -1
299#define PRIO_IDLE -3 284#define CORO_PRIO_IDLE -3
300#define PRIO_MIN -4 285#define CORO_PRIO_MIN -4
301 286
302/* for Coro.pm */ 287/* for Coro.pm */
303static SV *coro_current; 288static SV *coro_current;
304static SV *coro_readyhook; 289static SV *coro_readyhook;
305static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
306static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
307static struct coro *coro_first; 292static struct coro *coro_first;
308#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
309 294
295/** Coro::Select ************************************************************/
296
297static OP *(*coro_old_pp_sselect) (pTHX);
298static SV *coro_select_select;
299
300/* horrible hack, but if it works... */
301static OP *
302coro_pp_sselect (pTHX)
303{
304 dSP;
305 PUSHMARK (SP - 4); /* fake argument list */
306 XPUSHs (coro_select_select);
307 PUTBACK;
308
309 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
310 PL_op->op_flags |= OPf_STACKED;
311 PL_op->op_private = 0;
312 return PL_ppaddr [OP_ENTERSUB](aTHX);
313}
314
315/** time stuff **************************************************************/
316
317#ifdef HAS_GETTIMEOFDAY
318
319ECB_INLINE void
320coro_u2time (pTHX_ UV ret[2])
321{
322 struct timeval tv;
323 gettimeofday (&tv, 0);
324
325 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec;
327}
328
329ECB_INLINE double
330coro_nvtime ()
331{
332 struct timeval tv;
333 gettimeofday (&tv, 0);
334
335 return tv.tv_sec + tv.tv_usec * 1e-6;
336}
337
338ECB_INLINE void
339time_init (pTHX)
340{
341 nvtime = coro_nvtime;
342 u2time = coro_u2time;
343}
344
345#else
346
347ECB_INLINE void
348time_init (pTHX)
349{
350 SV **svp;
351
352 require_pv ("Time/HiRes.pm");
353
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
358
359 nvtime = INT2PTR (double (*)(), SvIV (*svp));
360
361 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
362 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
363}
364
365#endif
366
310/** lowlevel stuff **********************************************************/ 367/** lowlevel stuff **********************************************************/
311 368
312static SV * 369static SV * ecb_noinline
313coro_get_sv (pTHX_ const char *name, int create) 370coro_get_sv (pTHX_ const char *name, int create)
314{ 371{
315#if PERL_VERSION_ATLEAST (5,10,0) 372#if PERL_VERSION_ATLEAST (5,10,0)
316 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
317 get_sv (name, create); 374 get_sv (name, create);
318#endif 375#endif
319 return get_sv (name, create); 376 return get_sv (name, create);
320} 377}
321 378
322static AV * 379static AV * ecb_noinline
323coro_get_av (pTHX_ const char *name, int create) 380coro_get_av (pTHX_ const char *name, int create)
324{ 381{
325#if PERL_VERSION_ATLEAST (5,10,0) 382#if PERL_VERSION_ATLEAST (5,10,0)
326 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 383 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
327 get_av (name, create); 384 get_av (name, create);
328#endif 385#endif
329 return get_av (name, create); 386 return get_av (name, create);
330} 387}
331 388
332static HV * 389static HV * ecb_noinline
333coro_get_hv (pTHX_ const char *name, int create) 390coro_get_hv (pTHX_ const char *name, int create)
334{ 391{
335#if PERL_VERSION_ATLEAST (5,10,0) 392#if PERL_VERSION_ATLEAST (5,10,0)
336 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 393 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
337 get_hv (name, create); 394 get_hv (name, create);
338#endif 395#endif
339 return get_hv (name, create); 396 return get_hv (name, create);
340} 397}
341 398
342/* may croak */ 399ECB_INLINE void
400coro_times_update ()
401{
402#ifdef coro_clock_gettime
403 struct timespec ts;
404
405 ts.tv_sec = ts.tv_nsec = 0;
406 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
407 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
408
409 ts.tv_sec = ts.tv_nsec = 0;
410 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
411 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
412#else
413 dTHX;
414 UV tv[2];
415
416 u2time (aTHX_ tv);
417 time_real [0] = tv [0];
418 time_real [1] = tv [1] * 1000;
419#endif
420}
421
422ECB_INLINE void
423coro_times_add (struct coro *c)
424{
425 c->t_real [1] += time_real [1];
426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
427 c->t_real [0] += time_real [0];
428
429 c->t_cpu [1] += time_cpu [1];
430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
431 c->t_cpu [0] += time_cpu [0];
432}
433
434ECB_INLINE void
435coro_times_sub (struct coro *c)
436{
437 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
438 c->t_real [1] -= time_real [1];
439 c->t_real [0] -= time_real [0];
440
441 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
442 c->t_cpu [1] -= time_cpu [1];
443 c->t_cpu [0] -= time_cpu [0];
444}
445
446/*****************************************************************************/
447/* magic glue */
448
449#define CORO_MAGIC_type_cv 26
450#define CORO_MAGIC_type_state PERL_MAGIC_ext
451
452#define CORO_MAGIC_NN(sv, type) \
453 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
454 ? SvMAGIC (sv) \
455 : mg_find (sv, type))
456
457#define CORO_MAGIC(sv, type) \
458 (ecb_expect_true (SvMAGIC (sv)) \
459 ? CORO_MAGIC_NN (sv, type) \
460 : 0)
461
462#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
463#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
464
465ECB_INLINE MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro)
467{
468 MAGIC *mg;
469
470 if (ecb_expect_true (
471 SvTYPE (coro) == SVt_PVHV
472 && (mg = CORO_MAGIC_state (coro))
473 && mg->mg_virtual == &coro_state_vtbl
474 ))
475 return mg;
476
477 return 0;
478}
479
480ECB_INLINE struct coro *
481SvSTATE_ (pTHX_ SV *coro)
482{
483 MAGIC *mg;
484
485 if (SvROK (coro))
486 coro = SvRV (coro);
487
488 mg = SvSTATEhv_p (aTHX_ coro);
489 if (!mg)
490 croak ("Coro::State object required");
491
492 return (struct coro *)mg->mg_ptr;
493}
494
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496
497/* faster than SvSTATE, but expects a coroutine hv */
498#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500
501/*****************************************************************************/
502/* padlist management and caching */
503
343INLINE CV * 504ECB_INLINE AV *
344coro_sv_2cv (pTHX_ SV *sv)
345{
346 HV *st;
347 GV *gvp;
348 return sv_2cv (sv, &st, &gvp, 0);
349}
350
351static AV *
352coro_clone_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
353{ 506{
354 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
355 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
356 509
357 newpadlist = newAV (); 510 newpadlist = newAV ();
… …
362 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
363#endif 516#endif
364 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
365 --AvFILLp (padlist); 518 --AvFILLp (padlist);
366 519
367 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
368 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
369 522
370 return newpadlist; 523 return newpadlist;
371} 524}
372 525
373static void 526ECB_INLINE void
374free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
375{ 528{
376 /* may be during global destruction */ 529 /* may be during global destruction */
377 if (SvREFCNT (padlist)) 530 if (!IN_DESTRUCT)
378 { 531 {
379 I32 i = AvFILLp (padlist); 532 I32 i = AvFILLp (padlist);
380 while (i >= 0) 533
534 while (i > 0) /* special-case index 0 */
381 { 535 {
382 SV **svp = av_fetch (padlist, i--, FALSE); 536 /* we try to be extra-careful here */
383 if (svp) 537 AV *av = (AV *)AvARRAY (padlist)[i--];
384 { 538 I32 j = AvFILLp (av);
385 SV *sv; 539
386 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 540 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]);
542
543 AvFILLp (av) = -1;
387 SvREFCNT_dec (sv); 544 SvREFCNT_dec (av);
388
389 SvREFCNT_dec (*svp);
390 }
391 } 545 }
392 546
547 SvREFCNT_dec (AvARRAY (padlist)[0]);
548
549 AvFILLp (padlist) = -1;
393 SvREFCNT_dec ((SV*)padlist); 550 SvREFCNT_dec ((SV*)padlist);
394 } 551 }
395} 552}
396 553
397static int 554static int
398coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
399{ 556{
400 AV *padlist; 557 AV *padlist;
401 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
402 563
403 /* casting is fun. */ 564 /* casting is fun. */
404 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
405 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
406 567
407 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
408 569
409 return 0; 570 return 0;
410} 571}
411
412#define CORO_MAGIC_type_cv 26
413#define CORO_MAGIC_type_state PERL_MAGIC_ext
414 572
415static MGVTBL coro_cv_vtbl = { 573static MGVTBL coro_cv_vtbl = {
416 0, 0, 0, 0, 574 0, 0, 0, 0,
417 coro_cv_free 575 coro_cv_free
418}; 576};
419 577
420#define CORO_MAGIC_NN(sv, type) \
421 (expect_true (SvMAGIC (sv)->mg_type == type) \
422 ? SvMAGIC (sv) \
423 : mg_find (sv, type))
424
425#define CORO_MAGIC(sv, type) \
426 (expect_true (SvMAGIC (sv)) \
427 ? CORO_MAGIC_NN (sv, type) \
428 : 0)
429
430#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
431#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
432
433INLINE struct coro *
434SvSTATE_ (pTHX_ SV *coro)
435{
436 HV *stash;
437 MAGIC *mg;
438
439 if (SvROK (coro))
440 coro = SvRV (coro);
441
442 if (expect_false (SvTYPE (coro) != SVt_PVHV))
443 croak ("Coro::State object required");
444
445 stash = SvSTASH (coro);
446 if (expect_false (stash != coro_stash && stash != coro_state_stash))
447 {
448 /* very slow, but rare, check */
449 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
450 croak ("Coro::State object required");
451 }
452
453 mg = CORO_MAGIC_state (coro);
454 return (struct coro *)mg->mg_ptr;
455}
456
457#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
458
459/* faster than SvSTATE, but expects a coroutine hv */
460#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
461#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
462
463/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
464static void 579ECB_INLINE void
465get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
466{ 581{
467 MAGIC *mg = CORO_MAGIC_cv (cv); 582 MAGIC *mg = CORO_MAGIC_cv (cv);
468 AV *av; 583 AV *av;
469 584
470 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
471 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
472 else 587 else
473 { 588 {
474#if CORO_PREFER_PERL_FUNCTIONS 589#if CORO_PREFER_PERL_FUNCTIONS
475 /* this is probably cleaner? but also slower! */ 590 /* this is probably cleaner? but also slower! */
… …
477 CV *cp = Perl_cv_clone (aTHX_ cv); 592 CV *cp = Perl_cv_clone (aTHX_ cv);
478 CvPADLIST (cv) = CvPADLIST (cp); 593 CvPADLIST (cv) = CvPADLIST (cp);
479 CvPADLIST (cp) = 0; 594 CvPADLIST (cp) = 0;
480 SvREFCNT_dec (cp); 595 SvREFCNT_dec (cp);
481#else 596#else
482 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
483#endif 598#endif
484 } 599 }
485} 600}
486 601
487static void 602ECB_INLINE void
488put_padlist (pTHX_ CV *cv) 603put_padlist (pTHX_ CV *cv)
489{ 604{
490 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
491 AV *av; 606 AV *av;
492 607
493 if (expect_false (!mg)) 608 if (ecb_expect_false (!mg))
494 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
495 610
496 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
497 612
498 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
499 av_extend (av, AvMAX (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
500 615
501 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
502} 617}
503 618
504/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
672static void
673on_enterleave_call (pTHX_ SV *cb);
505 674
506static void 675static void
507load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
508{ 677{
509 perl_slots *slot = c->slot; 678 perl_slots *slot = c->slot;
510 c->slot = 0; 679 c->slot = 0;
511 680
512 PL_mainstack = c->mainstack; 681 PL_mainstack = c->mainstack;
513 682
514 GvSV (PL_defgv) = slot->defsv; 683 GvSV (PL_defgv) = slot->defsv;
515 GvAV (PL_defgv) = slot->defav; 684 GvAV (PL_defgv) = slot->defav;
516 GvSV (PL_errgv) = slot->errsv; 685 GvSV (PL_errgv) = slot->errsv;
517 GvSV (irsgv) = slot->irsgv; 686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
518 688
519 #define VAR(name,type) PL_ ## name = slot->name; 689 #define VAR(name,type) PL_ ## name = slot->name;
520 # include "state.h" 690 # include "state.h"
521 #undef VAR 691 #undef VAR
522 692
… …
524 dSP; 694 dSP;
525 695
526 CV *cv; 696 CV *cv;
527 697
528 /* now do the ugly restore mess */ 698 /* now do the ugly restore mess */
529 while (expect_true (cv = (CV *)POPs)) 699 while (ecb_expect_true (cv = (CV *)POPs))
530 { 700 {
531 put_padlist (aTHX_ cv); /* mark this padlist as available */ 701 put_padlist (aTHX_ cv); /* mark this padlist as available */
532 CvDEPTH (cv) = PTR2IV (POPs); 702 CvDEPTH (cv) = PTR2IV (POPs);
533 CvPADLIST (cv) = (AV *)POPs; 703 CvPADLIST (cv) = (AV *)POPs;
534 } 704 }
… …
536 PUTBACK; 706 PUTBACK;
537 } 707 }
538 708
539 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
540 CORO_THROW = c->except; 710 CORO_THROW = c->except;
711
712 if (ecb_expect_false (enable_times))
713 {
714 if (ecb_expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
720 if (ecb_expect_false (c->on_enter))
721 {
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 }
727
728 SWAP_SVS (c);
541} 729}
542 730
543static void 731static void
544save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
545{ 733{
734 SWAP_SVS (c);
735
736 if (ecb_expect_false (c->on_leave))
737 {
738 int i;
739
740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (ecb_expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
750 }
751
546 c->except = CORO_THROW; 752 c->except = CORO_THROW;
547 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
548 754
549 { 755 {
550 dSP; 756 dSP;
… …
559 765
560 XPUSHs (Nullsv); 766 XPUSHs (Nullsv);
561 /* this loop was inspired by pp_caller */ 767 /* this loop was inspired by pp_caller */
562 for (;;) 768 for (;;)
563 { 769 {
564 while (expect_true (cxix >= 0)) 770 while (ecb_expect_true (cxix >= 0))
565 { 771 {
566 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
567 773
568 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 774 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
569 { 775 {
570 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
571 777
572 if (expect_true (CvDEPTH (cv))) 778 if (ecb_expect_true (CvDEPTH (cv)))
573 { 779 {
574 EXTEND (SP, 3); 780 EXTEND (SP, 3);
575 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
576 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
577 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
… …
580 get_padlist (aTHX_ cv); 786 get_padlist (aTHX_ cv);
581 } 787 }
582 } 788 }
583 } 789 }
584 790
585 if (expect_true (top_si->si_type == PERLSI_MAIN)) 791 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
586 break; 792 break;
587 793
588 top_si = top_si->si_prev; 794 top_si = top_si->si_prev;
589 ccstk = top_si->si_cxstack; 795 ccstk = top_si->si_cxstack;
590 cxix = top_si->si_cxix; 796 cxix = top_si->si_cxix;
… …
592 798
593 PUTBACK; 799 PUTBACK;
594 } 800 }
595 801
596 /* allocate some space on the context stack for our purposes */ 802 /* allocate some space on the context stack for our purposes */
597 /* we manually unroll here, as usually 2 slots is enough */ 803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
598 if (SLOT_COUNT >= 1) CXINC;
599 if (SLOT_COUNT >= 2) CXINC;
600 if (SLOT_COUNT >= 3) CXINC;
601 { 804 {
602 int i; 805 unsigned int i;
806
603 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 0; i < SLOT_COUNT; ++i)
604 CXINC; 808 CXINC;
605 } 809
606 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
811 }
607 812
608 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
609 814
610 { 815 {
611 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
612 817
613 slot->defav = GvAV (PL_defgv); 818 slot->defav = GvAV (PL_defgv);
614 slot->defsv = DEFSV; 819 slot->defsv = DEFSV;
615 slot->errsv = ERRSV; 820 slot->errsv = ERRSV;
616 slot->irsgv = GvSV (irsgv); 821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
617 823
618 #define VAR(name,type) slot->name = PL_ ## name; 824 #define VAR(name,type) slot->name = PL_ ## name;
619 # include "state.h" 825 # include "state.h"
620 #undef VAR 826 #undef VAR
621 } 827 }
… …
631# define coro_init_stacks(thx) init_stacks () 837# define coro_init_stacks(thx) init_stacks ()
632#else 838#else
633static void 839static void
634coro_init_stacks (pTHX) 840coro_init_stacks (pTHX)
635{ 841{
636 PL_curstackinfo = new_stackinfo(32, 8); 842 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
637 PL_curstackinfo->si_type = PERLSI_MAIN; 843 PL_curstackinfo->si_type = PERLSI_MAIN;
638 PL_curstack = PL_curstackinfo->si_stack; 844 PL_curstack = PL_curstackinfo->si_stack;
639 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
640 846
641 PL_stack_base = AvARRAY(PL_curstack); 847 PL_stack_base = AvARRAY(PL_curstack);
… …
748#endif 954#endif
749 955
750/* 956/*
751 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
752 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
753 * and instead of tryign to save and restore the hash elements, we just provide 959 * and instead of trying to save and restore the hash elements (extremely slow),
754 * readback here. 960 * we just provide our own readback here.
755 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
756 * not expecting this to actually change the hook. This is a potential problem
757 * when a schedule happens then, but we ignore this.
758 */ 961 */
759static int 962static int ecb_cold
760coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
761{ 964{
762 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
763 966
764 if (*s == '_') 967 if (*s == '_')
… …
776 } 979 }
777 980
778 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
779} 982}
780 983
781static int 984static int ecb_cold
782coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
783{ 986{
784 const char *s = MgPV_nolen_const (mg); 987 const char *s = MgPV_nolen_const (mg);
785 988
786 if (*s == '_') 989 if (*s == '_')
… …
800 } 1003 }
801 1004
802 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
803} 1006}
804 1007
805static int 1008static int ecb_cold
806coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
807{ 1010{
808 const char *s = MgPV_nolen_const (mg); 1011 const char *s = MgPV_nolen_const (mg);
809 1012
810 if (*s == '_') 1013 if (*s == '_')
… …
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1018 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 1019
817 if (svp) 1020 if (svp)
818 { 1021 {
819 SV *old = *svp; 1022 SV *old = *svp;
820 *svp = newSVsv (sv); 1023 *svp = SvOK (sv) ? newSVsv (sv) : 0;
821 SvREFCNT_dec (old); 1024 SvREFCNT_dec (old);
822 return 0; 1025 return 0;
823 } 1026 }
824 } 1027 }
825 1028
… …
843slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
844{ 1047{
845 return 1; 1048 return 1;
846} 1049}
847 1050
848static UNOP coro_setup_op; 1051static UNOP init_perl_op;
849 1052
850static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053ecb_noinline static void /* noinline to keep it out of the transfer fast path */
851coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
852{ 1055{
853 /* 1056 /*
854 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
855 */ 1058 */
856 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
857 1060
858 PL_runops = RUNOPS_DEFAULT; 1061 PL_runops = RUNOPS_DEFAULT;
859 PL_curcop = &PL_compiling; 1062 PL_curcop = &PL_compiling;
860 PL_in_eval = EVAL_NULL; 1063 PL_in_eval = EVAL_NULL;
861 PL_comppad = 0; 1064 PL_comppad = 0;
1065 PL_comppad_name = 0;
1066 PL_comppad_name_fill = 0;
1067 PL_comppad_name_floor = 0;
862 PL_curpm = 0; 1068 PL_curpm = 0;
863 PL_curpad = 0; 1069 PL_curpad = 0;
864 PL_localizing = 0; 1070 PL_localizing = 0;
865 PL_dirty = 0;
866 PL_restartop = 0; 1071 PL_restartop = 0;
867#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
868 PL_parser = 0; 1073 PL_parser = 0;
869#endif 1074#endif
1075 PL_hints = 0;
870 1076
871 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
872 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = SvREFCNT_inc (rv_diehook);
873 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = SvREFCNT_inc (rv_warnhook);
874 1080
875 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
876 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
877 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
878 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0;
879 PL_rs = newSVsv (GvSV (irsgv)); 1086 PL_rs = newSVsv (GvSV (irsgv));
880 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
881 1088
882 { 1089 {
883 dSP; 1090 dSP;
… …
898 /* this newly created coroutine might be run on an existing cctx which most 1105 /* this newly created coroutine might be run on an existing cctx which most
899 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
900 */ 1107 */
901 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
902 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1110 slf_frame.destroy = 0;
903 1111
904 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
905 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
906 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
907 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
908 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
909 1117
910 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
911 1119
912 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
913 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
914}
915 1122
1123 SWAP_SVS (coro);
1124
1125 if (ecb_expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
1130}
1131
916static void 1132static void
917coro_destruct (pTHX_ struct coro *coro) 1133coro_unwind_stacks (pTHX)
918{ 1134{
919 if (!IN_DESTRUCT) 1135 if (!IN_DESTRUCT)
920 { 1136 {
921 /* restore all saved variables and stuff */ 1137 /* restore all saved variables and stuff */
922 LEAVE_SCOPE (0); 1138 LEAVE_SCOPE (0);
… …
930 POPSTACK_TO (PL_mainstack); 1146 POPSTACK_TO (PL_mainstack);
931 1147
932 /* unwind main stack */ 1148 /* unwind main stack */
933 dounwind (-1); 1149 dounwind (-1);
934 } 1150 }
1151}
935 1152
936 SvREFCNT_dec (GvSV (PL_defgv)); 1153static void
937 SvREFCNT_dec (GvAV (PL_defgv)); 1154destroy_perl (pTHX_ struct coro *coro)
938 SvREFCNT_dec (GvSV (PL_errgv)); 1155{
939 SvREFCNT_dec (PL_defoutgv); 1156 SV *svf [9];
940 SvREFCNT_dec (PL_rs);
941 SvREFCNT_dec (GvSV (irsgv));
942 1157
943 SvREFCNT_dec (PL_diehook);
944 SvREFCNT_dec (PL_warnhook);
945 1158 {
1159 SV *old_current = SvRV (coro_current);
1160 struct coro *current = SvSTATE (old_current);
1161
1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1163
1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1169 load_perl (aTHX_ coro);
1170
1171 coro_unwind_stacks (aTHX);
1172
1173 /* restore swapped sv's */
1174 SWAP_SVS (coro);
1175
1176 coro_destruct_stacks (aTHX);
1177
1178 // now save some sv's to be free'd later
1179 svf [0] = GvSV (PL_defgv);
1180 svf [1] = (SV *)GvAV (PL_defgv);
1181 svf [2] = GvSV (PL_errgv);
1182 svf [3] = (SV *)PL_defoutgv;
1183 svf [4] = PL_rs;
1184 svf [5] = GvSV (irsgv);
1185 svf [6] = (SV *)GvHV (PL_hintgv);
1186 svf [7] = PL_diehook;
1187 svf [8] = PL_warnhook;
1188 assert (9 == sizeof (svf) / sizeof (*svf));
1189
1190 SvRV_set (coro_current, old_current);
1191
1192 load_perl (aTHX_ current);
1193 }
1194
1195 {
1196 unsigned int i;
1197
1198 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1199 SvREFCNT_dec (svf [i]);
1200
946 SvREFCNT_dec (coro->saved_deffh); 1201 SvREFCNT_dec (coro->saved_deffh);
947 SvREFCNT_dec (coro->rouse_cb); 1202 SvREFCNT_dec (coro->rouse_cb);
948 SvREFCNT_dec (coro->invoke_cb); 1203 SvREFCNT_dec (coro->invoke_cb);
949 SvREFCNT_dec (coro->invoke_av); 1204 SvREFCNT_dec (coro->invoke_av);
950 1205 }
951 coro_destruct_stacks (aTHX);
952} 1206}
953 1207
954INLINE void 1208ECB_INLINE void
955free_coro_mortal (pTHX) 1209free_coro_mortal (pTHX)
956{ 1210{
957 if (expect_true (coro_mortal)) 1211 if (ecb_expect_true (coro_mortal))
958 { 1212 {
959 SvREFCNT_dec (coro_mortal); 1213 SvREFCNT_dec ((SV *)coro_mortal);
960 coro_mortal = 0; 1214 coro_mortal = 0;
961 } 1215 }
962} 1216}
963 1217
964static int 1218static int
965runops_trace (pTHX) 1219runops_trace (pTHX)
966{ 1220{
967 COP *oldcop = 0; 1221 COP *oldcop = 0;
968 int oldcxix = -2; 1222 int oldcxix = -2;
969 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
970 coro_cctx *cctx = coro->cctx;
971 1223
972 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1224 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
973 { 1225 {
974 PERL_ASYNC_CHECK (); 1226 PERL_ASYNC_CHECK ();
975 1227
976 if (cctx->flags & CC_TRACE_ALL) 1228 if (cctx_current->flags & CC_TRACE_ALL)
977 { 1229 {
978 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1230 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
979 { 1231 {
980 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1232 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
981 SV **bot, **top; 1233 SV **bot, **top;
982 AV *av = newAV (); /* return values */ 1234 AV *av = newAV (); /* return values */
983 SV **cb; 1235 SV **cb;
… …
1020 1272
1021 if (PL_curcop != &PL_compiling) 1273 if (PL_curcop != &PL_compiling)
1022 { 1274 {
1023 SV **cb; 1275 SV **cb;
1024 1276
1025 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1277 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1026 { 1278 {
1027 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1279 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1028 1280
1029 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1281 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1030 { 1282 {
… …
1053 } 1305 }
1054 1306
1055 oldcxix = cxstack_ix; 1307 oldcxix = cxstack_ix;
1056 } 1308 }
1057 1309
1058 if (cctx->flags & CC_TRACE_LINE) 1310 if (cctx_current->flags & CC_TRACE_LINE)
1059 { 1311 {
1060 dSP; 1312 dSP;
1061 1313
1062 PL_runops = RUNOPS_DEFAULT; 1314 PL_runops = RUNOPS_DEFAULT;
1063 ENTER; 1315 ENTER;
… …
1082 1334
1083 TAINT_NOT; 1335 TAINT_NOT;
1084 return 0; 1336 return 0;
1085} 1337}
1086 1338
1087static struct coro_cctx *cctx_ssl_cctx;
1088static struct CoroSLF cctx_ssl_frame; 1339static struct CoroSLF cctx_ssl_frame;
1089 1340
1090static void 1341static void
1091slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1342slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1092{ 1343{
1093 ta->prev = (struct coro *)cctx_ssl_cctx;
1094 ta->next = 0; 1344 ta->prev = 0;
1095} 1345}
1096 1346
1097static int 1347static int
1098slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1348slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1099{ 1349{
… …
1101 1351
1102 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1352 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1103} 1353}
1104 1354
1105/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1355/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1106static void NOINLINE 1356static void ecb_noinline
1107cctx_prepare (pTHX_ coro_cctx *cctx) 1357cctx_prepare (pTHX)
1108{ 1358{
1109 PL_top_env = &PL_start_env; 1359 PL_top_env = &PL_start_env;
1110 1360
1111 if (cctx->flags & CC_TRACE) 1361 if (cctx_current->flags & CC_TRACE)
1112 PL_runops = runops_trace; 1362 PL_runops = runops_trace;
1113 1363
1114 /* we already must be executing an SLF op, there is no other valid way 1364 /* we already must be executing an SLF op, there is no other valid way
1115 * that can lead to creation of a new cctx */ 1365 * that can lead to creation of a new cctx */
1116 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1366 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1117 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1367 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1118 1368
1119 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1369 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1120 cctx_ssl_cctx = cctx;
1121 cctx_ssl_frame = slf_frame; 1370 cctx_ssl_frame = slf_frame;
1122 1371
1123 slf_frame.prepare = slf_prepare_set_stacklevel; 1372 slf_frame.prepare = slf_prepare_set_stacklevel;
1124 slf_frame.check = slf_check_set_stacklevel; 1373 slf_frame.check = slf_check_set_stacklevel;
1125} 1374}
1126 1375
1127/* the tail of transfer: execute stuff we can only do after a transfer */ 1376/* the tail of transfer: execute stuff we can only do after a transfer */
1128INLINE void 1377ECB_INLINE void
1129transfer_tail (pTHX) 1378transfer_tail (pTHX)
1130{ 1379{
1131 free_coro_mortal (aTHX); 1380 free_coro_mortal (aTHX);
1132} 1381}
1133 1382
… …
1148 /* normally we would need to skip the entersub here */ 1397 /* normally we would need to skip the entersub here */
1149 /* not doing so will re-execute it, which is exactly what we want */ 1398 /* not doing so will re-execute it, which is exactly what we want */
1150 /* PL_nop = PL_nop->op_next */ 1399 /* PL_nop = PL_nop->op_next */
1151 1400
1152 /* inject a fake subroutine call to cctx_init */ 1401 /* inject a fake subroutine call to cctx_init */
1153 cctx_prepare (aTHX_ (coro_cctx *)arg); 1402 cctx_prepare (aTHX);
1154 1403
1155 /* cctx_run is the alternative tail of transfer() */ 1404 /* cctx_run is the alternative tail of transfer() */
1156 transfer_tail (aTHX); 1405 transfer_tail (aTHX);
1157 1406
1158 /* somebody or something will hit me for both perl_run and PL_restartop */ 1407 /* somebody or something will hit me for both perl_run and PL_restartop */
1159 PL_restartop = PL_op; 1408 PL_restartop = PL_op;
1160 perl_run (PL_curinterp); 1409 perl_run (PL_curinterp);
1161 /* 1410 /*
1162 * Unfortunately, there is no way to get at the return values of the 1411 * Unfortunately, there is no way to get at the return values of the
1163 * coro body here, as perl_run destroys these 1412 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1413 * runtime errors here, as this is just a random interpreter, not a thread.
1164 */ 1414 */
1165 1415
1166 /* 1416 /*
1167 * If perl-run returns we assume exit() was being called or the coro 1417 * If perl-run returns we assume exit() was being called or the coro
1168 * fell off the end, which seems to be the only valid (non-bug) 1418 * fell off the end, which seems to be the only valid (non-bug)
1169 * reason for perl_run to return. We try to exit by jumping to the 1419 * reason for perl_run to return. We try to exit by jumping to the
1170 * bootstrap-time "top" top_env, as we cannot restore the "main" 1420 * bootstrap-time "top" top_env, as we cannot restore the "main"
1171 * coroutine as Coro has no such concept 1421 * coroutine as Coro has no such concept.
1422 * This actually isn't valid with the pthread backend, but OSes requiring
1423 * that backend are too broken to do it in a standards-compliant way.
1172 */ 1424 */
1173 PL_top_env = main_top_env; 1425 PL_top_env = main_top_env;
1174 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1426 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1175 } 1427 }
1176} 1428}
… …
1253cctx_destroy (coro_cctx *cctx) 1505cctx_destroy (coro_cctx *cctx)
1254{ 1506{
1255 if (!cctx) 1507 if (!cctx)
1256 return; 1508 return;
1257 1509
1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1511
1258 --cctx_count; 1512 --cctx_count;
1259 coro_destroy (&cctx->cctx); 1513 coro_destroy (&cctx->cctx);
1260 1514
1261 /* coro_transfer creates new, empty cctx's */ 1515 /* coro_transfer creates new, empty cctx's */
1262 if (cctx->sptr) 1516 if (cctx->sptr)
… …
1280#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1534#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1281 1535
1282static coro_cctx * 1536static coro_cctx *
1283cctx_get (pTHX) 1537cctx_get (pTHX)
1284{ 1538{
1285 while (expect_true (cctx_first)) 1539 while (ecb_expect_true (cctx_first))
1286 { 1540 {
1287 coro_cctx *cctx = cctx_first; 1541 coro_cctx *cctx = cctx_first;
1288 cctx_first = cctx->next; 1542 cctx_first = cctx->next;
1289 --cctx_idle; 1543 --cctx_idle;
1290 1544
1291 if (expect_true (!CCTX_EXPIRED (cctx))) 1545 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1292 return cctx; 1546 return cctx;
1293 1547
1294 cctx_destroy (cctx); 1548 cctx_destroy (cctx);
1295 } 1549 }
1296 1550
… …
1301cctx_put (coro_cctx *cctx) 1555cctx_put (coro_cctx *cctx)
1302{ 1556{
1303 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1557 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1304 1558
1305 /* free another cctx if overlimit */ 1559 /* free another cctx if overlimit */
1306 if (expect_false (cctx_idle >= cctx_max_idle)) 1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1307 { 1561 {
1308 coro_cctx *first = cctx_first; 1562 coro_cctx *first = cctx_first;
1309 cctx_first = first->next; 1563 cctx_first = first->next;
1310 --cctx_idle; 1564 --cctx_idle;
1311 1565
… …
1322static void 1576static void
1323transfer_check (pTHX_ struct coro *prev, struct coro *next) 1577transfer_check (pTHX_ struct coro *prev, struct coro *next)
1324{ 1578{
1325 /* TODO: throwing up here is considered harmful */ 1579 /* TODO: throwing up here is considered harmful */
1326 1580
1327 if (expect_true (prev != next)) 1581 if (ecb_expect_true (prev != next))
1328 { 1582 {
1329 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1583 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1330 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1584 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1331 1585
1332 if (expect_false (next->flags & CF_RUNNING)) 1586 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1333 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1334
1335 if (expect_false (next->flags & CF_DESTROYED))
1336 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1587 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1337 1588
1338#if !PERL_VERSION_ATLEAST (5,10,0) 1589#if !PERL_VERSION_ATLEAST (5,10,0)
1339 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1590 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1340 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1591 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1341#endif 1592#endif
1342 } 1593 }
1343} 1594}
1344 1595
1345/* always use the TRANSFER macro */ 1596/* always use the TRANSFER macro */
1346static void NOINLINE /* noinline so we have a fixed stackframe */ 1597static void ecb_noinline /* noinline so we have a fixed stackframe */
1347transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1598transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1348{ 1599{
1349 dSTACKLEVEL; 1600 dSTACKLEVEL;
1350 1601
1351 /* sometimes transfer is only called to set idle_sp */ 1602 /* sometimes transfer is only called to set idle_sp */
1352 if (expect_false (!next)) 1603 if (ecb_expect_false (!prev))
1353 { 1604 {
1354 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1605 cctx_current->idle_sp = STACKLEVEL;
1355 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1606 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1356 } 1607 }
1357 else if (expect_true (prev != next)) 1608 else if (ecb_expect_true (prev != next))
1358 { 1609 {
1359 coro_cctx *prev__cctx; 1610 coro_cctx *cctx_prev;
1360 1611
1361 if (expect_false (prev->flags & CF_NEW)) 1612 if (ecb_expect_false (prev->flags & CF_NEW))
1362 { 1613 {
1363 /* create a new empty/source context */ 1614 /* create a new empty/source context */
1364 prev->cctx = cctx_new_empty ();
1365 prev->flags &= ~CF_NEW; 1615 prev->flags &= ~CF_NEW;
1366 prev->flags |= CF_RUNNING; 1616 prev->flags |= CF_RUNNING;
1367 } 1617 }
1368 1618
1369 prev->flags &= ~CF_RUNNING; 1619 prev->flags &= ~CF_RUNNING;
1370 next->flags |= CF_RUNNING; 1620 next->flags |= CF_RUNNING;
1371 1621
1372 /* first get rid of the old state */ 1622 /* first get rid of the old state */
1373 save_perl (aTHX_ prev); 1623 save_perl (aTHX_ prev);
1374 1624
1375 if (expect_false (next->flags & CF_NEW)) 1625 if (ecb_expect_false (next->flags & CF_NEW))
1376 { 1626 {
1377 /* need to start coroutine */ 1627 /* need to start coroutine */
1378 next->flags &= ~CF_NEW; 1628 next->flags &= ~CF_NEW;
1379 /* setup coroutine call */ 1629 /* setup coroutine call */
1380 coro_setup (aTHX_ next); 1630 init_perl (aTHX_ next);
1381 } 1631 }
1382 else 1632 else
1383 load_perl (aTHX_ next); 1633 load_perl (aTHX_ next);
1384 1634
1385 prev__cctx = prev->cctx;
1386
1387 /* possibly untie and reuse the cctx */ 1635 /* possibly untie and reuse the cctx */
1388 if (expect_true ( 1636 if (ecb_expect_true (
1389 prev__cctx->idle_sp == STACKLEVEL 1637 cctx_current->idle_sp == STACKLEVEL
1390 && !(prev__cctx->flags & CC_TRACE) 1638 && !(cctx_current->flags & CC_TRACE)
1391 && !force_cctx 1639 && !force_cctx
1392 )) 1640 ))
1393 { 1641 {
1394 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1642 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1395 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1643 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1396 1644
1397 prev->cctx = 0;
1398
1399 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1645 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1400 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1646 /* without this the next cctx_get might destroy the running cctx while still in use */
1401 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1647 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1402 if (!next->cctx) 1648 if (ecb_expect_true (!next->cctx))
1403 next->cctx = cctx_get (aTHX); 1649 next->cctx = cctx_get (aTHX);
1404 1650
1405 cctx_put (prev__cctx); 1651 cctx_put (cctx_current);
1406 } 1652 }
1653 else
1654 prev->cctx = cctx_current;
1407 1655
1408 ++next->usecount; 1656 ++next->usecount;
1409 1657
1410 if (expect_true (!next->cctx)) 1658 cctx_prev = cctx_current;
1411 next->cctx = cctx_get (aTHX); 1659 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1412 1660
1413 if (expect_false (prev__cctx != next->cctx)) 1661 next->cctx = 0;
1662
1663 if (ecb_expect_false (cctx_prev != cctx_current))
1414 { 1664 {
1415 prev__cctx->top_env = PL_top_env; 1665 cctx_prev->top_env = PL_top_env;
1416 PL_top_env = next->cctx->top_env; 1666 PL_top_env = cctx_current->top_env;
1417 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1667 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1418 } 1668 }
1419 1669
1420 transfer_tail (aTHX); 1670 transfer_tail (aTHX);
1421 } 1671 }
1422} 1672}
… …
1424#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1674#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1425#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1675#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1426 1676
1427/** high level stuff ********************************************************/ 1677/** high level stuff ********************************************************/
1428 1678
1679/* this function is actually Coro, not Coro::State, but we call it from here */
1680/* because it is convenient - but it hasn't been declared yet for that reason */
1429static int 1681static void
1682coro_call_on_destroy (pTHX_ struct coro *coro);
1683
1684static void
1430coro_state_destroy (pTHX_ struct coro *coro) 1685coro_state_destroy (pTHX_ struct coro *coro)
1431{ 1686{
1432 if (coro->flags & CF_DESTROYED) 1687 if (coro->flags & CF_ZOMBIE)
1433 return 0; 1688 return;
1434 1689
1435 if (coro->on_destroy)
1436 coro->on_destroy (aTHX_ coro); 1690 slf_destroy (aTHX_ coro);
1437 1691
1438 coro->flags |= CF_DESTROYED; 1692 coro->flags |= CF_ZOMBIE;
1439 1693
1440 if (coro->flags & CF_READY) 1694 if (coro->flags & CF_READY)
1441 { 1695 {
1442 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1696 /* reduce nready, as destroying a ready coro effectively unreadies it */
1443 /* alternative: look through all ready queues and remove the coro */ 1697 /* alternative: look through all ready queues and remove the coro */
1444 --coro_nready; 1698 --coro_nready;
1445 } 1699 }
1446 else 1700 else
1447 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1701 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1448 1702
1449 if (coro->mainstack && coro->mainstack != main_mainstack) 1703 if (coro->next) coro->next->prev = coro->prev;
1450 { 1704 if (coro->prev) coro->prev->next = coro->next;
1451 struct coro temp; 1705 if (coro == coro_first) coro_first = coro->next;
1452 1706
1453 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1707 if (coro->mainstack
1454 1708 && coro->mainstack != main_mainstack
1455 save_perl (aTHX_ &temp); 1709 && coro->slot
1710 && !PL_dirty)
1456 load_perl (aTHX_ coro); 1711 destroy_perl (aTHX_ coro);
1457
1458 coro_destruct (aTHX_ coro);
1459
1460 load_perl (aTHX_ &temp);
1461
1462 coro->slot = 0;
1463 }
1464 1712
1465 cctx_destroy (coro->cctx); 1713 cctx_destroy (coro->cctx);
1466 SvREFCNT_dec (coro->startcv); 1714 SvREFCNT_dec (coro->startcv);
1467 SvREFCNT_dec (coro->args); 1715 SvREFCNT_dec (coro->args);
1716 SvREFCNT_dec (coro->swap_sv);
1468 SvREFCNT_dec (CORO_THROW); 1717 SvREFCNT_dec (CORO_THROW);
1469 1718
1470 if (coro->next) coro->next->prev = coro->prev; 1719 coro_call_on_destroy (aTHX_ coro);
1471 if (coro->prev) coro->prev->next = coro->next;
1472 if (coro == coro_first) coro_first = coro->next;
1473 1720
1474 return 1; 1721 /* more destruction mayhem in coro_state_free */
1475} 1722}
1476 1723
1477static int 1724static int
1478coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1725coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1479{ 1726{
1480 struct coro *coro = (struct coro *)mg->mg_ptr; 1727 struct coro *coro = (struct coro *)mg->mg_ptr;
1481 mg->mg_ptr = 0; 1728 mg->mg_ptr = 0;
1482 1729
1483 coro->hv = 0;
1484
1485 if (--coro->refcnt < 0)
1486 {
1487 coro_state_destroy (aTHX_ coro); 1730 coro_state_destroy (aTHX_ coro);
1731 SvREFCNT_dec (coro->on_destroy);
1732 SvREFCNT_dec (coro->status);
1733
1488 Safefree (coro); 1734 Safefree (coro);
1489 }
1490 1735
1491 return 0; 1736 return 0;
1492} 1737}
1493 1738
1494static int 1739static int ecb_cold
1495coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1740coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1496{ 1741{
1497 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 /* called when perl clones the current process the slow way (windows process emulation) */
1498 1743 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1499 ++coro->refcnt; 1744 mg->mg_ptr = 0;
1745 mg->mg_virtual = 0;
1500 1746
1501 return 0; 1747 return 0;
1502} 1748}
1503 1749
1504static MGVTBL coro_state_vtbl = { 1750static MGVTBL coro_state_vtbl = {
… …
1527 1773
1528 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1774 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1529 TRANSFER (ta, 1); 1775 TRANSFER (ta, 1);
1530} 1776}
1531 1777
1532/*****************************************************************************/
1533/* gensub: simple closure generation utility */
1534
1535#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1536
1537/* create a closure from XS, returns a code reference */
1538/* the arg can be accessed via GENSUB_ARG from the callback */
1539/* the callback must use dXSARGS/XSRETURN */
1540static SV *
1541gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1542{
1543 CV *cv = (CV *)newSV (0);
1544
1545 sv_upgrade ((SV *)cv, SVt_PVCV);
1546
1547 CvANON_on (cv);
1548 CvISXSUB_on (cv);
1549 CvXSUB (cv) = xsub;
1550 GENSUB_ARG = arg;
1551
1552 return newRV_noinc ((SV *)cv);
1553}
1554
1555/** Coro ********************************************************************/ 1778/** Coro ********************************************************************/
1556 1779
1557INLINE void 1780ECB_INLINE void
1558coro_enq (pTHX_ struct coro *coro) 1781coro_enq (pTHX_ struct coro *coro)
1559{ 1782{
1560 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1561}
1562 1784
1563INLINE SV * 1785 SvREFCNT_inc_NN (coro->hv);
1786
1787 coro->next_ready = 0;
1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1789 ready [1] = coro;
1790}
1791
1792ECB_INLINE struct coro *
1564coro_deq (pTHX) 1793coro_deq (pTHX)
1565{ 1794{
1566 int prio; 1795 int prio;
1567 1796
1568 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1569 if (AvFILLp (coro_ready [prio]) >= 0) 1798 {
1570 return av_shift (coro_ready [prio]); 1799 struct coro **ready = coro_ready [prio];
1800
1801 if (ready [0])
1802 {
1803 struct coro *coro = ready [0];
1804 ready [0] = coro->next_ready;
1805 return coro;
1806 }
1807 }
1571 1808
1572 return 0; 1809 return 0;
1810}
1811
1812static void
1813invoke_sv_ready_hook_helper (void)
1814{
1815 dTHX;
1816 dSP;
1817
1818 ENTER;
1819 SAVETMPS;
1820
1821 PUSHMARK (SP);
1822 PUTBACK;
1823 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1824
1825 FREETMPS;
1826 LEAVE;
1573} 1827}
1574 1828
1575static int 1829static int
1576api_ready (pTHX_ SV *coro_sv) 1830api_ready (pTHX_ SV *coro_sv)
1577{ 1831{
1578 struct coro *coro;
1579 SV *sv_hook;
1580 void (*xs_hook)(void);
1581
1582 if (SvROK (coro_sv))
1583 coro_sv = SvRV (coro_sv);
1584
1585 coro = SvSTATE (coro_sv); 1832 struct coro *coro = SvSTATE (coro_sv);
1586 1833
1587 if (coro->flags & CF_READY) 1834 if (coro->flags & CF_READY)
1588 return 0; 1835 return 0;
1589 1836
1590 coro->flags |= CF_READY; 1837 coro->flags |= CF_READY;
1591 1838
1592 sv_hook = coro_nready ? 0 : coro_readyhook;
1593 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1594
1595 coro_enq (aTHX_ coro); 1839 coro_enq (aTHX_ coro);
1596 ++coro_nready;
1597 1840
1598 if (sv_hook) 1841 if (!coro_nready++)
1599 { 1842 if (coroapi.readyhook)
1600 dSP; 1843 coroapi.readyhook ();
1601
1602 ENTER;
1603 SAVETMPS;
1604
1605 PUSHMARK (SP);
1606 PUTBACK;
1607 call_sv (sv_hook, G_VOID | G_DISCARD);
1608
1609 FREETMPS;
1610 LEAVE;
1611 }
1612
1613 if (xs_hook)
1614 xs_hook ();
1615 1844
1616 return 1; 1845 return 1;
1617} 1846}
1618 1847
1619static int 1848static int
… …
1621{ 1850{
1622 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1851 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1623} 1852}
1624 1853
1625/* expects to own a reference to next->hv */ 1854/* expects to own a reference to next->hv */
1626INLINE void 1855ECB_INLINE void
1627prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1628{ 1857{
1629 SV *prev_sv = SvRV (coro_current); 1858 SV *prev_sv = SvRV (coro_current);
1630 1859
1631 ta->prev = SvSTATE_hv (prev_sv); 1860 ta->prev = SvSTATE_hv (prev_sv);
… …
1642static void 1871static void
1643prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1872prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1644{ 1873{
1645 for (;;) 1874 for (;;)
1646 { 1875 {
1647 SV *next_sv = coro_deq (aTHX); 1876 struct coro *next = coro_deq (aTHX);
1648 1877
1649 if (expect_true (next_sv)) 1878 if (ecb_expect_true (next))
1650 { 1879 {
1651 struct coro *next = SvSTATE_hv (next_sv);
1652
1653 /* cannot transfer to destroyed coros, skip and look for next */ 1880 /* cannot transfer to destroyed coros, skip and look for next */
1654 if (expect_false (next->flags & CF_DESTROYED)) 1881 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1655 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1882 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1656 else 1883 else
1657 { 1884 {
1658 next->flags &= ~CF_READY; 1885 next->flags &= ~CF_READY;
1659 --coro_nready; 1886 --coro_nready;
1660 1887
… …
1663 } 1890 }
1664 } 1891 }
1665 else 1892 else
1666 { 1893 {
1667 /* nothing to schedule: call the idle handler */ 1894 /* nothing to schedule: call the idle handler */
1895 if (SvROK (sv_idle)
1896 && SvOBJECT (SvRV (sv_idle)))
1897 {
1898 if (SvRV (sv_idle) == SvRV (coro_current))
1899 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1900
1901 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1902 api_ready (aTHX_ SvRV (sv_idle));
1903 --coro_nready;
1904 }
1905 else
1906 {
1907 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1668 dSP; 1908 dSP;
1669 1909
1670 ENTER; 1910 ENTER;
1671 SAVETMPS; 1911 SAVETMPS;
1672 1912
1673 PUSHMARK (SP); 1913 PUSHMARK (SP);
1674 PUTBACK; 1914 PUTBACK;
1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1915 call_sv (sv_idle, G_VOID | G_DISCARD);
1676 1916
1677 FREETMPS; 1917 FREETMPS;
1678 LEAVE; 1918 LEAVE;
1919 }
1679 } 1920 }
1680 } 1921 }
1681} 1922}
1682 1923
1683INLINE void 1924ECB_INLINE void
1684prepare_cede (pTHX_ struct coro_transfer_args *ta) 1925prepare_cede (pTHX_ struct coro_transfer_args *ta)
1685{ 1926{
1686 api_ready (aTHX_ coro_current); 1927 api_ready (aTHX_ coro_current);
1687 prepare_schedule (aTHX_ ta); 1928 prepare_schedule (aTHX_ ta);
1688} 1929}
1689 1930
1690INLINE void 1931ECB_INLINE void
1691prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1692{ 1933{
1693 SV *prev = SvRV (coro_current); 1934 SV *prev = SvRV (coro_current);
1694 1935
1695 if (coro_nready) 1936 if (coro_nready)
… …
1725{ 1966{
1726 struct coro_transfer_args ta; 1967 struct coro_transfer_args ta;
1727 1968
1728 prepare_cede (aTHX_ &ta); 1969 prepare_cede (aTHX_ &ta);
1729 1970
1730 if (expect_true (ta.prev != ta.next)) 1971 if (ecb_expect_true (ta.prev != ta.next))
1731 { 1972 {
1732 TRANSFER (ta, 1); 1973 TRANSFER (ta, 1);
1733 return 1; 1974 return 1;
1734 } 1975 }
1735 else 1976 else
… …
1754static void 1995static void
1755api_trace (pTHX_ SV *coro_sv, int flags) 1996api_trace (pTHX_ SV *coro_sv, int flags)
1756{ 1997{
1757 struct coro *coro = SvSTATE (coro_sv); 1998 struct coro *coro = SvSTATE (coro_sv);
1758 1999
2000 if (coro->flags & CF_RUNNING)
2001 croak ("cannot enable tracing on a running coroutine, caught");
2002
1759 if (flags & CC_TRACE) 2003 if (flags & CC_TRACE)
1760 { 2004 {
1761 if (!coro->cctx) 2005 if (!coro->cctx)
1762 coro->cctx = cctx_new_run (); 2006 coro->cctx = cctx_new_run ();
1763 else if (!(coro->cctx->flags & CC_TRACE)) 2007 else if (!(coro->cctx->flags & CC_TRACE))
1764 croak ("cannot enable tracing on coroutine with custom stack,"); 2008 croak ("cannot enable tracing on coroutine with custom stack, caught");
1765 2009
1766 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2010 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1767 } 2011 }
1768 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2012 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1769 { 2013 {
… …
1775 coro->slot->runops = RUNOPS_DEFAULT; 2019 coro->slot->runops = RUNOPS_DEFAULT;
1776 } 2020 }
1777} 2021}
1778 2022
1779static void 2023static void
2024coro_push_av (pTHX_ AV *av, I32 gimme_v)
2025{
2026 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2027 {
2028 dSP;
2029
2030 if (gimme_v == G_SCALAR)
2031 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2032 else
2033 {
2034 int i;
2035 EXTEND (SP, AvFILLp (av) + 1);
2036
2037 for (i = 0; i <= AvFILLp (av); ++i)
2038 PUSHs (AvARRAY (av)[i]);
2039 }
2040
2041 PUTBACK;
2042 }
2043}
2044
2045static void
2046coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2047{
2048 if (!coro->on_destroy)
2049 coro->on_destroy = newAV ();
2050
2051 av_push (coro->on_destroy, cb);
2052}
2053
2054static void
2055slf_destroy_join (pTHX_ struct CoroSLF *frame)
2056{
2057 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2058}
2059
2060static int
2061slf_check_join (pTHX_ struct CoroSLF *frame)
2062{
2063 struct coro *coro = (struct coro *)frame->data;
2064
2065 if (!coro->status)
2066 return 1;
2067
2068 frame->destroy = 0;
2069
2070 coro_push_av (aTHX_ coro->status, GIMME_V);
2071
2072 SvREFCNT_dec ((SV *)coro->hv);
2073
2074 return 0;
2075}
2076
2077static void
2078slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2079{
2080 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2081
2082 if (items > 1)
2083 croak ("join called with too many arguments");
2084
2085 if (coro->status)
2086 frame->prepare = prepare_nop;
2087 else
2088 {
2089 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2090 frame->prepare = prepare_schedule;
2091 }
2092
2093 frame->check = slf_check_join;
2094 frame->destroy = slf_destroy_join;
2095 frame->data = (void *)coro;
2096 SvREFCNT_inc (coro->hv);
2097}
2098
2099static void
1780coro_call_on_destroy (pTHX_ struct coro *coro) 2100coro_call_on_destroy (pTHX_ struct coro *coro)
1781{ 2101{
1782 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2102 AV *od = coro->on_destroy;
1783 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1784 2103
1785 if (on_destroyp) 2104 if (!od)
1786 { 2105 return;
1787 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1788 2106
1789 while (AvFILLp (on_destroy) >= 0) 2107 while (AvFILLp (od) >= 0)
2108 {
2109 SV *cb = sv_2mortal (av_pop (od));
2110
2111 /* coro hv's (and only hv's at the moment) are supported as well */
2112 if (SvSTATEhv_p (aTHX_ cb))
2113 api_ready (aTHX_ cb);
2114 else
1790 { 2115 {
1791 dSP; /* don't disturb outer sp */ 2116 dSP; /* don't disturb outer sp */
1792 SV *cb = av_pop (on_destroy);
1793
1794 PUSHMARK (SP); 2117 PUSHMARK (SP);
1795 2118
1796 if (statusp) 2119 if (coro->status)
1797 { 2120 {
1798 int i; 2121 PUTBACK;
1799 AV *status = (AV *)SvRV (*statusp); 2122 coro_push_av (aTHX_ coro->status, G_ARRAY);
1800 EXTEND (SP, AvFILLp (status) + 1); 2123 SPAGAIN;
1801
1802 for (i = 0; i <= AvFILLp (status); ++i)
1803 PUSHs (AvARRAY (status)[i]);
1804 } 2124 }
1805 2125
1806 PUTBACK; 2126 PUTBACK;
1807 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2127 call_sv (cb, G_VOID | G_DISCARD);
1808 } 2128 }
1809 } 2129 }
1810} 2130}
1811 2131
1812static void 2132static void
1813slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1814{ 2134{
2135 AV *av;
2136
2137 if (coro->status)
2138 {
2139 av = coro->status;
2140 av_clear (av);
2141 }
2142 else
2143 av = coro->status = newAV ();
2144
2145 /* items are actually not so common, so optimise for this case */
2146 if (items)
2147 {
1815 int i; 2148 int i;
1816 HV *hv = (HV *)SvRV (coro_current);
1817 AV *av = newAV ();
1818 2149
1819 av_extend (av, items - 1); 2150 av_extend (av, items - 1);
2151
1820 for (i = 0; i < items; ++i) 2152 for (i = 0; i < items; ++i)
1821 av_push (av, SvREFCNT_inc_NN (arg [i])); 2153 av_push (av, SvREFCNT_inc_NN (arg [i]));
2154 }
2155}
1822 2156
1823 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2157static void
1824 2158slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2159{
1825 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2160 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1826 api_ready (aTHX_ sv_manager); 2161 api_ready (aTHX_ sv_manager);
1827 2162
1828 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
1829 frame->check = slf_check_repeat; 2164 frame->check = slf_check_repeat;
2165
2166 /* as a minor optimisation, we could unwind all stacks here */
2167 /* but that puts extra pressure on pp_slf, and is not worth much */
2168 /*coro_unwind_stacks (aTHX);*/
2169}
2170
2171static void
2172slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2173{
2174 HV *coro_hv = (HV *)SvRV (coro_current);
2175
2176 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2177 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2178}
2179
2180static void
2181slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{
2183 HV *coro_hv;
2184 struct coro *coro;
2185
2186 if (items <= 0)
2187 croak ("Coro::cancel called without coro object,");
2188
2189 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv;
2191
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 {
2196 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro;
2198
2199 frame->prepare = prepare_nop;
2200 frame->check = slf_check_nop;
2201 }
2202 else if (coro_hv == (HV *)SvRV (coro_current))
2203 {
2204 /* cancelling the current coro is allowed, and equals terminate */
2205 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2206 }
2207 else
2208 {
2209 struct coro *self = SvSTATE_current;
2210
2211 /* otherwise we cancel directly, purely for speed reasons
2212 * unfortunately, this requires some magic trickery, as
2213 * somebody else could cancel us, so we have to fight the cancellation.
2214 * this is ugly, and hopefully fully worth the extra speed.
2215 * besides, I can't get the slow-but-safe version working...
2216 */
2217 slf_frame.data = 0;
2218 self->flags |= CF_NOCANCEL;
2219 coro_state_destroy (aTHX_ coro);
2220 self->flags &= ~CF_NOCANCEL;
2221
2222 if (slf_frame.data)
2223 {
2224 /* while we were busy we have been cancelled, so terminate */
2225 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2226 }
2227 else
2228 {
2229 frame->prepare = prepare_nop;
2230 frame->check = slf_check_nop;
2231 }
2232 }
2233}
2234
2235static int
2236slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2237{
2238 frame->prepare = 0;
2239 coro_unwind_stacks (aTHX);
2240
2241 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2242
2243 return 1;
2244}
2245
2246static int
2247safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2248{
2249 if (coro->cctx)
2250 croak ("coro inside C callback, unable to cancel at this time, caught");
2251
2252 if (coro->flags & CF_NEW)
2253 {
2254 coro_set_status (aTHX_ coro, arg, items);
2255 coro_state_destroy (aTHX_ coro);
2256 }
2257 else
2258 {
2259 if (!coro->slf_frame.prepare)
2260 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2261
2262 slf_destroy (aTHX_ coro);
2263
2264 coro_set_status (aTHX_ coro, arg, items);
2265 coro->slf_frame.prepare = prepare_nop;
2266 coro->slf_frame.check = slf_check_safe_cancel;
2267
2268 api_ready (aTHX_ (SV *)coro->hv);
2269 }
2270
2271 return 1;
1830} 2272}
1831 2273
1832/*****************************************************************************/ 2274/*****************************************************************************/
1833/* async pool handler */ 2275/* async pool handler */
1834 2276
… …
1865slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2307slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1866{ 2308{
1867 HV *hv = (HV *)SvRV (coro_current); 2309 HV *hv = (HV *)SvRV (coro_current);
1868 struct coro *coro = SvSTATE_hv ((SV *)hv); 2310 struct coro *coro = SvSTATE_hv ((SV *)hv);
1869 2311
1870 if (expect_true (coro->saved_deffh)) 2312 if (ecb_expect_true (coro->saved_deffh))
1871 { 2313 {
1872 /* subsequent iteration */ 2314 /* subsequent iteration */
1873 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2315 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1874 coro->saved_deffh = 0; 2316 coro->saved_deffh = 0;
1875 2317
1876 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2318 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1877 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2319 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1878 { 2320 {
1879 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2321 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1880 coro->invoke_av = newAV (); 2322 return;
1881
1882 frame->prepare = prepare_nop;
1883 } 2323 }
1884 else 2324 else
1885 { 2325 {
1886 av_clear (GvAV (PL_defgv)); 2326 av_clear (GvAV (PL_defgv));
1887 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2327 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1912 2352
1913static void 2353static void
1914coro_rouse_callback (pTHX_ CV *cv) 2354coro_rouse_callback (pTHX_ CV *cv)
1915{ 2355{
1916 dXSARGS; 2356 dXSARGS;
1917 SV *data = (SV *)GENSUB_ARG; 2357 SV *data = (SV *)S_GENSUB_ARG;
1918 2358
1919 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2359 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1920 { 2360 {
1921 /* first call, set args */ 2361 /* first call, set args */
2362 SV *coro = SvRV (data);
1922 AV *av = newAV (); 2363 AV *av = newAV ();
1923 SV *coro = SvRV (data);
1924 2364
1925 SvRV_set (data, (SV *)av); 2365 SvRV_set (data, (SV *)av);
1926 api_ready (aTHX_ coro);
1927 SvREFCNT_dec (coro);
1928 2366
1929 /* better take a full copy of the arguments */ 2367 /* better take a full copy of the arguments */
1930 while (items--) 2368 while (items--)
1931 av_store (av, items, newSVsv (ST (items))); 2369 av_store (av, items, newSVsv (ST (items)));
2370
2371 api_ready (aTHX_ coro);
2372 SvREFCNT_dec (coro);
1932 } 2373 }
1933 2374
1934 XSRETURN_EMPTY; 2375 XSRETURN_EMPTY;
1935} 2376}
1936 2377
… …
1953 2394
1954 EXTEND (SP, AvFILLp (av) + 1); 2395 EXTEND (SP, AvFILLp (av) + 1);
1955 for (i = 0; i <= AvFILLp (av); ++i) 2396 for (i = 0; i <= AvFILLp (av); ++i)
1956 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2397 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1957 2398
1958 /* we have stolen the elements, so ste length to zero and free */ 2399 /* we have stolen the elements, so set length to zero and free */
1959 AvFILLp (av) = -1; 2400 AvFILLp (av) = -1;
1960 av_undef (av); 2401 av_undef (av);
1961 2402
1962 PUTBACK; 2403 PUTBACK;
1963 } 2404 }
… …
1987 || SvTYPE (SvRV (cb)) != SVt_PVCV 2428 || SvTYPE (SvRV (cb)) != SVt_PVCV
1988 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1989 croak ("Coro::rouse_wait called with illegal callback argument,"); 2430 croak ("Coro::rouse_wait called with illegal callback argument,");
1990 2431
1991 { 2432 {
1992 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1993 SV *data = (SV *)GENSUB_ARG; 2434 SV *data = (SV *)S_GENSUB_ARG;
1994 2435
1995 frame->data = (void *)data; 2436 frame->data = (void *)data;
1996 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2437 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1997 frame->check = slf_check_rouse_wait; 2438 frame->check = slf_check_rouse_wait;
1998 } 2439 }
… …
2002coro_new_rouse_cb (pTHX) 2443coro_new_rouse_cb (pTHX)
2003{ 2444{
2004 HV *hv = (HV *)SvRV (coro_current); 2445 HV *hv = (HV *)SvRV (coro_current);
2005 struct coro *coro = SvSTATE_hv (hv); 2446 struct coro *coro = SvSTATE_hv (hv);
2006 SV *data = newRV_inc ((SV *)hv); 2447 SV *data = newRV_inc ((SV *)hv);
2007 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2448 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2008 2449
2009 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2450 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2010 SvREFCNT_dec (data); /* magicext increases the refcount */ 2451 SvREFCNT_dec (data); /* magicext increases the refcount */
2011 2452
2012 SvREFCNT_dec (coro->rouse_cb); 2453 SvREFCNT_dec (coro->rouse_cb);
… …
2109static void 2550static void
2110slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2551slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2111{ 2552{
2112 frame->prepare = prepare_cede_notself; 2553 frame->prepare = prepare_cede_notself;
2113 frame->check = slf_check_nop; 2554 frame->check = slf_check_nop;
2555}
2556
2557/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2558static void
2559slf_destroy (pTHX_ struct coro *coro)
2560{
2561 /* this callback is reserved for slf functions needing to do cleanup */
2562 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2563 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2564
2565 /*
2566 * The on_destroy above most likely is from an SLF call.
2567 * Since by definition the SLF call will not finish when we destroy
2568 * the coro, we will have to force-finish it here, otherwise
2569 * cleanup functions cannot call SLF functions.
2570 */
2571 coro->slf_frame.prepare = 0;
2114} 2572}
2115 2573
2116/* 2574/*
2117 * these not obviously related functions are all rolled into one 2575 * these not obviously related functions are all rolled into one
2118 * function to increase chances that they all will call transfer with the same 2576 * function to increase chances that they all will call transfer with the same
… …
2125 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2583 I32 checkmark; /* mark SP to see how many elements check has pushed */
2126 2584
2127 /* set up the slf frame, unless it has already been set-up */ 2585 /* set up the slf frame, unless it has already been set-up */
2128 /* the latter happens when a new coro has been started */ 2586 /* the latter happens when a new coro has been started */
2129 /* or when a new cctx was attached to an existing coroutine */ 2587 /* or when a new cctx was attached to an existing coroutine */
2130 if (expect_true (!slf_frame.prepare)) 2588 if (ecb_expect_true (!slf_frame.prepare))
2131 { 2589 {
2132 /* first iteration */ 2590 /* first iteration */
2133 dSP; 2591 dSP;
2134 SV **arg = PL_stack_base + TOPMARK + 1; 2592 SV **arg = PL_stack_base + TOPMARK + 1;
2135 int items = SP - arg; /* args without function object */ 2593 int items = SP - arg; /* args without function object */
… …
2176 while (slf_frame.check (aTHX_ &slf_frame)); 2634 while (slf_frame.check (aTHX_ &slf_frame));
2177 2635
2178 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2636 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2179 2637
2180 /* exception handling */ 2638 /* exception handling */
2181 if (expect_false (CORO_THROW)) 2639 if (ecb_expect_false (CORO_THROW))
2182 { 2640 {
2183 SV *exception = sv_2mortal (CORO_THROW); 2641 SV *exception = sv_2mortal (CORO_THROW);
2184 2642
2185 CORO_THROW = 0; 2643 CORO_THROW = 0;
2186 sv_setsv (ERRSV, exception); 2644 sv_setsv (ERRSV, exception);
2187 croak (0); 2645 croak (0);
2188 } 2646 }
2189 2647
2190 /* return value handling - mostly like entersub */ 2648 /* return value handling - mostly like entersub */
2191 /* make sure we put something on the stack in scalar context */ 2649 /* make sure we put something on the stack in scalar context */
2192 if (GIMME_V == G_SCALAR) 2650 if (GIMME_V == G_SCALAR
2651 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2193 { 2652 {
2194 dSP; 2653 dSP;
2195 SV **bot = PL_stack_base + checkmark; 2654 SV **bot = PL_stack_base + checkmark;
2196 2655
2197 if (sp == bot) /* too few, push undef */ 2656 if (sp == bot) /* too few, push undef */
2198 bot [1] = &PL_sv_undef; 2657 bot [1] = &PL_sv_undef;
2199 else if (sp != bot + 1) /* too many, take last one */ 2658 else /* too many, take last one */
2200 bot [1] = *sp; 2659 bot [1] = *sp;
2201 2660
2202 SP = bot + 1; 2661 SP = bot + 1;
2203 2662
2204 PUTBACK; 2663 PUTBACK;
… …
2237 if (PL_op->op_flags & OPf_STACKED) 2696 if (PL_op->op_flags & OPf_STACKED)
2238 { 2697 {
2239 if (items > slf_arga) 2698 if (items > slf_arga)
2240 { 2699 {
2241 slf_arga = items; 2700 slf_arga = items;
2242 free (slf_argv); 2701 Safefree (slf_argv);
2243 slf_argv = malloc (slf_arga * sizeof (SV *)); 2702 New (0, slf_argv, slf_arga, SV *);
2244 } 2703 }
2245 2704
2246 slf_argc = items; 2705 slf_argc = items;
2247 2706
2248 for (i = 0; i < items; ++i) 2707 for (i = 0; i < items; ++i)
… …
2253 2712
2254 PL_op->op_ppaddr = pp_slf; 2713 PL_op->op_ppaddr = pp_slf;
2255 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2714 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2256 2715
2257 PL_op = (OP *)&slf_restore; 2716 PL_op = (OP *)&slf_restore;
2717}
2718
2719/*****************************************************************************/
2720/* dynamic wind */
2721
2722static void
2723on_enterleave_call (pTHX_ SV *cb)
2724{
2725 dSP;
2726
2727 PUSHSTACK;
2728
2729 PUSHMARK (SP);
2730 PUTBACK;
2731 call_sv (cb, G_VOID | G_DISCARD);
2732 SPAGAIN;
2733
2734 POPSTACK;
2735}
2736
2737static SV *
2738coro_avp_pop_and_free (pTHX_ AV **avp)
2739{
2740 AV *av = *avp;
2741 SV *res = av_pop (av);
2742
2743 if (AvFILLp (av) < 0)
2744 {
2745 *avp = 0;
2746 SvREFCNT_dec (av);
2747 }
2748
2749 return res;
2750}
2751
2752static void
2753coro_pop_on_enter (pTHX_ void *coro)
2754{
2755 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2756 SvREFCNT_dec (cb);
2757}
2758
2759static void
2760coro_pop_on_leave (pTHX_ void *coro)
2761{
2762 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2763 on_enterleave_call (aTHX_ sv_2mortal (cb));
2258} 2764}
2259 2765
2260/*****************************************************************************/ 2766/*****************************************************************************/
2261/* PerlIO::cede */ 2767/* PerlIO::cede */
2262 2768
… …
2264{ 2770{
2265 PerlIOBuf base; 2771 PerlIOBuf base;
2266 NV next, every; 2772 NV next, every;
2267} PerlIOCede; 2773} PerlIOCede;
2268 2774
2269static IV 2775static IV ecb_cold
2270PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2776PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2271{ 2777{
2272 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2778 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2273 2779
2274 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2780 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2275 self->next = nvtime () + self->every; 2781 self->next = nvtime () + self->every;
2276 2782
2277 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2783 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2278} 2784}
2279 2785
2280static SV * 2786static SV * ecb_cold
2281PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2787PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2282{ 2788{
2283 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2284 2790
2285 return newSVnv (self->every); 2791 return newSVnv (self->every);
… …
2336/* Coro::Semaphore & Coro::Signal */ 2842/* Coro::Semaphore & Coro::Signal */
2337 2843
2338static SV * 2844static SV *
2339coro_waitarray_new (pTHX_ int count) 2845coro_waitarray_new (pTHX_ int count)
2340{ 2846{
2341 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2847 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2342 AV *av = newAV (); 2848 AV *av = newAV ();
2343 SV **ary; 2849 SV **ary;
2344 2850
2345 /* unfortunately, building manually saves memory */ 2851 /* unfortunately, building manually saves memory */
2346 Newx (ary, 2, SV *); 2852 Newx (ary, 2, SV *);
2347 AvALLOC (av) = ary; 2853 AvALLOC (av) = ary;
2854#if PERL_VERSION_ATLEAST (5,10,0)
2348 /*AvARRAY (av) = ary;*/ 2855 AvARRAY (av) = ary;
2856#else
2349 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2857 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2858 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2859 SvPVX ((SV *)av) = (char *)ary;
2860#endif
2350 AvMAX (av) = 1; 2861 AvMAX (av) = 1;
2351 AvFILLp (av) = 0; 2862 AvFILLp (av) = 0;
2352 ary [0] = newSViv (count); 2863 ary [0] = newSViv (count);
2353 2864
2354 return newRV_noinc ((SV *)av); 2865 return newRV_noinc ((SV *)av);
… …
2392 SvREFCNT_dec (cb); 2903 SvREFCNT_dec (cb);
2393 } 2904 }
2394} 2905}
2395 2906
2396static void 2907static void
2397coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2398{ 2909{
2399 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2910 /* call $sem->adjust (0) to possibly wake up some other waiters */
2400 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2911 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2401} 2912}
2402 2913
2403static int 2914static int
2404slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2915slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2405{ 2916{
2406 AV *av = (AV *)frame->data; 2917 AV *av = (AV *)frame->data;
2407 SV *count_sv = AvARRAY (av)[0]; 2918 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current);
2408 2920
2409 /* if we are about to throw, don't actually acquire the lock, just throw */ 2921 /* if we are about to throw, don't actually acquire the lock, just throw */
2410 if (CORO_THROW) 2922 if (CORO_THROW)
2411 return 0; 2923 return 0;
2412 else if (SvIVX (count_sv) > 0) 2924 else if (SvIVX (count_sv) > 0)
2413 { 2925 {
2414 SvSTATE_current->on_destroy = 0; 2926 frame->destroy = 0;
2415 2927
2416 if (acquire) 2928 if (acquire)
2417 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2929 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2418 else 2930 else
2419 coro_semaphore_adjust (aTHX_ av, 0); 2931 coro_semaphore_adjust (aTHX_ av, 0);
… …
2424 { 2936 {
2425 int i; 2937 int i;
2426 /* if we were woken up but can't down, we look through the whole */ 2938 /* if we were woken up but can't down, we look through the whole */
2427 /* waiters list and only add us if we aren't in there already */ 2939 /* waiters list and only add us if we aren't in there already */
2428 /* this avoids some degenerate memory usage cases */ 2940 /* this avoids some degenerate memory usage cases */
2429 2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2430 for (i = 1; i <= AvFILLp (av); ++i)
2431 if (AvARRAY (av)[i] == SvRV (coro_current)) 2942 if (AvARRAY (av)[i] == coro_hv)
2432 return 1; 2943 return 1;
2433 2944
2434 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2945 av_push (av, SvREFCNT_inc (coro_hv));
2435 return 1; 2946 return 1;
2436 } 2947 }
2437} 2948}
2438 2949
2439static int 2950static int
… …
2462 { 2973 {
2463 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2974 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2464 2975
2465 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2976 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2466 frame->prepare = prepare_schedule; 2977 frame->prepare = prepare_schedule;
2467
2468 /* to avoid race conditions when a woken-up coro gets terminated */ 2978 /* to avoid race conditions when a woken-up coro gets terminated */
2469 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2979 /* we arrange for a temporary on_destroy that calls adjust (0) */
2470 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2980 frame->destroy = coro_semaphore_destroy;
2471 } 2981 }
2472} 2982}
2473 2983
2474static void 2984static void
2475slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2985slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2483{ 2993{
2484 if (items >= 2) 2994 if (items >= 2)
2485 { 2995 {
2486 /* callback form */ 2996 /* callback form */
2487 AV *av = (AV *)SvRV (arg [0]); 2997 AV *av = (AV *)SvRV (arg [0]);
2488 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2998 SV *cb_cv = s_get_cv_croak (arg [1]);
2489 2999
2490 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3000 av_push (av, SvREFCNT_inc_NN (cb_cv));
2491 3001
2492 if (SvIVX (AvARRAY (av)[0]) > 0) 3002 if (SvIVX (AvARRAY (av)[0]) > 0)
2493 coro_semaphore_adjust (aTHX_ av, 0); 3003 coro_semaphore_adjust (aTHX_ av, 0);
2494 3004
2495 frame->prepare = prepare_nop; 3005 frame->prepare = prepare_nop;
… …
2519 AvARRAY (av)[0] = AvARRAY (av)[1]; 3029 AvARRAY (av)[0] = AvARRAY (av)[1];
2520 AvARRAY (av)[1] = cb; 3030 AvARRAY (av)[1] = cb;
2521 3031
2522 cb = av_shift (av); 3032 cb = av_shift (av);
2523 3033
3034 if (SvTYPE (cb) == SVt_PVCV)
3035 {
3036 dSP;
3037 PUSHMARK (SP);
3038 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3039 PUTBACK;
3040 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3041 }
3042 else
3043 {
2524 api_ready (aTHX_ cb); 3044 api_ready (aTHX_ cb);
2525 sv_setiv (cb, 0); /* signal waiter */ 3045 sv_setiv (cb, 0); /* signal waiter */
3046 }
3047
2526 SvREFCNT_dec (cb); 3048 SvREFCNT_dec (cb);
2527 3049
2528 --count; 3050 --count;
2529 } 3051 }
2530} 3052}
… …
2539static void 3061static void
2540slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3062slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2541{ 3063{
2542 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2543 3065
3066 if (items >= 2)
3067 {
3068 SV *cb_cv = s_get_cv_croak (arg [1]);
3069 av_push (av, SvREFCNT_inc_NN (cb_cv));
3070
2544 if (SvIVX (AvARRAY (av)[0])) 3071 if (SvIVX (AvARRAY (av)[0]))
3072 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3073
3074 frame->prepare = prepare_nop;
3075 frame->check = slf_check_nop;
3076 }
3077 else if (SvIVX (AvARRAY (av)[0]))
2545 { 3078 {
2546 SvIVX (AvARRAY (av)[0]) = 0; 3079 SvIVX (AvARRAY (av)[0]) = 0;
2547 frame->prepare = prepare_nop; 3080 frame->prepare = prepare_nop;
2548 frame->check = slf_check_nop; 3081 frame->check = slf_check_nop;
2549 } 3082 }
2550 else 3083 else
2551 { 3084 {
2552 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3085 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2553 3086
2554 av_push (av, waiter); 3087 av_push (av, waiter);
2555 3088
2556 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3089 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2557 frame->prepare = prepare_schedule; 3090 frame->prepare = prepare_schedule;
… …
2575 3108
2576static void 3109static void
2577coro_aio_callback (pTHX_ CV *cv) 3110coro_aio_callback (pTHX_ CV *cv)
2578{ 3111{
2579 dXSARGS; 3112 dXSARGS;
2580 AV *state = (AV *)GENSUB_ARG; 3113 AV *state = (AV *)S_GENSUB_ARG;
2581 SV *coro = av_pop (state); 3114 SV *coro = av_pop (state);
2582 SV *data_sv = newSV (sizeof (struct io_state)); 3115 SV *data_sv = newSV (sizeof (struct io_state));
2583 3116
2584 av_extend (state, items - 1); 3117 av_extend (state, items - 1);
2585 3118
… …
2670 dSP; 3203 dSP;
2671 3204
2672 static SV *prio_cv; 3205 static SV *prio_cv;
2673 static SV *prio_sv; 3206 static SV *prio_sv;
2674 3207
2675 if (expect_false (!prio_cv)) 3208 if (ecb_expect_false (!prio_cv))
2676 { 3209 {
2677 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3210 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2678 prio_sv = newSViv (0); 3211 prio_sv = newSViv (0);
2679 } 3212 }
2680 3213
… …
2699 3232
2700 for (i = 0; i < items; ++i) 3233 for (i = 0; i < items; ++i)
2701 PUSHs (arg [i]); 3234 PUSHs (arg [i]);
2702 3235
2703 /* now push the callback closure */ 3236 /* now push the callback closure */
2704 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3237 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2705 3238
2706 /* now call the AIO function - we assume our request is uncancelable */ 3239 /* now call the AIO function - we assume our request is uncancelable */
2707 PUTBACK; 3240 PUTBACK;
2708 call_sv ((SV *)req, G_VOID | G_DISCARD); 3241 call_sv ((SV *)req, G_VOID | G_DISCARD);
2709 } 3242 }
2710 3243
2711 /* now that the requets is going, we loop toll we have a result */ 3244 /* now that the request is going, we loop till we have a result */
2712 frame->data = (void *)state; 3245 frame->data = (void *)state;
2713 frame->prepare = prepare_schedule; 3246 frame->prepare = prepare_schedule;
2714 frame->check = slf_check_aio_req; 3247 frame->check = slf_check_aio_req;
2715} 3248}
2716 3249
… …
2723 3256
2724 XSRETURN_EMPTY; 3257 XSRETURN_EMPTY;
2725} 3258}
2726 3259
2727/*****************************************************************************/ 3260/*****************************************************************************/
3261
3262#if CORO_CLONE
3263# include "clone.c"
3264#endif
3265
3266/*****************************************************************************/
3267
3268static SV *
3269coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3270{
3271 SV *coro_sv;
3272 struct coro *coro;
3273 MAGIC *mg;
3274 HV *hv;
3275 SV *cb;
3276 int i;
3277
3278 if (argc > 0)
3279 {
3280 cb = s_get_cv_croak (argv [0]);
3281
3282 if (!is_coro)
3283 {
3284 if (CvISXSUB (cb))
3285 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3286
3287 if (!CvROOT (cb))
3288 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3289 }
3290 }
3291
3292 Newz (0, coro, 1, struct coro);
3293 coro->args = newAV ();
3294 coro->flags = CF_NEW;
3295
3296 if (coro_first) coro_first->prev = coro;
3297 coro->next = coro_first;
3298 coro_first = coro;
3299
3300 coro->hv = hv = newHV ();
3301 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3302 mg->mg_flags |= MGf_DUP;
3303 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3304
3305 if (argc > 0)
3306 {
3307 av_extend (coro->args, argc + is_coro - 1);
3308
3309 if (is_coro)
3310 {
3311 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3312 cb = (SV *)cv_coro_run;
3313 }
3314
3315 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3316
3317 for (i = 1; i < argc; i++)
3318 av_push (coro->args, newSVsv (argv [i]));
3319 }
3320
3321 return coro_sv;
3322}
3323
3324#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State);
3326#endif
2728 3327
2729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2730 3329
2731PROTOTYPES: DISABLE 3330PROTOTYPES: DISABLE
2732 3331
… …
2737 coro_thx = PERL_GET_CONTEXT; 3336 coro_thx = PERL_GET_CONTEXT;
2738# endif 3337# endif
2739#endif 3338#endif
2740 BOOT_PAGESIZE; 3339 BOOT_PAGESIZE;
2741 3340
3341 cctx_current = cctx_new_empty ();
3342
2742 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3343 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2743 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3344 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2744 3345
2745 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3346 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2746 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3347 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2783 coroapi.prepare_nop = prepare_nop; 3384 coroapi.prepare_nop = prepare_nop;
2784 coroapi.prepare_schedule = prepare_schedule; 3385 coroapi.prepare_schedule = prepare_schedule;
2785 coroapi.prepare_cede = prepare_cede; 3386 coroapi.prepare_cede = prepare_cede;
2786 coroapi.prepare_cede_notself = prepare_cede_notself; 3387 coroapi.prepare_cede_notself = prepare_cede_notself;
2787 3388
2788 { 3389 time_init (aTHX);
2789 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2790 3390
2791 if (!svp) croak ("Time::HiRes is required");
2792 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2793
2794 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2795 }
2796
2797 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2798} 3392}
2799 3393
2800SV * 3394SV *
2801new (char *klass, ...) 3395new (SV *klass, ...)
2802 ALIAS: 3396 ALIAS:
2803 Coro::new = 1 3397 Coro::new = 1
2804 CODE: 3398 CODE:
2805{ 3399 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2806 struct coro *coro; 3400 OUTPUT:
2807 MAGIC *mg;
2808 HV *hv;
2809 CV *cb;
2810 int i;
2811
2812 if (items > 1)
2813 {
2814 cb = coro_sv_2cv (aTHX_ ST (1));
2815
2816 if (!ix)
2817 {
2818 if (CvISXSUB (cb))
2819 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2820
2821 if (!CvROOT (cb))
2822 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2823 }
2824 }
2825
2826 Newz (0, coro, 1, struct coro);
2827 coro->args = newAV ();
2828 coro->flags = CF_NEW;
2829
2830 if (coro_first) coro_first->prev = coro;
2831 coro->next = coro_first;
2832 coro_first = coro;
2833
2834 coro->hv = hv = newHV ();
2835 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2836 mg->mg_flags |= MGf_DUP;
2837 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2838
2839 if (items > 1)
2840 {
2841 av_extend (coro->args, items - 1 + ix - 1);
2842
2843 if (ix)
2844 {
2845 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2846 cb = cv_coro_run;
2847 }
2848
2849 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2850
2851 for (i = 2; i < items; i++)
2852 av_push (coro->args, newSVsv (ST (i)));
2853 }
2854}
2855 OUTPUT:
2856 RETVAL 3401 RETVAL
2857 3402
2858void 3403void
2859transfer (...) 3404transfer (...)
2860 PROTOTYPE: $$ 3405 PROTOTYPE: $$
2861 CODE: 3406 CODE:
2862 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3407 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2863 3408
2864bool
2865_destroy (SV *coro_sv)
2866 CODE:
2867 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2868 OUTPUT:
2869 RETVAL
2870
2871void 3409void
2872_exit (int code) 3410_exit (int code)
2873 PROTOTYPE: $ 3411 PROTOTYPE: $
2874 CODE: 3412 CODE:
2875 _exit (code); 3413 _exit (code);
3414
3415SV *
3416clone (Coro::State coro)
3417 CODE:
3418{
3419#if CORO_CLONE
3420 struct coro *ncoro = coro_clone (aTHX_ coro);
3421 MAGIC *mg;
3422 /* TODO: too much duplication */
3423 ncoro->hv = newHV ();
3424 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3425 mg->mg_flags |= MGf_DUP;
3426 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3427#else
3428 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3429#endif
3430}
3431 OUTPUT:
3432 RETVAL
2876 3433
2877int 3434int
2878cctx_stacksize (int new_stacksize = 0) 3435cctx_stacksize (int new_stacksize = 0)
2879 PROTOTYPE: ;$ 3436 PROTOTYPE: ;$
2880 CODE: 3437 CODE:
… …
2930 eval = 1 3487 eval = 1
2931 CODE: 3488 CODE:
2932{ 3489{
2933 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3490 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2934 { 3491 {
2935 struct coro temp; 3492 struct coro *current = SvSTATE_current;
3493 struct CoroSLF slf_save;
2936 3494
2937 if (!(coro->flags & CF_RUNNING)) 3495 if (current != coro)
2938 { 3496 {
2939 PUTBACK; 3497 PUTBACK;
2940 save_perl (aTHX_ &temp); 3498 save_perl (aTHX_ current);
2941 load_perl (aTHX_ coro); 3499 load_perl (aTHX_ coro);
3500 /* the coro is most likely in an active SLF call.
3501 * while not strictly required (the code we execute is
3502 * not allowed to call any SLF functions), it's cleaner
3503 * to reinitialise the slf_frame and restore it later.
3504 * This might one day allow us to actually do SLF calls
3505 * from code executed here.
3506 */
3507 slf_save = slf_frame;
3508 slf_frame.prepare = 0;
3509 SPAGAIN;
2942 } 3510 }
2943 3511
2944 {
2945 dSP;
2946 ENTER;
2947 SAVETMPS;
2948 PUTBACK;
2949 PUSHSTACK; 3512 PUSHSTACK;
3513
2950 PUSHMARK (SP); 3514 PUSHMARK (SP);
3515 PUTBACK;
2951 3516
2952 if (ix) 3517 if (ix)
2953 eval_sv (coderef, 0); 3518 eval_sv (coderef, 0);
2954 else 3519 else
2955 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3520 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2956 3521
2957 POPSTACK; 3522 POPSTACK;
2958 SPAGAIN; 3523 SPAGAIN;
2959 FREETMPS;
2960 LEAVE;
2961 PUTBACK;
2962 }
2963 3524
2964 if (!(coro->flags & CF_RUNNING)) 3525 if (current != coro)
2965 { 3526 {
3527 PUTBACK;
3528 slf_frame = slf_save;
2966 save_perl (aTHX_ coro); 3529 save_perl (aTHX_ coro);
2967 load_perl (aTHX_ &temp); 3530 load_perl (aTHX_ current);
2968 SPAGAIN; 3531 SPAGAIN;
2969 } 3532 }
2970 } 3533 }
2971} 3534}
2972 3535
… …
2975 PROTOTYPE: $ 3538 PROTOTYPE: $
2976 ALIAS: 3539 ALIAS:
2977 is_ready = CF_READY 3540 is_ready = CF_READY
2978 is_running = CF_RUNNING 3541 is_running = CF_RUNNING
2979 is_new = CF_NEW 3542 is_new = CF_NEW
2980 is_destroyed = CF_DESTROYED 3543 is_destroyed = CF_ZOMBIE
3544 is_zombie = CF_ZOMBIE
3545 is_suspended = CF_SUSPENDED
2981 CODE: 3546 CODE:
2982 RETVAL = boolSV (coro->flags & ix); 3547 RETVAL = boolSV (coro->flags & ix);
2983 OUTPUT: 3548 OUTPUT:
2984 RETVAL 3549 RETVAL
2985 3550
2986void 3551void
2987throw (Coro::State self, SV *throw = &PL_sv_undef) 3552throw (Coro::State self, SV *exception = &PL_sv_undef)
2988 PROTOTYPE: $;$ 3553 PROTOTYPE: $;$
2989 CODE: 3554 CODE:
2990{ 3555{
2991 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
2992 SV **throwp = self == current ? &CORO_THROW : &self->except; 3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2993 SvREFCNT_dec (*throwp); 3558 SvREFCNT_dec (*exceptionp);
2994 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3559 SvGETMAGIC (exception);
3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2995} 3561}
2996 3562
2997void 3563void
2998api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2999 PROTOTYPE: $;$ 3565 PROTOTYPE: $;$
… …
3001 3567
3002SV * 3568SV *
3003has_cctx (Coro::State coro) 3569has_cctx (Coro::State coro)
3004 PROTOTYPE: $ 3570 PROTOTYPE: $
3005 CODE: 3571 CODE:
3006 RETVAL = boolSV (!!coro->cctx); 3572 /* maybe manage the running flag differently */
3573 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3007 OUTPUT: 3574 OUTPUT:
3008 RETVAL 3575 RETVAL
3009 3576
3010int 3577int
3011is_traced (Coro::State coro) 3578is_traced (Coro::State coro)
… …
3031 3598
3032void 3599void
3033force_cctx () 3600force_cctx ()
3034 PROTOTYPE: 3601 PROTOTYPE:
3035 CODE: 3602 CODE:
3036 SvSTATE_current->cctx->idle_sp = 0; 3603 cctx_current->idle_sp = 0;
3037 3604
3038void 3605void
3039swap_defsv (Coro::State self) 3606swap_defsv (Coro::State self)
3040 PROTOTYPE: $ 3607 PROTOTYPE: $
3041 ALIAS: 3608 ALIAS:
… …
3049 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3616 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3050 3617
3051 SV *tmp = *src; *src = *dst; *dst = tmp; 3618 SV *tmp = *src; *src = *dst; *dst = tmp;
3052 } 3619 }
3053 3620
3621void
3622cancel (Coro::State self)
3623 CODE:
3624 coro_state_destroy (aTHX_ self);
3625
3626SV *
3627enable_times (int enabled = enable_times)
3628 CODE:
3629{
3630 RETVAL = boolSV (enable_times);
3631
3632 if (enabled != enable_times)
3633 {
3634 enable_times = enabled;
3635
3636 coro_times_update ();
3637 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3638 }
3639}
3640 OUTPUT:
3641 RETVAL
3642
3643void
3644times (Coro::State self)
3645 PPCODE:
3646{
3647 struct coro *current = SvSTATE (coro_current);
3648
3649 if (ecb_expect_false (current == self))
3650 {
3651 coro_times_update ();
3652 coro_times_add (SvSTATE (coro_current));
3653 }
3654
3655 EXTEND (SP, 2);
3656 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3657 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3658
3659 if (ecb_expect_false (current == self))
3660 coro_times_sub (SvSTATE (coro_current));
3661}
3662
3663void
3664swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3665 CODE:
3666{
3667 struct coro *current = SvSTATE_current;
3668
3669 if (current == coro)
3670 SWAP_SVS (current);
3671
3672 if (!coro->swap_sv)
3673 coro->swap_sv = newAV ();
3674
3675 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3676 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3677
3678 if (current == coro)
3679 SWAP_SVS (current);
3680}
3681
3054 3682
3055MODULE = Coro::State PACKAGE = Coro 3683MODULE = Coro::State PACKAGE = Coro
3056 3684
3057BOOT: 3685BOOT:
3058{ 3686{
3059 int i;
3060
3061 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3687 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3062 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3688 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3063 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3689 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3064 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3065 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3690 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3066 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3691 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3067 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3692 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3068 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3693 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3694 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3069 3695
3070 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3696 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3071 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3697 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3072 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3698 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3073 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3699 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3074 3700
3075 coro_stash = gv_stashpv ("Coro", TRUE); 3701 coro_stash = gv_stashpv ("Coro", TRUE);
3076 3702
3077 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3078 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3079 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3080 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3706 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3081 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3707 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3082 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3708 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3083
3084 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3085 coro_ready[i] = newAV ();
3086 3709
3087 { 3710 {
3088 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3711 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3089 3712
3090 coroapi.schedule = api_schedule; 3713 coroapi.schedule = api_schedule;
… …
3100 sv_setiv (sv, (IV)&coroapi); 3723 sv_setiv (sv, (IV)&coroapi);
3101 SvREADONLY_on (sv); 3724 SvREADONLY_on (sv);
3102 } 3725 }
3103} 3726}
3104 3727
3728SV *
3729async (...)
3730 PROTOTYPE: &@
3731 CODE:
3732 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3733 api_ready (aTHX_ RETVAL);
3734 OUTPUT:
3735 RETVAL
3736
3737void
3738_destroy (Coro::State coro)
3739 CODE:
3740 /* used by the manager thread */
3741 coro_state_destroy (aTHX_ coro);
3742
3743void
3744on_destroy (Coro::State coro, SV *cb)
3745 CODE:
3746 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3747
3748void
3749join (...)
3750 CODE:
3751 CORO_EXECUTE_SLF_XS (slf_init_join);
3752
3105void 3753void
3106terminate (...) 3754terminate (...)
3107 CODE: 3755 CODE:
3108 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3756 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3109 3757
3110void 3758void
3759cancel (...)
3760 CODE:
3761 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3762
3763int
3764safe_cancel (Coro::State self, ...)
3765 C_ARGS: aTHX_ self, &ST (1), items - 1
3766
3767void
3111schedule (...) 3768schedule (...)
3112 CODE: 3769 CODE:
3113 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3770 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3114 3771
3115void 3772void
… …
3129 3786
3130void 3787void
3131cede_notself (...) 3788cede_notself (...)
3132 CODE: 3789 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3790 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3134
3135void
3136_cancel (Coro::State self)
3137 CODE:
3138 coro_state_destroy (aTHX_ self);
3139 coro_call_on_destroy (aTHX_ self);
3140 3791
3141void 3792void
3142_set_current (SV *current) 3793_set_current (SV *current)
3143 PROTOTYPE: $ 3794 PROTOTYPE: $
3144 CODE: 3795 CODE:
… …
3148void 3799void
3149_set_readyhook (SV *hook) 3800_set_readyhook (SV *hook)
3150 PROTOTYPE: $ 3801 PROTOTYPE: $
3151 CODE: 3802 CODE:
3152 SvREFCNT_dec (coro_readyhook); 3803 SvREFCNT_dec (coro_readyhook);
3804 SvGETMAGIC (hook);
3805 if (SvOK (hook))
3806 {
3153 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3807 coro_readyhook = newSVsv (hook);
3808 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3809 }
3810 else
3811 {
3812 coro_readyhook = 0;
3813 CORO_READYHOOK = 0;
3814 }
3154 3815
3155int 3816int
3156prio (Coro::State coro, int newprio = 0) 3817prio (Coro::State coro, int newprio = 0)
3157 PROTOTYPE: $;$ 3818 PROTOTYPE: $;$
3158 ALIAS: 3819 ALIAS:
… …
3164 if (items > 1) 3825 if (items > 1)
3165 { 3826 {
3166 if (ix) 3827 if (ix)
3167 newprio = coro->prio - newprio; 3828 newprio = coro->prio - newprio;
3168 3829
3169 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3830 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3170 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3831 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3171 3832
3172 coro->prio = newprio; 3833 coro->prio = newprio;
3173 } 3834 }
3174} 3835}
3175 OUTPUT: 3836 OUTPUT:
… …
3190 RETVAL = coro_nready; 3851 RETVAL = coro_nready;
3191 OUTPUT: 3852 OUTPUT:
3192 RETVAL 3853 RETVAL
3193 3854
3194void 3855void
3856suspend (Coro::State self)
3857 PROTOTYPE: $
3858 CODE:
3859 self->flags |= CF_SUSPENDED;
3860
3861void
3862resume (Coro::State self)
3863 PROTOTYPE: $
3864 CODE:
3865 self->flags &= ~CF_SUSPENDED;
3866
3867void
3195_pool_handler (...) 3868_pool_handler (...)
3196 CODE: 3869 CODE:
3197 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3870 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3198 3871
3199void 3872void
… …
3210 for (i = 1; i < items; ++i) 3883 for (i = 1; i < items; ++i)
3211 av_push (av, SvREFCNT_inc_NN (ST (i))); 3884 av_push (av, SvREFCNT_inc_NN (ST (i)));
3212 3885
3213 if ((SV *)hv == &PL_sv_undef) 3886 if ((SV *)hv == &PL_sv_undef)
3214 { 3887 {
3215 PUSHMARK (SP); 3888 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3216 EXTEND (SP, 2);
3217 PUSHs (sv_Coro);
3218 PUSHs ((SV *)cv_pool_handler);
3219 PUTBACK;
3220 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3221 SPAGAIN;
3222
3223 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3889 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3890 SvREFCNT_dec (sv);
3224 } 3891 }
3225 3892
3226 { 3893 {
3227 struct coro *coro = SvSTATE_hv (hv); 3894 struct coro *coro = SvSTATE_hv (hv);
3228 3895
… …
3252rouse_wait (...) 3919rouse_wait (...)
3253 PROTOTYPE: ;$ 3920 PROTOTYPE: ;$
3254 PPCODE: 3921 PPCODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3922 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3256 3923
3924void
3925on_enter (SV *block)
3926 ALIAS:
3927 on_leave = 1
3928 PROTOTYPE: &
3929 CODE:
3930{
3931 struct coro *coro = SvSTATE_current;
3932 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3933
3934 block = s_get_cv_croak (block);
3935
3936 if (!*avp)
3937 *avp = newAV ();
3938
3939 av_push (*avp, SvREFCNT_inc (block));
3940
3941 if (!ix)
3942 on_enterleave_call (aTHX_ block);
3943
3944 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3945 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3946 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3947}
3948
3257 3949
3258MODULE = Coro::State PACKAGE = PerlIO::cede 3950MODULE = Coro::State PACKAGE = PerlIO::cede
3259 3951
3260BOOT: 3952BOOT:
3261 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3953 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3264MODULE = Coro::State PACKAGE = Coro::Semaphore 3956MODULE = Coro::State PACKAGE = Coro::Semaphore
3265 3957
3266SV * 3958SV *
3267new (SV *klass, SV *count = 0) 3959new (SV *klass, SV *count = 0)
3268 CODE: 3960 CODE:
3961{
3962 int semcnt = 1;
3963
3964 if (count)
3965 {
3966 SvGETMAGIC (count);
3967
3968 if (SvOK (count))
3969 semcnt = SvIV (count);
3970 }
3971
3269 RETVAL = sv_bless ( 3972 RETVAL = sv_bless (
3270 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3973 coro_waitarray_new (aTHX_ semcnt),
3271 GvSTASH (CvGV (cv)) 3974 GvSTASH (CvGV (cv))
3272 ); 3975 );
3976}
3273 OUTPUT: 3977 OUTPUT:
3274 RETVAL 3978 RETVAL
3275 3979
3276# helper for Coro::Channel 3980# helper for Coro::Channel and others
3277SV * 3981SV *
3278_alloc (int count) 3982_alloc (int count)
3279 CODE: 3983 CODE:
3280 RETVAL = coro_waitarray_new (aTHX_ count); 3984 RETVAL = coro_waitarray_new (aTHX_ count);
3281 OUTPUT: 3985 OUTPUT:
… …
3339 for (i = 1; i <= wcount; ++i) 4043 for (i = 1; i <= wcount; ++i)
3340 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4044 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3341 } 4045 }
3342} 4046}
3343 4047
4048MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4049
4050void
4051_may_delete (SV *sem, int count, int extra_refs)
4052 PPCODE:
4053{
4054 AV *av = (AV *)SvRV (sem);
4055
4056 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4057 && AvFILLp (av) == 0 /* no waiters, just count */
4058 && SvIV (AvARRAY (av)[0]) == count)
4059 XSRETURN_YES;
4060
4061 XSRETURN_NO;
4062}
4063
3344MODULE = Coro::State PACKAGE = Coro::Signal 4064MODULE = Coro::State PACKAGE = Coro::Signal
3345 4065
3346SV * 4066SV *
3347new (SV *klass) 4067new (SV *klass)
3348 CODE: 4068 CODE:
… …
3419 4139
3420void 4140void
3421_register (char *target, char *proto, SV *req) 4141_register (char *target, char *proto, SV *req)
3422 CODE: 4142 CODE:
3423{ 4143{
3424 CV *req_cv = coro_sv_2cv (aTHX_ req); 4144 SV *req_cv = s_get_cv_croak (req);
3425 /* newXSproto doesn't return the CV on 5.8 */ 4145 /* newXSproto doesn't return the CV on 5.8 */
3426 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4146 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3427 sv_setpv ((SV *)slf_cv, proto); 4147 sv_setpv ((SV *)slf_cv, proto);
3428 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4148 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3429} 4149}
3430 4150
4151MODULE = Coro::State PACKAGE = Coro::Select
4152
4153void
4154patch_pp_sselect ()
4155 CODE:
4156 if (!coro_old_pp_sselect)
4157 {
4158 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4159 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4160 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4161 }
4162
4163void
4164unpatch_pp_sselect ()
4165 CODE:
4166 if (coro_old_pp_sselect)
4167 {
4168 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4169 coro_old_pp_sselect = 0;
4170 }
4171

Diff Legend

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