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.470 by root, Fri Jul 14 13:14:32 2017 UTC

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

Diff Legend

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