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.333 by root, Thu Nov 27 12:39:00 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#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 83#endif
122 84
123/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
136#endif 98#endif
137 99
138#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
139 101
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 102#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
157 104
158#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 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
164static 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]);
165 141
166/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 144static OP *pp_slf (pTHX);
145static void slf_destroy (pTHX_ struct coro *coro);
169 146
170static U32 cctx_gen; 147static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 148static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 149static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 150static AV *main_mainstack; /* used to differentiate between $main and others */
… …
181 158
182static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
183static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
184static SV *rv_diehook; 161static SV *rv_diehook;
185static SV *rv_warnhook; 162static SV *rv_warnhook;
186static HV *hv_sig; /* %SIG */
187 163
188/* async_pool helper stuff */ 164/* async_pool helper stuff */
189static SV *sv_pool_rss; 165static SV *sv_pool_rss;
190static SV *sv_pool_size; 166static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 168static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 169static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 170static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 171
197/* Coro::AnyEvent */ 172/* Coro::AnyEvent */
198static SV *sv_activity; 173static SV *sv_activity;
199 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
200static struct coro_cctx *cctx_first; 181static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 182static int cctx_count, cctx_idle;
202 183
203enum { 184enum
185{
204 CC_MAPPED = 0x01, 186 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 187 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 188 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 189 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 190 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 195typedef struct coro_cctx
214{ 196{
215 struct coro_cctx *next; 197 struct coro_cctx *next;
216 198
217 /* the stack */ 199 /* the stack */
218 void *sptr; 200 struct coro_stack stack;
219 size_t ssize;
220 201
221 /* cpu state */ 202 /* cpu state */
222 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
223 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
224 JMPENV *top_env; 207 JMPENV *top_env;
225 coro_context cctx; 208 coro_context cctx;
226 209
227 U32 gen; 210 U32 gen;
228#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
229 int valgrind_id; 212 int valgrind_id;
230#endif 213#endif
231 unsigned char flags; 214 unsigned char flags;
232} coro_cctx; 215} coro_cctx;
233 216
234coro_cctx *cctx_current; /* the currently running cctx */ 217static coro_cctx *cctx_current; /* the currently running cctx */
235 218
236/*****************************************************************************/ 219/*****************************************************************************/
237 220
221static MGVTBL coro_state_vtbl;
222
238enum { 223enum
224{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 225 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 226 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 227 CF_NEW = 0x0004, /* has never been switched to */
242 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) */
243}; 231};
244 232
245/* 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 */
246typedef struct 234typedef struct
247{ 235{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
254# include "state.h" 237 #include "state.h"
255#undef VAR
256} perl_slots; 238} perl_slots;
257 239
240/* how many context stack entries do we need for perl_slots */
258#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))
259 242
260/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
261struct coro { 244struct coro
245{
262 /* the C coroutine allocated to this perl coroutine, if any */ 246 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 247 coro_cctx *cctx;
248
249 /* ready queue */
250 struct coro *next_ready;
264 251
265 /* state data */ 252 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 253 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 254 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 255 perl_slots *slot; /* basically the saved sp */
269 256
270 CV *startcv; /* the CV to execute */ 257 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 258 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 259 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 260 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 261
277 /* statistics */ 262 /* statistics */
278 int usecount; /* number of transfers to this coro */ 263 int usecount; /* number of transfers to this coro */
279 264
280 /* coro process data */ 265 /* coro process data */
281 int prio; 266 int prio;
282 SV *except; /* exception to be thrown */ 267 SV *except; /* exception to be thrown */
283 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 */
284 271
285 /* async_pool */ 272 /* async_pool */
286 SV *saved_deffh; 273 SV *saved_deffh;
287 SV *invoke_cb; 274 SV *invoke_cb;
288 AV *invoke_av; 275 AV *invoke_av;
289 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
290 /* linked list */ 287 /* linked list */
291 struct coro *next, *prev; 288 struct coro *next, *prev;
292}; 289};
293 290
294typedef struct coro *Coro__State; 291typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 292typedef struct coro *Coro__State_or_hashref;
296 293
297/* the following variables are effectively part of the perl context */ 294/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 295/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 296/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 297static struct CoroSLF slf_frame; /* the current slf frame */
301 298
302/** Coro ********************************************************************/ 299/** Coro ********************************************************************/
303 300
304#define PRIO_MAX 3 301#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 302#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 303#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 304#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 305#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 306#define CORO_PRIO_MIN -4
310 307
311/* for Coro.pm */ 308/* for Coro.pm */
312static SV *coro_current; 309static SV *coro_current;
313static SV *coro_readyhook; 310static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 311static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 312static CV *cv_coro_run;
316static struct coro *coro_first; 313static struct coro *coro_first;
317#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
318 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
319/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
320 412
321static SV * 413static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
323{ 415{
324#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 418 get_sv (name, create);
327#endif 419#endif
328 return get_sv (name, create); 420 return get_sv (name, create);
329} 421}
330 422
331static AV * 423static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
333{ 425{
334#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 428 get_av (name, create);
337#endif 429#endif
338 return get_av (name, create); 430 return get_av (name, create);
339} 431}
340 432
341static HV * 433static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
343{ 435{
344#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 438 get_hv (name, create);
347#endif 439#endif
348 return get_hv (name, create); 440 return get_hv (name, create);
349} 441}
350 442
351/* may croak */ 443ecb_inline void
352INLINE CV * 444coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 445{
355 HV *st; 446#ifdef coro_clock_gettime
356 GV *gvp; 447 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 448
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];
358} 488}
359 489
360/*****************************************************************************/ 490/*****************************************************************************/
361/* magic glue */ 491/* magic glue */
362 492
363#define CORO_MAGIC_type_cv 26 493#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext 494#define CORO_MAGIC_type_state PERL_MAGIC_ext
365 495
366#define CORO_MAGIC_NN(sv, type) \ 496#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \ 497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \ 498 ? SvMAGIC (sv) \
369 : mg_find (sv, type)) 499 : mg_find (sv, type))
370 500
371#define CORO_MAGIC(sv, type) \ 501#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \ 502 (ecb_expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \ 503 ? CORO_MAGIC_NN (sv, type) \
374 : 0) 504 : 0)
375 505
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 506#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 507#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378 508
379INLINE struct coro * 509ecb_inline MAGIC *
380SvSTATE_ (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
381{ 511{
382 HV *stash;
383 MAGIC *mg; 512 MAGIC *mg;
384 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
385 if (SvROK (coro)) 529 if (SvROK (coro_sv))
386 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
387 531
388 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
533 if (!mg)
389 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
390 535
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
401} 537}
402 538
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 539#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404 540
… …
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408 544
409/*****************************************************************************/ 545/*****************************************************************************/
410/* padlist management and caching */ 546/* padlist management and caching */
411 547
412static AV * 548ecb_inline PADLIST *
413coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
414{ 550{
415 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
416 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
417 556
418 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. */
419 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
420#if PERL_VERSION_ATLEAST (5,10,0)
421 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
422#else
423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
424#endif 586#endif
425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
426 --AvFILLp (padlist);
427 587
428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
429 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;
430 596
431 return newpadlist; 597 return newpadlist;
432} 598}
433 599
434static void 600ecb_inline void
435free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
436{ 602{
437 /* may be during global destruction */ 603 /* may be during global destruction */
438 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
439 { 605 {
440 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
441 607
442 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
443 { 609 {
444 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
445 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
446 I32 j = AvFILLp (av);
447 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
448 while (j >= 0) 617 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
450 619
451 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
452 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
453 } 623 }
454 624
455 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
456 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
457 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
458 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
459 } 635 }
460} 636}
461 637
462static int 638static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 640{
465 AV *padlist; 641 PADLIST *padlist;
466 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;
467 644
468 /* casting is fun. */ 645 /* perl manages to free our internal AV and _then_ call us */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 646 if (IN_DESTRUCT)
647 return 0;
648
649 while (len--)
470 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
471
472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
473 651
474 return 0; 652 return 0;
475} 653}
476 654
477static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
478 0, 0, 0, 0, 656 0, 0, 0, 0,
479 coro_cv_free 657 coro_cv_free
480}; 658};
481 659
482/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
483static void 661ecb_inline void
484get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
485{ 663{
486 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
487 AV *av; 665 size_t *lenp;
488 666
489 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
490 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
491 else 669 else
492 { 670 {
493#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
494 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
495 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
… …
501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
502#endif 680#endif
503 } 681 }
504} 682}
505 683
506static void 684ecb_inline void
507put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
508{ 686{
509 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
510 AV *av;
511 688
512 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
513 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);
514 699
515 av = (AV *)mg->mg_obj; 700 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
516
517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
518 av_extend (av, AvFILLp (av) + 1);
519
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 701}
522 702
523/** 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);
524 776
525static void 777static void
526load_perl (pTHX_ Coro__State c) 778load_perl (pTHX_ Coro__State c)
527{ 779{
528 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
529 c->slot = 0; 781 c->slot = 0;
530 782
531 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
532 784
533 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
534 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
535 GvSV (PL_errgv) = slot->errsv; 787#else
536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
538
539 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
540 # include "state.h" 789 #include "state.h"
541 #undef VAR 790#endif
542 791
543 { 792 {
544 dSP; 793 dSP;
545 794
546 CV *cv; 795 CV *cv;
547 796
548 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
549 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
550 { 799 {
551 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
552 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
553 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
554 } 803 }
555 804
556 PUTBACK; 805 PUTBACK;
557 } 806 }
558 807
559 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
560 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);
561} 836}
562 837
563static void 838static void
564save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
565{ 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
566 c->except = CORO_THROW; 867 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 868 c->slf_frame = slf_frame;
568 869
569 { 870 {
570 dSP; 871 dSP;
… …
579 880
580 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
581 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
582 for (;;) 883 for (;;)
583 { 884 {
584 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
585 { 886 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
587 888
588 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))
589 { 890 {
590 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
591 892
592 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
593 { 894 {
594 EXTEND (SP, 3); 895 EXTEND (SP, 3);
595 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
596 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
597 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
… …
600 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
601 } 902 }
602 } 903 }
603 } 904 }
604 905
605 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
606 break; 907 break;
607 908
608 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
609 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
610 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
… …
612 913
613 PUTBACK; 914 PUTBACK;
614 } 915 }
615 916
616 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
617 /* we manually unroll here, as usually 2 slots is enough */ 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
618 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC;
621 { 919 {
622 int i; 920 unsigned int i;
921
623 for (i = 3; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
624 CXINC; 923 CXINC;
625 } 924
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 925 cxstack_ix -= SLOT_COUNT; /* undo allocation */
926 }
627 927
628 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
629 929
630 { 930 {
631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
632 932
633 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
634 slot->defsv = DEFSV; 934 save_perl_slots (slot);
635 slot->errsv = ERRSV; 935#else
636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
638
639 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
640 # include "state.h" 937 #include "state.h"
641 #undef VAR 938#endif
642 } 939 }
643} 940}
644 941
645/* 942/*
646 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
… …
652# define coro_init_stacks(thx) init_stacks () 949# define coro_init_stacks(thx) init_stacks ()
653#else 950#else
654static void 951static void
655coro_init_stacks (pTHX) 952coro_init_stacks (pTHX)
656{ 953{
657 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() */
658 PL_curstackinfo->si_type = PERLSI_MAIN; 955 PL_curstackinfo->si_type = PERLSI_MAIN;
659 PL_curstack = PL_curstackinfo->si_stack; 956 PL_curstack = PL_curstackinfo->si_stack;
660 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 957 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
661 958
662 PL_stack_base = AvARRAY(PL_curstack); 959 PL_stack_base = AvARRAY(PL_curstack);
… …
677#endif 974#endif
678 975
679 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
680 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
681 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
682 982
683 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
684 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
685 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
686 991
687#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
688 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
689 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
690 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
714 } 1019 }
715 1020
716 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
717 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
718 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
719 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
720#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
721 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
722#endif 1030#endif
723} 1031}
… …
753 } 1061 }
754 1062
755 return rss; 1063 return rss;
756} 1064}
757 1065
758/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
759
760static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
761static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
762static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
763 1067
764/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
765#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
766#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
767 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
768 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
769#endif 1073#endif
770 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
771/* 1103/*
772 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
773 * 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
774 * 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),
775 * readback here. 1107 * we just provide our own readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 1108 */
780static int 1109static int ecb_cold
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 1111{
783 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;
784 1115
785 if (*s == '_') 1116 SV *ssv;
786 {
787 SV **svp = 0;
788 1117
789 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
790 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
791
792 if (svp) 1118 if (!*svp)
793 { 1119 ssv = &PL_sv_undef;
794 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
795 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
796 } 1122 else
797 } 1123 ssv = *svp;
798 1124
799 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
800} 1127}
801 1128
802static int 1129static int ecb_cold
803coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
804{ 1131{
805 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;
806 1135
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; 1136 SV *old = *svp;
817 *svp = 0; 1137 *svp = 0;
818 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
819 return 0; 1139 return 0;
820 }
821 }
822
823 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
824} 1140}
825 1141
826static int 1142static int ecb_cold
827coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
828{ 1144{
829 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;
830 1148
831 if (*s == '_')
832 {
833 SV **svp = 0;
834
835 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837
838 if (svp)
839 {
840 SV *old = *svp; 1149 SV *old = *svp;
841 *svp = newSVsv (sv); 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
843 return 0; 1152 return 0;
844 }
845 }
846
847 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
848} 1153}
849 1154
850static void 1155static void
851prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
852{ 1157{
… …
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 1170{
866 return 1; 1171 return 1;
867} 1172}
868 1173
869static UNOP coro_setup_op; 1174/** coroutine stack handling ************************************************/
870 1175
871static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1176static UNOP init_perl_op;
1177
1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
872coro_setup (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
873{ 1180{
874 /* 1181 /*
875 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
876 */ 1183 */
877 coro_init_stacks (aTHX); 1184 coro_init_stacks (aTHX);
… …
884 PL_comppad_name_fill = 0; 1191 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0; 1192 PL_comppad_name_floor = 0;
886 PL_curpm = 0; 1193 PL_curpm = 0;
887 PL_curpad = 0; 1194 PL_curpad = 0;
888 PL_localizing = 0; 1195 PL_localizing = 0;
889 PL_dirty = 0;
890 PL_restartop = 0; 1196 PL_restartop = 0;
891#if PERL_VERSION_ATLEAST (5,10,0) 1197#if PERL_VERSION_ATLEAST (5,10,0)
892 PL_parser = 0; 1198 PL_parser = 0;
893#endif 1199#endif
894 PL_hints = 0; 1200 PL_hints = 0;
895 1201
896 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
899 1205
900 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
901 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
902 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
903 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);
904 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
905 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
907 1216
908 { 1217 {
909 dSP; 1218 dSP;
… …
913 myop.op_next = Nullop; 1222 myop.op_next = Nullop;
914 myop.op_type = OP_ENTERSUB; 1223 myop.op_type = OP_ENTERSUB;
915 myop.op_flags = OPf_WANT_VOID; 1224 myop.op_flags = OPf_WANT_VOID;
916 1225
917 PUSHMARK (SP); 1226 PUSHMARK (SP);
918 PUSHs ((SV *)coro->startcv); 1227 XPUSHs ((SV *)coro->startcv);
919 PUTBACK; 1228 PUTBACK;
920 PL_op = (OP *)&myop; 1229 PL_op = (OP *)&myop;
921 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1230 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
922 } 1231 }
923 1232
924 /* 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
925 * 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.
926 */ 1235 */
927 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 */
928 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;
929 1239
930 /* 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 */
931 coro_setup_op.op_next = PL_op; 1241 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1242 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1243 init_perl_op.op_ppaddr = pp_slf;
934 /* 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 */
935 1245
936 PL_op = (OP *)&coro_setup_op; 1246 PL_op = (OP *)&init_perl_op;
937 1247
938 /* copy throw, in case it was set before coro_setup */ 1248 /* copy throw, in case it was set before init_perl */
939 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
940}
941 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
942static void 1260static void
943coro_destruct (pTHX_ struct coro *coro) 1261coro_unwind_stacks (pTHX)
944{ 1262{
945 if (!IN_DESTRUCT) 1263 if (!IN_DESTRUCT)
946 { 1264 {
947 /* restore all saved variables and stuff */ 1265 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 1266 LEAVE_SCOPE (0);
… …
956 POPSTACK_TO (PL_mainstack); 1274 POPSTACK_TO (PL_mainstack);
957 1275
958 /* unwind main stack */ 1276 /* unwind main stack */
959 dounwind (-1); 1277 dounwind (-1);
960 } 1278 }
1279}
961 1280
962 SvREFCNT_dec (GvSV (PL_defgv)); 1281static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 1282destroy_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 1283{
965 SvREFCNT_dec (PL_defoutgv); 1284 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 1285
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 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
973 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
977 1333 SvREFCNT_dec (coro->on_enter_xs);
978 coro_destruct_stacks (aTHX); 1334 SvREFCNT_dec (coro->on_leave_xs);
1335 }
979} 1336}
980 1337
981INLINE void 1338ecb_inline void
982free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
983{ 1340{
984 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
985 { 1342 {
986 SvREFCNT_dec (coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
987 coro_mortal = 0; 1344 coro_mortal = 0;
988 } 1345 }
989} 1346}
990 1347
991static int 1348static int
… …
1023 av_push (av, SvREFCNT_inc_NN (*bot++)); 1380 av_push (av, SvREFCNT_inc_NN (*bot++));
1024 1381
1025 PL_runops = RUNOPS_DEFAULT; 1382 PL_runops = RUNOPS_DEFAULT;
1026 ENTER; 1383 ENTER;
1027 SAVETMPS; 1384 SAVETMPS;
1385 PUSHMARK (SP);
1028 EXTEND (SP, 3); 1386 EXTEND (SP, 3);
1029 PUSHMARK (SP);
1030 PUSHs (&PL_sv_no); 1387 PUSHs (&PL_sv_no);
1031 PUSHs (fullname); 1388 PUSHs (fullname);
1032 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1389 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1033 PUTBACK; 1390 PUTBACK;
1034 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);
… …
1045 1402
1046 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1047 { 1404 {
1048 SV **cb; 1405 SV **cb;
1049 1406
1050 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1051 { 1408 {
1052 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1053 1410
1054 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1055 { 1412 {
… …
1061 gv_efullname3 (fullname, gv, 0); 1418 gv_efullname3 (fullname, gv, 0);
1062 1419
1063 PL_runops = RUNOPS_DEFAULT; 1420 PL_runops = RUNOPS_DEFAULT;
1064 ENTER; 1421 ENTER;
1065 SAVETMPS; 1422 SAVETMPS;
1423 PUSHMARK (SP);
1066 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1067 PUSHMARK (SP);
1068 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1069 PUSHs (fullname); 1426 PUSHs (fullname);
1070 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);
1071 PUTBACK; 1428 PUTBACK;
1072 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);
1073 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);
1074 SPAGAIN; 1431 SPAGAIN;
1075 FREETMPS; 1432 FREETMPS;
… …
1085 dSP; 1442 dSP;
1086 1443
1087 PL_runops = RUNOPS_DEFAULT; 1444 PL_runops = RUNOPS_DEFAULT;
1088 ENTER; 1445 ENTER;
1089 SAVETMPS; 1446 SAVETMPS;
1090 EXTEND (SP, 3);
1091 PL_runops = RUNOPS_DEFAULT;
1092 PUSHMARK (SP); 1447 PUSHMARK (SP);
1448 EXTEND (SP, 2);
1093 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1449 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1094 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1450 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1095 PUTBACK; 1451 PUTBACK;
1096 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);
1097 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);
… …
1124 1480
1125 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 */
1126} 1482}
1127 1483
1128/* 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 */
1129static void NOINLINE 1485static void ecb_noinline
1130cctx_prepare (pTHX) 1486cctx_prepare (pTHX)
1131{ 1487{
1132 PL_top_env = &PL_start_env; 1488 PL_top_env = &PL_start_env;
1133 1489
1134 if (cctx_current->flags & CC_TRACE) 1490 if (cctx_current->flags & CC_TRACE)
… …
1145 slf_frame.prepare = slf_prepare_set_stacklevel; 1501 slf_frame.prepare = slf_prepare_set_stacklevel;
1146 slf_frame.check = slf_check_set_stacklevel; 1502 slf_frame.check = slf_check_set_stacklevel;
1147} 1503}
1148 1504
1149/* 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 */
1150INLINE void 1506ecb_inline void
1151transfer_tail (pTHX) 1507transfer_tail (pTHX)
1152{ 1508{
1153 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);
1154} 1522}
1155 1523
1156/* 1524/*
1157 * this is a _very_ stripped down perl interpreter ;) 1525 * this is a _very_ stripped down perl interpreter ;)
1158 */ 1526 */
… …
1180 /* 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 */
1181 PL_restartop = PL_op; 1549 PL_restartop = PL_op;
1182 perl_run (PL_curinterp); 1550 perl_run (PL_curinterp);
1183 /* 1551 /*
1184 * 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
1185 * 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.
1186 */ 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;
1187 1563
1188 /* 1564 /*
1189 * 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
1190 * 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)
1191 * 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
1192 * bootstrap-time "top" top_env, as we cannot restore the "main" 1568 * doing in that case. YMMV.
1193 * coroutine as Coro has no such concept.
1194 * This actually isn't valid with the pthread backend, but OSes requiring
1195 * that backend are too broken to do it in a standards-compliant way.
1196 */ 1569 */
1197 PL_top_env = main_top_env; 1570 perlish_exit (aTHX);
1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1199 } 1571 }
1200} 1572}
1201 1573
1202static coro_cctx * 1574static coro_cctx *
1203cctx_new () 1575cctx_new (void)
1204{ 1576{
1205 coro_cctx *cctx; 1577 coro_cctx *cctx;
1206 1578
1207 ++cctx_count; 1579 ++cctx_count;
1208 New (0, cctx, 1, coro_cctx); 1580 New (0, cctx, 1, coro_cctx);
… …
1214 return cctx; 1586 return cctx;
1215} 1587}
1216 1588
1217/* create a new cctx only suitable as source */ 1589/* create a new cctx only suitable as source */
1218static coro_cctx * 1590static coro_cctx *
1219cctx_new_empty () 1591cctx_new_empty (void)
1220{ 1592{
1221 coro_cctx *cctx = cctx_new (); 1593 coro_cctx *cctx = cctx_new ();
1222 1594
1223 cctx->sptr = 0; 1595 cctx->stack.sptr = 0;
1224 coro_create (&cctx->cctx, 0, 0, 0, 0); 1596 coro_create (&cctx->cctx, 0, 0, 0, 0);
1225 1597
1226 return cctx; 1598 return cctx;
1227} 1599}
1228 1600
1229/* create a new cctx suitable as destination/running a perl interpreter */ 1601/* create a new cctx suitable as destination/running a perl interpreter */
1230static coro_cctx * 1602static coro_cctx *
1231cctx_new_run () 1603cctx_new_run (void)
1232{ 1604{
1233 coro_cctx *cctx = cctx_new (); 1605 coro_cctx *cctx = cctx_new ();
1234 void *stack_start;
1235 size_t stack_size;
1236 1606
1237#if HAVE_MMAP 1607 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1238 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1239 /* mmap supposedly does allocate-on-write for us */
1240 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1241
1242 if (cctx->sptr != (void *)-1)
1243 {
1244 #if CORO_STACKGUARD
1245 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1246 #endif
1247 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1248 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1249 cctx->flags |= CC_MAPPED;
1250 } 1608 {
1251 else
1252#endif
1253 {
1254 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1255 New (0, cctx->sptr, cctx_stacksize, long);
1256
1257 if (!cctx->sptr)
1258 {
1259 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1609 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1260 _exit (EXIT_FAILURE); 1610 _exit (EXIT_FAILURE);
1261 }
1262
1263 stack_start = cctx->sptr;
1264 stack_size = cctx->ssize;
1265 } 1611 }
1266 1612
1267 #if CORO_USE_VALGRIND
1268 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1269 #endif
1270
1271 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);
1272 1614
1273 return cctx; 1615 return cctx;
1274} 1616}
1275 1617
1276static void 1618static void
1277cctx_destroy (coro_cctx *cctx) 1619cctx_destroy (coro_cctx *cctx)
1278{ 1620{
1279 if (!cctx) 1621 if (!cctx)
1280 return; 1622 return;
1281 1623
1282 assert (cctx != cctx_current);//D temporary 1624 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1283 1625
1284 --cctx_count; 1626 --cctx_count;
1285 coro_destroy (&cctx->cctx); 1627 coro_destroy (&cctx->cctx);
1286 1628
1287 /* coro_transfer creates new, empty cctx's */ 1629 coro_stack_free (&cctx->stack);
1288 if (cctx->sptr)
1289 {
1290 #if CORO_USE_VALGRIND
1291 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1292 #endif
1293
1294#if HAVE_MMAP
1295 if (cctx->flags & CC_MAPPED)
1296 munmap (cctx->sptr, cctx->ssize);
1297 else
1298#endif
1299 Safefree (cctx->sptr);
1300 }
1301 1630
1302 Safefree (cctx); 1631 Safefree (cctx);
1303} 1632}
1304 1633
1305/* wether this cctx should be destructed */ 1634/* wether this cctx should be destructed */
1306#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))
1307 1636
1308static coro_cctx * 1637static coro_cctx *
1309cctx_get (pTHX) 1638cctx_get (pTHX)
1310{ 1639{
1311 while (expect_true (cctx_first)) 1640 while (ecb_expect_true (cctx_first))
1312 { 1641 {
1313 coro_cctx *cctx = cctx_first; 1642 coro_cctx *cctx = cctx_first;
1314 cctx_first = cctx->next; 1643 cctx_first = cctx->next;
1315 --cctx_idle; 1644 --cctx_idle;
1316 1645
1317 if (expect_true (!CCTX_EXPIRED (cctx))) 1646 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1318 return cctx; 1647 return cctx;
1319 1648
1320 cctx_destroy (cctx); 1649 cctx_destroy (cctx);
1321 } 1650 }
1322 1651
… …
1324} 1653}
1325 1654
1326static void 1655static void
1327cctx_put (coro_cctx *cctx) 1656cctx_put (coro_cctx *cctx)
1328{ 1657{
1329 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));
1330 1659
1331 /* free another cctx if overlimit */ 1660 /* free another cctx if overlimit */
1332 if (expect_false (cctx_idle >= cctx_max_idle)) 1661 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1333 { 1662 {
1334 coro_cctx *first = cctx_first; 1663 coro_cctx *first = cctx_first;
1335 cctx_first = first->next; 1664 cctx_first = first->next;
1336 --cctx_idle; 1665 --cctx_idle;
1337 1666
… …
1348static void 1677static void
1349transfer_check (pTHX_ struct coro *prev, struct coro *next) 1678transfer_check (pTHX_ struct coro *prev, struct coro *next)
1350{ 1679{
1351 /* TODO: throwing up here is considered harmful */ 1680 /* TODO: throwing up here is considered harmful */
1352 1681
1353 if (expect_true (prev != next)) 1682 if (ecb_expect_true (prev != next))
1354 { 1683 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1684 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1356 croak ("Coro::State::transfer called with a suspended 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,");
1357 1686
1358 if (expect_false (next->flags & CF_RUNNING)) 1687 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1360
1361 if (expect_false (next->flags & CF_DESTROYED))
1362 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,");
1363 1689
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1690#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1691 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1366 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,");
1367#endif 1693#endif
1368 } 1694 }
1369} 1695}
1370 1696
1371/* always use the TRANSFER macro */ 1697/* always use the TRANSFER macro */
1372static void NOINLINE /* noinline so we have a fixed stackframe */ 1698static void ecb_noinline /* noinline so we have a fixed stackframe */
1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1699transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1374{ 1700{
1375 dSTACKLEVEL; 1701 dSTACKLEVEL;
1376 1702
1377 /* sometimes transfer is only called to set idle_sp */ 1703 /* sometimes transfer is only called to set idle_sp */
1378 if (expect_false (!prev)) 1704 if (ecb_expect_false (!prev))
1379 { 1705 {
1380 cctx_current->idle_sp = STACKLEVEL; 1706 cctx_current->idle_sp = STACKLEVEL;
1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1707 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1382 } 1708 }
1383 else if (expect_true (prev != next)) 1709 else if (ecb_expect_true (prev != next))
1384 { 1710 {
1385 coro_cctx *cctx_prev; 1711 coro_cctx *cctx_prev;
1386 1712
1387 if (expect_false (prev->flags & CF_NEW)) 1713 if (ecb_expect_false (prev->flags & CF_NEW))
1388 { 1714 {
1389 /* create a new empty/source context */ 1715 /* create a new empty/source context */
1390 prev->flags &= ~CF_NEW; 1716 prev->flags &= ~CF_NEW;
1391 prev->flags |= CF_RUNNING; 1717 prev->flags |= CF_RUNNING;
1392 } 1718 }
… …
1395 next->flags |= CF_RUNNING; 1721 next->flags |= CF_RUNNING;
1396 1722
1397 /* first get rid of the old state */ 1723 /* first get rid of the old state */
1398 save_perl (aTHX_ prev); 1724 save_perl (aTHX_ prev);
1399 1725
1400 if (expect_false (next->flags & CF_NEW)) 1726 if (ecb_expect_false (next->flags & CF_NEW))
1401 { 1727 {
1402 /* need to start coroutine */ 1728 /* need to start coroutine */
1403 next->flags &= ~CF_NEW; 1729 next->flags &= ~CF_NEW;
1404 /* setup coroutine call */ 1730 /* setup coroutine call */
1405 coro_setup (aTHX_ next); 1731 init_perl (aTHX_ next);
1406 } 1732 }
1407 else 1733 else
1408 load_perl (aTHX_ next); 1734 load_perl (aTHX_ next);
1409 1735
1410 assert (!prev->cctx);//D temporary
1411
1412 /* possibly untie and reuse the cctx */ 1736 /* possibly untie and reuse the cctx */
1413 if (expect_true ( 1737 if (ecb_expect_true (
1414 cctx_current->idle_sp == STACKLEVEL 1738 cctx_current->idle_sp == STACKLEVEL
1415 && !(cctx_current->flags & CC_TRACE) 1739 && !(cctx_current->flags & CC_TRACE)
1416 && !force_cctx 1740 && !force_cctx
1417 )) 1741 ))
1418 { 1742 {
1419 /* 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 */
1420 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1744 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1421 1745
1422 /* 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. */
1423 /* without this the next cctx_get might destroy the running cctx while still in use */ 1747 /* without this the next cctx_get might destroy the running cctx while still in use */
1424 if (expect_false (CCTX_EXPIRED (cctx_current))) 1748 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1425 if (expect_true (!next->cctx)) 1749 if (ecb_expect_true (!next->cctx))
1426 next->cctx = cctx_get (aTHX); 1750 next->cctx = cctx_get (aTHX);
1427 1751
1428 cctx_put (cctx_current); 1752 cctx_put (cctx_current);
1429 } 1753 }
1430 else 1754 else
1431 prev->cctx = cctx_current; 1755 prev->cctx = cctx_current;
1432 1756
1433 ++next->usecount; 1757 ++next->usecount;
1434 1758
1435 cctx_prev = cctx_current; 1759 cctx_prev = cctx_current;
1436 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1760 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1437 1761
1438 next->cctx = 0; 1762 next->cctx = 0;
1439 1763
1440 if (expect_false (cctx_prev != cctx_current)) 1764 if (ecb_expect_false (cctx_prev != cctx_current))
1441 { 1765 {
1442 cctx_prev->top_env = PL_top_env; 1766 cctx_prev->top_env = PL_top_env;
1443 PL_top_env = cctx_current->top_env; 1767 PL_top_env = cctx_current->top_env;
1444 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1768 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1445 } 1769 }
… …
1451#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))
1452#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1776#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1453 1777
1454/** high level stuff ********************************************************/ 1778/** high level stuff ********************************************************/
1455 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 */
1456static int 1782static void
1783coro_call_on_destroy (pTHX_ struct coro *coro);
1784
1785static void
1457coro_state_destroy (pTHX_ struct coro *coro) 1786coro_state_destroy (pTHX_ struct coro *coro)
1458{ 1787{
1459 if (coro->flags & CF_DESTROYED) 1788 if (coro->flags & CF_ZOMBIE)
1460 return 0; 1789 return;
1461 1790
1462 if (coro->on_destroy)
1463 coro->on_destroy (aTHX_ coro); 1791 slf_destroy (aTHX_ coro);
1464 1792
1465 coro->flags |= CF_DESTROYED; 1793 coro->flags |= CF_ZOMBIE;
1466 1794
1467 if (coro->flags & CF_READY) 1795 if (coro->flags & CF_READY)
1468 { 1796 {
1469 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1797 /* reduce nready, as destroying a ready coro effectively unreadies it */
1470 /* alternative: look through all ready queues and remove the coro */ 1798 /* alternative: look through all ready queues and remove the coro */
1471 --coro_nready; 1799 --coro_nready;
1472 } 1800 }
1473 else 1801 else
1474 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 */
1475 1803
1476 if (coro->mainstack && coro->mainstack != main_mainstack) 1804 if (coro->next) coro->next->prev = coro->prev;
1477 { 1805 if (coro->prev) coro->prev->next = coro->next;
1478 struct coro temp; 1806 if (coro == coro_first) coro_first = coro->next;
1479 1807
1480 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1808 if (coro->mainstack
1481 1809 && coro->mainstack != main_mainstack
1482 save_perl (aTHX_ &temp); 1810 && coro->slot
1811 && !PL_dirty)
1483 load_perl (aTHX_ coro); 1812 destroy_perl (aTHX_ coro);
1484
1485 coro_destruct (aTHX_ coro);
1486
1487 load_perl (aTHX_ &temp);
1488
1489 coro->slot = 0;
1490 }
1491 1813
1492 cctx_destroy (coro->cctx); 1814 cctx_destroy (coro->cctx);
1493 SvREFCNT_dec (coro->startcv); 1815 SvREFCNT_dec (coro->startcv);
1494 SvREFCNT_dec (coro->args); 1816 SvREFCNT_dec (coro->args);
1817 SvREFCNT_dec (coro->swap_sv);
1495 SvREFCNT_dec (CORO_THROW); 1818 SvREFCNT_dec (CORO_THROW);
1496 1819
1497 if (coro->next) coro->next->prev = coro->prev; 1820 coro_call_on_destroy (aTHX_ coro);
1498 if (coro->prev) coro->prev->next = coro->next;
1499 if (coro == coro_first) coro_first = coro->next;
1500 1821
1501 return 1; 1822 /* more destruction mayhem in coro_state_free */
1502} 1823}
1503 1824
1504static int 1825static int
1505coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1826coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1506{ 1827{
1507 struct coro *coro = (struct coro *)mg->mg_ptr; 1828 struct coro *coro = (struct coro *)mg->mg_ptr;
1508 mg->mg_ptr = 0; 1829 mg->mg_ptr = 0;
1509 1830
1510 coro->hv = 0;
1511
1512 if (--coro->refcnt < 0)
1513 {
1514 coro_state_destroy (aTHX_ coro); 1831 coro_state_destroy (aTHX_ coro);
1832 SvREFCNT_dec (coro->on_destroy);
1833 SvREFCNT_dec (coro->status);
1834
1515 Safefree (coro); 1835 Safefree (coro);
1516 }
1517 1836
1518 return 0; 1837 return 0;
1519} 1838}
1520 1839
1521static int 1840static int ecb_cold
1522coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1841coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1523{ 1842{
1524 struct coro *coro = (struct coro *)mg->mg_ptr; 1843 /* called when perl clones the current process the slow way (windows process emulation) */
1525 1844 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1526 ++coro->refcnt; 1845 mg->mg_ptr = 0;
1846 mg->mg_virtual = 0;
1527 1847
1528 return 0; 1848 return 0;
1529} 1849}
1530 1850
1531static MGVTBL coro_state_vtbl = { 1851static MGVTBL coro_state_vtbl = {
… …
1554 1874
1555 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1875 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1556 TRANSFER (ta, 1); 1876 TRANSFER (ta, 1);
1557} 1877}
1558 1878
1559/*****************************************************************************/
1560/* gensub: simple closure generation utility */
1561
1562#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1563
1564/* create a closure from XS, returns a code reference */
1565/* the arg can be accessed via GENSUB_ARG from the callback */
1566/* the callback must use dXSARGS/XSRETURN */
1567static SV *
1568gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1569{
1570 CV *cv = (CV *)newSV (0);
1571
1572 sv_upgrade ((SV *)cv, SVt_PVCV);
1573
1574 CvANON_on (cv);
1575 CvISXSUB_on (cv);
1576 CvXSUB (cv) = xsub;
1577 GENSUB_ARG = arg;
1578
1579 return newRV_noinc ((SV *)cv);
1580}
1581
1582/** Coro ********************************************************************/ 1879/** Coro ********************************************************************/
1583 1880
1584INLINE void 1881ecb_inline void
1585coro_enq (pTHX_ struct coro *coro) 1882coro_enq (pTHX_ struct coro *coro)
1586{ 1883{
1587 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1884 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1588}
1589 1885
1590INLINE 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 *
1591coro_deq (pTHX) 1894coro_deq (pTHX)
1592{ 1895{
1593 int prio; 1896 int prio;
1594 1897
1595 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1898 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1596 if (AvFILLp (coro_ready [prio]) >= 0) 1899 {
1597 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 }
1598 1909
1599 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;
1600} 1928}
1601 1929
1602static int 1930static int
1603api_ready (pTHX_ SV *coro_sv) 1931api_ready (pTHX_ SV *coro_sv)
1604{ 1932{
1605 struct coro *coro;
1606 SV *sv_hook;
1607 void (*xs_hook)(void);
1608
1609 coro = SvSTATE (coro_sv); 1933 struct coro *coro = SvSTATE (coro_sv);
1610 1934
1611 if (coro->flags & CF_READY) 1935 if (coro->flags & CF_READY)
1612 return 0; 1936 return 0;
1613 1937
1614 coro->flags |= CF_READY; 1938 coro->flags |= CF_READY;
1615 1939
1616 sv_hook = coro_nready ? 0 : coro_readyhook;
1617 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1618
1619 coro_enq (aTHX_ coro); 1940 coro_enq (aTHX_ coro);
1620 ++coro_nready;
1621 1941
1622 if (sv_hook) 1942 if (!coro_nready++)
1623 { 1943 if (coroapi.readyhook)
1624 dSP; 1944 coroapi.readyhook ();
1625
1626 ENTER;
1627 SAVETMPS;
1628
1629 PUSHMARK (SP);
1630 PUTBACK;
1631 call_sv (sv_hook, G_VOID | G_DISCARD);
1632
1633 FREETMPS;
1634 LEAVE;
1635 }
1636
1637 if (xs_hook)
1638 xs_hook ();
1639 1945
1640 return 1; 1946 return 1;
1641} 1947}
1642 1948
1643static int 1949static int
… …
1645{ 1951{
1646 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1952 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1647} 1953}
1648 1954
1649/* expects to own a reference to next->hv */ 1955/* expects to own a reference to next->hv */
1650INLINE void 1956ecb_inline void
1651prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1957prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1652{ 1958{
1653 SV *prev_sv = SvRV (coro_current); 1959 SV *prev_sv = SvRV (coro_current);
1654 1960
1655 ta->prev = SvSTATE_hv (prev_sv); 1961 ta->prev = SvSTATE_hv (prev_sv);
… …
1666static void 1972static void
1667prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1973prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1668{ 1974{
1669 for (;;) 1975 for (;;)
1670 { 1976 {
1671 SV *next_sv = coro_deq (aTHX); 1977 struct coro *next = coro_deq (aTHX);
1672 1978
1673 if (expect_true (next_sv)) 1979 if (ecb_expect_true (next))
1674 { 1980 {
1675 struct coro *next = SvSTATE_hv (next_sv);
1676
1677 /* cannot transfer to destroyed coros, skip and look for next */ 1981 /* cannot transfer to destroyed coros, skip and look for next */
1678 if (expect_false (next->flags & CF_DESTROYED)) 1982 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1679 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 */
1680 else 1984 else
1681 { 1985 {
1682 next->flags &= ~CF_READY; 1986 next->flags &= ~CF_READY;
1683 --coro_nready; 1987 --coro_nready;
1684 1988
… …
1690 { 1994 {
1691 /* nothing to schedule: call the idle handler */ 1995 /* nothing to schedule: call the idle handler */
1692 if (SvROK (sv_idle) 1996 if (SvROK (sv_idle)
1693 && SvOBJECT (SvRV (sv_idle))) 1997 && SvOBJECT (SvRV (sv_idle)))
1694 { 1998 {
1999 if (SvRV (sv_idle) == SvRV (coro_current))
2000 {
2001 require_pv ("Carp");
2002
2003 {
2004 dSP;
2005
2006 ENTER;
2007 SAVETMPS;
2008
2009 PUSHMARK (SP);
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
1695 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2019 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1696 api_ready (aTHX_ SvRV (sv_idle)); 2020 api_ready (aTHX_ SvRV (sv_idle));
1697 --coro_nready; 2021 --coro_nready;
1698 } 2022 }
1699 else 2023 else
1700 { 2024 {
2025 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1701 dSP; 2026 dSP;
1702 2027
1703 ENTER; 2028 ENTER;
1704 SAVETMPS; 2029 SAVETMPS;
1705 2030
… …
1712 } 2037 }
1713 } 2038 }
1714 } 2039 }
1715} 2040}
1716 2041
1717INLINE void 2042ecb_inline void
1718prepare_cede (pTHX_ struct coro_transfer_args *ta) 2043prepare_cede (pTHX_ struct coro_transfer_args *ta)
1719{ 2044{
1720 api_ready (aTHX_ coro_current); 2045 api_ready (aTHX_ coro_current);
1721 prepare_schedule (aTHX_ ta); 2046 prepare_schedule (aTHX_ ta);
1722} 2047}
1723 2048
1724INLINE void 2049ecb_inline void
1725prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2050prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1726{ 2051{
1727 SV *prev = SvRV (coro_current); 2052 SV *prev = SvRV (coro_current);
1728 2053
1729 if (coro_nready) 2054 if (coro_nready)
… …
1759{ 2084{
1760 struct coro_transfer_args ta; 2085 struct coro_transfer_args ta;
1761 2086
1762 prepare_cede (aTHX_ &ta); 2087 prepare_cede (aTHX_ &ta);
1763 2088
1764 if (expect_true (ta.prev != ta.next)) 2089 if (ecb_expect_true (ta.prev != ta.next))
1765 { 2090 {
1766 TRANSFER (ta, 1); 2091 TRANSFER (ta, 1);
1767 return 1; 2092 return 1;
1768 } 2093 }
1769 else 2094 else
… …
1812 coro->slot->runops = RUNOPS_DEFAULT; 2137 coro->slot->runops = RUNOPS_DEFAULT;
1813 } 2138 }
1814} 2139}
1815 2140
1816static void 2141static void
2142coro_push_av (pTHX_ AV *av, I32 gimme_v)
2143{
2144 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2145 {
2146 dSP;
2147
2148 if (gimme_v == G_SCALAR)
2149 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2150 else
2151 {
2152 int i;
2153 EXTEND (SP, AvFILLp (av) + 1);
2154
2155 for (i = 0; i <= AvFILLp (av); ++i)
2156 PUSHs (AvARRAY (av)[i]);
2157 }
2158
2159 PUTBACK;
2160 }
2161}
2162
2163static void
2164coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2165{
2166 if (!coro->on_destroy)
2167 coro->on_destroy = newAV ();
2168
2169 av_push (coro->on_destroy, cb);
2170}
2171
2172static void
2173slf_destroy_join (pTHX_ struct CoroSLF *frame)
2174{
2175 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2176}
2177
2178static int
2179slf_check_join (pTHX_ struct CoroSLF *frame)
2180{
2181 struct coro *coro = (struct coro *)frame->data;
2182
2183 if (!coro->status)
2184 return 1;
2185
2186 frame->destroy = 0;
2187
2188 coro_push_av (aTHX_ coro->status, GIMME_V);
2189
2190 SvREFCNT_dec ((SV *)coro->hv);
2191
2192 return 0;
2193}
2194
2195static void
2196slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2197{
2198 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2199
2200 if (items > 1)
2201 croak ("join called with too many arguments");
2202
2203 if (coro->status)
2204 frame->prepare = prepare_nop;
2205 else
2206 {
2207 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2208 frame->prepare = prepare_schedule;
2209 }
2210
2211 frame->check = slf_check_join;
2212 frame->destroy = slf_destroy_join;
2213 frame->data = (void *)coro;
2214 SvREFCNT_inc (coro->hv);
2215}
2216
2217static void
1817coro_call_on_destroy (pTHX_ struct coro *coro) 2218coro_call_on_destroy (pTHX_ struct coro *coro)
1818{ 2219{
1819 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2220 AV *od = coro->on_destroy;
1820 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1821 2221
1822 if (on_destroyp) 2222 if (!od)
1823 { 2223 return;
1824 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1825 2224
2225 coro->on_destroy = 0;
2226 sv_2mortal ((SV *)od);
2227
1826 while (AvFILLp (on_destroy) >= 0) 2228 while (AvFILLp (od) >= 0)
2229 {
2230 SV *cb = sv_2mortal (av_pop (od));
2231
2232 /* coro hv's (and only hv's at the moment) are supported as well */
2233 if (SvSTATEhv_p (aTHX_ cb))
2234 api_ready (aTHX_ cb);
2235 else
1827 { 2236 {
1828 dSP; /* don't disturb outer sp */ 2237 dSP; /* don't disturb outer sp */
1829 SV *cb = av_pop (on_destroy);
1830
1831 PUSHMARK (SP); 2238 PUSHMARK (SP);
1832 2239
1833 if (statusp) 2240 if (coro->status)
1834 { 2241 {
1835 int i; 2242 PUTBACK;
1836 AV *status = (AV *)SvRV (*statusp); 2243 coro_push_av (aTHX_ coro->status, G_ARRAY);
1837 EXTEND (SP, AvFILLp (status) + 1); 2244 SPAGAIN;
1838
1839 for (i = 0; i <= AvFILLp (status); ++i)
1840 PUSHs (AvARRAY (status)[i]);
1841 } 2245 }
1842 2246
1843 PUTBACK; 2247 PUTBACK;
1844 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2248 call_sv (cb, G_VOID | G_DISCARD);
1845 } 2249 }
1846 } 2250 }
1847} 2251}
1848 2252
1849static void 2253static void
1850slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2254coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1851{ 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 {
1852 int i; 2269 int i;
1853 HV *hv = (HV *)SvRV (coro_current);
1854 AV *av = newAV ();
1855 2270
1856 av_extend (av, items - 1); 2271 av_extend (av, items - 1);
2272
1857 for (i = 0; i < items; ++i) 2273 for (i = 0; i < items; ++i)
1858 av_push (av, SvREFCNT_inc_NN (arg [i])); 2274 av_push (av, SvREFCNT_inc_NN (arg [i]));
2275 }
2276}
1859 2277
1860 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2278static void
1861 2279slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2280{
1862 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2281 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1863 api_ready (aTHX_ sv_manager); 2282 api_ready (aTHX_ sv_manager);
1864 2283
1865 frame->prepare = prepare_schedule; 2284 frame->prepare = prepare_schedule;
1866 frame->check = slf_check_repeat; 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;
1867} 2396}
1868 2397
1869/*****************************************************************************/ 2398/*****************************************************************************/
1870/* async pool handler */ 2399/* async pool handler */
1871 2400
… …
1902slf_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)
1903{ 2432{
1904 HV *hv = (HV *)SvRV (coro_current); 2433 HV *hv = (HV *)SvRV (coro_current);
1905 struct coro *coro = SvSTATE_hv ((SV *)hv); 2434 struct coro *coro = SvSTATE_hv ((SV *)hv);
1906 2435
1907 if (expect_true (coro->saved_deffh)) 2436 if (ecb_expect_true (coro->saved_deffh))
1908 { 2437 {
1909 /* subsequent iteration */ 2438 /* subsequent iteration */
1910 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2439 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1911 coro->saved_deffh = 0; 2440 coro->saved_deffh = 0;
1912 2441
1913 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2442 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1914 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2443 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1915 { 2444 {
1916 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2445 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1917 coro->invoke_av = newAV (); 2446 return;
1918
1919 frame->prepare = prepare_nop;
1920 } 2447 }
1921 else 2448 else
1922 { 2449 {
1923 av_clear (GvAV (PL_defgv)); 2450 av_clear (GvAV (PL_defgv));
1924 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);
1925 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
1926 coro->prio = 0; 2460 coro->prio = 0;
1927 2461
1928 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2462 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1929 api_trace (aTHX_ coro_current, 0); 2463 api_trace (aTHX_ coro_current, 0);
1930 2464
1931 frame->prepare = prepare_schedule; 2465 frame->prepare = prepare_schedule;
1932 av_push (av_async_pool, SvREFCNT_inc (hv)); 2466 av_push (av_async_pool, SvREFCNT_inc (hv));
1933 } 2467 }
… …
1949 2483
1950static void 2484static void
1951coro_rouse_callback (pTHX_ CV *cv) 2485coro_rouse_callback (pTHX_ CV *cv)
1952{ 2486{
1953 dXSARGS; 2487 dXSARGS;
1954 SV *data = (SV *)GENSUB_ARG; 2488 SV *data = (SV *)S_GENSUB_ARG;
1955 2489
1956 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2490 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1957 { 2491 {
1958 /* first call, set args */ 2492 /* first call, set args */
2493 SV *coro = SvRV (data);
1959 AV *av = newAV (); 2494 AV *av = newAV ();
1960 SV *coro = SvRV (data);
1961 2495
1962 SvRV_set (data, (SV *)av); 2496 SvRV_set (data, (SV *)av);
1963 api_ready (aTHX_ coro);
1964 SvREFCNT_dec (coro);
1965 2497
1966 /* better take a full copy of the arguments */ 2498 /* better take a full copy of the arguments */
1967 while (items--) 2499 while (items--)
1968 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);
1969 } 2504 }
1970 2505
1971 XSRETURN_EMPTY; 2506 XSRETURN_EMPTY;
1972} 2507}
1973 2508
1974static int 2509static int
1975slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2510slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1976{ 2511{
1977 SV *data = (SV *)frame->data; 2512 SV *data = (SV *)frame->data;
1978 2513
1979 if (CORO_THROW) 2514 if (CORO_THROW)
1980 return 0; 2515 return 0;
1981 2516
1982 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2517 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1983 return 1; 2518 return 1;
… …
1990 2525
1991 EXTEND (SP, AvFILLp (av) + 1); 2526 EXTEND (SP, AvFILLp (av) + 1);
1992 for (i = 0; i <= AvFILLp (av); ++i) 2527 for (i = 0; i <= AvFILLp (av); ++i)
1993 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2528 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1994 2529
1995 /* 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 */
1996 AvFILLp (av) = -1; 2531 AvFILLp (av) = -1;
1997 av_undef (av); 2532 av_undef (av);
1998 2533
1999 PUTBACK; 2534 PUTBACK;
2000 } 2535 }
… …
2019 cb = sv_2mortal (coro->rouse_cb); 2554 cb = sv_2mortal (coro->rouse_cb);
2020 coro->rouse_cb = 0; 2555 coro->rouse_cb = 0;
2021 } 2556 }
2022 2557
2023 if (!SvROK (cb) 2558 if (!SvROK (cb)
2024 || SvTYPE (SvRV (cb)) != SVt_PVCV 2559 || SvTYPE (SvRV (cb)) != SVt_PVCV
2025 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2560 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2026 croak ("Coro::rouse_wait called with illegal callback argument,"); 2561 croak ("Coro::rouse_wait called with illegal callback argument,");
2027 2562
2028 { 2563 {
2029 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2564 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2030 SV *data = (SV *)GENSUB_ARG; 2565 SV *data = (SV *)S_GENSUB_ARG;
2031 2566
2032 frame->data = (void *)data; 2567 frame->data = (void *)data;
2033 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2568 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2034 frame->check = slf_check_rouse_wait; 2569 frame->check = slf_check_rouse_wait;
2035 } 2570 }
… …
2039coro_new_rouse_cb (pTHX) 2574coro_new_rouse_cb (pTHX)
2040{ 2575{
2041 HV *hv = (HV *)SvRV (coro_current); 2576 HV *hv = (HV *)SvRV (coro_current);
2042 struct coro *coro = SvSTATE_hv (hv); 2577 struct coro *coro = SvSTATE_hv (hv);
2043 SV *data = newRV_inc ((SV *)hv); 2578 SV *data = newRV_inc ((SV *)hv);
2044 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2579 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2045 2580
2046 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);
2047 SvREFCNT_dec (data); /* magicext increases the refcount */ 2582 SvREFCNT_dec (data); /* magicext increases the refcount */
2048 2583
2049 SvREFCNT_dec (coro->rouse_cb); 2584 SvREFCNT_dec (coro->rouse_cb);
… …
2146static void 2681static void
2147slf_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)
2148{ 2683{
2149 frame->prepare = prepare_cede_notself; 2684 frame->prepare = prepare_cede_notself;
2150 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);
2151} 2705}
2152 2706
2153/* 2707/*
2154 * these not obviously related functions are all rolled into one 2708 * these not obviously related functions are all rolled into one
2155 * 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
… …
2162 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 */
2163 2717
2164 /* 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 */
2165 /* the latter happens when a new coro has been started */ 2719 /* the latter happens when a new coro has been started */
2166 /* or when a new cctx was attached to an existing coroutine */ 2720 /* or when a new cctx was attached to an existing coroutine */
2167 if (expect_true (!slf_frame.prepare)) 2721 if (ecb_expect_true (!slf_frame.prepare))
2168 { 2722 {
2169 /* first iteration */ 2723 /* first iteration */
2170 dSP; 2724 dSP;
2171 SV **arg = PL_stack_base + TOPMARK + 1; 2725 SV **arg = PL_stack_base + TOPMARK + 1;
2172 int items = SP - arg; /* args without function object */ 2726 int items = SP - arg; /* args without function object */
… …
2213 while (slf_frame.check (aTHX_ &slf_frame)); 2767 while (slf_frame.check (aTHX_ &slf_frame));
2214 2768
2215 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 */
2216 2770
2217 /* exception handling */ 2771 /* exception handling */
2218 if (expect_false (CORO_THROW)) 2772 if (ecb_expect_false (CORO_THROW))
2219 { 2773 {
2220 SV *exception = sv_2mortal (CORO_THROW); 2774 SV *exception = sv_2mortal (CORO_THROW);
2221 2775
2222 CORO_THROW = 0; 2776 CORO_THROW = 0;
2223 sv_setsv (ERRSV, exception); 2777 sv_setsv (ERRSV, exception);
2224 croak (0); 2778 croak (0);
2225 } 2779 }
2226 2780
2227 /* return value handling - mostly like entersub */ 2781 /* return value handling - mostly like entersub */
2228 /* make sure we put something on the stack in scalar context */ 2782 /* make sure we put something on the stack in scalar context */
2229 if (GIMME_V == G_SCALAR) 2783 if (GIMME_V == G_SCALAR
2784 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2230 { 2785 {
2231 dSP; 2786 dSP;
2232 SV **bot = PL_stack_base + checkmark; 2787 SV **bot = PL_stack_base + checkmark;
2233 2788
2234 if (sp == bot) /* too few, push undef */ 2789 if (sp == bot) /* too few, push undef */
2235 bot [1] = &PL_sv_undef; 2790 bot [1] = &PL_sv_undef;
2236 else if (sp != bot + 1) /* too many, take last one */ 2791 else /* too many, take last one */
2237 bot [1] = *sp; 2792 bot [1] = *sp;
2238 2793
2239 SP = bot + 1; 2794 SP = bot + 1;
2240 2795
2241 PUTBACK; 2796 PUTBACK;
… …
2274 if (PL_op->op_flags & OPf_STACKED) 2829 if (PL_op->op_flags & OPf_STACKED)
2275 { 2830 {
2276 if (items > slf_arga) 2831 if (items > slf_arga)
2277 { 2832 {
2278 slf_arga = items; 2833 slf_arga = items;
2279 free (slf_argv); 2834 Safefree (slf_argv);
2280 slf_argv = malloc (slf_arga * sizeof (SV *)); 2835 New (0, slf_argv, slf_arga, SV *);
2281 } 2836 }
2282 2837
2283 slf_argc = items; 2838 slf_argc = items;
2284 2839
2285 for (i = 0; i < items; ++i) 2840 for (i = 0; i < items; ++i)
… …
2290 2845
2291 PL_op->op_ppaddr = pp_slf; 2846 PL_op->op_ppaddr = pp_slf;
2292 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2847 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2293 2848
2294 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);
2295} 2989}
2296 2990
2297/*****************************************************************************/ 2991/*****************************************************************************/
2298/* PerlIO::cede */ 2992/* PerlIO::cede */
2299 2993
… …
2301{ 2995{
2302 PerlIOBuf base; 2996 PerlIOBuf base;
2303 NV next, every; 2997 NV next, every;
2304} PerlIOCede; 2998} PerlIOCede;
2305 2999
2306static IV 3000static IV ecb_cold
2307PerlIOCede_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)
2308{ 3002{
2309 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2310 3004
2311 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3005 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2312 self->next = nvtime () + self->every; 3006 self->next = nvtime () + self->every;
2313 3007
2314 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3008 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2315} 3009}
2316 3010
2317static SV * 3011static SV * ecb_cold
2318PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3012PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2319{ 3013{
2320 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3014 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2321 3015
2322 return newSVnv (self->every); 3016 return newSVnv (self->every);
… …
2373/* Coro::Semaphore & Coro::Signal */ 3067/* Coro::Semaphore & Coro::Signal */
2374 3068
2375static SV * 3069static SV *
2376coro_waitarray_new (pTHX_ int count) 3070coro_waitarray_new (pTHX_ int count)
2377{ 3071{
2378 /* 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 */
2379 AV *av = newAV (); 3073 AV *av = newAV ();
2380 SV **ary; 3074 SV **ary;
2381 3075
2382 /* unfortunately, building manually saves memory */ 3076 /* unfortunately, building manually saves memory */
2383 Newx (ary, 2, SV *); 3077 Newx (ary, 2, SV *);
… …
2429 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3123 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2430 PUTBACK; 3124 PUTBACK;
2431 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3125 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2432 } 3126 }
2433 3127
2434 SvREFCNT_dec (cb); 3128 SvREFCNT_dec_NN (cb);
2435 } 3129 }
2436} 3130}
2437 3131
2438static void 3132static void
2439coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3133coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2440{ 3134{
2441 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3135 /* call $sem->adjust (0) to possibly wake up some other waiters */
2442 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3136 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2443} 3137}
2444 3138
2445static int 3139static int
2446slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3140slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2447{ 3141{
2448 AV *av = (AV *)frame->data; 3142 AV *av = (AV *)frame->data;
2449 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;
2450 3147
2451 /* 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 */
2452 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
2453 return 0; 3154 return 0;
3155 }
2454 else if (SvIVX (count_sv) > 0) 3156 else if (SvIVX (count_sv) > 0)
2455 { 3157 {
2456 SvSTATE_current->on_destroy = 0;
2457
2458 if (acquire) 3158 if (acquire)
2459 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3159 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2460 else 3160 else
2461 coro_semaphore_adjust (aTHX_ av, 0); 3161 coro_semaphore_adjust (aTHX_ av, 0);
2462 3162
… …
2466 { 3166 {
2467 int i; 3167 int i;
2468 /* 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 */
2469 /* 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 */
2470 /* this avoids some degenerate memory usage cases */ 3170 /* this avoids some degenerate memory usage cases */
2471 3171 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2472 for (i = 1; i <= AvFILLp (av); ++i)
2473 if (AvARRAY (av)[i] == SvRV (coro_current)) 3172 if (AvARRAY (av)[i] == coro_hv)
2474 return 1; 3173 return 1;
2475 3174
2476 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3175 av_push (av, SvREFCNT_inc (coro_hv));
2477 return 1; 3176 return 1;
2478 } 3177 }
2479} 3178}
2480 3179
2481static int 3180static int
… …
2504 { 3203 {
2505 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3204 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2506 3205
2507 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3206 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2508 frame->prepare = prepare_schedule; 3207 frame->prepare = prepare_schedule;
2509
2510 /* to avoid race conditions when a woken-up coro gets terminated */ 3208 /* to avoid race conditions when a woken-up coro gets terminated */
2511 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3209 /* we arrange for a temporary on_destroy that calls adjust (0) */
2512 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3210 frame->destroy = coro_semaphore_destroy;
2513 } 3211 }
2514} 3212}
2515 3213
2516static void 3214static void
2517slf_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)
… …
2525{ 3223{
2526 if (items >= 2) 3224 if (items >= 2)
2527 { 3225 {
2528 /* callback form */ 3226 /* callback form */
2529 AV *av = (AV *)SvRV (arg [0]); 3227 AV *av = (AV *)SvRV (arg [0]);
2530 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3228 SV *cb_cv = s_get_cv_croak (arg [1]);
2531 3229
2532 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3230 av_push (av, SvREFCNT_inc_NN (cb_cv));
2533 3231
2534 if (SvIVX (AvARRAY (av)[0]) > 0) 3232 if (SvIVX (AvARRAY (av)[0]) > 0)
2535 coro_semaphore_adjust (aTHX_ av, 0); 3233 coro_semaphore_adjust (aTHX_ av, 0);
2536 3234
2537 frame->prepare = prepare_nop; 3235 frame->prepare = prepare_nop;
… …
2561 AvARRAY (av)[0] = AvARRAY (av)[1]; 3259 AvARRAY (av)[0] = AvARRAY (av)[1];
2562 AvARRAY (av)[1] = cb; 3260 AvARRAY (av)[1] = cb;
2563 3261
2564 cb = av_shift (av); 3262 cb = av_shift (av);
2565 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 {
2566 api_ready (aTHX_ cb); 3274 api_ready (aTHX_ cb);
2567 sv_setiv (cb, 0); /* signal waiter */ 3275 sv_setiv (cb, 0); /* signal waiter */
3276 }
3277
2568 SvREFCNT_dec (cb); 3278 SvREFCNT_dec_NN (cb);
2569 3279
2570 --count; 3280 --count;
2571 } 3281 }
2572} 3282}
2573 3283
… …
2581static void 3291static void
2582slf_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)
2583{ 3293{
2584 AV *av = (AV *)SvRV (arg [0]); 3294 AV *av = (AV *)SvRV (arg [0]);
2585 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
2586 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]))
2587 { 3308 {
2588 SvIVX (AvARRAY (av)[0]) = 0; 3309 SvIVX (AvARRAY (av)[0]) = 0;
2589 frame->prepare = prepare_nop; 3310 frame->prepare = prepare_nop;
2590 frame->check = slf_check_nop; 3311 frame->check = slf_check_nop;
2591 } 3312 }
2592 else 3313 else
2593 { 3314 {
2594 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3315 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2595 3316
2596 av_push (av, waiter); 3317 av_push (av, waiter);
2597 3318
2598 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 */
2599 frame->prepare = prepare_schedule; 3320 frame->prepare = prepare_schedule;
… …
2617 3338
2618static void 3339static void
2619coro_aio_callback (pTHX_ CV *cv) 3340coro_aio_callback (pTHX_ CV *cv)
2620{ 3341{
2621 dXSARGS; 3342 dXSARGS;
2622 AV *state = (AV *)GENSUB_ARG; 3343 AV *state = (AV *)S_GENSUB_ARG;
2623 SV *coro = av_pop (state); 3344 SV *coro = av_pop (state);
2624 SV *data_sv = newSV (sizeof (struct io_state)); 3345 SV *data_sv = newSV (sizeof (struct io_state));
2625 3346
2626 av_extend (state, items - 1); 3347 av_extend (state, items - 1);
2627 3348
… …
2647 } 3368 }
2648 3369
2649 av_push (state, data_sv); 3370 av_push (state, data_sv);
2650 3371
2651 api_ready (aTHX_ coro); 3372 api_ready (aTHX_ coro);
2652 SvREFCNT_dec (coro); 3373 SvREFCNT_dec_NN (coro);
2653 SvREFCNT_dec ((AV *)state); 3374 SvREFCNT_dec_NN ((AV *)state);
2654} 3375}
2655 3376
2656static int 3377static int
2657slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3378slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2658{ 3379{
… …
2663 /* it quickly returns */ 3384 /* it quickly returns */
2664 if (CORO_THROW) 3385 if (CORO_THROW)
2665 return 0; 3386 return 0;
2666 3387
2667 /* one element that is an RV? repeat! */ 3388 /* one element that is an RV? repeat! */
2668 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3389 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2669 return 1; 3390 return 1;
2670 3391
2671 /* restore status */ 3392 /* restore status */
2672 { 3393 {
2673 SV *data_sv = av_pop (state); 3394 SV *data_sv = av_pop (state);
… …
2676 errno = data->errorno; 3397 errno = data->errorno;
2677 PL_laststype = data->laststype; 3398 PL_laststype = data->laststype;
2678 PL_laststatval = data->laststatval; 3399 PL_laststatval = data->laststatval;
2679 PL_statcache = data->statcache; 3400 PL_statcache = data->statcache;
2680 3401
2681 SvREFCNT_dec (data_sv); 3402 SvREFCNT_dec_NN (data_sv);
2682 } 3403 }
2683 3404
2684 /* push result values */ 3405 /* push result values */
2685 { 3406 {
2686 dSP; 3407 dSP;
… …
2712 dSP; 3433 dSP;
2713 3434
2714 static SV *prio_cv; 3435 static SV *prio_cv;
2715 static SV *prio_sv; 3436 static SV *prio_sv;
2716 3437
2717 if (expect_false (!prio_cv)) 3438 if (ecb_expect_false (!prio_cv))
2718 { 3439 {
2719 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3440 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2720 prio_sv = newSViv (0); 3441 prio_sv = newSViv (0);
2721 } 3442 }
2722 3443
… …
2741 3462
2742 for (i = 0; i < items; ++i) 3463 for (i = 0; i < items; ++i)
2743 PUSHs (arg [i]); 3464 PUSHs (arg [i]);
2744 3465
2745 /* now push the callback closure */ 3466 /* now push the callback closure */
2746 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))));
2747 3468
2748 /* now call the AIO function - we assume our request is uncancelable */ 3469 /* now call the AIO function - we assume our request is uncancelable */
2749 PUTBACK; 3470 PUTBACK;
2750 call_sv ((SV *)req, G_VOID | G_DISCARD); 3471 call_sv ((SV *)req, G_VOID | G_DISCARD);
2751 } 3472 }
2752 3473
2753 /* 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 */
2754 frame->data = (void *)state; 3475 frame->data = (void *)state;
2755 frame->prepare = prepare_schedule; 3476 frame->prepare = prepare_schedule;
2756 frame->check = slf_check_aio_req; 3477 frame->check = slf_check_aio_req;
2757} 3478}
2758 3479
… …
2770 3491
2771#if CORO_CLONE 3492#if CORO_CLONE
2772# include "clone.c" 3493# include "clone.c"
2773#endif 3494#endif
2774 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
2775MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2776 3625
2777PROTOTYPES: DISABLE 3626PROTOTYPES: DISABLE
2778 3627
2779BOOT: 3628BOOT:
2780{ 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"
2781#ifdef USE_ITHREADS 3632#ifdef USE_ITHREADS
2782# if CORO_PTHREAD 3633# if CORO_PTHREAD
2783 coro_thx = PERL_GET_CONTEXT; 3634 coro_thx = PERL_GET_CONTEXT;
2784# endif 3635# endif
2785#endif 3636#endif
2786 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;
2787 3643
2788 cctx_current = cctx_new_empty (); 3644 cctx_current = cctx_new_empty ();
2789 3645
2790 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3646 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2791 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3647 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2792 3648
2793 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3649 {
2794 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3650 /*
2795 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 }
2796 3673
2797 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2798 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));
2799 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));
2800 3676
2801 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3677 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2802 3678
… …
2831 coroapi.prepare_nop = prepare_nop; 3707 coroapi.prepare_nop = prepare_nop;
2832 coroapi.prepare_schedule = prepare_schedule; 3708 coroapi.prepare_schedule = prepare_schedule;
2833 coroapi.prepare_cede = prepare_cede; 3709 coroapi.prepare_cede = prepare_cede;
2834 coroapi.prepare_cede_notself = prepare_cede_notself; 3710 coroapi.prepare_cede_notself = prepare_cede_notself;
2835 3711
2836 { 3712 time_init (aTHX);
2837 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2838 3713
2839 if (!svp) croak ("Time::HiRes is required");
2840 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2841
2842 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2843 }
2844
2845 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
2846} 3720}
2847 3721
2848SV * 3722SV *
2849new (char *klass, ...) 3723new (SV *klass, ...)
2850 ALIAS: 3724 ALIAS:
2851 Coro::new = 1 3725 Coro::new = 1
2852 CODE: 3726 CODE:
2853{ 3727 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2854 struct coro *coro; 3728 OUTPUT:
2855 MAGIC *mg;
2856 HV *hv;
2857 CV *cb;
2858 int i;
2859
2860 if (items > 1)
2861 {
2862 cb = coro_sv_2cv (aTHX_ ST (1));
2863
2864 if (!ix)
2865 {
2866 if (CvISXSUB (cb))
2867 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2868
2869 if (!CvROOT (cb))
2870 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2871 }
2872 }
2873
2874 Newz (0, coro, 1, struct coro);
2875 coro->args = newAV ();
2876 coro->flags = CF_NEW;
2877
2878 if (coro_first) coro_first->prev = coro;
2879 coro->next = coro_first;
2880 coro_first = coro;
2881
2882 coro->hv = hv = newHV ();
2883 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2884 mg->mg_flags |= MGf_DUP;
2885 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2886
2887 if (items > 1)
2888 {
2889 av_extend (coro->args, items - 1 + ix - 1);
2890
2891 if (ix)
2892 {
2893 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2894 cb = cv_coro_run;
2895 }
2896
2897 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2898
2899 for (i = 2; i < items; i++)
2900 av_push (coro->args, newSVsv (ST (i)));
2901 }
2902}
2903 OUTPUT:
2904 RETVAL 3729 RETVAL
2905 3730
2906void 3731void
2907transfer (...) 3732transfer (...)
2908 PROTOTYPE: $$ 3733 PROTOTYPE: $$
2909 CODE: 3734 CODE:
2910 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3735 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2911
2912bool
2913_destroy (SV *coro_sv)
2914 CODE:
2915 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2916 OUTPUT:
2917 RETVAL
2918
2919void
2920_exit (int code)
2921 PROTOTYPE: $
2922 CODE:
2923 _exit (code);
2924 3736
2925SV * 3737SV *
2926clone (Coro::State coro) 3738clone (Coro::State coro)
2927 CODE: 3739 CODE:
2928{ 3740{
… …
2983void 3795void
2984list () 3796list ()
2985 PROTOTYPE: 3797 PROTOTYPE:
2986 PPCODE: 3798 PPCODE:
2987{ 3799{
2988 struct coro *coro; 3800 struct coro *coro;
2989 for (coro = coro_first; coro; coro = coro->next) 3801 for (coro = coro_first; coro; coro = coro->next)
2990 if (coro->hv) 3802 if (coro->hv)
2991 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3803 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2992} 3804}
2993 3805
… …
2997 eval = 1 3809 eval = 1
2998 CODE: 3810 CODE:
2999{ 3811{
3000 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3812 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3001 { 3813 {
3002 struct coro temp; 3814 struct coro *current = SvSTATE_current;
3815 struct CoroSLF slf_save;
3003 3816
3004 if (!(coro->flags & CF_RUNNING)) 3817 if (current != coro)
3005 { 3818 {
3006 PUTBACK; 3819 PUTBACK;
3007 save_perl (aTHX_ &temp); 3820 save_perl (aTHX_ current);
3008 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;
3009 } 3832 }
3010 3833
3011 {
3012 dSP;
3013 ENTER;
3014 SAVETMPS;
3015 PUTBACK;
3016 PUSHSTACK; 3834 PUSHSTACK;
3835
3017 PUSHMARK (SP); 3836 PUSHMARK (SP);
3837 PUTBACK;
3018 3838
3019 if (ix) 3839 if (ix)
3020 eval_sv (coderef, 0); 3840 eval_sv (coderef, 0);
3021 else 3841 else
3022 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3842 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3023 3843
3024 POPSTACK; 3844 POPSTACK;
3025 SPAGAIN; 3845 SPAGAIN;
3026 FREETMPS;
3027 LEAVE;
3028 PUTBACK;
3029 }
3030 3846
3031 if (!(coro->flags & CF_RUNNING)) 3847 if (current != coro)
3032 { 3848 {
3849 PUTBACK;
3850 slf_frame = slf_save;
3033 save_perl (aTHX_ coro); 3851 save_perl (aTHX_ coro);
3034 load_perl (aTHX_ &temp); 3852 load_perl (aTHX_ current);
3035 SPAGAIN; 3853 SPAGAIN;
3036 } 3854 }
3037 } 3855 }
3038} 3856}
3039 3857
… …
3042 PROTOTYPE: $ 3860 PROTOTYPE: $
3043 ALIAS: 3861 ALIAS:
3044 is_ready = CF_READY 3862 is_ready = CF_READY
3045 is_running = CF_RUNNING 3863 is_running = CF_RUNNING
3046 is_new = CF_NEW 3864 is_new = CF_NEW
3047 is_destroyed = CF_DESTROYED 3865 is_destroyed = CF_ZOMBIE
3866 is_zombie = CF_ZOMBIE
3867 is_suspended = CF_SUSPENDED
3048 CODE: 3868 CODE:
3049 RETVAL = boolSV (coro->flags & ix); 3869 RETVAL = boolSV (coro->flags & ix);
3050 OUTPUT: 3870 OUTPUT:
3051 RETVAL 3871 RETVAL
3052 3872
3053void 3873void
3054throw (Coro::State self, SV *throw = &PL_sv_undef) 3874throw (SV *self, SV *exception = &PL_sv_undef)
3055 PROTOTYPE: $;$ 3875 PROTOTYPE: $;$
3056 CODE: 3876 CODE:
3057{ 3877{
3878 struct coro *coro = SvSTATE (self);
3058 struct coro *current = SvSTATE_current; 3879 struct coro *current = SvSTATE_current;
3059 SV **throwp = self == current ? &CORO_THROW : &self->except; 3880 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3060 SvREFCNT_dec (*throwp); 3881 SvREFCNT_dec (*exceptionp);
3061 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3882 SvGETMAGIC (exception);
3883 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3884
3885 api_ready (aTHX_ self);
3062} 3886}
3063 3887
3064void 3888void
3065api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3889api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3066 PROTOTYPE: $;$ 3890 PROTOTYPE: $;$
… …
3117 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3941 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3118 3942
3119 SV *tmp = *src; *src = *dst; *dst = tmp; 3943 SV *tmp = *src; *src = *dst; *dst = tmp;
3120 } 3944 }
3121 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
3122 4035
3123MODULE = Coro::State PACKAGE = Coro 4036MODULE = Coro::State PACKAGE = Coro
3124 4037
3125BOOT: 4038BOOT:
3126{ 4039{
3127 int i; 4040 if (SVt_LAST > 32)
4041 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3128 4042
3129 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4043 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3130 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4044 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3131 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 4045 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3132 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3133 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);
3134 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4047 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3135 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4048 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3136 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4049 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3137 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4050 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3138 4051
3139 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);
3140 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4053 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3141 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);
3142 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 */
3143 4056
3144 coro_stash = gv_stashpv ("Coro", TRUE); 4057 coro_stash = gv_stashpv ("Coro", TRUE);
3145 4058
3146 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4059 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3147 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4060 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3148 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4061 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3149 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4062 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3150 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4063 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3151 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4064 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3152
3153 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3154 coro_ready[i] = newAV ();
3155 4065
3156 { 4066 {
3157 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4067 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3158 4068
3159 coroapi.schedule = api_schedule; 4069 coroapi.schedule = api_schedule;
… …
3163 coroapi.ready = api_ready; 4073 coroapi.ready = api_ready;
3164 coroapi.is_ready = api_is_ready; 4074 coroapi.is_ready = api_is_ready;
3165 coroapi.nready = coro_nready; 4075 coroapi.nready = coro_nready;
3166 coroapi.current = coro_current; 4076 coroapi.current = coro_current;
3167 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
3168 /*GCoroAPI = &coroapi;*/ 4082 /*GCoroAPI = &coroapi;*/
3169 sv_setiv (sv, (IV)&coroapi); 4083 sv_setiv (sv, PTR2IV (&coroapi));
3170 SvREADONLY_on (sv); 4084 SvREADONLY_on (sv);
3171 } 4085 }
3172} 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);
3173 4112
3174void 4113void
3175terminate (...) 4114terminate (...)
3176 CODE: 4115 CODE:
3177 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4116 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3178 4117
3179void 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
4126
4127void
3180schedule (...) 4128schedule (...)
3181 CODE: 4129 CODE:
3182 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4130 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3183 4131
3184void 4132void
… …
3200cede_notself (...) 4148cede_notself (...)
3201 CODE: 4149 CODE:
3202 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4150 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3203 4151
3204void 4152void
3205_cancel (Coro::State self)
3206 CODE:
3207 coro_state_destroy (aTHX_ self);
3208 coro_call_on_destroy (aTHX_ self);
3209
3210void
3211_set_current (SV *current) 4153_set_current (SV *current)
3212 PROTOTYPE: $ 4154 PROTOTYPE: $
3213 CODE: 4155 CODE:
3214 SvREFCNT_dec (SvRV (coro_current)); 4156 SvREFCNT_dec_NN (SvRV (coro_current));
3215 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4157 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3216 4158
3217void 4159void
3218_set_readyhook (SV *hook) 4160_set_readyhook (SV *hook)
3219 PROTOTYPE: $ 4161 PROTOTYPE: $
3220 CODE: 4162 CODE:
3221 SvREFCNT_dec (coro_readyhook); 4163 SvREFCNT_dec (coro_readyhook);
4164 SvGETMAGIC (hook);
4165 if (SvOK (hook))
4166 {
3222 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 }
3223 4175
3224int 4176int
3225prio (Coro::State coro, int newprio = 0) 4177prio (Coro::State coro, int newprio = 0)
3226 PROTOTYPE: $;$ 4178 PROTOTYPE: $;$
3227 ALIAS: 4179 ALIAS:
… …
3233 if (items > 1) 4185 if (items > 1)
3234 { 4186 {
3235 if (ix) 4187 if (ix)
3236 newprio = coro->prio - newprio; 4188 newprio = coro->prio - newprio;
3237 4189
3238 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4190 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3239 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4191 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3240 4192
3241 coro->prio = newprio; 4193 coro->prio = newprio;
3242 } 4194 }
3243} 4195}
3244 OUTPUT: 4196 OUTPUT:
… …
3259 RETVAL = coro_nready; 4211 RETVAL = coro_nready;
3260 OUTPUT: 4212 OUTPUT:
3261 RETVAL 4213 RETVAL
3262 4214
3263void 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
3264_pool_handler (...) 4228_pool_handler (...)
3265 CODE: 4229 CODE:
3266 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4230 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3267 4231
3268void 4232void
… …
3279 for (i = 1; i < items; ++i) 4243 for (i = 1; i < items; ++i)
3280 av_push (av, SvREFCNT_inc_NN (ST (i))); 4244 av_push (av, SvREFCNT_inc_NN (ST (i)));
3281 4245
3282 if ((SV *)hv == &PL_sv_undef) 4246 if ((SV *)hv == &PL_sv_undef)
3283 { 4247 {
3284 PUSHMARK (SP); 4248 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3285 EXTEND (SP, 2);
3286 PUSHs (sv_Coro);
3287 PUSHs ((SV *)cv_pool_handler);
3288 PUTBACK;
3289 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3290 SPAGAIN;
3291
3292 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4249 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4250 SvREFCNT_dec_NN (sv);
3293 } 4251 }
3294 4252
3295 { 4253 {
3296 struct coro *coro = SvSTATE_hv (hv); 4254 struct coro *coro = SvSTATE_hv (hv);
3297 4255
… …
3304 api_ready (aTHX_ (SV *)hv); 4262 api_ready (aTHX_ (SV *)hv);
3305 4263
3306 if (GIMME_V != G_VOID) 4264 if (GIMME_V != G_VOID)
3307 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4265 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3308 else 4266 else
3309 SvREFCNT_dec (hv); 4267 SvREFCNT_dec_NN (hv);
3310} 4268}
3311 4269
3312SV * 4270SV *
3313rouse_cb () 4271rouse_cb ()
3314 PROTOTYPE: 4272 PROTOTYPE:
… …
3321rouse_wait (...) 4279rouse_wait (...)
3322 PROTOTYPE: ;$ 4280 PROTOTYPE: ;$
3323 PPCODE: 4281 PPCODE:
3324 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4282 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3325 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
3326 4309
3327MODULE = Coro::State PACKAGE = PerlIO::cede 4310MODULE = Coro::State PACKAGE = PerlIO::cede
3328 4311
3329BOOT: 4312BOOT:
3330 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4313 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3333MODULE = Coro::State PACKAGE = Coro::Semaphore 4316MODULE = Coro::State PACKAGE = Coro::Semaphore
3334 4317
3335SV * 4318SV *
3336new (SV *klass, SV *count = 0) 4319new (SV *klass, SV *count = 0)
3337 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
3338 RETVAL = sv_bless ( 4332 RETVAL = sv_bless (
3339 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4333 coro_waitarray_new (aTHX_ semcnt),
3340 GvSTASH (CvGV (cv)) 4334 GvSTASH (CvGV (cv))
3341 ); 4335 );
4336}
3342 OUTPUT: 4337 OUTPUT:
3343 RETVAL 4338 RETVAL
3344 4339
3345# helper for Coro::Channel 4340# helper for Coro::Channel and others
3346SV * 4341SV *
3347_alloc (int count) 4342_alloc (int count)
3348 CODE: 4343 CODE:
3349 RETVAL = coro_waitarray_new (aTHX_ count); 4344 RETVAL = coro_waitarray_new (aTHX_ count);
3350 OUTPUT: 4345 OUTPUT:
… …
3356 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4351 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3357 OUTPUT: 4352 OUTPUT:
3358 RETVAL 4353 RETVAL
3359 4354
3360void 4355void
3361up (SV *self, int adjust = 1) 4356up (SV *self)
3362 ALIAS:
3363 adjust = 1
3364 CODE: 4357 CODE:
4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4359
4360void
4361adjust (SV *self, int adjust)
4362 CODE:
3365 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4363 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3366 4364
3367void 4365void
3368down (...) 4366down (...)
3369 CODE: 4367 CODE:
3370 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4368 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3392 XSRETURN_NO; 4390 XSRETURN_NO;
3393} 4391}
3394 4392
3395void 4393void
3396waiters (SV *self) 4394waiters (SV *self)
3397 PPCODE: 4395 PPCODE:
3398{ 4396{
3399 AV *av = (AV *)SvRV (self); 4397 AV *av = (AV *)SvRV (self);
3400 int wcount = AvFILLp (av) + 1 - 1; 4398 int wcount = AvFILLp (av) + 1 - 1;
3401 4399
3402 if (GIMME_V == G_SCALAR) 4400 if (GIMME_V == G_SCALAR)
… …
3408 for (i = 1; i <= wcount; ++i) 4406 for (i = 1; i <= wcount; ++i)
3409 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4407 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3410 } 4408 }
3411} 4409}
3412 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
3413MODULE = Coro::State PACKAGE = Coro::Signal 4427MODULE = Coro::State PACKAGE = Coro::Signal
3414 4428
3415SV * 4429SV *
3416new (SV *klass) 4430new (SV *klass)
3417 CODE: 4431 CODE:
… …
3429 4443
3430void 4444void
3431broadcast (SV *self) 4445broadcast (SV *self)
3432 CODE: 4446 CODE:
3433{ 4447{
3434 AV *av = (AV *)SvRV (self); 4448 AV *av = (AV *)SvRV (self);
3435 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4449 coro_signal_wake (aTHX_ av, AvFILLp (av));
3436} 4450}
3437 4451
3438void 4452void
3439send (SV *self) 4453send (SV *self)
… …
3447 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4461 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3448} 4462}
3449 4463
3450IV 4464IV
3451awaited (SV *self) 4465awaited (SV *self)
3452 CODE: 4466 CODE:
3453 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4467 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3454 OUTPUT: 4468 OUTPUT:
3455 RETVAL 4469 RETVAL
3456 4470
3457 4471
… …
3462 4476
3463void 4477void
3464_schedule (...) 4478_schedule (...)
3465 CODE: 4479 CODE:
3466{ 4480{
3467 static int incede; 4481 static int incede;
3468 4482
3469 api_cede_notself (aTHX); 4483 api_cede_notself (aTHX);
3470 4484
3471 ++incede; 4485 ++incede;
3472 while (coro_nready >= incede && api_cede (aTHX)) 4486 while (coro_nready >= incede && api_cede (aTHX))
… …
3488 4502
3489void 4503void
3490_register (char *target, char *proto, SV *req) 4504_register (char *target, char *proto, SV *req)
3491 CODE: 4505 CODE:
3492{ 4506{
3493 CV *req_cv = coro_sv_2cv (aTHX_ req); 4507 SV *req_cv = s_get_cv_croak (req);
3494 /* newXSproto doesn't return the CV on 5.8 */ 4508 /* newXSproto doesn't return the CV on 5.8 */
3495 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4509 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3496 sv_setpv ((SV *)slf_cv, proto); 4510 sv_setpv ((SV *)slf_cv, proto);
3497 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);
3498} 4512}
3499 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