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.398 by root, Sat May 7 14:11:10 2011 UTC vs.
Revision 1.456 by root, Sun Mar 6 06:26:21 2016 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
… …
144 140
145static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
147static SV *rv_diehook; 143static SV *rv_diehook;
148static SV *rv_warnhook; 144static SV *rv_warnhook;
149static HV *hv_sig; /* %SIG */
150 145
151/* async_pool helper stuff */ 146/* async_pool helper stuff */
152static SV *sv_pool_rss; 147static SV *sv_pool_rss;
153static SV *sv_pool_size; 148static SV *sv_pool_size;
154static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
166static char times_valid; 161static char times_valid;
167 162
168static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
170 165
171enum { 166enum
167{
172 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 177typedef struct coro_cctx
182{ 178{
183 struct coro_cctx *next; 179 struct coro_cctx *next;
184 180
185 /* the stack */ 181 /* the stack */
186 void *sptr; 182 struct coro_stack stack;
187 size_t ssize;
188 183
189 /* cpu state */ 184 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
192 JMPENV *top_env; 189 JMPENV *top_env;
193 coro_context cctx; 190 coro_context cctx;
194 191
195 U32 gen; 192 U32 gen;
196#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
… …
201 198
202static coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
203 200
204/*****************************************************************************/ 201/*****************************************************************************/
205 202
203static MGVTBL coro_state_vtbl;
204
206enum { 205enum
206{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 213};
214 214
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 216typedef struct
217{ 217{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
224# include "state.h" 219 #include "state.h"
225#undef VAR
226} perl_slots; 220} perl_slots;
227 221
228// how many context stack entries do we need for perl_slots 222/* how many context stack entries do we need for perl_slots */
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 224
231/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
232struct coro { 226struct coro
227{
233 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 229 coro_cctx *cctx;
235 230
236 /* ready queue */ 231 /* ready queue */
237 struct coro *next_ready; 232 struct coro *next_ready;
… …
239 /* state data */ 234 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 236 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
243 238
244 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
245 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
246 int refcnt; /* coroutines are refcounted, yes */
247 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
248 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
249 243
250 /* statistics */ 244 /* statistics */
251 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
252 246
253 /* coro process data */ 247 /* coro process data */
254 int prio; 248 int prio;
255 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
256 SV *rouse_cb; 250 SV *rouse_cb; /* last rouse callback */
251 AV *on_destroy; /* callbacks or coros to notify on destroy */
252 AV *status; /* the exit status list */
257 253
258 /* async_pool */ 254 /* async_pool */
259 SV *saved_deffh; 255 SV *saved_deffh;
260 SV *invoke_cb; 256 SV *invoke_cb;
261 AV *invoke_av; 257 AV *invoke_av;
262 258
263 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
264 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
265 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
266 262
267 /* swap_sv */ 263 /* swap_sv */
268 AV *swap_sv; 264 AV *swap_sv;
269 265
270 /* times */ 266 /* times */
… …
297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
298static CV *cv_coro_run; 294static CV *cv_coro_run;
299static struct coro *coro_first; 295static struct coro *coro_first;
300#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
301 297
298/** JIT *********************************************************************/
299
300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
303 #ifndef CORO_JIT_TYPE
304 #if ECB_AMD64 && CORO_JIT_UNIXY
305 #define CORO_JIT_TYPE "amd64-unix"
306 #elif __i386 && CORO_JIT_UNIXY
307 #define CORO_JIT_TYPE "x86-unix"
308 #endif
309 #endif
310#endif
311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
319#endif
320
302/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
303 322
304static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select; 324static SV *coro_select_select;
306 325
… …
321 340
322/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
323 342
324#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
325 344
326static void 345ecb_inline void
327coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
328{ 347{
329 struct timeval tv; 348 struct timeval tv;
330 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
331 350
332 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
334} 353}
335 354
336static double 355ecb_inline double
337coro_nvtime () 356coro_nvtime (void)
338{ 357{
339 struct timeval tv; 358 struct timeval tv;
340 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
341 360
342 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
343} 362}
344 363
345static void 364ecb_inline void
346time_init (pTHX) 365time_init (pTHX)
347{ 366{
348 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
349 u2time = coro_u2time; 368 u2time = coro_u2time;
350} 369}
351 370
352#else 371#else
353 372
354static void 373ecb_inline void
355time_init (pTHX) 374time_init (pTHX)
356{ 375{
357 SV **svp; 376 SV **svp;
358 377
359 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
360 379
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362 381
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365 384
… …
371 390
372#endif 391#endif
373 392
374/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
375 394
376static SV * 395static SV * ecb_noinline
377coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
378{ 397{
379#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
380 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
381 get_sv (name, create); 400 get_sv (name, create);
382#endif 401#endif
383 return get_sv (name, create); 402 return get_sv (name, create);
384} 403}
385 404
386static AV * 405static AV * ecb_noinline
387coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
388{ 407{
389#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 409 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
391 get_av (name, create); 410 get_av (name, create);
392#endif 411#endif
393 return get_av (name, create); 412 return get_av (name, create);
394} 413}
395 414
396static HV * 415static HV * ecb_noinline
397coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
398{ 417{
399#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 419 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
401 get_hv (name, create); 420 get_hv (name, create);
402#endif 421#endif
403 return get_hv (name, create); 422 return get_hv (name, create);
404} 423}
405 424
406INLINE void 425ecb_inline void
407coro_times_update () 426coro_times_update (void)
408{ 427{
409#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
410 struct timespec ts; 429 struct timespec ts;
411 430
412 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
424 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
426#endif 445#endif
427} 446}
428 447
429INLINE void 448ecb_inline void
430coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
431{ 450{
432 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
436 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
439} 458}
440 459
441INLINE void 460ecb_inline void
442coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
443{ 462{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
445 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
454/* magic glue */ 473/* magic glue */
455 474
456#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
457#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
458 477
459#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
460 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
461 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
462 : mg_find (sv, type)) 481 : mg_find (sv, type))
463 482
464#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
465 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
466 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
467 : 0) 486 : 0)
468 487
469#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
470#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
471 490
472INLINE struct coro * 491ecb_inline MAGIC *
473SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
474{ 493{
475 HV *stash;
476 MAGIC *mg; 494 MAGIC *mg;
477 495
496 if (ecb_expect_true (
497 SvTYPE (coro) == SVt_PVHV
498 && (mg = CORO_MAGIC_state (coro))
499 && mg->mg_virtual == &coro_state_vtbl
500 ))
501 return mg;
502
503 return 0;
504}
505
506ecb_inline struct coro *
507SvSTATE_ (pTHX_ SV *coro_sv)
508{
509 MAGIC *mg;
510
478 if (SvROK (coro)) 511 if (SvROK (coro_sv))
479 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
480 513
481 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
482 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
483 517
484 stash = SvSTASH (coro);
485 if (expect_false (stash != coro_stash && stash != coro_state_stash))
486 {
487 /* very slow, but rare, check */
488 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
489 croak ("Coro::State object required");
490 }
491
492 mg = CORO_MAGIC_state (coro);
493 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
494} 519}
495 520
496#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
497 522
… …
500#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
501 526
502/*****************************************************************************/ 527/*****************************************************************************/
503/* padlist management and caching */ 528/* padlist management and caching */
504 529
505static AV * 530ecb_inline PADLIST *
506coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
507{ 532{
508 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
509 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
510 538
511 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
512 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
513#if PERL_VERSION_ATLEAST (5,10,0)
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
515#else
516 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
517#endif 568#endif
518 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
519 --AvFILLp (padlist);
520 569
521 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
522 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
523 578
524 return newpadlist; 579 return newpadlist;
525} 580}
526 581
527static void 582ecb_inline void
528free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
529{ 584{
530 /* may be during global destruction */ 585 /* may be during global destruction */
531 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
532 { 587 {
533 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
534 589
535 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
536 { 591 {
537 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
538 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
539 I32 j = AvFILLp (av);
540 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
541 while (j >= 0) 599 while (j >= 0)
542 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
543 601
544 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
545 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
546 } 605 }
547 606
548 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
549 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
550 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
551 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
552 } 617 }
553} 618}
554 619
555static int 620static int
556coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
557{ 622{
558 AV *padlist; 623 PADLIST *padlist;
559 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
560 626
561 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
562 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
563 return 0; 629 return 0;
564 630
565 /* casting is fun. */ 631 while (len--)
566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
567 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
568
569 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
570 633
571 return 0; 634 return 0;
572} 635}
573 636
574static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
575 0, 0, 0, 0, 638 0, 0, 0, 0,
576 coro_cv_free 639 coro_cv_free
577}; 640};
578 641
579/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
580static void 643ecb_inline void
581get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
582{ 645{
583 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
584 AV *av; 647 size_t *lenp;
585 648
586 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
587 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
588 else 651 else
589 { 652 {
590#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
591 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
592 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
598 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
599#endif 662#endif
600 } 663 }
601} 664}
602 665
603static void 666ecb_inline void
604put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
605{ 668{
606 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
607 AV *av;
608 670
609 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
610 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
611 681
612 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
613
614 if (expect_false (AvFILLp (av) >= AvMAX (av)))
615 av_extend (av, AvFILLp (av) + 1);
616
617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
618} 683}
619 684
620/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
621 686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
622/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
623static void 730static void
624swap_svs (pTHX_ Coro__State c) 731swap_svs (pTHX_ Coro__State c)
625{ 732{
626 int i; 733 int i;
627 734
628 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
629 { 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667} 737}
668 738
669#define SWAP_SVS(coro) \ 739#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \ 740 if (ecb_expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro)) 741 swap_svs (aTHX_ (coro))
672 742
673static void 743static void
674on_enterleave_call (pTHX_ SV *cb); 744on_enterleave_call (pTHX_ SV *cb);
675 745
… …
679 perl_slots *slot = c->slot; 749 perl_slots *slot = c->slot;
680 c->slot = 0; 750 c->slot = 0;
681 751
682 PL_mainstack = c->mainstack; 752 PL_mainstack = c->mainstack;
683 753
684 GvSV (PL_defgv) = slot->defsv; 754#if CORO_JIT
685 GvAV (PL_defgv) = slot->defav; 755 load_perl_slots (slot);
686 GvSV (PL_errgv) = slot->errsv; 756#else
687 GvSV (irsgv) = slot->irsgv;
688 GvHV (PL_hintgv) = slot->hinthv;
689
690 #define VAR(name,type) PL_ ## name = slot->name; 757 #define VARx(name,expr,type) expr = slot->name;
691 # include "state.h" 758 #include "state.h"
692 #undef VAR 759#endif
693 760
694 { 761 {
695 dSP; 762 dSP;
696 763
697 CV *cv; 764 CV *cv;
698 765
699 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
700 while (expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
701 { 768 {
702 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
703 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
704 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
705 } 772 }
706 773
707 PUTBACK; 774 PUTBACK;
708 } 775 }
709 776
710 slf_frame = c->slf_frame; 777 slf_frame = c->slf_frame;
711 CORO_THROW = c->except; 778 CORO_THROW = c->except;
712 779
713 if (expect_false (enable_times)) 780 if (ecb_expect_false (enable_times))
714 { 781 {
715 if (expect_false (!times_valid)) 782 if (ecb_expect_false (!times_valid))
716 coro_times_update (); 783 coro_times_update ();
717 784
718 coro_times_sub (c); 785 coro_times_sub (c);
719 } 786 }
720 787
721 if (expect_false (c->on_enter)) 788 if (ecb_expect_false (c->on_enter))
722 { 789 {
723 int i; 790 int i;
724 791
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
727 } 794 }
728 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
729 SWAP_SVS (c); 804 SWAP_SVS (c);
730} 805}
731 806
732static void 807static void
733save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
734{ 809{
735 SWAP_SVS (c); 810 SWAP_SVS (c);
736 811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
819
737 if (expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
738 { 821 {
739 int i; 822 int i;
740 823
741 for (i = AvFILLp (c->on_leave); i >= 0; --i) 824 for (i = AvFILLp (c->on_leave); i >= 0; --i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 825 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 } 826 }
744 827
745 times_valid = 0; 828 times_valid = 0;
746 829
747 if (expect_false (enable_times)) 830 if (ecb_expect_false (enable_times))
748 { 831 {
749 coro_times_update (); times_valid = 1; 832 coro_times_update (); times_valid = 1;
750 coro_times_add (c); 833 coro_times_add (c);
751 } 834 }
752 835
… …
766 849
767 XPUSHs (Nullsv); 850 XPUSHs (Nullsv);
768 /* this loop was inspired by pp_caller */ 851 /* this loop was inspired by pp_caller */
769 for (;;) 852 for (;;)
770 { 853 {
771 while (expect_true (cxix >= 0)) 854 while (ecb_expect_true (cxix >= 0))
772 { 855 {
773 PERL_CONTEXT *cx = &ccstk[cxix--]; 856 PERL_CONTEXT *cx = &ccstk[cxix--];
774 857
775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 858 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
776 { 859 {
777 CV *cv = cx->blk_sub.cv; 860 CV *cv = cx->blk_sub.cv;
778 861
779 if (expect_true (CvDEPTH (cv))) 862 if (ecb_expect_true (CvDEPTH (cv)))
780 { 863 {
781 EXTEND (SP, 3); 864 EXTEND (SP, 3);
782 PUSHs ((SV *)CvPADLIST (cv)); 865 PUSHs ((SV *)CvPADLIST (cv));
783 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 866 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
784 PUSHs ((SV *)cv); 867 PUSHs ((SV *)cv);
… …
787 get_padlist (aTHX_ cv); 870 get_padlist (aTHX_ cv);
788 } 871 }
789 } 872 }
790 } 873 }
791 874
792 if (expect_true (top_si->si_type == PERLSI_MAIN)) 875 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
793 break; 876 break;
794 877
795 top_si = top_si->si_prev; 878 top_si = top_si->si_prev;
796 ccstk = top_si->si_cxstack; 879 ccstk = top_si->si_cxstack;
797 cxix = top_si->si_cxix; 880 cxix = top_si->si_cxix;
… …
799 882
800 PUTBACK; 883 PUTBACK;
801 } 884 }
802 885
803 /* allocate some space on the context stack for our purposes */ 886 /* allocate some space on the context stack for our purposes */
804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 887 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
805 { 888 {
806 unsigned int i; 889 unsigned int i;
807 890
808 for (i = 0; i < SLOT_COUNT; ++i) 891 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 892 CXINC;
… …
814 c->mainstack = PL_mainstack; 897 c->mainstack = PL_mainstack;
815 898
816 { 899 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 900 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 901
819 slot->defav = GvAV (PL_defgv); 902#if CORO_JIT
820 slot->defsv = DEFSV; 903 save_perl_slots (slot);
821 slot->errsv = ERRSV; 904#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 905 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 906 #include "state.h"
827 #undef VAR 907#endif
828 } 908 }
829} 909}
830 910
831/* 911/*
832 * allocate various perl stacks. This is almost an exact copy 912 * allocate various perl stacks. This is almost an exact copy
… …
863#endif 943#endif
864 944
865 New(54,PL_scopestack,8,I32); 945 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 946 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 947 PL_scopestack_max = 8;
948#if HAS_SCOPESTACK_NAME
949 New(54,PL_scopestack_name,8,const char*);
950#endif
868 951
869 New(54,PL_savestack,24,ANY); 952 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 953 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 954 PL_savestack_max = 24;
872 955
… …
900 } 983 }
901 984
902 Safefree (PL_tmps_stack); 985 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 986 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 987 Safefree (PL_scopestack);
988#if HAS_SCOPESTACK_NAME
989 Safefree (PL_scopestack_name);
990#endif
905 Safefree (PL_savestack); 991 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 993 Safefree (PL_retstack);
908#endif 994#endif
909} 995}
… …
955#endif 1041#endif
956 1042
957/* 1043/*
958 * This overrides the default magic get method of %SIG elements. 1044 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1045 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1046 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1047 * we just provide our own readback here.
962 */ 1048 */
963static int 1049static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1051{
966 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
967 1053
968 if (*s == '_') 1054 if (*s == '_')
969 { 1055 {
970 SV **svp = 0; 1056 SV **svp = 0;
971 1057
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1060
975 if (svp) 1061 if (svp)
976 { 1062 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1063 SV *ssv;
1064
1065 if (!*svp)
1066 ssv = &PL_sv_undef;
1067 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1068 ssv = sv_2mortal (newRV_inc (*svp));
1069 else
1070 ssv = *svp;
1071
1072 sv_setsv (sv, ssv);
978 return 0; 1073 return 0;
979 } 1074 }
980 } 1075 }
981 1076
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1077 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1078}
984 1079
985static int 1080static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1081coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1082{
988 const char *s = MgPV_nolen_const (mg); 1083 const char *s = MgPV_nolen_const (mg);
989 1084
990 if (*s == '_') 1085 if (*s == '_')
… …
1004 } 1099 }
1005 1100
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1101 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1102}
1008 1103
1009static int 1104static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1105coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1106{
1012 const char *s = MgPV_nolen_const (mg); 1107 const char *s = MgPV_nolen_const (mg);
1013 1108
1014 if (*s == '_') 1109 if (*s == '_')
… …
1049 return 1; 1144 return 1;
1050} 1145}
1051 1146
1052static UNOP init_perl_op; 1147static UNOP init_perl_op;
1053 1148
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1149ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1150init_perl (pTHX_ struct coro *coro)
1056{ 1151{
1057 /* 1152 /*
1058 * emulate part of the perl startup here. 1153 * emulate part of the perl startup here.
1059 */ 1154 */
… …
1074 PL_parser = 0; 1169 PL_parser = 0;
1075#endif 1170#endif
1076 PL_hints = 0; 1171 PL_hints = 0;
1077 1172
1078 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1176
1082 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1187
1090 { 1188 {
1091 dSP; 1189 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1204 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1205 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1206 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1207 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1208 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1209 slf_frame.destroy = 0;
1111 1210
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1211 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1212 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1213 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1214 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1219 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1220 CORO_THROW = coro->except;
1122 1221
1123 SWAP_SVS (coro); 1222 SWAP_SVS (coro);
1124 1223
1125 if (expect_false (enable_times)) 1224 if (ecb_expect_false (enable_times))
1126 { 1225 {
1127 coro_times_update (); 1226 coro_times_update ();
1128 coro_times_sub (coro); 1227 coro_times_sub (coro);
1129 } 1228 }
1130} 1229}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1266 SvRV_set (coro_current, (SV *)coro->hv);
1168 1267
1169 load_perl (aTHX_ coro); 1268 load_perl (aTHX_ coro);
1170 1269
1171 coro_unwind_stacks (aTHX); 1270 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1271
1174 /* restore swapped sv's */ 1272 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1273 SWAP_SVS (coro);
1176 1274
1275 coro_destruct_stacks (aTHX);
1276
1177 // now save some sv's to be free'd later 1277 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1278 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1279 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1280 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1281 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1282 svf [4] = PL_rs;
… …
1199 1299
1200 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1201 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1202 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1204 } 1306 }
1205} 1307}
1206 1308
1207INLINE void 1309ecb_inline void
1208free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
1209{ 1311{
1210 if (expect_true (coro_mortal)) 1312 if (ecb_expect_true (coro_mortal))
1211 { 1313 {
1212 SvREFCNT_dec (coro_mortal); 1314 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1315 coro_mortal = 0;
1214 } 1316 }
1215} 1317}
1216 1318
1217static int 1319static int
… …
1271 1373
1272 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1273 { 1375 {
1274 SV **cb; 1376 SV **cb;
1275 1377
1276 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1277 { 1379 {
1278 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1279 1381
1280 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1281 { 1383 {
… …
1350 1452
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1453 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1454}
1353 1455
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1456/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1457static void ecb_noinline
1356cctx_prepare (pTHX) 1458cctx_prepare (pTHX)
1357{ 1459{
1358 PL_top_env = &PL_start_env; 1460 PL_top_env = &PL_start_env;
1359 1461
1360 if (cctx_current->flags & CC_TRACE) 1462 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1473 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1474 slf_frame.check = slf_check_set_stacklevel;
1373} 1475}
1374 1476
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1477/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1478ecb_inline void
1377transfer_tail (pTHX) 1479transfer_tail (pTHX)
1378{ 1480{
1379 free_coro_mortal (aTHX); 1481 free_coro_mortal (aTHX);
1482}
1483
1484/* try to exit the same way perl's main function would do */
1485/* we do not bother resetting the environment or other things *7
1486/* that are not, uhm, essential */
1487/* this obviously also doesn't work when perl is embedded */
1488static void ecb_noinline ecb_cold
1489perlish_exit (pTHX)
1490{
1491 int exitstatus = perl_destruct (PL_curinterp);
1492 perl_free (PL_curinterp);
1493 exit (exitstatus);
1380} 1494}
1381 1495
1382/* 1496/*
1383 * this is a _very_ stripped down perl interpreter ;) 1497 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1498 */
… …
1413 */ 1527 */
1414 1528
1415 /* 1529 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1533 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1534 */
1424 PL_top_env = main_top_env; 1535 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1536 }
1427} 1537}
1428 1538
1429static coro_cctx * 1539static coro_cctx *
1430cctx_new () 1540cctx_new (void)
1431{ 1541{
1432 coro_cctx *cctx; 1542 coro_cctx *cctx;
1433 1543
1434 ++cctx_count; 1544 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1545 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1551 return cctx;
1442} 1552}
1443 1553
1444/* create a new cctx only suitable as source */ 1554/* create a new cctx only suitable as source */
1445static coro_cctx * 1555static coro_cctx *
1446cctx_new_empty () 1556cctx_new_empty (void)
1447{ 1557{
1448 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1449 1559
1450 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1562
1453 return cctx; 1563 return cctx;
1454} 1564}
1455 1565
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1567static coro_cctx *
1458cctx_new_run () 1568cctx_new_run (void)
1459{ 1569{
1460 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1571
1464#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1468
1469 if (cctx->sptr != (void *)-1)
1470 {
1471 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1473 #endif
1474 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1475 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1476 cctx->flags |= CC_MAPPED;
1477 } 1573 {
1478 else
1479#endif
1480 {
1481 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1482 New (0, cctx->sptr, cctx_stacksize, long);
1483
1484 if (!cctx->sptr)
1485 {
1486 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1576 }
1493 1577
1494 #if CORO_USE_VALGRIND
1495 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1496 #endif
1497
1498 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1579
1500 return cctx; 1580 return cctx;
1501} 1581}
1502 1582
1503static void 1583static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1590
1511 --cctx_count; 1591 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1513 1593
1514 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1515 if (cctx->sptr)
1516 {
1517 #if CORO_USE_VALGRIND
1518 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1519 #endif
1520
1521#if HAVE_MMAP
1522 if (cctx->flags & CC_MAPPED)
1523 munmap (cctx->sptr, cctx->ssize);
1524 else
1525#endif
1526 Safefree (cctx->sptr);
1527 }
1528 1595
1529 Safefree (cctx); 1596 Safefree (cctx);
1530} 1597}
1531 1598
1532/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1600#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1601
1535static coro_cctx * 1602static coro_cctx *
1536cctx_get (pTHX) 1603cctx_get (pTHX)
1537{ 1604{
1538 while (expect_true (cctx_first)) 1605 while (ecb_expect_true (cctx_first))
1539 { 1606 {
1540 coro_cctx *cctx = cctx_first; 1607 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1608 cctx_first = cctx->next;
1542 --cctx_idle; 1609 --cctx_idle;
1543 1610
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1611 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1612 return cctx;
1546 1613
1547 cctx_destroy (cctx); 1614 cctx_destroy (cctx);
1548 } 1615 }
1549 1616
… …
1551} 1618}
1552 1619
1553static void 1620static void
1554cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1555{ 1622{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1624
1558 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1627 {
1561 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1629 cctx_first = first->next;
1563 --cctx_idle; 1630 --cctx_idle;
1564 1631
… …
1575static void 1642static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1643transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1644{
1578 /* TODO: throwing up here is considered harmful */ 1645 /* TODO: throwing up here is considered harmful */
1579 1646
1580 if (expect_true (prev != next)) 1647 if (ecb_expect_true (prev != next))
1581 { 1648 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1649 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1650 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1651
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1652 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1653 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1654
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1655#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1656 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1657 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1658#endif
1592 } 1659 }
1593} 1660}
1594 1661
1595/* always use the TRANSFER macro */ 1662/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1663static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1664transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1665{
1599 dSTACKLEVEL; 1666 dSTACKLEVEL;
1600 1667
1601 /* sometimes transfer is only called to set idle_sp */ 1668 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1669 if (ecb_expect_false (!prev))
1603 { 1670 {
1604 cctx_current->idle_sp = STACKLEVEL; 1671 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1672 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1673 }
1607 else if (expect_true (prev != next)) 1674 else if (ecb_expect_true (prev != next))
1608 { 1675 {
1609 coro_cctx *cctx_prev; 1676 coro_cctx *cctx_prev;
1610 1677
1611 if (expect_false (prev->flags & CF_NEW)) 1678 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1679 {
1613 /* create a new empty/source context */ 1680 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1681 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1682 prev->flags |= CF_RUNNING;
1616 } 1683 }
… …
1619 next->flags |= CF_RUNNING; 1686 next->flags |= CF_RUNNING;
1620 1687
1621 /* first get rid of the old state */ 1688 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1689 save_perl (aTHX_ prev);
1623 1690
1624 if (expect_false (next->flags & CF_NEW)) 1691 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1692 {
1626 /* need to start coroutine */ 1693 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1694 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1695 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1696 init_perl (aTHX_ next);
1630 } 1697 }
1631 else 1698 else
1632 load_perl (aTHX_ next); 1699 load_perl (aTHX_ next);
1633 1700
1634 /* possibly untie and reuse the cctx */ 1701 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1702 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1703 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1704 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1705 && !force_cctx
1639 )) 1706 ))
1640 { 1707 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1708 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1709 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1710
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1711 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1712 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1713 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1714 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1715 next->cctx = cctx_get (aTHX);
1649 1716
1650 cctx_put (cctx_current); 1717 cctx_put (cctx_current);
1651 } 1718 }
1652 else 1719 else
1653 prev->cctx = cctx_current; 1720 prev->cctx = cctx_current;
1654 1721
1655 ++next->usecount; 1722 ++next->usecount;
1656 1723
1657 cctx_prev = cctx_current; 1724 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1725 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1726
1660 next->cctx = 0; 1727 next->cctx = 0;
1661 1728
1662 if (expect_false (cctx_prev != cctx_current)) 1729 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1730 {
1664 cctx_prev->top_env = PL_top_env; 1731 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1732 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1733 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1734 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1740#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1741#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1742
1676/** high level stuff ********************************************************/ 1743/** high level stuff ********************************************************/
1677 1744
1745/* this function is actually Coro, not Coro::State, but we call it from here */
1746/* because it is convenient - but it hasn't been declared yet for that reason */
1747static void
1748coro_call_on_destroy (pTHX_ struct coro *coro);
1749
1678static void 1750static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1751coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1752{
1681 if (coro->flags & CF_DESTROYED) 1753 if (coro->flags & CF_ZOMBIE)
1682 return; 1754 return;
1683 1755
1684 slf_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1685 1757
1686 coro->flags |= CF_DESTROYED; 1758 coro->flags |= CF_ZOMBIE;
1687 1759
1688 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1689 { 1761 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1764 --coro_nready;
1693 } 1765 }
1694 else 1766 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1767 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1768
1769 if (coro->next) coro->next->prev = coro->prev;
1770 if (coro->prev) coro->prev->next = coro->next;
1771 if (coro == coro_first) coro_first = coro->next;
1696 1772
1697 if (coro->mainstack 1773 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1774 && coro->mainstack != main_mainstack
1699 && coro->slot 1775 && coro->slot
1700 && !PL_dirty) 1776 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1777 destroy_perl (aTHX_ coro);
1702 1778
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1779 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1780 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1781 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1782 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1783 SvREFCNT_dec (CORO_THROW);
1784
1785 coro_call_on_destroy (aTHX_ coro);
1786
1787 /* more destruction mayhem in coro_state_free */
1712} 1788}
1713 1789
1714static int 1790static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1791coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1792{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1793 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1794 mg->mg_ptr = 0;
1719 1795
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1796 coro_state_destroy (aTHX_ coro);
1797 SvREFCNT_dec (coro->on_destroy);
1798 SvREFCNT_dec (coro->status);
1799
1725 Safefree (coro); 1800 Safefree (coro);
1726 }
1727 1801
1728 return 0; 1802 return 0;
1729} 1803}
1730 1804
1731static int 1805static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1806coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1807{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1809 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1810 mg->mg_ptr = 0;
1811 mg->mg_virtual = 0;
1737 1812
1738 return 0; 1813 return 0;
1739} 1814}
1740 1815
1741static MGVTBL coro_state_vtbl = { 1816static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1841 TRANSFER (ta, 1);
1767} 1842}
1768 1843
1769/** Coro ********************************************************************/ 1844/** Coro ********************************************************************/
1770 1845
1771INLINE void 1846ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1847coro_enq (pTHX_ struct coro *coro)
1773{ 1848{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1849 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1850
1776 SvREFCNT_inc_NN (coro->hv); 1851 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1853 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1854 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1855 ready [1] = coro;
1781} 1856}
1782 1857
1783INLINE struct coro * 1858ecb_inline struct coro *
1784coro_deq (pTHX) 1859coro_deq (pTHX)
1785{ 1860{
1786 int prio; 1861 int prio;
1787 1862
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1863 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1916{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1917 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1918}
1844 1919
1845/* expects to own a reference to next->hv */ 1920/* expects to own a reference to next->hv */
1846INLINE void 1921ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1922prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1923{
1849 SV *prev_sv = SvRV (coro_current); 1924 SV *prev_sv = SvRV (coro_current);
1850 1925
1851 ta->prev = SvSTATE_hv (prev_sv); 1926 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1939{
1865 for (;;) 1940 for (;;)
1866 { 1941 {
1867 struct coro *next = coro_deq (aTHX); 1942 struct coro *next = coro_deq (aTHX);
1868 1943
1869 if (expect_true (next)) 1944 if (ecb_expect_true (next))
1870 { 1945 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1946 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1947 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1948 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1949 else
1875 { 1950 {
1876 next->flags &= ~CF_READY; 1951 next->flags &= ~CF_READY;
1877 --coro_nready; 1952 --coro_nready;
… …
1885 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1888 { 1963 {
1889 if (SvRV (sv_idle) == SvRV (coro_current)) 1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1891 1983
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready; 1986 --coro_nready;
1895 } 1987 }
… …
1910 } 2002 }
1911 } 2003 }
1912 } 2004 }
1913} 2005}
1914 2006
1915INLINE void 2007ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 2008prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 2009{
1918 api_ready (aTHX_ coro_current); 2010 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 2011 prepare_schedule (aTHX_ ta);
1920} 2012}
1921 2013
1922INLINE void 2014ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2015prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 2016{
1925 SV *prev = SvRV (coro_current); 2017 SV *prev = SvRV (coro_current);
1926 2018
1927 if (coro_nready) 2019 if (coro_nready)
… …
1957{ 2049{
1958 struct coro_transfer_args ta; 2050 struct coro_transfer_args ta;
1959 2051
1960 prepare_cede (aTHX_ &ta); 2052 prepare_cede (aTHX_ &ta);
1961 2053
1962 if (expect_true (ta.prev != ta.next)) 2054 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2055 {
1964 TRANSFER (ta, 1); 2056 TRANSFER (ta, 1);
1965 return 1; 2057 return 1;
1966 } 2058 }
1967 else 2059 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2102 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2103 }
2012} 2104}
2013 2105
2014static void 2106static void
2107coro_push_av (pTHX_ AV *av, I32 gimme_v)
2108{
2109 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2110 {
2111 dSP;
2112
2113 if (gimme_v == G_SCALAR)
2114 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2115 else
2116 {
2117 int i;
2118 EXTEND (SP, AvFILLp (av) + 1);
2119
2120 for (i = 0; i <= AvFILLp (av); ++i)
2121 PUSHs (AvARRAY (av)[i]);
2122 }
2123
2124 PUTBACK;
2125 }
2126}
2127
2128static void
2129coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2130{
2131 if (!coro->on_destroy)
2132 coro->on_destroy = newAV ();
2133
2134 av_push (coro->on_destroy, cb);
2135}
2136
2137static void
2138slf_destroy_join (pTHX_ struct CoroSLF *frame)
2139{
2140 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2141}
2142
2143static int
2144slf_check_join (pTHX_ struct CoroSLF *frame)
2145{
2146 struct coro *coro = (struct coro *)frame->data;
2147
2148 if (!coro->status)
2149 return 1;
2150
2151 frame->destroy = 0;
2152
2153 coro_push_av (aTHX_ coro->status, GIMME_V);
2154
2155 SvREFCNT_dec ((SV *)coro->hv);
2156
2157 return 0;
2158}
2159
2160static void
2161slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2162{
2163 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2164
2165 if (items > 1)
2166 croak ("join called with too many arguments");
2167
2168 if (coro->status)
2169 frame->prepare = prepare_nop;
2170 else
2171 {
2172 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2173 frame->prepare = prepare_schedule;
2174 }
2175
2176 frame->check = slf_check_join;
2177 frame->destroy = slf_destroy_join;
2178 frame->data = (void *)coro;
2179 SvREFCNT_inc (coro->hv);
2180}
2181
2182static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2183coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2184{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2185 AV *od = coro->on_destroy;
2018 2186
2019 if (on_destroyp) 2187 if (!od)
2020 { 2188 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2192
2025 while (AvFILLp (on_destroy) >= 0) 2193 while (AvFILLp (od) >= 0)
2194 {
2195 SV *cb = sv_2mortal (av_pop (od));
2196
2197 /* coro hv's (and only hv's at the moment) are supported as well */
2198 if (SvSTATEhv_p (aTHX_ cb))
2199 api_ready (aTHX_ cb);
2200 else
2026 { 2201 {
2027 dSP; /* don't disturb outer sp */ 2202 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2203 PUSHMARK (SP);
2031 2204
2032 if (statusp) 2205 if (coro->status)
2033 { 2206 {
2034 int i; 2207 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2208 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2209 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2210 }
2040 2211
2041 PUTBACK; 2212 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2213 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2214 }
2044 } 2215 }
2045} 2216}
2046 2217
2047static void 2218static void
2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items) 2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2220{
2050 AV *av = newAV (); 2221 AV *av;
2222
2223 if (coro->status)
2224 {
2225 av = coro->status;
2226 av_clear (av);
2227 }
2228 else
2229 av = coro->status = newAV ();
2051 2230
2052 /* items are actually not so common, so optimise for this case */ 2231 /* items are actually not so common, so optimise for this case */
2053 if (items) 2232 if (items)
2054 { 2233 {
2055 int i; 2234 int i;
… …
2057 av_extend (av, items - 1); 2236 av_extend (av, items - 1);
2058 2237
2059 for (i = 0; i < items; ++i) 2238 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2239 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2240 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2241}
2065 2242
2066static void 2243static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2244slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2245{
… …
2080static void 2257static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2258slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2259{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2260 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2261
2085 coro_set_status (aTHX_ coro_hv, arg, items); 2262 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2263 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2264}
2088 2265
2089static void 2266static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2267slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2096 croak ("Coro::cancel called without coro object,"); 2273 croak ("Coro::cancel called without coro object,");
2097 2274
2098 coro = SvSTATE (arg [0]); 2275 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2276 coro_hv = coro->hv;
2100 2277
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1); 2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2279
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2281 {
2105 /* coro currently busy cancelling something, so just notify it */ 2282 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2283 coro->slf_frame.data = (void *)coro;
2107 2284
2108 frame->prepare = prepare_nop; 2285 frame->prepare = prepare_nop;
… …
2114 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2292 }
2116 else 2293 else
2117 { 2294 {
2118 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2119 2299
2120 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation. 2302 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2304 * besides, I can't get the slow-but-safe version working...
2125 */ 2305 */
2126 slf_frame.data = 0; 2306 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2307 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2308 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2309 self->flags &= ~CF_NOCANCEL;
2133 2310
2134 if (slf_frame.data) 2311 if (slf_frame.data)
2135 { 2312 {
2136 /* while we were busy we have been cancelled, so terminate */ 2313 /* while we were busy we have been cancelled, so terminate */
… …
2161 if (coro->cctx) 2338 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2339 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2340
2164 if (coro->flags & CF_NEW) 2341 if (coro->flags & CF_NEW)
2165 { 2342 {
2166 coro_set_status (aTHX_ coro->hv, arg, items); 2343 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2344 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2345 }
2170 else 2346 else
2171 { 2347 {
2172 if (!coro->slf_frame.prepare) 2348 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2349 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2350
2175 slf_destroy (aTHX_ coro); 2351 slf_destroy (aTHX_ coro);
2176 2352
2177 coro_set_status (aTHX_ coro->hv, arg, items); 2353 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2354 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2355 coro->slf_frame.check = slf_check_safe_cancel;
2180 2356
2181 api_ready (aTHX_ coro->hv); 2357 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2358 }
2183 2359
2184 return 1; 2360 return 1;
2185} 2361}
2186 2362
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2396slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2397{
2222 HV *hv = (HV *)SvRV (coro_current); 2398 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2399 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2400
2225 if (expect_true (coro->saved_deffh)) 2401 if (ecb_expect_true (coro->saved_deffh))
2226 { 2402 {
2227 /* subsequent iteration */ 2403 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2404 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2405 coro->saved_deffh = 0;
2230 2406
… …
2290 2466
2291static int 2467static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2469{
2294 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
2295 2471
2296 if (CORO_THROW) 2472 if (CORO_THROW)
2297 return 0; 2473 return 0;
2298 2474
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2476 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
2338 } 2514 }
2339 2515
2340 if (!SvROK (cb) 2516 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2520
2345 { 2521 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2469 2645
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void 2647static void
2472slf_destroy (pTHX_ struct coro *coro) 2648slf_destroy (pTHX_ struct coro *coro)
2473{ 2649{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2650 struct CoroSLF frame = coro->slf_frame;
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477 2651
2478 /* 2652 /*
2479 * The on_destroy above most likely is from an SLF call. 2653 * The on_destroy below most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2654 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2655 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions. 2656 * cleanup functions cannot call SLF functions.
2483 */ 2657 */
2484 coro->slf_frame.prepare = 0; 2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2485} 2663}
2486 2664
2487/* 2665/*
2488 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2489 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2674 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2675
2498 /* set up the slf frame, unless it has already been set-up */ 2676 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2677 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2678 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2679 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2680 {
2503 /* first iteration */ 2681 /* first iteration */
2504 dSP; 2682 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2683 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2684 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2725 while (slf_frame.check (aTHX_ &slf_frame));
2548 2726
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2727 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2728
2551 /* exception handling */ 2729 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2730 if (ecb_expect_false (CORO_THROW))
2553 { 2731 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2732 SV *exception = sv_2mortal (CORO_THROW);
2555 2733
2556 CORO_THROW = 0; 2734 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2735 sv_setsv (ERRSV, exception);
2558 croak (0); 2736 croak (0);
2559 } 2737 }
2560 2738
2561 /* return value handling - mostly like entersub */ 2739 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2740 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2741 if (GIMME_V == G_SCALAR
2742 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2743 {
2565 dSP; 2744 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2745 SV **bot = PL_stack_base + checkmark;
2567 2746
2568 if (sp == bot) /* too few, push undef */ 2747 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2748 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2749 else /* too many, take last one */
2571 bot [1] = *sp; 2750 bot [1] = *sp;
2572 2751
2573 SP = bot + 1; 2752 SP = bot + 1;
2574 2753
2575 PUTBACK; 2754 PUTBACK;
… …
2673{ 2852{
2674 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2675 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2676} 2855}
2677 2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2947}
2948
2678/*****************************************************************************/ 2949/*****************************************************************************/
2679/* PerlIO::cede */ 2950/* PerlIO::cede */
2680 2951
2681typedef struct 2952typedef struct
2682{ 2953{
2683 PerlIOBuf base; 2954 PerlIOBuf base;
2684 NV next, every; 2955 NV next, every;
2685} PerlIOCede; 2956} PerlIOCede;
2686 2957
2687static IV 2958static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2959PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2960{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2961 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2962
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2963 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2964 self->next = nvtime () + self->every;
2694 2965
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2966 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2967}
2697 2968
2698static SV * 2969static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2970PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2971{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2972 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2973
2703 return newSVnv (self->every); 2974 return newSVnv (self->every);
… …
2810 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2811 PUTBACK; 3082 PUTBACK;
2812 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2813 } 3084 }
2814 3085
2815 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2816 } 3087 }
2817} 3088}
2818 3089
2819static void 3090static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 3092{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3093 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3094 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 3095}
2825 3096
2826static int 3097static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3098slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 3099{
2829 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
3102 SV *coro_hv = SvRV (coro_current);
3103
3104 frame->destroy = 0;
2831 3105
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2834 return 0; 3112 return 0;
3113 }
2835 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2836 { 3115 {
2837 frame->destroy = 0;
2838
2839 if (acquire) 3116 if (acquire)
2840 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2841 else 3118 else
2842 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2843 3120
… …
2847 { 3124 {
2848 int i; 3125 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 3126 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 3127 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 3128 /* this avoids some degenerate memory usage cases */
2852 3129 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 3130 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 3131 return 1;
2856 3132
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3133 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 3134 return 1;
2859 } 3135 }
2860} 3136}
2861 3137
2862static int 3138static int
… …
2955 { 3231 {
2956 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
2957 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
2958 } 3234 }
2959 3235
2960 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
2961 3237
2962 --count; 3238 --count;
2963 } 3239 }
2964} 3240}
2965 3241
… …
3050 } 3326 }
3051 3327
3052 av_push (state, data_sv); 3328 av_push (state, data_sv);
3053 3329
3054 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3055 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3056 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3057} 3333}
3058 3334
3059static int 3335static int
3060slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3061{ 3337{
… …
3066 /* it quickly returns */ 3342 /* it quickly returns */
3067 if (CORO_THROW) 3343 if (CORO_THROW)
3068 return 0; 3344 return 0;
3069 3345
3070 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
3071 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3072 return 1; 3348 return 1;
3073 3349
3074 /* restore status */ 3350 /* restore status */
3075 { 3351 {
3076 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
… …
3079 errno = data->errorno; 3355 errno = data->errorno;
3080 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3081 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3082 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3083 3359
3084 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3085 } 3361 }
3086 3362
3087 /* push result values */ 3363 /* push result values */
3088 { 3364 {
3089 dSP; 3365 dSP;
… …
3115 dSP; 3391 dSP;
3116 3392
3117 static SV *prio_cv; 3393 static SV *prio_cv;
3118 static SV *prio_sv; 3394 static SV *prio_sv;
3119 3395
3120 if (expect_false (!prio_cv)) 3396 if (ecb_expect_false (!prio_cv))
3121 { 3397 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3398 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3399 prio_sv = newSViv (0);
3124 } 3400 }
3125 3401
… …
3231 } 3507 }
3232 3508
3233 return coro_sv; 3509 return coro_sv;
3234} 3510}
3235 3511
3512#ifndef __cplusplus
3513ecb_cold XS(boot_Coro__State);
3514#endif
3515
3516#if CORO_JIT
3517
3518static void ecb_noinline ecb_cold
3519pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3520{
3521 dSP;
3522 AV *av = newAV ();
3523
3524 av_store (av, 3, newSVuv (d));
3525 av_store (av, 2, newSVuv (c));
3526 av_store (av, 1, newSVuv (b));
3527 av_store (av, 0, newSVuv (a));
3528
3529 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3530
3531 PUTBACK;
3532}
3533
3534static void ecb_noinline ecb_cold
3535jit_init (pTHX)
3536{
3537 dSP;
3538 SV *load, *save;
3539 char *map_base;
3540 char *load_ptr, *save_ptr;
3541 STRLEN load_len, save_len, map_len;
3542 int count;
3543
3544 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3545
3546 PUSHMARK (SP);
3547 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3548 #include "state.h"
3549 count = call_pv ("Coro::State::_jit", G_ARRAY);
3550 SPAGAIN;
3551
3552 save = POPs; save_ptr = SvPVbyte (save, save_len);
3553 load = POPs; load_ptr = SvPVbyte (load, load_len);
3554
3555 map_len = load_len + save_len + 16;
3556
3557 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3558
3559 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3560
3561 load_perl_slots = (load_save_perl_slots_type)map_base;
3562 memcpy (map_base, load_ptr, load_len);
3563
3564 map_base += (load_len + 15) & ~15;
3565
3566 save_perl_slots = (load_save_perl_slots_type)map_base;
3567 memcpy (map_base, save_ptr, save_len);
3568
3569 /* we are good citizens and try to make the page read-only, so the evil evil */
3570 /* hackers might have it a bit more difficult */
3571 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3572
3573 PUTBACK;
3574 eval_pv ("undef &Coro::State::_jit", 1);
3575}
3576
3577#endif
3578
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3579MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3580
3238PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3239 3582
3240BOOT: 3583BOOT:
3241{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3242#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3588# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3245# endif 3590# endif
3246#endif 3591#endif
3247 BOOT_PAGESIZE; 3592 /* perl defines these to check for existance first, but why it doesn't */
3593 /* just create them one at init time is not clear to me, except for */
3594 /* programs trying to delete them, but... */
3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3596 DEFSV;
3597 ERRSV;
3248 3598
3249 cctx_current = cctx_new_empty (); 3599 cctx_current = cctx_new_empty ();
3250 3600
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3601 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3602 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3253 3603
3254 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3255 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3256 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3257 3607
3258 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3259 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3260 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3261 3610
3262 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3263 3612
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3644 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3645
3297 time_init (aTHX); 3646 time_init (aTHX);
3298 3647
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3648 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3649#if CORO_JIT
3650 PUTBACK;
3651 jit_init (aTHX);
3652 SPAGAIN;
3653#endif
3300} 3654}
3301 3655
3302SV * 3656SV *
3303new (SV *klass, ...) 3657new (SV *klass, ...)
3304 ALIAS: 3658 ALIAS:
… …
3311void 3665void
3312transfer (...) 3666transfer (...)
3313 PROTOTYPE: $$ 3667 PROTOTYPE: $$
3314 CODE: 3668 CODE:
3315 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3316
3317void
3318_exit (int code)
3319 PROTOTYPE: $
3320 CODE:
3321 _exit (code);
3322 3670
3323SV * 3671SV *
3324clone (Coro::State coro) 3672clone (Coro::State coro)
3325 CODE: 3673 CODE:
3326{ 3674{
… …
3381void 3729void
3382list () 3730list ()
3383 PROTOTYPE: 3731 PROTOTYPE:
3384 PPCODE: 3732 PPCODE:
3385{ 3733{
3386 struct coro *coro; 3734 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3736 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3738}
3391 3739
… …
3446 PROTOTYPE: $ 3794 PROTOTYPE: $
3447 ALIAS: 3795 ALIAS:
3448 is_ready = CF_READY 3796 is_ready = CF_READY
3449 is_running = CF_RUNNING 3797 is_running = CF_RUNNING
3450 is_new = CF_NEW 3798 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3799 is_destroyed = CF_ZOMBIE
3800 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3801 is_suspended = CF_SUSPENDED
3453 CODE: 3802 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3804 OUTPUT:
3456 RETVAL 3805 RETVAL
3457 3806
3458void 3807void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
3461 CODE: 3810 CODE:
3462{ 3811{
3812 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3815 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3816 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
3468} 3820}
3469 3821
3470void 3822void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
… …
3549 3901
3550void 3902void
3551times (Coro::State self) 3903times (Coro::State self)
3552 PPCODE: 3904 PPCODE:
3553{ 3905{
3554 struct coro *current = SvSTATE (coro_current); 3906 struct coro *current = SvSTATE (coro_current);
3555 3907
3556 if (expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3557 { 3909 {
3558 coro_times_update (); 3910 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3911 coro_times_add (SvSTATE (coro_current));
3560 } 3912 }
3561 3913
3562 EXTEND (SP, 2); 3914 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3915 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3916 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3917
3566 if (expect_false (current == self)) 3918 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3919 coro_times_sub (SvSTATE (coro_current));
3568} 3920}
3569 3921
3570void 3922void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3923swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3589 3941
3590MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3591 3943
3592BOOT: 3944BOOT:
3593{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3597 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3602 3957
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3962
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3964
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3967 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3624 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3625 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3626 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3627 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3628 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3629 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3630 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3631 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3632 } 3991 }
3633} 3992}
… …
3644void 4003void
3645_destroy (Coro::State coro) 4004_destroy (Coro::State coro)
3646 CODE: 4005 CODE:
3647 /* used by the manager thread */ 4006 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 4007 coro_state_destroy (aTHX_ coro);
4008
4009void
4010on_destroy (Coro::State coro, SV *cb)
4011 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 4012 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4013
4014void
4015join (...)
4016 CODE:
4017 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 4018
3651void 4019void
3652terminate (...) 4020terminate (...)
3653 CODE: 4021 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4022 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3689 4057
3690void 4058void
3691_set_current (SV *current) 4059_set_current (SV *current)
3692 PROTOTYPE: $ 4060 PROTOTYPE: $
3693 CODE: 4061 CODE:
3694 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3695 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3696 4064
3697void 4065void
3698_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3699 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
3783 4151
3784 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3785 { 4153 {
3786 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
3789 } 4157 }
3790 4158
3791 { 4159 {
3792 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
3793 4161
… …
3800 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
3801 4169
3802 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
3803 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3804 else 4172 else
3805 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
3806} 4174}
3807 4175
3808SV * 4176SV *
3809rouse_cb () 4177rouse_cb ()
3810 PROTOTYPE: 4178 PROTOTYPE:
… …
3825 on_leave = 1 4193 on_leave = 1
3826 PROTOTYPE: & 4194 PROTOTYPE: &
3827 CODE: 4195 CODE:
3828{ 4196{
3829 struct coro *coro = SvSTATE_current; 4197 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4199
3832 block = s_get_cv_croak (block); 4200 block = s_get_cv_croak (block);
3833 4201
3834 if (!*avp) 4202 if (!*avp)
3835 *avp = newAV (); 4203 *avp = newAV ();
… …
3855 4223
3856SV * 4224SV *
3857new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
3858 CODE: 4226 CODE:
3859{ 4227{
3860 int semcnt = 1; 4228 int semcnt = 1;
3861 4229
3862 if (count) 4230 if (count)
3863 { 4231 {
3864 SvGETMAGIC (count); 4232 SvGETMAGIC (count);
3865 4233
… …
3889 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4257 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3890 OUTPUT: 4258 OUTPUT:
3891 RETVAL 4259 RETVAL
3892 4260
3893void 4261void
3894up (SV *self, int adjust = 1) 4262up (SV *self)
3895 ALIAS:
3896 adjust = 1
3897 CODE: 4263 CODE:
4264 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4265
4266void
4267adjust (SV *self, int adjust)
4268 CODE:
3898 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4269 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3899 4270
3900void 4271void
3901down (...) 4272down (...)
3902 CODE: 4273 CODE:
3903 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4274 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3925 XSRETURN_NO; 4296 XSRETURN_NO;
3926} 4297}
3927 4298
3928void 4299void
3929waiters (SV *self) 4300waiters (SV *self)
3930 PPCODE: 4301 PPCODE:
3931{ 4302{
3932 AV *av = (AV *)SvRV (self); 4303 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4304 int wcount = AvFILLp (av) + 1 - 1;
3934 4305
3935 if (GIMME_V == G_SCALAR) 4306 if (GIMME_V == G_SCALAR)
… …
3944} 4315}
3945 4316
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4317MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4318
3948void 4319void
3949_may_delete (SV *sem, int count, int extra_refs) 4320_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4321 PPCODE:
3951{ 4322{
3952 AV *av = (AV *)SvRV (sem); 4323 AV *av = (AV *)SvRV (sem);
3953 4324
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4325 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4326 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4327 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4328 XSRETURN_YES;
… …
3978 4349
3979void 4350void
3980broadcast (SV *self) 4351broadcast (SV *self)
3981 CODE: 4352 CODE:
3982{ 4353{
3983 AV *av = (AV *)SvRV (self); 4354 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4355 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4356}
3986 4357
3987void 4358void
3988send (SV *self) 4359send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4367 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4368}
3998 4369
3999IV 4370IV
4000awaited (SV *self) 4371awaited (SV *self)
4001 CODE: 4372 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4373 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4374 OUTPUT:
4004 RETVAL 4375 RETVAL
4005 4376
4006 4377
… …
4011 4382
4012void 4383void
4013_schedule (...) 4384_schedule (...)
4014 CODE: 4385 CODE:
4015{ 4386{
4016 static int incede; 4387 static int incede;
4017 4388
4018 api_cede_notself (aTHX); 4389 api_cede_notself (aTHX);
4019 4390
4020 ++incede; 4391 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4392 while (coro_nready >= incede && api_cede (aTHX))
… …
4065 { 4436 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4437 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0; 4438 coro_old_pp_sselect = 0;
4068 } 4439 }
4069 4440
4441MODULE = Coro::State PACKAGE = Coro::Util
4442
4443void
4444_exit (int code)
4445 CODE:
4446 _exit (code);
4447
4448NV
4449time ()
4450 CODE:
4451 RETVAL = nvtime (aTHX);
4452 OUTPUT:
4453 RETVAL
4454
4455NV
4456gettimeofday ()
4457 PPCODE:
4458{
4459 UV tv [2];
4460 u2time (aTHX_ tv);
4461 EXTEND (SP, 2);
4462 PUSHs (sv_2mortal (newSVuv (tv [0])));
4463 PUSHs (sv_2mortal (newSVuv (tv [1])));
4464}
4465

Diff Legend

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