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.328 by root, Tue Nov 25 09:49:43 2008 UTC vs.
Revision 1.459 by root, Fri Jun 17 05:00:19 2016 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
… …
133#else 95#else
134# define dSTACKLEVEL volatile void *stacklevel 96# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
136#endif 98#endif
137 99
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 100#define IN_DESTRUCT PL_dirty
139
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 101
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
164static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
165 123
166/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
169 128
170static U32 cctx_gen; 129static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
181 140
182static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
183static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
184static SV *rv_diehook; 143static SV *rv_diehook;
185static SV *rv_warnhook; 144static SV *rv_warnhook;
186static HV *hv_sig; /* %SIG */
187 145
188/* async_pool helper stuff */ 146/* async_pool helper stuff */
189static SV *sv_pool_rss; 147static SV *sv_pool_rss;
190static SV *sv_pool_size; 148static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 152static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 153
197/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
198static SV *sv_activity; 155static SV *sv_activity;
199 156
157/* enable processtime/realtime profiling */
158static char enable_times;
159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
162
200static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
202 165
203enum { 166enum
167{
204 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 177typedef struct coro_cctx
214{ 178{
215 struct coro_cctx *next; 179 struct coro_cctx *next;
216 180
217 /* the stack */ 181 /* the stack */
218 void *sptr; 182 struct coro_stack stack;
219 size_t ssize;
220 183
221 /* cpu state */ 184 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
224 JMPENV *top_env; 189 JMPENV *top_env;
225 coro_context cctx; 190 coro_context cctx;
226 191
227 U32 gen; 192 U32 gen;
228#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
229 int valgrind_id; 194 int valgrind_id;
230#endif 195#endif
231 unsigned char flags; 196 unsigned char flags;
232} coro_cctx; 197} coro_cctx;
233 198
234coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
235 200
236/*****************************************************************************/ 201/*****************************************************************************/
237 202
203static MGVTBL coro_state_vtbl;
204
238enum { 205enum
206{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 213};
244 214
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 216typedef struct
247{ 217{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
254# include "state.h" 219 #include "state.h"
255#undef VAR
256} perl_slots; 220} perl_slots;
257 221
222/* 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)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 224
260/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
261struct coro { 226struct coro
227{
262 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 229 coro_cctx *cctx;
230
231 /* ready queue */
232 struct coro *next_ready;
264 233
265 /* state data */ 234 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 236 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
269 238
270 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 243
277 /* statistics */ 244 /* statistics */
278 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
279 246
280 /* coro process data */ 247 /* coro process data */
281 int prio; 248 int prio;
282 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
283 SV *rouse_cb; 250 SV *rouse_cb; /* last rouse callback */
251 AV *on_destroy; /* callbacks or coros to notify on destroy */
252 AV *status; /* the exit status list */
284 253
285 /* async_pool */ 254 /* async_pool */
286 SV *saved_deffh; 255 SV *saved_deffh;
287 SV *invoke_cb; 256 SV *invoke_cb;
288 AV *invoke_av; 257 AV *invoke_av;
289 258
259 /* on_enter/on_leave */
260 AV *on_enter; AV *on_enter_xs;
261 AV *on_leave; AV *on_leave_xs;
262
263 /* swap_sv */
264 AV *swap_sv;
265
266 /* times */
267 coro_ts t_cpu, t_real;
268
290 /* linked list */ 269 /* linked list */
291 struct coro *next, *prev; 270 struct coro *next, *prev;
292}; 271};
293 272
294typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
296 275
297/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
301 280
302/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
303 282
304#define PRIO_MAX 3 283#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 284#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 285#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 286#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 287#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 288#define CORO_PRIO_MIN -4
310 289
311/* for Coro.pm */ 290/* for Coro.pm */
312static SV *coro_current; 291static SV *coro_current;
313static SV *coro_readyhook; 292static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
316static struct coro *coro_first; 295static struct coro *coro_first;
317#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
318 297
298/** JIT *********************************************************************/
299
300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
303 #ifndef CORO_JIT_TYPE
304 #if ECB_AMD64 && CORO_JIT_UNIXY
305 #define CORO_JIT_TYPE "amd64-unix"
306 #elif __i386 && CORO_JIT_UNIXY
307 #define CORO_JIT_TYPE "x86-unix"
308 #endif
309 #endif
310#endif
311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
319#endif
320
321/** Coro::Select ************************************************************/
322
323static OP *(*coro_old_pp_sselect) (pTHX);
324static SV *coro_select_select;
325
326/* horrible hack, but if it works... */
327static OP *
328coro_pp_sselect (pTHX)
329{
330 dSP;
331 PUSHMARK (SP - 4); /* fake argument list */
332 XPUSHs (coro_select_select);
333 PUTBACK;
334
335 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
336 PL_op->op_flags |= OPf_STACKED;
337 PL_op->op_private = 0;
338 return PL_ppaddr [OP_ENTERSUB](aTHX);
339}
340
341/** time stuff **************************************************************/
342
343#ifdef HAS_GETTIMEOFDAY
344
345ecb_inline void
346coro_u2time (pTHX_ UV ret[2])
347{
348 struct timeval tv;
349 gettimeofday (&tv, 0);
350
351 ret [0] = tv.tv_sec;
352 ret [1] = tv.tv_usec;
353}
354
355ecb_inline double
356coro_nvtime (void)
357{
358 struct timeval tv;
359 gettimeofday (&tv, 0);
360
361 return tv.tv_sec + tv.tv_usec * 1e-6;
362}
363
364ecb_inline void
365time_init (pTHX)
366{
367 nvtime = coro_nvtime;
368 u2time = coro_u2time;
369}
370
371#else
372
373ecb_inline void
374time_init (pTHX)
375{
376 SV **svp;
377
378 require_pv ("Time/HiRes.pm");
379
380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
381
382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
384
385 nvtime = INT2PTR (double (*)(), SvIV (*svp));
386
387 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
388 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
389}
390
391#endif
392
319/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
320 394
321static SV * 395static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
323{ 397{
324#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 400 get_sv (name, create);
327#endif 401#endif
328 return get_sv (name, create); 402 return get_sv (name, create);
329} 403}
330 404
331static AV * 405static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
333{ 407{
334#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 409 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 410 get_av (name, create);
337#endif 411#endif
338 return get_av (name, create); 412 return get_av (name, create);
339} 413}
340 414
341static HV * 415static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
343{ 417{
344#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 419 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 420 get_hv (name, create);
347#endif 421#endif
348 return get_hv (name, create); 422 return get_hv (name, create);
349} 423}
350 424
351/* may croak */ 425ecb_inline void
352INLINE CV * 426coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 427{
355 HV *st; 428#ifdef coro_clock_gettime
356 GV *gvp; 429 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0);
358}
359 430
360static AV * 431 ts.tv_sec = ts.tv_nsec = 0;
432 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
433 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
434
435 ts.tv_sec = ts.tv_nsec = 0;
436 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
437 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
438#else
439 dTHX;
440 UV tv[2];
441
442 u2time (aTHX_ tv);
443 time_real [0] = tv [0];
444 time_real [1] = tv [1] * 1000;
445#endif
446}
447
448ecb_inline void
449coro_times_add (struct coro *c)
450{
451 c->t_real [1] += time_real [1];
452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
453 c->t_real [0] += time_real [0];
454
455 c->t_cpu [1] += time_cpu [1];
456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
457 c->t_cpu [0] += time_cpu [0];
458}
459
460ecb_inline void
461coro_times_sub (struct coro *c)
462{
463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
464 c->t_real [1] -= time_real [1];
465 c->t_real [0] -= time_real [0];
466
467 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
468 c->t_cpu [1] -= time_cpu [1];
469 c->t_cpu [0] -= time_cpu [0];
470}
471
472/*****************************************************************************/
473/* magic glue */
474
475#define CORO_MAGIC_type_cv 26
476#define CORO_MAGIC_type_state PERL_MAGIC_ext
477
478#define CORO_MAGIC_NN(sv, type) \
479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
480 ? SvMAGIC (sv) \
481 : mg_find (sv, type))
482
483#define CORO_MAGIC(sv, type) \
484 (ecb_expect_true (SvMAGIC (sv)) \
485 ? CORO_MAGIC_NN (sv, type) \
486 : 0)
487
488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
490
491ecb_inline MAGIC *
492SvSTATEhv_p (pTHX_ SV *coro)
493{
494 MAGIC *mg;
495
496 if (ecb_expect_true (
497 SvTYPE (coro) == SVt_PVHV
498 && (mg = CORO_MAGIC_state (coro))
499 && mg->mg_virtual == &coro_state_vtbl
500 ))
501 return mg;
502
503 return 0;
504}
505
506ecb_inline struct coro *
507SvSTATE_ (pTHX_ SV *coro_sv)
508{
509 MAGIC *mg;
510
511 if (SvROK (coro_sv))
512 coro_sv = SvRV (coro_sv);
513
514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
516 croak ("Coro::State object required");
517
518 return (struct coro *)mg->mg_ptr;
519}
520
521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
522
523/* faster than SvSTATE, but expects a coroutine hv */
524#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
526
527/*****************************************************************************/
528/* padlist management and caching */
529
530ecb_inline PADLIST *
361coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
362{ 532{
363 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
364 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
365 538
366 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
367 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
368#if PERL_VERSION_ATLEAST (5,10,0)
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
370#else
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 568#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist);
375 569
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 570 /* Already extended to 2 elements by newPADLIST. */
377 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
378 578
379 return newpadlist; 579 return newpadlist;
380} 580}
381 581
382static void 582ecb_inline void
383free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
384{ 584{
385 /* may be during global destruction */ 585 /* may be during global destruction */
386 if (SvREFCNT (padlist)) 586 if (!IN_DESTRUCT)
387 { 587 {
388 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
389 while (i >= 0) 589
590 while (i > 0) /* special-case index 0 */
390 { 591 {
391 SV **svp = av_fetch (padlist, i--, FALSE); 592 /* we try to be extra-careful here */
593 PAD *pad = PadlistARRAY (padlist)[i--];
594
392 if (svp) 595 if (pad)
393 { 596 {
394 SV *sv; 597 I32 j = PadMAX (pad);
395 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 598
599 while (j >= 0)
396 SvREFCNT_dec (sv); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
397 601
602 PadMAX (pad) = -1;
398 SvREFCNT_dec (*svp); 603 SvREFCNT_dec (pad);
399 } 604 }
400 } 605 }
401 606
607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
402 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
403 } 617 }
404} 618}
405 619
406static int 620static int
407coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
408{ 622{
409 AV *padlist; 623 PADLIST *padlist;
410 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
411 626
412 /* casting is fun. */ 627 /* perl manages to free our internal AV and _then_ call us */
413 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 628 if (IN_DESTRUCT)
629 return 0;
630
631 while (len--)
414 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
415
416 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417 633
418 return 0; 634 return 0;
419} 635}
420
421#define CORO_MAGIC_type_cv 26
422#define CORO_MAGIC_type_state PERL_MAGIC_ext
423 636
424static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
425 0, 0, 0, 0, 638 0, 0, 0, 0,
426 coro_cv_free 639 coro_cv_free
427}; 640};
428 641
429#define CORO_MAGIC_NN(sv, type) \
430 (expect_true (SvMAGIC (sv)->mg_type == type) \
431 ? SvMAGIC (sv) \
432 : mg_find (sv, type))
433
434#define CORO_MAGIC(sv, type) \
435 (expect_true (SvMAGIC (sv)) \
436 ? CORO_MAGIC_NN (sv, type) \
437 : 0)
438
439#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
440#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
441
442INLINE struct coro *
443SvSTATE_ (pTHX_ SV *coro)
444{
445 HV *stash;
446 MAGIC *mg;
447
448 if (SvROK (coro))
449 coro = SvRV (coro);
450
451 if (expect_false (SvTYPE (coro) != SVt_PVHV))
452 croak ("Coro::State object required");
453
454 stash = SvSTASH (coro);
455 if (expect_false (stash != coro_stash && stash != coro_state_stash))
456 {
457 /* very slow, but rare, check */
458 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
459 croak ("Coro::State object required");
460 }
461
462 mg = CORO_MAGIC_state (coro);
463 return (struct coro *)mg->mg_ptr;
464}
465
466#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
467
468/* faster than SvSTATE, but expects a coroutine hv */
469#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
470#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
471
472/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
473static void 643ecb_inline void
474get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
475{ 645{
476 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
477 AV *av; 647 size_t *lenp;
478 648
479 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
480 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
481 else 651 else
482 { 652 {
483#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
484 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
485 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
491 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
492#endif 662#endif
493 } 663 }
494} 664}
495 665
496static void 666ecb_inline void
497put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
498{ 668{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av;
501 670
502 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
503 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
504 681
505 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
506
507 if (expect_false (AvFILLp (av) >= AvMAX (av)))
508 av_extend (av, AvMAX (av) + 1);
509
510 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511} 683}
512 684
513/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
729/* swap sv heads, at least logically */
730static void
731swap_svs_enter (pTHX_ Coro__State c)
732{
733 int i;
734
735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
737}
738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
748#define SWAP_SVS_ENTER(coro) \
749 if (ecb_expect_false ((coro)->swap_sv)) \
750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
755
756static void
757on_enterleave_call (pTHX_ SV *cb);
514 758
515static void 759static void
516load_perl (pTHX_ Coro__State c) 760load_perl (pTHX_ Coro__State c)
517{ 761{
518 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
519 c->slot = 0; 763 c->slot = 0;
520 764
521 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
522 766
523 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
524 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
525 GvSV (PL_errgv) = slot->errsv; 769#else
526 GvSV (irsgv) = slot->irsgv;
527 GvHV (PL_hintgv) = slot->hinthv;
528
529 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
530 # include "state.h" 771 #include "state.h"
531 #undef VAR 772#endif
532 773
533 { 774 {
534 dSP; 775 dSP;
535 776
536 CV *cv; 777 CV *cv;
537 778
538 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
539 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
540 { 781 {
541 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
542 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
543 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
544 } 785 }
545 786
546 PUTBACK; 787 PUTBACK;
547 } 788 }
548 789
549 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
550 CORO_THROW = c->except; 791 CORO_THROW = c->except;
792
793 if (ecb_expect_false (enable_times))
794 {
795 if (ecb_expect_false (!times_valid))
796 coro_times_update ();
797
798 coro_times_sub (c);
799 }
800
801 if (ecb_expect_false (c->on_enter))
802 {
803 int i;
804
805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
807 }
808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
817 SWAP_SVS_ENTER (c);
551} 818}
552 819
553static void 820static void
554save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
555{ 822{
823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
832
833 if (ecb_expect_false (c->on_leave))
834 {
835 int i;
836
837 for (i = AvFILLp (c->on_leave); i >= 0; --i)
838 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
839 }
840
841 times_valid = 0;
842
843 if (ecb_expect_false (enable_times))
844 {
845 coro_times_update (); times_valid = 1;
846 coro_times_add (c);
847 }
848
556 c->except = CORO_THROW; 849 c->except = CORO_THROW;
557 c->slf_frame = slf_frame; 850 c->slf_frame = slf_frame;
558 851
559 { 852 {
560 dSP; 853 dSP;
… …
569 862
570 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
571 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
572 for (;;) 865 for (;;)
573 { 866 {
574 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
575 { 868 {
576 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
577 870
578 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 871 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
579 { 872 {
580 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
581 874
582 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
583 { 876 {
584 EXTEND (SP, 3); 877 EXTEND (SP, 3);
585 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
586 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
587 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
590 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
591 } 884 }
592 } 885 }
593 } 886 }
594 887
595 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
596 break; 889 break;
597 890
598 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
599 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
600 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
602 895
603 PUTBACK; 896 PUTBACK;
604 } 897 }
605 898
606 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
607 /* we manually unroll here, as usually 2 slots is enough */ 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
608 if (SLOT_COUNT >= 1) CXINC;
609 if (SLOT_COUNT >= 2) CXINC;
610 if (SLOT_COUNT >= 3) CXINC;
611 { 901 {
612 int i; 902 unsigned int i;
903
613 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
614 CXINC; 905 CXINC;
615 } 906
616 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
617 909
618 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
619 911
620 { 912 {
621 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
622 914
623 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
624 slot->defsv = DEFSV; 916 save_perl_slots (slot);
625 slot->errsv = ERRSV; 917#else
626 slot->irsgv = GvSV (irsgv);
627 slot->hinthv = GvHV (PL_hintgv);
628
629 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
630 # include "state.h" 919 #include "state.h"
631 #undef VAR 920#endif
632 } 921 }
633} 922}
634 923
635/* 924/*
636 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
642# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
643#else 932#else
644static void 933static void
645coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
646{ 935{
647 PL_curstackinfo = new_stackinfo(32, 8); 936 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
648 PL_curstackinfo->si_type = PERLSI_MAIN; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
649 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
650 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
651 940
652 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
667#endif 956#endif
668 957
669 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
670 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
671 PL_scopestack_max = 8; 960 PL_scopestack_max = 8;
961#if HAS_SCOPESTACK_NAME
962 New(54,PL_scopestack_name,8,const char*);
963#endif
672 964
673 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
674 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
675 PL_savestack_max = 24; 967 PL_savestack_max = 24;
676 968
… …
704 } 996 }
705 997
706 Safefree (PL_tmps_stack); 998 Safefree (PL_tmps_stack);
707 Safefree (PL_markstack); 999 Safefree (PL_markstack);
708 Safefree (PL_scopestack); 1000 Safefree (PL_scopestack);
1001#if HAS_SCOPESTACK_NAME
1002 Safefree (PL_scopestack_name);
1003#endif
709 Safefree (PL_savestack); 1004 Safefree (PL_savestack);
710#if !PERL_VERSION_ATLEAST (5,10,0) 1005#if !PERL_VERSION_ATLEAST (5,10,0)
711 Safefree (PL_retstack); 1006 Safefree (PL_retstack);
712#endif 1007#endif
713} 1008}
… …
759#endif 1054#endif
760 1055
761/* 1056/*
762 * This overrides the default magic get method of %SIG elements. 1057 * This overrides the default magic get method of %SIG elements.
763 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1058 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
764 * and instead of tryign to save and restore the hash elements, we just provide 1059 * and instead of trying to save and restore the hash elements (extremely slow),
765 * readback here. 1060 * we just provide our own readback here.
766 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
767 * not expecting this to actually change the hook. This is a potential problem
768 * when a schedule happens then, but we ignore this.
769 */ 1061 */
770static int 1062static int ecb_cold
771coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1063coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
772{ 1064{
773 const char *s = MgPV_nolen_const (mg); 1065 const char *s = MgPV_nolen_const (mg);
774 1066
775 if (*s == '_') 1067 if (*s == '_')
776 { 1068 {
777 SV **svp = 0; 1069 SV **svp = 0;
778 1070
779 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1071 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
780 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1072 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
781 1073
782 if (svp) 1074 if (svp)
783 { 1075 {
784 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1076 SV *ssv;
1077
1078 if (!*svp)
1079 ssv = &PL_sv_undef;
1080 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1081 ssv = sv_2mortal (newRV_inc (*svp));
1082 else
1083 ssv = *svp;
1084
1085 sv_setsv (sv, ssv);
785 return 0; 1086 return 0;
786 } 1087 }
787 } 1088 }
788 1089
789 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
790} 1091}
791 1092
792static int 1093static int ecb_cold
793coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
794{ 1095{
795 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
796 1097
797 if (*s == '_') 1098 if (*s == '_')
… …
811 } 1112 }
812 1113
813 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1114 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
814} 1115}
815 1116
816static int 1117static int ecb_cold
817coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
818{ 1119{
819 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
820 1121
821 if (*s == '_') 1122 if (*s == '_')
… …
826 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1127 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827 1128
828 if (svp) 1129 if (svp)
829 { 1130 {
830 SV *old = *svp; 1131 SV *old = *svp;
831 *svp = newSVsv (sv); 1132 *svp = SvOK (sv) ? newSVsv (sv) : 0;
832 SvREFCNT_dec (old); 1133 SvREFCNT_dec (old);
833 return 0; 1134 return 0;
834 } 1135 }
835 } 1136 }
836 1137
… …
854slf_check_repeat (pTHX_ struct CoroSLF *frame) 1155slf_check_repeat (pTHX_ struct CoroSLF *frame)
855{ 1156{
856 return 1; 1157 return 1;
857} 1158}
858 1159
859static UNOP coro_setup_op; 1160static UNOP init_perl_op;
860 1161
861static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1162ecb_noinline static void /* noinline to keep it out of the transfer fast path */
862coro_setup (pTHX_ struct coro *coro) 1163init_perl (pTHX_ struct coro *coro)
863{ 1164{
864 /* 1165 /*
865 * emulate part of the perl startup here. 1166 * emulate part of the perl startup here.
866 */ 1167 */
867 coro_init_stacks (aTHX); 1168 coro_init_stacks (aTHX);
… …
874 PL_comppad_name_fill = 0; 1175 PL_comppad_name_fill = 0;
875 PL_comppad_name_floor = 0; 1176 PL_comppad_name_floor = 0;
876 PL_curpm = 0; 1177 PL_curpm = 0;
877 PL_curpad = 0; 1178 PL_curpad = 0;
878 PL_localizing = 0; 1179 PL_localizing = 0;
879 PL_dirty = 0;
880 PL_restartop = 0; 1180 PL_restartop = 0;
881#if PERL_VERSION_ATLEAST (5,10,0) 1181#if PERL_VERSION_ATLEAST (5,10,0)
882 PL_parser = 0; 1182 PL_parser = 0;
883#endif 1183#endif
884 PL_hints = 0; 1184 PL_hints = 0;
885 1185
886 /* recreate the die/warn hooks */ 1186 /* recreate the die/warn hooks */
887 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1187 PL_diehook = SvREFCNT_inc (rv_diehook);
888 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1188 PL_warnhook = SvREFCNT_inc (rv_warnhook);
889 1189
890 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
891 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
892 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
893 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1193 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
894 GvHV (PL_hintgv) = 0; 1194 GvHV (PL_hintgv) = newHV ();
1195#if PERL_VERSION_ATLEAST (5,10,0)
1196 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1197#endif
895 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
896 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
897 1200
898 { 1201 {
899 dSP; 1202 dSP;
… …
914 /* this newly created coroutine might be run on an existing cctx which most 1217 /* this newly created coroutine might be run on an existing cctx which most
915 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1218 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
916 */ 1219 */
917 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1220 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
918 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1221 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1222 slf_frame.destroy = 0;
919 1223
920 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1224 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
921 coro_setup_op.op_next = PL_op; 1225 init_perl_op.op_next = PL_op;
922 coro_setup_op.op_type = OP_ENTERSUB; 1226 init_perl_op.op_type = OP_ENTERSUB;
923 coro_setup_op.op_ppaddr = pp_slf; 1227 init_perl_op.op_ppaddr = pp_slf;
924 /* no flags etc. required, as an init function won't be called */ 1228 /* no flags etc. required, as an init function won't be called */
925 1229
926 PL_op = (OP *)&coro_setup_op; 1230 PL_op = (OP *)&init_perl_op;
927 1231
928 /* copy throw, in case it was set before coro_setup */ 1232 /* copy throw, in case it was set before init_perl */
929 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
930}
931 1234
1235 SWAP_SVS_ENTER (coro);
1236
1237 if (ecb_expect_false (enable_times))
1238 {
1239 coro_times_update ();
1240 coro_times_sub (coro);
1241 }
1242}
1243
932static void 1244static void
933coro_destruct (pTHX_ struct coro *coro) 1245coro_unwind_stacks (pTHX)
934{ 1246{
935 if (!IN_DESTRUCT) 1247 if (!IN_DESTRUCT)
936 { 1248 {
937 /* restore all saved variables and stuff */ 1249 /* restore all saved variables and stuff */
938 LEAVE_SCOPE (0); 1250 LEAVE_SCOPE (0);
… …
946 POPSTACK_TO (PL_mainstack); 1258 POPSTACK_TO (PL_mainstack);
947 1259
948 /* unwind main stack */ 1260 /* unwind main stack */
949 dounwind (-1); 1261 dounwind (-1);
950 } 1262 }
1263}
951 1264
952 SvREFCNT_dec (GvSV (PL_defgv)); 1265static void
953 SvREFCNT_dec (GvAV (PL_defgv)); 1266destroy_perl (pTHX_ struct coro *coro)
954 SvREFCNT_dec (GvSV (PL_errgv)); 1267{
955 SvREFCNT_dec (PL_defoutgv); 1268 SV *svf [9];
956 SvREFCNT_dec (PL_rs);
957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
959 1269
960 SvREFCNT_dec (PL_diehook);
961 SvREFCNT_dec (PL_warnhook);
962 1270 {
1271 SV *old_current = SvRV (coro_current);
1272 struct coro *current = SvSTATE (old_current);
1273
1274 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1275
1276 save_perl (aTHX_ current);
1277
1278 /* this will cause transfer_check to croak on block*/
1279 SvRV_set (coro_current, (SV *)coro->hv);
1280
1281 load_perl (aTHX_ coro);
1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1286 coro_unwind_stacks (aTHX);
1287
1288 coro_destruct_stacks (aTHX);
1289
1290 /* now save some sv's to be free'd later */
1291 svf [0] = GvSV (PL_defgv);
1292 svf [1] = (SV *)GvAV (PL_defgv);
1293 svf [2] = GvSV (PL_errgv);
1294 svf [3] = (SV *)PL_defoutgv;
1295 svf [4] = PL_rs;
1296 svf [5] = GvSV (irsgv);
1297 svf [6] = (SV *)GvHV (PL_hintgv);
1298 svf [7] = PL_diehook;
1299 svf [8] = PL_warnhook;
1300 assert (9 == sizeof (svf) / sizeof (*svf));
1301
1302 SvRV_set (coro_current, old_current);
1303
1304 load_perl (aTHX_ current);
1305 }
1306
1307 {
1308 unsigned int i;
1309
1310 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1311 SvREFCNT_dec (svf [i]);
1312
963 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
967 1317 SvREFCNT_dec (coro->on_enter_xs);
968 coro_destruct_stacks (aTHX); 1318 SvREFCNT_dec (coro->on_leave_xs);
1319 }
969} 1320}
970 1321
971INLINE void 1322ecb_inline void
972free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
973{ 1324{
974 if (expect_true (coro_mortal)) 1325 if (ecb_expect_true (coro_mortal))
975 { 1326 {
976 SvREFCNT_dec (coro_mortal); 1327 SvREFCNT_dec ((SV *)coro_mortal);
977 coro_mortal = 0; 1328 coro_mortal = 0;
978 } 1329 }
979} 1330}
980 1331
981static int 1332static int
… …
1035 1386
1036 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1037 { 1388 {
1038 SV **cb; 1389 SV **cb;
1039 1390
1040 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1041 { 1392 {
1042 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1043 1394
1044 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1045 { 1396 {
… …
1114 1465
1115 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1466 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1116} 1467}
1117 1468
1118/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1469/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1119static void NOINLINE 1470static void ecb_noinline
1120cctx_prepare (pTHX) 1471cctx_prepare (pTHX)
1121{ 1472{
1122 PL_top_env = &PL_start_env; 1473 PL_top_env = &PL_start_env;
1123 1474
1124 if (cctx_current->flags & CC_TRACE) 1475 if (cctx_current->flags & CC_TRACE)
… …
1135 slf_frame.prepare = slf_prepare_set_stacklevel; 1486 slf_frame.prepare = slf_prepare_set_stacklevel;
1136 slf_frame.check = slf_check_set_stacklevel; 1487 slf_frame.check = slf_check_set_stacklevel;
1137} 1488}
1138 1489
1139/* the tail of transfer: execute stuff we can only do after a transfer */ 1490/* the tail of transfer: execute stuff we can only do after a transfer */
1140INLINE void 1491ecb_inline void
1141transfer_tail (pTHX) 1492transfer_tail (pTHX)
1142{ 1493{
1143 free_coro_mortal (aTHX); 1494 free_coro_mortal (aTHX);
1495}
1496
1497/* try to exit the same way perl's main function would do */
1498/* we do not bother resetting the environment or other things *7
1499/* that are not, uhm, essential */
1500/* this obviously also doesn't work when perl is embedded */
1501static void ecb_noinline ecb_cold
1502perlish_exit (pTHX)
1503{
1504 int exitstatus = perl_destruct (PL_curinterp);
1505 perl_free (PL_curinterp);
1506 exit (exitstatus);
1144} 1507}
1145 1508
1146/* 1509/*
1147 * this is a _very_ stripped down perl interpreter ;) 1510 * this is a _very_ stripped down perl interpreter ;)
1148 */ 1511 */
… …
1170 /* somebody or something will hit me for both perl_run and PL_restartop */ 1533 /* somebody or something will hit me for both perl_run and PL_restartop */
1171 PL_restartop = PL_op; 1534 PL_restartop = PL_op;
1172 perl_run (PL_curinterp); 1535 perl_run (PL_curinterp);
1173 /* 1536 /*
1174 * Unfortunately, there is no way to get at the return values of the 1537 * Unfortunately, there is no way to get at the return values of the
1175 * coro body here, as perl_run destroys these 1538 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1539 * runtime errors here, as this is just a random interpreter, not a thread.
1176 */ 1540 */
1177 1541
1178 /* 1542 /*
1179 * If perl-run returns we assume exit() was being called or the coro 1543 * If perl-run returns we assume exit() was being called or the coro
1180 * fell off the end, which seems to be the only valid (non-bug) 1544 * fell off the end, which seems to be the only valid (non-bug)
1181 * reason for perl_run to return. We try to exit by jumping to the 1545 * reason for perl_run to return. We try to mimic whatever perl is normally
1182 * bootstrap-time "top" top_env, as we cannot restore the "main" 1546 * doing in that case. YMMV.
1183 * coroutine as Coro has no such concept.
1184 * This actually isn't valid with the pthread backend, but OSes requiring
1185 * that backend are too broken to do it in a standards-compliant way.
1186 */ 1547 */
1187 PL_top_env = main_top_env; 1548 perlish_exit (aTHX);
1188 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1189 } 1549 }
1190} 1550}
1191 1551
1192static coro_cctx * 1552static coro_cctx *
1193cctx_new () 1553cctx_new (void)
1194{ 1554{
1195 coro_cctx *cctx; 1555 coro_cctx *cctx;
1196 1556
1197 ++cctx_count; 1557 ++cctx_count;
1198 New (0, cctx, 1, coro_cctx); 1558 New (0, cctx, 1, coro_cctx);
… …
1204 return cctx; 1564 return cctx;
1205} 1565}
1206 1566
1207/* create a new cctx only suitable as source */ 1567/* create a new cctx only suitable as source */
1208static coro_cctx * 1568static coro_cctx *
1209cctx_new_empty () 1569cctx_new_empty (void)
1210{ 1570{
1211 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1212 1572
1213 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1214 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1215 1575
1216 return cctx; 1576 return cctx;
1217} 1577}
1218 1578
1219/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1220static coro_cctx * 1580static coro_cctx *
1221cctx_new_run () 1581cctx_new_run (void)
1222{ 1582{
1223 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1224 void *stack_start;
1225 size_t stack_size;
1226 1584
1227#if HAVE_MMAP 1585 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1228 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1229 /* mmap supposedly does allocate-on-write for us */
1230 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1231
1232 if (cctx->sptr != (void *)-1)
1233 {
1234 #if CORO_STACKGUARD
1235 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1236 #endif
1237 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1238 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1239 cctx->flags |= CC_MAPPED;
1240 } 1586 {
1241 else
1242#endif
1243 {
1244 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1245 New (0, cctx->sptr, cctx_stacksize, long);
1246
1247 if (!cctx->sptr)
1248 {
1249 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1250 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1251 }
1252
1253 stack_start = cctx->sptr;
1254 stack_size = cctx->ssize;
1255 } 1589 }
1256 1590
1257 #if CORO_USE_VALGRIND
1258 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1259 #endif
1260
1261 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1591 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1262 1592
1263 return cctx; 1593 return cctx;
1264} 1594}
1265 1595
1266static void 1596static void
1267cctx_destroy (coro_cctx *cctx) 1597cctx_destroy (coro_cctx *cctx)
1268{ 1598{
1269 if (!cctx) 1599 if (!cctx)
1270 return; 1600 return;
1271 1601
1272 assert (cctx != cctx_current);//D temporary 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1273 1603
1274 --cctx_count; 1604 --cctx_count;
1275 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1276 1606
1277 /* coro_transfer creates new, empty cctx's */ 1607 coro_stack_free (&cctx->stack);
1278 if (cctx->sptr)
1279 {
1280 #if CORO_USE_VALGRIND
1281 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1282 #endif
1283
1284#if HAVE_MMAP
1285 if (cctx->flags & CC_MAPPED)
1286 munmap (cctx->sptr, cctx->ssize);
1287 else
1288#endif
1289 Safefree (cctx->sptr);
1290 }
1291 1608
1292 Safefree (cctx); 1609 Safefree (cctx);
1293} 1610}
1294 1611
1295/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1296#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1613#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1297 1614
1298static coro_cctx * 1615static coro_cctx *
1299cctx_get (pTHX) 1616cctx_get (pTHX)
1300{ 1617{
1301 while (expect_true (cctx_first)) 1618 while (ecb_expect_true (cctx_first))
1302 { 1619 {
1303 coro_cctx *cctx = cctx_first; 1620 coro_cctx *cctx = cctx_first;
1304 cctx_first = cctx->next; 1621 cctx_first = cctx->next;
1305 --cctx_idle; 1622 --cctx_idle;
1306 1623
1307 if (expect_true (!CCTX_EXPIRED (cctx))) 1624 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1308 return cctx; 1625 return cctx;
1309 1626
1310 cctx_destroy (cctx); 1627 cctx_destroy (cctx);
1311 } 1628 }
1312 1629
… …
1314} 1631}
1315 1632
1316static void 1633static void
1317cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1318{ 1635{
1319 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1636 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1320 1637
1321 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1322 if (expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1323 { 1640 {
1324 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1325 cctx_first = first->next; 1642 cctx_first = first->next;
1326 --cctx_idle; 1643 --cctx_idle;
1327 1644
… …
1338static void 1655static void
1339transfer_check (pTHX_ struct coro *prev, struct coro *next) 1656transfer_check (pTHX_ struct coro *prev, struct coro *next)
1340{ 1657{
1341 /* TODO: throwing up here is considered harmful */ 1658 /* TODO: throwing up here is considered harmful */
1342 1659
1343 if (expect_true (prev != next)) 1660 if (ecb_expect_true (prev != next))
1344 { 1661 {
1345 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1662 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1346 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1663 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1347 1664
1348 if (expect_false (next->flags & CF_RUNNING)) 1665 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1349 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1350
1351 if (expect_false (next->flags & CF_DESTROYED))
1352 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1666 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1353 1667
1354#if !PERL_VERSION_ATLEAST (5,10,0) 1668#if !PERL_VERSION_ATLEAST (5,10,0)
1355 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1669 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1356 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1670 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1357#endif 1671#endif
1358 } 1672 }
1359} 1673}
1360 1674
1361/* always use the TRANSFER macro */ 1675/* always use the TRANSFER macro */
1362static void NOINLINE /* noinline so we have a fixed stackframe */ 1676static void ecb_noinline /* noinline so we have a fixed stackframe */
1363transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1677transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1364{ 1678{
1365 dSTACKLEVEL; 1679 dSTACKLEVEL;
1366 1680
1367 /* sometimes transfer is only called to set idle_sp */ 1681 /* sometimes transfer is only called to set idle_sp */
1368 if (expect_false (!prev)) 1682 if (ecb_expect_false (!prev))
1369 { 1683 {
1370 cctx_current->idle_sp = STACKLEVEL; 1684 cctx_current->idle_sp = STACKLEVEL;
1371 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1685 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1372 } 1686 }
1373 else if (expect_true (prev != next)) 1687 else if (ecb_expect_true (prev != next))
1374 { 1688 {
1375 coro_cctx *cctx_prev; 1689 coro_cctx *cctx_prev;
1376 1690
1377 if (expect_false (prev->flags & CF_NEW)) 1691 if (ecb_expect_false (prev->flags & CF_NEW))
1378 { 1692 {
1379 /* create a new empty/source context */ 1693 /* create a new empty/source context */
1380 prev->flags &= ~CF_NEW; 1694 prev->flags &= ~CF_NEW;
1381 prev->flags |= CF_RUNNING; 1695 prev->flags |= CF_RUNNING;
1382 } 1696 }
… …
1385 next->flags |= CF_RUNNING; 1699 next->flags |= CF_RUNNING;
1386 1700
1387 /* first get rid of the old state */ 1701 /* first get rid of the old state */
1388 save_perl (aTHX_ prev); 1702 save_perl (aTHX_ prev);
1389 1703
1390 if (expect_false (next->flags & CF_NEW)) 1704 if (ecb_expect_false (next->flags & CF_NEW))
1391 { 1705 {
1392 /* need to start coroutine */ 1706 /* need to start coroutine */
1393 next->flags &= ~CF_NEW; 1707 next->flags &= ~CF_NEW;
1394 /* setup coroutine call */ 1708 /* setup coroutine call */
1395 coro_setup (aTHX_ next); 1709 init_perl (aTHX_ next);
1396 } 1710 }
1397 else 1711 else
1398 load_perl (aTHX_ next); 1712 load_perl (aTHX_ next);
1399 1713
1400 assert (!prev->cctx);//D temporary
1401
1402 /* possibly untie and reuse the cctx */ 1714 /* possibly untie and reuse the cctx */
1403 if (expect_true ( 1715 if (ecb_expect_true (
1404 cctx_current->idle_sp == STACKLEVEL 1716 cctx_current->idle_sp == STACKLEVEL
1405 && !(cctx_current->flags & CC_TRACE) 1717 && !(cctx_current->flags & CC_TRACE)
1406 && !force_cctx 1718 && !force_cctx
1407 )) 1719 ))
1408 { 1720 {
1409 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1721 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1410 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1722 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1411 1723
1412 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1724 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1413 /* without this the next cctx_get might destroy the running cctx while still in use */ 1725 /* without this the next cctx_get might destroy the running cctx while still in use */
1414 if (expect_false (CCTX_EXPIRED (cctx_current))) 1726 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1415 if (expect_true (!next->cctx)) 1727 if (ecb_expect_true (!next->cctx))
1416 next->cctx = cctx_get (aTHX); 1728 next->cctx = cctx_get (aTHX);
1417 1729
1418 cctx_put (cctx_current); 1730 cctx_put (cctx_current);
1419 } 1731 }
1420 else 1732 else
1421 prev->cctx = cctx_current; 1733 prev->cctx = cctx_current;
1422 1734
1423 ++next->usecount; 1735 ++next->usecount;
1424 1736
1425 cctx_prev = cctx_current; 1737 cctx_prev = cctx_current;
1426 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1738 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1427 1739
1428 next->cctx = 0; 1740 next->cctx = 0;
1429 1741
1430 if (expect_false (cctx_prev != cctx_current)) 1742 if (ecb_expect_false (cctx_prev != cctx_current))
1431 { 1743 {
1432 cctx_prev->top_env = PL_top_env; 1744 cctx_prev->top_env = PL_top_env;
1433 PL_top_env = cctx_current->top_env; 1745 PL_top_env = cctx_current->top_env;
1434 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1746 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1435 } 1747 }
… …
1441#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1753#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1442#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1754#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1443 1755
1444/** high level stuff ********************************************************/ 1756/** high level stuff ********************************************************/
1445 1757
1758/* this function is actually Coro, not Coro::State, but we call it from here */
1759/* because it is convenient - but it hasn't been declared yet for that reason */
1446static int 1760static void
1761coro_call_on_destroy (pTHX_ struct coro *coro);
1762
1763static void
1447coro_state_destroy (pTHX_ struct coro *coro) 1764coro_state_destroy (pTHX_ struct coro *coro)
1448{ 1765{
1449 if (coro->flags & CF_DESTROYED) 1766 if (coro->flags & CF_ZOMBIE)
1450 return 0; 1767 return;
1451 1768
1452 if (coro->on_destroy)
1453 coro->on_destroy (aTHX_ coro); 1769 slf_destroy (aTHX_ coro);
1454 1770
1455 coro->flags |= CF_DESTROYED; 1771 coro->flags |= CF_ZOMBIE;
1456 1772
1457 if (coro->flags & CF_READY) 1773 if (coro->flags & CF_READY)
1458 { 1774 {
1459 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1775 /* reduce nready, as destroying a ready coro effectively unreadies it */
1460 /* alternative: look through all ready queues and remove the coro */ 1776 /* alternative: look through all ready queues and remove the coro */
1461 --coro_nready; 1777 --coro_nready;
1462 } 1778 }
1463 else 1779 else
1464 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1780 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1465 1781
1466 if (coro->mainstack && coro->mainstack != main_mainstack) 1782 if (coro->next) coro->next->prev = coro->prev;
1467 { 1783 if (coro->prev) coro->prev->next = coro->next;
1468 struct coro temp; 1784 if (coro == coro_first) coro_first = coro->next;
1469 1785
1470 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1786 if (coro->mainstack
1471 1787 && coro->mainstack != main_mainstack
1472 save_perl (aTHX_ &temp); 1788 && coro->slot
1789 && !PL_dirty)
1473 load_perl (aTHX_ coro); 1790 destroy_perl (aTHX_ coro);
1474
1475 coro_destruct (aTHX_ coro);
1476
1477 load_perl (aTHX_ &temp);
1478
1479 coro->slot = 0;
1480 }
1481 1791
1482 cctx_destroy (coro->cctx); 1792 cctx_destroy (coro->cctx);
1483 SvREFCNT_dec (coro->startcv); 1793 SvREFCNT_dec (coro->startcv);
1484 SvREFCNT_dec (coro->args); 1794 SvREFCNT_dec (coro->args);
1795 SvREFCNT_dec (coro->swap_sv);
1485 SvREFCNT_dec (CORO_THROW); 1796 SvREFCNT_dec (CORO_THROW);
1486 1797
1487 if (coro->next) coro->next->prev = coro->prev; 1798 coro_call_on_destroy (aTHX_ coro);
1488 if (coro->prev) coro->prev->next = coro->next;
1489 if (coro == coro_first) coro_first = coro->next;
1490 1799
1491 return 1; 1800 /* more destruction mayhem in coro_state_free */
1492} 1801}
1493 1802
1494static int 1803static int
1495coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1804coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1496{ 1805{
1497 struct coro *coro = (struct coro *)mg->mg_ptr; 1806 struct coro *coro = (struct coro *)mg->mg_ptr;
1498 mg->mg_ptr = 0; 1807 mg->mg_ptr = 0;
1499 1808
1500 coro->hv = 0;
1501
1502 if (--coro->refcnt < 0)
1503 {
1504 coro_state_destroy (aTHX_ coro); 1809 coro_state_destroy (aTHX_ coro);
1810 SvREFCNT_dec (coro->on_destroy);
1811 SvREFCNT_dec (coro->status);
1812
1505 Safefree (coro); 1813 Safefree (coro);
1506 }
1507 1814
1508 return 0; 1815 return 0;
1509} 1816}
1510 1817
1511static int 1818static int ecb_cold
1512coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1819coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1513{ 1820{
1514 struct coro *coro = (struct coro *)mg->mg_ptr; 1821 /* called when perl clones the current process the slow way (windows process emulation) */
1515 1822 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1516 ++coro->refcnt; 1823 mg->mg_ptr = 0;
1824 mg->mg_virtual = 0;
1517 1825
1518 return 0; 1826 return 0;
1519} 1827}
1520 1828
1521static MGVTBL coro_state_vtbl = { 1829static MGVTBL coro_state_vtbl = {
… …
1544 1852
1545 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1853 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1546 TRANSFER (ta, 1); 1854 TRANSFER (ta, 1);
1547} 1855}
1548 1856
1549/*****************************************************************************/
1550/* gensub: simple closure generation utility */
1551
1552#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1553
1554/* create a closure from XS, returns a code reference */
1555/* the arg can be accessed via GENSUB_ARG from the callback */
1556/* the callback must use dXSARGS/XSRETURN */
1557static SV *
1558gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1559{
1560 CV *cv = (CV *)newSV (0);
1561
1562 sv_upgrade ((SV *)cv, SVt_PVCV);
1563
1564 CvANON_on (cv);
1565 CvISXSUB_on (cv);
1566 CvXSUB (cv) = xsub;
1567 GENSUB_ARG = arg;
1568
1569 return newRV_noinc ((SV *)cv);
1570}
1571
1572/** Coro ********************************************************************/ 1857/** Coro ********************************************************************/
1573 1858
1574INLINE void 1859ecb_inline void
1575coro_enq (pTHX_ struct coro *coro) 1860coro_enq (pTHX_ struct coro *coro)
1576{ 1861{
1577 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1862 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1578}
1579 1863
1580INLINE SV * 1864 SvREFCNT_inc_NN (coro->hv);
1865
1866 coro->next_ready = 0;
1867 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1868 ready [1] = coro;
1869}
1870
1871ecb_inline struct coro *
1581coro_deq (pTHX) 1872coro_deq (pTHX)
1582{ 1873{
1583 int prio; 1874 int prio;
1584 1875
1585 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1876 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1586 if (AvFILLp (coro_ready [prio]) >= 0) 1877 {
1587 return av_shift (coro_ready [prio]); 1878 struct coro **ready = coro_ready [prio];
1879
1880 if (ready [0])
1881 {
1882 struct coro *coro = ready [0];
1883 ready [0] = coro->next_ready;
1884 return coro;
1885 }
1886 }
1588 1887
1589 return 0; 1888 return 0;
1889}
1890
1891static void
1892invoke_sv_ready_hook_helper (void)
1893{
1894 dTHX;
1895 dSP;
1896
1897 ENTER;
1898 SAVETMPS;
1899
1900 PUSHMARK (SP);
1901 PUTBACK;
1902 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1903
1904 FREETMPS;
1905 LEAVE;
1590} 1906}
1591 1907
1592static int 1908static int
1593api_ready (pTHX_ SV *coro_sv) 1909api_ready (pTHX_ SV *coro_sv)
1594{ 1910{
1595 struct coro *coro;
1596 SV *sv_hook;
1597 void (*xs_hook)(void);
1598
1599 coro = SvSTATE (coro_sv); 1911 struct coro *coro = SvSTATE (coro_sv);
1600 1912
1601 if (coro->flags & CF_READY) 1913 if (coro->flags & CF_READY)
1602 return 0; 1914 return 0;
1603 1915
1604 coro->flags |= CF_READY; 1916 coro->flags |= CF_READY;
1605 1917
1606 sv_hook = coro_nready ? 0 : coro_readyhook;
1607 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1608
1609 coro_enq (aTHX_ coro); 1918 coro_enq (aTHX_ coro);
1610 ++coro_nready;
1611 1919
1612 if (sv_hook) 1920 if (!coro_nready++)
1613 { 1921 if (coroapi.readyhook)
1614 dSP; 1922 coroapi.readyhook ();
1615
1616 ENTER;
1617 SAVETMPS;
1618
1619 PUSHMARK (SP);
1620 PUTBACK;
1621 call_sv (sv_hook, G_VOID | G_DISCARD);
1622
1623 FREETMPS;
1624 LEAVE;
1625 }
1626
1627 if (xs_hook)
1628 xs_hook ();
1629 1923
1630 return 1; 1924 return 1;
1631} 1925}
1632 1926
1633static int 1927static int
… …
1635{ 1929{
1636 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1930 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1637} 1931}
1638 1932
1639/* expects to own a reference to next->hv */ 1933/* expects to own a reference to next->hv */
1640INLINE void 1934ecb_inline void
1641prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1935prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1642{ 1936{
1643 SV *prev_sv = SvRV (coro_current); 1937 SV *prev_sv = SvRV (coro_current);
1644 1938
1645 ta->prev = SvSTATE_hv (prev_sv); 1939 ta->prev = SvSTATE_hv (prev_sv);
… …
1656static void 1950static void
1657prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1951prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1658{ 1952{
1659 for (;;) 1953 for (;;)
1660 { 1954 {
1661 SV *next_sv = coro_deq (aTHX); 1955 struct coro *next = coro_deq (aTHX);
1662 1956
1663 if (expect_true (next_sv)) 1957 if (ecb_expect_true (next))
1664 { 1958 {
1665 struct coro *next = SvSTATE_hv (next_sv);
1666
1667 /* cannot transfer to destroyed coros, skip and look for next */ 1959 /* cannot transfer to destroyed coros, skip and look for next */
1668 if (expect_false (next->flags & CF_DESTROYED)) 1960 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1669 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1961 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1670 else 1962 else
1671 { 1963 {
1672 next->flags &= ~CF_READY; 1964 next->flags &= ~CF_READY;
1673 --coro_nready; 1965 --coro_nready;
1674 1966
… …
1680 { 1972 {
1681 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1682 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1683 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1684 { 1976 {
1977 if (SvRV (sv_idle) == SvRV (coro_current))
1978 {
1979 require_pv ("Carp");
1980
1981 {
1982 dSP;
1983
1984 ENTER;
1985 SAVETMPS;
1986
1987 PUSHMARK (SP);
1988 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1989 PUTBACK;
1990 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1991
1992 FREETMPS;
1993 LEAVE;
1994 }
1995 }
1996
1685 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1997 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1686 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1687 --coro_nready; 1999 --coro_nready;
1688 } 2000 }
1689 else 2001 else
1690 { 2002 {
2003 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1691 dSP; 2004 dSP;
1692 2005
1693 ENTER; 2006 ENTER;
1694 SAVETMPS; 2007 SAVETMPS;
1695 2008
… …
1702 } 2015 }
1703 } 2016 }
1704 } 2017 }
1705} 2018}
1706 2019
1707INLINE void 2020ecb_inline void
1708prepare_cede (pTHX_ struct coro_transfer_args *ta) 2021prepare_cede (pTHX_ struct coro_transfer_args *ta)
1709{ 2022{
1710 api_ready (aTHX_ coro_current); 2023 api_ready (aTHX_ coro_current);
1711 prepare_schedule (aTHX_ ta); 2024 prepare_schedule (aTHX_ ta);
1712} 2025}
1713 2026
1714INLINE void 2027ecb_inline void
1715prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2028prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1716{ 2029{
1717 SV *prev = SvRV (coro_current); 2030 SV *prev = SvRV (coro_current);
1718 2031
1719 if (coro_nready) 2032 if (coro_nready)
… …
1749{ 2062{
1750 struct coro_transfer_args ta; 2063 struct coro_transfer_args ta;
1751 2064
1752 prepare_cede (aTHX_ &ta); 2065 prepare_cede (aTHX_ &ta);
1753 2066
1754 if (expect_true (ta.prev != ta.next)) 2067 if (ecb_expect_true (ta.prev != ta.next))
1755 { 2068 {
1756 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1757 return 1; 2070 return 1;
1758 } 2071 }
1759 else 2072 else
… …
1802 coro->slot->runops = RUNOPS_DEFAULT; 2115 coro->slot->runops = RUNOPS_DEFAULT;
1803 } 2116 }
1804} 2117}
1805 2118
1806static void 2119static void
2120coro_push_av (pTHX_ AV *av, I32 gimme_v)
2121{
2122 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2123 {
2124 dSP;
2125
2126 if (gimme_v == G_SCALAR)
2127 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2128 else
2129 {
2130 int i;
2131 EXTEND (SP, AvFILLp (av) + 1);
2132
2133 for (i = 0; i <= AvFILLp (av); ++i)
2134 PUSHs (AvARRAY (av)[i]);
2135 }
2136
2137 PUTBACK;
2138 }
2139}
2140
2141static void
2142coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2143{
2144 if (!coro->on_destroy)
2145 coro->on_destroy = newAV ();
2146
2147 av_push (coro->on_destroy, cb);
2148}
2149
2150static void
2151slf_destroy_join (pTHX_ struct CoroSLF *frame)
2152{
2153 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2154}
2155
2156static int
2157slf_check_join (pTHX_ struct CoroSLF *frame)
2158{
2159 struct coro *coro = (struct coro *)frame->data;
2160
2161 if (!coro->status)
2162 return 1;
2163
2164 frame->destroy = 0;
2165
2166 coro_push_av (aTHX_ coro->status, GIMME_V);
2167
2168 SvREFCNT_dec ((SV *)coro->hv);
2169
2170 return 0;
2171}
2172
2173static void
2174slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2175{
2176 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2177
2178 if (items > 1)
2179 croak ("join called with too many arguments");
2180
2181 if (coro->status)
2182 frame->prepare = prepare_nop;
2183 else
2184 {
2185 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2186 frame->prepare = prepare_schedule;
2187 }
2188
2189 frame->check = slf_check_join;
2190 frame->destroy = slf_destroy_join;
2191 frame->data = (void *)coro;
2192 SvREFCNT_inc (coro->hv);
2193}
2194
2195static void
1807coro_call_on_destroy (pTHX_ struct coro *coro) 2196coro_call_on_destroy (pTHX_ struct coro *coro)
1808{ 2197{
1809 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2198 AV *od = coro->on_destroy;
1810 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1811 2199
1812 if (on_destroyp) 2200 if (!od)
1813 { 2201 return;
1814 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1815 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
1816 while (AvFILLp (on_destroy) >= 0) 2206 while (AvFILLp (od) >= 0)
2207 {
2208 SV *cb = sv_2mortal (av_pop (od));
2209
2210 /* coro hv's (and only hv's at the moment) are supported as well */
2211 if (SvSTATEhv_p (aTHX_ cb))
2212 api_ready (aTHX_ cb);
2213 else
1817 { 2214 {
1818 dSP; /* don't disturb outer sp */ 2215 dSP; /* don't disturb outer sp */
1819 SV *cb = av_pop (on_destroy);
1820
1821 PUSHMARK (SP); 2216 PUSHMARK (SP);
1822 2217
1823 if (statusp) 2218 if (coro->status)
1824 { 2219 {
1825 int i; 2220 PUTBACK;
1826 AV *status = (AV *)SvRV (*statusp); 2221 coro_push_av (aTHX_ coro->status, G_ARRAY);
1827 EXTEND (SP, AvFILLp (status) + 1); 2222 SPAGAIN;
1828
1829 for (i = 0; i <= AvFILLp (status); ++i)
1830 PUSHs (AvARRAY (status)[i]);
1831 } 2223 }
1832 2224
1833 PUTBACK; 2225 PUTBACK;
1834 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2226 call_sv (cb, G_VOID | G_DISCARD);
1835 } 2227 }
1836 } 2228 }
1837} 2229}
1838 2230
1839static void 2231static void
1840slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2232coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1841{ 2233{
2234 AV *av;
2235
2236 if (coro->status)
2237 {
2238 av = coro->status;
2239 av_clear (av);
2240 }
2241 else
2242 av = coro->status = newAV ();
2243
2244 /* items are actually not so common, so optimise for this case */
2245 if (items)
2246 {
1842 int i; 2247 int i;
1843 HV *hv = (HV *)SvRV (coro_current);
1844 AV *av = newAV ();
1845 2248
1846 av_extend (av, items - 1); 2249 av_extend (av, items - 1);
2250
1847 for (i = 0; i < items; ++i) 2251 for (i = 0; i < items; ++i)
1848 av_push (av, SvREFCNT_inc_NN (arg [i])); 2252 av_push (av, SvREFCNT_inc_NN (arg [i]));
2253 }
2254}
1849 2255
1850 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2256static void
1851 2257slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2258{
1852 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2259 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1853 api_ready (aTHX_ sv_manager); 2260 api_ready (aTHX_ sv_manager);
1854 2261
1855 frame->prepare = prepare_schedule; 2262 frame->prepare = prepare_schedule;
1856 frame->check = slf_check_repeat; 2263 frame->check = slf_check_repeat;
2264
2265 /* as a minor optimisation, we could unwind all stacks here */
2266 /* but that puts extra pressure on pp_slf, and is not worth much */
2267 /*coro_unwind_stacks (aTHX);*/
2268}
2269
2270static void
2271slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2272{
2273 HV *coro_hv = (HV *)SvRV (coro_current);
2274
2275 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2276 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2277}
2278
2279static void
2280slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2281{
2282 HV *coro_hv;
2283 struct coro *coro;
2284
2285 if (items <= 0)
2286 croak ("Coro::cancel called without coro object,");
2287
2288 coro = SvSTATE (arg [0]);
2289 coro_hv = coro->hv;
2290
2291 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2292
2293 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2294 {
2295 /* coro currently busy cancelling something, so just notify it */
2296 coro->slf_frame.data = (void *)coro;
2297
2298 frame->prepare = prepare_nop;
2299 frame->check = slf_check_nop;
2300 }
2301 else if (coro_hv == (HV *)SvRV (coro_current))
2302 {
2303 /* cancelling the current coro is allowed, and equals terminate */
2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2305 }
2306 else
2307 {
2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2312
2313 /* otherwise we cancel directly, purely for speed reasons
2314 * unfortunately, this requires some magic trickery, as
2315 * somebody else could cancel us, so we have to fight the cancellation.
2316 * this is ugly, and hopefully fully worth the extra speed.
2317 * besides, I can't get the slow-but-safe version working...
2318 */
2319 slf_frame.data = 0;
2320 self->flags |= CF_NOCANCEL;
2321 coro_state_destroy (aTHX_ coro);
2322 self->flags &= ~CF_NOCANCEL;
2323
2324 if (slf_frame.data)
2325 {
2326 /* while we were busy we have been cancelled, so terminate */
2327 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2328 }
2329 else
2330 {
2331 frame->prepare = prepare_nop;
2332 frame->check = slf_check_nop;
2333 }
2334 }
2335}
2336
2337static int
2338slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2339{
2340 frame->prepare = 0;
2341 coro_unwind_stacks (aTHX);
2342
2343 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2344
2345 return 1;
2346}
2347
2348static int
2349safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2350{
2351 if (coro->cctx)
2352 croak ("coro inside C callback, unable to cancel at this time, caught");
2353
2354 if (coro->flags & CF_NEW)
2355 {
2356 coro_set_status (aTHX_ coro, arg, items);
2357 coro_state_destroy (aTHX_ coro);
2358 }
2359 else
2360 {
2361 if (!coro->slf_frame.prepare)
2362 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2363
2364 slf_destroy (aTHX_ coro);
2365
2366 coro_set_status (aTHX_ coro, arg, items);
2367 coro->slf_frame.prepare = prepare_nop;
2368 coro->slf_frame.check = slf_check_safe_cancel;
2369
2370 api_ready (aTHX_ (SV *)coro->hv);
2371 }
2372
2373 return 1;
1857} 2374}
1858 2375
1859/*****************************************************************************/ 2376/*****************************************************************************/
1860/* async pool handler */ 2377/* async pool handler */
1861 2378
… …
1892slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2409slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1893{ 2410{
1894 HV *hv = (HV *)SvRV (coro_current); 2411 HV *hv = (HV *)SvRV (coro_current);
1895 struct coro *coro = SvSTATE_hv ((SV *)hv); 2412 struct coro *coro = SvSTATE_hv ((SV *)hv);
1896 2413
1897 if (expect_true (coro->saved_deffh)) 2414 if (ecb_expect_true (coro->saved_deffh))
1898 { 2415 {
1899 /* subsequent iteration */ 2416 /* subsequent iteration */
1900 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2417 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1901 coro->saved_deffh = 0; 2418 coro->saved_deffh = 0;
1902 2419
1903 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2420 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1904 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2421 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1905 { 2422 {
1906 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2423 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1907 coro->invoke_av = newAV (); 2424 return;
1908
1909 frame->prepare = prepare_nop;
1910 } 2425 }
1911 else 2426 else
1912 { 2427 {
1913 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
1914 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2429 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1915 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 SvREFCNT_dec_NN (coro->swap_sv);
2434 coro->swap_sv = 0;
2435 }
2436
1916 coro->prio = 0; 2437 coro->prio = 0;
1917 2438
1918 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2439 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1919 api_trace (aTHX_ coro_current, 0); 2440 api_trace (aTHX_ coro_current, 0);
1920 2441
1921 frame->prepare = prepare_schedule; 2442 frame->prepare = prepare_schedule;
1922 av_push (av_async_pool, SvREFCNT_inc (hv)); 2443 av_push (av_async_pool, SvREFCNT_inc (hv));
1923 } 2444 }
… …
1939 2460
1940static void 2461static void
1941coro_rouse_callback (pTHX_ CV *cv) 2462coro_rouse_callback (pTHX_ CV *cv)
1942{ 2463{
1943 dXSARGS; 2464 dXSARGS;
1944 SV *data = (SV *)GENSUB_ARG; 2465 SV *data = (SV *)S_GENSUB_ARG;
1945 2466
1946 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1947 { 2468 {
1948 /* first call, set args */ 2469 /* first call, set args */
2470 SV *coro = SvRV (data);
1949 AV *av = newAV (); 2471 AV *av = newAV ();
1950 SV *coro = SvRV (data);
1951 2472
1952 SvRV_set (data, (SV *)av); 2473 SvRV_set (data, (SV *)av);
1953 api_ready (aTHX_ coro);
1954 SvREFCNT_dec (coro);
1955 2474
1956 /* better take a full copy of the arguments */ 2475 /* better take a full copy of the arguments */
1957 while (items--) 2476 while (items--)
1958 av_store (av, items, newSVsv (ST (items))); 2477 av_store (av, items, newSVsv (ST (items)));
2478
2479 api_ready (aTHX_ coro);
2480 SvREFCNT_dec (coro);
1959 } 2481 }
1960 2482
1961 XSRETURN_EMPTY; 2483 XSRETURN_EMPTY;
1962} 2484}
1963 2485
1964static int 2486static int
1965slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2487slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1966{ 2488{
1967 SV *data = (SV *)frame->data; 2489 SV *data = (SV *)frame->data;
1968 2490
1969 if (CORO_THROW) 2491 if (CORO_THROW)
1970 return 0; 2492 return 0;
1971 2493
1972 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2494 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1973 return 1; 2495 return 1;
… …
1980 2502
1981 EXTEND (SP, AvFILLp (av) + 1); 2503 EXTEND (SP, AvFILLp (av) + 1);
1982 for (i = 0; i <= AvFILLp (av); ++i) 2504 for (i = 0; i <= AvFILLp (av); ++i)
1983 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2505 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1984 2506
1985 /* we have stolen the elements, so ste length to zero and free */ 2507 /* we have stolen the elements, so set length to zero and free */
1986 AvFILLp (av) = -1; 2508 AvFILLp (av) = -1;
1987 av_undef (av); 2509 av_undef (av);
1988 2510
1989 PUTBACK; 2511 PUTBACK;
1990 } 2512 }
… …
2009 cb = sv_2mortal (coro->rouse_cb); 2531 cb = sv_2mortal (coro->rouse_cb);
2010 coro->rouse_cb = 0; 2532 coro->rouse_cb = 0;
2011 } 2533 }
2012 2534
2013 if (!SvROK (cb) 2535 if (!SvROK (cb)
2014 || SvTYPE (SvRV (cb)) != SVt_PVCV 2536 || SvTYPE (SvRV (cb)) != SVt_PVCV
2015 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2537 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2016 croak ("Coro::rouse_wait called with illegal callback argument,"); 2538 croak ("Coro::rouse_wait called with illegal callback argument,");
2017 2539
2018 { 2540 {
2019 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2541 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2020 SV *data = (SV *)GENSUB_ARG; 2542 SV *data = (SV *)S_GENSUB_ARG;
2021 2543
2022 frame->data = (void *)data; 2544 frame->data = (void *)data;
2023 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2545 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2024 frame->check = slf_check_rouse_wait; 2546 frame->check = slf_check_rouse_wait;
2025 } 2547 }
… …
2029coro_new_rouse_cb (pTHX) 2551coro_new_rouse_cb (pTHX)
2030{ 2552{
2031 HV *hv = (HV *)SvRV (coro_current); 2553 HV *hv = (HV *)SvRV (coro_current);
2032 struct coro *coro = SvSTATE_hv (hv); 2554 struct coro *coro = SvSTATE_hv (hv);
2033 SV *data = newRV_inc ((SV *)hv); 2555 SV *data = newRV_inc ((SV *)hv);
2034 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2556 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2035 2557
2036 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2558 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2037 SvREFCNT_dec (data); /* magicext increases the refcount */ 2559 SvREFCNT_dec (data); /* magicext increases the refcount */
2038 2560
2039 SvREFCNT_dec (coro->rouse_cb); 2561 SvREFCNT_dec (coro->rouse_cb);
… …
2136static void 2658static void
2137slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2659slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2138{ 2660{
2139 frame->prepare = prepare_cede_notself; 2661 frame->prepare = prepare_cede_notself;
2140 frame->check = slf_check_nop; 2662 frame->check = slf_check_nop;
2663}
2664
2665/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2666static void
2667slf_destroy (pTHX_ struct coro *coro)
2668{
2669 struct CoroSLF frame = coro->slf_frame;
2670
2671 /*
2672 * The on_destroy below most likely is from an SLF call.
2673 * Since by definition the SLF call will not finish when we destroy
2674 * the coro, we will have to force-finish it here, otherwise
2675 * cleanup functions cannot call SLF functions.
2676 */
2677 coro->slf_frame.prepare = 0;
2678
2679 /* this callback is reserved for slf functions needing to do cleanup */
2680 if (frame.destroy && frame.prepare && !PL_dirty)
2681 frame.destroy (aTHX_ &frame);
2141} 2682}
2142 2683
2143/* 2684/*
2144 * these not obviously related functions are all rolled into one 2685 * these not obviously related functions are all rolled into one
2145 * function to increase chances that they all will call transfer with the same 2686 * function to increase chances that they all will call transfer with the same
… …
2152 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2693 I32 checkmark; /* mark SP to see how many elements check has pushed */
2153 2694
2154 /* set up the slf frame, unless it has already been set-up */ 2695 /* set up the slf frame, unless it has already been set-up */
2155 /* the latter happens when a new coro has been started */ 2696 /* the latter happens when a new coro has been started */
2156 /* or when a new cctx was attached to an existing coroutine */ 2697 /* or when a new cctx was attached to an existing coroutine */
2157 if (expect_true (!slf_frame.prepare)) 2698 if (ecb_expect_true (!slf_frame.prepare))
2158 { 2699 {
2159 /* first iteration */ 2700 /* first iteration */
2160 dSP; 2701 dSP;
2161 SV **arg = PL_stack_base + TOPMARK + 1; 2702 SV **arg = PL_stack_base + TOPMARK + 1;
2162 int items = SP - arg; /* args without function object */ 2703 int items = SP - arg; /* args without function object */
… …
2203 while (slf_frame.check (aTHX_ &slf_frame)); 2744 while (slf_frame.check (aTHX_ &slf_frame));
2204 2745
2205 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2746 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2206 2747
2207 /* exception handling */ 2748 /* exception handling */
2208 if (expect_false (CORO_THROW)) 2749 if (ecb_expect_false (CORO_THROW))
2209 { 2750 {
2210 SV *exception = sv_2mortal (CORO_THROW); 2751 SV *exception = sv_2mortal (CORO_THROW);
2211 2752
2212 CORO_THROW = 0; 2753 CORO_THROW = 0;
2213 sv_setsv (ERRSV, exception); 2754 sv_setsv (ERRSV, exception);
2214 croak (0); 2755 croak (0);
2215 } 2756 }
2216 2757
2217 /* return value handling - mostly like entersub */ 2758 /* return value handling - mostly like entersub */
2218 /* make sure we put something on the stack in scalar context */ 2759 /* make sure we put something on the stack in scalar context */
2219 if (GIMME_V == G_SCALAR) 2760 if (GIMME_V == G_SCALAR
2761 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2220 { 2762 {
2221 dSP; 2763 dSP;
2222 SV **bot = PL_stack_base + checkmark; 2764 SV **bot = PL_stack_base + checkmark;
2223 2765
2224 if (sp == bot) /* too few, push undef */ 2766 if (sp == bot) /* too few, push undef */
2225 bot [1] = &PL_sv_undef; 2767 bot [1] = &PL_sv_undef;
2226 else if (sp != bot + 1) /* too many, take last one */ 2768 else /* too many, take last one */
2227 bot [1] = *sp; 2769 bot [1] = *sp;
2228 2770
2229 SP = bot + 1; 2771 SP = bot + 1;
2230 2772
2231 PUTBACK; 2773 PUTBACK;
… …
2264 if (PL_op->op_flags & OPf_STACKED) 2806 if (PL_op->op_flags & OPf_STACKED)
2265 { 2807 {
2266 if (items > slf_arga) 2808 if (items > slf_arga)
2267 { 2809 {
2268 slf_arga = items; 2810 slf_arga = items;
2269 free (slf_argv); 2811 Safefree (slf_argv);
2270 slf_argv = malloc (slf_arga * sizeof (SV *)); 2812 New (0, slf_argv, slf_arga, SV *);
2271 } 2813 }
2272 2814
2273 slf_argc = items; 2815 slf_argc = items;
2274 2816
2275 for (i = 0; i < items; ++i) 2817 for (i = 0; i < items; ++i)
… …
2280 2822
2281 PL_op->op_ppaddr = pp_slf; 2823 PL_op->op_ppaddr = pp_slf;
2282 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2824 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2283 2825
2284 PL_op = (OP *)&slf_restore; 2826 PL_op = (OP *)&slf_restore;
2827}
2828
2829/*****************************************************************************/
2830/* dynamic wind */
2831
2832static void
2833on_enterleave_call (pTHX_ SV *cb)
2834{
2835 dSP;
2836
2837 PUSHSTACK;
2838
2839 PUSHMARK (SP);
2840 PUTBACK;
2841 call_sv (cb, G_VOID | G_DISCARD);
2842 SPAGAIN;
2843
2844 POPSTACK;
2845}
2846
2847static SV *
2848coro_avp_pop_and_free (pTHX_ AV **avp)
2849{
2850 AV *av = *avp;
2851 SV *res = av_pop (av);
2852
2853 if (AvFILLp (av) < 0)
2854 {
2855 *avp = 0;
2856 SvREFCNT_dec (av);
2857 }
2858
2859 return res;
2860}
2861
2862static void
2863coro_pop_on_enter (pTHX_ void *coro)
2864{
2865 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2866 SvREFCNT_dec (cb);
2867}
2868
2869static void
2870coro_pop_on_leave (pTHX_ void *coro)
2871{
2872 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2873 on_enterleave_call (aTHX_ sv_2mortal (cb));
2874}
2875
2876static void
2877enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2878{
2879 if (!hook)
2880 return;
2881
2882 if (!*avp)
2883 {
2884 *avp = newAV ();
2885 AvREAL_off (*avp);
2886 }
2887
2888 av_push (*avp, (SV *)hook);
2889 av_push (*avp, (SV *)arg);
2890}
2891
2892static void
2893enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2894{
2895 AV *av = *avp;
2896 int i;
2897
2898 if (!av)
2899 return;
2900
2901 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2902 if (AvARRAY (av)[i] == (SV *)hook)
2903 {
2904 if (execute)
2905 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2906
2907 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2908 av_pop (av);
2909 av_pop (av);
2910 break;
2911 }
2912
2913 if (AvFILLp (av) >= 0)
2914 {
2915 *avp = 0;
2916 SvREFCNT_dec_NN (av);
2917 }
2918}
2919
2920static void
2921api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2922{
2923 struct coro *coro = SvSTATE (coro_sv);
2924
2925 if (SvSTATE_current == coro)
2926 if (enter)
2927 enter (aTHX_ enter_arg);
2928
2929 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2931}
2932
2933static void
2934api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2940}
2941
2942static void
2943savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2944{
2945 struct coro *coro = SvSTATE_current;
2946
2947 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2948}
2949
2950static void
2951savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2952{
2953 struct coro *coro = SvSTATE_current;
2954
2955 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2956}
2957
2958static void
2959api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2960{
2961 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2962
2963 /* this ought to be much cheaper than malloc + a single destructor call */
2964 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2965 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2285} 2966}
2286 2967
2287/*****************************************************************************/ 2968/*****************************************************************************/
2288/* PerlIO::cede */ 2969/* PerlIO::cede */
2289 2970
… …
2291{ 2972{
2292 PerlIOBuf base; 2973 PerlIOBuf base;
2293 NV next, every; 2974 NV next, every;
2294} PerlIOCede; 2975} PerlIOCede;
2295 2976
2296static IV 2977static IV ecb_cold
2297PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2978PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2298{ 2979{
2299 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2980 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2300 2981
2301 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2982 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2302 self->next = nvtime () + self->every; 2983 self->next = nvtime () + self->every;
2303 2984
2304 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2985 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2305} 2986}
2306 2987
2307static SV * 2988static SV * ecb_cold
2308PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2989PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2309{ 2990{
2310 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2991 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2311 2992
2312 return newSVnv (self->every); 2993 return newSVnv (self->every);
… …
2363/* Coro::Semaphore & Coro::Signal */ 3044/* Coro::Semaphore & Coro::Signal */
2364 3045
2365static SV * 3046static SV *
2366coro_waitarray_new (pTHX_ int count) 3047coro_waitarray_new (pTHX_ int count)
2367{ 3048{
2368 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3049 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2369 AV *av = newAV (); 3050 AV *av = newAV ();
2370 SV **ary; 3051 SV **ary;
2371 3052
2372 /* unfortunately, building manually saves memory */ 3053 /* unfortunately, building manually saves memory */
2373 Newx (ary, 2, SV *); 3054 Newx (ary, 2, SV *);
2374 AvALLOC (av) = ary; 3055 AvALLOC (av) = ary;
3056#if PERL_VERSION_ATLEAST (5,10,0)
2375 /*AvARRAY (av) = ary;*/ 3057 AvARRAY (av) = ary;
3058#else
2376 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 3059 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
3060 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
3061 SvPVX ((SV *)av) = (char *)ary;
3062#endif
2377 AvMAX (av) = 1; 3063 AvMAX (av) = 1;
2378 AvFILLp (av) = 0; 3064 AvFILLp (av) = 0;
2379 ary [0] = newSViv (count); 3065 ary [0] = newSViv (count);
2380 3066
2381 return newRV_noinc ((SV *)av); 3067 return newRV_noinc ((SV *)av);
… …
2414 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3100 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2415 PUTBACK; 3101 PUTBACK;
2416 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3102 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2417 } 3103 }
2418 3104
2419 SvREFCNT_dec (cb); 3105 SvREFCNT_dec_NN (cb);
2420 } 3106 }
2421} 3107}
2422 3108
2423static void 3109static void
2424coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3110coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2425{ 3111{
2426 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3112 /* call $sem->adjust (0) to possibly wake up some other waiters */
2427 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3113 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2428} 3114}
2429 3115
2430static int 3116static int
2431slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3117slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2432{ 3118{
2433 AV *av = (AV *)frame->data; 3119 AV *av = (AV *)frame->data;
2434 SV *count_sv = AvARRAY (av)[0]; 3120 SV *count_sv = AvARRAY (av)[0];
3121 SV *coro_hv = SvRV (coro_current);
3122
3123 frame->destroy = 0;
2435 3124
2436 /* if we are about to throw, don't actually acquire the lock, just throw */ 3125 /* if we are about to throw, don't actually acquire the lock, just throw */
2437 if (CORO_THROW) 3126 if (ecb_expect_false (CORO_THROW))
3127 {
3128 /* we still might be responsible for the semaphore, so wake up others */
3129 coro_semaphore_adjust (aTHX_ av, 0);
3130
2438 return 0; 3131 return 0;
3132 }
2439 else if (SvIVX (count_sv) > 0) 3133 else if (SvIVX (count_sv) > 0)
2440 { 3134 {
2441 SvSTATE_current->on_destroy = 0;
2442
2443 if (acquire) 3135 if (acquire)
2444 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3136 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2445 else 3137 else
2446 coro_semaphore_adjust (aTHX_ av, 0); 3138 coro_semaphore_adjust (aTHX_ av, 0);
2447 3139
… …
2451 { 3143 {
2452 int i; 3144 int i;
2453 /* if we were woken up but can't down, we look through the whole */ 3145 /* if we were woken up but can't down, we look through the whole */
2454 /* waiters list and only add us if we aren't in there already */ 3146 /* waiters list and only add us if we aren't in there already */
2455 /* this avoids some degenerate memory usage cases */ 3147 /* this avoids some degenerate memory usage cases */
2456 3148 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2457 for (i = 1; i <= AvFILLp (av); ++i)
2458 if (AvARRAY (av)[i] == SvRV (coro_current)) 3149 if (AvARRAY (av)[i] == coro_hv)
2459 return 1; 3150 return 1;
2460 3151
2461 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3152 av_push (av, SvREFCNT_inc (coro_hv));
2462 return 1; 3153 return 1;
2463 } 3154 }
2464} 3155}
2465 3156
2466static int 3157static int
… …
2489 { 3180 {
2490 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3181 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2491 3182
2492 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3183 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2493 frame->prepare = prepare_schedule; 3184 frame->prepare = prepare_schedule;
2494
2495 /* to avoid race conditions when a woken-up coro gets terminated */ 3185 /* to avoid race conditions when a woken-up coro gets terminated */
2496 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3186 /* we arrange for a temporary on_destroy that calls adjust (0) */
2497 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3187 frame->destroy = coro_semaphore_destroy;
2498 } 3188 }
2499} 3189}
2500 3190
2501static void 3191static void
2502slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3192slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2510{ 3200{
2511 if (items >= 2) 3201 if (items >= 2)
2512 { 3202 {
2513 /* callback form */ 3203 /* callback form */
2514 AV *av = (AV *)SvRV (arg [0]); 3204 AV *av = (AV *)SvRV (arg [0]);
2515 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3205 SV *cb_cv = s_get_cv_croak (arg [1]);
2516 3206
2517 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3207 av_push (av, SvREFCNT_inc_NN (cb_cv));
2518 3208
2519 if (SvIVX (AvARRAY (av)[0]) > 0) 3209 if (SvIVX (AvARRAY (av)[0]) > 0)
2520 coro_semaphore_adjust (aTHX_ av, 0); 3210 coro_semaphore_adjust (aTHX_ av, 0);
2521 3211
2522 frame->prepare = prepare_nop; 3212 frame->prepare = prepare_nop;
… …
2546 AvARRAY (av)[0] = AvARRAY (av)[1]; 3236 AvARRAY (av)[0] = AvARRAY (av)[1];
2547 AvARRAY (av)[1] = cb; 3237 AvARRAY (av)[1] = cb;
2548 3238
2549 cb = av_shift (av); 3239 cb = av_shift (av);
2550 3240
3241 if (SvTYPE (cb) == SVt_PVCV)
3242 {
3243 dSP;
3244 PUSHMARK (SP);
3245 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3246 PUTBACK;
3247 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3248 }
3249 else
3250 {
2551 api_ready (aTHX_ cb); 3251 api_ready (aTHX_ cb);
2552 sv_setiv (cb, 0); /* signal waiter */ 3252 sv_setiv (cb, 0); /* signal waiter */
3253 }
3254
2553 SvREFCNT_dec (cb); 3255 SvREFCNT_dec_NN (cb);
2554 3256
2555 --count; 3257 --count;
2556 } 3258 }
2557} 3259}
2558 3260
… …
2566static void 3268static void
2567slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3269slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2568{ 3270{
2569 AV *av = (AV *)SvRV (arg [0]); 3271 AV *av = (AV *)SvRV (arg [0]);
2570 3272
3273 if (items >= 2)
3274 {
3275 SV *cb_cv = s_get_cv_croak (arg [1]);
3276 av_push (av, SvREFCNT_inc_NN (cb_cv));
3277
2571 if (SvIVX (AvARRAY (av)[0])) 3278 if (SvIVX (AvARRAY (av)[0]))
3279 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3280
3281 frame->prepare = prepare_nop;
3282 frame->check = slf_check_nop;
3283 }
3284 else if (SvIVX (AvARRAY (av)[0]))
2572 { 3285 {
2573 SvIVX (AvARRAY (av)[0]) = 0; 3286 SvIVX (AvARRAY (av)[0]) = 0;
2574 frame->prepare = prepare_nop; 3287 frame->prepare = prepare_nop;
2575 frame->check = slf_check_nop; 3288 frame->check = slf_check_nop;
2576 } 3289 }
2577 else 3290 else
2578 { 3291 {
2579 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3292 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2580 3293
2581 av_push (av, waiter); 3294 av_push (av, waiter);
2582 3295
2583 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3296 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2584 frame->prepare = prepare_schedule; 3297 frame->prepare = prepare_schedule;
… …
2602 3315
2603static void 3316static void
2604coro_aio_callback (pTHX_ CV *cv) 3317coro_aio_callback (pTHX_ CV *cv)
2605{ 3318{
2606 dXSARGS; 3319 dXSARGS;
2607 AV *state = (AV *)GENSUB_ARG; 3320 AV *state = (AV *)S_GENSUB_ARG;
2608 SV *coro = av_pop (state); 3321 SV *coro = av_pop (state);
2609 SV *data_sv = newSV (sizeof (struct io_state)); 3322 SV *data_sv = newSV (sizeof (struct io_state));
2610 3323
2611 av_extend (state, items - 1); 3324 av_extend (state, items - 1);
2612 3325
… …
2632 } 3345 }
2633 3346
2634 av_push (state, data_sv); 3347 av_push (state, data_sv);
2635 3348
2636 api_ready (aTHX_ coro); 3349 api_ready (aTHX_ coro);
2637 SvREFCNT_dec (coro); 3350 SvREFCNT_dec_NN (coro);
2638 SvREFCNT_dec ((AV *)state); 3351 SvREFCNT_dec_NN ((AV *)state);
2639} 3352}
2640 3353
2641static int 3354static int
2642slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3355slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2643{ 3356{
… …
2648 /* it quickly returns */ 3361 /* it quickly returns */
2649 if (CORO_THROW) 3362 if (CORO_THROW)
2650 return 0; 3363 return 0;
2651 3364
2652 /* one element that is an RV? repeat! */ 3365 /* one element that is an RV? repeat! */
2653 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3366 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2654 return 1; 3367 return 1;
2655 3368
2656 /* restore status */ 3369 /* restore status */
2657 { 3370 {
2658 SV *data_sv = av_pop (state); 3371 SV *data_sv = av_pop (state);
… …
2661 errno = data->errorno; 3374 errno = data->errorno;
2662 PL_laststype = data->laststype; 3375 PL_laststype = data->laststype;
2663 PL_laststatval = data->laststatval; 3376 PL_laststatval = data->laststatval;
2664 PL_statcache = data->statcache; 3377 PL_statcache = data->statcache;
2665 3378
2666 SvREFCNT_dec (data_sv); 3379 SvREFCNT_dec_NN (data_sv);
2667 } 3380 }
2668 3381
2669 /* push result values */ 3382 /* push result values */
2670 { 3383 {
2671 dSP; 3384 dSP;
… …
2697 dSP; 3410 dSP;
2698 3411
2699 static SV *prio_cv; 3412 static SV *prio_cv;
2700 static SV *prio_sv; 3413 static SV *prio_sv;
2701 3414
2702 if (expect_false (!prio_cv)) 3415 if (ecb_expect_false (!prio_cv))
2703 { 3416 {
2704 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3417 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2705 prio_sv = newSViv (0); 3418 prio_sv = newSViv (0);
2706 } 3419 }
2707 3420
… …
2726 3439
2727 for (i = 0; i < items; ++i) 3440 for (i = 0; i < items; ++i)
2728 PUSHs (arg [i]); 3441 PUSHs (arg [i]);
2729 3442
2730 /* now push the callback closure */ 3443 /* now push the callback closure */
2731 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3444 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2732 3445
2733 /* now call the AIO function - we assume our request is uncancelable */ 3446 /* now call the AIO function - we assume our request is uncancelable */
2734 PUTBACK; 3447 PUTBACK;
2735 call_sv ((SV *)req, G_VOID | G_DISCARD); 3448 call_sv ((SV *)req, G_VOID | G_DISCARD);
2736 } 3449 }
2737 3450
2738 /* now that the requets is going, we loop toll we have a result */ 3451 /* now that the request is going, we loop till we have a result */
2739 frame->data = (void *)state; 3452 frame->data = (void *)state;
2740 frame->prepare = prepare_schedule; 3453 frame->prepare = prepare_schedule;
2741 frame->check = slf_check_aio_req; 3454 frame->check = slf_check_aio_req;
2742} 3455}
2743 3456
… …
2755 3468
2756#if CORO_CLONE 3469#if CORO_CLONE
2757# include "clone.c" 3470# include "clone.c"
2758#endif 3471#endif
2759 3472
3473/*****************************************************************************/
3474
3475static SV *
3476coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3477{
3478 SV *coro_sv;
3479 struct coro *coro;
3480 MAGIC *mg;
3481 HV *hv;
3482 SV *cb;
3483 int i;
3484
3485 if (argc > 0)
3486 {
3487 cb = s_get_cv_croak (argv [0]);
3488
3489 if (!is_coro)
3490 {
3491 if (CvISXSUB (cb))
3492 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3493
3494 if (!CvROOT (cb))
3495 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3496 }
3497 }
3498
3499 Newz (0, coro, 1, struct coro);
3500 coro->args = newAV ();
3501 coro->flags = CF_NEW;
3502
3503 if (coro_first) coro_first->prev = coro;
3504 coro->next = coro_first;
3505 coro_first = coro;
3506
3507 coro->hv = hv = newHV ();
3508 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3509 mg->mg_flags |= MGf_DUP;
3510 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3511
3512 if (argc > 0)
3513 {
3514 av_extend (coro->args, argc + is_coro - 1);
3515
3516 if (is_coro)
3517 {
3518 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3519 cb = (SV *)cv_coro_run;
3520 }
3521
3522 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3523
3524 for (i = 1; i < argc; i++)
3525 av_push (coro->args, newSVsv (argv [i]));
3526 }
3527
3528 return coro_sv;
3529}
3530
3531#ifndef __cplusplus
3532ecb_cold XS(boot_Coro__State);
3533#endif
3534
3535#if CORO_JIT
3536
3537static void ecb_noinline ecb_cold
3538pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3539{
3540 dSP;
3541 AV *av = newAV ();
3542
3543 av_store (av, 3, newSVuv (d));
3544 av_store (av, 2, newSVuv (c));
3545 av_store (av, 1, newSVuv (b));
3546 av_store (av, 0, newSVuv (a));
3547
3548 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3549
3550 PUTBACK;
3551}
3552
3553static void ecb_noinline ecb_cold
3554jit_init (pTHX)
3555{
3556 dSP;
3557 SV *load, *save;
3558 char *map_base;
3559 char *load_ptr, *save_ptr;
3560 STRLEN load_len, save_len, map_len;
3561 int count;
3562
3563 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3564
3565 PUSHMARK (SP);
3566 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3567 #include "state.h"
3568 count = call_pv ("Coro::State::_jit", G_ARRAY);
3569 SPAGAIN;
3570
3571 save = POPs; save_ptr = SvPVbyte (save, save_len);
3572 load = POPs; load_ptr = SvPVbyte (load, load_len);
3573
3574 map_len = load_len + save_len + 16;
3575
3576 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3577
3578 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3579
3580 load_perl_slots = (load_save_perl_slots_type)map_base;
3581 memcpy (map_base, load_ptr, load_len);
3582
3583 map_base += (load_len + 15) & ~15;
3584
3585 save_perl_slots = (load_save_perl_slots_type)map_base;
3586 memcpy (map_base, save_ptr, save_len);
3587
3588 /* we are good citizens and try to make the page read-only, so the evil evil */
3589 /* hackers might have it a bit more difficult */
3590 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3591
3592 PUTBACK;
3593 eval_pv ("undef &Coro::State::_jit", 1);
3594}
3595
3596#endif
3597
2760MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3598MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2761 3599
2762PROTOTYPES: DISABLE 3600PROTOTYPES: DISABLE
2763 3601
2764BOOT: 3602BOOT:
2765{ 3603{
3604#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3605#include "state.h"
2766#ifdef USE_ITHREADS 3606#ifdef USE_ITHREADS
2767# if CORO_PTHREAD 3607# if CORO_PTHREAD
2768 coro_thx = PERL_GET_CONTEXT; 3608 coro_thx = PERL_GET_CONTEXT;
2769# endif 3609# endif
2770#endif 3610#endif
2771 BOOT_PAGESIZE; 3611 /* perl defines these to check for existance first, but why it doesn't */
3612 /* just create them one at init time is not clear to me, except for */
3613 /* programs trying to delete them, but... */
3614 /* anyway, we declare this as invalid and make sure they are initialised here */
3615 DEFSV;
3616 ERRSV;
2772 3617
2773 cctx_current = cctx_new_empty (); 3618 cctx_current = cctx_new_empty ();
2774 3619
2775 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3620 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2776 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3621 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2777 3622
2778 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3623 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2779 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3624 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2780 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3625 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2781 3626
2782 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2783 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3627 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2784 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3628 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2785 3629
2786 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3630 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2787 3631
… …
2816 coroapi.prepare_nop = prepare_nop; 3660 coroapi.prepare_nop = prepare_nop;
2817 coroapi.prepare_schedule = prepare_schedule; 3661 coroapi.prepare_schedule = prepare_schedule;
2818 coroapi.prepare_cede = prepare_cede; 3662 coroapi.prepare_cede = prepare_cede;
2819 coroapi.prepare_cede_notself = prepare_cede_notself; 3663 coroapi.prepare_cede_notself = prepare_cede_notself;
2820 3664
2821 { 3665 time_init (aTHX);
2822 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2823 3666
2824 if (!svp) croak ("Time::HiRes is required");
2825 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2826
2827 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2828 }
2829
2830 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3667 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3668#if CORO_JIT
3669 PUTBACK;
3670 jit_init (aTHX);
3671 SPAGAIN;
3672#endif
2831} 3673}
2832 3674
2833SV * 3675SV *
2834new (char *klass, ...) 3676new (SV *klass, ...)
2835 ALIAS: 3677 ALIAS:
2836 Coro::new = 1 3678 Coro::new = 1
2837 CODE: 3679 CODE:
2838{ 3680 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2839 struct coro *coro; 3681 OUTPUT:
2840 MAGIC *mg;
2841 HV *hv;
2842 CV *cb;
2843 int i;
2844
2845 if (items > 1)
2846 {
2847 cb = coro_sv_2cv (aTHX_ ST (1));
2848
2849 if (!ix)
2850 {
2851 if (CvISXSUB (cb))
2852 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2853
2854 if (!CvROOT (cb))
2855 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2856 }
2857 }
2858
2859 Newz (0, coro, 1, struct coro);
2860 coro->args = newAV ();
2861 coro->flags = CF_NEW;
2862
2863 if (coro_first) coro_first->prev = coro;
2864 coro->next = coro_first;
2865 coro_first = coro;
2866
2867 coro->hv = hv = newHV ();
2868 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2869 mg->mg_flags |= MGf_DUP;
2870 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2871
2872 if (items > 1)
2873 {
2874 av_extend (coro->args, items - 1 + ix - 1);
2875
2876 if (ix)
2877 {
2878 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2879 cb = cv_coro_run;
2880 }
2881
2882 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2883
2884 for (i = 2; i < items; i++)
2885 av_push (coro->args, newSVsv (ST (i)));
2886 }
2887}
2888 OUTPUT:
2889 RETVAL 3682 RETVAL
2890 3683
2891void 3684void
2892transfer (...) 3685transfer (...)
2893 PROTOTYPE: $$ 3686 PROTOTYPE: $$
2894 CODE: 3687 CODE:
2895 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3688 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2896 3689
2897bool
2898_destroy (SV *coro_sv)
2899 CODE:
2900 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2901 OUTPUT:
2902 RETVAL
2903
2904void
2905_exit (int code)
2906 PROTOTYPE: $
2907 CODE:
2908 _exit (code);
2909
2910SV * 3690SV *
2911clone (Coro::State coro) 3691clone (Coro::State coro)
2912 CODE: 3692 CODE:
2913{ 3693{
2914#if CORO_CLONE 3694#if CORO_CLONE
2915 struct coro *ncoro = coro_clone (coro); 3695 struct coro *ncoro = coro_clone (aTHX_ coro);
2916 MAGIC *mg; 3696 MAGIC *mg;
2917 /* TODO: too much duplication */ 3697 /* TODO: too much duplication */
2918 ncoro->hv = newHV (); 3698 ncoro->hv = newHV ();
2919 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3699 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2920 mg->mg_flags |= MGf_DUP; 3700 mg->mg_flags |= MGf_DUP;
… …
2968void 3748void
2969list () 3749list ()
2970 PROTOTYPE: 3750 PROTOTYPE:
2971 PPCODE: 3751 PPCODE:
2972{ 3752{
2973 struct coro *coro; 3753 struct coro *coro;
2974 for (coro = coro_first; coro; coro = coro->next) 3754 for (coro = coro_first; coro; coro = coro->next)
2975 if (coro->hv) 3755 if (coro->hv)
2976 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3756 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2977} 3757}
2978 3758
… …
2982 eval = 1 3762 eval = 1
2983 CODE: 3763 CODE:
2984{ 3764{
2985 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3765 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2986 { 3766 {
2987 struct coro temp; 3767 struct coro *current = SvSTATE_current;
3768 struct CoroSLF slf_save;
2988 3769
2989 if (!(coro->flags & CF_RUNNING)) 3770 if (current != coro)
2990 { 3771 {
2991 PUTBACK; 3772 PUTBACK;
2992 save_perl (aTHX_ &temp); 3773 save_perl (aTHX_ current);
2993 load_perl (aTHX_ coro); 3774 load_perl (aTHX_ coro);
3775 /* the coro is most likely in an active SLF call.
3776 * while not strictly required (the code we execute is
3777 * not allowed to call any SLF functions), it's cleaner
3778 * to reinitialise the slf_frame and restore it later.
3779 * This might one day allow us to actually do SLF calls
3780 * from code executed here.
3781 */
3782 slf_save = slf_frame;
3783 slf_frame.prepare = 0;
3784 SPAGAIN;
2994 } 3785 }
2995 3786
2996 {
2997 dSP;
2998 ENTER;
2999 SAVETMPS;
3000 PUTBACK;
3001 PUSHSTACK; 3787 PUSHSTACK;
3788
3002 PUSHMARK (SP); 3789 PUSHMARK (SP);
3790 PUTBACK;
3003 3791
3004 if (ix) 3792 if (ix)
3005 eval_sv (coderef, 0); 3793 eval_sv (coderef, 0);
3006 else 3794 else
3007 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3795 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3008 3796
3009 POPSTACK; 3797 POPSTACK;
3010 SPAGAIN; 3798 SPAGAIN;
3011 FREETMPS;
3012 LEAVE;
3013 PUTBACK;
3014 }
3015 3799
3016 if (!(coro->flags & CF_RUNNING)) 3800 if (current != coro)
3017 { 3801 {
3802 PUTBACK;
3803 slf_frame = slf_save;
3018 save_perl (aTHX_ coro); 3804 save_perl (aTHX_ coro);
3019 load_perl (aTHX_ &temp); 3805 load_perl (aTHX_ current);
3020 SPAGAIN; 3806 SPAGAIN;
3021 } 3807 }
3022 } 3808 }
3023} 3809}
3024 3810
… …
3027 PROTOTYPE: $ 3813 PROTOTYPE: $
3028 ALIAS: 3814 ALIAS:
3029 is_ready = CF_READY 3815 is_ready = CF_READY
3030 is_running = CF_RUNNING 3816 is_running = CF_RUNNING
3031 is_new = CF_NEW 3817 is_new = CF_NEW
3032 is_destroyed = CF_DESTROYED 3818 is_destroyed = CF_ZOMBIE
3819 is_zombie = CF_ZOMBIE
3820 is_suspended = CF_SUSPENDED
3033 CODE: 3821 CODE:
3034 RETVAL = boolSV (coro->flags & ix); 3822 RETVAL = boolSV (coro->flags & ix);
3035 OUTPUT: 3823 OUTPUT:
3036 RETVAL 3824 RETVAL
3037 3825
3038void 3826void
3039throw (Coro::State self, SV *throw = &PL_sv_undef) 3827throw (SV *self, SV *exception = &PL_sv_undef)
3040 PROTOTYPE: $;$ 3828 PROTOTYPE: $;$
3041 CODE: 3829 CODE:
3042{ 3830{
3831 struct coro *coro = SvSTATE (self);
3043 struct coro *current = SvSTATE_current; 3832 struct coro *current = SvSTATE_current;
3044 SV **throwp = self == current ? &CORO_THROW : &self->except; 3833 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3045 SvREFCNT_dec (*throwp); 3834 SvREFCNT_dec (*exceptionp);
3046 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3835 SvGETMAGIC (exception);
3836 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3837
3838 api_ready (aTHX_ self);
3047} 3839}
3048 3840
3049void 3841void
3050api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3842api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3051 PROTOTYPE: $;$ 3843 PROTOTYPE: $;$
… …
3102 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3894 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3103 3895
3104 SV *tmp = *src; *src = *dst; *dst = tmp; 3896 SV *tmp = *src; *src = *dst; *dst = tmp;
3105 } 3897 }
3106 3898
3899void
3900cancel (Coro::State self)
3901 CODE:
3902 coro_state_destroy (aTHX_ self);
3903
3904SV *
3905enable_times (int enabled = enable_times)
3906 CODE:
3907{
3908 RETVAL = boolSV (enable_times);
3909
3910 if (enabled != enable_times)
3911 {
3912 enable_times = enabled;
3913
3914 coro_times_update ();
3915 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3916 }
3917}
3918 OUTPUT:
3919 RETVAL
3920
3921void
3922times (Coro::State self)
3923 PPCODE:
3924{
3925 struct coro *current = SvSTATE (coro_current);
3926
3927 if (ecb_expect_false (current == self))
3928 {
3929 coro_times_update ();
3930 coro_times_add (SvSTATE (coro_current));
3931 }
3932
3933 EXTEND (SP, 2);
3934 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3935 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3936
3937 if (ecb_expect_false (current == self))
3938 coro_times_sub (SvSTATE (coro_current));
3939}
3940
3941void
3942swap_sv (Coro::State coro, SV *sva, SV *svb)
3943 CODE:
3944{
3945 struct coro *current = SvSTATE_current;
3946 AV *swap_sv;
3947 int i;
3948
3949 sva = SvRV (sva);
3950 svb = SvRV (svb);
3951
3952 if (current == coro)
3953 SWAP_SVS_LEAVE (current);
3954
3955 if (!coro->swap_sv)
3956 coro->swap_sv = newAV ();
3957
3958 swap_sv = coro->swap_sv;
3959
3960 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3961 {
3962 SV *a = AvARRAY (swap_sv)[i ];
3963 SV *b = AvARRAY (swap_sv)[i + 1];
3964
3965 if (a == sva && b == svb)
3966 {
3967 SvREFCNT_dec_NN (a);
3968 SvREFCNT_dec_NN (b);
3969
3970 for (; i <= AvFILLp (swap_sv) - 2; i++)
3971 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3972
3973 AvFILLp (swap_sv) -= 2;
3974
3975 goto removed;
3976 }
3977 }
3978
3979 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3980 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3981
3982 removed:
3983
3984 if (current == coro)
3985 SWAP_SVS_ENTER (current);
3986}
3987
3107 3988
3108MODULE = Coro::State PACKAGE = Coro 3989MODULE = Coro::State PACKAGE = Coro
3109 3990
3110BOOT: 3991BOOT:
3111{ 3992{
3112 int i; 3993 if (SVt_LAST > 32)
3994 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3113 3995
3114 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3996 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3115 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3997 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3116 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3998 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3117 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3118 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3999 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3119 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4000 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3120 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4001 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3121 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4002 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3122 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4003 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3123 4004
3124 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4005 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3125 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4006 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3126 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4007 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3127 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4008 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3128 4009
3129 coro_stash = gv_stashpv ("Coro", TRUE); 4010 coro_stash = gv_stashpv ("Coro", TRUE);
3130 4011
3131 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4012 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3132 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4013 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3133 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4014 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3134 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4015 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3135 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4016 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3136 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4017 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3137
3138 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3139 coro_ready[i] = newAV ();
3140 4018
3141 { 4019 {
3142 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4020 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3143 4021
3144 coroapi.schedule = api_schedule; 4022 coroapi.schedule = api_schedule;
… …
3148 coroapi.ready = api_ready; 4026 coroapi.ready = api_ready;
3149 coroapi.is_ready = api_is_ready; 4027 coroapi.is_ready = api_is_ready;
3150 coroapi.nready = coro_nready; 4028 coroapi.nready = coro_nready;
3151 coroapi.current = coro_current; 4029 coroapi.current = coro_current;
3152 4030
4031 coroapi.enterleave_hook = api_enterleave_hook;
4032 coroapi.enterleave_unhook = api_enterleave_unhook;
4033 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4034
3153 /*GCoroAPI = &coroapi;*/ 4035 /*GCoroAPI = &coroapi;*/
3154 sv_setiv (sv, (IV)&coroapi); 4036 sv_setiv (sv, (IV)&coroapi);
3155 SvREADONLY_on (sv); 4037 SvREADONLY_on (sv);
3156 } 4038 }
3157} 4039}
3158 4040
4041SV *
4042async (...)
4043 PROTOTYPE: &@
4044 CODE:
4045 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4046 api_ready (aTHX_ RETVAL);
4047 OUTPUT:
4048 RETVAL
4049
4050void
4051_destroy (Coro::State coro)
4052 CODE:
4053 /* used by the manager thread */
4054 coro_state_destroy (aTHX_ coro);
4055
4056void
4057on_destroy (Coro::State coro, SV *cb)
4058 CODE:
4059 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4060
4061void
4062join (...)
4063 CODE:
4064 CORO_EXECUTE_SLF_XS (slf_init_join);
4065
3159void 4066void
3160terminate (...) 4067terminate (...)
3161 CODE: 4068 CODE:
3162 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4069 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3163 4070
3164void 4071void
4072cancel (...)
4073 CODE:
4074 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4075
4076int
4077safe_cancel (Coro::State self, ...)
4078 C_ARGS: aTHX_ self, &ST (1), items - 1
4079
4080void
3165schedule (...) 4081schedule (...)
3166 CODE: 4082 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4083 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3168 4084
3169void 4085void
… …
3185cede_notself (...) 4101cede_notself (...)
3186 CODE: 4102 CODE:
3187 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4103 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3188 4104
3189void 4105void
3190_cancel (Coro::State self)
3191 CODE:
3192 coro_state_destroy (aTHX_ self);
3193 coro_call_on_destroy (aTHX_ self);
3194
3195void
3196_set_current (SV *current) 4106_set_current (SV *current)
3197 PROTOTYPE: $ 4107 PROTOTYPE: $
3198 CODE: 4108 CODE:
3199 SvREFCNT_dec (SvRV (coro_current)); 4109 SvREFCNT_dec_NN (SvRV (coro_current));
3200 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4110 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3201 4111
3202void 4112void
3203_set_readyhook (SV *hook) 4113_set_readyhook (SV *hook)
3204 PROTOTYPE: $ 4114 PROTOTYPE: $
3205 CODE: 4115 CODE:
3206 SvREFCNT_dec (coro_readyhook); 4116 SvREFCNT_dec (coro_readyhook);
4117 SvGETMAGIC (hook);
4118 if (SvOK (hook))
4119 {
3207 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4120 coro_readyhook = newSVsv (hook);
4121 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4122 }
4123 else
4124 {
4125 coro_readyhook = 0;
4126 CORO_READYHOOK = 0;
4127 }
3208 4128
3209int 4129int
3210prio (Coro::State coro, int newprio = 0) 4130prio (Coro::State coro, int newprio = 0)
3211 PROTOTYPE: $;$ 4131 PROTOTYPE: $;$
3212 ALIAS: 4132 ALIAS:
… …
3218 if (items > 1) 4138 if (items > 1)
3219 { 4139 {
3220 if (ix) 4140 if (ix)
3221 newprio = coro->prio - newprio; 4141 newprio = coro->prio - newprio;
3222 4142
3223 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4143 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3224 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4144 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3225 4145
3226 coro->prio = newprio; 4146 coro->prio = newprio;
3227 } 4147 }
3228} 4148}
3229 OUTPUT: 4149 OUTPUT:
… …
3244 RETVAL = coro_nready; 4164 RETVAL = coro_nready;
3245 OUTPUT: 4165 OUTPUT:
3246 RETVAL 4166 RETVAL
3247 4167
3248void 4168void
4169suspend (Coro::State self)
4170 PROTOTYPE: $
4171 CODE:
4172 self->flags |= CF_SUSPENDED;
4173
4174void
4175resume (Coro::State self)
4176 PROTOTYPE: $
4177 CODE:
4178 self->flags &= ~CF_SUSPENDED;
4179
4180void
3249_pool_handler (...) 4181_pool_handler (...)
3250 CODE: 4182 CODE:
3251 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4183 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3252 4184
3253void 4185void
… …
3264 for (i = 1; i < items; ++i) 4196 for (i = 1; i < items; ++i)
3265 av_push (av, SvREFCNT_inc_NN (ST (i))); 4197 av_push (av, SvREFCNT_inc_NN (ST (i)));
3266 4198
3267 if ((SV *)hv == &PL_sv_undef) 4199 if ((SV *)hv == &PL_sv_undef)
3268 { 4200 {
3269 PUSHMARK (SP); 4201 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3270 EXTEND (SP, 2);
3271 PUSHs (sv_Coro);
3272 PUSHs ((SV *)cv_pool_handler);
3273 PUTBACK;
3274 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3275 SPAGAIN;
3276
3277 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4202 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4203 SvREFCNT_dec_NN (sv);
3278 } 4204 }
3279 4205
3280 { 4206 {
3281 struct coro *coro = SvSTATE_hv (hv); 4207 struct coro *coro = SvSTATE_hv (hv);
3282 4208
… …
3289 api_ready (aTHX_ (SV *)hv); 4215 api_ready (aTHX_ (SV *)hv);
3290 4216
3291 if (GIMME_V != G_VOID) 4217 if (GIMME_V != G_VOID)
3292 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4218 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3293 else 4219 else
3294 SvREFCNT_dec (hv); 4220 SvREFCNT_dec_NN (hv);
3295} 4221}
3296 4222
3297SV * 4223SV *
3298rouse_cb () 4224rouse_cb ()
3299 PROTOTYPE: 4225 PROTOTYPE:
… …
3306rouse_wait (...) 4232rouse_wait (...)
3307 PROTOTYPE: ;$ 4233 PROTOTYPE: ;$
3308 PPCODE: 4234 PPCODE:
3309 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4235 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3310 4236
4237void
4238on_enter (SV *block)
4239 ALIAS:
4240 on_leave = 1
4241 PROTOTYPE: &
4242 CODE:
4243{
4244 struct coro *coro = SvSTATE_current;
4245 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4246
4247 block = s_get_cv_croak (block);
4248
4249 if (!*avp)
4250 *avp = newAV ();
4251
4252 av_push (*avp, SvREFCNT_inc (block));
4253
4254 if (!ix)
4255 on_enterleave_call (aTHX_ block);
4256
4257 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4258 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4259 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4260}
4261
3311 4262
3312MODULE = Coro::State PACKAGE = PerlIO::cede 4263MODULE = Coro::State PACKAGE = PerlIO::cede
3313 4264
3314BOOT: 4265BOOT:
3315 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4266 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3318MODULE = Coro::State PACKAGE = Coro::Semaphore 4269MODULE = Coro::State PACKAGE = Coro::Semaphore
3319 4270
3320SV * 4271SV *
3321new (SV *klass, SV *count = 0) 4272new (SV *klass, SV *count = 0)
3322 CODE: 4273 CODE:
4274{
4275 int semcnt = 1;
4276
4277 if (count)
4278 {
4279 SvGETMAGIC (count);
4280
4281 if (SvOK (count))
4282 semcnt = SvIV (count);
4283 }
4284
3323 RETVAL = sv_bless ( 4285 RETVAL = sv_bless (
3324 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4286 coro_waitarray_new (aTHX_ semcnt),
3325 GvSTASH (CvGV (cv)) 4287 GvSTASH (CvGV (cv))
3326 ); 4288 );
4289}
3327 OUTPUT: 4290 OUTPUT:
3328 RETVAL 4291 RETVAL
3329 4292
3330# helper for Coro::Channel 4293# helper for Coro::Channel and others
3331SV * 4294SV *
3332_alloc (int count) 4295_alloc (int count)
3333 CODE: 4296 CODE:
3334 RETVAL = coro_waitarray_new (aTHX_ count); 4297 RETVAL = coro_waitarray_new (aTHX_ count);
3335 OUTPUT: 4298 OUTPUT:
… …
3341 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4304 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3342 OUTPUT: 4305 OUTPUT:
3343 RETVAL 4306 RETVAL
3344 4307
3345void 4308void
3346up (SV *self, int adjust = 1) 4309up (SV *self)
3347 ALIAS:
3348 adjust = 1
3349 CODE: 4310 CODE:
4311 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4312
4313void
4314adjust (SV *self, int adjust)
4315 CODE:
3350 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4316 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3351 4317
3352void 4318void
3353down (...) 4319down (...)
3354 CODE: 4320 CODE:
3355 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4321 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3377 XSRETURN_NO; 4343 XSRETURN_NO;
3378} 4344}
3379 4345
3380void 4346void
3381waiters (SV *self) 4347waiters (SV *self)
3382 PPCODE: 4348 PPCODE:
3383{ 4349{
3384 AV *av = (AV *)SvRV (self); 4350 AV *av = (AV *)SvRV (self);
3385 int wcount = AvFILLp (av) + 1 - 1; 4351 int wcount = AvFILLp (av) + 1 - 1;
3386 4352
3387 if (GIMME_V == G_SCALAR) 4353 if (GIMME_V == G_SCALAR)
… …
3393 for (i = 1; i <= wcount; ++i) 4359 for (i = 1; i <= wcount; ++i)
3394 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4360 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3395 } 4361 }
3396} 4362}
3397 4363
4364MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4365
4366void
4367_may_delete (SV *sem, int count, unsigned int extra_refs)
4368 PPCODE:
4369{
4370 AV *av = (AV *)SvRV (sem);
4371
4372 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4373 && AvFILLp (av) == 0 /* no waiters, just count */
4374 && SvIV (AvARRAY (av)[0]) == count)
4375 XSRETURN_YES;
4376
4377 XSRETURN_NO;
4378}
4379
3398MODULE = Coro::State PACKAGE = Coro::Signal 4380MODULE = Coro::State PACKAGE = Coro::Signal
3399 4381
3400SV * 4382SV *
3401new (SV *klass) 4383new (SV *klass)
3402 CODE: 4384 CODE:
… …
3414 4396
3415void 4397void
3416broadcast (SV *self) 4398broadcast (SV *self)
3417 CODE: 4399 CODE:
3418{ 4400{
3419 AV *av = (AV *)SvRV (self); 4401 AV *av = (AV *)SvRV (self);
3420 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4402 coro_signal_wake (aTHX_ av, AvFILLp (av));
3421} 4403}
3422 4404
3423void 4405void
3424send (SV *self) 4406send (SV *self)
… …
3432 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4414 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3433} 4415}
3434 4416
3435IV 4417IV
3436awaited (SV *self) 4418awaited (SV *self)
3437 CODE: 4419 CODE:
3438 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4420 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3439 OUTPUT: 4421 OUTPUT:
3440 RETVAL 4422 RETVAL
3441 4423
3442 4424
… …
3447 4429
3448void 4430void
3449_schedule (...) 4431_schedule (...)
3450 CODE: 4432 CODE:
3451{ 4433{
3452 static int incede; 4434 static int incede;
3453 4435
3454 api_cede_notself (aTHX); 4436 api_cede_notself (aTHX);
3455 4437
3456 ++incede; 4438 ++incede;
3457 while (coro_nready >= incede && api_cede (aTHX)) 4439 while (coro_nready >= incede && api_cede (aTHX))
… …
3473 4455
3474void 4456void
3475_register (char *target, char *proto, SV *req) 4457_register (char *target, char *proto, SV *req)
3476 CODE: 4458 CODE:
3477{ 4459{
3478 CV *req_cv = coro_sv_2cv (aTHX_ req); 4460 SV *req_cv = s_get_cv_croak (req);
3479 /* newXSproto doesn't return the CV on 5.8 */ 4461 /* newXSproto doesn't return the CV on 5.8 */
3480 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4462 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3481 sv_setpv ((SV *)slf_cv, proto); 4463 sv_setpv ((SV *)slf_cv, proto);
3482 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4464 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3483} 4465}
3484 4466
4467MODULE = Coro::State PACKAGE = Coro::Select
4468
4469void
4470patch_pp_sselect ()
4471 CODE:
4472 if (!coro_old_pp_sselect)
4473 {
4474 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4475 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4476 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4477 }
4478
4479void
4480unpatch_pp_sselect ()
4481 CODE:
4482 if (coro_old_pp_sselect)
4483 {
4484 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4485 coro_old_pp_sselect = 0;
4486 }
4487
4488MODULE = Coro::State PACKAGE = Coro::Util
4489
4490void
4491_exit (int code)
4492 CODE:
4493 _exit (code);
4494
4495NV
4496time ()
4497 CODE:
4498 RETVAL = nvtime (aTHX);
4499 OUTPUT:
4500 RETVAL
4501
4502NV
4503gettimeofday ()
4504 PPCODE:
4505{
4506 UV tv [2];
4507 u2time (aTHX_ tv);
4508 EXTEND (SP, 2);
4509 PUSHs (sv_2mortal (newSVuv (tv [0])));
4510 PUSHs (sv_2mortal (newSVuv (tv [1])));
4511}
4512

Diff Legend

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