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

Diff Legend

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