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.316 by root, Thu Nov 20 06:01:40 2008 UTC vs.
Revision 1.473 by root, Sun Sep 3 23:36:01 2017 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 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
35#ifndef SVs_PADSTALE
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
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
18# undef setjmp 70# undef setjmp
19# undef longjmp 71# undef longjmp
20# undef _exit 72# undef _exit
21# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
22#else 74#else
23# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
24#endif 76#endif
25 77
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
55 80
56#define PERL_VERSION_ATLEAST(a,b,c) \ 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 82# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD
114#endif
115
116#ifndef CORO_STACKGUARD
117# define CORO_STACKGUARD 0
118#endif 83#endif
119 84
120/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
121#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
122# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
130#else 95#else
131# define dSTACKLEVEL volatile void *stacklevel 96# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
133#endif 98#endif
134 99
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 100#define IN_DESTRUCT PL_dirty
136
137#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value))
140# define INLINE static inline
141#else
142# define attribute(x)
143# define expect(expr,value) (expr)
144# define INLINE static
145#endif
146
147#define expect_false(expr) expect ((expr) != 0, 0)
148#define expect_true(expr) expect ((expr) != 0, 1)
149
150#define NOINLINE attribute ((noinline))
151 101
152#include "CoroAPI.h" 102#include "CoroAPI.h"
153#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
154 104
155#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
156# if CORO_PTHREAD 106# if CORO_PTHREAD
157static void *coro_thx; 107static void *coro_thx;
158# endif 108# endif
159#endif 109#endif
160 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
161static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
140static void (*u2time)(pTHX_ UV ret[2]);
162 141
163/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 144static OP *pp_slf (pTHX);
145static void slf_destroy (pTHX_ struct coro *coro);
166 146
167static U32 cctx_gen; 147static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 148static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 149static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 150static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 151static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 152static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 153static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 154
155static AV *av_destroy; /* destruction queue */
156static SV *sv_manager; /* the manager coro */
157static SV *sv_idle; /* $Coro::idle */
158
175static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 161static SV *rv_diehook;
178static SV *rv_warnhook; 162static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */
180 163
181/* async_pool helper stuff */ 164/* async_pool helper stuff */
182static SV *sv_pool_rss; 165static SV *sv_pool_rss;
183static SV *sv_pool_size; 166static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 167static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 168static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 169static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 170static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 171
190/* Coro::AnyEvent */ 172/* Coro::AnyEvent */
191static SV *sv_activity; 173static SV *sv_activity;
192 174
175/* enable processtime/realtime profiling */
176static char enable_times;
177typedef U32 coro_ts[2];
178static coro_ts time_real, time_cpu;
179static char times_valid;
180
193static struct coro_cctx *cctx_first; 181static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 182static int cctx_count, cctx_idle;
195 183
196enum { 184enum
185{
197 CC_MAPPED = 0x01, 186 CC_MAPPED = 0x01,
198 CC_NOREUSE = 0x02, /* throw this away after tracing */ 187 CC_NOREUSE = 0x02, /* throw this away after tracing */
199 CC_TRACE = 0x04, 188 CC_TRACE = 0x04,
200 CC_TRACE_SUB = 0x08, /* trace sub calls */ 189 CC_TRACE_SUB = 0x08, /* trace sub calls */
201 CC_TRACE_LINE = 0x10, /* trace each statement */ 190 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
206typedef struct coro_cctx 195typedef struct coro_cctx
207{ 196{
208 struct coro_cctx *next; 197 struct coro_cctx *next;
209 198
210 /* the stack */ 199 /* the stack */
211 void *sptr; 200 struct coro_stack stack;
212 size_t ssize;
213 201
214 /* cpu state */ 202 /* cpu state */
215 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204#ifndef NDEBUG
216 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 205 JMPENV *idle_te; /* same as idle_sp, but for top_env */
206#endif
217 JMPENV *top_env; 207 JMPENV *top_env;
218 coro_context cctx; 208 coro_context cctx;
219 209
220 U32 gen; 210 U32 gen;
221#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
222 int valgrind_id; 212 int valgrind_id;
223#endif 213#endif
224 unsigned char flags; 214 unsigned char flags;
225} coro_cctx; 215} coro_cctx;
226 216
217static coro_cctx *cctx_current; /* the currently running cctx */
218
219/*****************************************************************************/
220
221static MGVTBL coro_state_vtbl;
222
227enum { 223enum
224{
228 CF_RUNNING = 0x0001, /* coroutine is running */ 225 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 226 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 227 CF_NEW = 0x0004, /* has never been switched to */
231 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 228 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
229 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
230 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
232}; 231};
233 232
234/* the structure where most of the perl state is stored, overlaid on the cxstack */ 233/* the structure where most of the perl state is stored, overlaid on the cxstack */
235typedef struct 234typedef struct
236{ 235{
237 SV *defsv;
238 AV *defav;
239 SV *errsv;
240 SV *irsgv;
241#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
242# include "state.h" 237 #include "state.h"
243#undef VAR
244} perl_slots; 238} perl_slots;
245 239
240/* how many context stack entries do we need for perl_slots */
246#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 241#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
247 242
248/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
249struct coro { 244struct coro
245{
250 /* the C coroutine allocated to this perl coroutine, if any */ 246 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 247 coro_cctx *cctx;
248
249 /* ready queue */
250 struct coro *next_ready;
252 251
253 /* state data */ 252 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 253 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 254 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 255 perl_slots *slot; /* basically the saved sp */
257 256
258 CV *startcv; /* the CV to execute */ 257 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 258 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 259 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 260 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro);
264 261
265 /* statistics */ 262 /* statistics */
266 int usecount; /* number of transfers to this coro */ 263 int usecount; /* number of transfers to this coro */
267 264
268 /* coro process data */ 265 /* coro process data */
269 int prio; 266 int prio;
270 SV *except; /* exception to be thrown */ 267 SV *except; /* exception to be thrown */
271 SV *rouse_cb; 268 SV *rouse_cb; /* last rouse callback */
269 AV *on_destroy; /* callbacks or coros to notify on destroy */
270 AV *status; /* the exit status list */
272 271
273 /* async_pool */ 272 /* async_pool */
274 SV *saved_deffh; 273 SV *saved_deffh;
275 SV *invoke_cb; 274 SV *invoke_cb;
276 AV *invoke_av; 275 AV *invoke_av;
277 276
277 /* on_enter/on_leave */
278 AV *on_enter; AV *on_enter_xs;
279 AV *on_leave; AV *on_leave_xs;
280
281 /* swap_sv */
282 AV *swap_sv;
283
284 /* times */
285 coro_ts t_cpu, t_real;
286
278 /* linked list */ 287 /* linked list */
279 struct coro *next, *prev; 288 struct coro *next, *prev;
280}; 289};
281 290
282typedef struct coro *Coro__State; 291typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 292typedef struct coro *Coro__State_or_hashref;
284 293
285/* the following variables are effectively part of the perl context */ 294/* the following variables are effectively part of the perl context */
286/* and get copied between struct coro and these variables */ 295/* and get copied between struct coro and these variables */
287/* the mainr easonw e don't support windows process emulation */ 296/* the main reason we don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 297static struct CoroSLF slf_frame; /* the current slf frame */
289 298
290/** Coro ********************************************************************/ 299/** Coro ********************************************************************/
291 300
292#define PRIO_MAX 3 301#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 302#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 303#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 304#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 305#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 306#define CORO_PRIO_MIN -4
298 307
299/* for Coro.pm */ 308/* for Coro.pm */
300static SV *coro_current; 309static SV *coro_current;
301static SV *coro_readyhook; 310static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 311static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 312static CV *cv_coro_run;
304static struct coro *coro_first; 313static struct coro *coro_first;
305#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
306 315
316/** JIT *********************************************************************/
317
318#if CORO_JIT
319 /* APPLE doesn't have mmap though */
320 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
321 #ifndef CORO_JIT_TYPE
322 #if ECB_AMD64 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "amd64-unix"
324 #elif __i386 && CORO_JIT_UNIXY
325 #define CORO_JIT_TYPE "x86-unix"
326 #endif
327 #endif
328#endif
329
330#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
331 #undef CORO_JIT
332#endif
333
334#if CORO_JIT
335 typedef void (*load_save_perl_slots_type)(perl_slots *);
336 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
337#endif
338
339/** Coro::Select ************************************************************/
340
341static OP *(*coro_old_pp_sselect) (pTHX);
342static SV *coro_select_select;
343
344/* horrible hack, but if it works... */
345static OP *
346coro_pp_sselect (pTHX)
347{
348 dSP;
349 PUSHMARK (SP - 4); /* fake argument list */
350 XPUSHs (coro_select_select);
351 PUTBACK;
352
353 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
354 PL_op->op_flags |= OPf_STACKED;
355 PL_op->op_private = 0;
356 return PL_ppaddr [OP_ENTERSUB](aTHX);
357}
358
359/** time stuff **************************************************************/
360
361#ifdef HAS_GETTIMEOFDAY
362
363ecb_inline void
364coro_u2time (pTHX_ UV ret[2])
365{
366 struct timeval tv;
367 gettimeofday (&tv, 0);
368
369 ret [0] = tv.tv_sec;
370 ret [1] = tv.tv_usec;
371}
372
373ecb_inline double
374coro_nvtime (void)
375{
376 struct timeval tv;
377 gettimeofday (&tv, 0);
378
379 return tv.tv_sec + tv.tv_usec * 1e-6;
380}
381
382ecb_inline void
383time_init (pTHX)
384{
385 nvtime = coro_nvtime;
386 u2time = coro_u2time;
387}
388
389#else
390
391ecb_inline void
392time_init (pTHX)
393{
394 SV **svp;
395
396 require_pv ("Time/HiRes.pm");
397
398 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
399
400 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
401 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
402
403 nvtime = INT2PTR (double (*)(), SvIV (*svp));
404
405 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
406 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
407}
408
409#endif
410
307/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
308 412
309static SV * 413static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
311{ 415{
312#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 417 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 418 get_sv (name, create);
315#endif 419#endif
316 return get_sv (name, create); 420 return get_sv (name, create);
317} 421}
318 422
319static AV * 423static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
321{ 425{
322#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 427 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 428 get_av (name, create);
325#endif 429#endif
326 return get_av (name, create); 430 return get_av (name, create);
327} 431}
328 432
329static HV * 433static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
331{ 435{
332#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 437 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 438 get_hv (name, create);
335#endif 439#endif
336 return get_hv (name, create); 440 return get_hv (name, create);
337} 441}
338 442
339/* may croak */ 443ecb_inline void
340INLINE CV * 444coro_times_update (void)
341coro_sv_2cv (pTHX_ SV *sv)
342{ 445{
343 HV *st; 446#ifdef coro_clock_gettime
344 GV *gvp; 447 struct timespec ts;
345 return sv_2cv (sv, &st, &gvp, 0);
346}
347 448
348static AV * 449 ts.tv_sec = ts.tv_nsec = 0;
450 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
451 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
452
453 ts.tv_sec = ts.tv_nsec = 0;
454 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
455 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
456#else
457 dTHX;
458 UV tv[2];
459
460 u2time (aTHX_ tv);
461 time_real [0] = tv [0];
462 time_real [1] = tv [1] * 1000;
463#endif
464}
465
466ecb_inline void
467coro_times_add (struct coro *c)
468{
469 c->t_real [1] += time_real [1];
470 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
471 c->t_real [0] += time_real [0];
472
473 c->t_cpu [1] += time_cpu [1];
474 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
475 c->t_cpu [0] += time_cpu [0];
476}
477
478ecb_inline void
479coro_times_sub (struct coro *c)
480{
481 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
482 c->t_real [1] -= time_real [1];
483 c->t_real [0] -= time_real [0];
484
485 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
486 c->t_cpu [1] -= time_cpu [1];
487 c->t_cpu [0] -= time_cpu [0];
488}
489
490/*****************************************************************************/
491/* magic glue */
492
493#define CORO_MAGIC_type_cv 26
494#define CORO_MAGIC_type_state PERL_MAGIC_ext
495
496#define CORO_MAGIC_NN(sv, type) \
497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
498 ? SvMAGIC (sv) \
499 : mg_find (sv, type))
500
501#define CORO_MAGIC(sv, type) \
502 (ecb_expect_true (SvMAGIC (sv)) \
503 ? CORO_MAGIC_NN (sv, type) \
504 : 0)
505
506#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
507#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
508
509ecb_inline MAGIC *
510SvSTATEhv_p (pTHX_ SV *coro)
511{
512 MAGIC *mg;
513
514 if (ecb_expect_true (
515 SvTYPE (coro) == SVt_PVHV
516 && (mg = CORO_MAGIC_state (coro))
517 && mg->mg_virtual == &coro_state_vtbl
518 ))
519 return mg;
520
521 return 0;
522}
523
524ecb_inline struct coro *
525SvSTATE_ (pTHX_ SV *coro_sv)
526{
527 MAGIC *mg;
528
529 if (SvROK (coro_sv))
530 coro_sv = SvRV (coro_sv);
531
532 mg = SvSTATEhv_p (aTHX_ coro_sv);
533 if (!mg)
534 croak ("Coro::State object required");
535
536 return (struct coro *)mg->mg_ptr;
537}
538
539#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
540
541/* faster than SvSTATE, but expects a coroutine hv */
542#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
544
545/*****************************************************************************/
546/* padlist management and caching */
547
548ecb_inline PADLIST *
349coro_clone_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
350{ 550{
351 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
353 556
354 newpadlist = newAV (); 557#if NEWPADAPI
558
559 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
560 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
561 while (!PadlistARRAY (padlist)[off - 1])
562 --off;
563
564 Perl_pad_push (aTHX_ padlist, off);
565
566 newpad = PadlistARRAY (padlist)[off];
567 PadlistARRAY (padlist)[off] = 0;
568
569#else
570
571#if PERL_VERSION_ATLEAST (5,10,0)
572 Perl_pad_push (aTHX_ padlist, off);
573#else
574 Perl_pad_push (aTHX_ padlist, off, 1);
575#endif
576
577 newpad = PadlistARRAY (padlist)[off];
578 PadlistMAX (padlist) = off - 1;
579
580#endif
581
582 newPADLIST (newpadlist);
583#if !PERL_VERSION_ATLEAST(5,15,3)
584 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
355 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
356#if PERL_VERSION_ATLEAST (5,10,0)
357 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
358#else
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 586#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist);
363 587
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 588 /* Already extended to 2 elements by newPADLIST. */
365 av_store (newpadlist, 1, (SV *)newpad); 589 PadlistMAX (newpadlist) = 1;
590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
595 PadlistARRAY (newpadlist)[1] = newpad;
366 596
367 return newpadlist; 597 return newpadlist;
368} 598}
369 599
370static void 600ecb_inline void
371free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
372{ 602{
373 /* may be during global destruction */ 603 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 604 if (!IN_DESTRUCT)
375 { 605 {
376 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
377 while (i >= 0) 607
608 while (i > 0) /* special-case index 0 */
378 { 609 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 610 /* we try to be extra-careful here */
611 PAD *pad = PadlistARRAY (padlist)[i--];
612
380 if (svp) 613 if (pad)
381 { 614 {
382 SV *sv; 615 I32 j = PadMAX (pad);
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 616
617 while (j >= 0)
384 SvREFCNT_dec (sv); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
385 619
620 PadMAX (pad) = -1;
386 SvREFCNT_dec (*svp); 621 SvREFCNT_dec (pad);
387 } 622 }
388 } 623 }
389 624
625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
390 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
391 } 635 }
392} 636}
393 637
394static int 638static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 640{
397 AV *padlist; 641 PADLIST *padlist;
398 AV *av = (AV *)mg->mg_obj; 642 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
643 size_t len = *(size_t *)mg->mg_ptr;
399 644
400 /* casting is fun. */ 645 /* perl manages to free our internal AV and _then_ call us */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 646 if (IN_DESTRUCT)
647 return 0;
648
649 while (len--)
402 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
403
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 651
406 return 0; 652 return 0;
407} 653}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 654
412static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 656 0, 0, 0, 0,
414 coro_cv_free 657 coro_cv_free
415}; 658};
416 659
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459
460/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
461static void 661ecb_inline void
462get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
463{ 663{
464 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
465 AV *av; 665 size_t *lenp;
466 666
467 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
468 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
469 else 669 else
470 { 670 {
471#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
472 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
473 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
474 CV *cp = Perl_cv_clone (aTHX_ cv); 674 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 675 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 676 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 677 SvREFCNT_dec (cp);
478#else 678#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 680#endif
481 } 681 }
482} 682}
483 683
484static void 684ecb_inline void
485put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
486{ 686{
487 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
488 AV *av;
489 688
490 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
491 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 691 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
692 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
693 mg->mg_len = 1; /* so mg_free frees mg_ptr */
694 }
695 else
696 Renew (mg->mg_ptr,
697 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
698 char);
492 699
493 av = (AV *)mg->mg_obj; 700 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
494
495 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1);
497
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 701}
500 702
501/** load & save, init *******************************************************/ 703/** load & save, init *******************************************************/
704
705ecb_inline void
706swap_sv (SV *a, SV *b)
707{
708 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
709 SV tmp;
710
711 /* swap sv_any */
712 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
713
714 /* swap sv_flags */
715 SvFLAGS (&tmp) = SvFLAGS (a);
716 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
717 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
718
719#if PERL_VERSION_ATLEAST (5,10,0)
720 /* perl 5.10 and later complicates this _quite_ a bit, but it also
721 * is much faster, so no quarrels here. alternatively, we could
722 * sv_upgrade to avoid this.
723 */
724 {
725 /* swap sv_u */
726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
727
728 /* if SvANY points to the head, we need to adjust the pointers,
729 * as the pointer for a still points to b, and maybe vice versa.
730 */
731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
737
738 if (svany_in_head (SvTYPE (a)))
739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
740
741 if (svany_in_head (SvTYPE (b)))
742 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
743 }
744#endif
745}
746
747/* swap sv heads, at least logically */
748static void
749swap_svs_enter (pTHX_ Coro__State c)
750{
751 int i;
752
753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
755}
756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
766#define SWAP_SVS_ENTER(coro) \
767 if (ecb_expect_false ((coro)->swap_sv)) \
768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
773
774static void
775on_enterleave_call (pTHX_ SV *cb);
502 776
503static void 777static void
504load_perl (pTHX_ Coro__State c) 778load_perl (pTHX_ Coro__State c)
505{ 779{
506 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
507 c->slot = 0; 781 c->slot = 0;
508 782
509 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
510 784
511 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
512 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
513 GvSV (PL_errgv) = slot->errsv; 787#else
514 GvSV (irsgv) = slot->irsgv;
515
516 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
517 # include "state.h" 789 #include "state.h"
518 #undef VAR 790#endif
519 791
520 { 792 {
521 dSP; 793 dSP;
522 794
523 CV *cv; 795 CV *cv;
524 796
525 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
526 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
527 { 799 {
528 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
529 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
530 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
531 } 803 }
532 804
533 PUTBACK; 805 PUTBACK;
534 } 806 }
535 807
536 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 809 CORO_THROW = c->except;
810
811 if (ecb_expect_false (enable_times))
812 {
813 if (ecb_expect_false (!times_valid))
814 coro_times_update ();
815
816 coro_times_sub (c);
817 }
818
819 if (ecb_expect_false (c->on_enter))
820 {
821 int i;
822
823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
825 }
826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
835 SWAP_SVS_ENTER (c);
538} 836}
539 837
540static void 838static void
541save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
542{ 840{
841 SWAP_SVS_LEAVE (c);
842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
850
851 if (ecb_expect_false (c->on_leave))
852 {
853 int i;
854
855 for (i = AvFILLp (c->on_leave); i >= 0; --i)
856 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
857 }
858
859 times_valid = 0;
860
861 if (ecb_expect_false (enable_times))
862 {
863 coro_times_update (); times_valid = 1;
864 coro_times_add (c);
865 }
866
543 c->except = CORO_THROW; 867 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 868 c->slf_frame = slf_frame;
545 869
546 { 870 {
547 dSP; 871 dSP;
… …
556 880
557 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
558 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
559 for (;;) 883 for (;;)
560 { 884 {
561 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
562 { 886 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
564 888
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 889 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 890 {
567 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
568 892
569 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
570 { 894 {
571 EXTEND (SP, 3); 895 EXTEND (SP, 3);
572 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
573 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
574 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
… …
577 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
578 } 902 }
579 } 903 }
580 } 904 }
581 905
582 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
583 break; 907 break;
584 908
585 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
586 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
587 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
… …
589 913
590 PUTBACK; 914 PUTBACK;
591 } 915 }
592 916
593 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
594 /* we manually unroll here, as usually 2 slots is enough */ 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
595 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC;
598 { 919 {
599 int i; 920 unsigned int i;
921
600 for (i = 3; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
601 CXINC; 923 CXINC;
602 } 924
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 925 cxstack_ix -= SLOT_COUNT; /* undo allocation */
926 }
604 927
605 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
606 929
607 { 930 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 932
610 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
611 slot->defsv = DEFSV; 934 save_perl_slots (slot);
612 slot->errsv = ERRSV; 935#else
613 slot->irsgv = GvSV (irsgv);
614
615 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
616 # include "state.h" 937 #include "state.h"
617 #undef VAR 938#endif
618 } 939 }
619} 940}
620 941
621/* 942/*
622 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
… …
628# define coro_init_stacks(thx) init_stacks () 949# define coro_init_stacks(thx) init_stacks ()
629#else 950#else
630static void 951static void
631coro_init_stacks (pTHX) 952coro_init_stacks (pTHX)
632{ 953{
633 PL_curstackinfo = new_stackinfo(32, 8); 954 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
634 PL_curstackinfo->si_type = PERLSI_MAIN; 955 PL_curstackinfo->si_type = PERLSI_MAIN;
635 PL_curstack = PL_curstackinfo->si_stack; 956 PL_curstack = PL_curstackinfo->si_stack;
636 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 957 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
637 958
638 PL_stack_base = AvARRAY(PL_curstack); 959 PL_stack_base = AvARRAY(PL_curstack);
… …
653#endif 974#endif
654 975
655 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
656 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
657 PL_scopestack_max = 8; 978 PL_scopestack_max = 8;
979#if HAS_SCOPESTACK_NAME
980 New(54,PL_scopestack_name,8,const char*);
981#endif
658 982
659 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
660 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
661 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
662 991
663#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
664 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
665 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
666 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
690 } 1019 }
691 1020
692 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
693 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
694 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
695 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
696#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
697 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
698#endif 1030#endif
699} 1031}
… …
729 } 1061 }
730 1062
731 return rss; 1063 return rss;
732} 1064}
733 1065
734/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
735
736static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
737static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
738static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
739 1067
740/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
741#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
742#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
743 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
744 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
745#endif 1073#endif
746 1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
1102
747/* 1103/*
748 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
749 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1105 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
750 * and instead of tryign to save and restore the hash elements, we just provide 1106 * and instead of trying to save and restore the hash elements (extremely slow),
751 * readback here. 1107 * we just provide our own readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 1108 */
756static int 1109static int ecb_cold
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 1111{
759 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
760 1115
761 if (*s == '_') 1116 SV *ssv;
762 {
763 SV **svp = 0;
764 1117
765 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
766 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
767
768 if (svp) 1118 if (!*svp)
769 { 1119 ssv = &PL_sv_undef;
770 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
771 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
772 } 1122 else
773 } 1123 ssv = *svp;
774 1124
775 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
776} 1127}
777 1128
778static int 1129static int ecb_cold
779coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
780{ 1131{
781 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
782 1135
783 if (*s == '_')
784 {
785 SV **svp = 0;
786
787 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
788 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
789
790 if (svp)
791 {
792 SV *old = *svp; 1136 SV *old = *svp;
793 *svp = 0; 1137 *svp = 0;
794 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
795 return 0; 1139 return 0;
796 }
797 }
798
799 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
800} 1140}
801 1141
802static int 1142static int ecb_cold
803coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
804{ 1144{
805 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
806 1148
807 if (*s == '_')
808 {
809 SV **svp = 0;
810
811 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813
814 if (svp)
815 {
816 SV *old = *svp; 1149 SV *old = *svp;
817 *svp = newSVsv (sv); 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
819 return 0; 1152 return 0;
820 }
821 }
822
823 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
824} 1153}
825 1154
826static void 1155static void
827prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
828{ 1157{
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1163slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1164{
836 return 0; 1165 return 0;
837} 1166}
838 1167
839static UNOP coro_setup_op; 1168static int
1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1170{
1171 return 1;
1172}
840 1173
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1174/** coroutine stack handling ************************************************/
1175
1176static UNOP init_perl_op;
1177
1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
843{ 1180{
844 /* 1181 /*
845 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
846 */ 1183 */
847 coro_init_stacks (aTHX); 1184 coro_init_stacks (aTHX);
848 1185
849 PL_runops = RUNOPS_DEFAULT; 1186 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1187 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1188 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1189 PL_comppad = 0;
1190 PL_comppad_name = 0;
1191 PL_comppad_name_fill = 0;
1192 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1193 PL_curpm = 0;
854 PL_curpad = 0; 1194 PL_curpad = 0;
855 PL_localizing = 0; 1195 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1196 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1197#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1198 PL_parser = 0;
860#endif 1199#endif
1200 PL_hints = 0;
861 1201
862 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
865 1205
866 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
870 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1216
873 { 1217 {
874 dSP; 1218 dSP;
… …
878 myop.op_next = Nullop; 1222 myop.op_next = Nullop;
879 myop.op_type = OP_ENTERSUB; 1223 myop.op_type = OP_ENTERSUB;
880 myop.op_flags = OPf_WANT_VOID; 1224 myop.op_flags = OPf_WANT_VOID;
881 1225
882 PUSHMARK (SP); 1226 PUSHMARK (SP);
883 PUSHs ((SV *)coro->startcv); 1227 XPUSHs ((SV *)coro->startcv);
884 PUTBACK; 1228 PUTBACK;
885 PL_op = (OP *)&myop; 1229 PL_op = (OP *)&myop;
886 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1230 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
887 } 1231 }
888 1232
889 /* this newly created coroutine might be run on an existing cctx which most 1233 /* this newly created coroutine might be run on an existing cctx which most
890 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1234 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
891 */ 1235 */
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1236 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1237 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1238 slf_frame.destroy = 0;
894 1239
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1240 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
896 coro_setup_op.op_next = PL_op; 1241 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1242 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1243 init_perl_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 1244 /* no flags etc. required, as an init function won't be called */
900 1245
901 PL_op = (OP *)&coro_setup_op; 1246 PL_op = (OP *)&init_perl_op;
902 1247
903 /* copy throw, in case it was set before coro_setup */ 1248 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
905}
906 1250
1251 SWAP_SVS_ENTER (coro);
1252
1253 if (ecb_expect_false (enable_times))
1254 {
1255 coro_times_update ();
1256 coro_times_sub (coro);
1257 }
1258}
1259
907static void 1260static void
908coro_destruct (pTHX_ struct coro *coro) 1261coro_unwind_stacks (pTHX)
909{ 1262{
910 if (!IN_DESTRUCT) 1263 if (!IN_DESTRUCT)
911 { 1264 {
912 /* restore all saved variables and stuff */ 1265 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1266 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1274 POPSTACK_TO (PL_mainstack);
922 1275
923 /* unwind main stack */ 1276 /* unwind main stack */
924 dounwind (-1); 1277 dounwind (-1);
925 } 1278 }
1279}
926 1280
927 SvREFCNT_dec (GvSV (PL_defgv)); 1281static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1282destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1283{
930 SvREFCNT_dec (PL_defoutgv); 1284 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1285
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1286 {
1287 SV *old_current = SvRV (coro_current);
1288 struct coro *current = SvSTATE (old_current);
1289
1290 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1291
1292 save_perl (aTHX_ current);
1293
1294 /* this will cause transfer_check to croak on block*/
1295 SvRV_set (coro_current, (SV *)coro->hv);
1296
1297 load_perl (aTHX_ coro);
1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1302 coro_unwind_stacks (aTHX);
1303
1304 coro_destruct_stacks (aTHX);
1305
1306 /* now save some sv's to be free'd later */
1307 svf [0] = GvSV (PL_defgv);
1308 svf [1] = (SV *)GvAV (PL_defgv);
1309 svf [2] = GvSV (PL_errgv);
1310 svf [3] = (SV *)PL_defoutgv;
1311 svf [4] = PL_rs;
1312 svf [5] = GvSV (irsgv);
1313 svf [6] = (SV *)GvHV (PL_hintgv);
1314 svf [7] = PL_diehook;
1315 svf [8] = PL_warnhook;
1316 assert (9 == sizeof (svf) / sizeof (*svf));
1317
1318 SvRV_set (coro_current, old_current);
1319
1320 load_perl (aTHX_ current);
1321 }
1322
1323 {
1324 unsigned int i;
1325
1326 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1327 SvREFCNT_dec (svf [i]);
1328
937 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
941 1333 SvREFCNT_dec (coro->on_enter_xs);
942 coro_destruct_stacks (aTHX); 1334 SvREFCNT_dec (coro->on_leave_xs);
1335 }
943} 1336}
944 1337
945INLINE void 1338ecb_inline void
946free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
947{ 1340{
948 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
949 { 1342 {
950 SvREFCNT_dec (coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
951 coro_mortal = 0; 1344 coro_mortal = 0;
952 } 1345 }
953} 1346}
954 1347
955static int 1348static int
956runops_trace (pTHX) 1349runops_trace (pTHX)
957{ 1350{
958 COP *oldcop = 0; 1351 COP *oldcop = 0;
959 int oldcxix = -2; 1352 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1353
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1354 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1355 {
965 PERL_ASYNC_CHECK (); 1356 PERL_ASYNC_CHECK ();
966 1357
967 if (cctx->flags & CC_TRACE_ALL) 1358 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1359 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1360 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1361 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1362 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1363 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1364 AV *av = newAV (); /* return values */
974 SV **cb; 1365 SV **cb;
… …
989 av_push (av, SvREFCNT_inc_NN (*bot++)); 1380 av_push (av, SvREFCNT_inc_NN (*bot++));
990 1381
991 PL_runops = RUNOPS_DEFAULT; 1382 PL_runops = RUNOPS_DEFAULT;
992 ENTER; 1383 ENTER;
993 SAVETMPS; 1384 SAVETMPS;
1385 PUSHMARK (SP);
994 EXTEND (SP, 3); 1386 EXTEND (SP, 3);
995 PUSHMARK (SP);
996 PUSHs (&PL_sv_no); 1387 PUSHs (&PL_sv_no);
997 PUSHs (fullname); 1388 PUSHs (fullname);
998 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1389 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
999 PUTBACK; 1390 PUTBACK;
1000 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1391 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
… …
1011 1402
1012 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1013 { 1404 {
1014 SV **cb; 1405 SV **cb;
1015 1406
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1017 { 1408 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1410
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1412 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1413 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1414 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1415 SV *fullname = sv_2mortal (newSV (0));
1026 1416
1027 if (isGV (gv)) 1417 if (isGV (gv))
1028 gv_efullname3 (fullname, gv, 0); 1418 gv_efullname3 (fullname, gv, 0);
1029 1419
1030 PL_runops = RUNOPS_DEFAULT; 1420 PL_runops = RUNOPS_DEFAULT;
1031 ENTER; 1421 ENTER;
1032 SAVETMPS; 1422 SAVETMPS;
1423 PUSHMARK (SP);
1033 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1034 PUSHMARK (SP);
1035 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1036 PUSHs (fullname); 1426 PUSHs (fullname);
1037 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1038 PUTBACK; 1428 PUTBACK;
1039 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1040 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1041 SPAGAIN; 1431 SPAGAIN;
1042 FREETMPS; 1432 FREETMPS;
… …
1045 } 1435 }
1046 1436
1047 oldcxix = cxstack_ix; 1437 oldcxix = cxstack_ix;
1048 } 1438 }
1049 1439
1050 if (cctx->flags & CC_TRACE_LINE) 1440 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1441 {
1052 dSP; 1442 dSP;
1053 1443
1054 PL_runops = RUNOPS_DEFAULT; 1444 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1445 ENTER;
1056 SAVETMPS; 1446 SAVETMPS;
1057 EXTEND (SP, 3);
1058 PL_runops = RUNOPS_DEFAULT;
1059 PUSHMARK (SP); 1447 PUSHMARK (SP);
1448 EXTEND (SP, 2);
1060 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1449 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1061 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1450 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1062 PUTBACK; 1451 PUTBACK;
1063 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1452 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1064 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1453 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
… …
1074 1463
1075 TAINT_NOT; 1464 TAINT_NOT;
1076 return 0; 1465 return 0;
1077} 1466}
1078 1467
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1468static struct CoroSLF cctx_ssl_frame;
1081 1469
1082static void 1470static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1471slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1472{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1473 ta->prev = 0;
1087} 1474}
1088 1475
1089static int 1476static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1477slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1478{
… …
1093 1480
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1481 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1482}
1096 1483
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1484/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1485static void ecb_noinline
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1486cctx_prepare (pTHX)
1100{ 1487{
1101 PL_top_env = &PL_start_env; 1488 PL_top_env = &PL_start_env;
1102 1489
1103 if (cctx->flags & CC_TRACE) 1490 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1491 PL_runops = runops_trace;
1105 1492
1106 /* we already must be executing an SLF op, there is no other valid way 1493 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1494 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1495 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1496 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1497
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1498 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1499 cctx_ssl_frame = slf_frame;
1114 1500
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1501 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1502 slf_frame.check = slf_check_set_stacklevel;
1117} 1503}
1118 1504
1119/* the tail of transfer: execute stuff we can only do after a transfer */ 1505/* the tail of transfer: execute stuff we can only do after a transfer */
1120INLINE void 1506ecb_inline void
1121transfer_tail (pTHX) 1507transfer_tail (pTHX)
1122{ 1508{
1123 free_coro_mortal (aTHX); 1509 free_coro_mortal (aTHX);
1510}
1511
1512/* try to exit the same way perl's main function would do */
1513/* we do not bother resetting the environment or other things *7
1514/* that are not, uhm, essential */
1515/* this obviously also doesn't work when perl is embedded */
1516static void ecb_noinline ecb_cold
1517perlish_exit (pTHX)
1518{
1519 int exitstatus = perl_destruct (PL_curinterp);
1520 perl_free (PL_curinterp);
1521 exit (exitstatus);
1124} 1522}
1125 1523
1126/* 1524/*
1127 * this is a _very_ stripped down perl interpreter ;) 1525 * this is a _very_ stripped down perl interpreter ;)
1128 */ 1526 */
… …
1140 /* normally we would need to skip the entersub here */ 1538 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1539 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1540 /* PL_nop = PL_nop->op_next */
1143 1541
1144 /* inject a fake subroutine call to cctx_init */ 1542 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1543 cctx_prepare (aTHX);
1146 1544
1147 /* cctx_run is the alternative tail of transfer() */ 1545 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1546 transfer_tail (aTHX);
1149 1547
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1548 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1549 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1550 perl_run (PL_curinterp);
1153 /* 1551 /*
1154 * Unfortunately, there is no way to get at the return values of the 1552 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1553 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1554 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1555 */
1556
1557 /*
1558 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1559 * requires PL_scopestack_ix, so do it here if required.
1560 */
1561 if (!PL_scopestack_ix)
1562 ENTER;
1157 1563
1158 /* 1564 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1565 * If perl-run returns we assume exit() was being called or the coro
1160 * fell off the end, which seems to be the only valid (non-bug) 1566 * fell off the end, which seems to be the only valid (non-bug)
1161 * reason for perl_run to return. We try to exit by jumping to the 1567 * reason for perl_run to return. We try to mimic whatever perl is normally
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1568 * doing in that case. YMMV.
1163 * coroutine as Coro has no such concept
1164 */ 1569 */
1165 PL_top_env = main_top_env; 1570 perlish_exit (aTHX);
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1571 }
1168} 1572}
1169 1573
1170static coro_cctx * 1574static coro_cctx *
1171cctx_new () 1575cctx_new (void)
1172{ 1576{
1173 coro_cctx *cctx; 1577 coro_cctx *cctx;
1174 1578
1175 ++cctx_count; 1579 ++cctx_count;
1176 New (0, cctx, 1, coro_cctx); 1580 New (0, cctx, 1, coro_cctx);
… …
1182 return cctx; 1586 return cctx;
1183} 1587}
1184 1588
1185/* create a new cctx only suitable as source */ 1589/* create a new cctx only suitable as source */
1186static coro_cctx * 1590static coro_cctx *
1187cctx_new_empty () 1591cctx_new_empty (void)
1188{ 1592{
1189 coro_cctx *cctx = cctx_new (); 1593 coro_cctx *cctx = cctx_new ();
1190 1594
1191 cctx->sptr = 0; 1595 cctx->stack.sptr = 0;
1192 coro_create (&cctx->cctx, 0, 0, 0, 0); 1596 coro_create (&cctx->cctx, 0, 0, 0, 0);
1193 1597
1194 return cctx; 1598 return cctx;
1195} 1599}
1196 1600
1197/* create a new cctx suitable as destination/running a perl interpreter */ 1601/* create a new cctx suitable as destination/running a perl interpreter */
1198static coro_cctx * 1602static coro_cctx *
1199cctx_new_run () 1603cctx_new_run (void)
1200{ 1604{
1201 coro_cctx *cctx = cctx_new (); 1605 coro_cctx *cctx = cctx_new ();
1202 void *stack_start;
1203 size_t stack_size;
1204 1606
1205#if HAVE_MMAP 1607 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1206 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1207 /* mmap supposedly does allocate-on-write for us */
1208 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1209
1210 if (cctx->sptr != (void *)-1)
1211 {
1212 #if CORO_STACKGUARD
1213 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1214 #endif
1215 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1216 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1217 cctx->flags |= CC_MAPPED;
1218 } 1608 {
1219 else
1220#endif
1221 {
1222 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1223 New (0, cctx->sptr, cctx_stacksize, long);
1224
1225 if (!cctx->sptr)
1226 {
1227 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1609 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1228 _exit (EXIT_FAILURE); 1610 _exit (EXIT_FAILURE);
1229 }
1230
1231 stack_start = cctx->sptr;
1232 stack_size = cctx->ssize;
1233 } 1611 }
1234 1612
1235 #if CORO_USE_VALGRIND
1236 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1237 #endif
1238
1239 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1613 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1240 1614
1241 return cctx; 1615 return cctx;
1242} 1616}
1243 1617
1244static void 1618static void
1245cctx_destroy (coro_cctx *cctx) 1619cctx_destroy (coro_cctx *cctx)
1246{ 1620{
1247 if (!cctx) 1621 if (!cctx)
1248 return; 1622 return;
1249 1623
1624 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1625
1250 --cctx_count; 1626 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1627 coro_destroy (&cctx->cctx);
1252 1628
1253 /* coro_transfer creates new, empty cctx's */ 1629 coro_stack_free (&cctx->stack);
1254 if (cctx->sptr)
1255 {
1256 #if CORO_USE_VALGRIND
1257 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1258 #endif
1259
1260#if HAVE_MMAP
1261 if (cctx->flags & CC_MAPPED)
1262 munmap (cctx->sptr, cctx->ssize);
1263 else
1264#endif
1265 Safefree (cctx->sptr);
1266 }
1267 1630
1268 Safefree (cctx); 1631 Safefree (cctx);
1269} 1632}
1270 1633
1271/* wether this cctx should be destructed */ 1634/* wether this cctx should be destructed */
1272#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1635#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1273 1636
1274static coro_cctx * 1637static coro_cctx *
1275cctx_get (pTHX) 1638cctx_get (pTHX)
1276{ 1639{
1277 while (expect_true (cctx_first)) 1640 while (ecb_expect_true (cctx_first))
1278 { 1641 {
1279 coro_cctx *cctx = cctx_first; 1642 coro_cctx *cctx = cctx_first;
1280 cctx_first = cctx->next; 1643 cctx_first = cctx->next;
1281 --cctx_idle; 1644 --cctx_idle;
1282 1645
1283 if (expect_true (!CCTX_EXPIRED (cctx))) 1646 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1284 return cctx; 1647 return cctx;
1285 1648
1286 cctx_destroy (cctx); 1649 cctx_destroy (cctx);
1287 } 1650 }
1288 1651
… …
1290} 1653}
1291 1654
1292static void 1655static void
1293cctx_put (coro_cctx *cctx) 1656cctx_put (coro_cctx *cctx)
1294{ 1657{
1295 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1658 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1296 1659
1297 /* free another cctx if overlimit */ 1660 /* free another cctx if overlimit */
1298 if (expect_false (cctx_idle >= cctx_max_idle)) 1661 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1299 { 1662 {
1300 coro_cctx *first = cctx_first; 1663 coro_cctx *first = cctx_first;
1301 cctx_first = first->next; 1664 cctx_first = first->next;
1302 --cctx_idle; 1665 --cctx_idle;
1303 1666
… …
1314static void 1677static void
1315transfer_check (pTHX_ struct coro *prev, struct coro *next) 1678transfer_check (pTHX_ struct coro *prev, struct coro *next)
1316{ 1679{
1317 /* TODO: throwing up here is considered harmful */ 1680 /* TODO: throwing up here is considered harmful */
1318 1681
1319 if (expect_true (prev != next)) 1682 if (ecb_expect_true (prev != next))
1320 { 1683 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1684 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1685 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1686
1324 if (expect_false (next->flags & CF_RUNNING)) 1687 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1688 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1689
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1690#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1691 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1692 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1693#endif
1334 } 1694 }
1335} 1695}
1336 1696
1337/* always use the TRANSFER macro */ 1697/* always use the TRANSFER macro */
1338static void NOINLINE /* noinline so we have a fixed stackframe */ 1698static void ecb_noinline /* noinline so we have a fixed stackframe */
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1699transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1700{
1341 dSTACKLEVEL; 1701 dSTACKLEVEL;
1342 1702
1343 /* sometimes transfer is only called to set idle_sp */ 1703 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1704 if (ecb_expect_false (!prev))
1345 { 1705 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1706 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1707 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1708 }
1349 else if (expect_true (prev != next)) 1709 else if (ecb_expect_true (prev != next))
1350 { 1710 {
1351 coro_cctx *prev__cctx; 1711 coro_cctx *cctx_prev;
1352 1712
1353 if (expect_false (prev->flags & CF_NEW)) 1713 if (ecb_expect_false (prev->flags & CF_NEW))
1354 { 1714 {
1355 /* create a new empty/source context */ 1715 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1716 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1717 prev->flags |= CF_RUNNING;
1359 } 1718 }
1360 1719
1361 prev->flags &= ~CF_RUNNING; 1720 prev->flags &= ~CF_RUNNING;
1362 next->flags |= CF_RUNNING; 1721 next->flags |= CF_RUNNING;
1363 1722
1364 /* first get rid of the old state */ 1723 /* first get rid of the old state */
1365 save_perl (aTHX_ prev); 1724 save_perl (aTHX_ prev);
1366 1725
1367 if (expect_false (next->flags & CF_NEW)) 1726 if (ecb_expect_false (next->flags & CF_NEW))
1368 { 1727 {
1369 /* need to start coroutine */ 1728 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1729 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1730 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1731 init_perl (aTHX_ next);
1373 } 1732 }
1374 else 1733 else
1375 load_perl (aTHX_ next); 1734 load_perl (aTHX_ next);
1376 1735
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1736 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1737 if (ecb_expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1738 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1739 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1740 && !force_cctx
1384 )) 1741 ))
1385 { 1742 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1743 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1744 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1745
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1746 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1747 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1748 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1749 if (ecb_expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1750 next->cctx = cctx_get (aTHX);
1396 1751
1397 cctx_put (prev__cctx); 1752 cctx_put (cctx_current);
1398 } 1753 }
1754 else
1755 prev->cctx = cctx_current;
1399 1756
1400 ++next->usecount; 1757 ++next->usecount;
1401 1758
1402 if (expect_true (!next->cctx)) 1759 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1760 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1761
1405 if (expect_false (prev__cctx != next->cctx)) 1762 next->cctx = 0;
1763
1764 if (ecb_expect_false (cctx_prev != cctx_current))
1406 { 1765 {
1407 prev__cctx->top_env = PL_top_env; 1766 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1767 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1768 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1769 }
1411 1770
1412 transfer_tail (aTHX); 1771 transfer_tail (aTHX);
1413 } 1772 }
1414} 1773}
… …
1416#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1775#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1417#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1776#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1418 1777
1419/** high level stuff ********************************************************/ 1778/** high level stuff ********************************************************/
1420 1779
1780/* this function is actually Coro, not Coro::State, but we call it from here */
1781/* because it is convenient - but it hasn't been declared yet for that reason */
1421static int 1782static void
1783coro_call_on_destroy (pTHX_ struct coro *coro);
1784
1785static void
1422coro_state_destroy (pTHX_ struct coro *coro) 1786coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1787{
1424 if (coro->flags & CF_DESTROYED) 1788 if (coro->flags & CF_ZOMBIE)
1425 return 0; 1789 return;
1426 1790
1427 if (coro->on_destroy)
1428 coro->on_destroy (aTHX_ coro); 1791 slf_destroy (aTHX_ coro);
1429 1792
1430 coro->flags |= CF_DESTROYED; 1793 coro->flags |= CF_ZOMBIE;
1431 1794
1432 if (coro->flags & CF_READY) 1795 if (coro->flags & CF_READY)
1433 { 1796 {
1434 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1797 /* reduce nready, as destroying a ready coro effectively unreadies it */
1435 /* alternative: look through all ready queues and remove the coro */ 1798 /* alternative: look through all ready queues and remove the coro */
1436 --coro_nready; 1799 --coro_nready;
1437 } 1800 }
1438 else 1801 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1802 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1803
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1804 if (coro->next) coro->next->prev = coro->prev;
1442 { 1805 if (coro->prev) coro->prev->next = coro->next;
1443 struct coro temp; 1806 if (coro == coro_first) coro_first = coro->next;
1444 1807
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1808 if (coro->mainstack
1446 1809 && coro->mainstack != main_mainstack
1447 save_perl (aTHX_ &temp); 1810 && coro->slot
1811 && !PL_dirty)
1448 load_perl (aTHX_ coro); 1812 destroy_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1813
1457 cctx_destroy (coro->cctx); 1814 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1815 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1816 SvREFCNT_dec (coro->args);
1817 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1818 SvREFCNT_dec (CORO_THROW);
1461 1819
1462 if (coro->next) coro->next->prev = coro->prev; 1820 coro_call_on_destroy (aTHX_ coro);
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465 1821
1466 return 1; 1822 /* more destruction mayhem in coro_state_free */
1467} 1823}
1468 1824
1469static int 1825static int
1470coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1826coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1471{ 1827{
1472 struct coro *coro = (struct coro *)mg->mg_ptr; 1828 struct coro *coro = (struct coro *)mg->mg_ptr;
1473 mg->mg_ptr = 0; 1829 mg->mg_ptr = 0;
1474 1830
1475 coro->hv = 0;
1476
1477 if (--coro->refcnt < 0)
1478 {
1479 coro_state_destroy (aTHX_ coro); 1831 coro_state_destroy (aTHX_ coro);
1832 SvREFCNT_dec (coro->on_destroy);
1833 SvREFCNT_dec (coro->status);
1834
1480 Safefree (coro); 1835 Safefree (coro);
1481 }
1482 1836
1483 return 0; 1837 return 0;
1484} 1838}
1485 1839
1486static int 1840static int ecb_cold
1487coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1841coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1488{ 1842{
1489 struct coro *coro = (struct coro *)mg->mg_ptr; 1843 /* called when perl clones the current process the slow way (windows process emulation) */
1490 1844 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1491 ++coro->refcnt; 1845 mg->mg_ptr = 0;
1846 mg->mg_virtual = 0;
1492 1847
1493 return 0; 1848 return 0;
1494} 1849}
1495 1850
1496static MGVTBL coro_state_vtbl = { 1851static MGVTBL coro_state_vtbl = {
… …
1519 1874
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1875 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1876 TRANSFER (ta, 1);
1522} 1877}
1523 1878
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1879/** Coro ********************************************************************/
1548 1880
1549INLINE void 1881ecb_inline void
1550coro_enq (pTHX_ struct coro *coro) 1882coro_enq (pTHX_ struct coro *coro)
1551{ 1883{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1884 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1885
1555INLINE SV * 1886 SvREFCNT_inc_NN (coro->hv);
1887
1888 coro->next_ready = 0;
1889 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1890 ready [1] = coro;
1891}
1892
1893ecb_inline struct coro *
1556coro_deq (pTHX) 1894coro_deq (pTHX)
1557{ 1895{
1558 int prio; 1896 int prio;
1559 1897
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1898 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1899 {
1562 return av_shift (coro_ready [prio]); 1900 struct coro **ready = coro_ready [prio];
1901
1902 if (ready [0])
1903 {
1904 struct coro *coro = ready [0];
1905 ready [0] = coro->next_ready;
1906 return coro;
1907 }
1908 }
1563 1909
1564 return 0; 1910 return 0;
1911}
1912
1913static void
1914invoke_sv_ready_hook_helper (void)
1915{
1916 dTHX;
1917 dSP;
1918
1919 ENTER;
1920 SAVETMPS;
1921
1922 PUSHMARK (SP);
1923 PUTBACK;
1924 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1925
1926 FREETMPS;
1927 LEAVE;
1565} 1928}
1566 1929
1567static int 1930static int
1568api_ready (pTHX_ SV *coro_sv) 1931api_ready (pTHX_ SV *coro_sv)
1569{ 1932{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1933 struct coro *coro = SvSTATE (coro_sv);
1578 1934
1579 if (coro->flags & CF_READY) 1935 if (coro->flags & CF_READY)
1580 return 0; 1936 return 0;
1581 1937
1582 coro->flags |= CF_READY; 1938 coro->flags |= CF_READY;
1583 1939
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1940 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1941
1590 if (sv_hook) 1942 if (!coro_nready++)
1591 { 1943 if (coroapi.readyhook)
1592 dSP; 1944 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1945
1608 return 1; 1946 return 1;
1609} 1947}
1610 1948
1611static int 1949static int
… …
1613{ 1951{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1952 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1953}
1616 1954
1617/* expects to own a reference to next->hv */ 1955/* expects to own a reference to next->hv */
1618INLINE void 1956ecb_inline void
1619prepare_cede_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1957prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{ 1958{
1621 SV *prev_sv = SvRV (coro_current); 1959 SV *prev_sv = SvRV (coro_current);
1622 1960
1623 ta->prev = SvSTATE_hv (prev_sv); 1961 ta->prev = SvSTATE_hv (prev_sv);
1624 ta->next = next; 1962 ta->next = next;
1625 1963
1626 TRANSFER_CHECK (*ta); 1964 TRANSFER_CHECK (*ta);
1627 1965
1628 SvRV_set (coro_current, next->hv); 1966 SvRV_set (coro_current, (SV *)next->hv);
1629 1967
1630 free_coro_mortal (aTHX); 1968 free_coro_mortal (aTHX);
1631 coro_mortal = prev_sv; 1969 coro_mortal = prev_sv;
1632} 1970}
1633 1971
1634static void 1972static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1973prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1974{
1637 for (;;) 1975 for (;;)
1638 { 1976 {
1639 SV *next_sv = coro_deq (aTHX); 1977 struct coro *next = coro_deq (aTHX);
1640 1978
1641 if (expect_false (!next_sv)) 1979 if (ecb_expect_true (next))
1642 { 1980 {
1643 /* nothing to schedule: call the idle handler */
1644 dSP;
1645
1646 ENTER;
1647 SAVETMPS;
1648
1649 PUSHMARK (SP);
1650 PUTBACK;
1651 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1652
1653 FREETMPS;
1654 LEAVE;
1655 }
1656 else
1657 {
1658 struct coro *next = SvSTATE_hv (next_sv);
1659
1660 /* cannot transfer to destroyed coros, skip and look for next */ 1981 /* cannot transfer to destroyed coros, skip and look for next */
1661 if (expect_false (next->flags & CF_DESTROYED)) 1982 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1662 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1983 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1663 else 1984 else
1664 { 1985 {
1665 next->flags &= ~CF_READY; 1986 next->flags &= ~CF_READY;
1666 --coro_nready; 1987 --coro_nready;
1667 1988
1668 return prepare_cede_to (aTHX_ ta, next); 1989 prepare_schedule_to (aTHX_ ta, next);
1990 break;
1669 } 1991 }
1670 } 1992 }
1671 } 1993 else
1672} 1994 {
1995 /* nothing to schedule: call the idle handler */
1996 if (SvROK (sv_idle)
1997 && SvOBJECT (SvRV (sv_idle)))
1998 {
1999 if (SvRV (sv_idle) == SvRV (coro_current))
2000 {
2001 require_pv ("Carp");
1673 2002
1674INLINE void 2003 {
2004 dSP;
2005
2006 ENTER;
2007 SAVETMPS;
2008
2009 PUSHMARK (SP);
2010 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2011 PUTBACK;
2012 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2013
2014 FREETMPS;
2015 LEAVE;
2016 }
2017 }
2018
2019 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
2020 api_ready (aTHX_ SvRV (sv_idle));
2021 --coro_nready;
2022 }
2023 else
2024 {
2025 /* TODO: deprecated, remove, cannot work reliably *//*D*/
2026 dSP;
2027
2028 ENTER;
2029 SAVETMPS;
2030
2031 PUSHMARK (SP);
2032 PUTBACK;
2033 call_sv (sv_idle, G_VOID | G_DISCARD);
2034
2035 FREETMPS;
2036 LEAVE;
2037 }
2038 }
2039 }
2040}
2041
2042ecb_inline void
1675prepare_cede (pTHX_ struct coro_transfer_args *ta) 2043prepare_cede (pTHX_ struct coro_transfer_args *ta)
1676{ 2044{
1677 api_ready (aTHX_ coro_current); 2045 api_ready (aTHX_ coro_current);
1678 prepare_schedule (aTHX_ ta); 2046 prepare_schedule (aTHX_ ta);
1679} 2047}
1680 2048
1681INLINE void 2049ecb_inline void
1682prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2050prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1683{ 2051{
1684 SV *prev = SvRV (coro_current); 2052 SV *prev = SvRV (coro_current);
1685 2053
1686 if (coro_nready) 2054 if (coro_nready)
… …
1699 2067
1700 prepare_schedule (aTHX_ &ta); 2068 prepare_schedule (aTHX_ &ta);
1701 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1702} 2070}
1703 2071
2072static void
2073api_schedule_to (pTHX_ SV *coro_sv)
2074{
2075 struct coro_transfer_args ta;
2076 struct coro *next = SvSTATE (coro_sv);
2077
2078 SvREFCNT_inc_NN (coro_sv);
2079 prepare_schedule_to (aTHX_ &ta, next);
2080}
2081
1704static int 2082static int
1705api_cede (pTHX) 2083api_cede (pTHX)
1706{ 2084{
1707 struct coro_transfer_args ta; 2085 struct coro_transfer_args ta;
1708 2086
1709 prepare_cede (aTHX_ &ta); 2087 prepare_cede (aTHX_ &ta);
1710 2088
1711 if (expect_true (ta.prev != ta.next)) 2089 if (ecb_expect_true (ta.prev != ta.next))
1712 { 2090 {
1713 TRANSFER (ta, 1); 2091 TRANSFER (ta, 1);
1714 return 1; 2092 return 1;
1715 } 2093 }
1716 else 2094 else
… …
1735static void 2113static void
1736api_trace (pTHX_ SV *coro_sv, int flags) 2114api_trace (pTHX_ SV *coro_sv, int flags)
1737{ 2115{
1738 struct coro *coro = SvSTATE (coro_sv); 2116 struct coro *coro = SvSTATE (coro_sv);
1739 2117
2118 if (coro->flags & CF_RUNNING)
2119 croak ("cannot enable tracing on a running coroutine, caught");
2120
1740 if (flags & CC_TRACE) 2121 if (flags & CC_TRACE)
1741 { 2122 {
1742 if (!coro->cctx) 2123 if (!coro->cctx)
1743 coro->cctx = cctx_new_run (); 2124 coro->cctx = cctx_new_run ();
1744 else if (!(coro->cctx->flags & CC_TRACE)) 2125 else if (!(coro->cctx->flags & CC_TRACE))
1745 croak ("cannot enable tracing on coroutine with custom stack,"); 2126 croak ("cannot enable tracing on coroutine with custom stack, caught");
1746 2127
1747 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2128 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1748 } 2129 }
1749 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2130 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1750 { 2131 {
… …
1753 if (coro->flags & CF_RUNNING) 2134 if (coro->flags & CF_RUNNING)
1754 PL_runops = RUNOPS_DEFAULT; 2135 PL_runops = RUNOPS_DEFAULT;
1755 else 2136 else
1756 coro->slot->runops = RUNOPS_DEFAULT; 2137 coro->slot->runops = RUNOPS_DEFAULT;
1757 } 2138 }
2139}
2140
2141static void
2142coro_push_av (pTHX_ AV *av, I32 gimme_v)
2143{
2144 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2145 {
2146 dSP;
2147
2148 if (gimme_v == G_SCALAR)
2149 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2150 else
2151 {
2152 int i;
2153 EXTEND (SP, AvFILLp (av) + 1);
2154
2155 for (i = 0; i <= AvFILLp (av); ++i)
2156 PUSHs (AvARRAY (av)[i]);
2157 }
2158
2159 PUTBACK;
2160 }
2161}
2162
2163static void
2164coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2165{
2166 if (!coro->on_destroy)
2167 coro->on_destroy = newAV ();
2168
2169 av_push (coro->on_destroy, cb);
2170}
2171
2172static void
2173slf_destroy_join (pTHX_ struct CoroSLF *frame)
2174{
2175 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2176}
2177
2178static int
2179slf_check_join (pTHX_ struct CoroSLF *frame)
2180{
2181 struct coro *coro = (struct coro *)frame->data;
2182
2183 if (!coro->status)
2184 return 1;
2185
2186 frame->destroy = 0;
2187
2188 coro_push_av (aTHX_ coro->status, GIMME_V);
2189
2190 SvREFCNT_dec ((SV *)coro->hv);
2191
2192 return 0;
2193}
2194
2195static void
2196slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2197{
2198 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2199
2200 if (items > 1)
2201 croak ("join called with too many arguments");
2202
2203 if (coro->status)
2204 frame->prepare = prepare_nop;
2205 else
2206 {
2207 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2208 frame->prepare = prepare_schedule;
2209 }
2210
2211 frame->check = slf_check_join;
2212 frame->destroy = slf_destroy_join;
2213 frame->data = (void *)coro;
2214 SvREFCNT_inc (coro->hv);
2215}
2216
2217static void
2218coro_call_on_destroy (pTHX_ struct coro *coro)
2219{
2220 AV *od = coro->on_destroy;
2221
2222 if (!od)
2223 return;
2224
2225 coro->on_destroy = 0;
2226 sv_2mortal ((SV *)od);
2227
2228 while (AvFILLp (od) >= 0)
2229 {
2230 SV *cb = sv_2mortal (av_pop (od));
2231
2232 /* coro hv's (and only hv's at the moment) are supported as well */
2233 if (SvSTATEhv_p (aTHX_ cb))
2234 api_ready (aTHX_ cb);
2235 else
2236 {
2237 dSP; /* don't disturb outer sp */
2238 PUSHMARK (SP);
2239
2240 if (coro->status)
2241 {
2242 PUTBACK;
2243 coro_push_av (aTHX_ coro->status, G_ARRAY);
2244 SPAGAIN;
2245 }
2246
2247 PUTBACK;
2248 call_sv (cb, G_VOID | G_DISCARD);
2249 }
2250 }
2251}
2252
2253static void
2254coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2255{
2256 AV *av;
2257
2258 if (coro->status)
2259 {
2260 av = coro->status;
2261 av_clear (av);
2262 }
2263 else
2264 av = coro->status = newAV ();
2265
2266 /* items are actually not so common, so optimise for this case */
2267 if (items)
2268 {
2269 int i;
2270
2271 av_extend (av, items - 1);
2272
2273 for (i = 0; i < items; ++i)
2274 av_push (av, SvREFCNT_inc_NN (arg [i]));
2275 }
2276}
2277
2278static void
2279slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2280{
2281 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2282 api_ready (aTHX_ sv_manager);
2283
2284 frame->prepare = prepare_schedule;
2285 frame->check = slf_check_repeat;
2286
2287 /* as a minor optimisation, we could unwind all stacks here */
2288 /* but that puts extra pressure on pp_slf, and is not worth much */
2289 /*coro_unwind_stacks (aTHX);*/
2290}
2291
2292static void
2293slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2294{
2295 HV *coro_hv = (HV *)SvRV (coro_current);
2296
2297 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2298 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2299}
2300
2301static void
2302slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2303{
2304 HV *coro_hv;
2305 struct coro *coro;
2306
2307 if (items <= 0)
2308 croak ("Coro::cancel called without coro object,");
2309
2310 coro = SvSTATE (arg [0]);
2311 coro_hv = coro->hv;
2312
2313 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2314
2315 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2316 {
2317 /* coro currently busy cancelling something, so just notify it */
2318 coro->slf_frame.data = (void *)coro;
2319
2320 frame->prepare = prepare_nop;
2321 frame->check = slf_check_nop;
2322 }
2323 else if (coro_hv == (HV *)SvRV (coro_current))
2324 {
2325 /* cancelling the current coro is allowed, and equals terminate */
2326 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2327 }
2328 else
2329 {
2330 struct coro *self = SvSTATE_current;
2331
2332 if (!self)
2333 croak ("Coro::cancel called outside of thread content,");
2334
2335 /* otherwise we cancel directly, purely for speed reasons
2336 * unfortunately, this requires some magic trickery, as
2337 * somebody else could cancel us, so we have to fight the cancellation.
2338 * this is ugly, and hopefully fully worth the extra speed.
2339 * besides, I can't get the slow-but-safe version working...
2340 */
2341 slf_frame.data = 0;
2342 self->flags |= CF_NOCANCEL;
2343 coro_state_destroy (aTHX_ coro);
2344 self->flags &= ~CF_NOCANCEL;
2345
2346 if (slf_frame.data)
2347 {
2348 /* while we were busy we have been cancelled, so terminate */
2349 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2350 }
2351 else
2352 {
2353 frame->prepare = prepare_nop;
2354 frame->check = slf_check_nop;
2355 }
2356 }
2357}
2358
2359static int
2360slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2361{
2362 frame->prepare = 0;
2363 coro_unwind_stacks (aTHX);
2364
2365 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2366
2367 return 1;
2368}
2369
2370static int
2371safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2372{
2373 if (coro->cctx)
2374 croak ("coro inside C callback, unable to cancel at this time, caught");
2375
2376 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2377 {
2378 coro_set_status (aTHX_ coro, arg, items);
2379 coro_state_destroy (aTHX_ coro);
2380 }
2381 else
2382 {
2383 if (!coro->slf_frame.prepare)
2384 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2385
2386 slf_destroy (aTHX_ coro);
2387
2388 coro_set_status (aTHX_ coro, arg, items);
2389 coro->slf_frame.prepare = prepare_nop;
2390 coro->slf_frame.check = slf_check_safe_cancel;
2391
2392 api_ready (aTHX_ (SV *)coro->hv);
2393 }
2394
2395 return 1;
1758} 2396}
1759 2397
1760/*****************************************************************************/ 2398/*****************************************************************************/
1761/* async pool handler */ 2399/* async pool handler */
1762 2400
… …
1793slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2431slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1794{ 2432{
1795 HV *hv = (HV *)SvRV (coro_current); 2433 HV *hv = (HV *)SvRV (coro_current);
1796 struct coro *coro = SvSTATE_hv ((SV *)hv); 2434 struct coro *coro = SvSTATE_hv ((SV *)hv);
1797 2435
1798 if (expect_true (coro->saved_deffh)) 2436 if (ecb_expect_true (coro->saved_deffh))
1799 { 2437 {
1800 /* subsequent iteration */ 2438 /* subsequent iteration */
1801 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2439 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1802 coro->saved_deffh = 0; 2440 coro->saved_deffh = 0;
1803 2441
1804 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2442 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1805 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2443 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1806 { 2444 {
1807 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2445 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1808 coro->invoke_av = newAV (); 2446 return;
1809
1810 frame->prepare = prepare_nop;
1811 } 2447 }
1812 else 2448 else
1813 { 2449 {
1814 av_clear (GvAV (PL_defgv)); 2450 av_clear (GvAV (PL_defgv));
1815 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2451 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1816 2452
2453 if (ecb_expect_false (coro->swap_sv))
2454 {
2455 SWAP_SVS_LEAVE (coro);
2456 SvREFCNT_dec_NN (coro->swap_sv);
2457 coro->swap_sv = 0;
2458 }
2459
1817 coro->prio = 0; 2460 coro->prio = 0;
1818 2461
1819 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2462 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1820 api_trace (aTHX_ coro_current, 0); 2463 api_trace (aTHX_ coro_current, 0);
1821 2464
1822 frame->prepare = prepare_schedule; 2465 frame->prepare = prepare_schedule;
1823 av_push (av_async_pool, SvREFCNT_inc (hv)); 2466 av_push (av_async_pool, SvREFCNT_inc (hv));
1824 } 2467 }
… …
1840 2483
1841static void 2484static void
1842coro_rouse_callback (pTHX_ CV *cv) 2485coro_rouse_callback (pTHX_ CV *cv)
1843{ 2486{
1844 dXSARGS; 2487 dXSARGS;
1845 SV *data = (SV *)GENSUB_ARG; 2488 SV *data = (SV *)S_GENSUB_ARG;
1846 2489
1847 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2490 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1848 { 2491 {
1849 /* first call, set args */ 2492 /* first call, set args */
2493 SV *coro = SvRV (data);
1850 AV *av = newAV (); 2494 AV *av = newAV ();
1851 SV *coro = SvRV (data);
1852 2495
1853 SvRV_set (data, (SV *)av); 2496 SvRV_set (data, (SV *)av);
1854 api_ready (aTHX_ coro);
1855 SvREFCNT_dec (coro);
1856 2497
1857 /* better take a full copy of the arguments */ 2498 /* better take a full copy of the arguments */
1858 while (items--) 2499 while (items--)
1859 av_store (av, items, newSVsv (ST (items))); 2500 av_store (av, items, newSVsv (ST (items)));
2501
2502 api_ready (aTHX_ coro);
2503 SvREFCNT_dec (coro);
1860 } 2504 }
1861 2505
1862 XSRETURN_EMPTY; 2506 XSRETURN_EMPTY;
1863} 2507}
1864 2508
1865static int 2509static int
1866slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2510slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1867{ 2511{
1868 SV *data = (SV *)frame->data; 2512 SV *data = (SV *)frame->data;
1869 2513
1870 if (CORO_THROW) 2514 if (CORO_THROW)
1871 return 0; 2515 return 0;
1872 2516
1873 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2517 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1874 return 1; 2518 return 1;
… …
1881 2525
1882 EXTEND (SP, AvFILLp (av) + 1); 2526 EXTEND (SP, AvFILLp (av) + 1);
1883 for (i = 0; i <= AvFILLp (av); ++i) 2527 for (i = 0; i <= AvFILLp (av); ++i)
1884 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2528 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1885 2529
1886 /* we have stolen the elements, so ste length to zero and free */ 2530 /* we have stolen the elements, so set length to zero and free */
1887 AvFILLp (av) = -1; 2531 AvFILLp (av) = -1;
1888 av_undef (av); 2532 av_undef (av);
1889 2533
1890 PUTBACK; 2534 PUTBACK;
1891 } 2535 }
… …
1910 cb = sv_2mortal (coro->rouse_cb); 2554 cb = sv_2mortal (coro->rouse_cb);
1911 coro->rouse_cb = 0; 2555 coro->rouse_cb = 0;
1912 } 2556 }
1913 2557
1914 if (!SvROK (cb) 2558 if (!SvROK (cb)
1915 || SvTYPE (SvRV (cb)) != SVt_PVCV 2559 || SvTYPE (SvRV (cb)) != SVt_PVCV
1916 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2560 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1917 croak ("Coro::rouse_wait called with illegal callback argument,"); 2561 croak ("Coro::rouse_wait called with illegal callback argument,");
1918 2562
1919 { 2563 {
1920 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2564 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1921 SV *data = (SV *)GENSUB_ARG; 2565 SV *data = (SV *)S_GENSUB_ARG;
1922 2566
1923 frame->data = (void *)data; 2567 frame->data = (void *)data;
1924 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2568 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1925 frame->check = slf_check_rouse_wait; 2569 frame->check = slf_check_rouse_wait;
1926 } 2570 }
… …
1930coro_new_rouse_cb (pTHX) 2574coro_new_rouse_cb (pTHX)
1931{ 2575{
1932 HV *hv = (HV *)SvRV (coro_current); 2576 HV *hv = (HV *)SvRV (coro_current);
1933 struct coro *coro = SvSTATE_hv (hv); 2577 struct coro *coro = SvSTATE_hv (hv);
1934 SV *data = newRV_inc ((SV *)hv); 2578 SV *data = newRV_inc ((SV *)hv);
1935 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2579 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1936 2580
1937 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2581 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1938 SvREFCNT_dec (data); /* magicext increases the refcount */ 2582 SvREFCNT_dec (data); /* magicext increases the refcount */
1939 2583
1940 SvREFCNT_dec (coro->rouse_cb); 2584 SvREFCNT_dec (coro->rouse_cb);
… …
1998 frame->prepare = prepare_schedule; 2642 frame->prepare = prepare_schedule;
1999 frame->check = slf_check_nop; 2643 frame->check = slf_check_nop;
2000} 2644}
2001 2645
2002static void 2646static void
2647slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2648{
2649 struct coro *next = (struct coro *)slf_frame.data;
2650
2651 SvREFCNT_inc_NN (next->hv);
2652 prepare_schedule_to (aTHX_ ta, next);
2653}
2654
2655static void
2656slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2657{
2658 if (!items)
2659 croak ("Coro::schedule_to expects a coroutine argument, caught");
2660
2661 frame->data = (void *)SvSTATE (arg [0]);
2662 frame->prepare = slf_prepare_schedule_to;
2663 frame->check = slf_check_nop;
2664}
2665
2666static void
2667slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2668{
2669 api_ready (aTHX_ SvRV (coro_current));
2670
2671 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2672}
2673
2674static void
2003slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2675slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2004{ 2676{
2005 frame->prepare = prepare_cede; 2677 frame->prepare = prepare_cede;
2006 frame->check = slf_check_nop; 2678 frame->check = slf_check_nop;
2007} 2679}
… …
2009static void 2681static void
2010slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2682slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2011{ 2683{
2012 frame->prepare = prepare_cede_notself; 2684 frame->prepare = prepare_cede_notself;
2013 frame->check = slf_check_nop; 2685 frame->check = slf_check_nop;
2686}
2687
2688/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2689static void
2690slf_destroy (pTHX_ struct coro *coro)
2691{
2692 struct CoroSLF frame = coro->slf_frame;
2693
2694 /*
2695 * The on_destroy below most likely is from an SLF call.
2696 * Since by definition the SLF call will not finish when we destroy
2697 * the coro, we will have to force-finish it here, otherwise
2698 * cleanup functions cannot call SLF functions.
2699 */
2700 coro->slf_frame.prepare = 0;
2701
2702 /* this callback is reserved for slf functions needing to do cleanup */
2703 if (frame.destroy && frame.prepare && !PL_dirty)
2704 frame.destroy (aTHX_ &frame);
2014} 2705}
2015 2706
2016/* 2707/*
2017 * these not obviously related functions are all rolled into one 2708 * these not obviously related functions are all rolled into one
2018 * function to increase chances that they all will call transfer with the same 2709 * function to increase chances that they all will call transfer with the same
… …
2025 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2716 I32 checkmark; /* mark SP to see how many elements check has pushed */
2026 2717
2027 /* set up the slf frame, unless it has already been set-up */ 2718 /* set up the slf frame, unless it has already been set-up */
2028 /* the latter happens when a new coro has been started */ 2719 /* the latter happens when a new coro has been started */
2029 /* or when a new cctx was attached to an existing coroutine */ 2720 /* or when a new cctx was attached to an existing coroutine */
2030 if (expect_true (!slf_frame.prepare)) 2721 if (ecb_expect_true (!slf_frame.prepare))
2031 { 2722 {
2032 /* first iteration */ 2723 /* first iteration */
2033 dSP; 2724 dSP;
2034 SV **arg = PL_stack_base + TOPMARK + 1; 2725 SV **arg = PL_stack_base + TOPMARK + 1;
2035 int items = SP - arg; /* args without function object */ 2726 int items = SP - arg; /* args without function object */
… …
2076 while (slf_frame.check (aTHX_ &slf_frame)); 2767 while (slf_frame.check (aTHX_ &slf_frame));
2077 2768
2078 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2769 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2079 2770
2080 /* exception handling */ 2771 /* exception handling */
2081 if (expect_false (CORO_THROW)) 2772 if (ecb_expect_false (CORO_THROW))
2082 { 2773 {
2083 SV *exception = sv_2mortal (CORO_THROW); 2774 SV *exception = sv_2mortal (CORO_THROW);
2084 2775
2085 CORO_THROW = 0; 2776 CORO_THROW = 0;
2086 sv_setsv (ERRSV, exception); 2777 sv_setsv (ERRSV, exception);
2087 croak (0); 2778 croak (0);
2088 } 2779 }
2089 2780
2090 /* return value handling - mostly like entersub */ 2781 /* return value handling - mostly like entersub */
2091 /* make sure we put something on the stack in scalar context */ 2782 /* make sure we put something on the stack in scalar context */
2092 if (GIMME_V == G_SCALAR) 2783 if (GIMME_V == G_SCALAR
2784 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2093 { 2785 {
2094 dSP; 2786 dSP;
2095 SV **bot = PL_stack_base + checkmark; 2787 SV **bot = PL_stack_base + checkmark;
2096 2788
2097 if (sp == bot) /* too few, push undef */ 2789 if (sp == bot) /* too few, push undef */
2098 bot [1] = &PL_sv_undef; 2790 bot [1] = &PL_sv_undef;
2099 else if (sp != bot + 1) /* too many, take last one */ 2791 else /* too many, take last one */
2100 bot [1] = *sp; 2792 bot [1] = *sp;
2101 2793
2102 SP = bot + 1; 2794 SP = bot + 1;
2103 2795
2104 PUTBACK; 2796 PUTBACK;
… …
2137 if (PL_op->op_flags & OPf_STACKED) 2829 if (PL_op->op_flags & OPf_STACKED)
2138 { 2830 {
2139 if (items > slf_arga) 2831 if (items > slf_arga)
2140 { 2832 {
2141 slf_arga = items; 2833 slf_arga = items;
2142 free (slf_argv); 2834 Safefree (slf_argv);
2143 slf_argv = malloc (slf_arga * sizeof (SV *)); 2835 New (0, slf_argv, slf_arga, SV *);
2144 } 2836 }
2145 2837
2146 slf_argc = items; 2838 slf_argc = items;
2147 2839
2148 for (i = 0; i < items; ++i) 2840 for (i = 0; i < items; ++i)
… …
2150 } 2842 }
2151 else 2843 else
2152 slf_argc = 0; 2844 slf_argc = 0;
2153 2845
2154 PL_op->op_ppaddr = pp_slf; 2846 PL_op->op_ppaddr = pp_slf;
2155 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2847 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2156 2848
2157 PL_op = (OP *)&slf_restore; 2849 PL_op = (OP *)&slf_restore;
2850}
2851
2852/*****************************************************************************/
2853/* dynamic wind */
2854
2855static void
2856on_enterleave_call (pTHX_ SV *cb)
2857{
2858 dSP;
2859
2860 PUSHSTACK;
2861
2862 PUSHMARK (SP);
2863 PUTBACK;
2864 call_sv (cb, G_VOID | G_DISCARD);
2865 SPAGAIN;
2866
2867 POPSTACK;
2868}
2869
2870static SV *
2871coro_avp_pop_and_free (pTHX_ AV **avp)
2872{
2873 AV *av = *avp;
2874 SV *res = av_pop (av);
2875
2876 if (AvFILLp (av) < 0)
2877 {
2878 *avp = 0;
2879 SvREFCNT_dec (av);
2880 }
2881
2882 return res;
2883}
2884
2885static void
2886coro_pop_on_enter (pTHX_ void *coro)
2887{
2888 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2889 SvREFCNT_dec (cb);
2890}
2891
2892static void
2893coro_pop_on_leave (pTHX_ void *coro)
2894{
2895 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2896 on_enterleave_call (aTHX_ sv_2mortal (cb));
2897}
2898
2899static void
2900enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2901{
2902 if (!hook)
2903 return;
2904
2905 if (!*avp)
2906 {
2907 *avp = newAV ();
2908 AvREAL_off (*avp);
2909 }
2910
2911 av_push (*avp, (SV *)hook);
2912 av_push (*avp, (SV *)arg);
2913}
2914
2915static void
2916enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2917{
2918 AV *av = *avp;
2919 int i;
2920
2921 if (!av)
2922 return;
2923
2924 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2925 if (AvARRAY (av)[i] == (SV *)hook)
2926 {
2927 if (execute)
2928 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2929
2930 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2931 av_pop (av);
2932 av_pop (av);
2933 break;
2934 }
2935
2936 if (AvFILLp (av) >= 0)
2937 {
2938 *avp = 0;
2939 SvREFCNT_dec_NN (av);
2940 }
2941}
2942
2943static void
2944api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2945{
2946 struct coro *coro = SvSTATE (coro_sv);
2947
2948 if (SvSTATE_current == coro)
2949 if (enter)
2950 enter (aTHX_ enter_arg);
2951
2952 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2954}
2955
2956static void
2957api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2963}
2964
2965static void
2966savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2967{
2968 struct coro *coro = SvSTATE_current;
2969
2970 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2971}
2972
2973static void
2974savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2975{
2976 struct coro *coro = SvSTATE_current;
2977
2978 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2979}
2980
2981static void
2982api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2983{
2984 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2985
2986 /* this ought to be much cheaper than malloc + a single destructor call */
2987 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2988 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2158} 2989}
2159 2990
2160/*****************************************************************************/ 2991/*****************************************************************************/
2161/* PerlIO::cede */ 2992/* PerlIO::cede */
2162 2993
… …
2164{ 2995{
2165 PerlIOBuf base; 2996 PerlIOBuf base;
2166 NV next, every; 2997 NV next, every;
2167} PerlIOCede; 2998} PerlIOCede;
2168 2999
2169static IV 3000static IV ecb_cold
2170PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3001PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2171{ 3002{
2172 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2173 3004
2174 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3005 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2175 self->next = nvtime () + self->every; 3006 self->next = nvtime () + self->every;
2176 3007
2177 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3008 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2178} 3009}
2179 3010
2180static SV * 3011static SV * ecb_cold
2181PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3012PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2182{ 3013{
2183 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3014 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2184 3015
2185 return newSVnv (self->every); 3016 return newSVnv (self->every);
… …
2236/* Coro::Semaphore & Coro::Signal */ 3067/* Coro::Semaphore & Coro::Signal */
2237 3068
2238static SV * 3069static SV *
2239coro_waitarray_new (pTHX_ int count) 3070coro_waitarray_new (pTHX_ int count)
2240{ 3071{
2241 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3072 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2242 AV *av = newAV (); 3073 AV *av = newAV ();
2243 SV **ary; 3074 SV **ary;
2244 3075
2245 /* unfortunately, building manually saves memory */ 3076 /* unfortunately, building manually saves memory */
2246 Newx (ary, 2, SV *); 3077 Newx (ary, 2, SV *);
2247 AvALLOC (av) = ary; 3078 AvALLOC (av) = ary;
3079#if PERL_VERSION_ATLEAST (5,10,0)
2248 /*AvARRAY (av) = ary;*/ 3080 AvARRAY (av) = ary;
3081#else
2249 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 3082 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
3083 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
3084 SvPVX ((SV *)av) = (char *)ary;
3085#endif
2250 AvMAX (av) = 1; 3086 AvMAX (av) = 1;
2251 AvFILLp (av) = 0; 3087 AvFILLp (av) = 0;
2252 ary [0] = newSViv (count); 3088 ary [0] = newSViv (count);
2253 3089
2254 return newRV_noinc ((SV *)av); 3090 return newRV_noinc ((SV *)av);
… …
2287 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3123 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2288 PUTBACK; 3124 PUTBACK;
2289 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3125 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2290 } 3126 }
2291 3127
2292 SvREFCNT_dec (cb); 3128 SvREFCNT_dec_NN (cb);
2293 } 3129 }
2294} 3130}
2295 3131
2296static void 3132static void
2297coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3133coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2298{ 3134{
2299 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3135 /* call $sem->adjust (0) to possibly wake up some other waiters */
2300 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3136 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2301} 3137}
2302 3138
2303static int 3139static int
2304slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3140slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2305{ 3141{
2306 AV *av = (AV *)frame->data; 3142 AV *av = (AV *)frame->data;
2307 SV *count_sv = AvARRAY (av)[0]; 3143 SV *count_sv = AvARRAY (av)[0];
3144 SV *coro_hv = SvRV (coro_current);
3145
3146 frame->destroy = 0;
2308 3147
2309 /* if we are about to throw, don't actually acquire the lock, just throw */ 3148 /* if we are about to throw, don't actually acquire the lock, just throw */
2310 if (CORO_THROW) 3149 if (ecb_expect_false (CORO_THROW))
3150 {
3151 /* we still might be responsible for the semaphore, so wake up others */
3152 coro_semaphore_adjust (aTHX_ av, 0);
3153
2311 return 0; 3154 return 0;
3155 }
2312 else if (SvIVX (count_sv) > 0) 3156 else if (SvIVX (count_sv) > 0)
2313 { 3157 {
2314 SvSTATE_current->on_destroy = 0;
2315
2316 if (acquire) 3158 if (acquire)
2317 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3159 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2318 else 3160 else
2319 coro_semaphore_adjust (aTHX_ av, 0); 3161 coro_semaphore_adjust (aTHX_ av, 0);
2320 3162
… …
2324 { 3166 {
2325 int i; 3167 int i;
2326 /* if we were woken up but can't down, we look through the whole */ 3168 /* if we were woken up but can't down, we look through the whole */
2327 /* waiters list and only add us if we aren't in there already */ 3169 /* waiters list and only add us if we aren't in there already */
2328 /* this avoids some degenerate memory usage cases */ 3170 /* this avoids some degenerate memory usage cases */
2329 3171 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2330 for (i = 1; i <= AvFILLp (av); ++i)
2331 if (AvARRAY (av)[i] == SvRV (coro_current)) 3172 if (AvARRAY (av)[i] == coro_hv)
2332 return 1; 3173 return 1;
2333 3174
2334 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3175 av_push (av, SvREFCNT_inc (coro_hv));
2335 return 1; 3176 return 1;
2336 } 3177 }
2337} 3178}
2338 3179
2339static int 3180static int
… …
2362 { 3203 {
2363 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3204 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2364 3205
2365 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3206 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2366 frame->prepare = prepare_schedule; 3207 frame->prepare = prepare_schedule;
2367
2368 /* to avoid race conditions when a woken-up coro gets terminated */ 3208 /* to avoid race conditions when a woken-up coro gets terminated */
2369 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3209 /* we arrange for a temporary on_destroy that calls adjust (0) */
2370 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3210 frame->destroy = coro_semaphore_destroy;
2371 } 3211 }
2372} 3212}
2373 3213
2374static void 3214static void
2375slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3215slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2383{ 3223{
2384 if (items >= 2) 3224 if (items >= 2)
2385 { 3225 {
2386 /* callback form */ 3226 /* callback form */
2387 AV *av = (AV *)SvRV (arg [0]); 3227 AV *av = (AV *)SvRV (arg [0]);
2388 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3228 SV *cb_cv = s_get_cv_croak (arg [1]);
2389 3229
2390 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3230 av_push (av, SvREFCNT_inc_NN (cb_cv));
2391 3231
2392 if (SvIVX (AvARRAY (av)[0]) > 0) 3232 if (SvIVX (AvARRAY (av)[0]) > 0)
2393 coro_semaphore_adjust (aTHX_ av, 0); 3233 coro_semaphore_adjust (aTHX_ av, 0);
2394 3234
2395 frame->prepare = prepare_nop; 3235 frame->prepare = prepare_nop;
… …
2419 AvARRAY (av)[0] = AvARRAY (av)[1]; 3259 AvARRAY (av)[0] = AvARRAY (av)[1];
2420 AvARRAY (av)[1] = cb; 3260 AvARRAY (av)[1] = cb;
2421 3261
2422 cb = av_shift (av); 3262 cb = av_shift (av);
2423 3263
3264 if (SvTYPE (cb) == SVt_PVCV)
3265 {
3266 dSP;
3267 PUSHMARK (SP);
3268 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3269 PUTBACK;
3270 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3271 }
3272 else
3273 {
2424 api_ready (aTHX_ cb); 3274 api_ready (aTHX_ cb);
2425 sv_setiv (cb, 0); /* signal waiter */ 3275 sv_setiv (cb, 0); /* signal waiter */
3276 }
3277
2426 SvREFCNT_dec (cb); 3278 SvREFCNT_dec_NN (cb);
2427 3279
2428 --count; 3280 --count;
2429 } 3281 }
2430} 3282}
2431 3283
… …
2439static void 3291static void
2440slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3292slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2441{ 3293{
2442 AV *av = (AV *)SvRV (arg [0]); 3294 AV *av = (AV *)SvRV (arg [0]);
2443 3295
3296 if (items >= 2)
3297 {
3298 SV *cb_cv = s_get_cv_croak (arg [1]);
3299 av_push (av, SvREFCNT_inc_NN (cb_cv));
3300
2444 if (SvIVX (AvARRAY (av)[0])) 3301 if (SvIVX (AvARRAY (av)[0]))
3302 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3303
3304 frame->prepare = prepare_nop;
3305 frame->check = slf_check_nop;
3306 }
3307 else if (SvIVX (AvARRAY (av)[0]))
2445 { 3308 {
2446 SvIVX (AvARRAY (av)[0]) = 0; 3309 SvIVX (AvARRAY (av)[0]) = 0;
2447 frame->prepare = prepare_nop; 3310 frame->prepare = prepare_nop;
2448 frame->check = slf_check_nop; 3311 frame->check = slf_check_nop;
2449 } 3312 }
2450 else 3313 else
2451 { 3314 {
2452 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3315 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2453 3316
2454 av_push (av, waiter); 3317 av_push (av, waiter);
2455 3318
2456 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3319 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2457 frame->prepare = prepare_schedule; 3320 frame->prepare = prepare_schedule;
… …
2475 3338
2476static void 3339static void
2477coro_aio_callback (pTHX_ CV *cv) 3340coro_aio_callback (pTHX_ CV *cv)
2478{ 3341{
2479 dXSARGS; 3342 dXSARGS;
2480 AV *state = (AV *)GENSUB_ARG; 3343 AV *state = (AV *)S_GENSUB_ARG;
2481 SV *coro = av_pop (state); 3344 SV *coro = av_pop (state);
2482 SV *data_sv = newSV (sizeof (struct io_state)); 3345 SV *data_sv = newSV (sizeof (struct io_state));
2483 3346
2484 av_extend (state, items - 1); 3347 av_extend (state, items - 1);
2485 3348
… …
2505 } 3368 }
2506 3369
2507 av_push (state, data_sv); 3370 av_push (state, data_sv);
2508 3371
2509 api_ready (aTHX_ coro); 3372 api_ready (aTHX_ coro);
2510 SvREFCNT_dec (coro); 3373 SvREFCNT_dec_NN (coro);
2511 SvREFCNT_dec ((AV *)state); 3374 SvREFCNT_dec_NN ((AV *)state);
2512} 3375}
2513 3376
2514static int 3377static int
2515slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3378slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2516{ 3379{
… …
2521 /* it quickly returns */ 3384 /* it quickly returns */
2522 if (CORO_THROW) 3385 if (CORO_THROW)
2523 return 0; 3386 return 0;
2524 3387
2525 /* one element that is an RV? repeat! */ 3388 /* one element that is an RV? repeat! */
2526 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3389 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2527 return 1; 3390 return 1;
2528 3391
2529 /* restore status */ 3392 /* restore status */
2530 { 3393 {
2531 SV *data_sv = av_pop (state); 3394 SV *data_sv = av_pop (state);
… …
2534 errno = data->errorno; 3397 errno = data->errorno;
2535 PL_laststype = data->laststype; 3398 PL_laststype = data->laststype;
2536 PL_laststatval = data->laststatval; 3399 PL_laststatval = data->laststatval;
2537 PL_statcache = data->statcache; 3400 PL_statcache = data->statcache;
2538 3401
2539 SvREFCNT_dec (data_sv); 3402 SvREFCNT_dec_NN (data_sv);
2540 } 3403 }
2541 3404
2542 /* push result values */ 3405 /* push result values */
2543 { 3406 {
2544 dSP; 3407 dSP;
… …
2570 dSP; 3433 dSP;
2571 3434
2572 static SV *prio_cv; 3435 static SV *prio_cv;
2573 static SV *prio_sv; 3436 static SV *prio_sv;
2574 3437
2575 if (expect_false (!prio_cv)) 3438 if (ecb_expect_false (!prio_cv))
2576 { 3439 {
2577 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3440 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2578 prio_sv = newSViv (0); 3441 prio_sv = newSViv (0);
2579 } 3442 }
2580 3443
… …
2599 3462
2600 for (i = 0; i < items; ++i) 3463 for (i = 0; i < items; ++i)
2601 PUSHs (arg [i]); 3464 PUSHs (arg [i]);
2602 3465
2603 /* now push the callback closure */ 3466 /* now push the callback closure */
2604 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3467 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2605 3468
2606 /* now call the AIO function - we assume our request is uncancelable */ 3469 /* now call the AIO function - we assume our request is uncancelable */
2607 PUTBACK; 3470 PUTBACK;
2608 call_sv ((SV *)req, G_VOID | G_DISCARD); 3471 call_sv ((SV *)req, G_VOID | G_DISCARD);
2609 } 3472 }
2610 3473
2611 /* now that the requets is going, we loop toll we have a result */ 3474 /* now that the request is going, we loop till we have a result */
2612 frame->data = (void *)state; 3475 frame->data = (void *)state;
2613 frame->prepare = prepare_schedule; 3476 frame->prepare = prepare_schedule;
2614 frame->check = slf_check_aio_req; 3477 frame->check = slf_check_aio_req;
2615} 3478}
2616 3479
… …
2624 XSRETURN_EMPTY; 3487 XSRETURN_EMPTY;
2625} 3488}
2626 3489
2627/*****************************************************************************/ 3490/*****************************************************************************/
2628 3491
3492#if CORO_CLONE
3493# include "clone.c"
3494#endif
3495
3496/*****************************************************************************/
3497
3498static SV *
3499coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3500{
3501 SV *coro_sv;
3502 struct coro *coro;
3503 MAGIC *mg;
3504 HV *hv;
3505 SV *cb;
3506 int i;
3507
3508 if (argc > 0)
3509 {
3510 cb = s_get_cv_croak (argv [0]);
3511
3512 if (!is_coro)
3513 {
3514 if (CvISXSUB (cb))
3515 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3516
3517 if (!CvROOT (cb))
3518 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3519 }
3520 }
3521
3522 Newz (0, coro, 1, struct coro);
3523 coro->args = newAV ();
3524 coro->flags = CF_NEW;
3525
3526 if (coro_first) coro_first->prev = coro;
3527 coro->next = coro_first;
3528 coro_first = coro;
3529
3530 coro->hv = hv = newHV ();
3531 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3532 mg->mg_flags |= MGf_DUP;
3533 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3534
3535 if (argc > 0)
3536 {
3537 av_extend (coro->args, argc + is_coro - 1);
3538
3539 if (is_coro)
3540 {
3541 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3542 cb = (SV *)cv_coro_run;
3543 }
3544
3545 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3546
3547 for (i = 1; i < argc; i++)
3548 av_push (coro->args, newSVsv (argv [i]));
3549 }
3550
3551 return coro_sv;
3552}
3553
3554#ifndef __cplusplus
3555ecb_cold XS(boot_Coro__State);
3556#endif
3557
3558#if CORO_JIT
3559
3560static void ecb_noinline ecb_cold
3561pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3562{
3563 dSP;
3564 AV *av = newAV ();
3565
3566 av_store (av, 3, newSVuv (d));
3567 av_store (av, 2, newSVuv (c));
3568 av_store (av, 1, newSVuv (b));
3569 av_store (av, 0, newSVuv (a));
3570
3571 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3572
3573 PUTBACK;
3574}
3575
3576static void ecb_noinline ecb_cold
3577jit_init (pTHX)
3578{
3579 dSP;
3580 SV *load, *save;
3581 char *map_base;
3582 char *load_ptr, *save_ptr;
3583 STRLEN load_len, save_len, map_len;
3584 int count;
3585
3586 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3587
3588 PUSHMARK (SP);
3589 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3590 #include "state.h"
3591 count = call_pv ("Coro::State::_jit", G_ARRAY);
3592 SPAGAIN;
3593
3594 save = POPs; save_ptr = SvPVbyte (save, save_len);
3595 load = POPs; load_ptr = SvPVbyte (load, load_len);
3596
3597 map_len = load_len + save_len + 16;
3598
3599 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3600
3601 if (map_base == (char *)MAP_FAILED)
3602 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3603
3604 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3605
3606 load_perl_slots = (load_save_perl_slots_type)map_base;
3607 memcpy (map_base, load_ptr, load_len);
3608
3609 map_base += (load_len + 15) & ~15;
3610
3611 save_perl_slots = (load_save_perl_slots_type)map_base;
3612 memcpy (map_base, save_ptr, save_len);
3613
3614 /* we are good citizens and try to make the page read-only, so the evil evil */
3615 /* hackers might have it a bit more difficult */
3616 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3617
3618 PUTBACK;
3619 eval_pv ("undef &Coro::State::_jit", 1);
3620}
3621
3622#endif
3623
2629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2630 3625
2631PROTOTYPES: DISABLE 3626PROTOTYPES: DISABLE
2632 3627
2633BOOT: 3628BOOT:
2634{ 3629{
3630#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3631#include "state.h"
2635#ifdef USE_ITHREADS 3632#ifdef USE_ITHREADS
2636# if CORO_PTHREAD 3633# if CORO_PTHREAD
2637 coro_thx = PERL_GET_CONTEXT; 3634 coro_thx = PERL_GET_CONTEXT;
2638# endif 3635# endif
2639#endif 3636#endif
2640 BOOT_PAGESIZE; 3637 /* perl defines these to check for existance first, but why it doesn't */
3638 /* just create them one at init time is not clear to me, except for */
3639 /* programs trying to delete them, but... */
3640 /* anyway, we declare this as invalid and make sure they are initialised here */
3641 DEFSV;
3642 ERRSV;
3643
3644 cctx_current = cctx_new_empty ();
2641 3645
2642 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3646 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2643 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3647 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2644 3648
2645 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3649 {
2646 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3650 /*
2647 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3651 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3652 * by coro_sig_vtbl in hash values.
3653 */
3654 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3655
3656 /* this only works if perl doesn't have a vtbl for %SIG */
3657 assert (!mg->mg_virtual);
3658
3659 /*
3660 * The irony is that the perl API itself asserts that mg_virtual
3661 * must be non-const, yet perl5porters insisted on marking their
3662 * vtbls as read-only, just to thwart perl modules from patching
3663 * them.
3664 */
3665 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3666 mg->mg_flags |= MGf_COPY;
3667
3668 coro_sigelem_vtbl = PL_vtbl_sigelem;
3669 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3670 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3671 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3672 }
2648 3673
2649 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2650 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3674 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2651 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3675 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2652 3676
2653 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3677 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2654 3678
… …
2665 3689
2666 { 3690 {
2667 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3691 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2668 3692
2669 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3693 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2670 hv_store_ent (PL_custom_op_names, slf, 3694 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2671 newSVpv ("coro_slf", 0), 0);
2672 3695
2673 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3696 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2674 hv_store_ent (PL_custom_op_descs, slf, 3697 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2675 newSVpv ("coro schedule like function", 0), 0);
2676 } 3698 }
2677 3699
2678 coroapi.ver = CORO_API_VERSION; 3700 coroapi.ver = CORO_API_VERSION;
2679 coroapi.rev = CORO_API_REVISION; 3701 coroapi.rev = CORO_API_REVISION;
2680 3702
… …
2685 coroapi.prepare_nop = prepare_nop; 3707 coroapi.prepare_nop = prepare_nop;
2686 coroapi.prepare_schedule = prepare_schedule; 3708 coroapi.prepare_schedule = prepare_schedule;
2687 coroapi.prepare_cede = prepare_cede; 3709 coroapi.prepare_cede = prepare_cede;
2688 coroapi.prepare_cede_notself = prepare_cede_notself; 3710 coroapi.prepare_cede_notself = prepare_cede_notself;
2689 3711
2690 { 3712 time_init (aTHX);
2691 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2692 3713
2693 if (!svp) croak ("Time::HiRes is required");
2694 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2695
2696 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2697 }
2698
2699 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3714 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3715#if CORO_JIT
3716 PUTBACK;
3717 jit_init (aTHX);
3718 SPAGAIN;
3719#endif
2700} 3720}
2701 3721
2702SV * 3722SV *
2703new (char *klass, ...) 3723new (SV *klass, ...)
2704 ALIAS: 3724 ALIAS:
2705 Coro::new = 1 3725 Coro::new = 1
2706 CODE: 3726 CODE:
2707{ 3727 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2708 struct coro *coro; 3728 OUTPUT:
2709 MAGIC *mg;
2710 HV *hv;
2711 CV *cb;
2712 int i;
2713
2714 if (items > 1)
2715 {
2716 cb = coro_sv_2cv (aTHX_ ST (1));
2717
2718 if (!ix)
2719 {
2720 if (CvISXSUB (cb))
2721 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2722
2723 if (!CvROOT (cb))
2724 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2725 }
2726 }
2727
2728 Newz (0, coro, 1, struct coro);
2729 coro->args = newAV ();
2730 coro->flags = CF_NEW;
2731
2732 if (coro_first) coro_first->prev = coro;
2733 coro->next = coro_first;
2734 coro_first = coro;
2735
2736 coro->hv = hv = newHV ();
2737 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2738 mg->mg_flags |= MGf_DUP;
2739 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2740
2741 if (items > 1)
2742 {
2743 av_extend (coro->args, items - 1 + ix - 1);
2744
2745 if (ix)
2746 {
2747 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2748 cb = cv_coro_run;
2749 }
2750
2751 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2752
2753 for (i = 2; i < items; i++)
2754 av_push (coro->args, newSVsv (ST (i)));
2755 }
2756}
2757 OUTPUT:
2758 RETVAL 3729 RETVAL
2759 3730
2760void 3731void
2761transfer (...) 3732transfer (...)
2762 PROTOTYPE: $$ 3733 PROTOTYPE: $$
2763 CODE: 3734 CODE:
2764 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3735 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2765 3736
2766bool 3737SV *
2767_destroy (SV *coro_sv) 3738clone (Coro::State coro)
2768 CODE: 3739 CODE:
2769 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 3740{
3741#if CORO_CLONE
3742 struct coro *ncoro = coro_clone (aTHX_ coro);
3743 MAGIC *mg;
3744 /* TODO: too much duplication */
3745 ncoro->hv = newHV ();
3746 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3747 mg->mg_flags |= MGf_DUP;
3748 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3749#else
3750 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3751#endif
3752}
2770 OUTPUT: 3753 OUTPUT:
2771 RETVAL 3754 RETVAL
2772
2773void
2774_exit (int code)
2775 PROTOTYPE: $
2776 CODE:
2777 _exit (code);
2778 3755
2779int 3756int
2780cctx_stacksize (int new_stacksize = 0) 3757cctx_stacksize (int new_stacksize = 0)
2781 PROTOTYPE: ;$ 3758 PROTOTYPE: ;$
2782 CODE: 3759 CODE:
… …
2818void 3795void
2819list () 3796list ()
2820 PROTOTYPE: 3797 PROTOTYPE:
2821 PPCODE: 3798 PPCODE:
2822{ 3799{
2823 struct coro *coro; 3800 struct coro *coro;
2824 for (coro = coro_first; coro; coro = coro->next) 3801 for (coro = coro_first; coro; coro = coro->next)
2825 if (coro->hv) 3802 if (coro->hv)
2826 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3803 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2827} 3804}
2828 3805
… …
2832 eval = 1 3809 eval = 1
2833 CODE: 3810 CODE:
2834{ 3811{
2835 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3812 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2836 { 3813 {
2837 struct coro temp; 3814 struct coro *current = SvSTATE_current;
3815 struct CoroSLF slf_save;
2838 3816
2839 if (!(coro->flags & CF_RUNNING)) 3817 if (current != coro)
2840 { 3818 {
2841 PUTBACK; 3819 PUTBACK;
2842 save_perl (aTHX_ &temp); 3820 save_perl (aTHX_ current);
2843 load_perl (aTHX_ coro); 3821 load_perl (aTHX_ coro);
3822 /* the coro is most likely in an active SLF call.
3823 * while not strictly required (the code we execute is
3824 * not allowed to call any SLF functions), it's cleaner
3825 * to reinitialise the slf_frame and restore it later.
3826 * This might one day allow us to actually do SLF calls
3827 * from code executed here.
3828 */
3829 slf_save = slf_frame;
3830 slf_frame.prepare = 0;
3831 SPAGAIN;
2844 } 3832 }
2845 3833
2846 {
2847 dSP;
2848 ENTER;
2849 SAVETMPS;
2850 PUTBACK;
2851 PUSHSTACK; 3834 PUSHSTACK;
3835
2852 PUSHMARK (SP); 3836 PUSHMARK (SP);
3837 PUTBACK;
2853 3838
2854 if (ix) 3839 if (ix)
2855 eval_sv (coderef, 0); 3840 eval_sv (coderef, 0);
2856 else 3841 else
2857 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3842 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2858 3843
2859 POPSTACK; 3844 POPSTACK;
2860 SPAGAIN; 3845 SPAGAIN;
2861 FREETMPS;
2862 LEAVE;
2863 PUTBACK;
2864 }
2865 3846
2866 if (!(coro->flags & CF_RUNNING)) 3847 if (current != coro)
2867 { 3848 {
3849 PUTBACK;
3850 slf_frame = slf_save;
2868 save_perl (aTHX_ coro); 3851 save_perl (aTHX_ coro);
2869 load_perl (aTHX_ &temp); 3852 load_perl (aTHX_ current);
2870 SPAGAIN; 3853 SPAGAIN;
2871 } 3854 }
2872 } 3855 }
2873} 3856}
2874 3857
… …
2877 PROTOTYPE: $ 3860 PROTOTYPE: $
2878 ALIAS: 3861 ALIAS:
2879 is_ready = CF_READY 3862 is_ready = CF_READY
2880 is_running = CF_RUNNING 3863 is_running = CF_RUNNING
2881 is_new = CF_NEW 3864 is_new = CF_NEW
2882 is_destroyed = CF_DESTROYED 3865 is_destroyed = CF_ZOMBIE
3866 is_zombie = CF_ZOMBIE
3867 is_suspended = CF_SUSPENDED
2883 CODE: 3868 CODE:
2884 RETVAL = boolSV (coro->flags & ix); 3869 RETVAL = boolSV (coro->flags & ix);
2885 OUTPUT: 3870 OUTPUT:
2886 RETVAL 3871 RETVAL
2887 3872
2888void 3873void
2889throw (Coro::State self, SV *throw = &PL_sv_undef) 3874throw (SV *self, SV *exception = &PL_sv_undef)
2890 PROTOTYPE: $;$ 3875 PROTOTYPE: $;$
2891 CODE: 3876 CODE:
2892{ 3877{
3878 struct coro *coro = SvSTATE (self);
2893 struct coro *current = SvSTATE_current; 3879 struct coro *current = SvSTATE_current;
2894 SV **throwp = self == current ? &CORO_THROW : &self->except; 3880 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
2895 SvREFCNT_dec (*throwp); 3881 SvREFCNT_dec (*exceptionp);
2896 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3882 SvGETMAGIC (exception);
3883 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3884
3885 api_ready (aTHX_ self);
2897} 3886}
2898 3887
2899void 3888void
2900api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3889api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2901 PROTOTYPE: $;$ 3890 PROTOTYPE: $;$
… …
2903 3892
2904SV * 3893SV *
2905has_cctx (Coro::State coro) 3894has_cctx (Coro::State coro)
2906 PROTOTYPE: $ 3895 PROTOTYPE: $
2907 CODE: 3896 CODE:
2908 RETVAL = boolSV (!!coro->cctx); 3897 /* maybe manage the running flag differently */
3898 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2909 OUTPUT: 3899 OUTPUT:
2910 RETVAL 3900 RETVAL
2911 3901
2912int 3902int
2913is_traced (Coro::State coro) 3903is_traced (Coro::State coro)
… …
2933 3923
2934void 3924void
2935force_cctx () 3925force_cctx ()
2936 PROTOTYPE: 3926 PROTOTYPE:
2937 CODE: 3927 CODE:
2938 SvSTATE_current->cctx->idle_sp = 0; 3928 cctx_current->idle_sp = 0;
2939 3929
2940void 3930void
2941swap_defsv (Coro::State self) 3931swap_defsv (Coro::State self)
2942 PROTOTYPE: $ 3932 PROTOTYPE: $
2943 ALIAS: 3933 ALIAS:
… …
2951 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3941 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2952 3942
2953 SV *tmp = *src; *src = *dst; *dst = tmp; 3943 SV *tmp = *src; *src = *dst; *dst = tmp;
2954 } 3944 }
2955 3945
3946void
3947cancel (Coro::State self)
3948 CODE:
3949 coro_state_destroy (aTHX_ self);
3950
3951SV *
3952enable_times (int enabled = enable_times)
3953 CODE:
3954{
3955 RETVAL = boolSV (enable_times);
3956
3957 if (enabled != enable_times)
3958 {
3959 enable_times = enabled;
3960
3961 coro_times_update ();
3962 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3963 }
3964}
3965 OUTPUT:
3966 RETVAL
3967
3968void
3969times (Coro::State self)
3970 PPCODE:
3971{
3972 struct coro *current = SvSTATE (coro_current);
3973
3974 if (ecb_expect_false (current == self))
3975 {
3976 coro_times_update ();
3977 coro_times_add (SvSTATE (coro_current));
3978 }
3979
3980 EXTEND (SP, 2);
3981 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3982 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3983
3984 if (ecb_expect_false (current == self))
3985 coro_times_sub (SvSTATE (coro_current));
3986}
3987
3988void
3989swap_sv (Coro::State coro, SV *sva, SV *svb)
3990 CODE:
3991{
3992 struct coro *current = SvSTATE_current;
3993 AV *swap_sv;
3994 int i;
3995
3996 sva = SvRV (sva);
3997 svb = SvRV (svb);
3998
3999 if (current == coro)
4000 SWAP_SVS_LEAVE (current);
4001
4002 if (!coro->swap_sv)
4003 coro->swap_sv = newAV ();
4004
4005 swap_sv = coro->swap_sv;
4006
4007 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4008 {
4009 SV *a = AvARRAY (swap_sv)[i ];
4010 SV *b = AvARRAY (swap_sv)[i + 1];
4011
4012 if (a == sva && b == svb)
4013 {
4014 SvREFCNT_dec_NN (a);
4015 SvREFCNT_dec_NN (b);
4016
4017 for (; i <= AvFILLp (swap_sv) - 2; i++)
4018 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4019
4020 AvFILLp (swap_sv) -= 2;
4021
4022 goto removed;
4023 }
4024 }
4025
4026 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4027 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4028
4029 removed:
4030
4031 if (current == coro)
4032 SWAP_SVS_ENTER (current);
4033}
4034
2956 4035
2957MODULE = Coro::State PACKAGE = Coro 4036MODULE = Coro::State PACKAGE = Coro
2958 4037
2959BOOT: 4038BOOT:
2960{ 4039{
2961 int i; 4040 if (SVt_LAST > 32)
4041 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
2962 4042
2963 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2964 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4043 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2965 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4044 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2966 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 4045 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2967 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2968 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4046 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
4047 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
4048 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
4049 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
4050 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2969 4051
2970 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4052 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2971 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4053 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2972 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4054 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2973 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4055 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2974 4056
2975 coro_stash = gv_stashpv ("Coro", TRUE); 4057 coro_stash = gv_stashpv ("Coro", TRUE);
2976 4058
2977 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4059 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2978 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4060 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2979 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4061 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2980 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4062 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2981 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4063 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2982 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4064 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2983
2984 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2985 coro_ready[i] = newAV ();
2986 4065
2987 { 4066 {
2988 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4067 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2989 4068
2990 coroapi.schedule = api_schedule; 4069 coroapi.schedule = api_schedule;
4070 coroapi.schedule_to = api_schedule_to;
2991 coroapi.cede = api_cede; 4071 coroapi.cede = api_cede;
2992 coroapi.cede_notself = api_cede_notself; 4072 coroapi.cede_notself = api_cede_notself;
2993 coroapi.ready = api_ready; 4073 coroapi.ready = api_ready;
2994 coroapi.is_ready = api_is_ready; 4074 coroapi.is_ready = api_is_ready;
2995 coroapi.nready = coro_nready; 4075 coroapi.nready = coro_nready;
2996 coroapi.current = coro_current; 4076 coroapi.current = coro_current;
2997 4077
4078 coroapi.enterleave_hook = api_enterleave_hook;
4079 coroapi.enterleave_unhook = api_enterleave_unhook;
4080 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4081
2998 /*GCoroAPI = &coroapi;*/ 4082 /*GCoroAPI = &coroapi;*/
2999 sv_setiv (sv, (IV)&coroapi); 4083 sv_setiv (sv, PTR2IV (&coroapi));
3000 SvREADONLY_on (sv); 4084 SvREADONLY_on (sv);
3001 } 4085 }
3002} 4086}
4087
4088SV *
4089async (...)
4090 PROTOTYPE: &@
4091 CODE:
4092 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4093 api_ready (aTHX_ RETVAL);
4094 OUTPUT:
4095 RETVAL
4096
4097void
4098_destroy (Coro::State coro)
4099 CODE:
4100 /* used by the manager thread */
4101 coro_state_destroy (aTHX_ coro);
4102
4103void
4104on_destroy (Coro::State coro, SV *cb)
4105 CODE:
4106 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4107
4108void
4109join (...)
4110 CODE:
4111 CORO_EXECUTE_SLF_XS (slf_init_join);
4112
4113void
4114terminate (...)
4115 CODE:
4116 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4117
4118void
4119cancel (...)
4120 CODE:
4121 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4122
4123int
4124safe_cancel (Coro::State self, ...)
4125 C_ARGS: aTHX_ self, &ST (1), items - 1
3003 4126
3004void 4127void
3005schedule (...) 4128schedule (...)
3006 CODE: 4129 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4130 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3008 4131
3009void 4132void
4133schedule_to (...)
4134 CODE:
4135 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
4136
4137void
4138cede_to (...)
4139 CODE:
4140 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
4141
4142void
3010cede (...) 4143cede (...)
3011 CODE: 4144 CODE:
3012 CORO_EXECUTE_SLF_XS (slf_init_cede); 4145 CORO_EXECUTE_SLF_XS (slf_init_cede);
3013 4146
3014void 4147void
… …
3018 4151
3019void 4152void
3020_set_current (SV *current) 4153_set_current (SV *current)
3021 PROTOTYPE: $ 4154 PROTOTYPE: $
3022 CODE: 4155 CODE:
3023 SvREFCNT_dec (SvRV (coro_current)); 4156 SvREFCNT_dec_NN (SvRV (coro_current));
3024 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4157 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3025 4158
3026void 4159void
3027_set_readyhook (SV *hook) 4160_set_readyhook (SV *hook)
3028 PROTOTYPE: $ 4161 PROTOTYPE: $
3029 CODE: 4162 CODE:
3030 SvREFCNT_dec (coro_readyhook); 4163 SvREFCNT_dec (coro_readyhook);
4164 SvGETMAGIC (hook);
4165 if (SvOK (hook))
4166 {
3031 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4167 coro_readyhook = newSVsv (hook);
4168 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4169 }
4170 else
4171 {
4172 coro_readyhook = 0;
4173 CORO_READYHOOK = 0;
4174 }
3032 4175
3033int 4176int
3034prio (Coro::State coro, int newprio = 0) 4177prio (Coro::State coro, int newprio = 0)
3035 PROTOTYPE: $;$ 4178 PROTOTYPE: $;$
3036 ALIAS: 4179 ALIAS:
… …
3042 if (items > 1) 4185 if (items > 1)
3043 { 4186 {
3044 if (ix) 4187 if (ix)
3045 newprio = coro->prio - newprio; 4188 newprio = coro->prio - newprio;
3046 4189
3047 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4190 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3048 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4191 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3049 4192
3050 coro->prio = newprio; 4193 coro->prio = newprio;
3051 } 4194 }
3052} 4195}
3053 OUTPUT: 4196 OUTPUT:
… …
3068 RETVAL = coro_nready; 4211 RETVAL = coro_nready;
3069 OUTPUT: 4212 OUTPUT:
3070 RETVAL 4213 RETVAL
3071 4214
3072void 4215void
4216suspend (Coro::State self)
4217 PROTOTYPE: $
4218 CODE:
4219 self->flags |= CF_SUSPENDED;
4220
4221void
4222resume (Coro::State self)
4223 PROTOTYPE: $
4224 CODE:
4225 self->flags &= ~CF_SUSPENDED;
4226
4227void
3073_pool_handler (...) 4228_pool_handler (...)
3074 CODE: 4229 CODE:
3075 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4230 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3076 4231
3077void 4232void
… …
3088 for (i = 1; i < items; ++i) 4243 for (i = 1; i < items; ++i)
3089 av_push (av, SvREFCNT_inc_NN (ST (i))); 4244 av_push (av, SvREFCNT_inc_NN (ST (i)));
3090 4245
3091 if ((SV *)hv == &PL_sv_undef) 4246 if ((SV *)hv == &PL_sv_undef)
3092 { 4247 {
3093 PUSHMARK (SP); 4248 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3094 EXTEND (SP, 2);
3095 PUSHs (sv_Coro);
3096 PUSHs ((SV *)cv_pool_handler);
3097 PUTBACK;
3098 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3099 SPAGAIN;
3100
3101 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4249 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4250 SvREFCNT_dec_NN (sv);
3102 } 4251 }
3103 4252
3104 { 4253 {
3105 struct coro *coro = SvSTATE_hv (hv); 4254 struct coro *coro = SvSTATE_hv (hv);
3106 4255
… …
3113 api_ready (aTHX_ (SV *)hv); 4262 api_ready (aTHX_ (SV *)hv);
3114 4263
3115 if (GIMME_V != G_VOID) 4264 if (GIMME_V != G_VOID)
3116 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4265 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3117 else 4266 else
3118 SvREFCNT_dec (hv); 4267 SvREFCNT_dec_NN (hv);
3119} 4268}
3120 4269
3121SV * 4270SV *
3122rouse_cb () 4271rouse_cb ()
3123 PROTOTYPE: 4272 PROTOTYPE:
… …
3130rouse_wait (...) 4279rouse_wait (...)
3131 PROTOTYPE: ;$ 4280 PROTOTYPE: ;$
3132 PPCODE: 4281 PPCODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4282 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3134 4283
4284void
4285on_enter (SV *block)
4286 ALIAS:
4287 on_leave = 1
4288 PROTOTYPE: &
4289 CODE:
4290{
4291 struct coro *coro = SvSTATE_current;
4292 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4293
4294 block = s_get_cv_croak (block);
4295
4296 if (!*avp)
4297 *avp = newAV ();
4298
4299 av_push (*avp, SvREFCNT_inc (block));
4300
4301 if (!ix)
4302 on_enterleave_call (aTHX_ block);
4303
4304 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4305 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4306 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4307}
4308
3135 4309
3136MODULE = Coro::State PACKAGE = PerlIO::cede 4310MODULE = Coro::State PACKAGE = PerlIO::cede
3137 4311
3138BOOT: 4312BOOT:
3139 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4313 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3142MODULE = Coro::State PACKAGE = Coro::Semaphore 4316MODULE = Coro::State PACKAGE = Coro::Semaphore
3143 4317
3144SV * 4318SV *
3145new (SV *klass, SV *count = 0) 4319new (SV *klass, SV *count = 0)
3146 CODE: 4320 CODE:
4321{
4322 int semcnt = 1;
4323
4324 if (count)
4325 {
4326 SvGETMAGIC (count);
4327
4328 if (SvOK (count))
4329 semcnt = SvIV (count);
4330 }
4331
3147 RETVAL = sv_bless ( 4332 RETVAL = sv_bless (
3148 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4333 coro_waitarray_new (aTHX_ semcnt),
3149 GvSTASH (CvGV (cv)) 4334 GvSTASH (CvGV (cv))
3150 ); 4335 );
4336}
3151 OUTPUT: 4337 OUTPUT:
3152 RETVAL 4338 RETVAL
3153 4339
3154# helper for Coro::Channel 4340# helper for Coro::Channel and others
3155SV * 4341SV *
3156_alloc (int count) 4342_alloc (int count)
3157 CODE: 4343 CODE:
3158 RETVAL = coro_waitarray_new (aTHX_ count); 4344 RETVAL = coro_waitarray_new (aTHX_ count);
3159 OUTPUT: 4345 OUTPUT:
… …
3165 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4351 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3166 OUTPUT: 4352 OUTPUT:
3167 RETVAL 4353 RETVAL
3168 4354
3169void 4355void
3170up (SV *self, int adjust = 1) 4356up (SV *self)
3171 ALIAS:
3172 adjust = 1
3173 CODE: 4357 CODE:
4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4359
4360void
4361adjust (SV *self, int adjust)
4362 CODE:
3174 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4363 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3175 4364
3176void 4365void
3177down (...) 4366down (...)
3178 CODE: 4367 CODE:
3179 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4368 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3201 XSRETURN_NO; 4390 XSRETURN_NO;
3202} 4391}
3203 4392
3204void 4393void
3205waiters (SV *self) 4394waiters (SV *self)
3206 PPCODE: 4395 PPCODE:
3207{ 4396{
3208 AV *av = (AV *)SvRV (self); 4397 AV *av = (AV *)SvRV (self);
3209 int wcount = AvFILLp (av) + 1 - 1; 4398 int wcount = AvFILLp (av) + 1 - 1;
3210 4399
3211 if (GIMME_V == G_SCALAR) 4400 if (GIMME_V == G_SCALAR)
… …
3217 for (i = 1; i <= wcount; ++i) 4406 for (i = 1; i <= wcount; ++i)
3218 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4407 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3219 } 4408 }
3220} 4409}
3221 4410
4411MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4412
4413void
4414_may_delete (SV *sem, int count, unsigned int extra_refs)
4415 PPCODE:
4416{
4417 AV *av = (AV *)SvRV (sem);
4418
4419 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4420 && AvFILLp (av) == 0 /* no waiters, just count */
4421 && SvIV (AvARRAY (av)[0]) == count)
4422 XSRETURN_YES;
4423
4424 XSRETURN_NO;
4425}
4426
3222MODULE = Coro::State PACKAGE = Coro::Signal 4427MODULE = Coro::State PACKAGE = Coro::Signal
3223 4428
3224SV * 4429SV *
3225new (SV *klass) 4430new (SV *klass)
3226 CODE: 4431 CODE:
… …
3238 4443
3239void 4444void
3240broadcast (SV *self) 4445broadcast (SV *self)
3241 CODE: 4446 CODE:
3242{ 4447{
3243 AV *av = (AV *)SvRV (self); 4448 AV *av = (AV *)SvRV (self);
3244 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4449 coro_signal_wake (aTHX_ av, AvFILLp (av));
3245} 4450}
3246 4451
3247void 4452void
3248send (SV *self) 4453send (SV *self)
… …
3256 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4461 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3257} 4462}
3258 4463
3259IV 4464IV
3260awaited (SV *self) 4465awaited (SV *self)
3261 CODE: 4466 CODE:
3262 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4467 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3263 OUTPUT: 4468 OUTPUT:
3264 RETVAL 4469 RETVAL
3265 4470
3266 4471
… …
3271 4476
3272void 4477void
3273_schedule (...) 4478_schedule (...)
3274 CODE: 4479 CODE:
3275{ 4480{
3276 static int incede; 4481 static int incede;
3277 4482
3278 api_cede_notself (aTHX); 4483 api_cede_notself (aTHX);
3279 4484
3280 ++incede; 4485 ++incede;
3281 while (coro_nready >= incede && api_cede (aTHX)) 4486 while (coro_nready >= incede && api_cede (aTHX))
… …
3297 4502
3298void 4503void
3299_register (char *target, char *proto, SV *req) 4504_register (char *target, char *proto, SV *req)
3300 CODE: 4505 CODE:
3301{ 4506{
3302 CV *req_cv = coro_sv_2cv (aTHX_ req); 4507 SV *req_cv = s_get_cv_croak (req);
3303 /* newXSproto doesn't return the CV on 5.8 */ 4508 /* newXSproto doesn't return the CV on 5.8 */
3304 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4509 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3305 sv_setpv ((SV *)slf_cv, proto); 4510 sv_setpv ((SV *)slf_cv, proto);
3306 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4511 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3307} 4512}
3308 4513
4514MODULE = Coro::State PACKAGE = Coro::Select
4515
4516void
4517patch_pp_sselect ()
4518 CODE:
4519 if (!coro_old_pp_sselect)
4520 {
4521 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4522 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4523 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4524 }
4525
4526void
4527unpatch_pp_sselect ()
4528 CODE:
4529 if (coro_old_pp_sselect)
4530 {
4531 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4532 coro_old_pp_sselect = 0;
4533 }
4534
4535MODULE = Coro::State PACKAGE = Coro::Util
4536
4537void
4538_exit (int code)
4539 CODE:
4540 _exit (code);
4541
4542NV
4543time ()
4544 CODE:
4545 RETVAL = nvtime (aTHX);
4546 OUTPUT:
4547 RETVAL
4548
4549NV
4550gettimeofday ()
4551 PPCODE:
4552{
4553 UV tv [2];
4554 u2time (aTHX_ tv);
4555 EXTEND (SP, 2);
4556 PUSHs (sv_2mortal (newSVuv (tv [0])));
4557 PUSHs (sv_2mortal (newSVuv (tv [1])));
4558}
4559

Diff Legend

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