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.391 by root, Thu Mar 31 04:24:19 2011 UTC vs.
Revision 1.472 by root, Thu Aug 31 16:24:19 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
130static OP *pp_slf (pTHX); 144static OP *pp_slf (pTHX);
145static void slf_destroy (pTHX_ struct coro *coro);
131 146
132static U32 cctx_gen; 147static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 148static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 149static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 150static AV *main_mainstack; /* used to differentiate between $main and others */
… …
143 158
144static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
145static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
146static SV *rv_diehook; 161static SV *rv_diehook;
147static SV *rv_warnhook; 162static SV *rv_warnhook;
148static HV *hv_sig; /* %SIG */
149 163
150/* async_pool helper stuff */ 164/* async_pool helper stuff */
151static SV *sv_pool_rss; 165static SV *sv_pool_rss;
152static SV *sv_pool_size; 166static SV *sv_pool_size;
153static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
… …
165static char times_valid; 179static char times_valid;
166 180
167static struct coro_cctx *cctx_first; 181static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 182static int cctx_count, cctx_idle;
169 183
170enum { 184enum
185{
171 CC_MAPPED = 0x01, 186 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 187 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 188 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 189 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 190 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 195typedef struct coro_cctx
181{ 196{
182 struct coro_cctx *next; 197 struct coro_cctx *next;
183 198
184 /* the stack */ 199 /* the stack */
185 void *sptr; 200 struct coro_stack stack;
186 size_t ssize;
187 201
188 /* cpu state */ 202 /* cpu state */
189 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
190 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
191 JMPENV *top_env; 207 JMPENV *top_env;
192 coro_context cctx; 208 coro_context cctx;
193 209
194 U32 gen; 210 U32 gen;
195#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
196 int valgrind_id; 212 int valgrind_id;
197#endif 213#endif
198 unsigned char flags; 214 unsigned char flags;
199} coro_cctx; 215} coro_cctx;
200 216
201coro_cctx *cctx_current; /* the currently running cctx */ 217static coro_cctx *cctx_current; /* the currently running cctx */
202 218
203/*****************************************************************************/ 219/*****************************************************************************/
204 220
221static MGVTBL coro_state_vtbl;
222
205enum { 223enum
224{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 225 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 226 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 227 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 228 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 229 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
230 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
211}; 231};
212 232
213/* 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 */
214typedef struct 234typedef struct
215{ 235{
216 SV *defsv;
217 AV *defav;
218 SV *errsv;
219 SV *irsgv;
220 HV *hinthv;
221#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
222# include "state.h" 237 #include "state.h"
223#undef VAR
224} perl_slots; 238} perl_slots;
225 239
240/* how many context stack entries do we need for perl_slots */
226#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))
227 242
228/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
229struct coro { 244struct coro
245{
230 /* the C coroutine allocated to this perl coroutine, if any */ 246 /* the C coroutine allocated to this perl coroutine, if any */
231 coro_cctx *cctx; 247 coro_cctx *cctx;
232 248
233 /* ready queue */ 249 /* ready queue */
234 struct coro *next_ready; 250 struct coro *next_ready;
… …
236 /* state data */ 252 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 253 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 254 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 255 perl_slots *slot; /* basically the saved sp */
240 256
241 CV *startcv; /* the CV to execute */ 257 CV *startcv; /* the CV to execute */
242 AV *args; /* data associated with this coroutine (initial args) */ 258 AV *args; /* data associated with this coroutine (initial args) */
243 int refcnt; /* coroutines are refcounted, yes */
244 int flags; /* CF_ flags */ 259 int flags; /* CF_ flags */
245 HV *hv; /* the perl hash associated with this coro, if any */ 260 HV *hv; /* the perl hash associated with this coro, if any */
246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
247 261
248 /* statistics */ 262 /* statistics */
249 int usecount; /* number of transfers to this coro */ 263 int usecount; /* number of transfers to this coro */
250 264
251 /* coro process data */ 265 /* coro process data */
252 int prio; 266 int prio;
253 SV *except; /* exception to be thrown */ 267 SV *except; /* exception to be thrown */
254 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 */
255 271
256 /* async_pool */ 272 /* async_pool */
257 SV *saved_deffh; 273 SV *saved_deffh;
258 SV *invoke_cb; 274 SV *invoke_cb;
259 AV *invoke_av; 275 AV *invoke_av;
260 276
261 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
262 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
263 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
264 280
265 /* swap_sv */ 281 /* swap_sv */
266 AV *swap_sv; 282 AV *swap_sv;
267 283
268 /* times */ 284 /* times */
… …
275typedef struct coro *Coro__State; 291typedef struct coro *Coro__State;
276typedef struct coro *Coro__State_or_hashref; 292typedef struct coro *Coro__State_or_hashref;
277 293
278/* the following variables are effectively part of the perl context */ 294/* the following variables are effectively part of the perl context */
279/* and get copied between struct coro and these variables */ 295/* and get copied between struct coro and these variables */
280/* the mainr easonw e don't support windows process emulation */ 296/* the main reason we don't support windows process emulation */
281static struct CoroSLF slf_frame; /* the current slf frame */ 297static struct CoroSLF slf_frame; /* the current slf frame */
282 298
283/** Coro ********************************************************************/ 299/** Coro ********************************************************************/
284 300
285#define CORO_PRIO_MAX 3 301#define CORO_PRIO_MAX 3
… …
291 307
292/* for Coro.pm */ 308/* for Coro.pm */
293static SV *coro_current; 309static SV *coro_current;
294static SV *coro_readyhook; 310static SV *coro_readyhook;
295static 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 */
296static CV *cv_coro_run, *cv_coro_terminate; 312static CV *cv_coro_run;
297static struct coro *coro_first; 313static struct coro *coro_first;
298#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
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
299 338
300/** Coro::Select ************************************************************/ 339/** Coro::Select ************************************************************/
301 340
302static OP *(*coro_old_pp_sselect) (pTHX); 341static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select; 342static SV *coro_select_select;
… …
319 358
320/** time stuff **************************************************************/ 359/** time stuff **************************************************************/
321 360
322#ifdef HAS_GETTIMEOFDAY 361#ifdef HAS_GETTIMEOFDAY
323 362
324static void 363ecb_inline void
325coro_u2time (pTHX_ UV ret[2]) 364coro_u2time (pTHX_ UV ret[2])
326{ 365{
327 struct timeval tv; 366 struct timeval tv;
328 gettimeofday (&tv, 0); 367 gettimeofday (&tv, 0);
329 368
330 ret [0] = tv.tv_sec; 369 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec; 370 ret [1] = tv.tv_usec;
332} 371}
333 372
334static double 373ecb_inline double
335coro_nvtime () 374coro_nvtime (void)
336{ 375{
337 struct timeval tv; 376 struct timeval tv;
338 gettimeofday (&tv, 0); 377 gettimeofday (&tv, 0);
339 378
340 return tv.tv_sec + tv.tv_usec * 1e-6; 379 return tv.tv_sec + tv.tv_usec * 1e-6;
341} 380}
342 381
343static void 382ecb_inline void
344time_init (pTHX) 383time_init (pTHX)
345{ 384{
346 nvtime = coro_nvtime; 385 nvtime = coro_nvtime;
347 u2time = coro_u2time; 386 u2time = coro_u2time;
348} 387}
349 388
350#else 389#else
351 390
352static void 391ecb_inline void
353time_init (pTHX) 392time_init (pTHX)
354{ 393{
355 SV **svp; 394 SV **svp;
356 395
357 require_pv ("Time/HiRes.pm"); 396 require_pv ("Time/HiRes.pm");
358 397
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 398 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360 399
361 if (!svp) croak ("Time::HiRes is required, but missing."); 400 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 401 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363 402
364 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 403 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365 404
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 405 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 406 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
369 408
370#endif 409#endif
371 410
372/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
373 412
374static SV * 413static SV * ecb_noinline
375coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
376{ 415{
377#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
378 /* 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 */
379 get_sv (name, create); 418 get_sv (name, create);
380#endif 419#endif
381 return get_sv (name, create); 420 return get_sv (name, create);
382} 421}
383 422
384static AV * 423static AV * ecb_noinline
385coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
386{ 425{
387#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
388 /* 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 */
389 get_av (name, create); 428 get_av (name, create);
390#endif 429#endif
391 return get_av (name, create); 430 return get_av (name, create);
392} 431}
393 432
394static HV * 433static HV * ecb_noinline
395coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
396{ 435{
397#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
398 /* 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 */
399 get_hv (name, create); 438 get_hv (name, create);
400#endif 439#endif
401 return get_hv (name, create); 440 return get_hv (name, create);
402} 441}
403 442
404INLINE void 443ecb_inline void
405coro_times_update () 444coro_times_update (void)
406{ 445{
407#ifdef coro_clock_gettime 446#ifdef coro_clock_gettime
408 struct timespec ts; 447 struct timespec ts;
409 448
410 ts.tv_sec = ts.tv_nsec = 0; 449 ts.tv_sec = ts.tv_nsec = 0;
… …
422 time_real [0] = tv [0]; 461 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000; 462 time_real [1] = tv [1] * 1000;
424#endif 463#endif
425} 464}
426 465
427INLINE void 466ecb_inline void
428coro_times_add (struct coro *c) 467coro_times_add (struct coro *c)
429{ 468{
430 c->t_real [1] += time_real [1]; 469 c->t_real [1] += time_real [1];
431 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]; }
432 c->t_real [0] += time_real [0]; 471 c->t_real [0] += time_real [0];
… …
434 c->t_cpu [1] += time_cpu [1]; 473 c->t_cpu [1] += time_cpu [1];
435 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]; }
436 c->t_cpu [0] += time_cpu [0]; 475 c->t_cpu [0] += time_cpu [0];
437} 476}
438 477
439INLINE void 478ecb_inline void
440coro_times_sub (struct coro *c) 479coro_times_sub (struct coro *c)
441{ 480{
442 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]; }
443 c->t_real [1] -= time_real [1]; 482 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0]; 483 c->t_real [0] -= time_real [0];
… …
452/* magic glue */ 491/* magic glue */
453 492
454#define CORO_MAGIC_type_cv 26 493#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext 494#define CORO_MAGIC_type_state PERL_MAGIC_ext
456 495
457#define CORO_MAGIC_NN(sv, type) \ 496#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \ 497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \ 498 ? SvMAGIC (sv) \
460 : mg_find (sv, type)) 499 : mg_find (sv, type))
461 500
462#define CORO_MAGIC(sv, type) \ 501#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \ 502 (ecb_expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \ 503 ? CORO_MAGIC_NN (sv, type) \
465 : 0) 504 : 0)
466 505
467#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)
468#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)
469 508
470INLINE struct coro * 509ecb_inline MAGIC *
471SvSTATE_ (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
472{ 511{
473 HV *stash;
474 MAGIC *mg; 512 MAGIC *mg;
475 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
476 if (SvROK (coro)) 529 if (SvROK (coro_sv))
477 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
478 531
479 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
533 if (!mg)
480 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
481 535
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
492} 537}
493 538
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 539#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495 540
… …
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499 544
500/*****************************************************************************/ 545/*****************************************************************************/
501/* padlist management and caching */ 546/* padlist management and caching */
502 547
503static AV * 548ecb_inline PADLIST *
504coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
505{ 550{
506 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
507 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
508 556
509 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. */
510 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
511#if PERL_VERSION_ATLEAST (5,10,0)
512 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
513#else
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
515#endif 586#endif
516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
517 --AvFILLp (padlist);
518 587
519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
520 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;
521 596
522 return newpadlist; 597 return newpadlist;
523} 598}
524 599
525static void 600ecb_inline void
526free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
527{ 602{
528 /* may be during global destruction */ 603 /* may be during global destruction */
529 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
530 { 605 {
531 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
532 607
533 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
534 { 609 {
535 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
536 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
537 I32 j = AvFILLp (av);
538 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
539 while (j >= 0) 617 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
541 619
542 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
543 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
544 } 623 }
545 624
546 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
547 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
548 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
549 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
550 } 635 }
551} 636}
552 637
553static int 638static int
554coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
555{ 640{
556 AV *padlist; 641 PADLIST *padlist;
557 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;
558 644
559 /* perl manages to free our internal AV and _then_ call us */ 645 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT) 646 if (IN_DESTRUCT)
561 return 0; 647 return 0;
562 648
563 /* casting is fun. */ 649 while (len--)
564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
565 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
566
567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
568 651
569 return 0; 652 return 0;
570} 653}
571 654
572static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
573 0, 0, 0, 0, 656 0, 0, 0, 0,
574 coro_cv_free 657 coro_cv_free
575}; 658};
576 659
577/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
578static void 661ecb_inline void
579get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
580{ 663{
581 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
582 AV *av; 665 size_t *lenp;
583 666
584 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
585 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
586 else 669 else
587 { 670 {
588#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
589 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
590 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
… …
596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
597#endif 680#endif
598 } 681 }
599} 682}
600 683
601static void 684ecb_inline void
602put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
603{ 686{
604 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
605 AV *av;
606 688
607 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
608 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);
609 699
610 av = (AV *)mg->mg_obj; 700 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
611
612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
613 av_extend (av, AvFILLp (av) + 1);
614
615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
616} 701}
617 702
618/** load & save, init *******************************************************/ 703/** load & save, init *******************************************************/
619 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
620/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
621static void 748static void
622swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
623{ 750{
624 int i; 751 int i;
625 752
626 for (i = 0; i <= AvFILLp (c->swap_sv); ) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
627 { 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665} 755}
666 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
667#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
668 if (expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
669 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))
670 773
671static void 774static void
672on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
673 776
674static void 777static void
… …
677 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
678 c->slot = 0; 781 c->slot = 0;
679 782
680 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
681 784
682 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
683 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
684 GvSV (PL_errgv) = slot->errsv; 787#else
685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
687
688 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
689 # include "state.h" 789 #include "state.h"
690 #undef VAR 790#endif
691 791
692 { 792 {
693 dSP; 793 dSP;
694 794
695 CV *cv; 795 CV *cv;
696 796
697 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
698 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
699 { 799 {
700 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
701 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
702 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
703 } 803 }
704 804
705 PUTBACK; 805 PUTBACK;
706 } 806 }
707 807
708 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
709 CORO_THROW = c->except; 809 CORO_THROW = c->except;
710 810
711 if (expect_false (enable_times)) 811 if (ecb_expect_false (enable_times))
712 { 812 {
713 if (expect_false (!times_valid)) 813 if (ecb_expect_false (!times_valid))
714 coro_times_update (); 814 coro_times_update ();
715 815
716 coro_times_sub (c); 816 coro_times_sub (c);
717 } 817 }
718 818
719 if (expect_false (c->on_enter)) 819 if (ecb_expect_false (c->on_enter))
720 { 820 {
721 int i; 821 int i;
722 822
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
725 } 825 }
726 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
727 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
728} 836}
729 837
730static void 838static void
731save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
732{ 840{
733 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
734 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
735 if (expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
736 { 852 {
737 int i; 853 int i;
738 854
739 for (i = AvFILLp (c->on_leave); i >= 0; --i) 855 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 856 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 } 857 }
742 858
743 times_valid = 0; 859 times_valid = 0;
744 860
745 if (expect_false (enable_times)) 861 if (ecb_expect_false (enable_times))
746 { 862 {
747 coro_times_update (); times_valid = 1; 863 coro_times_update (); times_valid = 1;
748 coro_times_add (c); 864 coro_times_add (c);
749 } 865 }
750 866
… …
764 880
765 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
766 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
767 for (;;) 883 for (;;)
768 { 884 {
769 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
770 { 886 {
771 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
772 888
773 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))
774 { 890 {
775 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
776 892
777 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
778 { 894 {
779 EXTEND (SP, 3); 895 EXTEND (SP, 3);
780 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
781 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
782 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
… …
785 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
786 } 902 }
787 } 903 }
788 } 904 }
789 905
790 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
791 break; 907 break;
792 908
793 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
794 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
795 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
… …
797 913
798 PUTBACK; 914 PUTBACK;
799 } 915 }
800 916
801 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
802 /* we manually unroll here, as usually 2 slots is enough */ 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
803 if (SLOT_COUNT >= 1) CXINC;
804 if (SLOT_COUNT >= 2) CXINC;
805 if (SLOT_COUNT >= 3) CXINC;
806 { 919 {
807 unsigned int i; 920 unsigned int i;
921
808 for (i = 3; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 923 CXINC;
810 } 924
811 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 925 cxstack_ix -= SLOT_COUNT; /* undo allocation */
926 }
812 927
813 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
814 929
815 { 930 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 932
818 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
819 slot->defsv = DEFSV; 934 save_perl_slots (slot);
820 slot->errsv = ERRSV; 935#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 937 #include "state.h"
826 #undef VAR 938#endif
827 } 939 }
828} 940}
829 941
830/* 942/*
831 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
… …
837# define coro_init_stacks(thx) init_stacks () 949# define coro_init_stacks(thx) init_stacks ()
838#else 950#else
839static void 951static void
840coro_init_stacks (pTHX) 952coro_init_stacks (pTHX)
841{ 953{
842 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() */
843 PL_curstackinfo->si_type = PERLSI_MAIN; 955 PL_curstackinfo->si_type = PERLSI_MAIN;
844 PL_curstack = PL_curstackinfo->si_stack; 956 PL_curstack = PL_curstackinfo->si_stack;
845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 957 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
846 958
847 PL_stack_base = AvARRAY(PL_curstack); 959 PL_stack_base = AvARRAY(PL_curstack);
… …
862#endif 974#endif
863 975
864 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
866 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
867 982
868 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
870 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
871 991
872#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
873 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
874 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
875 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
899 } 1019 }
900 1020
901 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
904 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
907#endif 1030#endif
908} 1031}
… …
938 } 1061 }
939 1062
940 return rss; 1063 return rss;
941} 1064}
942 1065
943/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
944
945static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
946static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
947static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
948 1067
949/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
950#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
951#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
952 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
953 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
954#endif 1073#endif
955 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
956/* 1103/*
957 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
958 * 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
959 * 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),
960 * readback here. 1107 * we just provide our own readback here.
961 */ 1108 */
962static int 1109static int ecb_cold
963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
964{ 1111{
965 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;
966 1115
967 if (*s == '_') 1116 SV *ssv;
968 {
969 SV **svp = 0;
970 1117
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973
974 if (svp) 1118 if (!*svp)
975 { 1119 ssv = &PL_sv_undef;
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
977 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
978 } 1122 else
979 } 1123 ssv = *svp;
980 1124
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
982} 1127}
983 1128
984static int 1129static int ecb_cold
985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
986{ 1131{
987 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;
988 1135
989 if (*s == '_')
990 {
991 SV **svp = 0;
992
993 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
994 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
995
996 if (svp)
997 {
998 SV *old = *svp; 1136 SV *old = *svp;
999 *svp = 0; 1137 *svp = 0;
1000 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1001 return 0; 1139 return 0;
1002 }
1003 }
1004
1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1006} 1140}
1007 1141
1008static int 1142static int ecb_cold
1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1010{ 1144{
1011 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;
1012 1148
1013 if (*s == '_')
1014 {
1015 SV **svp = 0;
1016
1017 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1018 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1019
1020 if (svp)
1021 {
1022 SV *old = *svp; 1149 SV *old = *svp;
1023 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1024 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1025 return 0; 1152 return 0;
1026 }
1027 }
1028
1029 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1030} 1153}
1031 1154
1032static void 1155static void
1033prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1034{ 1157{
… …
1046slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1047{ 1170{
1048 return 1; 1171 return 1;
1049} 1172}
1050 1173
1174/** coroutine stack handling ************************************************/
1175
1051static UNOP init_perl_op; 1176static UNOP init_perl_op;
1052 1177
1053static 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 */
1054init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1055{ 1180{
1056 /* 1181 /*
1057 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
1058 */ 1183 */
… …
1073 PL_parser = 0; 1198 PL_parser = 0;
1074#endif 1199#endif
1075 PL_hints = 0; 1200 PL_hints = 0;
1076 1201
1077 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1205
1081 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1084 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);
1085 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
1086 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1088 1216
1089 { 1217 {
1090 dSP; 1218 dSP;
… …
1105 /* 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
1106 * 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.
1107 */ 1235 */
1108 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 */
1109 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;
1110 1239
1111 /* 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 */
1112 init_perl_op.op_next = PL_op; 1241 init_perl_op.op_next = PL_op;
1113 init_perl_op.op_type = OP_ENTERSUB; 1242 init_perl_op.op_type = OP_ENTERSUB;
1114 init_perl_op.op_ppaddr = pp_slf; 1243 init_perl_op.op_ppaddr = pp_slf;
… …
1117 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1118 1247
1119 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1120 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1121 1250
1122 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1123 1252
1124 if (expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1125 { 1254 {
1126 coro_times_update (); 1255 coro_times_update ();
1127 coro_times_sub (coro); 1256 coro_times_sub (coro);
1128 } 1257 }
1129} 1258}
… …
1153destroy_perl (pTHX_ struct coro *coro) 1282destroy_perl (pTHX_ struct coro *coro)
1154{ 1283{
1155 SV *svf [9]; 1284 SV *svf [9];
1156 1285
1157 { 1286 {
1287 SV *old_current = SvRV (coro_current);
1158 struct coro *current = SvSTATE_current; 1288 struct coro *current = SvSTATE (old_current);
1159 1289
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1290 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161 1291
1162 save_perl (aTHX_ current); 1292 save_perl (aTHX_ current);
1293
1294 /* this will cause transfer_check to croak on block*/
1295 SvRV_set (coro_current, (SV *)coro->hv);
1296
1163 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1164 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1165 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1303
1166 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1167 1305
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1170
1171 // now save some sv's to be free'd later 1306 /* now save some sv's to be free'd later */
1172 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv); 1308 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv); 1309 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv; 1310 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs; 1311 svf [4] = PL_rs;
… …
1178 svf [6] = (SV *)GvHV (PL_hintgv); 1313 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook; 1314 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook; 1315 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf)); 1316 assert (9 == sizeof (svf) / sizeof (*svf));
1182 1317
1318 SvRV_set (coro_current, old_current);
1319
1183 load_perl (aTHX_ current); 1320 load_perl (aTHX_ current);
1184 } 1321 }
1185 1322
1186 { 1323 {
1187 unsigned int i; 1324 unsigned int i;
… …
1191 1328
1192 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1193 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1194 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1195 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);
1196 } 1335 }
1197} 1336}
1198 1337
1199INLINE void 1338ecb_inline void
1200free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1201{ 1340{
1202 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
1203 { 1342 {
1204 SvREFCNT_dec (coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
1205 coro_mortal = 0; 1344 coro_mortal = 0;
1206 } 1345 }
1207} 1346}
1208 1347
1209static int 1348static int
… …
1263 1402
1264 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1265 { 1404 {
1266 SV **cb; 1405 SV **cb;
1267 1406
1268 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1269 { 1408 {
1270 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1271 1410
1272 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1273 { 1412 {
… …
1283 SAVETMPS; 1422 SAVETMPS;
1284 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1285 PUSHMARK (SP); 1424 PUSHMARK (SP);
1286 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1287 PUSHs (fullname); 1426 PUSHs (fullname);
1288 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);
1289 PUTBACK; 1428 PUTBACK;
1290 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);
1291 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);
1292 SPAGAIN; 1431 SPAGAIN;
1293 FREETMPS; 1432 FREETMPS;
… …
1342 1481
1343 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1482 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1344} 1483}
1345 1484
1346/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1485/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1347static void NOINLINE 1486static void ecb_noinline
1348cctx_prepare (pTHX) 1487cctx_prepare (pTHX)
1349{ 1488{
1350 PL_top_env = &PL_start_env; 1489 PL_top_env = &PL_start_env;
1351 1490
1352 if (cctx_current->flags & CC_TRACE) 1491 if (cctx_current->flags & CC_TRACE)
… …
1363 slf_frame.prepare = slf_prepare_set_stacklevel; 1502 slf_frame.prepare = slf_prepare_set_stacklevel;
1364 slf_frame.check = slf_check_set_stacklevel; 1503 slf_frame.check = slf_check_set_stacklevel;
1365} 1504}
1366 1505
1367/* the tail of transfer: execute stuff we can only do after a transfer */ 1506/* the tail of transfer: execute stuff we can only do after a transfer */
1368INLINE void 1507ecb_inline void
1369transfer_tail (pTHX) 1508transfer_tail (pTHX)
1370{ 1509{
1371 free_coro_mortal (aTHX); 1510 free_coro_mortal (aTHX);
1511}
1512
1513/* try to exit the same way perl's main function would do */
1514/* we do not bother resetting the environment or other things *7
1515/* that are not, uhm, essential */
1516/* this obviously also doesn't work when perl is embedded */
1517static void ecb_noinline ecb_cold
1518perlish_exit (pTHX)
1519{
1520 int exitstatus = perl_destruct (PL_curinterp);
1521 perl_free (PL_curinterp);
1522 exit (exitstatus);
1372} 1523}
1373 1524
1374/* 1525/*
1375 * this is a _very_ stripped down perl interpreter ;) 1526 * this is a _very_ stripped down perl interpreter ;)
1376 */ 1527 */
… …
1403 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1554 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1404 * runtime errors here, as this is just a random interpreter, not a thread. 1555 * runtime errors here, as this is just a random interpreter, not a thread.
1405 */ 1556 */
1406 1557
1407 /* 1558 /*
1559 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1560 * requires PL_scopestack_ix, so do it here if required.
1561 */
1562 if (!PL_scopestack_ix)
1563 ENTER;
1564
1565 /*
1408 * If perl-run returns we assume exit() was being called or the coro 1566 * If perl-run returns we assume exit() was being called or the coro
1409 * fell off the end, which seems to be the only valid (non-bug) 1567 * fell off the end, which seems to be the only valid (non-bug)
1410 * reason for perl_run to return. We try to exit by jumping to the 1568 * reason for perl_run to return. We try to mimic whatever perl is normally
1411 * bootstrap-time "top" top_env, as we cannot restore the "main" 1569 * doing in that case. YMMV.
1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1415 */ 1570 */
1416 PL_top_env = main_top_env; 1571 perlish_exit (aTHX);
1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1418 } 1572 }
1419} 1573}
1420 1574
1421static coro_cctx * 1575static coro_cctx *
1422cctx_new () 1576cctx_new (void)
1423{ 1577{
1424 coro_cctx *cctx; 1578 coro_cctx *cctx;
1425 1579
1426 ++cctx_count; 1580 ++cctx_count;
1427 New (0, cctx, 1, coro_cctx); 1581 New (0, cctx, 1, coro_cctx);
… …
1433 return cctx; 1587 return cctx;
1434} 1588}
1435 1589
1436/* create a new cctx only suitable as source */ 1590/* create a new cctx only suitable as source */
1437static coro_cctx * 1591static coro_cctx *
1438cctx_new_empty () 1592cctx_new_empty (void)
1439{ 1593{
1440 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1441 1595
1442 cctx->sptr = 0; 1596 cctx->stack.sptr = 0;
1443 coro_create (&cctx->cctx, 0, 0, 0, 0); 1597 coro_create (&cctx->cctx, 0, 0, 0, 0);
1444 1598
1445 return cctx; 1599 return cctx;
1446} 1600}
1447 1601
1448/* create a new cctx suitable as destination/running a perl interpreter */ 1602/* create a new cctx suitable as destination/running a perl interpreter */
1449static coro_cctx * 1603static coro_cctx *
1450cctx_new_run () 1604cctx_new_run (void)
1451{ 1605{
1452 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1453 void *stack_start;
1454 size_t stack_size;
1455 1607
1456#if HAVE_MMAP 1608 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1457 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1458 /* mmap supposedly does allocate-on-write for us */
1459 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1460
1461 if (cctx->sptr != (void *)-1)
1462 {
1463 #if CORO_STACKGUARD
1464 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1465 #endif
1466 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1467 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1468 cctx->flags |= CC_MAPPED;
1469 } 1609 {
1470 else
1471#endif
1472 {
1473 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1474 New (0, cctx->sptr, cctx_stacksize, long);
1475
1476 if (!cctx->sptr)
1477 {
1478 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1610 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1479 _exit (EXIT_FAILURE); 1611 _exit (EXIT_FAILURE);
1480 }
1481
1482 stack_start = cctx->sptr;
1483 stack_size = cctx->ssize;
1484 } 1612 }
1485 1613
1486 #if CORO_USE_VALGRIND
1487 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1488 #endif
1489
1490 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1614 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1491 1615
1492 return cctx; 1616 return cctx;
1493} 1617}
1494 1618
1495static void 1619static void
1496cctx_destroy (coro_cctx *cctx) 1620cctx_destroy (coro_cctx *cctx)
1497{ 1621{
1498 if (!cctx) 1622 if (!cctx)
1499 return; 1623 return;
1500 1624
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1625 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1502 1626
1503 --cctx_count; 1627 --cctx_count;
1504 coro_destroy (&cctx->cctx); 1628 coro_destroy (&cctx->cctx);
1505 1629
1506 /* coro_transfer creates new, empty cctx's */ 1630 coro_stack_free (&cctx->stack);
1507 if (cctx->sptr)
1508 {
1509 #if CORO_USE_VALGRIND
1510 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1511 #endif
1512
1513#if HAVE_MMAP
1514 if (cctx->flags & CC_MAPPED)
1515 munmap (cctx->sptr, cctx->ssize);
1516 else
1517#endif
1518 Safefree (cctx->sptr);
1519 }
1520 1631
1521 Safefree (cctx); 1632 Safefree (cctx);
1522} 1633}
1523 1634
1524/* wether this cctx should be destructed */ 1635/* wether this cctx should be destructed */
1525#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1636#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1526 1637
1527static coro_cctx * 1638static coro_cctx *
1528cctx_get (pTHX) 1639cctx_get (pTHX)
1529{ 1640{
1530 while (expect_true (cctx_first)) 1641 while (ecb_expect_true (cctx_first))
1531 { 1642 {
1532 coro_cctx *cctx = cctx_first; 1643 coro_cctx *cctx = cctx_first;
1533 cctx_first = cctx->next; 1644 cctx_first = cctx->next;
1534 --cctx_idle; 1645 --cctx_idle;
1535 1646
1536 if (expect_true (!CCTX_EXPIRED (cctx))) 1647 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1537 return cctx; 1648 return cctx;
1538 1649
1539 cctx_destroy (cctx); 1650 cctx_destroy (cctx);
1540 } 1651 }
1541 1652
… …
1543} 1654}
1544 1655
1545static void 1656static void
1546cctx_put (coro_cctx *cctx) 1657cctx_put (coro_cctx *cctx)
1547{ 1658{
1548 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1659 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1549 1660
1550 /* free another cctx if overlimit */ 1661 /* free another cctx if overlimit */
1551 if (expect_false (cctx_idle >= cctx_max_idle)) 1662 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1552 { 1663 {
1553 coro_cctx *first = cctx_first; 1664 coro_cctx *first = cctx_first;
1554 cctx_first = first->next; 1665 cctx_first = first->next;
1555 --cctx_idle; 1666 --cctx_idle;
1556 1667
… …
1567static void 1678static void
1568transfer_check (pTHX_ struct coro *prev, struct coro *next) 1679transfer_check (pTHX_ struct coro *prev, struct coro *next)
1569{ 1680{
1570 /* TODO: throwing up here is considered harmful */ 1681 /* TODO: throwing up here is considered harmful */
1571 1682
1572 if (expect_true (prev != next)) 1683 if (ecb_expect_true (prev != next))
1573 { 1684 {
1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1685 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1686 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1576 1687
1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1688 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1689 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1579 1690
1580#if !PERL_VERSION_ATLEAST (5,10,0) 1691#if !PERL_VERSION_ATLEAST (5,10,0)
1581 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1692 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1693 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1583#endif 1694#endif
1584 } 1695 }
1585} 1696}
1586 1697
1587/* always use the TRANSFER macro */ 1698/* always use the TRANSFER macro */
1588static void NOINLINE /* noinline so we have a fixed stackframe */ 1699static void ecb_noinline /* noinline so we have a fixed stackframe */
1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1700transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1590{ 1701{
1591 dSTACKLEVEL; 1702 dSTACKLEVEL;
1592 1703
1593 /* sometimes transfer is only called to set idle_sp */ 1704 /* sometimes transfer is only called to set idle_sp */
1594 if (expect_false (!prev)) 1705 if (ecb_expect_false (!prev))
1595 { 1706 {
1596 cctx_current->idle_sp = STACKLEVEL; 1707 cctx_current->idle_sp = STACKLEVEL;
1597 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1708 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1598 } 1709 }
1599 else if (expect_true (prev != next)) 1710 else if (ecb_expect_true (prev != next))
1600 { 1711 {
1601 coro_cctx *cctx_prev; 1712 coro_cctx *cctx_prev;
1602 1713
1603 if (expect_false (prev->flags & CF_NEW)) 1714 if (ecb_expect_false (prev->flags & CF_NEW))
1604 { 1715 {
1605 /* create a new empty/source context */ 1716 /* create a new empty/source context */
1606 prev->flags &= ~CF_NEW; 1717 prev->flags &= ~CF_NEW;
1607 prev->flags |= CF_RUNNING; 1718 prev->flags |= CF_RUNNING;
1608 } 1719 }
… …
1611 next->flags |= CF_RUNNING; 1722 next->flags |= CF_RUNNING;
1612 1723
1613 /* first get rid of the old state */ 1724 /* first get rid of the old state */
1614 save_perl (aTHX_ prev); 1725 save_perl (aTHX_ prev);
1615 1726
1616 if (expect_false (next->flags & CF_NEW)) 1727 if (ecb_expect_false (next->flags & CF_NEW))
1617 { 1728 {
1618 /* need to start coroutine */ 1729 /* need to start coroutine */
1619 next->flags &= ~CF_NEW; 1730 next->flags &= ~CF_NEW;
1620 /* setup coroutine call */ 1731 /* setup coroutine call */
1621 init_perl (aTHX_ next); 1732 init_perl (aTHX_ next);
1622 } 1733 }
1623 else 1734 else
1624 load_perl (aTHX_ next); 1735 load_perl (aTHX_ next);
1625 1736
1626 /* possibly untie and reuse the cctx */ 1737 /* possibly untie and reuse the cctx */
1627 if (expect_true ( 1738 if (ecb_expect_true (
1628 cctx_current->idle_sp == STACKLEVEL 1739 cctx_current->idle_sp == STACKLEVEL
1629 && !(cctx_current->flags & CC_TRACE) 1740 && !(cctx_current->flags & CC_TRACE)
1630 && !force_cctx 1741 && !force_cctx
1631 )) 1742 ))
1632 { 1743 {
1633 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1744 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1634 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1745 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1635 1746
1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1747 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1637 /* without this the next cctx_get might destroy the running cctx while still in use */ 1748 /* without this the next cctx_get might destroy the running cctx while still in use */
1638 if (expect_false (CCTX_EXPIRED (cctx_current))) 1749 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1639 if (expect_true (!next->cctx)) 1750 if (ecb_expect_true (!next->cctx))
1640 next->cctx = cctx_get (aTHX); 1751 next->cctx = cctx_get (aTHX);
1641 1752
1642 cctx_put (cctx_current); 1753 cctx_put (cctx_current);
1643 } 1754 }
1644 else 1755 else
1645 prev->cctx = cctx_current; 1756 prev->cctx = cctx_current;
1646 1757
1647 ++next->usecount; 1758 ++next->usecount;
1648 1759
1649 cctx_prev = cctx_current; 1760 cctx_prev = cctx_current;
1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1761 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1651 1762
1652 next->cctx = 0; 1763 next->cctx = 0;
1653 1764
1654 if (expect_false (cctx_prev != cctx_current)) 1765 if (ecb_expect_false (cctx_prev != cctx_current))
1655 { 1766 {
1656 cctx_prev->top_env = PL_top_env; 1767 cctx_prev->top_env = PL_top_env;
1657 PL_top_env = cctx_current->top_env; 1768 PL_top_env = cctx_current->top_env;
1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1769 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1659 } 1770 }
… …
1665#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1776#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1666#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1777#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1667 1778
1668/** high level stuff ********************************************************/ 1779/** high level stuff ********************************************************/
1669 1780
1781/* this function is actually Coro, not Coro::State, but we call it from here */
1782/* because it is convenient - but it hasn't been declared yet for that reason */
1670static int 1783static void
1784coro_call_on_destroy (pTHX_ struct coro *coro);
1785
1786static void
1671coro_state_destroy (pTHX_ struct coro *coro) 1787coro_state_destroy (pTHX_ struct coro *coro)
1672{ 1788{
1673 if (coro->flags & CF_DESTROYED) 1789 if (coro->flags & CF_ZOMBIE)
1674 return 0; 1790 return;
1675 1791
1676 if (coro->on_destroy && !PL_dirty)
1677 coro->on_destroy (aTHX_ coro); 1792 slf_destroy (aTHX_ coro);
1678 1793
1679 coro->flags |= CF_DESTROYED; 1794 coro->flags |= CF_ZOMBIE;
1680 1795
1681 if (coro->flags & CF_READY) 1796 if (coro->flags & CF_READY)
1682 { 1797 {
1683 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1798 /* reduce nready, as destroying a ready coro effectively unreadies it */
1684 /* alternative: look through all ready queues and remove the coro */ 1799 /* alternative: look through all ready queues and remove the coro */
1685 --coro_nready; 1800 --coro_nready;
1686 } 1801 }
1687 else 1802 else
1688 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1803 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1804
1805 if (coro->next) coro->next->prev = coro->prev;
1806 if (coro->prev) coro->prev->next = coro->next;
1807 if (coro == coro_first) coro_first = coro->next;
1689 1808
1690 if (coro->mainstack 1809 if (coro->mainstack
1691 && coro->mainstack != main_mainstack 1810 && coro->mainstack != main_mainstack
1692 && coro->slot 1811 && coro->slot
1693 && !PL_dirty) 1812 && !PL_dirty)
1694 destroy_perl (aTHX_ coro); 1813 destroy_perl (aTHX_ coro);
1695 1814
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1699
1700 cctx_destroy (coro->cctx); 1815 cctx_destroy (coro->cctx);
1701 SvREFCNT_dec (coro->startcv); 1816 SvREFCNT_dec (coro->startcv);
1702 SvREFCNT_dec (coro->args); 1817 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv); 1818 SvREFCNT_dec (coro->swap_sv);
1704 SvREFCNT_dec (CORO_THROW); 1819 SvREFCNT_dec (CORO_THROW);
1705 1820
1706 return 1; 1821 coro_call_on_destroy (aTHX_ coro);
1822
1823 /* more destruction mayhem in coro_state_free */
1707} 1824}
1708 1825
1709static int 1826static int
1710coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1827coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1711{ 1828{
1712 struct coro *coro = (struct coro *)mg->mg_ptr; 1829 struct coro *coro = (struct coro *)mg->mg_ptr;
1713 mg->mg_ptr = 0; 1830 mg->mg_ptr = 0;
1714 1831
1715 coro->hv = 0;
1716
1717 if (--coro->refcnt < 0)
1718 {
1719 coro_state_destroy (aTHX_ coro); 1832 coro_state_destroy (aTHX_ coro);
1833 SvREFCNT_dec (coro->on_destroy);
1834 SvREFCNT_dec (coro->status);
1835
1720 Safefree (coro); 1836 Safefree (coro);
1721 }
1722 1837
1723 return 0; 1838 return 0;
1724} 1839}
1725 1840
1726static int 1841static int ecb_cold
1727coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1842coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1728{ 1843{
1729 struct coro *coro = (struct coro *)mg->mg_ptr; 1844 /* called when perl clones the current process the slow way (windows process emulation) */
1730 1845 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1731 ++coro->refcnt; 1846 mg->mg_ptr = 0;
1847 mg->mg_virtual = 0;
1732 1848
1733 return 0; 1849 return 0;
1734} 1850}
1735 1851
1736static MGVTBL coro_state_vtbl = { 1852static MGVTBL coro_state_vtbl = {
… …
1761 TRANSFER (ta, 1); 1877 TRANSFER (ta, 1);
1762} 1878}
1763 1879
1764/** Coro ********************************************************************/ 1880/** Coro ********************************************************************/
1765 1881
1766INLINE void 1882ecb_inline void
1767coro_enq (pTHX_ struct coro *coro) 1883coro_enq (pTHX_ struct coro *coro)
1768{ 1884{
1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1885 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1770 1886
1771 SvREFCNT_inc_NN (coro->hv); 1887 SvREFCNT_inc_NN (coro->hv);
… …
1773 coro->next_ready = 0; 1889 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1890 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro; 1891 ready [1] = coro;
1776} 1892}
1777 1893
1778INLINE struct coro * 1894ecb_inline struct coro *
1779coro_deq (pTHX) 1895coro_deq (pTHX)
1780{ 1896{
1781 int prio; 1897 int prio;
1782 1898
1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1899 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1836{ 1952{
1837 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1953 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1838} 1954}
1839 1955
1840/* expects to own a reference to next->hv */ 1956/* expects to own a reference to next->hv */
1841INLINE void 1957ecb_inline void
1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1958prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1843{ 1959{
1844 SV *prev_sv = SvRV (coro_current); 1960 SV *prev_sv = SvRV (coro_current);
1845 1961
1846 ta->prev = SvSTATE_hv (prev_sv); 1962 ta->prev = SvSTATE_hv (prev_sv);
… …
1859{ 1975{
1860 for (;;) 1976 for (;;)
1861 { 1977 {
1862 struct coro *next = coro_deq (aTHX); 1978 struct coro *next = coro_deq (aTHX);
1863 1979
1864 if (expect_true (next)) 1980 if (ecb_expect_true (next))
1865 { 1981 {
1866 /* cannot transfer to destroyed coros, skip and look for next */ 1982 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1983 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1984 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1869 else 1985 else
1870 { 1986 {
1871 next->flags &= ~CF_READY; 1987 next->flags &= ~CF_READY;
1872 --coro_nready; 1988 --coro_nready;
… …
1880 /* nothing to schedule: call the idle handler */ 1996 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle) 1997 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle))) 1998 && SvOBJECT (SvRV (sv_idle)))
1883 { 1999 {
1884 if (SvRV (sv_idle) == SvRV (coro_current)) 2000 if (SvRV (sv_idle) == SvRV (coro_current))
2001 {
2002 require_pv ("Carp");
2003
2004 {
2005 dSP;
2006
2007 ENTER;
2008 SAVETMPS;
2009
2010 PUSHMARK (SP);
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2011 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2012 PUTBACK;
2013 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2014
2015 FREETMPS;
2016 LEAVE;
2017 }
2018 }
1886 2019
1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2020 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1888 api_ready (aTHX_ SvRV (sv_idle)); 2021 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready; 2022 --coro_nready;
1890 } 2023 }
… …
1905 } 2038 }
1906 } 2039 }
1907 } 2040 }
1908} 2041}
1909 2042
1910INLINE void 2043ecb_inline void
1911prepare_cede (pTHX_ struct coro_transfer_args *ta) 2044prepare_cede (pTHX_ struct coro_transfer_args *ta)
1912{ 2045{
1913 api_ready (aTHX_ coro_current); 2046 api_ready (aTHX_ coro_current);
1914 prepare_schedule (aTHX_ ta); 2047 prepare_schedule (aTHX_ ta);
1915} 2048}
1916 2049
1917INLINE void 2050ecb_inline void
1918prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2051prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1919{ 2052{
1920 SV *prev = SvRV (coro_current); 2053 SV *prev = SvRV (coro_current);
1921 2054
1922 if (coro_nready) 2055 if (coro_nready)
… …
1952{ 2085{
1953 struct coro_transfer_args ta; 2086 struct coro_transfer_args ta;
1954 2087
1955 prepare_cede (aTHX_ &ta); 2088 prepare_cede (aTHX_ &ta);
1956 2089
1957 if (expect_true (ta.prev != ta.next)) 2090 if (ecb_expect_true (ta.prev != ta.next))
1958 { 2091 {
1959 TRANSFER (ta, 1); 2092 TRANSFER (ta, 1);
1960 return 1; 2093 return 1;
1961 } 2094 }
1962 else 2095 else
… …
2005 coro->slot->runops = RUNOPS_DEFAULT; 2138 coro->slot->runops = RUNOPS_DEFAULT;
2006 } 2139 }
2007} 2140}
2008 2141
2009static void 2142static void
2143coro_push_av (pTHX_ AV *av, I32 gimme_v)
2144{
2145 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2146 {
2147 dSP;
2148
2149 if (gimme_v == G_SCALAR)
2150 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2151 else
2152 {
2153 int i;
2154 EXTEND (SP, AvFILLp (av) + 1);
2155
2156 for (i = 0; i <= AvFILLp (av); ++i)
2157 PUSHs (AvARRAY (av)[i]);
2158 }
2159
2160 PUTBACK;
2161 }
2162}
2163
2164static void
2165coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2166{
2167 if (!coro->on_destroy)
2168 coro->on_destroy = newAV ();
2169
2170 av_push (coro->on_destroy, cb);
2171}
2172
2173static void
2174slf_destroy_join (pTHX_ struct CoroSLF *frame)
2175{
2176 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2177}
2178
2179static int
2180slf_check_join (pTHX_ struct CoroSLF *frame)
2181{
2182 struct coro *coro = (struct coro *)frame->data;
2183
2184 if (!coro->status)
2185 return 1;
2186
2187 frame->destroy = 0;
2188
2189 coro_push_av (aTHX_ coro->status, GIMME_V);
2190
2191 SvREFCNT_dec ((SV *)coro->hv);
2192
2193 return 0;
2194}
2195
2196static void
2197slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{
2199 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2200
2201 if (items > 1)
2202 croak ("join called with too many arguments");
2203
2204 if (coro->status)
2205 frame->prepare = prepare_nop;
2206 else
2207 {
2208 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2209 frame->prepare = prepare_schedule;
2210 }
2211
2212 frame->check = slf_check_join;
2213 frame->destroy = slf_destroy_join;
2214 frame->data = (void *)coro;
2215 SvREFCNT_inc (coro->hv);
2216}
2217
2218static void
2010coro_call_on_destroy (pTHX_ struct coro *coro) 2219coro_call_on_destroy (pTHX_ struct coro *coro)
2011{ 2220{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2221 AV *od = coro->on_destroy;
2013 2222
2014 if (on_destroyp) 2223 if (!od)
2015 { 2224 return;
2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2019 2225
2226 coro->on_destroy = 0;
2227 sv_2mortal ((SV *)od);
2228
2020 while (AvFILLp (on_destroy) >= 0) 2229 while (AvFILLp (od) >= 0)
2230 {
2231 SV *cb = sv_2mortal (av_pop (od));
2232
2233 /* coro hv's (and only hv's at the moment) are supported as well */
2234 if (SvSTATEhv_p (aTHX_ cb))
2235 api_ready (aTHX_ cb);
2236 else
2021 { 2237 {
2022 dSP; /* don't disturb outer sp */ 2238 dSP; /* don't disturb outer sp */
2023 SV *cb = av_pop (on_destroy);
2024
2025 PUSHMARK (SP); 2239 PUSHMARK (SP);
2026 2240
2027 if (statusp) 2241 if (coro->status)
2028 { 2242 {
2029 int i; 2243 PUTBACK;
2030 EXTEND (SP, AvFILLp (status) + 1); 2244 coro_push_av (aTHX_ coro->status, G_ARRAY);
2031 2245 SPAGAIN;
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 } 2246 }
2035 2247
2036 PUTBACK; 2248 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2249 call_sv (cb, G_VOID | G_DISCARD);
2038 } 2250 }
2039 } 2251 }
2040} 2252}
2041 2253
2042static void 2254static void
2043slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2044{ 2256{
2045 int i; 2257 AV *av;
2046 HV *hv = (HV *)SvRV (coro_current); 2258
2047 AV *av = newAV (); 2259 if (coro->status)
2260 {
2261 av = coro->status;
2262 av_clear (av);
2263 }
2264 else
2265 av = coro->status = newAV ();
2048 2266
2049 /* items are actually not so common, so optimise for this case */ 2267 /* items are actually not so common, so optimise for this case */
2050 if (items) 2268 if (items)
2051 { 2269 {
2270 int i;
2271
2052 av_extend (av, items - 1); 2272 av_extend (av, items - 1);
2053 2273
2054 for (i = 0; i < items; ++i) 2274 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i])); 2275 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 } 2276 }
2277}
2057 2278
2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2279static void
2059 2280slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2281{
2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2282 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2061 api_ready (aTHX_ sv_manager); 2283 api_ready (aTHX_ sv_manager);
2062 2284
2063 frame->prepare = prepare_schedule; 2285 frame->prepare = prepare_schedule;
2064 frame->check = slf_check_repeat; 2286 frame->check = slf_check_repeat;
2065 2287
2066 /* as a minor optimisation, we could unwind all stacks here */ 2288 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */ 2289 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/ 2290 /*coro_unwind_stacks (aTHX);*/
2291}
2292
2293static void
2294slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2295{
2296 HV *coro_hv = (HV *)SvRV (coro_current);
2297
2298 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2299 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2300}
2301
2302static void
2303slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2304{
2305 HV *coro_hv;
2306 struct coro *coro;
2307
2308 if (items <= 0)
2309 croak ("Coro::cancel called without coro object,");
2310
2311 coro = SvSTATE (arg [0]);
2312 coro_hv = coro->hv;
2313
2314 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2315
2316 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2317 {
2318 /* coro currently busy cancelling something, so just notify it */
2319 coro->slf_frame.data = (void *)coro;
2320
2321 frame->prepare = prepare_nop;
2322 frame->check = slf_check_nop;
2323 }
2324 else if (coro_hv == (HV *)SvRV (coro_current))
2325 {
2326 /* cancelling the current coro is allowed, and equals terminate */
2327 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2328 }
2329 else
2330 {
2331 struct coro *self = SvSTATE_current;
2332
2333 if (!self)
2334 croak ("Coro::cancel called outside of thread content,");
2335
2336 /* otherwise we cancel directly, purely for speed reasons
2337 * unfortunately, this requires some magic trickery, as
2338 * somebody else could cancel us, so we have to fight the cancellation.
2339 * this is ugly, and hopefully fully worth the extra speed.
2340 * besides, I can't get the slow-but-safe version working...
2341 */
2342 slf_frame.data = 0;
2343 self->flags |= CF_NOCANCEL;
2344 coro_state_destroy (aTHX_ coro);
2345 self->flags &= ~CF_NOCANCEL;
2346
2347 if (slf_frame.data)
2348 {
2349 /* while we were busy we have been cancelled, so terminate */
2350 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2351 }
2352 else
2353 {
2354 frame->prepare = prepare_nop;
2355 frame->check = slf_check_nop;
2356 }
2357 }
2358}
2359
2360static int
2361slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2362{
2363 frame->prepare = 0;
2364 coro_unwind_stacks (aTHX);
2365
2366 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2367
2368 return 1;
2369}
2370
2371static int
2372safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2373{
2374 if (coro->cctx)
2375 croak ("coro inside C callback, unable to cancel at this time, caught");
2376
2377 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2378 {
2379 coro_set_status (aTHX_ coro, arg, items);
2380 coro_state_destroy (aTHX_ coro);
2381 }
2382 else
2383 {
2384 if (!coro->slf_frame.prepare)
2385 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2386
2387 slf_destroy (aTHX_ coro);
2388
2389 coro_set_status (aTHX_ coro, arg, items);
2390 coro->slf_frame.prepare = prepare_nop;
2391 coro->slf_frame.check = slf_check_safe_cancel;
2392
2393 api_ready (aTHX_ (SV *)coro->hv);
2394 }
2395
2396 return 1;
2069} 2397}
2070 2398
2071/*****************************************************************************/ 2399/*****************************************************************************/
2072/* async pool handler */ 2400/* async pool handler */
2073 2401
… …
2104slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2432slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2105{ 2433{
2106 HV *hv = (HV *)SvRV (coro_current); 2434 HV *hv = (HV *)SvRV (coro_current);
2107 struct coro *coro = SvSTATE_hv ((SV *)hv); 2435 struct coro *coro = SvSTATE_hv ((SV *)hv);
2108 2436
2109 if (expect_true (coro->saved_deffh)) 2437 if (ecb_expect_true (coro->saved_deffh))
2110 { 2438 {
2111 /* subsequent iteration */ 2439 /* subsequent iteration */
2112 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2440 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2113 coro->saved_deffh = 0; 2441 coro->saved_deffh = 0;
2114 2442
2115 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2443 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2116 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2444 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2117 { 2445 {
2118 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2446 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2119 coro->invoke_av = newAV (); 2447 return;
2120
2121 frame->prepare = prepare_nop;
2122 } 2448 }
2123 else 2449 else
2124 { 2450 {
2125 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2126 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2452 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2127 2453
2454 if (ecb_expect_false (coro->swap_sv))
2455 {
2456 SWAP_SVS_LEAVE (coro);
2457 SvREFCNT_dec_NN (coro->swap_sv);
2458 coro->swap_sv = 0;
2459 }
2460
2128 coro->prio = 0; 2461 coro->prio = 0;
2129 2462
2130 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2131 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2132 2465
2133 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2134 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2135 } 2468 }
… …
2176 2509
2177static int 2510static int
2178slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2511slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2179{ 2512{
2180 SV *data = (SV *)frame->data; 2513 SV *data = (SV *)frame->data;
2181 2514
2182 if (CORO_THROW) 2515 if (CORO_THROW)
2183 return 0; 2516 return 0;
2184 2517
2185 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2518 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2186 return 1; 2519 return 1;
… …
2222 cb = sv_2mortal (coro->rouse_cb); 2555 cb = sv_2mortal (coro->rouse_cb);
2223 coro->rouse_cb = 0; 2556 coro->rouse_cb = 0;
2224 } 2557 }
2225 2558
2226 if (!SvROK (cb) 2559 if (!SvROK (cb)
2227 || SvTYPE (SvRV (cb)) != SVt_PVCV 2560 || SvTYPE (SvRV (cb)) != SVt_PVCV
2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2561 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2229 croak ("Coro::rouse_wait called with illegal callback argument,"); 2562 croak ("Coro::rouse_wait called with illegal callback argument,");
2230 2563
2231 { 2564 {
2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2565 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2349static void 2682static void
2350slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2683slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2351{ 2684{
2352 frame->prepare = prepare_cede_notself; 2685 frame->prepare = prepare_cede_notself;
2353 frame->check = slf_check_nop; 2686 frame->check = slf_check_nop;
2687}
2688
2689/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2690static void
2691slf_destroy (pTHX_ struct coro *coro)
2692{
2693 struct CoroSLF frame = coro->slf_frame;
2694
2695 /*
2696 * The on_destroy below most likely is from an SLF call.
2697 * Since by definition the SLF call will not finish when we destroy
2698 * the coro, we will have to force-finish it here, otherwise
2699 * cleanup functions cannot call SLF functions.
2700 */
2701 coro->slf_frame.prepare = 0;
2702
2703 /* this callback is reserved for slf functions needing to do cleanup */
2704 if (frame.destroy && frame.prepare && !PL_dirty)
2705 frame.destroy (aTHX_ &frame);
2354} 2706}
2355 2707
2356/* 2708/*
2357 * these not obviously related functions are all rolled into one 2709 * these not obviously related functions are all rolled into one
2358 * function to increase chances that they all will call transfer with the same 2710 * function to increase chances that they all will call transfer with the same
… …
2365 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2717 I32 checkmark; /* mark SP to see how many elements check has pushed */
2366 2718
2367 /* set up the slf frame, unless it has already been set-up */ 2719 /* set up the slf frame, unless it has already been set-up */
2368 /* the latter happens when a new coro has been started */ 2720 /* the latter happens when a new coro has been started */
2369 /* or when a new cctx was attached to an existing coroutine */ 2721 /* or when a new cctx was attached to an existing coroutine */
2370 if (expect_true (!slf_frame.prepare)) 2722 if (ecb_expect_true (!slf_frame.prepare))
2371 { 2723 {
2372 /* first iteration */ 2724 /* first iteration */
2373 dSP; 2725 dSP;
2374 SV **arg = PL_stack_base + TOPMARK + 1; 2726 SV **arg = PL_stack_base + TOPMARK + 1;
2375 int items = SP - arg; /* args without function object */ 2727 int items = SP - arg; /* args without function object */
… …
2416 while (slf_frame.check (aTHX_ &slf_frame)); 2768 while (slf_frame.check (aTHX_ &slf_frame));
2417 2769
2418 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2770 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2419 2771
2420 /* exception handling */ 2772 /* exception handling */
2421 if (expect_false (CORO_THROW)) 2773 if (ecb_expect_false (CORO_THROW))
2422 { 2774 {
2423 SV *exception = sv_2mortal (CORO_THROW); 2775 SV *exception = sv_2mortal (CORO_THROW);
2424 2776
2425 CORO_THROW = 0; 2777 CORO_THROW = 0;
2426 sv_setsv (ERRSV, exception); 2778 sv_setsv (ERRSV, exception);
2427 croak (0); 2779 croak (0);
2428 } 2780 }
2429 2781
2430 /* return value handling - mostly like entersub */ 2782 /* return value handling - mostly like entersub */
2431 /* make sure we put something on the stack in scalar context */ 2783 /* make sure we put something on the stack in scalar context */
2432 if (GIMME_V == G_SCALAR) 2784 if (GIMME_V == G_SCALAR
2785 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2433 { 2786 {
2434 dSP; 2787 dSP;
2435 SV **bot = PL_stack_base + checkmark; 2788 SV **bot = PL_stack_base + checkmark;
2436 2789
2437 if (sp == bot) /* too few, push undef */ 2790 if (sp == bot) /* too few, push undef */
2438 bot [1] = &PL_sv_undef; 2791 bot [1] = &PL_sv_undef;
2439 else if (sp != bot + 1) /* too many, take last one */ 2792 else /* too many, take last one */
2440 bot [1] = *sp; 2793 bot [1] = *sp;
2441 2794
2442 SP = bot + 1; 2795 SP = bot + 1;
2443 2796
2444 PUTBACK; 2797 PUTBACK;
… …
2542{ 2895{
2543 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2896 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2544 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2545} 2898}
2546 2899
2900static void
2901enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2902{
2903 if (!hook)
2904 return;
2905
2906 if (!*avp)
2907 {
2908 *avp = newAV ();
2909 AvREAL_off (*avp);
2910 }
2911
2912 av_push (*avp, (SV *)hook);
2913 av_push (*avp, (SV *)arg);
2914}
2915
2916static void
2917enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2918{
2919 AV *av = *avp;
2920 int i;
2921
2922 if (!av)
2923 return;
2924
2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2926 if (AvARRAY (av)[i] == (SV *)hook)
2927 {
2928 if (execute)
2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2930
2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2932 av_pop (av);
2933 av_pop (av);
2934 break;
2935 }
2936
2937 if (AvFILLp (av) >= 0)
2938 {
2939 *avp = 0;
2940 SvREFCNT_dec_NN (av);
2941 }
2942}
2943
2944static void
2945api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2946{
2947 struct coro *coro = SvSTATE (coro_sv);
2948
2949 if (SvSTATE_current == coro)
2950 if (enter)
2951 enter (aTHX_ enter_arg);
2952
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2955}
2956
2957static void
2958api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2959{
2960 struct coro *coro = SvSTATE (coro_sv);
2961
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2963 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2964}
2965
2966static void
2967savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2968{
2969 struct coro *coro = SvSTATE_current;
2970
2971 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2972}
2973
2974static void
2975savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2976{
2977 struct coro *coro = SvSTATE_current;
2978
2979 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2980}
2981
2982static void
2983api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2984{
2985 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2986
2987 /* this ought to be much cheaper than malloc + a single destructor call */
2988 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2989 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2990}
2991
2547/*****************************************************************************/ 2992/*****************************************************************************/
2548/* PerlIO::cede */ 2993/* PerlIO::cede */
2549 2994
2550typedef struct 2995typedef struct
2551{ 2996{
2552 PerlIOBuf base; 2997 PerlIOBuf base;
2553 NV next, every; 2998 NV next, every;
2554} PerlIOCede; 2999} PerlIOCede;
2555 3000
2556static IV 3001static IV ecb_cold
2557PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3002PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2558{ 3003{
2559 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3004 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2560 3005
2561 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3006 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2562 self->next = nvtime () + self->every; 3007 self->next = nvtime () + self->every;
2563 3008
2564 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3009 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2565} 3010}
2566 3011
2567static SV * 3012static SV * ecb_cold
2568PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3013PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2569{ 3014{
2570 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3015 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2571 3016
2572 return newSVnv (self->every); 3017 return newSVnv (self->every);
… …
2679 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2680 PUTBACK; 3125 PUTBACK;
2681 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2682 } 3127 }
2683 3128
2684 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2685 } 3130 }
2686} 3131}
2687 3132
2688static void 3133static void
2689coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2690{ 3135{
2691 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3136 /* call $sem->adjust (0) to possibly wake up some other waiters */
2692 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3137 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2693} 3138}
2694 3139
2695static int 3140static int
2696slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3141slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2697{ 3142{
2698 AV *av = (AV *)frame->data; 3143 AV *av = (AV *)frame->data;
2699 SV *count_sv = AvARRAY (av)[0]; 3144 SV *count_sv = AvARRAY (av)[0];
3145 SV *coro_hv = SvRV (coro_current);
3146
3147 frame->destroy = 0;
2700 3148
2701 /* if we are about to throw, don't actually acquire the lock, just throw */ 3149 /* if we are about to throw, don't actually acquire the lock, just throw */
2702 if (CORO_THROW) 3150 if (ecb_expect_false (CORO_THROW))
3151 {
3152 /* we still might be responsible for the semaphore, so wake up others */
3153 coro_semaphore_adjust (aTHX_ av, 0);
3154
2703 return 0; 3155 return 0;
3156 }
2704 else if (SvIVX (count_sv) > 0) 3157 else if (SvIVX (count_sv) > 0)
2705 { 3158 {
2706 SvSTATE_current->on_destroy = 0;
2707
2708 if (acquire) 3159 if (acquire)
2709 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3160 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2710 else 3161 else
2711 coro_semaphore_adjust (aTHX_ av, 0); 3162 coro_semaphore_adjust (aTHX_ av, 0);
2712 3163
… …
2716 { 3167 {
2717 int i; 3168 int i;
2718 /* if we were woken up but can't down, we look through the whole */ 3169 /* if we were woken up but can't down, we look through the whole */
2719 /* waiters list and only add us if we aren't in there already */ 3170 /* waiters list and only add us if we aren't in there already */
2720 /* this avoids some degenerate memory usage cases */ 3171 /* this avoids some degenerate memory usage cases */
2721 3172 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2722 for (i = 1; i <= AvFILLp (av); ++i)
2723 if (AvARRAY (av)[i] == SvRV (coro_current)) 3173 if (AvARRAY (av)[i] == coro_hv)
2724 return 1; 3174 return 1;
2725 3175
2726 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3176 av_push (av, SvREFCNT_inc (coro_hv));
2727 return 1; 3177 return 1;
2728 } 3178 }
2729} 3179}
2730 3180
2731static int 3181static int
… …
2754 { 3204 {
2755 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3205 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2756 3206
2757 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3207 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2758 frame->prepare = prepare_schedule; 3208 frame->prepare = prepare_schedule;
2759
2760 /* to avoid race conditions when a woken-up coro gets terminated */ 3209 /* to avoid race conditions when a woken-up coro gets terminated */
2761 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3210 /* we arrange for a temporary on_destroy that calls adjust (0) */
2762 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3211 frame->destroy = coro_semaphore_destroy;
2763 } 3212 }
2764} 3213}
2765 3214
2766static void 3215static void
2767slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3216slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2825 { 3274 {
2826 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
2827 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
2828 } 3277 }
2829 3278
2830 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
2831 3280
2832 --count; 3281 --count;
2833 } 3282 }
2834} 3283}
2835 3284
… …
2920 } 3369 }
2921 3370
2922 av_push (state, data_sv); 3371 av_push (state, data_sv);
2923 3372
2924 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
2925 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
2926 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
2927} 3376}
2928 3377
2929static int 3378static int
2930slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2931{ 3380{
… …
2936 /* it quickly returns */ 3385 /* it quickly returns */
2937 if (CORO_THROW) 3386 if (CORO_THROW)
2938 return 0; 3387 return 0;
2939 3388
2940 /* one element that is an RV? repeat! */ 3389 /* one element that is an RV? repeat! */
2941 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3390 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2942 return 1; 3391 return 1;
2943 3392
2944 /* restore status */ 3393 /* restore status */
2945 { 3394 {
2946 SV *data_sv = av_pop (state); 3395 SV *data_sv = av_pop (state);
… …
2949 errno = data->errorno; 3398 errno = data->errorno;
2950 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
2951 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
2952 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
2953 3402
2954 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
2955 } 3404 }
2956 3405
2957 /* push result values */ 3406 /* push result values */
2958 { 3407 {
2959 dSP; 3408 dSP;
… …
2985 dSP; 3434 dSP;
2986 3435
2987 static SV *prio_cv; 3436 static SV *prio_cv;
2988 static SV *prio_sv; 3437 static SV *prio_sv;
2989 3438
2990 if (expect_false (!prio_cv)) 3439 if (ecb_expect_false (!prio_cv))
2991 { 3440 {
2992 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3441 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2993 prio_sv = newSViv (0); 3442 prio_sv = newSViv (0);
2994 } 3443 }
2995 3444
… …
3101 } 3550 }
3102 3551
3103 return coro_sv; 3552 return coro_sv;
3104} 3553}
3105 3554
3555#ifndef __cplusplus
3556ecb_cold XS(boot_Coro__State);
3557#endif
3558
3559#if CORO_JIT
3560
3561static void ecb_noinline ecb_cold
3562pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3563{
3564 dSP;
3565 AV *av = newAV ();
3566
3567 av_store (av, 3, newSVuv (d));
3568 av_store (av, 2, newSVuv (c));
3569 av_store (av, 1, newSVuv (b));
3570 av_store (av, 0, newSVuv (a));
3571
3572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3573
3574 PUTBACK;
3575}
3576
3577static void ecb_noinline ecb_cold
3578jit_init (pTHX)
3579{
3580 dSP;
3581 SV *load, *save;
3582 char *map_base;
3583 char *load_ptr, *save_ptr;
3584 STRLEN load_len, save_len, map_len;
3585 int count;
3586
3587 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3588
3589 PUSHMARK (SP);
3590 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3591 #include "state.h"
3592 count = call_pv ("Coro::State::_jit", G_ARRAY);
3593 SPAGAIN;
3594
3595 save = POPs; save_ptr = SvPVbyte (save, save_len);
3596 load = POPs; load_ptr = SvPVbyte (load, load_len);
3597
3598 map_len = load_len + save_len + 16;
3599
3600 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3601
3602 if (map_base == (char *)MAP_FAILED)
3603 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3604
3605 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3606
3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3608 memcpy (map_base, load_ptr, load_len);
3609
3610 map_base += (load_len + 15) & ~15;
3611
3612 save_perl_slots = (load_save_perl_slots_type)map_base;
3613 memcpy (map_base, save_ptr, save_len);
3614
3615 /* we are good citizens and try to make the page read-only, so the evil evil */
3616 /* hackers might have it a bit more difficult */
3617 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3618
3619 PUTBACK;
3620 eval_pv ("undef &Coro::State::_jit", 1);
3621}
3622
3623#endif
3624
3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3625MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3107 3626
3108PROTOTYPES: DISABLE 3627PROTOTYPES: DISABLE
3109 3628
3110BOOT: 3629BOOT:
3111{ 3630{
3631#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3632#include "state.h"
3112#ifdef USE_ITHREADS 3633#ifdef USE_ITHREADS
3113# if CORO_PTHREAD 3634# if CORO_PTHREAD
3114 coro_thx = PERL_GET_CONTEXT; 3635 coro_thx = PERL_GET_CONTEXT;
3115# endif 3636# endif
3116#endif 3637#endif
3117 BOOT_PAGESIZE; 3638 /* perl defines these to check for existance first, but why it doesn't */
3639 /* just create them one at init time is not clear to me, except for */
3640 /* programs trying to delete them, but... */
3641 /* anyway, we declare this as invalid and make sure they are initialised here */
3642 DEFSV;
3643 ERRSV;
3118 3644
3119 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3120 3646
3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3123 3649
3124 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3125 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3126 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3652 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3653 * by coro_sig_vtbl in hash values.
3654 */
3655 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3656
3657 /* this only works if perl doesn't have a vtbl for %SIG */
3658 assert (!mg->mg_virtual);
3659
3660 /*
3661 * The irony is that the perl API itself asserts that mg_virtual
3662 * must be non-const, yet perl5porters insisted on marking their
3663 * vtbls as read-only, just to thwart perl modules from patching
3664 * them.
3665 */
3666 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3667 mg->mg_flags |= MGf_COPY;
3668
3669 coro_sigelem_vtbl = PL_vtbl_sigelem;
3670 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3671 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3672 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3673 }
3127 3674
3128 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3129 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3675 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3130 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3676 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3131 3677
3132 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3133 3679
… …
3165 coroapi.prepare_cede_notself = prepare_cede_notself; 3711 coroapi.prepare_cede_notself = prepare_cede_notself;
3166 3712
3167 time_init (aTHX); 3713 time_init (aTHX);
3168 3714
3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3715 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3716#if CORO_JIT
3717 PUTBACK;
3718 jit_init (aTHX);
3719 SPAGAIN;
3720#endif
3170} 3721}
3171 3722
3172SV * 3723SV *
3173new (SV *klass, ...) 3724new (SV *klass, ...)
3174 ALIAS: 3725 ALIAS:
… …
3181void 3732void
3182transfer (...) 3733transfer (...)
3183 PROTOTYPE: $$ 3734 PROTOTYPE: $$
3184 CODE: 3735 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3736 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3186
3187bool
3188_destroy (SV *coro_sv)
3189 CODE:
3190 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3191 OUTPUT:
3192 RETVAL
3193
3194void
3195_exit (int code)
3196 PROTOTYPE: $
3197 CODE:
3198 _exit (code);
3199 3737
3200SV * 3738SV *
3201clone (Coro::State coro) 3739clone (Coro::State coro)
3202 CODE: 3740 CODE:
3203{ 3741{
… …
3258void 3796void
3259list () 3797list ()
3260 PROTOTYPE: 3798 PROTOTYPE:
3261 PPCODE: 3799 PPCODE:
3262{ 3800{
3263 struct coro *coro; 3801 struct coro *coro;
3264 for (coro = coro_first; coro; coro = coro->next) 3802 for (coro = coro_first; coro; coro = coro->next)
3265 if (coro->hv) 3803 if (coro->hv)
3266 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3804 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3267} 3805}
3268 3806
… …
3273 CODE: 3811 CODE:
3274{ 3812{
3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3813 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3276 { 3814 {
3277 struct coro *current = SvSTATE_current; 3815 struct coro *current = SvSTATE_current;
3816 struct CoroSLF slf_save;
3278 3817
3279 if (current != coro) 3818 if (current != coro)
3280 { 3819 {
3281 PUTBACK; 3820 PUTBACK;
3282 save_perl (aTHX_ current); 3821 save_perl (aTHX_ current);
3283 load_perl (aTHX_ coro); 3822 load_perl (aTHX_ coro);
3823 /* the coro is most likely in an active SLF call.
3824 * while not strictly required (the code we execute is
3825 * not allowed to call any SLF functions), it's cleaner
3826 * to reinitialise the slf_frame and restore it later.
3827 * This might one day allow us to actually do SLF calls
3828 * from code executed here.
3829 */
3830 slf_save = slf_frame;
3831 slf_frame.prepare = 0;
3284 SPAGAIN; 3832 SPAGAIN;
3285 } 3833 }
3286 3834
3287 PUSHSTACK; 3835 PUSHSTACK;
3288 3836
… …
3298 SPAGAIN; 3846 SPAGAIN;
3299 3847
3300 if (current != coro) 3848 if (current != coro)
3301 { 3849 {
3302 PUTBACK; 3850 PUTBACK;
3851 slf_frame = slf_save;
3303 save_perl (aTHX_ coro); 3852 save_perl (aTHX_ coro);
3304 load_perl (aTHX_ current); 3853 load_perl (aTHX_ current);
3305 SPAGAIN; 3854 SPAGAIN;
3306 } 3855 }
3307 } 3856 }
… …
3312 PROTOTYPE: $ 3861 PROTOTYPE: $
3313 ALIAS: 3862 ALIAS:
3314 is_ready = CF_READY 3863 is_ready = CF_READY
3315 is_running = CF_RUNNING 3864 is_running = CF_RUNNING
3316 is_new = CF_NEW 3865 is_new = CF_NEW
3317 is_destroyed = CF_DESTROYED 3866 is_destroyed = CF_ZOMBIE
3867 is_zombie = CF_ZOMBIE
3318 is_suspended = CF_SUSPENDED 3868 is_suspended = CF_SUSPENDED
3319 CODE: 3869 CODE:
3320 RETVAL = boolSV (coro->flags & ix); 3870 RETVAL = boolSV (coro->flags & ix);
3321 OUTPUT: 3871 OUTPUT:
3322 RETVAL 3872 RETVAL
3323 3873
3324void 3874void
3325throw (Coro::State self, SV *exception = &PL_sv_undef) 3875throw (SV *self, SV *exception = &PL_sv_undef)
3326 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
3327 CODE: 3877 CODE:
3328{ 3878{
3879 struct coro *coro = SvSTATE (self);
3329 struct coro *current = SvSTATE_current; 3880 struct coro *current = SvSTATE_current;
3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3881 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3331 SvREFCNT_dec (*exceptionp); 3882 SvREFCNT_dec (*exceptionp);
3332 SvGETMAGIC (exception); 3883 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3884 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3885
3886 api_ready (aTHX_ self);
3334} 3887}
3335 3888
3336void 3889void
3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3890api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3338 PROTOTYPE: $;$ 3891 PROTOTYPE: $;$
… …
3393 3946
3394void 3947void
3395cancel (Coro::State self) 3948cancel (Coro::State self)
3396 CODE: 3949 CODE:
3397 coro_state_destroy (aTHX_ self); 3950 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399 3951
3400SV * 3952SV *
3401enable_times (int enabled = enable_times) 3953enable_times (int enabled = enable_times)
3402 CODE: 3954 CODE:
3403{ 3955{
… …
3416 3968
3417void 3969void
3418times (Coro::State self) 3970times (Coro::State self)
3419 PPCODE: 3971 PPCODE:
3420{ 3972{
3421 struct coro *current = SvSTATE (coro_current); 3973 struct coro *current = SvSTATE (coro_current);
3422 3974
3423 if (expect_false (current == self)) 3975 if (ecb_expect_false (current == self))
3424 { 3976 {
3425 coro_times_update (); 3977 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3978 coro_times_add (SvSTATE (coro_current));
3427 } 3979 }
3428 3980
3429 EXTEND (SP, 2); 3981 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3982 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3983 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 3984
3433 if (expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3435} 3987}
3436 3988
3437void 3989void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3439 CODE: 3991 CODE:
3440{ 3992{
3441 struct coro *current = SvSTATE_current; 3993 struct coro *current = SvSTATE_current;
3994 AV *swap_sv;
3995 int i;
3996
3997 sva = SvRV (sva);
3998 svb = SvRV (svb);
3442 3999
3443 if (current == coro) 4000 if (current == coro)
3444 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3445 4002
3446 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3447 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3448 4005
4006 swap_sv = coro->swap_sv;
4007
4008 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4009 {
4010 SV *a = AvARRAY (swap_sv)[i ];
4011 SV *b = AvARRAY (swap_sv)[i + 1];
4012
4013 if (a == sva && b == svb)
4014 {
4015 SvREFCNT_dec_NN (a);
4016 SvREFCNT_dec_NN (b);
4017
4018 for (; i <= AvFILLp (swap_sv) - 2; i++)
4019 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4020
4021 AvFILLp (swap_sv) -= 2;
4022
4023 goto removed;
4024 }
4025 }
4026
3449 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3451 4031
3452 if (current == coro) 4032 if (current == coro)
3453 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3454} 4034}
3455 4035
3456 4036
3457MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3458 4038
3459BOOT: 4039BOOT:
3460{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4047 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4049 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4050 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4051 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3470 4052
3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4053 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4054 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4055 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4056 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3475 4057
3476 coro_stash = gv_stashpv ("Coro", TRUE); 4058 coro_stash = gv_stashpv ("Coro", TRUE);
3477 4059
3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4060 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4061 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4062 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3492 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3493 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3494 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3495 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3496 4078
4079 coroapi.enterleave_hook = api_enterleave_hook;
4080 coroapi.enterleave_unhook = api_enterleave_unhook;
4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4082
3497 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3498 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3499 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3500 } 4086 }
3501} 4087}
3502 4088
3503SV * 4089SV *
… …
3508 api_ready (aTHX_ RETVAL); 4094 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 4095 OUTPUT:
3510 RETVAL 4096 RETVAL
3511 4097
3512void 4098void
4099_destroy (Coro::State coro)
4100 CODE:
4101 /* used by the manager thread */
4102 coro_state_destroy (aTHX_ coro);
4103
4104void
4105on_destroy (Coro::State coro, SV *cb)
4106 CODE:
4107 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4108
4109void
4110join (...)
4111 CODE:
4112 CORO_EXECUTE_SLF_XS (slf_init_join);
4113
4114void
3513terminate (...) 4115terminate (...)
3514 CODE: 4116 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4117 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4118
4119void
4120cancel (...)
4121 CODE:
4122 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4123
4124int
4125safe_cancel (Coro::State self, ...)
4126 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 4127
3517void 4128void
3518schedule (...) 4129schedule (...)
3519 CODE: 4130 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4131 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3541 4152
3542void 4153void
3543_set_current (SV *current) 4154_set_current (SV *current)
3544 PROTOTYPE: $ 4155 PROTOTYPE: $
3545 CODE: 4156 CODE:
3546 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3547 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3548 4159
3549void 4160void
3550_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3551 PROTOTYPE: $ 4162 PROTOTYPE: $
… …
3635 4246
3636 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
3637 { 4248 {
3638 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3640 SvREFCNT_dec (sv); 4251 SvREFCNT_dec_NN (sv);
3641 } 4252 }
3642 4253
3643 { 4254 {
3644 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
3645 4256
… …
3652 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
3653 4264
3654 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
3655 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3656 else 4267 else
3657 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
3658} 4269}
3659 4270
3660SV * 4271SV *
3661rouse_cb () 4272rouse_cb ()
3662 PROTOTYPE: 4273 PROTOTYPE:
… …
3677 on_leave = 1 4288 on_leave = 1
3678 PROTOTYPE: & 4289 PROTOTYPE: &
3679 CODE: 4290 CODE:
3680{ 4291{
3681 struct coro *coro = SvSTATE_current; 4292 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4293 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683 4294
3684 block = s_get_cv_croak (block); 4295 block = s_get_cv_croak (block);
3685 4296
3686 if (!*avp) 4297 if (!*avp)
3687 *avp = newAV (); 4298 *avp = newAV ();
… …
3707 4318
3708SV * 4319SV *
3709new (SV *klass, SV *count = 0) 4320new (SV *klass, SV *count = 0)
3710 CODE: 4321 CODE:
3711{ 4322{
3712 int semcnt = 1; 4323 int semcnt = 1;
3713 4324
3714 if (count) 4325 if (count)
3715 { 4326 {
3716 SvGETMAGIC (count); 4327 SvGETMAGIC (count);
3717 4328
… …
3741 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3742 OUTPUT: 4353 OUTPUT:
3743 RETVAL 4354 RETVAL
3744 4355
3745void 4356void
3746up (SV *self, int adjust = 1) 4357up (SV *self)
3747 ALIAS:
3748 adjust = 1
3749 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
3750 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3751 4365
3752void 4366void
3753down (...) 4367down (...)
3754 CODE: 4368 CODE:
3755 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3777 XSRETURN_NO; 4391 XSRETURN_NO;
3778} 4392}
3779 4393
3780void 4394void
3781waiters (SV *self) 4395waiters (SV *self)
3782 PPCODE: 4396 PPCODE:
3783{ 4397{
3784 AV *av = (AV *)SvRV (self); 4398 AV *av = (AV *)SvRV (self);
3785 int wcount = AvFILLp (av) + 1 - 1; 4399 int wcount = AvFILLp (av) + 1 - 1;
3786 4400
3787 if (GIMME_V == G_SCALAR) 4401 if (GIMME_V == G_SCALAR)
… …
3796} 4410}
3797 4411
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4412MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799 4413
3800void 4414void
3801_may_delete (SV *sem, int count, int extra_refs) 4415_may_delete (SV *sem, int count, unsigned int extra_refs)
3802 PPCODE: 4416 PPCODE:
3803{ 4417{
3804 AV *av = (AV *)SvRV (sem); 4418 AV *av = (AV *)SvRV (sem);
3805 4419
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4420 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */ 4421 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count) 4422 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES; 4423 XSRETURN_YES;
… …
3830 4444
3831void 4445void
3832broadcast (SV *self) 4446broadcast (SV *self)
3833 CODE: 4447 CODE:
3834{ 4448{
3835 AV *av = (AV *)SvRV (self); 4449 AV *av = (AV *)SvRV (self);
3836 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4450 coro_signal_wake (aTHX_ av, AvFILLp (av));
3837} 4451}
3838 4452
3839void 4453void
3840send (SV *self) 4454send (SV *self)
… …
3848 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4462 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3849} 4463}
3850 4464
3851IV 4465IV
3852awaited (SV *self) 4466awaited (SV *self)
3853 CODE: 4467 CODE:
3854 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4468 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3855 OUTPUT: 4469 OUTPUT:
3856 RETVAL 4470 RETVAL
3857 4471
3858 4472
… …
3863 4477
3864void 4478void
3865_schedule (...) 4479_schedule (...)
3866 CODE: 4480 CODE:
3867{ 4481{
3868 static int incede; 4482 static int incede;
3869 4483
3870 api_cede_notself (aTHX); 4484 api_cede_notself (aTHX);
3871 4485
3872 ++incede; 4486 ++incede;
3873 while (coro_nready >= incede && api_cede (aTHX)) 4487 while (coro_nready >= incede && api_cede (aTHX))
… …
3917 { 4531 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4532 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0; 4533 coro_old_pp_sselect = 0;
3920 } 4534 }
3921 4535
4536MODULE = Coro::State PACKAGE = Coro::Util
4537
4538void
4539_exit (int code)
4540 CODE:
4541 _exit (code);
4542
4543NV
4544time ()
4545 CODE:
4546 RETVAL = nvtime (aTHX);
4547 OUTPUT:
4548 RETVAL
4549
4550NV
4551gettimeofday ()
4552 PPCODE:
4553{
4554 UV tv [2];
4555 u2time (aTHX_ tv);
4556 EXTEND (SP, 2);
4557 PUSHs (sv_2mortal (newSVuv (tv [0])));
4558 PUSHs (sv_2mortal (newSVuv (tv [1])));
4559}
4560

Diff Legend

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