ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.320 by root, Fri Nov 21 07:29:04 2008 UTC vs.
Revision 1.405 by root, Sat Jun 11 13:01:26 2011 UTC

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

Diff Legend

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