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.397 by root, Fri May 6 21:15:17 2011 UTC vs.
Revision 1.473 by root, Sun Sep 3 23:36:01 2017 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
24#endif 66#endif
25 67
26#if defined(_WIN32) 68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
32#else 74#else
33# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
34#endif 76#endif
35 77
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
65 80
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 83#endif
73 84
74/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
87#endif 98#endif
88 99
89#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
90 101
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 102#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
108 104
109#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
110# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
120# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif 118# endif
123#endif 119#endif
124 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
125static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
127 141
128/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
… …
144 158
145static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
147static SV *rv_diehook; 161static SV *rv_diehook;
148static SV *rv_warnhook; 162static SV *rv_warnhook;
149static HV *hv_sig; /* %SIG */
150 163
151/* async_pool helper stuff */ 164/* async_pool helper stuff */
152static SV *sv_pool_rss; 165static SV *sv_pool_rss;
153static SV *sv_pool_size; 166static SV *sv_pool_size;
154static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
… …
166static char times_valid; 179static char times_valid;
167 180
168static struct coro_cctx *cctx_first; 181static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 182static int cctx_count, cctx_idle;
170 183
171enum { 184enum
185{
172 CC_MAPPED = 0x01, 186 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 187 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 188 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 189 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 190 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 195typedef struct coro_cctx
182{ 196{
183 struct coro_cctx *next; 197 struct coro_cctx *next;
184 198
185 /* the stack */ 199 /* the stack */
186 void *sptr; 200 struct coro_stack stack;
187 size_t ssize;
188 201
189 /* cpu state */ 202 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 205 JMPENV *idle_te; /* same as idle_sp, but for top_env */
206#endif
192 JMPENV *top_env; 207 JMPENV *top_env;
193 coro_context cctx; 208 coro_context cctx;
194 209
195 U32 gen; 210 U32 gen;
196#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
… …
201 216
202static coro_cctx *cctx_current; /* the currently running cctx */ 217static coro_cctx *cctx_current; /* the currently running cctx */
203 218
204/*****************************************************************************/ 219/*****************************************************************************/
205 220
221static MGVTBL coro_state_vtbl;
222
206enum { 223enum
224{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 225 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 226 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 227 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 228 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 229 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 230 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 231};
214 232
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 233/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 234typedef struct
217{ 235{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
224# include "state.h" 237 #include "state.h"
225#undef VAR
226} perl_slots; 238} perl_slots;
227 239
240/* how many context stack entries do we need for perl_slots */
228#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 241#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
229 242
230/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
231struct coro { 244struct coro
245{
232 /* the C coroutine allocated to this perl coroutine, if any */ 246 /* the C coroutine allocated to this perl coroutine, if any */
233 coro_cctx *cctx; 247 coro_cctx *cctx;
234 248
235 /* ready queue */ 249 /* ready queue */
236 struct coro *next_ready; 250 struct coro *next_ready;
… …
238 /* state data */ 252 /* state data */
239 struct CoroSLF slf_frame; /* saved slf frame */ 253 struct CoroSLF slf_frame; /* saved slf frame */
240 AV *mainstack; 254 AV *mainstack;
241 perl_slots *slot; /* basically the saved sp */ 255 perl_slots *slot; /* basically the saved sp */
242 256
243 CV *startcv; /* the CV to execute */ 257 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 258 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 259 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 260 HV *hv; /* the perl hash associated with this coro, if any */
248 261
249 /* statistics */ 262 /* statistics */
250 int usecount; /* number of transfers to this coro */ 263 int usecount; /* number of transfers to this coro */
251 264
252 /* coro process data */ 265 /* coro process data */
253 int prio; 266 int prio;
254 SV *except; /* exception to be thrown */ 267 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 268 SV *rouse_cb; /* last rouse callback */
269 AV *on_destroy; /* callbacks or coros to notify on destroy */
270 AV *status; /* the exit status list */
256 271
257 /* async_pool */ 272 /* async_pool */
258 SV *saved_deffh; 273 SV *saved_deffh;
259 SV *invoke_cb; 274 SV *invoke_cb;
260 AV *invoke_av; 275 AV *invoke_av;
261 276
262 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
263 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
264 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
265 280
266 /* swap_sv */ 281 /* swap_sv */
267 AV *swap_sv; 282 AV *swap_sv;
268 283
269 /* times */ 284 /* times */
… …
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 311static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run; 312static CV *cv_coro_run;
298static struct coro *coro_first; 313static struct coro *coro_first;
299#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
300 315
316/** JIT *********************************************************************/
317
318#if CORO_JIT
319 /* APPLE doesn't have mmap though */
320 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
321 #ifndef CORO_JIT_TYPE
322 #if ECB_AMD64 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "amd64-unix"
324 #elif __i386 && CORO_JIT_UNIXY
325 #define CORO_JIT_TYPE "x86-unix"
326 #endif
327 #endif
328#endif
329
330#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
331 #undef CORO_JIT
332#endif
333
334#if CORO_JIT
335 typedef void (*load_save_perl_slots_type)(perl_slots *);
336 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
337#endif
338
301/** Coro::Select ************************************************************/ 339/** Coro::Select ************************************************************/
302 340
303static OP *(*coro_old_pp_sselect) (pTHX); 341static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 342static SV *coro_select_select;
305 343
… …
320 358
321/** time stuff **************************************************************/ 359/** time stuff **************************************************************/
322 360
323#ifdef HAS_GETTIMEOFDAY 361#ifdef HAS_GETTIMEOFDAY
324 362
325static void 363ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 364coro_u2time (pTHX_ UV ret[2])
327{ 365{
328 struct timeval tv; 366 struct timeval tv;
329 gettimeofday (&tv, 0); 367 gettimeofday (&tv, 0);
330 368
331 ret [0] = tv.tv_sec; 369 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 370 ret [1] = tv.tv_usec;
333} 371}
334 372
335static double 373ecb_inline double
336coro_nvtime () 374coro_nvtime (void)
337{ 375{
338 struct timeval tv; 376 struct timeval tv;
339 gettimeofday (&tv, 0); 377 gettimeofday (&tv, 0);
340 378
341 return tv.tv_sec + tv.tv_usec * 1e-6; 379 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 380}
343 381
344static void 382ecb_inline void
345time_init (pTHX) 383time_init (pTHX)
346{ 384{
347 nvtime = coro_nvtime; 385 nvtime = coro_nvtime;
348 u2time = coro_u2time; 386 u2time = coro_u2time;
349} 387}
350 388
351#else 389#else
352 390
353static void 391ecb_inline void
354time_init (pTHX) 392time_init (pTHX)
355{ 393{
356 SV **svp; 394 SV **svp;
357 395
358 require_pv ("Time/HiRes.pm"); 396 require_pv ("Time/HiRes.pm");
359 397
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 398 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 399
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 400 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 401 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 402
… …
370 408
371#endif 409#endif
372 410
373/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
374 412
375static SV * 413static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
377{ 415{
378#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 417 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 418 get_sv (name, create);
381#endif 419#endif
382 return get_sv (name, create); 420 return get_sv (name, create);
383} 421}
384 422
385static AV * 423static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
387{ 425{
388#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 427 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 428 get_av (name, create);
391#endif 429#endif
392 return get_av (name, create); 430 return get_av (name, create);
393} 431}
394 432
395static HV * 433static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
397{ 435{
398#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 437 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 438 get_hv (name, create);
401#endif 439#endif
402 return get_hv (name, create); 440 return get_hv (name, create);
403} 441}
404 442
405INLINE void 443ecb_inline void
406coro_times_update () 444coro_times_update (void)
407{ 445{
408#ifdef coro_clock_gettime 446#ifdef coro_clock_gettime
409 struct timespec ts; 447 struct timespec ts;
410 448
411 ts.tv_sec = ts.tv_nsec = 0; 449 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 461 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 462 time_real [1] = tv [1] * 1000;
425#endif 463#endif
426} 464}
427 465
428INLINE void 466ecb_inline void
429coro_times_add (struct coro *c) 467coro_times_add (struct coro *c)
430{ 468{
431 c->t_real [1] += time_real [1]; 469 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 470 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 471 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 473 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 474 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 475 c->t_cpu [0] += time_cpu [0];
438} 476}
439 477
440INLINE void 478ecb_inline void
441coro_times_sub (struct coro *c) 479coro_times_sub (struct coro *c)
442{ 480{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 481 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1]; 482 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 483 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 491/* magic glue */
454 492
455#define CORO_MAGIC_type_cv 26 493#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 494#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 495
458#define CORO_MAGIC_NN(sv, type) \ 496#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 498 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 499 : mg_find (sv, type))
462 500
463#define CORO_MAGIC(sv, type) \ 501#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 502 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 503 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 504 : 0)
467 505
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 506#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 507#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 508
471INLINE struct coro * 509ecb_inline MAGIC *
472SvSTATE_ (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
473{ 511{
474 HV *stash;
475 MAGIC *mg; 512 MAGIC *mg;
476 513
514 if (ecb_expect_true (
515 SvTYPE (coro) == SVt_PVHV
516 && (mg = CORO_MAGIC_state (coro))
517 && mg->mg_virtual == &coro_state_vtbl
518 ))
519 return mg;
520
521 return 0;
522}
523
524ecb_inline struct coro *
525SvSTATE_ (pTHX_ SV *coro_sv)
526{
527 MAGIC *mg;
528
477 if (SvROK (coro)) 529 if (SvROK (coro_sv))
478 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
479 531
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
533 if (!mg)
481 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
482 535
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
493} 537}
494 538
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 539#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 540
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 544
501/*****************************************************************************/ 545/*****************************************************************************/
502/* padlist management and caching */ 546/* padlist management and caching */
503 547
504static AV * 548ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
506{ 550{
507 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
509 556
510 newpadlist = newAV (); 557#if NEWPADAPI
558
559 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
560 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
561 while (!PadlistARRAY (padlist)[off - 1])
562 --off;
563
564 Perl_pad_push (aTHX_ padlist, off);
565
566 newpad = PadlistARRAY (padlist)[off];
567 PadlistARRAY (padlist)[off] = 0;
568
569#else
570
571#if PERL_VERSION_ATLEAST (5,10,0)
572 Perl_pad_push (aTHX_ padlist, off);
573#else
574 Perl_pad_push (aTHX_ padlist, off, 1);
575#endif
576
577 newpad = PadlistARRAY (padlist)[off];
578 PadlistMAX (padlist) = off - 1;
579
580#endif
581
582 newPADLIST (newpadlist);
583#if !PERL_VERSION_ATLEAST(5,15,3)
584 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 586#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 587
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 589 PadlistMAX (newpadlist) = 1;
590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
595 PadlistARRAY (newpadlist)[1] = newpad;
522 596
523 return newpadlist; 597 return newpadlist;
524} 598}
525 599
526static void 600ecb_inline void
527free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
528{ 602{
529 /* may be during global destruction */ 603 /* may be during global destruction */
530 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
531 { 605 {
532 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
533 607
534 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
535 { 609 {
536 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
540 while (j >= 0) 617 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 619
543 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
545 } 623 }
546 624
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
548 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
549 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
551 } 635 }
552} 636}
553 637
554static int 638static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 640{
557 AV *padlist; 641 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 642 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
643 size_t len = *(size_t *)mg->mg_ptr;
559 644
560 /* perl manages to free our internal AV and _then_ call us */ 645 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 646 if (IN_DESTRUCT)
562 return 0; 647 return 0;
563 648
564 /* casting is fun. */ 649 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 651
570 return 0; 652 return 0;
571} 653}
572 654
573static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 656 0, 0, 0, 0,
575 coro_cv_free 657 coro_cv_free
576}; 658};
577 659
578/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
579static void 661ecb_inline void
580get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
581{ 663{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 665 size_t *lenp;
584 666
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 669 else
588 { 670 {
589#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 680#endif
599 } 681 }
600} 682}
601 683
602static void 684ecb_inline void
603put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
604{ 686{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 688
608 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 691 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
692 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
693 mg->mg_len = 1; /* so mg_free frees mg_ptr */
694 }
695 else
696 Renew (mg->mg_ptr,
697 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
698 char);
610 699
611 av = (AV *)mg->mg_obj; 700 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 701}
618 702
619/** load & save, init *******************************************************/ 703/** load & save, init *******************************************************/
620 704
705ecb_inline void
706swap_sv (SV *a, SV *b)
707{
708 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
709 SV tmp;
710
711 /* swap sv_any */
712 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
713
714 /* swap sv_flags */
715 SvFLAGS (&tmp) = SvFLAGS (a);
716 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
717 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
718
719#if PERL_VERSION_ATLEAST (5,10,0)
720 /* perl 5.10 and later complicates this _quite_ a bit, but it also
721 * is much faster, so no quarrels here. alternatively, we could
722 * sv_upgrade to avoid this.
723 */
724 {
725 /* swap sv_u */
726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
727
728 /* if SvANY points to the head, we need to adjust the pointers,
729 * as the pointer for a still points to b, and maybe vice versa.
730 */
731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
737
738 if (svany_in_head (SvTYPE (a)))
739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
740
741 if (svany_in_head (SvTYPE (b)))
742 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
743 }
744#endif
745}
746
621/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
622static void 748static void
623swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
624{ 750{
625 int i; 751 int i;
626 752
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 755}
667 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
668#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
671 773
672static void 774static void
673on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
674 776
675static void 777static void
… …
678 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
679 c->slot = 0; 781 c->slot = 0;
680 782
681 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
682 784
683 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 787#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 789 #include "state.h"
691 #undef VAR 790#endif
692 791
693 { 792 {
694 dSP; 793 dSP;
695 794
696 CV *cv; 795 CV *cv;
697 796
698 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
700 { 799 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 803 }
705 804
706 PUTBACK; 805 PUTBACK;
707 } 806 }
708 807
709 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 809 CORO_THROW = c->except;
711 810
712 if (expect_false (enable_times)) 811 if (ecb_expect_false (enable_times))
713 { 812 {
714 if (expect_false (!times_valid)) 813 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 814 coro_times_update ();
716 815
717 coro_times_sub (c); 816 coro_times_sub (c);
718 } 817 }
719 818
720 if (expect_false (c->on_enter)) 819 if (ecb_expect_false (c->on_enter))
721 { 820 {
722 int i; 821 int i;
723 822
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 } 825 }
727 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
728 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
729} 836}
730 837
731static void 838static void
732save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
733{ 840{
734 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
735 842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
850
736 if (expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
737 { 852 {
738 int i; 853 int i;
739 854
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 855 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 856 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 857 }
743 858
744 times_valid = 0; 859 times_valid = 0;
745 860
746 if (expect_false (enable_times)) 861 if (ecb_expect_false (enable_times))
747 { 862 {
748 coro_times_update (); times_valid = 1; 863 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 864 coro_times_add (c);
750 } 865 }
751 866
… …
765 880
766 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
768 for (;;) 883 for (;;)
769 { 884 {
770 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
771 { 886 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
773 888
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 889 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 890 {
776 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
777 892
778 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
779 { 894 {
780 EXTEND (SP, 3); 895 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
787 } 902 }
788 } 903 }
789 } 904 }
790 905
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 907 break;
793 908
794 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
… …
798 913
799 PUTBACK; 914 PUTBACK;
800 } 915 }
801 916
802 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 919 {
808 unsigned int i; 920 unsigned int i;
921
809 for (i = 3; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 923 CXINC;
811 } 924
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 925 cxstack_ix -= SLOT_COUNT; /* undo allocation */
926 }
813 927
814 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
815 929
816 { 930 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 932
819 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
820 slot->defsv = DEFSV; 934 save_perl_slots (slot);
821 slot->errsv = ERRSV; 935#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 937 #include "state.h"
827 #undef VAR 938#endif
828 } 939 }
829} 940}
830 941
831/* 942/*
832 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 949# define coro_init_stacks(thx) init_stacks ()
839#else 950#else
840static void 951static void
841coro_init_stacks (pTHX) 952coro_init_stacks (pTHX)
842{ 953{
843 PL_curstackinfo = new_stackinfo(32, 8); 954 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 955 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 956 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 957 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 958
848 PL_stack_base = AvARRAY(PL_curstack); 959 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 974#endif
864 975
865 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 978 PL_scopestack_max = 8;
979#if HAS_SCOPESTACK_NAME
980 New(54,PL_scopestack_name,8,const char*);
981#endif
868 982
869 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
872 991
873#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
874 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
875 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
876 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
900 } 1019 }
901 1020
902 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
905 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
908#endif 1030#endif
909} 1031}
… …
939 } 1061 }
940 1062
941 return rss; 1063 return rss;
942} 1064}
943 1065
944/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
945
946static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
947static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
948static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
949 1067
950/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
951#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
952#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
953 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
954 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
955#endif 1073#endif
956 1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
1102
957/* 1103/*
958 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1105 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1106 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1107 * we just provide our own readback here.
962 */ 1108 */
963static int 1109static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1111{
966 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
967 1115
968 if (*s == '_') 1116 SV *ssv;
969 {
970 SV **svp = 0;
971 1117
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974
975 if (svp) 1118 if (!*svp)
976 { 1119 ssv = &PL_sv_undef;
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
978 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
979 } 1122 else
980 } 1123 ssv = *svp;
981 1124
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
983} 1127}
984 1128
985static int 1129static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1131{
988 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
989 1135
990 if (*s == '_')
991 {
992 SV **svp = 0;
993
994 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
995 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
996
997 if (svp)
998 {
999 SV *old = *svp; 1136 SV *old = *svp;
1000 *svp = 0; 1137 *svp = 0;
1001 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1002 return 0; 1139 return 0;
1003 }
1004 }
1005
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1140}
1008 1141
1009static int 1142static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1144{
1012 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1013 1148
1014 if (*s == '_')
1015 {
1016 SV **svp = 0;
1017
1018 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1020
1021 if (svp)
1022 {
1023 SV *old = *svp; 1149 SV *old = *svp;
1024 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1025 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1026 return 0; 1152 return 0;
1027 }
1028 }
1029
1030 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1031} 1153}
1032 1154
1033static void 1155static void
1034prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1035{ 1157{
… …
1047slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1048{ 1170{
1049 return 1; 1171 return 1;
1050} 1172}
1051 1173
1174/** coroutine stack handling ************************************************/
1175
1052static UNOP init_perl_op; 1176static UNOP init_perl_op;
1053 1177
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1056{ 1180{
1057 /* 1181 /*
1058 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
1059 */ 1183 */
… …
1074 PL_parser = 0; 1198 PL_parser = 0;
1075#endif 1199#endif
1076 PL_hints = 0; 1200 PL_hints = 0;
1077 1201
1078 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1205
1082 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1216
1090 { 1217 {
1091 dSP; 1218 dSP;
… …
1095 myop.op_next = Nullop; 1222 myop.op_next = Nullop;
1096 myop.op_type = OP_ENTERSUB; 1223 myop.op_type = OP_ENTERSUB;
1097 myop.op_flags = OPf_WANT_VOID; 1224 myop.op_flags = OPf_WANT_VOID;
1098 1225
1099 PUSHMARK (SP); 1226 PUSHMARK (SP);
1100 PUSHs ((SV *)coro->startcv); 1227 XPUSHs ((SV *)coro->startcv);
1101 PUTBACK; 1228 PUTBACK;
1102 PL_op = (OP *)&myop; 1229 PL_op = (OP *)&myop;
1103 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1230 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1104 } 1231 }
1105 1232
1106 /* this newly created coroutine might be run on an existing cctx which most 1233 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1234 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1235 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1236 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1237 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1238 slf_frame.destroy = 0;
1111 1239
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1240 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1241 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1242 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1243 init_perl_op.op_ppaddr = pp_slf;
… …
1118 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1119 1247
1120 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1122 1250
1123 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1124 1252
1125 if (expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1126 { 1254 {
1127 coro_times_update (); 1255 coro_times_update ();
1128 coro_times_sub (coro); 1256 coro_times_sub (coro);
1129 } 1257 }
1130} 1258}
… …
1166 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1168 1296
1169 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1170 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1171 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1303
1172 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1173 1305
1174 /* restore swapped sv's */
1175 SWAP_SVS (coro);
1176
1177 // now save some sv's to be free'd later 1306 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1308 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1309 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1310 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1311 svf [4] = PL_rs;
… …
1199 1328
1200 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1201 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1202 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1204 } 1335 }
1205} 1336}
1206 1337
1207INLINE void 1338ecb_inline void
1208free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1209{ 1340{
1210 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
1211 { 1342 {
1212 SvREFCNT_dec (coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1344 coro_mortal = 0;
1214 } 1345 }
1215} 1346}
1216 1347
1217static int 1348static int
… …
1249 av_push (av, SvREFCNT_inc_NN (*bot++)); 1380 av_push (av, SvREFCNT_inc_NN (*bot++));
1250 1381
1251 PL_runops = RUNOPS_DEFAULT; 1382 PL_runops = RUNOPS_DEFAULT;
1252 ENTER; 1383 ENTER;
1253 SAVETMPS; 1384 SAVETMPS;
1385 PUSHMARK (SP);
1254 EXTEND (SP, 3); 1386 EXTEND (SP, 3);
1255 PUSHMARK (SP);
1256 PUSHs (&PL_sv_no); 1387 PUSHs (&PL_sv_no);
1257 PUSHs (fullname); 1388 PUSHs (fullname);
1258 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1389 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1259 PUTBACK; 1390 PUTBACK;
1260 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1391 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
… …
1271 1402
1272 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1273 { 1404 {
1274 SV **cb; 1405 SV **cb;
1275 1406
1276 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1277 { 1408 {
1278 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1279 1410
1280 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1281 { 1412 {
… …
1287 gv_efullname3 (fullname, gv, 0); 1418 gv_efullname3 (fullname, gv, 0);
1288 1419
1289 PL_runops = RUNOPS_DEFAULT; 1420 PL_runops = RUNOPS_DEFAULT;
1290 ENTER; 1421 ENTER;
1291 SAVETMPS; 1422 SAVETMPS;
1423 PUSHMARK (SP);
1292 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1293 PUSHMARK (SP);
1294 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1295 PUSHs (fullname); 1426 PUSHs (fullname);
1296 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1297 PUTBACK; 1428 PUTBACK;
1298 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1299 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1300 SPAGAIN; 1431 SPAGAIN;
1301 FREETMPS; 1432 FREETMPS;
… …
1311 dSP; 1442 dSP;
1312 1443
1313 PL_runops = RUNOPS_DEFAULT; 1444 PL_runops = RUNOPS_DEFAULT;
1314 ENTER; 1445 ENTER;
1315 SAVETMPS; 1446 SAVETMPS;
1316 EXTEND (SP, 3);
1317 PL_runops = RUNOPS_DEFAULT;
1318 PUSHMARK (SP); 1447 PUSHMARK (SP);
1448 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1449 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1320 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1450 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1321 PUTBACK; 1451 PUTBACK;
1322 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1452 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1323 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1453 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
… …
1350 1480
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1481 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1482}
1353 1483
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1484/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1485static void ecb_noinline
1356cctx_prepare (pTHX) 1486cctx_prepare (pTHX)
1357{ 1487{
1358 PL_top_env = &PL_start_env; 1488 PL_top_env = &PL_start_env;
1359 1489
1360 if (cctx_current->flags & CC_TRACE) 1490 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1501 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1502 slf_frame.check = slf_check_set_stacklevel;
1373} 1503}
1374 1504
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1505/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1506ecb_inline void
1377transfer_tail (pTHX) 1507transfer_tail (pTHX)
1378{ 1508{
1379 free_coro_mortal (aTHX); 1509 free_coro_mortal (aTHX);
1510}
1511
1512/* try to exit the same way perl's main function would do */
1513/* we do not bother resetting the environment or other things *7
1514/* that are not, uhm, essential */
1515/* this obviously also doesn't work when perl is embedded */
1516static void ecb_noinline ecb_cold
1517perlish_exit (pTHX)
1518{
1519 int exitstatus = perl_destruct (PL_curinterp);
1520 perl_free (PL_curinterp);
1521 exit (exitstatus);
1380} 1522}
1381 1523
1382/* 1524/*
1383 * this is a _very_ stripped down perl interpreter ;) 1525 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1526 */
… …
1411 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1553 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1412 * runtime errors here, as this is just a random interpreter, not a thread. 1554 * runtime errors here, as this is just a random interpreter, not a thread.
1413 */ 1555 */
1414 1556
1415 /* 1557 /*
1558 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1559 * requires PL_scopestack_ix, so do it here if required.
1560 */
1561 if (!PL_scopestack_ix)
1562 ENTER;
1563
1564 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1565 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1566 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1567 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1568 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1569 */
1424 PL_top_env = main_top_env; 1570 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1571 }
1427} 1572}
1428 1573
1429static coro_cctx * 1574static coro_cctx *
1430cctx_new () 1575cctx_new (void)
1431{ 1576{
1432 coro_cctx *cctx; 1577 coro_cctx *cctx;
1433 1578
1434 ++cctx_count; 1579 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1580 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1586 return cctx;
1442} 1587}
1443 1588
1444/* create a new cctx only suitable as source */ 1589/* create a new cctx only suitable as source */
1445static coro_cctx * 1590static coro_cctx *
1446cctx_new_empty () 1591cctx_new_empty (void)
1447{ 1592{
1448 coro_cctx *cctx = cctx_new (); 1593 coro_cctx *cctx = cctx_new ();
1449 1594
1450 cctx->sptr = 0; 1595 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1596 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1597
1453 return cctx; 1598 return cctx;
1454} 1599}
1455 1600
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1601/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1602static coro_cctx *
1458cctx_new_run () 1603cctx_new_run (void)
1459{ 1604{
1460 coro_cctx *cctx = cctx_new (); 1605 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1606
1464#if HAVE_MMAP 1607 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1468
1469 if (cctx->sptr != (void *)-1)
1470 {
1471 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1473 #endif
1474 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1475 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1476 cctx->flags |= CC_MAPPED;
1477 } 1608 {
1478 else
1479#endif
1480 {
1481 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1482 New (0, cctx->sptr, cctx_stacksize, long);
1483
1484 if (!cctx->sptr)
1485 {
1486 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1609 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1610 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1611 }
1493 1612
1494 #if CORO_USE_VALGRIND
1495 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1496 #endif
1497
1498 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1613 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1614
1500 return cctx; 1615 return cctx;
1501} 1616}
1502 1617
1503static void 1618static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1624 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1625
1511 --cctx_count; 1626 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1627 coro_destroy (&cctx->cctx);
1513 1628
1514 /* coro_transfer creates new, empty cctx's */ 1629 coro_stack_free (&cctx->stack);
1515 if (cctx->sptr)
1516 {
1517 #if CORO_USE_VALGRIND
1518 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1519 #endif
1520
1521#if HAVE_MMAP
1522 if (cctx->flags & CC_MAPPED)
1523 munmap (cctx->sptr, cctx->ssize);
1524 else
1525#endif
1526 Safefree (cctx->sptr);
1527 }
1528 1630
1529 Safefree (cctx); 1631 Safefree (cctx);
1530} 1632}
1531 1633
1532/* wether this cctx should be destructed */ 1634/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1635#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1636
1535static coro_cctx * 1637static coro_cctx *
1536cctx_get (pTHX) 1638cctx_get (pTHX)
1537{ 1639{
1538 while (expect_true (cctx_first)) 1640 while (ecb_expect_true (cctx_first))
1539 { 1641 {
1540 coro_cctx *cctx = cctx_first; 1642 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1643 cctx_first = cctx->next;
1542 --cctx_idle; 1644 --cctx_idle;
1543 1645
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1646 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1647 return cctx;
1546 1648
1547 cctx_destroy (cctx); 1649 cctx_destroy (cctx);
1548 } 1650 }
1549 1651
… …
1551} 1653}
1552 1654
1553static void 1655static void
1554cctx_put (coro_cctx *cctx) 1656cctx_put (coro_cctx *cctx)
1555{ 1657{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1658 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1659
1558 /* free another cctx if overlimit */ 1660 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1661 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1662 {
1561 coro_cctx *first = cctx_first; 1663 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1664 cctx_first = first->next;
1563 --cctx_idle; 1665 --cctx_idle;
1564 1666
… …
1575static void 1677static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1678transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1679{
1578 /* TODO: throwing up here is considered harmful */ 1680 /* TODO: throwing up here is considered harmful */
1579 1681
1580 if (expect_true (prev != next)) 1682 if (ecb_expect_true (prev != next))
1581 { 1683 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1684 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1685 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1686
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1687 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1688 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1689
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1690#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1691 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1692 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1693#endif
1592 } 1694 }
1593} 1695}
1594 1696
1595/* always use the TRANSFER macro */ 1697/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1698static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1699transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1700{
1599 dSTACKLEVEL; 1701 dSTACKLEVEL;
1600 1702
1601 /* sometimes transfer is only called to set idle_sp */ 1703 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1704 if (ecb_expect_false (!prev))
1603 { 1705 {
1604 cctx_current->idle_sp = STACKLEVEL; 1706 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1707 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1708 }
1607 else if (expect_true (prev != next)) 1709 else if (ecb_expect_true (prev != next))
1608 { 1710 {
1609 coro_cctx *cctx_prev; 1711 coro_cctx *cctx_prev;
1610 1712
1611 if (expect_false (prev->flags & CF_NEW)) 1713 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1714 {
1613 /* create a new empty/source context */ 1715 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1716 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1717 prev->flags |= CF_RUNNING;
1616 } 1718 }
… …
1619 next->flags |= CF_RUNNING; 1721 next->flags |= CF_RUNNING;
1620 1722
1621 /* first get rid of the old state */ 1723 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1724 save_perl (aTHX_ prev);
1623 1725
1624 if (expect_false (next->flags & CF_NEW)) 1726 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1727 {
1626 /* need to start coroutine */ 1728 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1729 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1730 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1731 init_perl (aTHX_ next);
1630 } 1732 }
1631 else 1733 else
1632 load_perl (aTHX_ next); 1734 load_perl (aTHX_ next);
1633 1735
1634 /* possibly untie and reuse the cctx */ 1736 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1737 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1738 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1739 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1740 && !force_cctx
1639 )) 1741 ))
1640 { 1742 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1743 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1744 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1745
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1746 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1747 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1748 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1749 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1750 next->cctx = cctx_get (aTHX);
1649 1751
1650 cctx_put (cctx_current); 1752 cctx_put (cctx_current);
1651 } 1753 }
1652 else 1754 else
1653 prev->cctx = cctx_current; 1755 prev->cctx = cctx_current;
1654 1756
1655 ++next->usecount; 1757 ++next->usecount;
1656 1758
1657 cctx_prev = cctx_current; 1759 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1760 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1761
1660 next->cctx = 0; 1762 next->cctx = 0;
1661 1763
1662 if (expect_false (cctx_prev != cctx_current)) 1764 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1765 {
1664 cctx_prev->top_env = PL_top_env; 1766 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1767 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1768 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1769 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1775#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1776#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1777
1676/** high level stuff ********************************************************/ 1778/** high level stuff ********************************************************/
1677 1779
1780/* this function is actually Coro, not Coro::State, but we call it from here */
1781/* because it is convenient - but it hasn't been declared yet for that reason */
1782static void
1783coro_call_on_destroy (pTHX_ struct coro *coro);
1784
1678static void 1785static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1786coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1787{
1681 if (coro->flags & CF_DESTROYED) 1788 if (coro->flags & CF_ZOMBIE)
1682 return; 1789 return;
1683 1790
1684 slf_destroy (aTHX_ coro); 1791 slf_destroy (aTHX_ coro);
1685 1792
1686 coro->flags |= CF_DESTROYED; 1793 coro->flags |= CF_ZOMBIE;
1687 1794
1688 if (coro->flags & CF_READY) 1795 if (coro->flags & CF_READY)
1689 { 1796 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1797 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1798 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1799 --coro_nready;
1693 } 1800 }
1694 else 1801 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1802 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1803
1804 if (coro->next) coro->next->prev = coro->prev;
1805 if (coro->prev) coro->prev->next = coro->next;
1806 if (coro == coro_first) coro_first = coro->next;
1696 1807
1697 if (coro->mainstack 1808 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1809 && coro->mainstack != main_mainstack
1699 && coro->slot 1810 && coro->slot
1700 && !PL_dirty) 1811 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1812 destroy_perl (aTHX_ coro);
1702 1813
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1814 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1815 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1816 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1817 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1818 SvREFCNT_dec (CORO_THROW);
1819
1820 coro_call_on_destroy (aTHX_ coro);
1821
1822 /* more destruction mayhem in coro_state_free */
1712} 1823}
1713 1824
1714static int 1825static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1826coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1827{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1828 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1829 mg->mg_ptr = 0;
1719 1830
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1831 coro_state_destroy (aTHX_ coro);
1832 SvREFCNT_dec (coro->on_destroy);
1833 SvREFCNT_dec (coro->status);
1834
1725 Safefree (coro); 1835 Safefree (coro);
1726 }
1727 1836
1728 return 0; 1837 return 0;
1729} 1838}
1730 1839
1731static int 1840static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1841coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1842{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1843 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1844 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1845 mg->mg_ptr = 0;
1846 mg->mg_virtual = 0;
1737 1847
1738 return 0; 1848 return 0;
1739} 1849}
1740 1850
1741static MGVTBL coro_state_vtbl = { 1851static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1876 TRANSFER (ta, 1);
1767} 1877}
1768 1878
1769/** Coro ********************************************************************/ 1879/** Coro ********************************************************************/
1770 1880
1771INLINE void 1881ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1882coro_enq (pTHX_ struct coro *coro)
1773{ 1883{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1884 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1885
1776 SvREFCNT_inc_NN (coro->hv); 1886 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1888 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1889 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1890 ready [1] = coro;
1781} 1891}
1782 1892
1783INLINE struct coro * 1893ecb_inline struct coro *
1784coro_deq (pTHX) 1894coro_deq (pTHX)
1785{ 1895{
1786 int prio; 1896 int prio;
1787 1897
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1898 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1951{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1952 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1953}
1844 1954
1845/* expects to own a reference to next->hv */ 1955/* expects to own a reference to next->hv */
1846INLINE void 1956ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1957prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1958{
1849 SV *prev_sv = SvRV (coro_current); 1959 SV *prev_sv = SvRV (coro_current);
1850 1960
1851 ta->prev = SvSTATE_hv (prev_sv); 1961 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1974{
1865 for (;;) 1975 for (;;)
1866 { 1976 {
1867 struct coro *next = coro_deq (aTHX); 1977 struct coro *next = coro_deq (aTHX);
1868 1978
1869 if (expect_true (next)) 1979 if (ecb_expect_true (next))
1870 { 1980 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1981 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1982 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1983 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1984 else
1875 { 1985 {
1876 next->flags &= ~CF_READY; 1986 next->flags &= ~CF_READY;
1877 --coro_nready; 1987 --coro_nready;
… …
1885 /* nothing to schedule: call the idle handler */ 1995 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle) 1996 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle))) 1997 && SvOBJECT (SvRV (sv_idle)))
1888 { 1998 {
1889 if (SvRV (sv_idle) == SvRV (coro_current)) 1999 if (SvRV (sv_idle) == SvRV (coro_current))
2000 {
2001 require_pv ("Carp");
2002
2003 {
2004 dSP;
2005
2006 ENTER;
2007 SAVETMPS;
2008
2009 PUSHMARK (SP);
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2010 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2011 PUTBACK;
2012 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2013
2014 FREETMPS;
2015 LEAVE;
2016 }
2017 }
1891 2018
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2019 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle)); 2020 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready; 2021 --coro_nready;
1895 } 2022 }
… …
1910 } 2037 }
1911 } 2038 }
1912 } 2039 }
1913} 2040}
1914 2041
1915INLINE void 2042ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 2043prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 2044{
1918 api_ready (aTHX_ coro_current); 2045 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 2046 prepare_schedule (aTHX_ ta);
1920} 2047}
1921 2048
1922INLINE void 2049ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2050prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 2051{
1925 SV *prev = SvRV (coro_current); 2052 SV *prev = SvRV (coro_current);
1926 2053
1927 if (coro_nready) 2054 if (coro_nready)
… …
1957{ 2084{
1958 struct coro_transfer_args ta; 2085 struct coro_transfer_args ta;
1959 2086
1960 prepare_cede (aTHX_ &ta); 2087 prepare_cede (aTHX_ &ta);
1961 2088
1962 if (expect_true (ta.prev != ta.next)) 2089 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2090 {
1964 TRANSFER (ta, 1); 2091 TRANSFER (ta, 1);
1965 return 1; 2092 return 1;
1966 } 2093 }
1967 else 2094 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2137 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2138 }
2012} 2139}
2013 2140
2014static void 2141static void
2142coro_push_av (pTHX_ AV *av, I32 gimme_v)
2143{
2144 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2145 {
2146 dSP;
2147
2148 if (gimme_v == G_SCALAR)
2149 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2150 else
2151 {
2152 int i;
2153 EXTEND (SP, AvFILLp (av) + 1);
2154
2155 for (i = 0; i <= AvFILLp (av); ++i)
2156 PUSHs (AvARRAY (av)[i]);
2157 }
2158
2159 PUTBACK;
2160 }
2161}
2162
2163static void
2164coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2165{
2166 if (!coro->on_destroy)
2167 coro->on_destroy = newAV ();
2168
2169 av_push (coro->on_destroy, cb);
2170}
2171
2172static void
2173slf_destroy_join (pTHX_ struct CoroSLF *frame)
2174{
2175 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2176}
2177
2178static int
2179slf_check_join (pTHX_ struct CoroSLF *frame)
2180{
2181 struct coro *coro = (struct coro *)frame->data;
2182
2183 if (!coro->status)
2184 return 1;
2185
2186 frame->destroy = 0;
2187
2188 coro_push_av (aTHX_ coro->status, GIMME_V);
2189
2190 SvREFCNT_dec ((SV *)coro->hv);
2191
2192 return 0;
2193}
2194
2195static void
2196slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2197{
2198 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2199
2200 if (items > 1)
2201 croak ("join called with too many arguments");
2202
2203 if (coro->status)
2204 frame->prepare = prepare_nop;
2205 else
2206 {
2207 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2208 frame->prepare = prepare_schedule;
2209 }
2210
2211 frame->check = slf_check_join;
2212 frame->destroy = slf_destroy_join;
2213 frame->data = (void *)coro;
2214 SvREFCNT_inc (coro->hv);
2215}
2216
2217static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2218coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2219{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2220 AV *od = coro->on_destroy;
2018 2221
2019 if (on_destroyp) 2222 if (!od)
2020 { 2223 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2224
2225 coro->on_destroy = 0;
2226 sv_2mortal ((SV *)od);
2227
2025 while (AvFILLp (on_destroy) >= 0) 2228 while (AvFILLp (od) >= 0)
2229 {
2230 SV *cb = sv_2mortal (av_pop (od));
2231
2232 /* coro hv's (and only hv's at the moment) are supported as well */
2233 if (SvSTATEhv_p (aTHX_ cb))
2234 api_ready (aTHX_ cb);
2235 else
2026 { 2236 {
2027 dSP; /* don't disturb outer sp */ 2237 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2238 PUSHMARK (SP);
2031 2239
2032 if (statusp) 2240 if (coro->status)
2033 { 2241 {
2034 int i; 2242 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2243 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2244 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2245 }
2040 2246
2041 PUTBACK; 2247 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2248 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2249 }
2044 } 2250 }
2045} 2251}
2046 2252
2047static void 2253static void
2048coro_set_status (HV *coro_hv, SV **arg, int items) 2254coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2255{
2050 AV *av = newAV (); 2256 AV *av;
2257
2258 if (coro->status)
2259 {
2260 av = coro->status;
2261 av_clear (av);
2262 }
2263 else
2264 av = coro->status = newAV ();
2051 2265
2052 /* items are actually not so common, so optimise for this case */ 2266 /* items are actually not so common, so optimise for this case */
2053 if (items) 2267 if (items)
2054 { 2268 {
2055 int i; 2269 int i;
… …
2057 av_extend (av, items - 1); 2271 av_extend (av, items - 1);
2058 2272
2059 for (i = 0; i < items; ++i) 2273 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2274 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2275 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2276}
2065 2277
2066static void 2278static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2279slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2280{
… …
2080static void 2292static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2293slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2294{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2295 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2296
2085 coro_set_status (coro_hv, arg, items); 2297 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (frame, coro_hv); 2298 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2299}
2088 2300
2089static void 2301static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2302slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{ 2303{
… …
2096 croak ("Coro::cancel called without coro object,"); 2308 croak ("Coro::cancel called without coro object,");
2097 2309
2098 coro = SvSTATE (arg [0]); 2310 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2311 coro_hv = coro->hv;
2100 2312
2101 coro_set_status (coro_hv, arg + 1, items - 1); 2313 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2314
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2315 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2316 {
2105 /* coro currently busy cancelling something, so just notify it */ 2317 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2318 coro->slf_frame.data = (void *)coro;
2107 2319
2108 frame->prepare = prepare_nop; 2320 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop; 2321 frame->check = slf_check_nop;
2110 } 2322 }
2111 else if (coro_hv == (HV *)SvRV (coro_current)) 2323 else if (coro_hv == (HV *)SvRV (coro_current))
2112 { 2324 {
2113 /* cancelling the current coro is allowed, and equals terminate */ 2325 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (frame, coro_hv); 2326 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2327 }
2116 else 2328 else
2117 { 2329 {
2118 struct coro *self = SvSTATE_current; 2330 struct coro *self = SvSTATE_current;
2331
2332 if (!self)
2333 croak ("Coro::cancel called outside of thread content,");
2119 2334
2120 /* otherwise we cancel directly, purely for speed reasons 2335 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as 2336 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation. 2337 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed. 2338 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2339 * besides, I can't get the slow-but-safe version working...
2125 */ 2340 */
2126 slf_frame.data = 0; 2341 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2342 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2343 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2344 self->flags &= ~CF_NOCANCEL;
2133 2345
2134 if (slf_frame.data) 2346 if (slf_frame.data)
2135 { 2347 {
2136 /* while we were busy we have been cancelled, so terminate */ 2348 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (frame, self->hv); 2349 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 } 2350 }
2139 else 2351 else
2140 { 2352 {
2141 frame->prepare = prepare_nop; 2353 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop; 2354 frame->check = slf_check_nop;
… …
2146 2358
2147static int 2359static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame) 2360slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{ 2361{
2150 frame->prepare = 0; 2362 frame->prepare = 0;
2151 coro_unwind_stacks (); 2363 coro_unwind_stacks (aTHX);
2152 2364
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current)); 2365 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154 2366
2155 return 1; 2367 return 1;
2156} 2368}
… …
2159safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2371safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2160{ 2372{
2161 if (coro->cctx) 2373 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2374 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2375
2164 if (coro->flags & CF_NEW) 2376 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2165 { 2377 {
2166 coro_set_status (coro->hv, arg, items); 2378 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2379 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2380 }
2170 else 2381 else
2171 { 2382 {
2172 if (!coro->slf_frame.prepare) 2383 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2384 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2385
2175 slf_destroy (coro); 2386 slf_destroy (aTHX_ coro);
2176 2387
2177 coro_set_status (coro->hv, arg, items); 2388 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2389 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2390 coro->slf_frame.check = slf_check_safe_cancel;
2180 2391
2181 api_ready (aTHX_ coro->hv); 2392 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2393 }
2183 2394
2184 return 1; 2395 return 1;
2185} 2396}
2186 2397
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2431slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2432{
2222 HV *hv = (HV *)SvRV (coro_current); 2433 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2434 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2435
2225 if (expect_true (coro->saved_deffh)) 2436 if (ecb_expect_true (coro->saved_deffh))
2226 { 2437 {
2227 /* subsequent iteration */ 2438 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2439 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2440 coro->saved_deffh = 0;
2230 2441
… …
2237 else 2448 else
2238 { 2449 {
2239 av_clear (GvAV (PL_defgv)); 2450 av_clear (GvAV (PL_defgv));
2240 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2451 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2241 2452
2453 if (ecb_expect_false (coro->swap_sv))
2454 {
2455 SWAP_SVS_LEAVE (coro);
2456 SvREFCNT_dec_NN (coro->swap_sv);
2457 coro->swap_sv = 0;
2458 }
2459
2242 coro->prio = 0; 2460 coro->prio = 0;
2243 2461
2244 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2462 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2245 api_trace (aTHX_ coro_current, 0); 2463 api_trace (aTHX_ coro_current, 0);
2246 2464
2247 frame->prepare = prepare_schedule; 2465 frame->prepare = prepare_schedule;
2248 av_push (av_async_pool, SvREFCNT_inc (hv)); 2466 av_push (av_async_pool, SvREFCNT_inc (hv));
2249 } 2467 }
… …
2290 2508
2291static int 2509static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2510slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2511{
2294 SV *data = (SV *)frame->data; 2512 SV *data = (SV *)frame->data;
2295 2513
2296 if (CORO_THROW) 2514 if (CORO_THROW)
2297 return 0; 2515 return 0;
2298 2516
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2517 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2518 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2554 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2555 coro->rouse_cb = 0;
2338 } 2556 }
2339 2557
2340 if (!SvROK (cb) 2558 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2559 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2560 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2561 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2562
2345 { 2563 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2564 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2469 2687
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2688/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void 2689static void
2472slf_destroy (pTHX_ struct coro *coro) 2690slf_destroy (pTHX_ struct coro *coro)
2473{ 2691{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2692 struct CoroSLF frame = coro->slf_frame;
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477 2693
2478 /* 2694 /*
2479 * The on_destroy above most likely is from an SLF call. 2695 * The on_destroy below most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2696 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2697 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions. 2698 * cleanup functions cannot call SLF functions.
2483 */ 2699 */
2484 coro->slf_frame.prepare = 0; 2700 coro->slf_frame.prepare = 0;
2701
2702 /* this callback is reserved for slf functions needing to do cleanup */
2703 if (frame.destroy && frame.prepare && !PL_dirty)
2704 frame.destroy (aTHX_ &frame);
2485} 2705}
2486 2706
2487/* 2707/*
2488 * these not obviously related functions are all rolled into one 2708 * these not obviously related functions are all rolled into one
2489 * function to increase chances that they all will call transfer with the same 2709 * function to increase chances that they all will call transfer with the same
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2716 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2717
2498 /* set up the slf frame, unless it has already been set-up */ 2718 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2719 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2720 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2721 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2722 {
2503 /* first iteration */ 2723 /* first iteration */
2504 dSP; 2724 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2725 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2726 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2767 while (slf_frame.check (aTHX_ &slf_frame));
2548 2768
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2769 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2770
2551 /* exception handling */ 2771 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2772 if (ecb_expect_false (CORO_THROW))
2553 { 2773 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2774 SV *exception = sv_2mortal (CORO_THROW);
2555 2775
2556 CORO_THROW = 0; 2776 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2777 sv_setsv (ERRSV, exception);
2558 croak (0); 2778 croak (0);
2559 } 2779 }
2560 2780
2561 /* return value handling - mostly like entersub */ 2781 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2782 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2783 if (GIMME_V == G_SCALAR
2784 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2785 {
2565 dSP; 2786 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2787 SV **bot = PL_stack_base + checkmark;
2567 2788
2568 if (sp == bot) /* too few, push undef */ 2789 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2790 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2791 else /* too many, take last one */
2571 bot [1] = *sp; 2792 bot [1] = *sp;
2572 2793
2573 SP = bot + 1; 2794 SP = bot + 1;
2574 2795
2575 PUTBACK; 2796 PUTBACK;
… …
2673{ 2894{
2674 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2895 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2675 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2896 on_enterleave_call (aTHX_ sv_2mortal (cb));
2676} 2897}
2677 2898
2899static void
2900enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2901{
2902 if (!hook)
2903 return;
2904
2905 if (!*avp)
2906 {
2907 *avp = newAV ();
2908 AvREAL_off (*avp);
2909 }
2910
2911 av_push (*avp, (SV *)hook);
2912 av_push (*avp, (SV *)arg);
2913}
2914
2915static void
2916enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2917{
2918 AV *av = *avp;
2919 int i;
2920
2921 if (!av)
2922 return;
2923
2924 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2925 if (AvARRAY (av)[i] == (SV *)hook)
2926 {
2927 if (execute)
2928 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2929
2930 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2931 av_pop (av);
2932 av_pop (av);
2933 break;
2934 }
2935
2936 if (AvFILLp (av) >= 0)
2937 {
2938 *avp = 0;
2939 SvREFCNT_dec_NN (av);
2940 }
2941}
2942
2943static void
2944api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2945{
2946 struct coro *coro = SvSTATE (coro_sv);
2947
2948 if (SvSTATE_current == coro)
2949 if (enter)
2950 enter (aTHX_ enter_arg);
2951
2952 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2954}
2955
2956static void
2957api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2963}
2964
2965static void
2966savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2967{
2968 struct coro *coro = SvSTATE_current;
2969
2970 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2971}
2972
2973static void
2974savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2975{
2976 struct coro *coro = SvSTATE_current;
2977
2978 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2979}
2980
2981static void
2982api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2983{
2984 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2985
2986 /* this ought to be much cheaper than malloc + a single destructor call */
2987 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2988 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2989}
2990
2678/*****************************************************************************/ 2991/*****************************************************************************/
2679/* PerlIO::cede */ 2992/* PerlIO::cede */
2680 2993
2681typedef struct 2994typedef struct
2682{ 2995{
2683 PerlIOBuf base; 2996 PerlIOBuf base;
2684 NV next, every; 2997 NV next, every;
2685} PerlIOCede; 2998} PerlIOCede;
2686 2999
2687static IV 3000static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3001PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 3002{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 3004
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3005 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 3006 self->next = nvtime () + self->every;
2694 3007
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3008 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 3009}
2697 3010
2698static SV * 3011static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3012PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 3013{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3014 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 3015
2703 return newSVnv (self->every); 3016 return newSVnv (self->every);
… …
2810 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3123 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2811 PUTBACK; 3124 PUTBACK;
2812 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3125 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2813 } 3126 }
2814 3127
2815 SvREFCNT_dec (cb); 3128 SvREFCNT_dec_NN (cb);
2816 } 3129 }
2817} 3130}
2818 3131
2819static void 3132static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 3133coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 3134{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3135 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3136 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 3137}
2825 3138
2826static int 3139static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3140slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 3141{
2829 AV *av = (AV *)frame->data; 3142 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 3143 SV *count_sv = AvARRAY (av)[0];
3144 SV *coro_hv = SvRV (coro_current);
3145
3146 frame->destroy = 0;
2831 3147
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 3148 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 3149 if (ecb_expect_false (CORO_THROW))
3150 {
3151 /* we still might be responsible for the semaphore, so wake up others */
3152 coro_semaphore_adjust (aTHX_ av, 0);
3153
2834 return 0; 3154 return 0;
3155 }
2835 else if (SvIVX (count_sv) > 0) 3156 else if (SvIVX (count_sv) > 0)
2836 { 3157 {
2837 frame->destroy = 0;
2838
2839 if (acquire) 3158 if (acquire)
2840 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3159 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2841 else 3160 else
2842 coro_semaphore_adjust (aTHX_ av, 0); 3161 coro_semaphore_adjust (aTHX_ av, 0);
2843 3162
… …
2847 { 3166 {
2848 int i; 3167 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 3168 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 3169 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 3170 /* this avoids some degenerate memory usage cases */
2852 3171 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 3172 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 3173 return 1;
2856 3174
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3175 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 3176 return 1;
2859 } 3177 }
2860} 3178}
2861 3179
2862static int 3180static int
… …
2955 { 3273 {
2956 api_ready (aTHX_ cb); 3274 api_ready (aTHX_ cb);
2957 sv_setiv (cb, 0); /* signal waiter */ 3275 sv_setiv (cb, 0); /* signal waiter */
2958 } 3276 }
2959 3277
2960 SvREFCNT_dec (cb); 3278 SvREFCNT_dec_NN (cb);
2961 3279
2962 --count; 3280 --count;
2963 } 3281 }
2964} 3282}
2965 3283
… …
3050 } 3368 }
3051 3369
3052 av_push (state, data_sv); 3370 av_push (state, data_sv);
3053 3371
3054 api_ready (aTHX_ coro); 3372 api_ready (aTHX_ coro);
3055 SvREFCNT_dec (coro); 3373 SvREFCNT_dec_NN (coro);
3056 SvREFCNT_dec ((AV *)state); 3374 SvREFCNT_dec_NN ((AV *)state);
3057} 3375}
3058 3376
3059static int 3377static int
3060slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3378slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3061{ 3379{
… …
3066 /* it quickly returns */ 3384 /* it quickly returns */
3067 if (CORO_THROW) 3385 if (CORO_THROW)
3068 return 0; 3386 return 0;
3069 3387
3070 /* one element that is an RV? repeat! */ 3388 /* one element that is an RV? repeat! */
3071 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3389 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3072 return 1; 3390 return 1;
3073 3391
3074 /* restore status */ 3392 /* restore status */
3075 { 3393 {
3076 SV *data_sv = av_pop (state); 3394 SV *data_sv = av_pop (state);
… …
3079 errno = data->errorno; 3397 errno = data->errorno;
3080 PL_laststype = data->laststype; 3398 PL_laststype = data->laststype;
3081 PL_laststatval = data->laststatval; 3399 PL_laststatval = data->laststatval;
3082 PL_statcache = data->statcache; 3400 PL_statcache = data->statcache;
3083 3401
3084 SvREFCNT_dec (data_sv); 3402 SvREFCNT_dec_NN (data_sv);
3085 } 3403 }
3086 3404
3087 /* push result values */ 3405 /* push result values */
3088 { 3406 {
3089 dSP; 3407 dSP;
… …
3115 dSP; 3433 dSP;
3116 3434
3117 static SV *prio_cv; 3435 static SV *prio_cv;
3118 static SV *prio_sv; 3436 static SV *prio_sv;
3119 3437
3120 if (expect_false (!prio_cv)) 3438 if (ecb_expect_false (!prio_cv))
3121 { 3439 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3440 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3441 prio_sv = newSViv (0);
3124 } 3442 }
3125 3443
… …
3231 } 3549 }
3232 3550
3233 return coro_sv; 3551 return coro_sv;
3234} 3552}
3235 3553
3554#ifndef __cplusplus
3555ecb_cold XS(boot_Coro__State);
3556#endif
3557
3558#if CORO_JIT
3559
3560static void ecb_noinline ecb_cold
3561pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3562{
3563 dSP;
3564 AV *av = newAV ();
3565
3566 av_store (av, 3, newSVuv (d));
3567 av_store (av, 2, newSVuv (c));
3568 av_store (av, 1, newSVuv (b));
3569 av_store (av, 0, newSVuv (a));
3570
3571 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3572
3573 PUTBACK;
3574}
3575
3576static void ecb_noinline ecb_cold
3577jit_init (pTHX)
3578{
3579 dSP;
3580 SV *load, *save;
3581 char *map_base;
3582 char *load_ptr, *save_ptr;
3583 STRLEN load_len, save_len, map_len;
3584 int count;
3585
3586 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3587
3588 PUSHMARK (SP);
3589 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3590 #include "state.h"
3591 count = call_pv ("Coro::State::_jit", G_ARRAY);
3592 SPAGAIN;
3593
3594 save = POPs; save_ptr = SvPVbyte (save, save_len);
3595 load = POPs; load_ptr = SvPVbyte (load, load_len);
3596
3597 map_len = load_len + save_len + 16;
3598
3599 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3600
3601 if (map_base == (char *)MAP_FAILED)
3602 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3603
3604 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3605
3606 load_perl_slots = (load_save_perl_slots_type)map_base;
3607 memcpy (map_base, load_ptr, load_len);
3608
3609 map_base += (load_len + 15) & ~15;
3610
3611 save_perl_slots = (load_save_perl_slots_type)map_base;
3612 memcpy (map_base, save_ptr, save_len);
3613
3614 /* we are good citizens and try to make the page read-only, so the evil evil */
3615 /* hackers might have it a bit more difficult */
3616 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3617
3618 PUTBACK;
3619 eval_pv ("undef &Coro::State::_jit", 1);
3620}
3621
3622#endif
3623
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3625
3238PROTOTYPES: DISABLE 3626PROTOTYPES: DISABLE
3239 3627
3240BOOT: 3628BOOT:
3241{ 3629{
3630#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3631#include "state.h"
3242#ifdef USE_ITHREADS 3632#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3633# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3634 coro_thx = PERL_GET_CONTEXT;
3245# endif 3635# endif
3246#endif 3636#endif
3247 BOOT_PAGESIZE; 3637 /* perl defines these to check for existance first, but why it doesn't */
3638 /* just create them one at init time is not clear to me, except for */
3639 /* programs trying to delete them, but... */
3640 /* anyway, we declare this as invalid and make sure they are initialised here */
3641 DEFSV;
3642 ERRSV;
3248 3643
3249 cctx_current = cctx_new_empty (); 3644 cctx_current = cctx_new_empty ();
3250 3645
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3646 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3647 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3253 3648
3254 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3649 {
3255 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3650 /*
3256 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3651 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3652 * by coro_sig_vtbl in hash values.
3653 */
3654 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3655
3656 /* this only works if perl doesn't have a vtbl for %SIG */
3657 assert (!mg->mg_virtual);
3658
3659 /*
3660 * The irony is that the perl API itself asserts that mg_virtual
3661 * must be non-const, yet perl5porters insisted on marking their
3662 * vtbls as read-only, just to thwart perl modules from patching
3663 * them.
3664 */
3665 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3666 mg->mg_flags |= MGf_COPY;
3667
3668 coro_sigelem_vtbl = PL_vtbl_sigelem;
3669 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3670 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3671 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3672 }
3257 3673
3258 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3259 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3674 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3260 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3675 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3261 3676
3262 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3677 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3263 3678
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3710 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3711
3297 time_init (aTHX); 3712 time_init (aTHX);
3298 3713
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3714 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3715#if CORO_JIT
3716 PUTBACK;
3717 jit_init (aTHX);
3718 SPAGAIN;
3719#endif
3300} 3720}
3301 3721
3302SV * 3722SV *
3303new (SV *klass, ...) 3723new (SV *klass, ...)
3304 ALIAS: 3724 ALIAS:
… …
3311void 3731void
3312transfer (...) 3732transfer (...)
3313 PROTOTYPE: $$ 3733 PROTOTYPE: $$
3314 CODE: 3734 CODE:
3315 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3735 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3316
3317void
3318_exit (int code)
3319 PROTOTYPE: $
3320 CODE:
3321 _exit (code);
3322 3736
3323SV * 3737SV *
3324clone (Coro::State coro) 3738clone (Coro::State coro)
3325 CODE: 3739 CODE:
3326{ 3740{
… …
3381void 3795void
3382list () 3796list ()
3383 PROTOTYPE: 3797 PROTOTYPE:
3384 PPCODE: 3798 PPCODE:
3385{ 3799{
3386 struct coro *coro; 3800 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3801 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3802 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3803 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3804}
3391 3805
… …
3446 PROTOTYPE: $ 3860 PROTOTYPE: $
3447 ALIAS: 3861 ALIAS:
3448 is_ready = CF_READY 3862 is_ready = CF_READY
3449 is_running = CF_RUNNING 3863 is_running = CF_RUNNING
3450 is_new = CF_NEW 3864 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3865 is_destroyed = CF_ZOMBIE
3866 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3867 is_suspended = CF_SUSPENDED
3453 CODE: 3868 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3869 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3870 OUTPUT:
3456 RETVAL 3871 RETVAL
3457 3872
3458void 3873void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3874throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3875 PROTOTYPE: $;$
3461 CODE: 3876 CODE:
3462{ 3877{
3878 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3879 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3880 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3881 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3882 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3883 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3884
3885 api_ready (aTHX_ self);
3468} 3886}
3469 3887
3470void 3888void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3889api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3890 PROTOTYPE: $;$
… …
3549 3967
3550void 3968void
3551times (Coro::State self) 3969times (Coro::State self)
3552 PPCODE: 3970 PPCODE:
3553{ 3971{
3554 struct coro *current = SvSTATE (coro_current); 3972 struct coro *current = SvSTATE (coro_current);
3555 3973
3556 if (expect_false (current == self)) 3974 if (ecb_expect_false (current == self))
3557 { 3975 {
3558 coro_times_update (); 3976 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3977 coro_times_add (SvSTATE (coro_current));
3560 } 3978 }
3561 3979
3562 EXTEND (SP, 2); 3980 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3981 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3982 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3983
3566 if (expect_false (current == self)) 3984 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3985 coro_times_sub (SvSTATE (coro_current));
3568} 3986}
3569 3987
3570void 3988void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3989swap_sv (Coro::State coro, SV *sva, SV *svb)
3572 CODE: 3990 CODE:
3573{ 3991{
3574 struct coro *current = SvSTATE_current; 3992 struct coro *current = SvSTATE_current;
3993 AV *swap_sv;
3994 int i;
3995
3996 sva = SvRV (sva);
3997 svb = SvRV (svb);
3575 3998
3576 if (current == coro) 3999 if (current == coro)
3577 SWAP_SVS (current); 4000 SWAP_SVS_LEAVE (current);
3578 4001
3579 if (!coro->swap_sv) 4002 if (!coro->swap_sv)
3580 coro->swap_sv = newAV (); 4003 coro->swap_sv = newAV ();
3581 4004
4005 swap_sv = coro->swap_sv;
4006
4007 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4008 {
4009 SV *a = AvARRAY (swap_sv)[i ];
4010 SV *b = AvARRAY (swap_sv)[i + 1];
4011
4012 if (a == sva && b == svb)
4013 {
4014 SvREFCNT_dec_NN (a);
4015 SvREFCNT_dec_NN (b);
4016
4017 for (; i <= AvFILLp (swap_sv) - 2; i++)
4018 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4019
4020 AvFILLp (swap_sv) -= 2;
4021
4022 goto removed;
4023 }
4024 }
4025
3582 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4026 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3583 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4028
4029 removed:
3584 4030
3585 if (current == coro) 4031 if (current == coro)
3586 SWAP_SVS (current); 4032 SWAP_SVS_ENTER (current);
3587} 4033}
3588 4034
3589 4035
3590MODULE = Coro::State PACKAGE = Coro 4036MODULE = Coro::State PACKAGE = Coro
3591 4037
3592BOOT: 4038BOOT:
3593{ 4039{
4040 if (SVt_LAST > 32)
4041 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4042
3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4043 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4044 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4045 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3597 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4046 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4047 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3602 4051
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4052 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4053 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4054 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4055 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 4056
3608 coro_stash = gv_stashpv ("Coro", TRUE); 4057 coro_stash = gv_stashpv ("Coro", TRUE);
3609 4058
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4059 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4060 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4061 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3624 coroapi.ready = api_ready; 4073 coroapi.ready = api_ready;
3625 coroapi.is_ready = api_is_ready; 4074 coroapi.is_ready = api_is_ready;
3626 coroapi.nready = coro_nready; 4075 coroapi.nready = coro_nready;
3627 coroapi.current = coro_current; 4076 coroapi.current = coro_current;
3628 4077
4078 coroapi.enterleave_hook = api_enterleave_hook;
4079 coroapi.enterleave_unhook = api_enterleave_unhook;
4080 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4081
3629 /*GCoroAPI = &coroapi;*/ 4082 /*GCoroAPI = &coroapi;*/
3630 sv_setiv (sv, (IV)&coroapi); 4083 sv_setiv (sv, PTR2IV (&coroapi));
3631 SvREADONLY_on (sv); 4084 SvREADONLY_on (sv);
3632 } 4085 }
3633} 4086}
3634 4087
3635SV * 4088SV *
… …
3644void 4097void
3645_destroy (Coro::State coro) 4098_destroy (Coro::State coro)
3646 CODE: 4099 CODE:
3647 /* used by the manager thread */ 4100 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 4101 coro_state_destroy (aTHX_ coro);
4102
4103void
4104on_destroy (Coro::State coro, SV *cb)
4105 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 4106 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4107
4108void
4109join (...)
4110 CODE:
4111 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 4112
3651void 4113void
3652terminate (...) 4114terminate (...)
3653 CODE: 4115 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4116 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3689 4151
3690void 4152void
3691_set_current (SV *current) 4153_set_current (SV *current)
3692 PROTOTYPE: $ 4154 PROTOTYPE: $
3693 CODE: 4155 CODE:
3694 SvREFCNT_dec (SvRV (coro_current)); 4156 SvREFCNT_dec_NN (SvRV (coro_current));
3695 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4157 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3696 4158
3697void 4159void
3698_set_readyhook (SV *hook) 4160_set_readyhook (SV *hook)
3699 PROTOTYPE: $ 4161 PROTOTYPE: $
… …
3783 4245
3784 if ((SV *)hv == &PL_sv_undef) 4246 if ((SV *)hv == &PL_sv_undef)
3785 { 4247 {
3786 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4248 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4249 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv); 4250 SvREFCNT_dec_NN (sv);
3789 } 4251 }
3790 4252
3791 { 4253 {
3792 struct coro *coro = SvSTATE_hv (hv); 4254 struct coro *coro = SvSTATE_hv (hv);
3793 4255
… …
3800 api_ready (aTHX_ (SV *)hv); 4262 api_ready (aTHX_ (SV *)hv);
3801 4263
3802 if (GIMME_V != G_VOID) 4264 if (GIMME_V != G_VOID)
3803 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4265 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3804 else 4266 else
3805 SvREFCNT_dec (hv); 4267 SvREFCNT_dec_NN (hv);
3806} 4268}
3807 4269
3808SV * 4270SV *
3809rouse_cb () 4271rouse_cb ()
3810 PROTOTYPE: 4272 PROTOTYPE:
… …
3825 on_leave = 1 4287 on_leave = 1
3826 PROTOTYPE: & 4288 PROTOTYPE: &
3827 CODE: 4289 CODE:
3828{ 4290{
3829 struct coro *coro = SvSTATE_current; 4291 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4292 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4293
3832 block = s_get_cv_croak (block); 4294 block = s_get_cv_croak (block);
3833 4295
3834 if (!*avp) 4296 if (!*avp)
3835 *avp = newAV (); 4297 *avp = newAV ();
… …
3855 4317
3856SV * 4318SV *
3857new (SV *klass, SV *count = 0) 4319new (SV *klass, SV *count = 0)
3858 CODE: 4320 CODE:
3859{ 4321{
3860 int semcnt = 1; 4322 int semcnt = 1;
3861 4323
3862 if (count) 4324 if (count)
3863 { 4325 {
3864 SvGETMAGIC (count); 4326 SvGETMAGIC (count);
3865 4327
… …
3889 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4351 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3890 OUTPUT: 4352 OUTPUT:
3891 RETVAL 4353 RETVAL
3892 4354
3893void 4355void
3894up (SV *self, int adjust = 1) 4356up (SV *self)
3895 ALIAS:
3896 adjust = 1
3897 CODE: 4357 CODE:
4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4359
4360void
4361adjust (SV *self, int adjust)
4362 CODE:
3898 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4363 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3899 4364
3900void 4365void
3901down (...) 4366down (...)
3902 CODE: 4367 CODE:
3903 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4368 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3925 XSRETURN_NO; 4390 XSRETURN_NO;
3926} 4391}
3927 4392
3928void 4393void
3929waiters (SV *self) 4394waiters (SV *self)
3930 PPCODE: 4395 PPCODE:
3931{ 4396{
3932 AV *av = (AV *)SvRV (self); 4397 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4398 int wcount = AvFILLp (av) + 1 - 1;
3934 4399
3935 if (GIMME_V == G_SCALAR) 4400 if (GIMME_V == G_SCALAR)
… …
3944} 4409}
3945 4410
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4411MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4412
3948void 4413void
3949_may_delete (SV *sem, int count, int extra_refs) 4414_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4415 PPCODE:
3951{ 4416{
3952 AV *av = (AV *)SvRV (sem); 4417 AV *av = (AV *)SvRV (sem);
3953 4418
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4419 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4420 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4421 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4422 XSRETURN_YES;
… …
3978 4443
3979void 4444void
3980broadcast (SV *self) 4445broadcast (SV *self)
3981 CODE: 4446 CODE:
3982{ 4447{
3983 AV *av = (AV *)SvRV (self); 4448 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4449 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4450}
3986 4451
3987void 4452void
3988send (SV *self) 4453send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4461 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4462}
3998 4463
3999IV 4464IV
4000awaited (SV *self) 4465awaited (SV *self)
4001 CODE: 4466 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4467 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4468 OUTPUT:
4004 RETVAL 4469 RETVAL
4005 4470
4006 4471
… …
4011 4476
4012void 4477void
4013_schedule (...) 4478_schedule (...)
4014 CODE: 4479 CODE:
4015{ 4480{
4016 static int incede; 4481 static int incede;
4017 4482
4018 api_cede_notself (aTHX); 4483 api_cede_notself (aTHX);
4019 4484
4020 ++incede; 4485 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4486 while (coro_nready >= incede && api_cede (aTHX))
… …
4065 { 4530 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4531 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0; 4532 coro_old_pp_sselect = 0;
4068 } 4533 }
4069 4534
4535MODULE = Coro::State PACKAGE = Coro::Util
4536
4537void
4538_exit (int code)
4539 CODE:
4540 _exit (code);
4541
4542NV
4543time ()
4544 CODE:
4545 RETVAL = nvtime (aTHX);
4546 OUTPUT:
4547 RETVAL
4548
4549NV
4550gettimeofday ()
4551 PPCODE:
4552{
4553 UV tv [2];
4554 u2time (aTHX_ tv);
4555 EXTEND (SP, 2);
4556 PUSHs (sv_2mortal (newSVuv (tv [0])));
4557 PUSHs (sv_2mortal (newSVuv (tv [1])));
4558}
4559

Diff Legend

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