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.313 by root, Thu Nov 20 03:22:59 2008 UTC vs.
Revision 1.406 by root, Sat Jun 11 13:49:00 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
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif
108
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 69# undef CORO_STACKGUARD
111#endif 70#endif
112 71
113#ifndef CORO_STACKGUARD 72#ifndef CORO_STACKGUARD
… …
127#else 86#else
128# define dSTACKLEVEL volatile void *stacklevel 87# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
130#endif 89#endif
131 90
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 91#define IN_DESTRUCT PL_dirty
133
134#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value))
137# define INLINE static inline
138#else
139# define attribute(x)
140# define expect(expr,value) (expr)
141# define INLINE static
142#endif
143
144#define expect_false(expr) expect ((expr) != 0, 0)
145#define expect_true(expr) expect ((expr) != 0, 1)
146
147#define NOINLINE attribute ((noinline))
148 92
149#include "CoroAPI.h" 93#include "CoroAPI.h"
150#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
151 95
152#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
153# if CORO_PTHREAD 97# if CORO_PTHREAD
154static void *coro_thx; 98static void *coro_thx;
155# endif 99# endif
156#endif 100#endif
157 101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
158static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
159 117
160/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
163 122
164static U32 cctx_gen; 123static U32 cctx_gen;
165static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
166static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
167static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 127static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 128static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 129static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 130
131static AV *av_destroy; /* destruction queue */
132static SV *sv_manager; /* the manager coro */
133static SV *sv_idle; /* $Coro::idle */
134
172static GV *irsgv; /* $/ */ 135static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 136static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 137static SV *rv_diehook;
175static SV *rv_warnhook; 138static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 139static HV *hv_sig; /* %SIG */
177 140
178/* async_pool helper stuff */ 141/* async_pool helper stuff */
179static SV *sv_pool_rss; 142static SV *sv_pool_rss;
180static SV *sv_pool_size; 143static SV *sv_pool_size;
181static SV *sv_async_pool_idle; 144static SV *sv_async_pool_idle; /* description string */
182static AV *av_async_pool; 145static AV *av_async_pool; /* idle pool */
183static SV *sv_Coro; 146static SV *sv_Coro; /* class string */
184static CV *cv_pool_handler; 147static CV *cv_pool_handler;
185static CV *cv_coro_new;
186 148
187/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
188static SV *sv_activity; 150static SV *sv_activity;
189 151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
157
190static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
191static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
192 160
193enum { 161enum
162{
194 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
195 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
196 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
197 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
198 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
219 int valgrind_id; 188 int valgrind_id;
220#endif 189#endif
221 unsigned char flags; 190 unsigned char flags;
222} coro_cctx; 191} coro_cctx;
223 192
193static coro_cctx *cctx_current; /* the currently running cctx */
194
195/*****************************************************************************/
196
197static MGVTBL coro_state_vtbl;
198
224enum { 199enum
200{
225 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
226 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
227 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
228 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
229}; 207};
230 208
231/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
232typedef struct 210typedef struct
233{ 211{
234 SV *defsv;
235 AV *defav;
236 SV *errsv;
237 SV *irsgv;
238#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
239# include "state.h" 213# include "state.h"
240#undef VAR 214#undef VARx
241} perl_slots; 215} perl_slots;
242 216
217// how many context stack entries do we need for perl_slots
243#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
244 219
245/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
246struct coro { 221struct coro
222{
247 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
248 coro_cctx *cctx; 224 coro_cctx *cctx;
225
226 /* ready queue */
227 struct coro *next_ready;
249 228
250 /* state data */ 229 /* state data */
251 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
252 AV *mainstack; 231 AV *mainstack;
253 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
254 233
255 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
256 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
257 int refcnt; /* coroutines are refcounted, yes */
258 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
259 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
260 void (*on_destroy)(pTHX_ struct coro *coro);
261 238
262 /* statistics */ 239 /* statistics */
263 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
264 241
265 /* coro process data */ 242 /* coro process data */
266 int prio; 243 int prio;
267 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
268 SV *rouse_cb; 245 SV *rouse_cb; /* last rouse callback */
246 AV *on_destroy; /* callbacks or coros to notify on destroy */
247 AV *status; /* the exit status list */
269 248
270 /* async_pool */ 249 /* async_pool */
271 SV *saved_deffh; 250 SV *saved_deffh;
272 SV *invoke_cb; 251 SV *invoke_cb;
273 AV *invoke_av; 252 AV *invoke_av;
274 253
254 /* on_enter/on_leave */
255 AV *on_enter;
256 AV *on_leave;
257
258 /* swap_sv */
259 AV *swap_sv;
260
261 /* times */
262 coro_ts t_cpu, t_real;
263
275 /* linked list */ 264 /* linked list */
276 struct coro *next, *prev; 265 struct coro *next, *prev;
277}; 266};
278 267
279typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
280typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
281 270
282/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
283/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
284/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
285static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
286 275
287/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
288 277
289#define PRIO_MAX 3 278#define CORO_PRIO_MAX 3
290#define PRIO_HIGH 1 279#define CORO_PRIO_HIGH 1
291#define PRIO_NORMAL 0 280#define CORO_PRIO_NORMAL 0
292#define PRIO_LOW -1 281#define CORO_PRIO_LOW -1
293#define PRIO_IDLE -3 282#define CORO_PRIO_IDLE -3
294#define PRIO_MIN -4 283#define CORO_PRIO_MIN -4
295 284
296/* for Coro.pm */ 285/* for Coro.pm */
297static SV *coro_current; 286static SV *coro_current;
298static SV *coro_readyhook; 287static SV *coro_readyhook;
299static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
300static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
301static struct coro *coro_first; 290static struct coro *coro_first;
302#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
303 292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *);
300 #else
301 #undef CORO_JIT
302 #endif
303 #endif
304#endif
305
306#if CORO_JIT
307static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif
309
310/** Coro::Select ************************************************************/
311
312static OP *(*coro_old_pp_sselect) (pTHX);
313static SV *coro_select_select;
314
315/* horrible hack, but if it works... */
316static OP *
317coro_pp_sselect (pTHX)
318{
319 dSP;
320 PUSHMARK (SP - 4); /* fake argument list */
321 XPUSHs (coro_select_select);
322 PUTBACK;
323
324 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
325 PL_op->op_flags |= OPf_STACKED;
326 PL_op->op_private = 0;
327 return PL_ppaddr [OP_ENTERSUB](aTHX);
328}
329
330/** time stuff **************************************************************/
331
332#ifdef HAS_GETTIMEOFDAY
333
334ECB_INLINE void
335coro_u2time (pTHX_ UV ret[2])
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 ret [0] = tv.tv_sec;
341 ret [1] = tv.tv_usec;
342}
343
344ECB_INLINE double
345coro_nvtime ()
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 return tv.tv_sec + tv.tv_usec * 1e-6;
351}
352
353ECB_INLINE void
354time_init (pTHX)
355{
356 nvtime = coro_nvtime;
357 u2time = coro_u2time;
358}
359
360#else
361
362ECB_INLINE void
363time_init (pTHX)
364{
365 SV **svp;
366
367 require_pv ("Time/HiRes.pm");
368
369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
370
371 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
372 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
373
374 nvtime = INT2PTR (double (*)(), SvIV (*svp));
375
376 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
377 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
378}
379
380#endif
381
304/** lowlevel stuff **********************************************************/ 382/** lowlevel stuff **********************************************************/
305 383
306static SV * 384static SV * ecb_noinline
307coro_get_sv (pTHX_ const char *name, int create) 385coro_get_sv (pTHX_ const char *name, int create)
308{ 386{
309#if PERL_VERSION_ATLEAST (5,10,0) 387#if PERL_VERSION_ATLEAST (5,10,0)
310 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
311 get_sv (name, create); 389 get_sv (name, create);
312#endif 390#endif
313 return get_sv (name, create); 391 return get_sv (name, create);
314} 392}
315 393
316static AV * 394static AV * ecb_noinline
317coro_get_av (pTHX_ const char *name, int create) 395coro_get_av (pTHX_ const char *name, int create)
318{ 396{
319#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
320 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
321 get_av (name, create); 399 get_av (name, create);
322#endif 400#endif
323 return get_av (name, create); 401 return get_av (name, create);
324} 402}
325 403
326static HV * 404static HV * ecb_noinline
327coro_get_hv (pTHX_ const char *name, int create) 405coro_get_hv (pTHX_ const char *name, int create)
328{ 406{
329#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
330 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
331 get_hv (name, create); 409 get_hv (name, create);
332#endif 410#endif
333 return get_hv (name, create); 411 return get_hv (name, create);
334} 412}
335 413
336/* may croak */ 414ECB_INLINE void
415coro_times_update ()
416{
417#ifdef coro_clock_gettime
418 struct timespec ts;
419
420 ts.tv_sec = ts.tv_nsec = 0;
421 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
422 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
423
424 ts.tv_sec = ts.tv_nsec = 0;
425 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
426 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
427#else
428 dTHX;
429 UV tv[2];
430
431 u2time (aTHX_ tv);
432 time_real [0] = tv [0];
433 time_real [1] = tv [1] * 1000;
434#endif
435}
436
437ECB_INLINE void
438coro_times_add (struct coro *c)
439{
440 c->t_real [1] += time_real [1];
441 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
442 c->t_real [0] += time_real [0];
443
444 c->t_cpu [1] += time_cpu [1];
445 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
446 c->t_cpu [0] += time_cpu [0];
447}
448
449ECB_INLINE void
450coro_times_sub (struct coro *c)
451{
452 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
453 c->t_real [1] -= time_real [1];
454 c->t_real [0] -= time_real [0];
455
456 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
457 c->t_cpu [1] -= time_cpu [1];
458 c->t_cpu [0] -= time_cpu [0];
459}
460
461/*****************************************************************************/
462/* magic glue */
463
464#define CORO_MAGIC_type_cv 26
465#define CORO_MAGIC_type_state PERL_MAGIC_ext
466
467#define CORO_MAGIC_NN(sv, type) \
468 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
469 ? SvMAGIC (sv) \
470 : mg_find (sv, type))
471
472#define CORO_MAGIC(sv, type) \
473 (ecb_expect_true (SvMAGIC (sv)) \
474 ? CORO_MAGIC_NN (sv, type) \
475 : 0)
476
477#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
478#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
479
480ECB_INLINE MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro)
482{
483 MAGIC *mg;
484
485 if (ecb_expect_true (
486 SvTYPE (coro) == SVt_PVHV
487 && (mg = CORO_MAGIC_state (coro))
488 && mg->mg_virtual == &coro_state_vtbl
489 ))
490 return mg;
491
492 return 0;
493}
494
495ECB_INLINE struct coro *
496SvSTATE_ (pTHX_ SV *coro)
497{
498 MAGIC *mg;
499
500 if (SvROK (coro))
501 coro = SvRV (coro);
502
503 mg = SvSTATEhv_p (aTHX_ coro);
504 if (!mg)
505 croak ("Coro::State object required");
506
507 return (struct coro *)mg->mg_ptr;
508}
509
510#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
511
512/* faster than SvSTATE, but expects a coroutine hv */
513#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
515
516/*****************************************************************************/
517/* padlist management and caching */
518
337INLINE CV * 519ECB_INLINE AV *
338coro_sv_2cv (pTHX_ SV *sv)
339{
340 HV *st;
341 GV *gvp;
342 return sv_2cv (sv, &st, &gvp, 0);
343}
344
345static AV *
346coro_clone_padlist (pTHX_ CV *cv) 520coro_derive_padlist (pTHX_ CV *cv)
347{ 521{
348 AV *padlist = CvPADLIST (cv); 522 AV *padlist = CvPADLIST (cv);
349 AV *newpadlist, *newpad; 523 AV *newpadlist, *newpad;
350 524
351 newpadlist = newAV (); 525 newpadlist = newAV ();
… …
356 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
357#endif 531#endif
358 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 532 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
359 --AvFILLp (padlist); 533 --AvFILLp (padlist);
360 534
361 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 535 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
362 av_store (newpadlist, 1, (SV *)newpad); 536 av_store (newpadlist, 1, (SV *)newpad);
363 537
364 return newpadlist; 538 return newpadlist;
365} 539}
366 540
367static void 541ECB_INLINE void
368free_padlist (pTHX_ AV *padlist) 542free_padlist (pTHX_ AV *padlist)
369{ 543{
370 /* may be during global destruction */ 544 /* may be during global destruction */
371 if (SvREFCNT (padlist)) 545 if (!IN_DESTRUCT)
372 { 546 {
373 I32 i = AvFILLp (padlist); 547 I32 i = AvFILLp (padlist);
374 while (i >= 0) 548
549 while (i > 0) /* special-case index 0 */
375 { 550 {
376 SV **svp = av_fetch (padlist, i--, FALSE); 551 /* we try to be extra-careful here */
377 if (svp) 552 AV *av = (AV *)AvARRAY (padlist)[i--];
378 { 553 I32 j = AvFILLp (av);
379 SV *sv; 554
380 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 555 while (j >= 0)
556 SvREFCNT_dec (AvARRAY (av)[j--]);
557
558 AvFILLp (av) = -1;
381 SvREFCNT_dec (sv); 559 SvREFCNT_dec (av);
382
383 SvREFCNT_dec (*svp);
384 }
385 } 560 }
386 561
562 SvREFCNT_dec (AvARRAY (padlist)[0]);
563
564 AvFILLp (padlist) = -1;
387 SvREFCNT_dec ((SV*)padlist); 565 SvREFCNT_dec ((SV*)padlist);
388 } 566 }
389} 567}
390 568
391static int 569static int
392coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 570coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
393{ 571{
394 AV *padlist; 572 AV *padlist;
395 AV *av = (AV *)mg->mg_obj; 573 AV *av = (AV *)mg->mg_obj;
574
575 /* perl manages to free our internal AV and _then_ call us */
576 if (IN_DESTRUCT)
577 return 0;
396 578
397 /* casting is fun. */ 579 /* casting is fun. */
398 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 580 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
399 free_padlist (aTHX_ padlist); 581 free_padlist (aTHX_ padlist);
400 582
401 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 583 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
402 584
403 return 0; 585 return 0;
404} 586}
405
406#define CORO_MAGIC_type_cv 26
407#define CORO_MAGIC_type_state PERL_MAGIC_ext
408 587
409static MGVTBL coro_cv_vtbl = { 588static MGVTBL coro_cv_vtbl = {
410 0, 0, 0, 0, 589 0, 0, 0, 0,
411 coro_cv_free 590 coro_cv_free
412}; 591};
413 592
414#define CORO_MAGIC_NN(sv, type) \
415 (expect_true (SvMAGIC (sv)->mg_type == type) \
416 ? SvMAGIC (sv) \
417 : mg_find (sv, type))
418
419#define CORO_MAGIC(sv, type) \
420 (expect_true (SvMAGIC (sv)) \
421 ? CORO_MAGIC_NN (sv, type) \
422 : 0)
423
424#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
425#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
426
427INLINE struct coro *
428SvSTATE_ (pTHX_ SV *coro)
429{
430 HV *stash;
431 MAGIC *mg;
432
433 if (SvROK (coro))
434 coro = SvRV (coro);
435
436 if (expect_false (SvTYPE (coro) != SVt_PVHV))
437 croak ("Coro::State object required");
438
439 stash = SvSTASH (coro);
440 if (expect_false (stash != coro_stash && stash != coro_state_stash))
441 {
442 /* very slow, but rare, check */
443 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
444 croak ("Coro::State object required");
445 }
446
447 mg = CORO_MAGIC_state (coro);
448 return (struct coro *)mg->mg_ptr;
449}
450
451#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
452
453/* faster than SvSTATE, but expects a coroutine hv */
454#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
455#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
456
457/* the next two functions merely cache the padlists */ 593/* the next two functions merely cache the padlists */
458static void 594ECB_INLINE void
459get_padlist (pTHX_ CV *cv) 595get_padlist (pTHX_ CV *cv)
460{ 596{
461 MAGIC *mg = CORO_MAGIC_cv (cv); 597 MAGIC *mg = CORO_MAGIC_cv (cv);
462 AV *av; 598 AV *av;
463 599
464 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
465 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
466 else 602 else
467 { 603 {
468#if CORO_PREFER_PERL_FUNCTIONS 604#if CORO_PREFER_PERL_FUNCTIONS
469 /* this is probably cleaner? but also slower! */ 605 /* this is probably cleaner? but also slower! */
… …
471 CV *cp = Perl_cv_clone (aTHX_ cv); 607 CV *cp = Perl_cv_clone (aTHX_ cv);
472 CvPADLIST (cv) = CvPADLIST (cp); 608 CvPADLIST (cv) = CvPADLIST (cp);
473 CvPADLIST (cp) = 0; 609 CvPADLIST (cp) = 0;
474 SvREFCNT_dec (cp); 610 SvREFCNT_dec (cp);
475#else 611#else
476 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
477#endif 613#endif
478 } 614 }
479} 615}
480 616
481static void 617ECB_INLINE void
482put_padlist (pTHX_ CV *cv) 618put_padlist (pTHX_ CV *cv)
483{ 619{
484 MAGIC *mg = CORO_MAGIC_cv (cv); 620 MAGIC *mg = CORO_MAGIC_cv (cv);
485 AV *av; 621 AV *av;
486 622
487 if (expect_false (!mg)) 623 if (ecb_expect_false (!mg))
488 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
489 625
490 av = (AV *)mg->mg_obj; 626 av = (AV *)mg->mg_obj;
491 627
492 if (expect_false (AvFILLp (av) >= AvMAX (av))) 628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
493 av_extend (av, AvMAX (av) + 1); 629 av_extend (av, AvFILLp (av) + 1);
494 630
495 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
496} 632}
497 633
498/** load & save, init *******************************************************/ 634/** load & save, init *******************************************************/
635
636/* swap sv heads, at least logically */
637static void
638swap_svs (pTHX_ Coro__State c)
639{
640 int i;
641
642 for (i = 0; i <= AvFILLp (c->swap_sv); )
643 {
644 SV *a = AvARRAY (c->swap_sv)[i++];
645 SV *b = AvARRAY (c->swap_sv)[i++];
646
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 complicates this _quite_ a bit, but it also is
660 * much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680 }
681}
682
683#define SWAP_SVS(coro) \
684 if (ecb_expect_false ((coro)->swap_sv)) \
685 swap_svs (aTHX_ (coro))
686
687static void
688on_enterleave_call (pTHX_ SV *cb);
499 689
500static void 690static void
501load_perl (pTHX_ Coro__State c) 691load_perl (pTHX_ Coro__State c)
502{ 692{
503 perl_slots *slot = c->slot; 693 perl_slots *slot = c->slot;
504 c->slot = 0; 694 c->slot = 0;
505 695
506 PL_mainstack = c->mainstack; 696 PL_mainstack = c->mainstack;
507 697
508 GvSV (PL_defgv) = slot->defsv; 698#if CORO_JIT
509 GvAV (PL_defgv) = slot->defav; 699 load_perl_slots (slot);
510 GvSV (PL_errgv) = slot->errsv; 700#else
511 GvSV (irsgv) = slot->irsgv;
512
513 #define VAR(name,type) PL_ ## name = slot->name; 701 #define VARx(name,expr,type) expr = slot->name;
514 # include "state.h" 702 # include "state.h"
515 #undef VAR 703 #undef VARx
704#endif
516 705
517 { 706 {
518 dSP; 707 dSP;
519 708
520 CV *cv; 709 CV *cv;
521 710
522 /* now do the ugly restore mess */ 711 /* now do the ugly restore mess */
523 while (expect_true (cv = (CV *)POPs)) 712 while (ecb_expect_true (cv = (CV *)POPs))
524 { 713 {
525 put_padlist (aTHX_ cv); /* mark this padlist as available */ 714 put_padlist (aTHX_ cv); /* mark this padlist as available */
526 CvDEPTH (cv) = PTR2IV (POPs); 715 CvDEPTH (cv) = PTR2IV (POPs);
527 CvPADLIST (cv) = (AV *)POPs; 716 CvPADLIST (cv) = (AV *)POPs;
528 } 717 }
… …
530 PUTBACK; 719 PUTBACK;
531 } 720 }
532 721
533 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
534 CORO_THROW = c->except; 723 CORO_THROW = c->except;
724
725 if (ecb_expect_false (enable_times))
726 {
727 if (ecb_expect_false (!times_valid))
728 coro_times_update ();
729
730 coro_times_sub (c);
731 }
732
733 if (ecb_expect_false (c->on_enter))
734 {
735 int i;
736
737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
739 }
740
741 SWAP_SVS (c);
535} 742}
536 743
537static void 744static void
538save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
539{ 746{
747 SWAP_SVS (c);
748
749 if (ecb_expect_false (c->on_leave))
750 {
751 int i;
752
753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
755 }
756
757 times_valid = 0;
758
759 if (ecb_expect_false (enable_times))
760 {
761 coro_times_update (); times_valid = 1;
762 coro_times_add (c);
763 }
764
540 c->except = CORO_THROW; 765 c->except = CORO_THROW;
541 c->slf_frame = slf_frame; 766 c->slf_frame = slf_frame;
542 767
543 { 768 {
544 dSP; 769 dSP;
… …
553 778
554 XPUSHs (Nullsv); 779 XPUSHs (Nullsv);
555 /* this loop was inspired by pp_caller */ 780 /* this loop was inspired by pp_caller */
556 for (;;) 781 for (;;)
557 { 782 {
558 while (expect_true (cxix >= 0)) 783 while (ecb_expect_true (cxix >= 0))
559 { 784 {
560 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
561 786
562 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 787 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
563 { 788 {
564 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
565 790
566 if (expect_true (CvDEPTH (cv))) 791 if (ecb_expect_true (CvDEPTH (cv)))
567 { 792 {
568 EXTEND (SP, 3); 793 EXTEND (SP, 3);
569 PUSHs ((SV *)CvPADLIST (cv)); 794 PUSHs ((SV *)CvPADLIST (cv));
570 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 795 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
571 PUSHs ((SV *)cv); 796 PUSHs ((SV *)cv);
… …
574 get_padlist (aTHX_ cv); 799 get_padlist (aTHX_ cv);
575 } 800 }
576 } 801 }
577 } 802 }
578 803
579 if (expect_true (top_si->si_type == PERLSI_MAIN)) 804 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
580 break; 805 break;
581 806
582 top_si = top_si->si_prev; 807 top_si = top_si->si_prev;
583 ccstk = top_si->si_cxstack; 808 ccstk = top_si->si_cxstack;
584 cxix = top_si->si_cxix; 809 cxix = top_si->si_cxix;
… …
586 811
587 PUTBACK; 812 PUTBACK;
588 } 813 }
589 814
590 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
591 /* we manually unroll here, as usually 2 slots is enough */ 816 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
592 if (SLOT_COUNT >= 1) CXINC;
593 if (SLOT_COUNT >= 2) CXINC;
594 if (SLOT_COUNT >= 3) CXINC;
595 { 817 {
596 int i; 818 unsigned int i;
819
597 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
598 CXINC; 821 CXINC;
599 } 822
600 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
601 825
602 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
603 827
604 { 828 {
605 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
606 830
607 slot->defav = GvAV (PL_defgv); 831#if CORO_JIT
608 slot->defsv = DEFSV; 832 save_perl_slots (slot);
609 slot->errsv = ERRSV; 833#else
610 slot->irsgv = GvSV (irsgv);
611
612 #define VAR(name,type) slot->name = PL_ ## name; 834 #define VARx(name,expr,type) slot->name = expr;
613 # include "state.h" 835 # include "state.h"
614 #undef VAR 836 #undef VARx
837#endif
615 } 838 }
616} 839}
617 840
618/* 841/*
619 * allocate various perl stacks. This is almost an exact copy 842 * allocate various perl stacks. This is almost an exact copy
… …
625# define coro_init_stacks(thx) init_stacks () 848# define coro_init_stacks(thx) init_stacks ()
626#else 849#else
627static void 850static void
628coro_init_stacks (pTHX) 851coro_init_stacks (pTHX)
629{ 852{
630 PL_curstackinfo = new_stackinfo(32, 8); 853 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
631 PL_curstackinfo->si_type = PERLSI_MAIN; 854 PL_curstackinfo->si_type = PERLSI_MAIN;
632 PL_curstack = PL_curstackinfo->si_stack; 855 PL_curstack = PL_curstackinfo->si_stack;
633 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 856 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
634 857
635 PL_stack_base = AvARRAY(PL_curstack); 858 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 965#endif
743 966
744/* 967/*
745 * This overrides the default magic get method of %SIG elements. 968 * This overrides the default magic get method of %SIG elements.
746 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 969 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
747 * and instead of tryign to save and restore the hash elements, we just provide 970 * and instead of trying to save and restore the hash elements (extremely slow),
748 * readback here. 971 * we just provide our own readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 972 */
753static int 973static int ecb_cold
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 974coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 975{
756 const char *s = MgPV_nolen_const (mg); 976 const char *s = MgPV_nolen_const (mg);
757 977
758 if (*s == '_') 978 if (*s == '_')
… …
770 } 990 }
771 991
772 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
773} 993}
774 994
775static int 995static int ecb_cold
776coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 996coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
777{ 997{
778 const char *s = MgPV_nolen_const (mg); 998 const char *s = MgPV_nolen_const (mg);
779 999
780 if (*s == '_') 1000 if (*s == '_')
… …
794 } 1014 }
795 1015
796 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
797} 1017}
798 1018
799static int 1019static int ecb_cold
800coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
801{ 1021{
802 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
803 1023
804 if (*s == '_') 1024 if (*s == '_')
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1029 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 1030
811 if (svp) 1031 if (svp)
812 { 1032 {
813 SV *old = *svp; 1033 SV *old = *svp;
814 *svp = newSVsv (sv); 1034 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 1035 SvREFCNT_dec (old);
816 return 0; 1036 return 0;
817 } 1037 }
818 } 1038 }
819 1039
… …
831slf_check_nop (pTHX_ struct CoroSLF *frame) 1051slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 1052{
833 return 0; 1053 return 0;
834} 1054}
835 1055
836static UNOP coro_setup_op; 1056static int
1057slf_check_repeat (pTHX_ struct CoroSLF *frame)
1058{
1059 return 1;
1060}
837 1061
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1062static UNOP init_perl_op;
1063
1064ecb_noinline static void /* noinline to keep it out of the transfer fast path */
839coro_setup (pTHX_ struct coro *coro) 1065init_perl (pTHX_ struct coro *coro)
840{ 1066{
841 /* 1067 /*
842 * emulate part of the perl startup here. 1068 * emulate part of the perl startup here.
843 */ 1069 */
844 coro_init_stacks (aTHX); 1070 coro_init_stacks (aTHX);
845 1071
846 PL_runops = RUNOPS_DEFAULT; 1072 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 1073 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 1074 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 1075 PL_comppad = 0;
1076 PL_comppad_name = 0;
1077 PL_comppad_name_fill = 0;
1078 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 1079 PL_curpm = 0;
851 PL_curpad = 0; 1080 PL_curpad = 0;
852 PL_localizing = 0; 1081 PL_localizing = 0;
853 PL_dirty = 0;
854 PL_restartop = 0; 1082 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 1083#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 1084 PL_parser = 0;
857#endif 1085#endif
1086 PL_hints = 0;
858 1087
859 /* recreate the die/warn hooks */ 1088 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1089 PL_diehook = SvREFCNT_inc (rv_diehook);
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1090 PL_warnhook = SvREFCNT_inc (rv_warnhook);
862 1091
863 GvSV (PL_defgv) = newSV (0); 1092 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 1093 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 1094 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1095 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1096 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 1097 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1098 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 1099
870 { 1100 {
871 dSP; 1101 dSP;
… …
886 /* this newly created coroutine might be run on an existing cctx which most 1116 /* this newly created coroutine might be run on an existing cctx which most
887 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1117 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 */ 1118 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1119 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1120 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1121 slf_frame.destroy = 0;
891 1122
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1123 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 1124 init_perl_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 1125 init_perl_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 1126 init_perl_op.op_ppaddr = pp_slf;
896 /* no flags etc. required, as an init function won't be called */ 1127 /* no flags etc. required, as an init function won't be called */
897 1128
898 PL_op = (OP *)&coro_setup_op; 1129 PL_op = (OP *)&init_perl_op;
899 1130
900 /* copy throw, in case it was set before coro_setup */ 1131 /* copy throw, in case it was set before init_perl */
901 CORO_THROW = coro->except; 1132 CORO_THROW = coro->except;
902}
903 1133
1134 SWAP_SVS (coro);
1135
1136 if (ecb_expect_false (enable_times))
1137 {
1138 coro_times_update ();
1139 coro_times_sub (coro);
1140 }
1141}
1142
904static void 1143static void
905coro_destruct (pTHX_ struct coro *coro) 1144coro_unwind_stacks (pTHX)
906{ 1145{
907 if (!IN_DESTRUCT) 1146 if (!IN_DESTRUCT)
908 { 1147 {
909 /* restore all saved variables and stuff */ 1148 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1149 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 1157 POPSTACK_TO (PL_mainstack);
919 1158
920 /* unwind main stack */ 1159 /* unwind main stack */
921 dounwind (-1); 1160 dounwind (-1);
922 } 1161 }
1162}
923 1163
924 SvREFCNT_dec (GvSV (PL_defgv)); 1164static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1165destroy_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1166{
927 SvREFCNT_dec (PL_defoutgv); 1167 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1168
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1169 {
1170 SV *old_current = SvRV (coro_current);
1171 struct coro *current = SvSTATE (old_current);
1172
1173 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1174
1175 save_perl (aTHX_ current);
1176
1177 /* this will cause transfer_check to croak on block*/
1178 SvRV_set (coro_current, (SV *)coro->hv);
1179
1180 load_perl (aTHX_ coro);
1181
1182 coro_unwind_stacks (aTHX);
1183
1184 /* restore swapped sv's */
1185 SWAP_SVS (coro);
1186
1187 coro_destruct_stacks (aTHX);
1188
1189 // now save some sv's to be free'd later
1190 svf [0] = GvSV (PL_defgv);
1191 svf [1] = (SV *)GvAV (PL_defgv);
1192 svf [2] = GvSV (PL_errgv);
1193 svf [3] = (SV *)PL_defoutgv;
1194 svf [4] = PL_rs;
1195 svf [5] = GvSV (irsgv);
1196 svf [6] = (SV *)GvHV (PL_hintgv);
1197 svf [7] = PL_diehook;
1198 svf [8] = PL_warnhook;
1199 assert (9 == sizeof (svf) / sizeof (*svf));
1200
1201 SvRV_set (coro_current, old_current);
1202
1203 load_perl (aTHX_ current);
1204 }
1205
1206 {
1207 unsigned int i;
1208
1209 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1210 SvREFCNT_dec (svf [i]);
1211
934 SvREFCNT_dec (coro->saved_deffh); 1212 SvREFCNT_dec (coro->saved_deffh);
935 SvREFCNT_dec (coro->rouse_cb); 1213 SvREFCNT_dec (coro->rouse_cb);
936 SvREFCNT_dec (coro->invoke_cb); 1214 SvREFCNT_dec (coro->invoke_cb);
937 SvREFCNT_dec (coro->invoke_av); 1215 SvREFCNT_dec (coro->invoke_av);
938 1216 }
939 coro_destruct_stacks (aTHX);
940} 1217}
941 1218
942INLINE void 1219ECB_INLINE void
943free_coro_mortal (pTHX) 1220free_coro_mortal (pTHX)
944{ 1221{
945 if (expect_true (coro_mortal)) 1222 if (ecb_expect_true (coro_mortal))
946 { 1223 {
947 SvREFCNT_dec (coro_mortal); 1224 SvREFCNT_dec ((SV *)coro_mortal);
948 coro_mortal = 0; 1225 coro_mortal = 0;
949 } 1226 }
950} 1227}
951 1228
952static int 1229static int
953runops_trace (pTHX) 1230runops_trace (pTHX)
954{ 1231{
955 COP *oldcop = 0; 1232 COP *oldcop = 0;
956 int oldcxix = -2; 1233 int oldcxix = -2;
957 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
958 coro_cctx *cctx = coro->cctx;
959 1234
960 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1235 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
961 { 1236 {
962 PERL_ASYNC_CHECK (); 1237 PERL_ASYNC_CHECK ();
963 1238
964 if (cctx->flags & CC_TRACE_ALL) 1239 if (cctx_current->flags & CC_TRACE_ALL)
965 { 1240 {
966 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1241 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
967 { 1242 {
968 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1243 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
969 SV **bot, **top; 1244 SV **bot, **top;
970 AV *av = newAV (); /* return values */ 1245 AV *av = newAV (); /* return values */
971 SV **cb; 1246 SV **cb;
… …
1008 1283
1009 if (PL_curcop != &PL_compiling) 1284 if (PL_curcop != &PL_compiling)
1010 { 1285 {
1011 SV **cb; 1286 SV **cb;
1012 1287
1013 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1288 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1014 { 1289 {
1015 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1290 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1016 1291
1017 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1292 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1018 { 1293 {
1019 runops_proc_t old_runops = PL_runops;
1020 dSP; 1294 dSP;
1021 GV *gv = CvGV (cx->blk_sub.cv); 1295 GV *gv = CvGV (cx->blk_sub.cv);
1022 SV *fullname = sv_2mortal (newSV (0)); 1296 SV *fullname = sv_2mortal (newSV (0));
1023 1297
1024 if (isGV (gv)) 1298 if (isGV (gv))
… …
1042 } 1316 }
1043 1317
1044 oldcxix = cxstack_ix; 1318 oldcxix = cxstack_ix;
1045 } 1319 }
1046 1320
1047 if (cctx->flags & CC_TRACE_LINE) 1321 if (cctx_current->flags & CC_TRACE_LINE)
1048 { 1322 {
1049 dSP; 1323 dSP;
1050 1324
1051 PL_runops = RUNOPS_DEFAULT; 1325 PL_runops = RUNOPS_DEFAULT;
1052 ENTER; 1326 ENTER;
… …
1071 1345
1072 TAINT_NOT; 1346 TAINT_NOT;
1073 return 0; 1347 return 0;
1074} 1348}
1075 1349
1076static struct coro_cctx *cctx_ssl_cctx;
1077static struct CoroSLF cctx_ssl_frame; 1350static struct CoroSLF cctx_ssl_frame;
1078 1351
1079static void 1352static void
1080slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1353slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1081{ 1354{
1082 ta->prev = (struct coro *)cctx_ssl_cctx;
1083 ta->next = 0; 1355 ta->prev = 0;
1084} 1356}
1085 1357
1086static int 1358static int
1087slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1359slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1088{ 1360{
… …
1090 1362
1091 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1363 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1092} 1364}
1093 1365
1094/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1366/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1095static void NOINLINE 1367static void ecb_noinline
1096cctx_prepare (pTHX_ coro_cctx *cctx) 1368cctx_prepare (pTHX)
1097{ 1369{
1098 PL_top_env = &PL_start_env; 1370 PL_top_env = &PL_start_env;
1099 1371
1100 if (cctx->flags & CC_TRACE) 1372 if (cctx_current->flags & CC_TRACE)
1101 PL_runops = runops_trace; 1373 PL_runops = runops_trace;
1102 1374
1103 /* we already must be executing an SLF op, there is no other valid way 1375 /* we already must be executing an SLF op, there is no other valid way
1104 * that can lead to creation of a new cctx */ 1376 * that can lead to creation of a new cctx */
1105 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1377 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1106 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1378 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1107 1379
1108 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1380 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1109 cctx_ssl_cctx = cctx;
1110 cctx_ssl_frame = slf_frame; 1381 cctx_ssl_frame = slf_frame;
1111 1382
1112 slf_frame.prepare = slf_prepare_set_stacklevel; 1383 slf_frame.prepare = slf_prepare_set_stacklevel;
1113 slf_frame.check = slf_check_set_stacklevel; 1384 slf_frame.check = slf_check_set_stacklevel;
1114} 1385}
1115 1386
1116/* the tail of transfer: execute stuff we can only do after a transfer */ 1387/* the tail of transfer: execute stuff we can only do after a transfer */
1117INLINE void 1388ECB_INLINE void
1118transfer_tail (pTHX) 1389transfer_tail (pTHX)
1119{ 1390{
1120 free_coro_mortal (aTHX); 1391 free_coro_mortal (aTHX);
1121} 1392}
1122 1393
… …
1137 /* normally we would need to skip the entersub here */ 1408 /* normally we would need to skip the entersub here */
1138 /* not doing so will re-execute it, which is exactly what we want */ 1409 /* not doing so will re-execute it, which is exactly what we want */
1139 /* PL_nop = PL_nop->op_next */ 1410 /* PL_nop = PL_nop->op_next */
1140 1411
1141 /* inject a fake subroutine call to cctx_init */ 1412 /* inject a fake subroutine call to cctx_init */
1142 cctx_prepare (aTHX_ (coro_cctx *)arg); 1413 cctx_prepare (aTHX);
1143 1414
1144 /* cctx_run is the alternative tail of transfer() */ 1415 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX); 1416 transfer_tail (aTHX);
1146 1417
1147 /* somebody or something will hit me for both perl_run and PL_restartop */ 1418 /* somebody or something will hit me for both perl_run and PL_restartop */
1148 PL_restartop = PL_op; 1419 PL_restartop = PL_op;
1149 perl_run (PL_curinterp); 1420 perl_run (PL_curinterp);
1150 /* 1421 /*
1151 * Unfortunately, there is no way to get at the return values of the 1422 * Unfortunately, there is no way to get at the return values of the
1152 * coro body here, as perl_run destroys these 1423 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1424 * runtime errors here, as this is just a random interpreter, not a thread.
1153 */ 1425 */
1154 1426
1155 /* 1427 /*
1156 * If perl-run returns we assume exit() was being called or the coro 1428 * If perl-run returns we assume exit() was being called or the coro
1157 * fell off the end, which seems to be the only valid (non-bug) 1429 * fell off the end, which seems to be the only valid (non-bug)
1158 * reason for perl_run to return. We try to exit by jumping to the 1430 * reason for perl_run to return. We try to exit by jumping to the
1159 * bootstrap-time "top" top_env, as we cannot restore the "main" 1431 * bootstrap-time "top" top_env, as we cannot restore the "main"
1160 * coroutine as Coro has no such concept 1432 * coroutine as Coro has no such concept.
1433 * This actually isn't valid with the pthread backend, but OSes requiring
1434 * that backend are too broken to do it in a standards-compliant way.
1161 */ 1435 */
1162 PL_top_env = main_top_env; 1436 PL_top_env = main_top_env;
1163 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1437 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1164 } 1438 }
1165} 1439}
… …
1242cctx_destroy (coro_cctx *cctx) 1516cctx_destroy (coro_cctx *cctx)
1243{ 1517{
1244 if (!cctx) 1518 if (!cctx)
1245 return; 1519 return;
1246 1520
1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1522
1247 --cctx_count; 1523 --cctx_count;
1248 coro_destroy (&cctx->cctx); 1524 coro_destroy (&cctx->cctx);
1249 1525
1250 /* coro_transfer creates new, empty cctx's */ 1526 /* coro_transfer creates new, empty cctx's */
1251 if (cctx->sptr) 1527 if (cctx->sptr)
… …
1269#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1545#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1270 1546
1271static coro_cctx * 1547static coro_cctx *
1272cctx_get (pTHX) 1548cctx_get (pTHX)
1273{ 1549{
1274 while (expect_true (cctx_first)) 1550 while (ecb_expect_true (cctx_first))
1275 { 1551 {
1276 coro_cctx *cctx = cctx_first; 1552 coro_cctx *cctx = cctx_first;
1277 cctx_first = cctx->next; 1553 cctx_first = cctx->next;
1278 --cctx_idle; 1554 --cctx_idle;
1279 1555
1280 if (expect_true (!CCTX_EXPIRED (cctx))) 1556 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1281 return cctx; 1557 return cctx;
1282 1558
1283 cctx_destroy (cctx); 1559 cctx_destroy (cctx);
1284 } 1560 }
1285 1561
… …
1290cctx_put (coro_cctx *cctx) 1566cctx_put (coro_cctx *cctx)
1291{ 1567{
1292 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1293 1569
1294 /* free another cctx if overlimit */ 1570 /* free another cctx if overlimit */
1295 if (expect_false (cctx_idle >= cctx_max_idle)) 1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1296 { 1572 {
1297 coro_cctx *first = cctx_first; 1573 coro_cctx *first = cctx_first;
1298 cctx_first = first->next; 1574 cctx_first = first->next;
1299 --cctx_idle; 1575 --cctx_idle;
1300 1576
… …
1311static void 1587static void
1312transfer_check (pTHX_ struct coro *prev, struct coro *next) 1588transfer_check (pTHX_ struct coro *prev, struct coro *next)
1313{ 1589{
1314 /* TODO: throwing up here is considered harmful */ 1590 /* TODO: throwing up here is considered harmful */
1315 1591
1316 if (expect_true (prev != next)) 1592 if (ecb_expect_true (prev != next))
1317 { 1593 {
1318 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1594 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1319 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1595 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1320 1596
1321 if (expect_false (next->flags & CF_RUNNING)) 1597 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1322 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1323
1324 if (expect_false (next->flags & CF_DESTROYED))
1325 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1598 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1326 1599
1327#if !PERL_VERSION_ATLEAST (5,10,0) 1600#if !PERL_VERSION_ATLEAST (5,10,0)
1328 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1601 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1329 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1602 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1330#endif 1603#endif
1331 } 1604 }
1332} 1605}
1333 1606
1334/* always use the TRANSFER macro */ 1607/* always use the TRANSFER macro */
1335static void NOINLINE /* noinline so we have a fixed stackframe */ 1608static void ecb_noinline /* noinline so we have a fixed stackframe */
1336transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1609transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1337{ 1610{
1338 dSTACKLEVEL; 1611 dSTACKLEVEL;
1339 1612
1340 /* sometimes transfer is only called to set idle_sp */ 1613 /* sometimes transfer is only called to set idle_sp */
1341 if (expect_false (!next)) 1614 if (ecb_expect_false (!prev))
1342 { 1615 {
1343 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1616 cctx_current->idle_sp = STACKLEVEL;
1344 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1617 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1345 } 1618 }
1346 else if (expect_true (prev != next)) 1619 else if (ecb_expect_true (prev != next))
1347 { 1620 {
1348 coro_cctx *prev__cctx; 1621 coro_cctx *cctx_prev;
1349 1622
1350 if (expect_false (prev->flags & CF_NEW)) 1623 if (ecb_expect_false (prev->flags & CF_NEW))
1351 { 1624 {
1352 /* create a new empty/source context */ 1625 /* create a new empty/source context */
1353 prev->cctx = cctx_new_empty ();
1354 prev->flags &= ~CF_NEW; 1626 prev->flags &= ~CF_NEW;
1355 prev->flags |= CF_RUNNING; 1627 prev->flags |= CF_RUNNING;
1356 } 1628 }
1357 1629
1358 prev->flags &= ~CF_RUNNING; 1630 prev->flags &= ~CF_RUNNING;
1359 next->flags |= CF_RUNNING; 1631 next->flags |= CF_RUNNING;
1360 1632
1361 /* first get rid of the old state */ 1633 /* first get rid of the old state */
1362 save_perl (aTHX_ prev); 1634 save_perl (aTHX_ prev);
1363 1635
1364 if (expect_false (next->flags & CF_NEW)) 1636 if (ecb_expect_false (next->flags & CF_NEW))
1365 { 1637 {
1366 /* need to start coroutine */ 1638 /* need to start coroutine */
1367 next->flags &= ~CF_NEW; 1639 next->flags &= ~CF_NEW;
1368 /* setup coroutine call */ 1640 /* setup coroutine call */
1369 coro_setup (aTHX_ next); 1641 init_perl (aTHX_ next);
1370 } 1642 }
1371 else 1643 else
1372 load_perl (aTHX_ next); 1644 load_perl (aTHX_ next);
1373 1645
1374 prev__cctx = prev->cctx;
1375
1376 /* possibly untie and reuse the cctx */ 1646 /* possibly untie and reuse the cctx */
1377 if (expect_true ( 1647 if (ecb_expect_true (
1378 prev__cctx->idle_sp == STACKLEVEL 1648 cctx_current->idle_sp == STACKLEVEL
1379 && !(prev__cctx->flags & CC_TRACE) 1649 && !(cctx_current->flags & CC_TRACE)
1380 && !force_cctx 1650 && !force_cctx
1381 )) 1651 ))
1382 { 1652 {
1383 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1653 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1384 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1654 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1385 1655
1386 prev->cctx = 0;
1387
1388 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1656 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1389 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1657 /* without this the next cctx_get might destroy the running cctx while still in use */
1390 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1658 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1391 if (!next->cctx) 1659 if (ecb_expect_true (!next->cctx))
1392 next->cctx = cctx_get (aTHX); 1660 next->cctx = cctx_get (aTHX);
1393 1661
1394 cctx_put (prev__cctx); 1662 cctx_put (cctx_current);
1395 } 1663 }
1664 else
1665 prev->cctx = cctx_current;
1396 1666
1397 ++next->usecount; 1667 ++next->usecount;
1398 1668
1399 if (expect_true (!next->cctx)) 1669 cctx_prev = cctx_current;
1400 next->cctx = cctx_get (aTHX); 1670 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1401 1671
1402 if (expect_false (prev__cctx != next->cctx)) 1672 next->cctx = 0;
1673
1674 if (ecb_expect_false (cctx_prev != cctx_current))
1403 { 1675 {
1404 prev__cctx->top_env = PL_top_env; 1676 cctx_prev->top_env = PL_top_env;
1405 PL_top_env = next->cctx->top_env; 1677 PL_top_env = cctx_current->top_env;
1406 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1678 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1407 } 1679 }
1408 1680
1409 transfer_tail (aTHX); 1681 transfer_tail (aTHX);
1410 } 1682 }
1411} 1683}
… …
1413#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1685#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1414#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1686#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1415 1687
1416/** high level stuff ********************************************************/ 1688/** high level stuff ********************************************************/
1417 1689
1690/* this function is actually Coro, not Coro::State, but we call it from here */
1691/* because it is convenient - but it hasn't been declared yet for that reason */
1418static int 1692static void
1693coro_call_on_destroy (pTHX_ struct coro *coro);
1694
1695static void
1419coro_state_destroy (pTHX_ struct coro *coro) 1696coro_state_destroy (pTHX_ struct coro *coro)
1420{ 1697{
1421 if (coro->flags & CF_DESTROYED) 1698 if (coro->flags & CF_ZOMBIE)
1422 return 0; 1699 return;
1423 1700
1424 if (coro->on_destroy)
1425 coro->on_destroy (aTHX_ coro); 1701 slf_destroy (aTHX_ coro);
1426 1702
1427 coro->flags |= CF_DESTROYED; 1703 coro->flags |= CF_ZOMBIE;
1428 1704
1429 if (coro->flags & CF_READY) 1705 if (coro->flags & CF_READY)
1430 { 1706 {
1431 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1707 /* reduce nready, as destroying a ready coro effectively unreadies it */
1432 /* alternative: look through all ready queues and remove the coro */ 1708 /* alternative: look through all ready queues and remove the coro */
1433 --coro_nready; 1709 --coro_nready;
1434 } 1710 }
1435 else 1711 else
1436 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1712 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1437 1713
1438 if (coro->mainstack && coro->mainstack != main_mainstack) 1714 if (coro->next) coro->next->prev = coro->prev;
1439 { 1715 if (coro->prev) coro->prev->next = coro->next;
1440 struct coro temp; 1716 if (coro == coro_first) coro_first = coro->next;
1441 1717
1442 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1718 if (coro->mainstack
1443 1719 && coro->mainstack != main_mainstack
1444 save_perl (aTHX_ &temp); 1720 && coro->slot
1721 && !PL_dirty)
1445 load_perl (aTHX_ coro); 1722 destroy_perl (aTHX_ coro);
1446
1447 coro_destruct (aTHX_ coro);
1448
1449 load_perl (aTHX_ &temp);
1450
1451 coro->slot = 0;
1452 }
1453 1723
1454 cctx_destroy (coro->cctx); 1724 cctx_destroy (coro->cctx);
1455 SvREFCNT_dec (coro->startcv); 1725 SvREFCNT_dec (coro->startcv);
1456 SvREFCNT_dec (coro->args); 1726 SvREFCNT_dec (coro->args);
1727 SvREFCNT_dec (coro->swap_sv);
1457 SvREFCNT_dec (CORO_THROW); 1728 SvREFCNT_dec (CORO_THROW);
1458 1729
1459 if (coro->next) coro->next->prev = coro->prev; 1730 coro_call_on_destroy (aTHX_ coro);
1460 if (coro->prev) coro->prev->next = coro->next;
1461 if (coro == coro_first) coro_first = coro->next;
1462 1731
1463 return 1; 1732 /* more destruction mayhem in coro_state_free */
1464} 1733}
1465 1734
1466static int 1735static int
1467coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1736coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1468{ 1737{
1469 struct coro *coro = (struct coro *)mg->mg_ptr; 1738 struct coro *coro = (struct coro *)mg->mg_ptr;
1470 mg->mg_ptr = 0; 1739 mg->mg_ptr = 0;
1471 1740
1472 coro->hv = 0;
1473
1474 if (--coro->refcnt < 0)
1475 {
1476 coro_state_destroy (aTHX_ coro); 1741 coro_state_destroy (aTHX_ coro);
1742 SvREFCNT_dec (coro->on_destroy);
1743 SvREFCNT_dec (coro->status);
1744
1477 Safefree (coro); 1745 Safefree (coro);
1478 }
1479 1746
1480 return 0; 1747 return 0;
1481} 1748}
1482 1749
1483static int 1750static int ecb_cold
1484coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1751coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1485{ 1752{
1486 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 /* called when perl clones the current process the slow way (windows process emulation) */
1487 1754 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1488 ++coro->refcnt; 1755 mg->mg_ptr = 0;
1756 mg->mg_virtual = 0;
1489 1757
1490 return 0; 1758 return 0;
1491} 1759}
1492 1760
1493static MGVTBL coro_state_vtbl = { 1761static MGVTBL coro_state_vtbl = {
… …
1516 1784
1517 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1785 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1518 TRANSFER (ta, 1); 1786 TRANSFER (ta, 1);
1519} 1787}
1520 1788
1521/*****************************************************************************/
1522/* gensub: simple closure generation utility */
1523
1524#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1525
1526/* create a closure from XS, returns a code reference */
1527/* the arg can be accessed via GENSUB_ARG from the callback */
1528/* the callback must use dXSARGS/XSRETURN */
1529static SV *
1530gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1531{
1532 CV *cv = (CV *)newSV (0);
1533
1534 sv_upgrade ((SV *)cv, SVt_PVCV);
1535
1536 CvANON_on (cv);
1537 CvISXSUB_on (cv);
1538 CvXSUB (cv) = xsub;
1539 GENSUB_ARG = arg;
1540
1541 return newRV_noinc ((SV *)cv);
1542}
1543
1544/** Coro ********************************************************************/ 1789/** Coro ********************************************************************/
1545 1790
1546INLINE void 1791ECB_INLINE void
1547coro_enq (pTHX_ struct coro *coro) 1792coro_enq (pTHX_ struct coro *coro)
1548{ 1793{
1549 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1550}
1551 1795
1552INLINE SV * 1796 SvREFCNT_inc_NN (coro->hv);
1797
1798 coro->next_ready = 0;
1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1800 ready [1] = coro;
1801}
1802
1803ECB_INLINE struct coro *
1553coro_deq (pTHX) 1804coro_deq (pTHX)
1554{ 1805{
1555 int prio; 1806 int prio;
1556 1807
1557 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1558 if (AvFILLp (coro_ready [prio]) >= 0) 1809 {
1559 return av_shift (coro_ready [prio]); 1810 struct coro **ready = coro_ready [prio];
1811
1812 if (ready [0])
1813 {
1814 struct coro *coro = ready [0];
1815 ready [0] = coro->next_ready;
1816 return coro;
1817 }
1818 }
1560 1819
1561 return 0; 1820 return 0;
1821}
1822
1823static void
1824invoke_sv_ready_hook_helper (void)
1825{
1826 dTHX;
1827 dSP;
1828
1829 ENTER;
1830 SAVETMPS;
1831
1832 PUSHMARK (SP);
1833 PUTBACK;
1834 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1835
1836 FREETMPS;
1837 LEAVE;
1562} 1838}
1563 1839
1564static int 1840static int
1565api_ready (pTHX_ SV *coro_sv) 1841api_ready (pTHX_ SV *coro_sv)
1566{ 1842{
1567 struct coro *coro;
1568 SV *sv_hook;
1569 void (*xs_hook)(void);
1570
1571 if (SvROK (coro_sv))
1572 coro_sv = SvRV (coro_sv);
1573
1574 coro = SvSTATE (coro_sv); 1843 struct coro *coro = SvSTATE (coro_sv);
1575 1844
1576 if (coro->flags & CF_READY) 1845 if (coro->flags & CF_READY)
1577 return 0; 1846 return 0;
1578 1847
1579 coro->flags |= CF_READY; 1848 coro->flags |= CF_READY;
1580 1849
1581 sv_hook = coro_nready ? 0 : coro_readyhook;
1582 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1583
1584 coro_enq (aTHX_ coro); 1850 coro_enq (aTHX_ coro);
1585 ++coro_nready;
1586 1851
1587 if (sv_hook) 1852 if (!coro_nready++)
1588 { 1853 if (coroapi.readyhook)
1589 dSP; 1854 coroapi.readyhook ();
1590
1591 ENTER;
1592 SAVETMPS;
1593
1594 PUSHMARK (SP);
1595 PUTBACK;
1596 call_sv (sv_hook, G_VOID | G_DISCARD);
1597
1598 FREETMPS;
1599 LEAVE;
1600 }
1601
1602 if (xs_hook)
1603 xs_hook ();
1604 1855
1605 return 1; 1856 return 1;
1606} 1857}
1607 1858
1608static int 1859static int
1609api_is_ready (pTHX_ SV *coro_sv) 1860api_is_ready (pTHX_ SV *coro_sv)
1610{ 1861{
1611 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1862 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1612} 1863}
1613 1864
1865/* expects to own a reference to next->hv */
1614INLINE void 1866ECB_INLINE void
1615prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1616{ 1868{
1617 SV *prev_sv, *next_sv;
1618
1619 for (;;)
1620 {
1621 next_sv = coro_deq (aTHX);
1622
1623 /* nothing to schedule: call the idle handler */
1624 if (expect_false (!next_sv))
1625 {
1626 dSP;
1627
1628 ENTER;
1629 SAVETMPS;
1630
1631 PUSHMARK (SP);
1632 PUTBACK;
1633 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1634
1635 FREETMPS;
1636 LEAVE;
1637 continue;
1638 }
1639
1640 ta->next = SvSTATE_hv (next_sv);
1641
1642 /* cannot transfer to destroyed coros, skip and look for next */
1643 if (expect_false (ta->next->flags & CF_DESTROYED))
1644 {
1645 SvREFCNT_dec (next_sv);
1646 /* coro_nready has already been taken care of by destroy */
1647 continue;
1648 }
1649
1650 --coro_nready;
1651 break;
1652 }
1653
1654 /* free this only after the transfer */
1655 prev_sv = SvRV (coro_current); 1869 SV *prev_sv = SvRV (coro_current);
1870
1656 ta->prev = SvSTATE_hv (prev_sv); 1871 ta->prev = SvSTATE_hv (prev_sv);
1872 ta->next = next;
1873
1657 TRANSFER_CHECK (*ta); 1874 TRANSFER_CHECK (*ta);
1658 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1875
1659 ta->next->flags &= ~CF_READY;
1660 SvRV_set (coro_current, next_sv); 1876 SvRV_set (coro_current, (SV *)next->hv);
1661 1877
1662 free_coro_mortal (aTHX); 1878 free_coro_mortal (aTHX);
1663 coro_mortal = prev_sv; 1879 coro_mortal = prev_sv;
1664} 1880}
1665 1881
1882static void
1883prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1884{
1885 for (;;)
1886 {
1887 struct coro *next = coro_deq (aTHX);
1888
1889 if (ecb_expect_true (next))
1890 {
1891 /* cannot transfer to destroyed coros, skip and look for next */
1892 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1893 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1894 else
1895 {
1896 next->flags &= ~CF_READY;
1897 --coro_nready;
1898
1899 prepare_schedule_to (aTHX_ ta, next);
1900 break;
1901 }
1902 }
1903 else
1904 {
1905 /* nothing to schedule: call the idle handler */
1906 if (SvROK (sv_idle)
1907 && SvOBJECT (SvRV (sv_idle)))
1908 {
1909 if (SvRV (sv_idle) == SvRV (coro_current))
1910 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1911
1912 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1913 api_ready (aTHX_ SvRV (sv_idle));
1914 --coro_nready;
1915 }
1916 else
1917 {
1918 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1919 dSP;
1920
1921 ENTER;
1922 SAVETMPS;
1923
1924 PUSHMARK (SP);
1925 PUTBACK;
1926 call_sv (sv_idle, G_VOID | G_DISCARD);
1927
1928 FREETMPS;
1929 LEAVE;
1930 }
1931 }
1932 }
1933}
1934
1666INLINE void 1935ECB_INLINE void
1667prepare_cede (pTHX_ struct coro_transfer_args *ta) 1936prepare_cede (pTHX_ struct coro_transfer_args *ta)
1668{ 1937{
1669 api_ready (aTHX_ coro_current); 1938 api_ready (aTHX_ coro_current);
1670 prepare_schedule (aTHX_ ta); 1939 prepare_schedule (aTHX_ ta);
1671} 1940}
1672 1941
1673INLINE void 1942ECB_INLINE void
1674prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1675{ 1944{
1676 SV *prev = SvRV (coro_current); 1945 SV *prev = SvRV (coro_current);
1677 1946
1678 if (coro_nready) 1947 if (coro_nready)
… …
1691 1960
1692 prepare_schedule (aTHX_ &ta); 1961 prepare_schedule (aTHX_ &ta);
1693 TRANSFER (ta, 1); 1962 TRANSFER (ta, 1);
1694} 1963}
1695 1964
1965static void
1966api_schedule_to (pTHX_ SV *coro_sv)
1967{
1968 struct coro_transfer_args ta;
1969 struct coro *next = SvSTATE (coro_sv);
1970
1971 SvREFCNT_inc_NN (coro_sv);
1972 prepare_schedule_to (aTHX_ &ta, next);
1973}
1974
1696static int 1975static int
1697api_cede (pTHX) 1976api_cede (pTHX)
1698{ 1977{
1699 struct coro_transfer_args ta; 1978 struct coro_transfer_args ta;
1700 1979
1701 prepare_cede (aTHX_ &ta); 1980 prepare_cede (aTHX_ &ta);
1702 1981
1703 if (expect_true (ta.prev != ta.next)) 1982 if (ecb_expect_true (ta.prev != ta.next))
1704 { 1983 {
1705 TRANSFER (ta, 1); 1984 TRANSFER (ta, 1);
1706 return 1; 1985 return 1;
1707 } 1986 }
1708 else 1987 else
… …
1727static void 2006static void
1728api_trace (pTHX_ SV *coro_sv, int flags) 2007api_trace (pTHX_ SV *coro_sv, int flags)
1729{ 2008{
1730 struct coro *coro = SvSTATE (coro_sv); 2009 struct coro *coro = SvSTATE (coro_sv);
1731 2010
2011 if (coro->flags & CF_RUNNING)
2012 croak ("cannot enable tracing on a running coroutine, caught");
2013
1732 if (flags & CC_TRACE) 2014 if (flags & CC_TRACE)
1733 { 2015 {
1734 if (!coro->cctx) 2016 if (!coro->cctx)
1735 coro->cctx = cctx_new_run (); 2017 coro->cctx = cctx_new_run ();
1736 else if (!(coro->cctx->flags & CC_TRACE)) 2018 else if (!(coro->cctx->flags & CC_TRACE))
1737 croak ("cannot enable tracing on coroutine with custom stack,"); 2019 croak ("cannot enable tracing on coroutine with custom stack, caught");
1738 2020
1739 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2021 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1740 } 2022 }
1741 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2023 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1742 { 2024 {
… …
1745 if (coro->flags & CF_RUNNING) 2027 if (coro->flags & CF_RUNNING)
1746 PL_runops = RUNOPS_DEFAULT; 2028 PL_runops = RUNOPS_DEFAULT;
1747 else 2029 else
1748 coro->slot->runops = RUNOPS_DEFAULT; 2030 coro->slot->runops = RUNOPS_DEFAULT;
1749 } 2031 }
2032}
2033
2034static void
2035coro_push_av (pTHX_ AV *av, I32 gimme_v)
2036{
2037 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2038 {
2039 dSP;
2040
2041 if (gimme_v == G_SCALAR)
2042 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2043 else
2044 {
2045 int i;
2046 EXTEND (SP, AvFILLp (av) + 1);
2047
2048 for (i = 0; i <= AvFILLp (av); ++i)
2049 PUSHs (AvARRAY (av)[i]);
2050 }
2051
2052 PUTBACK;
2053 }
2054}
2055
2056static void
2057coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2058{
2059 if (!coro->on_destroy)
2060 coro->on_destroy = newAV ();
2061
2062 av_push (coro->on_destroy, cb);
2063}
2064
2065static void
2066slf_destroy_join (pTHX_ struct CoroSLF *frame)
2067{
2068 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2069}
2070
2071static int
2072slf_check_join (pTHX_ struct CoroSLF *frame)
2073{
2074 struct coro *coro = (struct coro *)frame->data;
2075
2076 if (!coro->status)
2077 return 1;
2078
2079 frame->destroy = 0;
2080
2081 coro_push_av (aTHX_ coro->status, GIMME_V);
2082
2083 SvREFCNT_dec ((SV *)coro->hv);
2084
2085 return 0;
2086}
2087
2088static void
2089slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2090{
2091 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2092
2093 if (items > 1)
2094 croak ("join called with too many arguments");
2095
2096 if (coro->status)
2097 frame->prepare = prepare_nop;
2098 else
2099 {
2100 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2101 frame->prepare = prepare_schedule;
2102 }
2103
2104 frame->check = slf_check_join;
2105 frame->destroy = slf_destroy_join;
2106 frame->data = (void *)coro;
2107 SvREFCNT_inc (coro->hv);
2108}
2109
2110static void
2111coro_call_on_destroy (pTHX_ struct coro *coro)
2112{
2113 AV *od = coro->on_destroy;
2114
2115 if (!od)
2116 return;
2117
2118 while (AvFILLp (od) >= 0)
2119 {
2120 SV *cb = sv_2mortal (av_pop (od));
2121
2122 /* coro hv's (and only hv's at the moment) are supported as well */
2123 if (SvSTATEhv_p (aTHX_ cb))
2124 api_ready (aTHX_ cb);
2125 else
2126 {
2127 dSP; /* don't disturb outer sp */
2128 PUSHMARK (SP);
2129
2130 if (coro->status)
2131 {
2132 PUTBACK;
2133 coro_push_av (aTHX_ coro->status, G_ARRAY);
2134 SPAGAIN;
2135 }
2136
2137 PUTBACK;
2138 call_sv (cb, G_VOID | G_DISCARD);
2139 }
2140 }
2141}
2142
2143static void
2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2145{
2146 AV *av;
2147
2148 if (coro->status)
2149 {
2150 av = coro->status;
2151 av_clear (av);
2152 }
2153 else
2154 av = coro->status = newAV ();
2155
2156 /* items are actually not so common, so optimise for this case */
2157 if (items)
2158 {
2159 int i;
2160
2161 av_extend (av, items - 1);
2162
2163 for (i = 0; i < items; ++i)
2164 av_push (av, SvREFCNT_inc_NN (arg [i]));
2165 }
2166}
2167
2168static void
2169slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2170{
2171 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2172 api_ready (aTHX_ sv_manager);
2173
2174 frame->prepare = prepare_schedule;
2175 frame->check = slf_check_repeat;
2176
2177 /* as a minor optimisation, we could unwind all stacks here */
2178 /* but that puts extra pressure on pp_slf, and is not worth much */
2179 /*coro_unwind_stacks (aTHX);*/
2180}
2181
2182static void
2183slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{
2185 HV *coro_hv = (HV *)SvRV (coro_current);
2186
2187 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2188 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2189}
2190
2191static void
2192slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2193{
2194 HV *coro_hv;
2195 struct coro *coro;
2196
2197 if (items <= 0)
2198 croak ("Coro::cancel called without coro object,");
2199
2200 coro = SvSTATE (arg [0]);
2201 coro_hv = coro->hv;
2202
2203 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2204
2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2206 {
2207 /* coro currently busy cancelling something, so just notify it */
2208 coro->slf_frame.data = (void *)coro;
2209
2210 frame->prepare = prepare_nop;
2211 frame->check = slf_check_nop;
2212 }
2213 else if (coro_hv == (HV *)SvRV (coro_current))
2214 {
2215 /* cancelling the current coro is allowed, and equals terminate */
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217 }
2218 else
2219 {
2220 struct coro *self = SvSTATE_current;
2221
2222 /* otherwise we cancel directly, purely for speed reasons
2223 * unfortunately, this requires some magic trickery, as
2224 * somebody else could cancel us, so we have to fight the cancellation.
2225 * this is ugly, and hopefully fully worth the extra speed.
2226 * besides, I can't get the slow-but-safe version working...
2227 */
2228 slf_frame.data = 0;
2229 self->flags |= CF_NOCANCEL;
2230 coro_state_destroy (aTHX_ coro);
2231 self->flags &= ~CF_NOCANCEL;
2232
2233 if (slf_frame.data)
2234 {
2235 /* while we were busy we have been cancelled, so terminate */
2236 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2237 }
2238 else
2239 {
2240 frame->prepare = prepare_nop;
2241 frame->check = slf_check_nop;
2242 }
2243 }
2244}
2245
2246static int
2247slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2248{
2249 frame->prepare = 0;
2250 coro_unwind_stacks (aTHX);
2251
2252 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2253
2254 return 1;
2255}
2256
2257static int
2258safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2259{
2260 if (coro->cctx)
2261 croak ("coro inside C callback, unable to cancel at this time, caught");
2262
2263 if (coro->flags & CF_NEW)
2264 {
2265 coro_set_status (aTHX_ coro, arg, items);
2266 coro_state_destroy (aTHX_ coro);
2267 }
2268 else
2269 {
2270 if (!coro->slf_frame.prepare)
2271 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2272
2273 slf_destroy (aTHX_ coro);
2274
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro->slf_frame.prepare = prepare_nop;
2277 coro->slf_frame.check = slf_check_safe_cancel;
2278
2279 api_ready (aTHX_ (SV *)coro->hv);
2280 }
2281
2282 return 1;
1750} 2283}
1751 2284
1752/*****************************************************************************/ 2285/*****************************************************************************/
1753/* async pool handler */ 2286/* async pool handler */
1754 2287
… …
1785slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2318slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1786{ 2319{
1787 HV *hv = (HV *)SvRV (coro_current); 2320 HV *hv = (HV *)SvRV (coro_current);
1788 struct coro *coro = SvSTATE_hv ((SV *)hv); 2321 struct coro *coro = SvSTATE_hv ((SV *)hv);
1789 2322
1790 if (expect_true (coro->saved_deffh)) 2323 if (ecb_expect_true (coro->saved_deffh))
1791 { 2324 {
1792 /* subsequent iteration */ 2325 /* subsequent iteration */
1793 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2326 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1794 coro->saved_deffh = 0; 2327 coro->saved_deffh = 0;
1795 2328
1796 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2329 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1797 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2330 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1798 { 2331 {
1799 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2332 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1800 coro->invoke_av = newAV (); 2333 return;
1801
1802 frame->prepare = prepare_nop;
1803 } 2334 }
1804 else 2335 else
1805 { 2336 {
1806 av_clear (GvAV (PL_defgv)); 2337 av_clear (GvAV (PL_defgv));
1807 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2338 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1832 2363
1833static void 2364static void
1834coro_rouse_callback (pTHX_ CV *cv) 2365coro_rouse_callback (pTHX_ CV *cv)
1835{ 2366{
1836 dXSARGS; 2367 dXSARGS;
1837 SV *data = (SV *)GENSUB_ARG; 2368 SV *data = (SV *)S_GENSUB_ARG;
1838 2369
1839 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2370 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1840 { 2371 {
1841 /* first call, set args */ 2372 /* first call, set args */
2373 SV *coro = SvRV (data);
1842 AV *av = newAV (); 2374 AV *av = newAV ();
1843 SV *coro = SvRV (data);
1844 2375
1845 SvRV_set (data, (SV *)av); 2376 SvRV_set (data, (SV *)av);
1846 api_ready (aTHX_ coro);
1847 SvREFCNT_dec (coro);
1848 2377
1849 /* better take a full copy of the arguments */ 2378 /* better take a full copy of the arguments */
1850 while (items--) 2379 while (items--)
1851 av_store (av, items, newSVsv (ST (items))); 2380 av_store (av, items, newSVsv (ST (items)));
2381
2382 api_ready (aTHX_ coro);
2383 SvREFCNT_dec (coro);
1852 } 2384 }
1853 2385
1854 XSRETURN_EMPTY; 2386 XSRETURN_EMPTY;
1855} 2387}
1856 2388
… …
1873 2405
1874 EXTEND (SP, AvFILLp (av) + 1); 2406 EXTEND (SP, AvFILLp (av) + 1);
1875 for (i = 0; i <= AvFILLp (av); ++i) 2407 for (i = 0; i <= AvFILLp (av); ++i)
1876 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2408 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1877 2409
1878 /* we have stolen the elements, so ste length to zero and free */ 2410 /* we have stolen the elements, so set length to zero and free */
1879 AvFILLp (av) = -1; 2411 AvFILLp (av) = -1;
1880 av_undef (av); 2412 av_undef (av);
1881 2413
1882 PUTBACK; 2414 PUTBACK;
1883 } 2415 }
… …
1907 || SvTYPE (SvRV (cb)) != SVt_PVCV 2439 || SvTYPE (SvRV (cb)) != SVt_PVCV
1908 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2440 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1909 croak ("Coro::rouse_wait called with illegal callback argument,"); 2441 croak ("Coro::rouse_wait called with illegal callback argument,");
1910 2442
1911 { 2443 {
1912 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2444 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1913 SV *data = (SV *)GENSUB_ARG; 2445 SV *data = (SV *)S_GENSUB_ARG;
1914 2446
1915 frame->data = (void *)data; 2447 frame->data = (void *)data;
1916 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2448 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1917 frame->check = slf_check_rouse_wait; 2449 frame->check = slf_check_rouse_wait;
1918 } 2450 }
… …
1922coro_new_rouse_cb (pTHX) 2454coro_new_rouse_cb (pTHX)
1923{ 2455{
1924 HV *hv = (HV *)SvRV (coro_current); 2456 HV *hv = (HV *)SvRV (coro_current);
1925 struct coro *coro = SvSTATE_hv (hv); 2457 struct coro *coro = SvSTATE_hv (hv);
1926 SV *data = newRV_inc ((SV *)hv); 2458 SV *data = newRV_inc ((SV *)hv);
1927 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2459 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1928 2460
1929 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2461 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1930 SvREFCNT_dec (data); /* magicext increases the refcount */ 2462 SvREFCNT_dec (data); /* magicext increases the refcount */
1931 2463
1932 SvREFCNT_dec (coro->rouse_cb); 2464 SvREFCNT_dec (coro->rouse_cb);
… …
1990 frame->prepare = prepare_schedule; 2522 frame->prepare = prepare_schedule;
1991 frame->check = slf_check_nop; 2523 frame->check = slf_check_nop;
1992} 2524}
1993 2525
1994static void 2526static void
2527slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2528{
2529 struct coro *next = (struct coro *)slf_frame.data;
2530
2531 SvREFCNT_inc_NN (next->hv);
2532 prepare_schedule_to (aTHX_ ta, next);
2533}
2534
2535static void
2536slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2537{
2538 if (!items)
2539 croak ("Coro::schedule_to expects a coroutine argument, caught");
2540
2541 frame->data = (void *)SvSTATE (arg [0]);
2542 frame->prepare = slf_prepare_schedule_to;
2543 frame->check = slf_check_nop;
2544}
2545
2546static void
2547slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2548{
2549 api_ready (aTHX_ SvRV (coro_current));
2550
2551 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2552}
2553
2554static void
1995slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2555slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1996{ 2556{
1997 frame->prepare = prepare_cede; 2557 frame->prepare = prepare_cede;
1998 frame->check = slf_check_nop; 2558 frame->check = slf_check_nop;
1999} 2559}
… …
2001static void 2561static void
2002slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2562slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2003{ 2563{
2004 frame->prepare = prepare_cede_notself; 2564 frame->prepare = prepare_cede_notself;
2005 frame->check = slf_check_nop; 2565 frame->check = slf_check_nop;
2566}
2567
2568/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2569static void
2570slf_destroy (pTHX_ struct coro *coro)
2571{
2572 /* this callback is reserved for slf functions needing to do cleanup */
2573 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2574 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2575
2576 /*
2577 * The on_destroy above most likely is from an SLF call.
2578 * Since by definition the SLF call will not finish when we destroy
2579 * the coro, we will have to force-finish it here, otherwise
2580 * cleanup functions cannot call SLF functions.
2581 */
2582 coro->slf_frame.prepare = 0;
2006} 2583}
2007 2584
2008/* 2585/*
2009 * these not obviously related functions are all rolled into one 2586 * these not obviously related functions are all rolled into one
2010 * function to increase chances that they all will call transfer with the same 2587 * function to increase chances that they all will call transfer with the same
… …
2017 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2594 I32 checkmark; /* mark SP to see how many elements check has pushed */
2018 2595
2019 /* set up the slf frame, unless it has already been set-up */ 2596 /* set up the slf frame, unless it has already been set-up */
2020 /* the latter happens when a new coro has been started */ 2597 /* the latter happens when a new coro has been started */
2021 /* or when a new cctx was attached to an existing coroutine */ 2598 /* or when a new cctx was attached to an existing coroutine */
2022 if (expect_true (!slf_frame.prepare)) 2599 if (ecb_expect_true (!slf_frame.prepare))
2023 { 2600 {
2024 /* first iteration */ 2601 /* first iteration */
2025 dSP; 2602 dSP;
2026 SV **arg = PL_stack_base + TOPMARK + 1; 2603 SV **arg = PL_stack_base + TOPMARK + 1;
2027 int items = SP - arg; /* args without function object */ 2604 int items = SP - arg; /* args without function object */
… …
2068 while (slf_frame.check (aTHX_ &slf_frame)); 2645 while (slf_frame.check (aTHX_ &slf_frame));
2069 2646
2070 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2647 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2071 2648
2072 /* exception handling */ 2649 /* exception handling */
2073 if (expect_false (CORO_THROW)) 2650 if (ecb_expect_false (CORO_THROW))
2074 { 2651 {
2075 SV *exception = sv_2mortal (CORO_THROW); 2652 SV *exception = sv_2mortal (CORO_THROW);
2076 2653
2077 CORO_THROW = 0; 2654 CORO_THROW = 0;
2078 sv_setsv (ERRSV, exception); 2655 sv_setsv (ERRSV, exception);
2079 croak (0); 2656 croak (0);
2080 } 2657 }
2081 2658
2082 /* return value handling - mostly like entersub */ 2659 /* return value handling - mostly like entersub */
2083 /* make sure we put something on the stack in scalar context */ 2660 /* make sure we put something on the stack in scalar context */
2084 if (GIMME_V == G_SCALAR) 2661 if (GIMME_V == G_SCALAR
2662 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2085 { 2663 {
2086 dSP; 2664 dSP;
2087 SV **bot = PL_stack_base + checkmark; 2665 SV **bot = PL_stack_base + checkmark;
2088 2666
2089 if (sp == bot) /* too few, push undef */ 2667 if (sp == bot) /* too few, push undef */
2090 bot [1] = &PL_sv_undef; 2668 bot [1] = &PL_sv_undef;
2091 else if (sp != bot + 1) /* too many, take last one */ 2669 else /* too many, take last one */
2092 bot [1] = *sp; 2670 bot [1] = *sp;
2093 2671
2094 SP = bot + 1; 2672 SP = bot + 1;
2095 2673
2096 PUTBACK; 2674 PUTBACK;
… …
2129 if (PL_op->op_flags & OPf_STACKED) 2707 if (PL_op->op_flags & OPf_STACKED)
2130 { 2708 {
2131 if (items > slf_arga) 2709 if (items > slf_arga)
2132 { 2710 {
2133 slf_arga = items; 2711 slf_arga = items;
2134 free (slf_argv); 2712 Safefree (slf_argv);
2135 slf_argv = malloc (slf_arga * sizeof (SV *)); 2713 New (0, slf_argv, slf_arga, SV *);
2136 } 2714 }
2137 2715
2138 slf_argc = items; 2716 slf_argc = items;
2139 2717
2140 for (i = 0; i < items; ++i) 2718 for (i = 0; i < items; ++i)
… …
2142 } 2720 }
2143 else 2721 else
2144 slf_argc = 0; 2722 slf_argc = 0;
2145 2723
2146 PL_op->op_ppaddr = pp_slf; 2724 PL_op->op_ppaddr = pp_slf;
2147 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2725 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2148 2726
2149 PL_op = (OP *)&slf_restore; 2727 PL_op = (OP *)&slf_restore;
2728}
2729
2730/*****************************************************************************/
2731/* dynamic wind */
2732
2733static void
2734on_enterleave_call (pTHX_ SV *cb)
2735{
2736 dSP;
2737
2738 PUSHSTACK;
2739
2740 PUSHMARK (SP);
2741 PUTBACK;
2742 call_sv (cb, G_VOID | G_DISCARD);
2743 SPAGAIN;
2744
2745 POPSTACK;
2746}
2747
2748static SV *
2749coro_avp_pop_and_free (pTHX_ AV **avp)
2750{
2751 AV *av = *avp;
2752 SV *res = av_pop (av);
2753
2754 if (AvFILLp (av) < 0)
2755 {
2756 *avp = 0;
2757 SvREFCNT_dec (av);
2758 }
2759
2760 return res;
2761}
2762
2763static void
2764coro_pop_on_enter (pTHX_ void *coro)
2765{
2766 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2767 SvREFCNT_dec (cb);
2768}
2769
2770static void
2771coro_pop_on_leave (pTHX_ void *coro)
2772{
2773 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2774 on_enterleave_call (aTHX_ sv_2mortal (cb));
2150} 2775}
2151 2776
2152/*****************************************************************************/ 2777/*****************************************************************************/
2153/* PerlIO::cede */ 2778/* PerlIO::cede */
2154 2779
… …
2156{ 2781{
2157 PerlIOBuf base; 2782 PerlIOBuf base;
2158 NV next, every; 2783 NV next, every;
2159} PerlIOCede; 2784} PerlIOCede;
2160 2785
2161static IV 2786static IV ecb_cold
2162PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2787PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2163{ 2788{
2164 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2165 2790
2166 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2791 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2167 self->next = nvtime () + self->every; 2792 self->next = nvtime () + self->every;
2168 2793
2169 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2794 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2170} 2795}
2171 2796
2172static SV * 2797static SV * ecb_cold
2173PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2798PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2174{ 2799{
2175 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2800 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2176 2801
2177 return newSVnv (self->every); 2802 return newSVnv (self->every);
… …
2228/* Coro::Semaphore & Coro::Signal */ 2853/* Coro::Semaphore & Coro::Signal */
2229 2854
2230static SV * 2855static SV *
2231coro_waitarray_new (pTHX_ int count) 2856coro_waitarray_new (pTHX_ int count)
2232{ 2857{
2233 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2858 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2234 AV *av = newAV (); 2859 AV *av = newAV ();
2235 SV **ary; 2860 SV **ary;
2236 2861
2237 /* unfortunately, building manually saves memory */ 2862 /* unfortunately, building manually saves memory */
2238 Newx (ary, 2, SV *); 2863 Newx (ary, 2, SV *);
2239 AvALLOC (av) = ary; 2864 AvALLOC (av) = ary;
2865#if PERL_VERSION_ATLEAST (5,10,0)
2240 /*AvARRAY (av) = ary;*/ 2866 AvARRAY (av) = ary;
2867#else
2241 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2868 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2869 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2870 SvPVX ((SV *)av) = (char *)ary;
2871#endif
2242 AvMAX (av) = 1; 2872 AvMAX (av) = 1;
2243 AvFILLp (av) = 0; 2873 AvFILLp (av) = 0;
2244 ary [0] = newSViv (count); 2874 ary [0] = newSViv (count);
2245 2875
2246 return newRV_noinc ((SV *)av); 2876 return newRV_noinc ((SV *)av);
… …
2284 SvREFCNT_dec (cb); 2914 SvREFCNT_dec (cb);
2285 } 2915 }
2286} 2916}
2287 2917
2288static void 2918static void
2289coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2919coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2290{ 2920{
2291 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2921 /* call $sem->adjust (0) to possibly wake up some other waiters */
2292 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2922 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2293} 2923}
2294 2924
2295static int 2925static int
2296slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2926slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2297{ 2927{
2298 AV *av = (AV *)frame->data; 2928 AV *av = (AV *)frame->data;
2299 SV *count_sv = AvARRAY (av)[0]; 2929 SV *count_sv = AvARRAY (av)[0];
2930 SV *coro_hv = SvRV (coro_current);
2300 2931
2301 /* if we are about to throw, don't actually acquire the lock, just throw */ 2932 /* if we are about to throw, don't actually acquire the lock, just throw */
2302 if (CORO_THROW) 2933 if (CORO_THROW)
2303 return 0; 2934 return 0;
2304 else if (SvIVX (count_sv) > 0) 2935 else if (SvIVX (count_sv) > 0)
2305 { 2936 {
2306 SvSTATE_current->on_destroy = 0; 2937 frame->destroy = 0;
2307 2938
2308 if (acquire) 2939 if (acquire)
2309 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2940 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2310 else 2941 else
2311 coro_semaphore_adjust (aTHX_ av, 0); 2942 coro_semaphore_adjust (aTHX_ av, 0);
… …
2316 { 2947 {
2317 int i; 2948 int i;
2318 /* if we were woken up but can't down, we look through the whole */ 2949 /* if we were woken up but can't down, we look through the whole */
2319 /* waiters list and only add us if we aren't in there already */ 2950 /* waiters list and only add us if we aren't in there already */
2320 /* this avoids some degenerate memory usage cases */ 2951 /* this avoids some degenerate memory usage cases */
2321 2952 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2322 for (i = 1; i <= AvFILLp (av); ++i)
2323 if (AvARRAY (av)[i] == SvRV (coro_current)) 2953 if (AvARRAY (av)[i] == coro_hv)
2324 return 1; 2954 return 1;
2325 2955
2326 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2956 av_push (av, SvREFCNT_inc (coro_hv));
2327 return 1; 2957 return 1;
2328 } 2958 }
2329} 2959}
2330 2960
2331static int 2961static int
… …
2354 { 2984 {
2355 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2985 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2356 2986
2357 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2987 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2358 frame->prepare = prepare_schedule; 2988 frame->prepare = prepare_schedule;
2359
2360 /* to avoid race conditions when a woken-up coro gets terminated */ 2989 /* to avoid race conditions when a woken-up coro gets terminated */
2361 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2990 /* we arrange for a temporary on_destroy that calls adjust (0) */
2362 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2991 frame->destroy = coro_semaphore_destroy;
2363 } 2992 }
2364} 2993}
2365 2994
2366static void 2995static void
2367slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2996slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2375{ 3004{
2376 if (items >= 2) 3005 if (items >= 2)
2377 { 3006 {
2378 /* callback form */ 3007 /* callback form */
2379 AV *av = (AV *)SvRV (arg [0]); 3008 AV *av = (AV *)SvRV (arg [0]);
2380 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3009 SV *cb_cv = s_get_cv_croak (arg [1]);
2381 3010
2382 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3011 av_push (av, SvREFCNT_inc_NN (cb_cv));
2383 3012
2384 if (SvIVX (AvARRAY (av)[0]) > 0) 3013 if (SvIVX (AvARRAY (av)[0]) > 0)
2385 coro_semaphore_adjust (aTHX_ av, 0); 3014 coro_semaphore_adjust (aTHX_ av, 0);
2386 3015
2387 frame->prepare = prepare_nop; 3016 frame->prepare = prepare_nop;
… …
2411 AvARRAY (av)[0] = AvARRAY (av)[1]; 3040 AvARRAY (av)[0] = AvARRAY (av)[1];
2412 AvARRAY (av)[1] = cb; 3041 AvARRAY (av)[1] = cb;
2413 3042
2414 cb = av_shift (av); 3043 cb = av_shift (av);
2415 3044
3045 if (SvTYPE (cb) == SVt_PVCV)
3046 {
3047 dSP;
3048 PUSHMARK (SP);
3049 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3050 PUTBACK;
3051 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3052 }
3053 else
3054 {
2416 api_ready (aTHX_ cb); 3055 api_ready (aTHX_ cb);
2417 sv_setiv (cb, 0); /* signal waiter */ 3056 sv_setiv (cb, 0); /* signal waiter */
3057 }
3058
2418 SvREFCNT_dec (cb); 3059 SvREFCNT_dec (cb);
2419 3060
2420 --count; 3061 --count;
2421 } 3062 }
2422} 3063}
… …
2431static void 3072static void
2432slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3073slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2433{ 3074{
2434 AV *av = (AV *)SvRV (arg [0]); 3075 AV *av = (AV *)SvRV (arg [0]);
2435 3076
3077 if (items >= 2)
3078 {
3079 SV *cb_cv = s_get_cv_croak (arg [1]);
3080 av_push (av, SvREFCNT_inc_NN (cb_cv));
3081
2436 if (SvIVX (AvARRAY (av)[0])) 3082 if (SvIVX (AvARRAY (av)[0]))
3083 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3084
3085 frame->prepare = prepare_nop;
3086 frame->check = slf_check_nop;
3087 }
3088 else if (SvIVX (AvARRAY (av)[0]))
2437 { 3089 {
2438 SvIVX (AvARRAY (av)[0]) = 0; 3090 SvIVX (AvARRAY (av)[0]) = 0;
2439 frame->prepare = prepare_nop; 3091 frame->prepare = prepare_nop;
2440 frame->check = slf_check_nop; 3092 frame->check = slf_check_nop;
2441 } 3093 }
2442 else 3094 else
2443 { 3095 {
2444 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3096 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2445 3097
2446 av_push (av, waiter); 3098 av_push (av, waiter);
2447 3099
2448 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3100 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2449 frame->prepare = prepare_schedule; 3101 frame->prepare = prepare_schedule;
… …
2467 3119
2468static void 3120static void
2469coro_aio_callback (pTHX_ CV *cv) 3121coro_aio_callback (pTHX_ CV *cv)
2470{ 3122{
2471 dXSARGS; 3123 dXSARGS;
2472 AV *state = (AV *)GENSUB_ARG; 3124 AV *state = (AV *)S_GENSUB_ARG;
2473 SV *coro = av_pop (state); 3125 SV *coro = av_pop (state);
2474 SV *data_sv = newSV (sizeof (struct io_state)); 3126 SV *data_sv = newSV (sizeof (struct io_state));
2475 3127
2476 av_extend (state, items - 1); 3128 av_extend (state, items - 1);
2477 3129
… …
2562 dSP; 3214 dSP;
2563 3215
2564 static SV *prio_cv; 3216 static SV *prio_cv;
2565 static SV *prio_sv; 3217 static SV *prio_sv;
2566 3218
2567 if (expect_false (!prio_cv)) 3219 if (ecb_expect_false (!prio_cv))
2568 { 3220 {
2569 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3221 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2570 prio_sv = newSViv (0); 3222 prio_sv = newSViv (0);
2571 } 3223 }
2572 3224
… …
2591 3243
2592 for (i = 0; i < items; ++i) 3244 for (i = 0; i < items; ++i)
2593 PUSHs (arg [i]); 3245 PUSHs (arg [i]);
2594 3246
2595 /* now push the callback closure */ 3247 /* now push the callback closure */
2596 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3248 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2597 3249
2598 /* now call the AIO function - we assume our request is uncancelable */ 3250 /* now call the AIO function - we assume our request is uncancelable */
2599 PUTBACK; 3251 PUTBACK;
2600 call_sv ((SV *)req, G_VOID | G_DISCARD); 3252 call_sv ((SV *)req, G_VOID | G_DISCARD);
2601 } 3253 }
2602 3254
2603 /* now that the requets is going, we loop toll we have a result */ 3255 /* now that the request is going, we loop till we have a result */
2604 frame->data = (void *)state; 3256 frame->data = (void *)state;
2605 frame->prepare = prepare_schedule; 3257 frame->prepare = prepare_schedule;
2606 frame->check = slf_check_aio_req; 3258 frame->check = slf_check_aio_req;
2607} 3259}
2608 3260
… …
2615 3267
2616 XSRETURN_EMPTY; 3268 XSRETURN_EMPTY;
2617} 3269}
2618 3270
2619/*****************************************************************************/ 3271/*****************************************************************************/
3272
3273#if CORO_CLONE
3274# include "clone.c"
3275#endif
3276
3277/*****************************************************************************/
3278
3279static SV *
3280coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3281{
3282 SV *coro_sv;
3283 struct coro *coro;
3284 MAGIC *mg;
3285 HV *hv;
3286 SV *cb;
3287 int i;
3288
3289 if (argc > 0)
3290 {
3291 cb = s_get_cv_croak (argv [0]);
3292
3293 if (!is_coro)
3294 {
3295 if (CvISXSUB (cb))
3296 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3297
3298 if (!CvROOT (cb))
3299 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3300 }
3301 }
3302
3303 Newz (0, coro, 1, struct coro);
3304 coro->args = newAV ();
3305 coro->flags = CF_NEW;
3306
3307 if (coro_first) coro_first->prev = coro;
3308 coro->next = coro_first;
3309 coro_first = coro;
3310
3311 coro->hv = hv = newHV ();
3312 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3313 mg->mg_flags |= MGf_DUP;
3314 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3315
3316 if (argc > 0)
3317 {
3318 av_extend (coro->args, argc + is_coro - 1);
3319
3320 if (is_coro)
3321 {
3322 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3323 cb = (SV *)cv_coro_run;
3324 }
3325
3326 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3327
3328 for (i = 1; i < argc; i++)
3329 av_push (coro->args, newSVsv (argv [i]));
3330 }
3331
3332 return coro_sv;
3333}
3334
3335#ifndef __cplusplus
3336ecb_cold XS(boot_Coro__State);
3337#endif
3338
3339#if CORO_JIT
3340
3341static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c)
3343{
3344 dSP;
3345 AV *av = newAV ();
3346
3347 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a));
3350
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3352
3353 PUTBACK;
3354}
3355
3356static void ecb_noinline ecb_cold
3357jit_init (pTHX)
3358{
3359 dSP;
3360 SV *load, *save;
3361 char *map_base;
3362 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len;
3364 int count;
3365
3366 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN;
3373
3374 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380
3381 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len);
3383
3384 map_base += (load_len + 15) & ~15;
3385
3386 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len);
3388}
3389
3390#endif
2620 3391
2621MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2622 3393
2623PROTOTYPES: DISABLE 3394PROTOTYPES: DISABLE
2624 3395
… …
2629 coro_thx = PERL_GET_CONTEXT; 3400 coro_thx = PERL_GET_CONTEXT;
2630# endif 3401# endif
2631#endif 3402#endif
2632 BOOT_PAGESIZE; 3403 BOOT_PAGESIZE;
2633 3404
3405 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV;
3410 ERRSV;
3411
3412 cctx_current = cctx_new_empty ();
3413
2634 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3414 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2635 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3415 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2636 3416
2637 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3417 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2638 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3418 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2657 3437
2658 { 3438 {
2659 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3439 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2660 3440
2661 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3441 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2662 hv_store_ent (PL_custom_op_names, slf, 3442 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2663 newSVpv ("coro_slf", 0), 0);
2664 3443
2665 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3444 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2666 hv_store_ent (PL_custom_op_descs, slf, 3445 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2667 newSVpv ("coro schedule like function", 0), 0);
2668 } 3446 }
2669 3447
2670 coroapi.ver = CORO_API_VERSION; 3448 coroapi.ver = CORO_API_VERSION;
2671 coroapi.rev = CORO_API_REVISION; 3449 coroapi.rev = CORO_API_REVISION;
2672 3450
… …
2677 coroapi.prepare_nop = prepare_nop; 3455 coroapi.prepare_nop = prepare_nop;
2678 coroapi.prepare_schedule = prepare_schedule; 3456 coroapi.prepare_schedule = prepare_schedule;
2679 coroapi.prepare_cede = prepare_cede; 3457 coroapi.prepare_cede = prepare_cede;
2680 coroapi.prepare_cede_notself = prepare_cede_notself; 3458 coroapi.prepare_cede_notself = prepare_cede_notself;
2681 3459
2682 { 3460 time_init (aTHX);
2683 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2684 3461
2685 if (!svp) croak ("Time::HiRes is required");
2686 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2687
2688 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2689 }
2690
2691 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT
3464 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN;
3469#endif
2692} 3470}
2693 3471
2694SV * 3472SV *
2695new (char *klass, ...) 3473new (SV *klass, ...)
2696 ALIAS: 3474 ALIAS:
2697 Coro::new = 1 3475 Coro::new = 1
2698 CODE: 3476 CODE:
2699{ 3477 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2700 struct coro *coro; 3478 OUTPUT:
2701 MAGIC *mg;
2702 HV *hv;
2703 CV *cb;
2704 int i;
2705
2706 if (items > 1)
2707 {
2708 cb = coro_sv_2cv (aTHX_ ST (1));
2709
2710 if (!ix)
2711 {
2712 if (CvISXSUB (cb))
2713 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2714
2715 if (!CvROOT (cb))
2716 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2717 }
2718 }
2719
2720 Newz (0, coro, 1, struct coro);
2721 coro->args = newAV ();
2722 coro->flags = CF_NEW;
2723
2724 if (coro_first) coro_first->prev = coro;
2725 coro->next = coro_first;
2726 coro_first = coro;
2727
2728 coro->hv = hv = newHV ();
2729 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2730 mg->mg_flags |= MGf_DUP;
2731 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2732
2733 if (items > 1)
2734 {
2735 av_extend (coro->args, items - 1 + ix - 1);
2736
2737 if (ix)
2738 {
2739 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2740 cb = cv_coro_run;
2741 }
2742
2743 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2744
2745 for (i = 2; i < items; i++)
2746 av_push (coro->args, newSVsv (ST (i)));
2747 }
2748}
2749 OUTPUT:
2750 RETVAL 3479 RETVAL
2751 3480
2752void 3481void
2753transfer (...) 3482transfer (...)
2754 PROTOTYPE: $$ 3483 PROTOTYPE: $$
2755 CODE: 3484 CODE:
2756 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3485 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2757 3486
2758bool
2759_destroy (SV *coro_sv)
2760 CODE:
2761 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2762 OUTPUT:
2763 RETVAL
2764
2765void 3487void
2766_exit (int code) 3488_exit (int code)
2767 PROTOTYPE: $ 3489 PROTOTYPE: $
2768 CODE: 3490 CODE:
2769 _exit (code); 3491 _exit (code);
3492
3493SV *
3494clone (Coro::State coro)
3495 CODE:
3496{
3497#if CORO_CLONE
3498 struct coro *ncoro = coro_clone (aTHX_ coro);
3499 MAGIC *mg;
3500 /* TODO: too much duplication */
3501 ncoro->hv = newHV ();
3502 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3503 mg->mg_flags |= MGf_DUP;
3504 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3505#else
3506 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3507#endif
3508}
3509 OUTPUT:
3510 RETVAL
2770 3511
2771int 3512int
2772cctx_stacksize (int new_stacksize = 0) 3513cctx_stacksize (int new_stacksize = 0)
2773 PROTOTYPE: ;$ 3514 PROTOTYPE: ;$
2774 CODE: 3515 CODE:
… …
2824 eval = 1 3565 eval = 1
2825 CODE: 3566 CODE:
2826{ 3567{
2827 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3568 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2828 { 3569 {
2829 struct coro temp; 3570 struct coro *current = SvSTATE_current;
3571 struct CoroSLF slf_save;
2830 3572
2831 if (!(coro->flags & CF_RUNNING)) 3573 if (current != coro)
2832 { 3574 {
2833 PUTBACK; 3575 PUTBACK;
2834 save_perl (aTHX_ &temp); 3576 save_perl (aTHX_ current);
2835 load_perl (aTHX_ coro); 3577 load_perl (aTHX_ coro);
3578 /* the coro is most likely in an active SLF call.
3579 * while not strictly required (the code we execute is
3580 * not allowed to call any SLF functions), it's cleaner
3581 * to reinitialise the slf_frame and restore it later.
3582 * This might one day allow us to actually do SLF calls
3583 * from code executed here.
3584 */
3585 slf_save = slf_frame;
3586 slf_frame.prepare = 0;
3587 SPAGAIN;
2836 } 3588 }
2837 3589
2838 {
2839 dSP;
2840 ENTER;
2841 SAVETMPS;
2842 PUTBACK;
2843 PUSHSTACK; 3590 PUSHSTACK;
3591
2844 PUSHMARK (SP); 3592 PUSHMARK (SP);
3593 PUTBACK;
2845 3594
2846 if (ix) 3595 if (ix)
2847 eval_sv (coderef, 0); 3596 eval_sv (coderef, 0);
2848 else 3597 else
2849 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3598 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2850 3599
2851 POPSTACK; 3600 POPSTACK;
2852 SPAGAIN; 3601 SPAGAIN;
2853 FREETMPS;
2854 LEAVE;
2855 PUTBACK;
2856 }
2857 3602
2858 if (!(coro->flags & CF_RUNNING)) 3603 if (current != coro)
2859 { 3604 {
3605 PUTBACK;
3606 slf_frame = slf_save;
2860 save_perl (aTHX_ coro); 3607 save_perl (aTHX_ coro);
2861 load_perl (aTHX_ &temp); 3608 load_perl (aTHX_ current);
2862 SPAGAIN; 3609 SPAGAIN;
2863 } 3610 }
2864 } 3611 }
2865} 3612}
2866 3613
… …
2869 PROTOTYPE: $ 3616 PROTOTYPE: $
2870 ALIAS: 3617 ALIAS:
2871 is_ready = CF_READY 3618 is_ready = CF_READY
2872 is_running = CF_RUNNING 3619 is_running = CF_RUNNING
2873 is_new = CF_NEW 3620 is_new = CF_NEW
2874 is_destroyed = CF_DESTROYED 3621 is_destroyed = CF_ZOMBIE
3622 is_zombie = CF_ZOMBIE
3623 is_suspended = CF_SUSPENDED
2875 CODE: 3624 CODE:
2876 RETVAL = boolSV (coro->flags & ix); 3625 RETVAL = boolSV (coro->flags & ix);
2877 OUTPUT: 3626 OUTPUT:
2878 RETVAL 3627 RETVAL
2879 3628
2880void 3629void
2881throw (Coro::State self, SV *throw = &PL_sv_undef) 3630throw (Coro::State self, SV *exception = &PL_sv_undef)
2882 PROTOTYPE: $;$ 3631 PROTOTYPE: $;$
2883 CODE: 3632 CODE:
2884{ 3633{
2885 struct coro *current = SvSTATE_current; 3634 struct coro *current = SvSTATE_current;
2886 SV **throwp = self == current ? &CORO_THROW : &self->except; 3635 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2887 SvREFCNT_dec (*throwp); 3636 SvREFCNT_dec (*exceptionp);
2888 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3637 SvGETMAGIC (exception);
3638 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2889} 3639}
2890 3640
2891void 3641void
2892api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3642api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2893 PROTOTYPE: $;$ 3643 PROTOTYPE: $;$
… …
2895 3645
2896SV * 3646SV *
2897has_cctx (Coro::State coro) 3647has_cctx (Coro::State coro)
2898 PROTOTYPE: $ 3648 PROTOTYPE: $
2899 CODE: 3649 CODE:
2900 RETVAL = boolSV (!!coro->cctx); 3650 /* maybe manage the running flag differently */
3651 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2901 OUTPUT: 3652 OUTPUT:
2902 RETVAL 3653 RETVAL
2903 3654
2904int 3655int
2905is_traced (Coro::State coro) 3656is_traced (Coro::State coro)
… …
2925 3676
2926void 3677void
2927force_cctx () 3678force_cctx ()
2928 PROTOTYPE: 3679 PROTOTYPE:
2929 CODE: 3680 CODE:
2930 SvSTATE_current->cctx->idle_sp = 0; 3681 cctx_current->idle_sp = 0;
2931 3682
2932void 3683void
2933swap_defsv (Coro::State self) 3684swap_defsv (Coro::State self)
2934 PROTOTYPE: $ 3685 PROTOTYPE: $
2935 ALIAS: 3686 ALIAS:
… …
2943 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3694 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2944 3695
2945 SV *tmp = *src; *src = *dst; *dst = tmp; 3696 SV *tmp = *src; *src = *dst; *dst = tmp;
2946 } 3697 }
2947 3698
3699void
3700cancel (Coro::State self)
3701 CODE:
3702 coro_state_destroy (aTHX_ self);
3703
3704SV *
3705enable_times (int enabled = enable_times)
3706 CODE:
3707{
3708 RETVAL = boolSV (enable_times);
3709
3710 if (enabled != enable_times)
3711 {
3712 enable_times = enabled;
3713
3714 coro_times_update ();
3715 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3716 }
3717}
3718 OUTPUT:
3719 RETVAL
3720
3721void
3722times (Coro::State self)
3723 PPCODE:
3724{
3725 struct coro *current = SvSTATE (coro_current);
3726
3727 if (ecb_expect_false (current == self))
3728 {
3729 coro_times_update ();
3730 coro_times_add (SvSTATE (coro_current));
3731 }
3732
3733 EXTEND (SP, 2);
3734 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3735 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3736
3737 if (ecb_expect_false (current == self))
3738 coro_times_sub (SvSTATE (coro_current));
3739}
3740
3741void
3742swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3743 CODE:
3744{
3745 struct coro *current = SvSTATE_current;
3746
3747 if (current == coro)
3748 SWAP_SVS (current);
3749
3750 if (!coro->swap_sv)
3751 coro->swap_sv = newAV ();
3752
3753 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3754 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3755
3756 if (current == coro)
3757 SWAP_SVS (current);
3758}
3759
2948 3760
2949MODULE = Coro::State PACKAGE = Coro 3761MODULE = Coro::State PACKAGE = Coro
2950 3762
2951BOOT: 3763BOOT:
2952{ 3764{
2953 int i;
2954
2955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2956 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3765 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2957 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3766 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2958 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3767 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2959 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD);
2960 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3768 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2961 SvREADONLY_on (coro_current); 3769 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3770 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3771 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3772 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2962 3773
2963 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3774 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2964 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3775 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2965 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler); 3776 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2966 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new); 3777 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2967 3778
2968 coro_stash = gv_stashpv ("Coro", TRUE); 3779 coro_stash = gv_stashpv ("Coro", TRUE);
2969 3780
2970 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3781 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2971 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3782 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2972 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3783 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2973 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3784 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2974 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3785 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2975 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3786 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2976
2977 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2978 coro_ready[i] = newAV ();
2979 3787
2980 { 3788 {
2981 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3789 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2982 3790
2983 coroapi.schedule = api_schedule; 3791 coroapi.schedule = api_schedule;
3792 coroapi.schedule_to = api_schedule_to;
2984 coroapi.cede = api_cede; 3793 coroapi.cede = api_cede;
2985 coroapi.cede_notself = api_cede_notself; 3794 coroapi.cede_notself = api_cede_notself;
2986 coroapi.ready = api_ready; 3795 coroapi.ready = api_ready;
2987 coroapi.is_ready = api_is_ready; 3796 coroapi.is_ready = api_is_ready;
2988 coroapi.nready = coro_nready; 3797 coroapi.nready = coro_nready;
… …
2992 sv_setiv (sv, (IV)&coroapi); 3801 sv_setiv (sv, (IV)&coroapi);
2993 SvREADONLY_on (sv); 3802 SvREADONLY_on (sv);
2994 } 3803 }
2995} 3804}
2996 3805
3806SV *
3807async (...)
3808 PROTOTYPE: &@
3809 CODE:
3810 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3811 api_ready (aTHX_ RETVAL);
3812 OUTPUT:
3813 RETVAL
3814
3815void
3816_destroy (Coro::State coro)
3817 CODE:
3818 /* used by the manager thread */
3819 coro_state_destroy (aTHX_ coro);
3820
3821void
3822on_destroy (Coro::State coro, SV *cb)
3823 CODE:
3824 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3825
3826void
3827join (...)
3828 CODE:
3829 CORO_EXECUTE_SLF_XS (slf_init_join);
3830
3831void
3832terminate (...)
3833 CODE:
3834 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3835
3836void
3837cancel (...)
3838 CODE:
3839 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3840
3841int
3842safe_cancel (Coro::State self, ...)
3843 C_ARGS: aTHX_ self, &ST (1), items - 1
3844
2997void 3845void
2998schedule (...) 3846schedule (...)
2999 CODE: 3847 CODE:
3000 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3848 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3849
3850void
3851schedule_to (...)
3852 CODE:
3853 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3854
3855void
3856cede_to (...)
3857 CODE:
3858 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3001 3859
3002void 3860void
3003cede (...) 3861cede (...)
3004 CODE: 3862 CODE:
3005 CORO_EXECUTE_SLF_XS (slf_init_cede); 3863 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3019void 3877void
3020_set_readyhook (SV *hook) 3878_set_readyhook (SV *hook)
3021 PROTOTYPE: $ 3879 PROTOTYPE: $
3022 CODE: 3880 CODE:
3023 SvREFCNT_dec (coro_readyhook); 3881 SvREFCNT_dec (coro_readyhook);
3882 SvGETMAGIC (hook);
3883 if (SvOK (hook))
3884 {
3024 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3885 coro_readyhook = newSVsv (hook);
3886 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3887 }
3888 else
3889 {
3890 coro_readyhook = 0;
3891 CORO_READYHOOK = 0;
3892 }
3025 3893
3026int 3894int
3027prio (Coro::State coro, int newprio = 0) 3895prio (Coro::State coro, int newprio = 0)
3028 PROTOTYPE: $;$ 3896 PROTOTYPE: $;$
3029 ALIAS: 3897 ALIAS:
… …
3035 if (items > 1) 3903 if (items > 1)
3036 { 3904 {
3037 if (ix) 3905 if (ix)
3038 newprio = coro->prio - newprio; 3906 newprio = coro->prio - newprio;
3039 3907
3040 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3908 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3041 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3909 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3042 3910
3043 coro->prio = newprio; 3911 coro->prio = newprio;
3044 } 3912 }
3045} 3913}
3046 OUTPUT: 3914 OUTPUT:
… …
3061 RETVAL = coro_nready; 3929 RETVAL = coro_nready;
3062 OUTPUT: 3930 OUTPUT:
3063 RETVAL 3931 RETVAL
3064 3932
3065void 3933void
3934suspend (Coro::State self)
3935 PROTOTYPE: $
3936 CODE:
3937 self->flags |= CF_SUSPENDED;
3938
3939void
3940resume (Coro::State self)
3941 PROTOTYPE: $
3942 CODE:
3943 self->flags &= ~CF_SUSPENDED;
3944
3945void
3066_pool_handler (...) 3946_pool_handler (...)
3067 CODE: 3947 CODE:
3068 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3948 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3069 3949
3070void 3950void
… …
3081 for (i = 1; i < items; ++i) 3961 for (i = 1; i < items; ++i)
3082 av_push (av, SvREFCNT_inc_NN (ST (i))); 3962 av_push (av, SvREFCNT_inc_NN (ST (i)));
3083 3963
3084 if ((SV *)hv == &PL_sv_undef) 3964 if ((SV *)hv == &PL_sv_undef)
3085 { 3965 {
3086 PUSHMARK (SP); 3966 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3087 EXTEND (SP, 2);
3088 PUSHs (sv_Coro);
3089 PUSHs ((SV *)cv_pool_handler);
3090 PUTBACK;
3091 call_sv ((SV *)cv_coro_new, G_SCALAR);
3092 SPAGAIN;
3093
3094 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3967 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3968 SvREFCNT_dec (sv);
3095 } 3969 }
3096 3970
3097 { 3971 {
3098 struct coro *coro = SvSTATE_hv (hv); 3972 struct coro *coro = SvSTATE_hv (hv);
3099 3973
… …
3123rouse_wait (...) 3997rouse_wait (...)
3124 PROTOTYPE: ;$ 3998 PROTOTYPE: ;$
3125 PPCODE: 3999 PPCODE:
3126 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4000 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3127 4001
4002void
4003on_enter (SV *block)
4004 ALIAS:
4005 on_leave = 1
4006 PROTOTYPE: &
4007 CODE:
4008{
4009 struct coro *coro = SvSTATE_current;
4010 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4011
4012 block = s_get_cv_croak (block);
4013
4014 if (!*avp)
4015 *avp = newAV ();
4016
4017 av_push (*avp, SvREFCNT_inc (block));
4018
4019 if (!ix)
4020 on_enterleave_call (aTHX_ block);
4021
4022 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4023 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4024 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4025}
4026
3128 4027
3129MODULE = Coro::State PACKAGE = PerlIO::cede 4028MODULE = Coro::State PACKAGE = PerlIO::cede
3130 4029
3131BOOT: 4030BOOT:
3132 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4031 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3135MODULE = Coro::State PACKAGE = Coro::Semaphore 4034MODULE = Coro::State PACKAGE = Coro::Semaphore
3136 4035
3137SV * 4036SV *
3138new (SV *klass, SV *count = 0) 4037new (SV *klass, SV *count = 0)
3139 CODE: 4038 CODE:
4039{
4040 int semcnt = 1;
4041
4042 if (count)
4043 {
4044 SvGETMAGIC (count);
4045
4046 if (SvOK (count))
4047 semcnt = SvIV (count);
4048 }
4049
3140 RETVAL = sv_bless ( 4050 RETVAL = sv_bless (
3141 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4051 coro_waitarray_new (aTHX_ semcnt),
3142 GvSTASH (CvGV (cv)) 4052 GvSTASH (CvGV (cv))
3143 ); 4053 );
4054}
3144 OUTPUT: 4055 OUTPUT:
3145 RETVAL 4056 RETVAL
3146 4057
3147# helper for Coro::Channel 4058# helper for Coro::Channel and others
3148SV * 4059SV *
3149_alloc (int count) 4060_alloc (int count)
3150 CODE: 4061 CODE:
3151 RETVAL = coro_waitarray_new (aTHX_ count); 4062 RETVAL = coro_waitarray_new (aTHX_ count);
3152 OUTPUT: 4063 OUTPUT:
… …
3210 for (i = 1; i <= wcount; ++i) 4121 for (i = 1; i <= wcount; ++i)
3211 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4122 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3212 } 4123 }
3213} 4124}
3214 4125
4126MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4127
4128void
4129_may_delete (SV *sem, int count, int extra_refs)
4130 PPCODE:
4131{
4132 AV *av = (AV *)SvRV (sem);
4133
4134 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4135 && AvFILLp (av) == 0 /* no waiters, just count */
4136 && SvIV (AvARRAY (av)[0]) == count)
4137 XSRETURN_YES;
4138
4139 XSRETURN_NO;
4140}
4141
3215MODULE = Coro::State PACKAGE = Coro::Signal 4142MODULE = Coro::State PACKAGE = Coro::Signal
3216 4143
3217SV * 4144SV *
3218new (SV *klass) 4145new (SV *klass)
3219 CODE: 4146 CODE:
… …
3290 4217
3291void 4218void
3292_register (char *target, char *proto, SV *req) 4219_register (char *target, char *proto, SV *req)
3293 CODE: 4220 CODE:
3294{ 4221{
3295 CV *req_cv = coro_sv_2cv (aTHX_ req); 4222 SV *req_cv = s_get_cv_croak (req);
3296 /* newXSproto doesn't return the CV on 5.8 */ 4223 /* newXSproto doesn't return the CV on 5.8 */
3297 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4224 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3298 sv_setpv ((SV *)slf_cv, proto); 4225 sv_setpv ((SV *)slf_cv, proto);
3299 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4226 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3300} 4227}
3301 4228
4229MODULE = Coro::State PACKAGE = Coro::Select
4230
4231void
4232patch_pp_sselect ()
4233 CODE:
4234 if (!coro_old_pp_sselect)
4235 {
4236 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4237 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4238 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4239 }
4240
4241void
4242unpatch_pp_sselect ()
4243 CODE:
4244 if (coro_old_pp_sselect)
4245 {
4246 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4247 coro_old_pp_sselect = 0;
4248 }
4249

Diff Legend

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