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.330 by root, Wed Nov 26 09:29:06 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 = AvARRAY (padlist)[i--]; 592 /* we try to be extra-careful here */
593 PAD *pad = PadlistARRAY (padlist)[i--];
594
392 if (svp) 595 if (pad)
393 { 596 {
394 AvREAL_on (*svp); 597 I32 j = PadMAX (pad);
395 av_undef (*svp); 598
599 while (j >= 0)
600 SvREFCNT_dec (PadARRAY (pad)[j--]);
601
602 PadMAX (pad) = -1;
396 SvREFCNT_dec (*svp); 603 SvREFCNT_dec (pad);
397 } 604 }
398 } 605 }
399 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);
400 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
401 } 617 }
402} 618}
403 619
404static int 620static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 622{
407 AV *padlist; 623 PADLIST *padlist;
408 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;
409 626
410 /* casting is fun. */ 627 /* perl manages to free our internal AV and _then_ call us */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 628 if (IN_DESTRUCT)
629 return 0;
630
631 while (len--)
412 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
413
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 633
416 return 0; 634 return 0;
417} 635}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 636
422static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 638 0, 0, 0, 0,
424 coro_cv_free 639 coro_cv_free
425}; 640};
426 641
427#define CORO_MAGIC_NN(sv, type) \
428 (expect_true (SvMAGIC (sv)->mg_type == type) \
429 ? SvMAGIC (sv) \
430 : mg_find (sv, type))
431
432#define CORO_MAGIC(sv, type) \
433 (expect_true (SvMAGIC (sv)) \
434 ? CORO_MAGIC_NN (sv, type) \
435 : 0)
436
437#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
438#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
439
440INLINE struct coro *
441SvSTATE_ (pTHX_ SV *coro)
442{
443 HV *stash;
444 MAGIC *mg;
445
446 if (SvROK (coro))
447 coro = SvRV (coro);
448
449 if (expect_false (SvTYPE (coro) != SVt_PVHV))
450 croak ("Coro::State object required");
451
452 stash = SvSTASH (coro);
453 if (expect_false (stash != coro_stash && stash != coro_state_stash))
454 {
455 /* very slow, but rare, check */
456 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
457 croak ("Coro::State object required");
458 }
459
460 mg = CORO_MAGIC_state (coro);
461 return (struct coro *)mg->mg_ptr;
462}
463
464#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
465
466/* faster than SvSTATE, but expects a coroutine hv */
467#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
468#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
469
470/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
471static void 643ecb_inline void
472get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
473{ 645{
474 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
475 AV *av; 647 size_t *lenp;
476 648
477 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
478 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
479 else 651 else
480 { 652 {
481#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
482 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
483 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
489 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
490#endif 662#endif
491 } 663 }
492} 664}
493 665
494static void 666ecb_inline void
495put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
496{ 668{
497 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
498 AV *av;
499 670
500 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
501 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);
502 681
503 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
504
505 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvFILLp (av) + 1);
507
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 683}
510 684
511/** 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);
512 758
513static void 759static void
514load_perl (pTHX_ Coro__State c) 760load_perl (pTHX_ Coro__State c)
515{ 761{
516 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
517 c->slot = 0; 763 c->slot = 0;
518 764
519 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
520 766
521 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
522 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
523 GvSV (PL_errgv) = slot->errsv; 769#else
524 GvSV (irsgv) = slot->irsgv;
525 GvHV (PL_hintgv) = slot->hinthv;
526
527 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
528 # include "state.h" 771 #include "state.h"
529 #undef VAR 772#endif
530 773
531 { 774 {
532 dSP; 775 dSP;
533 776
534 CV *cv; 777 CV *cv;
535 778
536 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
537 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
538 { 781 {
539 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
540 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
541 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
542 } 785 }
543 786
544 PUTBACK; 787 PUTBACK;
545 } 788 }
546 789
547 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
548 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);
549} 818}
550 819
551static void 820static void
552save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
553{ 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
554 c->except = CORO_THROW; 849 c->except = CORO_THROW;
555 c->slf_frame = slf_frame; 850 c->slf_frame = slf_frame;
556 851
557 { 852 {
558 dSP; 853 dSP;
… …
567 862
568 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
569 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
570 for (;;) 865 for (;;)
571 { 866 {
572 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
573 { 868 {
574 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
575 870
576 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))
577 { 872 {
578 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
579 874
580 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
581 { 876 {
582 EXTEND (SP, 3); 877 EXTEND (SP, 3);
583 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
584 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
585 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
588 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
589 } 884 }
590 } 885 }
591 } 886 }
592 887
593 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
594 break; 889 break;
595 890
596 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
597 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
598 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
600 895
601 PUTBACK; 896 PUTBACK;
602 } 897 }
603 898
604 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
605 /* we manually unroll here, as usually 2 slots is enough */ 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
606 if (SLOT_COUNT >= 1) CXINC;
607 if (SLOT_COUNT >= 2) CXINC;
608 if (SLOT_COUNT >= 3) CXINC;
609 { 901 {
610 int i; 902 unsigned int i;
903
611 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
612 CXINC; 905 CXINC;
613 } 906
614 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
615 909
616 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
617 911
618 { 912 {
619 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
620 914
621 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
622 slot->defsv = DEFSV; 916 save_perl_slots (slot);
623 slot->errsv = ERRSV; 917#else
624 slot->irsgv = GvSV (irsgv);
625 slot->hinthv = GvHV (PL_hintgv);
626
627 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
628 # include "state.h" 919 #include "state.h"
629 #undef VAR 920#endif
630 } 921 }
631} 922}
632 923
633/* 924/*
634 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
640# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
641#else 932#else
642static void 933static void
643coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
644{ 935{
645 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() */
646 PL_curstackinfo->si_type = PERLSI_MAIN; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
647 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
648 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
649 940
650 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
665#endif 956#endif
666 957
667 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
668 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
669 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
670 964
671 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
672 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
673 PL_savestack_max = 24; 967 PL_savestack_max = 24;
674 968
… …
702 } 996 }
703 997
704 Safefree (PL_tmps_stack); 998 Safefree (PL_tmps_stack);
705 Safefree (PL_markstack); 999 Safefree (PL_markstack);
706 Safefree (PL_scopestack); 1000 Safefree (PL_scopestack);
1001#if HAS_SCOPESTACK_NAME
1002 Safefree (PL_scopestack_name);
1003#endif
707 Safefree (PL_savestack); 1004 Safefree (PL_savestack);
708#if !PERL_VERSION_ATLEAST (5,10,0) 1005#if !PERL_VERSION_ATLEAST (5,10,0)
709 Safefree (PL_retstack); 1006 Safefree (PL_retstack);
710#endif 1007#endif
711} 1008}
… …
757#endif 1054#endif
758 1055
759/* 1056/*
760 * This overrides the default magic get method of %SIG elements. 1057 * This overrides the default magic get method of %SIG elements.
761 * 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
762 * 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),
763 * readback here. 1060 * we just provide our own readback here.
764 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
765 * not expecting this to actually change the hook. This is a potential problem
766 * when a schedule happens then, but we ignore this.
767 */ 1061 */
768static int 1062static int ecb_cold
769coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1063coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
770{ 1064{
771 const char *s = MgPV_nolen_const (mg); 1065 const char *s = MgPV_nolen_const (mg);
772 1066
773 if (*s == '_') 1067 if (*s == '_')
774 { 1068 {
775 SV **svp = 0; 1069 SV **svp = 0;
776 1070
777 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1071 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
778 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1072 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
779 1073
780 if (svp) 1074 if (svp)
781 { 1075 {
782 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);
783 return 0; 1086 return 0;
784 } 1087 }
785 } 1088 }
786 1089
787 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
788} 1091}
789 1092
790static int 1093static int ecb_cold
791coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
792{ 1095{
793 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
794 1097
795 if (*s == '_') 1098 if (*s == '_')
… …
809 } 1112 }
810 1113
811 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1114 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
812} 1115}
813 1116
814static int 1117static int ecb_cold
815coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
816{ 1119{
817 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
818 1121
819 if (*s == '_') 1122 if (*s == '_')
… …
824 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1127 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
825 1128
826 if (svp) 1129 if (svp)
827 { 1130 {
828 SV *old = *svp; 1131 SV *old = *svp;
829 *svp = newSVsv (sv); 1132 *svp = SvOK (sv) ? newSVsv (sv) : 0;
830 SvREFCNT_dec (old); 1133 SvREFCNT_dec (old);
831 return 0; 1134 return 0;
832 } 1135 }
833 } 1136 }
834 1137
… …
852slf_check_repeat (pTHX_ struct CoroSLF *frame) 1155slf_check_repeat (pTHX_ struct CoroSLF *frame)
853{ 1156{
854 return 1; 1157 return 1;
855} 1158}
856 1159
857static UNOP coro_setup_op; 1160static UNOP init_perl_op;
858 1161
859static 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 */
860coro_setup (pTHX_ struct coro *coro) 1163init_perl (pTHX_ struct coro *coro)
861{ 1164{
862 /* 1165 /*
863 * emulate part of the perl startup here. 1166 * emulate part of the perl startup here.
864 */ 1167 */
865 coro_init_stacks (aTHX); 1168 coro_init_stacks (aTHX);
… …
872 PL_comppad_name_fill = 0; 1175 PL_comppad_name_fill = 0;
873 PL_comppad_name_floor = 0; 1176 PL_comppad_name_floor = 0;
874 PL_curpm = 0; 1177 PL_curpm = 0;
875 PL_curpad = 0; 1178 PL_curpad = 0;
876 PL_localizing = 0; 1179 PL_localizing = 0;
877 PL_dirty = 0;
878 PL_restartop = 0; 1180 PL_restartop = 0;
879#if PERL_VERSION_ATLEAST (5,10,0) 1181#if PERL_VERSION_ATLEAST (5,10,0)
880 PL_parser = 0; 1182 PL_parser = 0;
881#endif 1183#endif
882 PL_hints = 0; 1184 PL_hints = 0;
883 1185
884 /* recreate the die/warn hooks */ 1186 /* recreate the die/warn hooks */
885 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1187 PL_diehook = SvREFCNT_inc (rv_diehook);
886 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1188 PL_warnhook = SvREFCNT_inc (rv_warnhook);
887 1189
888 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
889 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
890 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
891 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);
892 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
893 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
894 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
895 1200
896 { 1201 {
897 dSP; 1202 dSP;
… …
912 /* 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
913 * 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.
914 */ 1219 */
915 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 */
916 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;
917 1223
918 /* 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 */
919 coro_setup_op.op_next = PL_op; 1225 init_perl_op.op_next = PL_op;
920 coro_setup_op.op_type = OP_ENTERSUB; 1226 init_perl_op.op_type = OP_ENTERSUB;
921 coro_setup_op.op_ppaddr = pp_slf; 1227 init_perl_op.op_ppaddr = pp_slf;
922 /* 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 */
923 1229
924 PL_op = (OP *)&coro_setup_op; 1230 PL_op = (OP *)&init_perl_op;
925 1231
926 /* copy throw, in case it was set before coro_setup */ 1232 /* copy throw, in case it was set before init_perl */
927 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
928}
929 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
930static void 1244static void
931coro_destruct (pTHX_ struct coro *coro) 1245coro_unwind_stacks (pTHX)
932{ 1246{
933 if (!IN_DESTRUCT) 1247 if (!IN_DESTRUCT)
934 { 1248 {
935 /* restore all saved variables and stuff */ 1249 /* restore all saved variables and stuff */
936 LEAVE_SCOPE (0); 1250 LEAVE_SCOPE (0);
… …
944 POPSTACK_TO (PL_mainstack); 1258 POPSTACK_TO (PL_mainstack);
945 1259
946 /* unwind main stack */ 1260 /* unwind main stack */
947 dounwind (-1); 1261 dounwind (-1);
948 } 1262 }
1263}
949 1264
950 SvREFCNT_dec (GvSV (PL_defgv)); 1265static void
951 SvREFCNT_dec (GvAV (PL_defgv)); 1266destroy_perl (pTHX_ struct coro *coro)
952 SvREFCNT_dec (GvSV (PL_errgv)); 1267{
953 SvREFCNT_dec (PL_defoutgv); 1268 SV *svf [9];
954 SvREFCNT_dec (PL_rs);
955 SvREFCNT_dec (GvSV (irsgv));
956 SvREFCNT_dec (GvHV (PL_hintgv));
957 1269
958 SvREFCNT_dec (PL_diehook);
959 SvREFCNT_dec (PL_warnhook);
960 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
961 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
962 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
963 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
964 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
965 1317 SvREFCNT_dec (coro->on_enter_xs);
966 coro_destruct_stacks (aTHX); 1318 SvREFCNT_dec (coro->on_leave_xs);
1319 }
967} 1320}
968 1321
969INLINE void 1322ecb_inline void
970free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
971{ 1324{
972 if (expect_true (coro_mortal)) 1325 if (ecb_expect_true (coro_mortal))
973 { 1326 {
974 SvREFCNT_dec (coro_mortal); 1327 SvREFCNT_dec ((SV *)coro_mortal);
975 coro_mortal = 0; 1328 coro_mortal = 0;
976 } 1329 }
977} 1330}
978 1331
979static int 1332static int
… …
1033 1386
1034 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1035 { 1388 {
1036 SV **cb; 1389 SV **cb;
1037 1390
1038 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1039 { 1392 {
1040 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1041 1394
1042 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1043 { 1396 {
… …
1112 1465
1113 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 */
1114} 1467}
1115 1468
1116/* 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 */
1117static void NOINLINE 1470static void ecb_noinline
1118cctx_prepare (pTHX) 1471cctx_prepare (pTHX)
1119{ 1472{
1120 PL_top_env = &PL_start_env; 1473 PL_top_env = &PL_start_env;
1121 1474
1122 if (cctx_current->flags & CC_TRACE) 1475 if (cctx_current->flags & CC_TRACE)
… …
1133 slf_frame.prepare = slf_prepare_set_stacklevel; 1486 slf_frame.prepare = slf_prepare_set_stacklevel;
1134 slf_frame.check = slf_check_set_stacklevel; 1487 slf_frame.check = slf_check_set_stacklevel;
1135} 1488}
1136 1489
1137/* 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 */
1138INLINE void 1491ecb_inline void
1139transfer_tail (pTHX) 1492transfer_tail (pTHX)
1140{ 1493{
1141 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);
1142} 1507}
1143 1508
1144/* 1509/*
1145 * this is a _very_ stripped down perl interpreter ;) 1510 * this is a _very_ stripped down perl interpreter ;)
1146 */ 1511 */
… …
1168 /* 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 */
1169 PL_restartop = PL_op; 1534 PL_restartop = PL_op;
1170 perl_run (PL_curinterp); 1535 perl_run (PL_curinterp);
1171 /* 1536 /*
1172 * 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
1173 * 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.
1174 */ 1540 */
1175 1541
1176 /* 1542 /*
1177 * 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
1178 * 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)
1179 * 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
1180 * bootstrap-time "top" top_env, as we cannot restore the "main" 1546 * doing in that case. YMMV.
1181 * coroutine as Coro has no such concept.
1182 * This actually isn't valid with the pthread backend, but OSes requiring
1183 * that backend are too broken to do it in a standards-compliant way.
1184 */ 1547 */
1185 PL_top_env = main_top_env; 1548 perlish_exit (aTHX);
1186 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1187 } 1549 }
1188} 1550}
1189 1551
1190static coro_cctx * 1552static coro_cctx *
1191cctx_new () 1553cctx_new (void)
1192{ 1554{
1193 coro_cctx *cctx; 1555 coro_cctx *cctx;
1194 1556
1195 ++cctx_count; 1557 ++cctx_count;
1196 New (0, cctx, 1, coro_cctx); 1558 New (0, cctx, 1, coro_cctx);
… …
1202 return cctx; 1564 return cctx;
1203} 1565}
1204 1566
1205/* create a new cctx only suitable as source */ 1567/* create a new cctx only suitable as source */
1206static coro_cctx * 1568static coro_cctx *
1207cctx_new_empty () 1569cctx_new_empty (void)
1208{ 1570{
1209 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1210 1572
1211 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1212 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1213 1575
1214 return cctx; 1576 return cctx;
1215} 1577}
1216 1578
1217/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1218static coro_cctx * 1580static coro_cctx *
1219cctx_new_run () 1581cctx_new_run (void)
1220{ 1582{
1221 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1222 void *stack_start;
1223 size_t stack_size;
1224 1584
1225#if HAVE_MMAP 1585 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1226 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1227 /* mmap supposedly does allocate-on-write for us */
1228 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1229
1230 if (cctx->sptr != (void *)-1)
1231 {
1232 #if CORO_STACKGUARD
1233 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1234 #endif
1235 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1236 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1237 cctx->flags |= CC_MAPPED;
1238 } 1586 {
1239 else
1240#endif
1241 {
1242 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1243 New (0, cctx->sptr, cctx_stacksize, long);
1244
1245 if (!cctx->sptr)
1246 {
1247 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1248 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1249 }
1250
1251 stack_start = cctx->sptr;
1252 stack_size = cctx->ssize;
1253 } 1589 }
1254 1590
1255 #if CORO_USE_VALGRIND
1256 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1257 #endif
1258
1259 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);
1260 1592
1261 return cctx; 1593 return cctx;
1262} 1594}
1263 1595
1264static void 1596static void
1265cctx_destroy (coro_cctx *cctx) 1597cctx_destroy (coro_cctx *cctx)
1266{ 1598{
1267 if (!cctx) 1599 if (!cctx)
1268 return; 1600 return;
1269 1601
1270 assert (cctx != cctx_current);//D temporary 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1271 1603
1272 --cctx_count; 1604 --cctx_count;
1273 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1274 1606
1275 /* coro_transfer creates new, empty cctx's */ 1607 coro_stack_free (&cctx->stack);
1276 if (cctx->sptr)
1277 {
1278 #if CORO_USE_VALGRIND
1279 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1280 #endif
1281
1282#if HAVE_MMAP
1283 if (cctx->flags & CC_MAPPED)
1284 munmap (cctx->sptr, cctx->ssize);
1285 else
1286#endif
1287 Safefree (cctx->sptr);
1288 }
1289 1608
1290 Safefree (cctx); 1609 Safefree (cctx);
1291} 1610}
1292 1611
1293/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1294#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))
1295 1614
1296static coro_cctx * 1615static coro_cctx *
1297cctx_get (pTHX) 1616cctx_get (pTHX)
1298{ 1617{
1299 while (expect_true (cctx_first)) 1618 while (ecb_expect_true (cctx_first))
1300 { 1619 {
1301 coro_cctx *cctx = cctx_first; 1620 coro_cctx *cctx = cctx_first;
1302 cctx_first = cctx->next; 1621 cctx_first = cctx->next;
1303 --cctx_idle; 1622 --cctx_idle;
1304 1623
1305 if (expect_true (!CCTX_EXPIRED (cctx))) 1624 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1306 return cctx; 1625 return cctx;
1307 1626
1308 cctx_destroy (cctx); 1627 cctx_destroy (cctx);
1309 } 1628 }
1310 1629
… …
1312} 1631}
1313 1632
1314static void 1633static void
1315cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1316{ 1635{
1317 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));
1318 1637
1319 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1320 if (expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1321 { 1640 {
1322 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1323 cctx_first = first->next; 1642 cctx_first = first->next;
1324 --cctx_idle; 1643 --cctx_idle;
1325 1644
… …
1336static void 1655static void
1337transfer_check (pTHX_ struct coro *prev, struct coro *next) 1656transfer_check (pTHX_ struct coro *prev, struct coro *next)
1338{ 1657{
1339 /* TODO: throwing up here is considered harmful */ 1658 /* TODO: throwing up here is considered harmful */
1340 1659
1341 if (expect_true (prev != next)) 1660 if (ecb_expect_true (prev != next))
1342 { 1661 {
1343 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1662 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1344 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,");
1345 1664
1346 if (expect_false (next->flags & CF_RUNNING)) 1665 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1347 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1348
1349 if (expect_false (next->flags & CF_DESTROYED))
1350 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,");
1351 1667
1352#if !PERL_VERSION_ATLEAST (5,10,0) 1668#if !PERL_VERSION_ATLEAST (5,10,0)
1353 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1669 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1354 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,");
1355#endif 1671#endif
1356 } 1672 }
1357} 1673}
1358 1674
1359/* always use the TRANSFER macro */ 1675/* always use the TRANSFER macro */
1360static void NOINLINE /* noinline so we have a fixed stackframe */ 1676static void ecb_noinline /* noinline so we have a fixed stackframe */
1361transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1677transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1362{ 1678{
1363 dSTACKLEVEL; 1679 dSTACKLEVEL;
1364 1680
1365 /* sometimes transfer is only called to set idle_sp */ 1681 /* sometimes transfer is only called to set idle_sp */
1366 if (expect_false (!prev)) 1682 if (ecb_expect_false (!prev))
1367 { 1683 {
1368 cctx_current->idle_sp = STACKLEVEL; 1684 cctx_current->idle_sp = STACKLEVEL;
1369 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 */
1370 } 1686 }
1371 else if (expect_true (prev != next)) 1687 else if (ecb_expect_true (prev != next))
1372 { 1688 {
1373 coro_cctx *cctx_prev; 1689 coro_cctx *cctx_prev;
1374 1690
1375 if (expect_false (prev->flags & CF_NEW)) 1691 if (ecb_expect_false (prev->flags & CF_NEW))
1376 { 1692 {
1377 /* create a new empty/source context */ 1693 /* create a new empty/source context */
1378 prev->flags &= ~CF_NEW; 1694 prev->flags &= ~CF_NEW;
1379 prev->flags |= CF_RUNNING; 1695 prev->flags |= CF_RUNNING;
1380 } 1696 }
… …
1383 next->flags |= CF_RUNNING; 1699 next->flags |= CF_RUNNING;
1384 1700
1385 /* first get rid of the old state */ 1701 /* first get rid of the old state */
1386 save_perl (aTHX_ prev); 1702 save_perl (aTHX_ prev);
1387 1703
1388 if (expect_false (next->flags & CF_NEW)) 1704 if (ecb_expect_false (next->flags & CF_NEW))
1389 { 1705 {
1390 /* need to start coroutine */ 1706 /* need to start coroutine */
1391 next->flags &= ~CF_NEW; 1707 next->flags &= ~CF_NEW;
1392 /* setup coroutine call */ 1708 /* setup coroutine call */
1393 coro_setup (aTHX_ next); 1709 init_perl (aTHX_ next);
1394 } 1710 }
1395 else 1711 else
1396 load_perl (aTHX_ next); 1712 load_perl (aTHX_ next);
1397 1713
1398 assert (!prev->cctx);//D temporary
1399
1400 /* possibly untie and reuse the cctx */ 1714 /* possibly untie and reuse the cctx */
1401 if (expect_true ( 1715 if (ecb_expect_true (
1402 cctx_current->idle_sp == STACKLEVEL 1716 cctx_current->idle_sp == STACKLEVEL
1403 && !(cctx_current->flags & CC_TRACE) 1717 && !(cctx_current->flags & CC_TRACE)
1404 && !force_cctx 1718 && !force_cctx
1405 )) 1719 ))
1406 { 1720 {
1407 /* 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 */
1408 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));
1409 1723
1410 /* 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. */
1411 /* 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 */
1412 if (expect_false (CCTX_EXPIRED (cctx_current))) 1726 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1413 if (expect_true (!next->cctx)) 1727 if (ecb_expect_true (!next->cctx))
1414 next->cctx = cctx_get (aTHX); 1728 next->cctx = cctx_get (aTHX);
1415 1729
1416 cctx_put (cctx_current); 1730 cctx_put (cctx_current);
1417 } 1731 }
1418 else 1732 else
1419 prev->cctx = cctx_current; 1733 prev->cctx = cctx_current;
1420 1734
1421 ++next->usecount; 1735 ++next->usecount;
1422 1736
1423 cctx_prev = cctx_current; 1737 cctx_prev = cctx_current;
1424 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1738 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1425 1739
1426 next->cctx = 0; 1740 next->cctx = 0;
1427 1741
1428 if (expect_false (cctx_prev != cctx_current)) 1742 if (ecb_expect_false (cctx_prev != cctx_current))
1429 { 1743 {
1430 cctx_prev->top_env = PL_top_env; 1744 cctx_prev->top_env = PL_top_env;
1431 PL_top_env = cctx_current->top_env; 1745 PL_top_env = cctx_current->top_env;
1432 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1746 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1433 } 1747 }
… …
1439#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))
1440#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1754#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1441 1755
1442/** high level stuff ********************************************************/ 1756/** high level stuff ********************************************************/
1443 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 */
1444static int 1760static void
1761coro_call_on_destroy (pTHX_ struct coro *coro);
1762
1763static void
1445coro_state_destroy (pTHX_ struct coro *coro) 1764coro_state_destroy (pTHX_ struct coro *coro)
1446{ 1765{
1447 if (coro->flags & CF_DESTROYED) 1766 if (coro->flags & CF_ZOMBIE)
1448 return 0; 1767 return;
1449 1768
1450 if (coro->on_destroy)
1451 coro->on_destroy (aTHX_ coro); 1769 slf_destroy (aTHX_ coro);
1452 1770
1453 coro->flags |= CF_DESTROYED; 1771 coro->flags |= CF_ZOMBIE;
1454 1772
1455 if (coro->flags & CF_READY) 1773 if (coro->flags & CF_READY)
1456 { 1774 {
1457 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1775 /* reduce nready, as destroying a ready coro effectively unreadies it */
1458 /* alternative: look through all ready queues and remove the coro */ 1776 /* alternative: look through all ready queues and remove the coro */
1459 --coro_nready; 1777 --coro_nready;
1460 } 1778 }
1461 else 1779 else
1462 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 */
1463 1781
1464 if (coro->mainstack && coro->mainstack != main_mainstack) 1782 if (coro->next) coro->next->prev = coro->prev;
1465 { 1783 if (coro->prev) coro->prev->next = coro->next;
1466 struct coro temp; 1784 if (coro == coro_first) coro_first = coro->next;
1467 1785
1468 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1786 if (coro->mainstack
1469 1787 && coro->mainstack != main_mainstack
1470 save_perl (aTHX_ &temp); 1788 && coro->slot
1789 && !PL_dirty)
1471 load_perl (aTHX_ coro); 1790 destroy_perl (aTHX_ coro);
1472
1473 coro_destruct (aTHX_ coro);
1474
1475 load_perl (aTHX_ &temp);
1476
1477 coro->slot = 0;
1478 }
1479 1791
1480 cctx_destroy (coro->cctx); 1792 cctx_destroy (coro->cctx);
1481 SvREFCNT_dec (coro->startcv); 1793 SvREFCNT_dec (coro->startcv);
1482 SvREFCNT_dec (coro->args); 1794 SvREFCNT_dec (coro->args);
1795 SvREFCNT_dec (coro->swap_sv);
1483 SvREFCNT_dec (CORO_THROW); 1796 SvREFCNT_dec (CORO_THROW);
1484 1797
1485 if (coro->next) coro->next->prev = coro->prev; 1798 coro_call_on_destroy (aTHX_ coro);
1486 if (coro->prev) coro->prev->next = coro->next;
1487 if (coro == coro_first) coro_first = coro->next;
1488 1799
1489 return 1; 1800 /* more destruction mayhem in coro_state_free */
1490} 1801}
1491 1802
1492static int 1803static int
1493coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1804coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1494{ 1805{
1495 struct coro *coro = (struct coro *)mg->mg_ptr; 1806 struct coro *coro = (struct coro *)mg->mg_ptr;
1496 mg->mg_ptr = 0; 1807 mg->mg_ptr = 0;
1497 1808
1498 coro->hv = 0;
1499
1500 if (--coro->refcnt < 0)
1501 {
1502 coro_state_destroy (aTHX_ coro); 1809 coro_state_destroy (aTHX_ coro);
1810 SvREFCNT_dec (coro->on_destroy);
1811 SvREFCNT_dec (coro->status);
1812
1503 Safefree (coro); 1813 Safefree (coro);
1504 }
1505 1814
1506 return 0; 1815 return 0;
1507} 1816}
1508 1817
1509static int 1818static int ecb_cold
1510coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1819coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1511{ 1820{
1512 struct coro *coro = (struct coro *)mg->mg_ptr; 1821 /* called when perl clones the current process the slow way (windows process emulation) */
1513 1822 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1514 ++coro->refcnt; 1823 mg->mg_ptr = 0;
1824 mg->mg_virtual = 0;
1515 1825
1516 return 0; 1826 return 0;
1517} 1827}
1518 1828
1519static MGVTBL coro_state_vtbl = { 1829static MGVTBL coro_state_vtbl = {
… …
1542 1852
1543 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1853 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1544 TRANSFER (ta, 1); 1854 TRANSFER (ta, 1);
1545} 1855}
1546 1856
1547/*****************************************************************************/
1548/* gensub: simple closure generation utility */
1549
1550#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1551
1552/* create a closure from XS, returns a code reference */
1553/* the arg can be accessed via GENSUB_ARG from the callback */
1554/* the callback must use dXSARGS/XSRETURN */
1555static SV *
1556gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1557{
1558 CV *cv = (CV *)newSV (0);
1559
1560 sv_upgrade ((SV *)cv, SVt_PVCV);
1561
1562 CvANON_on (cv);
1563 CvISXSUB_on (cv);
1564 CvXSUB (cv) = xsub;
1565 GENSUB_ARG = arg;
1566
1567 return newRV_noinc ((SV *)cv);
1568}
1569
1570/** Coro ********************************************************************/ 1857/** Coro ********************************************************************/
1571 1858
1572INLINE void 1859ecb_inline void
1573coro_enq (pTHX_ struct coro *coro) 1860coro_enq (pTHX_ struct coro *coro)
1574{ 1861{
1575 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1862 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1576}
1577 1863
1578INLINE 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 *
1579coro_deq (pTHX) 1872coro_deq (pTHX)
1580{ 1873{
1581 int prio; 1874 int prio;
1582 1875
1583 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1876 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1584 if (AvFILLp (coro_ready [prio]) >= 0) 1877 {
1585 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 }
1586 1887
1587 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;
1588} 1906}
1589 1907
1590static int 1908static int
1591api_ready (pTHX_ SV *coro_sv) 1909api_ready (pTHX_ SV *coro_sv)
1592{ 1910{
1593 struct coro *coro;
1594 SV *sv_hook;
1595 void (*xs_hook)(void);
1596
1597 coro = SvSTATE (coro_sv); 1911 struct coro *coro = SvSTATE (coro_sv);
1598 1912
1599 if (coro->flags & CF_READY) 1913 if (coro->flags & CF_READY)
1600 return 0; 1914 return 0;
1601 1915
1602 coro->flags |= CF_READY; 1916 coro->flags |= CF_READY;
1603 1917
1604 sv_hook = coro_nready ? 0 : coro_readyhook;
1605 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1606
1607 coro_enq (aTHX_ coro); 1918 coro_enq (aTHX_ coro);
1608 ++coro_nready;
1609 1919
1610 if (sv_hook) 1920 if (!coro_nready++)
1611 { 1921 if (coroapi.readyhook)
1612 dSP; 1922 coroapi.readyhook ();
1613
1614 ENTER;
1615 SAVETMPS;
1616
1617 PUSHMARK (SP);
1618 PUTBACK;
1619 call_sv (sv_hook, G_VOID | G_DISCARD);
1620
1621 FREETMPS;
1622 LEAVE;
1623 }
1624
1625 if (xs_hook)
1626 xs_hook ();
1627 1923
1628 return 1; 1924 return 1;
1629} 1925}
1630 1926
1631static int 1927static int
… …
1633{ 1929{
1634 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1930 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1635} 1931}
1636 1932
1637/* expects to own a reference to next->hv */ 1933/* expects to own a reference to next->hv */
1638INLINE void 1934ecb_inline void
1639prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1935prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1640{ 1936{
1641 SV *prev_sv = SvRV (coro_current); 1937 SV *prev_sv = SvRV (coro_current);
1642 1938
1643 ta->prev = SvSTATE_hv (prev_sv); 1939 ta->prev = SvSTATE_hv (prev_sv);
… …
1654static void 1950static void
1655prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1951prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1656{ 1952{
1657 for (;;) 1953 for (;;)
1658 { 1954 {
1659 SV *next_sv = coro_deq (aTHX); 1955 struct coro *next = coro_deq (aTHX);
1660 1956
1661 if (expect_true (next_sv)) 1957 if (ecb_expect_true (next))
1662 { 1958 {
1663 struct coro *next = SvSTATE_hv (next_sv);
1664
1665 /* cannot transfer to destroyed coros, skip and look for next */ 1959 /* cannot transfer to destroyed coros, skip and look for next */
1666 if (expect_false (next->flags & CF_DESTROYED)) 1960 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1667 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 */
1668 else 1962 else
1669 { 1963 {
1670 next->flags &= ~CF_READY; 1964 next->flags &= ~CF_READY;
1671 --coro_nready; 1965 --coro_nready;
1672 1966
… …
1678 { 1972 {
1679 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1680 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1681 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1682 { 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
1683 ++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 */
1684 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1685 --coro_nready; 1999 --coro_nready;
1686 } 2000 }
1687 else 2001 else
1688 { 2002 {
2003 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1689 dSP; 2004 dSP;
1690 2005
1691 ENTER; 2006 ENTER;
1692 SAVETMPS; 2007 SAVETMPS;
1693 2008
… …
1700 } 2015 }
1701 } 2016 }
1702 } 2017 }
1703} 2018}
1704 2019
1705INLINE void 2020ecb_inline void
1706prepare_cede (pTHX_ struct coro_transfer_args *ta) 2021prepare_cede (pTHX_ struct coro_transfer_args *ta)
1707{ 2022{
1708 api_ready (aTHX_ coro_current); 2023 api_ready (aTHX_ coro_current);
1709 prepare_schedule (aTHX_ ta); 2024 prepare_schedule (aTHX_ ta);
1710} 2025}
1711 2026
1712INLINE void 2027ecb_inline void
1713prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2028prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1714{ 2029{
1715 SV *prev = SvRV (coro_current); 2030 SV *prev = SvRV (coro_current);
1716 2031
1717 if (coro_nready) 2032 if (coro_nready)
… …
1747{ 2062{
1748 struct coro_transfer_args ta; 2063 struct coro_transfer_args ta;
1749 2064
1750 prepare_cede (aTHX_ &ta); 2065 prepare_cede (aTHX_ &ta);
1751 2066
1752 if (expect_true (ta.prev != ta.next)) 2067 if (ecb_expect_true (ta.prev != ta.next))
1753 { 2068 {
1754 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1755 return 1; 2070 return 1;
1756 } 2071 }
1757 else 2072 else
… …
1800 coro->slot->runops = RUNOPS_DEFAULT; 2115 coro->slot->runops = RUNOPS_DEFAULT;
1801 } 2116 }
1802} 2117}
1803 2118
1804static 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
1805coro_call_on_destroy (pTHX_ struct coro *coro) 2196coro_call_on_destroy (pTHX_ struct coro *coro)
1806{ 2197{
1807 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2198 AV *od = coro->on_destroy;
1808 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1809 2199
1810 if (on_destroyp) 2200 if (!od)
1811 { 2201 return;
1812 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1813 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
1814 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
1815 { 2214 {
1816 dSP; /* don't disturb outer sp */ 2215 dSP; /* don't disturb outer sp */
1817 SV *cb = av_pop (on_destroy);
1818
1819 PUSHMARK (SP); 2216 PUSHMARK (SP);
1820 2217
1821 if (statusp) 2218 if (coro->status)
1822 { 2219 {
1823 int i; 2220 PUTBACK;
1824 AV *status = (AV *)SvRV (*statusp); 2221 coro_push_av (aTHX_ coro->status, G_ARRAY);
1825 EXTEND (SP, AvFILLp (status) + 1); 2222 SPAGAIN;
1826
1827 for (i = 0; i <= AvFILLp (status); ++i)
1828 PUSHs (AvARRAY (status)[i]);
1829 } 2223 }
1830 2224
1831 PUTBACK; 2225 PUTBACK;
1832 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2226 call_sv (cb, G_VOID | G_DISCARD);
1833 } 2227 }
1834 } 2228 }
1835} 2229}
1836 2230
1837static void 2231static void
1838slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2232coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1839{ 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 {
1840 int i; 2247 int i;
1841 HV *hv = (HV *)SvRV (coro_current);
1842 AV *av = newAV ();
1843 2248
1844 av_extend (av, items - 1); 2249 av_extend (av, items - 1);
2250
1845 for (i = 0; i < items; ++i) 2251 for (i = 0; i < items; ++i)
1846 av_push (av, SvREFCNT_inc_NN (arg [i])); 2252 av_push (av, SvREFCNT_inc_NN (arg [i]));
2253 }
2254}
1847 2255
1848 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2256static void
1849 2257slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2258{
1850 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 */
1851 api_ready (aTHX_ sv_manager); 2260 api_ready (aTHX_ sv_manager);
1852 2261
1853 frame->prepare = prepare_schedule; 2262 frame->prepare = prepare_schedule;
1854 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;
1855} 2374}
1856 2375
1857/*****************************************************************************/ 2376/*****************************************************************************/
1858/* async pool handler */ 2377/* async pool handler */
1859 2378
… …
1890slf_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)
1891{ 2410{
1892 HV *hv = (HV *)SvRV (coro_current); 2411 HV *hv = (HV *)SvRV (coro_current);
1893 struct coro *coro = SvSTATE_hv ((SV *)hv); 2412 struct coro *coro = SvSTATE_hv ((SV *)hv);
1894 2413
1895 if (expect_true (coro->saved_deffh)) 2414 if (ecb_expect_true (coro->saved_deffh))
1896 { 2415 {
1897 /* subsequent iteration */ 2416 /* subsequent iteration */
1898 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2417 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1899 coro->saved_deffh = 0; 2418 coro->saved_deffh = 0;
1900 2419
1901 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2420 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1902 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2421 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1903 { 2422 {
1904 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2423 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1905 coro->invoke_av = newAV (); 2424 return;
1906
1907 frame->prepare = prepare_nop;
1908 } 2425 }
1909 else 2426 else
1910 { 2427 {
1911 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
1912 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);
1913 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 SvREFCNT_dec_NN (coro->swap_sv);
2434 coro->swap_sv = 0;
2435 }
2436
1914 coro->prio = 0; 2437 coro->prio = 0;
1915 2438
1916 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2439 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1917 api_trace (aTHX_ coro_current, 0); 2440 api_trace (aTHX_ coro_current, 0);
1918 2441
1919 frame->prepare = prepare_schedule; 2442 frame->prepare = prepare_schedule;
1920 av_push (av_async_pool, SvREFCNT_inc (hv)); 2443 av_push (av_async_pool, SvREFCNT_inc (hv));
1921 } 2444 }
… …
1937 2460
1938static void 2461static void
1939coro_rouse_callback (pTHX_ CV *cv) 2462coro_rouse_callback (pTHX_ CV *cv)
1940{ 2463{
1941 dXSARGS; 2464 dXSARGS;
1942 SV *data = (SV *)GENSUB_ARG; 2465 SV *data = (SV *)S_GENSUB_ARG;
1943 2466
1944 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1945 { 2468 {
1946 /* first call, set args */ 2469 /* first call, set args */
2470 SV *coro = SvRV (data);
1947 AV *av = newAV (); 2471 AV *av = newAV ();
1948 SV *coro = SvRV (data);
1949 2472
1950 SvRV_set (data, (SV *)av); 2473 SvRV_set (data, (SV *)av);
1951 api_ready (aTHX_ coro);
1952 SvREFCNT_dec (coro);
1953 2474
1954 /* better take a full copy of the arguments */ 2475 /* better take a full copy of the arguments */
1955 while (items--) 2476 while (items--)
1956 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);
1957 } 2481 }
1958 2482
1959 XSRETURN_EMPTY; 2483 XSRETURN_EMPTY;
1960} 2484}
1961 2485
1962static int 2486static int
1963slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2487slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1964{ 2488{
1965 SV *data = (SV *)frame->data; 2489 SV *data = (SV *)frame->data;
1966 2490
1967 if (CORO_THROW) 2491 if (CORO_THROW)
1968 return 0; 2492 return 0;
1969 2493
1970 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2494 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1971 return 1; 2495 return 1;
… …
1978 2502
1979 EXTEND (SP, AvFILLp (av) + 1); 2503 EXTEND (SP, AvFILLp (av) + 1);
1980 for (i = 0; i <= AvFILLp (av); ++i) 2504 for (i = 0; i <= AvFILLp (av); ++i)
1981 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2505 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1982 2506
1983 /* 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 */
1984 AvFILLp (av) = -1; 2508 AvFILLp (av) = -1;
1985 av_undef (av); 2509 av_undef (av);
1986 2510
1987 PUTBACK; 2511 PUTBACK;
1988 } 2512 }
… …
2007 cb = sv_2mortal (coro->rouse_cb); 2531 cb = sv_2mortal (coro->rouse_cb);
2008 coro->rouse_cb = 0; 2532 coro->rouse_cb = 0;
2009 } 2533 }
2010 2534
2011 if (!SvROK (cb) 2535 if (!SvROK (cb)
2012 || SvTYPE (SvRV (cb)) != SVt_PVCV 2536 || SvTYPE (SvRV (cb)) != SVt_PVCV
2013 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2537 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2014 croak ("Coro::rouse_wait called with illegal callback argument,"); 2538 croak ("Coro::rouse_wait called with illegal callback argument,");
2015 2539
2016 { 2540 {
2017 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2541 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2018 SV *data = (SV *)GENSUB_ARG; 2542 SV *data = (SV *)S_GENSUB_ARG;
2019 2543
2020 frame->data = (void *)data; 2544 frame->data = (void *)data;
2021 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2545 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2022 frame->check = slf_check_rouse_wait; 2546 frame->check = slf_check_rouse_wait;
2023 } 2547 }
… …
2027coro_new_rouse_cb (pTHX) 2551coro_new_rouse_cb (pTHX)
2028{ 2552{
2029 HV *hv = (HV *)SvRV (coro_current); 2553 HV *hv = (HV *)SvRV (coro_current);
2030 struct coro *coro = SvSTATE_hv (hv); 2554 struct coro *coro = SvSTATE_hv (hv);
2031 SV *data = newRV_inc ((SV *)hv); 2555 SV *data = newRV_inc ((SV *)hv);
2032 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2556 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2033 2557
2034 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);
2035 SvREFCNT_dec (data); /* magicext increases the refcount */ 2559 SvREFCNT_dec (data); /* magicext increases the refcount */
2036 2560
2037 SvREFCNT_dec (coro->rouse_cb); 2561 SvREFCNT_dec (coro->rouse_cb);
… …
2134static void 2658static void
2135slf_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)
2136{ 2660{
2137 frame->prepare = prepare_cede_notself; 2661 frame->prepare = prepare_cede_notself;
2138 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);
2139} 2682}
2140 2683
2141/* 2684/*
2142 * these not obviously related functions are all rolled into one 2685 * these not obviously related functions are all rolled into one
2143 * 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
… …
2150 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 */
2151 2694
2152 /* 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 */
2153 /* the latter happens when a new coro has been started */ 2696 /* the latter happens when a new coro has been started */
2154 /* or when a new cctx was attached to an existing coroutine */ 2697 /* or when a new cctx was attached to an existing coroutine */
2155 if (expect_true (!slf_frame.prepare)) 2698 if (ecb_expect_true (!slf_frame.prepare))
2156 { 2699 {
2157 /* first iteration */ 2700 /* first iteration */
2158 dSP; 2701 dSP;
2159 SV **arg = PL_stack_base + TOPMARK + 1; 2702 SV **arg = PL_stack_base + TOPMARK + 1;
2160 int items = SP - arg; /* args without function object */ 2703 int items = SP - arg; /* args without function object */
… …
2201 while (slf_frame.check (aTHX_ &slf_frame)); 2744 while (slf_frame.check (aTHX_ &slf_frame));
2202 2745
2203 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 */
2204 2747
2205 /* exception handling */ 2748 /* exception handling */
2206 if (expect_false (CORO_THROW)) 2749 if (ecb_expect_false (CORO_THROW))
2207 { 2750 {
2208 SV *exception = sv_2mortal (CORO_THROW); 2751 SV *exception = sv_2mortal (CORO_THROW);
2209 2752
2210 CORO_THROW = 0; 2753 CORO_THROW = 0;
2211 sv_setsv (ERRSV, exception); 2754 sv_setsv (ERRSV, exception);
2212 croak (0); 2755 croak (0);
2213 } 2756 }
2214 2757
2215 /* return value handling - mostly like entersub */ 2758 /* return value handling - mostly like entersub */
2216 /* make sure we put something on the stack in scalar context */ 2759 /* make sure we put something on the stack in scalar context */
2217 if (GIMME_V == G_SCALAR) 2760 if (GIMME_V == G_SCALAR
2761 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2218 { 2762 {
2219 dSP; 2763 dSP;
2220 SV **bot = PL_stack_base + checkmark; 2764 SV **bot = PL_stack_base + checkmark;
2221 2765
2222 if (sp == bot) /* too few, push undef */ 2766 if (sp == bot) /* too few, push undef */
2223 bot [1] = &PL_sv_undef; 2767 bot [1] = &PL_sv_undef;
2224 else if (sp != bot + 1) /* too many, take last one */ 2768 else /* too many, take last one */
2225 bot [1] = *sp; 2769 bot [1] = *sp;
2226 2770
2227 SP = bot + 1; 2771 SP = bot + 1;
2228 2772
2229 PUTBACK; 2773 PUTBACK;
… …
2262 if (PL_op->op_flags & OPf_STACKED) 2806 if (PL_op->op_flags & OPf_STACKED)
2263 { 2807 {
2264 if (items > slf_arga) 2808 if (items > slf_arga)
2265 { 2809 {
2266 slf_arga = items; 2810 slf_arga = items;
2267 free (slf_argv); 2811 Safefree (slf_argv);
2268 slf_argv = malloc (slf_arga * sizeof (SV *)); 2812 New (0, slf_argv, slf_arga, SV *);
2269 } 2813 }
2270 2814
2271 slf_argc = items; 2815 slf_argc = items;
2272 2816
2273 for (i = 0; i < items; ++i) 2817 for (i = 0; i < items; ++i)
… …
2278 2822
2279 PL_op->op_ppaddr = pp_slf; 2823 PL_op->op_ppaddr = pp_slf;
2280 /*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 */
2281 2825
2282 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);
2283} 2966}
2284 2967
2285/*****************************************************************************/ 2968/*****************************************************************************/
2286/* PerlIO::cede */ 2969/* PerlIO::cede */
2287 2970
… …
2289{ 2972{
2290 PerlIOBuf base; 2973 PerlIOBuf base;
2291 NV next, every; 2974 NV next, every;
2292} PerlIOCede; 2975} PerlIOCede;
2293 2976
2294static IV 2977static IV ecb_cold
2295PerlIOCede_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)
2296{ 2979{
2297 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2980 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2298 2981
2299 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2982 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2300 self->next = nvtime () + self->every; 2983 self->next = nvtime () + self->every;
2301 2984
2302 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2985 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2303} 2986}
2304 2987
2305static SV * 2988static SV * ecb_cold
2306PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2989PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2307{ 2990{
2308 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2991 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2309 2992
2310 return newSVnv (self->every); 2993 return newSVnv (self->every);
… …
2361/* Coro::Semaphore & Coro::Signal */ 3044/* Coro::Semaphore & Coro::Signal */
2362 3045
2363static SV * 3046static SV *
2364coro_waitarray_new (pTHX_ int count) 3047coro_waitarray_new (pTHX_ int count)
2365{ 3048{
2366 /* 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 */
2367 AV *av = newAV (); 3050 AV *av = newAV ();
2368 SV **ary; 3051 SV **ary;
2369 3052
2370 /* unfortunately, building manually saves memory */ 3053 /* unfortunately, building manually saves memory */
2371 Newx (ary, 2, SV *); 3054 Newx (ary, 2, SV *);
… …
2417 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3100 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2418 PUTBACK; 3101 PUTBACK;
2419 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3102 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2420 } 3103 }
2421 3104
2422 SvREFCNT_dec (cb); 3105 SvREFCNT_dec_NN (cb);
2423 } 3106 }
2424} 3107}
2425 3108
2426static void 3109static void
2427coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3110coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2428{ 3111{
2429 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3112 /* call $sem->adjust (0) to possibly wake up some other waiters */
2430 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3113 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2431} 3114}
2432 3115
2433static int 3116static int
2434slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3117slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2435{ 3118{
2436 AV *av = (AV *)frame->data; 3119 AV *av = (AV *)frame->data;
2437 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;
2438 3124
2439 /* 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 */
2440 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
2441 return 0; 3131 return 0;
3132 }
2442 else if (SvIVX (count_sv) > 0) 3133 else if (SvIVX (count_sv) > 0)
2443 { 3134 {
2444 SvSTATE_current->on_destroy = 0;
2445
2446 if (acquire) 3135 if (acquire)
2447 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3136 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2448 else 3137 else
2449 coro_semaphore_adjust (aTHX_ av, 0); 3138 coro_semaphore_adjust (aTHX_ av, 0);
2450 3139
… …
2454 { 3143 {
2455 int i; 3144 int i;
2456 /* 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 */
2457 /* 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 */
2458 /* this avoids some degenerate memory usage cases */ 3147 /* this avoids some degenerate memory usage cases */
2459 3148 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2460 for (i = 1; i <= AvFILLp (av); ++i)
2461 if (AvARRAY (av)[i] == SvRV (coro_current)) 3149 if (AvARRAY (av)[i] == coro_hv)
2462 return 1; 3150 return 1;
2463 3151
2464 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3152 av_push (av, SvREFCNT_inc (coro_hv));
2465 return 1; 3153 return 1;
2466 } 3154 }
2467} 3155}
2468 3156
2469static int 3157static int
… …
2492 { 3180 {
2493 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3181 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2494 3182
2495 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3183 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2496 frame->prepare = prepare_schedule; 3184 frame->prepare = prepare_schedule;
2497
2498 /* to avoid race conditions when a woken-up coro gets terminated */ 3185 /* to avoid race conditions when a woken-up coro gets terminated */
2499 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3186 /* we arrange for a temporary on_destroy that calls adjust (0) */
2500 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3187 frame->destroy = coro_semaphore_destroy;
2501 } 3188 }
2502} 3189}
2503 3190
2504static void 3191static void
2505slf_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)
… …
2513{ 3200{
2514 if (items >= 2) 3201 if (items >= 2)
2515 { 3202 {
2516 /* callback form */ 3203 /* callback form */
2517 AV *av = (AV *)SvRV (arg [0]); 3204 AV *av = (AV *)SvRV (arg [0]);
2518 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3205 SV *cb_cv = s_get_cv_croak (arg [1]);
2519 3206
2520 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3207 av_push (av, SvREFCNT_inc_NN (cb_cv));
2521 3208
2522 if (SvIVX (AvARRAY (av)[0]) > 0) 3209 if (SvIVX (AvARRAY (av)[0]) > 0)
2523 coro_semaphore_adjust (aTHX_ av, 0); 3210 coro_semaphore_adjust (aTHX_ av, 0);
2524 3211
2525 frame->prepare = prepare_nop; 3212 frame->prepare = prepare_nop;
… …
2549 AvARRAY (av)[0] = AvARRAY (av)[1]; 3236 AvARRAY (av)[0] = AvARRAY (av)[1];
2550 AvARRAY (av)[1] = cb; 3237 AvARRAY (av)[1] = cb;
2551 3238
2552 cb = av_shift (av); 3239 cb = av_shift (av);
2553 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 {
2554 api_ready (aTHX_ cb); 3251 api_ready (aTHX_ cb);
2555 sv_setiv (cb, 0); /* signal waiter */ 3252 sv_setiv (cb, 0); /* signal waiter */
3253 }
3254
2556 SvREFCNT_dec (cb); 3255 SvREFCNT_dec_NN (cb);
2557 3256
2558 --count; 3257 --count;
2559 } 3258 }
2560} 3259}
2561 3260
… …
2569static void 3268static void
2570slf_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)
2571{ 3270{
2572 AV *av = (AV *)SvRV (arg [0]); 3271 AV *av = (AV *)SvRV (arg [0]);
2573 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
2574 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]))
2575 { 3285 {
2576 SvIVX (AvARRAY (av)[0]) = 0; 3286 SvIVX (AvARRAY (av)[0]) = 0;
2577 frame->prepare = prepare_nop; 3287 frame->prepare = prepare_nop;
2578 frame->check = slf_check_nop; 3288 frame->check = slf_check_nop;
2579 } 3289 }
2580 else 3290 else
2581 { 3291 {
2582 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3292 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2583 3293
2584 av_push (av, waiter); 3294 av_push (av, waiter);
2585 3295
2586 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 */
2587 frame->prepare = prepare_schedule; 3297 frame->prepare = prepare_schedule;
… …
2605 3315
2606static void 3316static void
2607coro_aio_callback (pTHX_ CV *cv) 3317coro_aio_callback (pTHX_ CV *cv)
2608{ 3318{
2609 dXSARGS; 3319 dXSARGS;
2610 AV *state = (AV *)GENSUB_ARG; 3320 AV *state = (AV *)S_GENSUB_ARG;
2611 SV *coro = av_pop (state); 3321 SV *coro = av_pop (state);
2612 SV *data_sv = newSV (sizeof (struct io_state)); 3322 SV *data_sv = newSV (sizeof (struct io_state));
2613 3323
2614 av_extend (state, items - 1); 3324 av_extend (state, items - 1);
2615 3325
… …
2635 } 3345 }
2636 3346
2637 av_push (state, data_sv); 3347 av_push (state, data_sv);
2638 3348
2639 api_ready (aTHX_ coro); 3349 api_ready (aTHX_ coro);
2640 SvREFCNT_dec (coro); 3350 SvREFCNT_dec_NN (coro);
2641 SvREFCNT_dec ((AV *)state); 3351 SvREFCNT_dec_NN ((AV *)state);
2642} 3352}
2643 3353
2644static int 3354static int
2645slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3355slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2646{ 3356{
… …
2651 /* it quickly returns */ 3361 /* it quickly returns */
2652 if (CORO_THROW) 3362 if (CORO_THROW)
2653 return 0; 3363 return 0;
2654 3364
2655 /* one element that is an RV? repeat! */ 3365 /* one element that is an RV? repeat! */
2656 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3366 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2657 return 1; 3367 return 1;
2658 3368
2659 /* restore status */ 3369 /* restore status */
2660 { 3370 {
2661 SV *data_sv = av_pop (state); 3371 SV *data_sv = av_pop (state);
… …
2664 errno = data->errorno; 3374 errno = data->errorno;
2665 PL_laststype = data->laststype; 3375 PL_laststype = data->laststype;
2666 PL_laststatval = data->laststatval; 3376 PL_laststatval = data->laststatval;
2667 PL_statcache = data->statcache; 3377 PL_statcache = data->statcache;
2668 3378
2669 SvREFCNT_dec (data_sv); 3379 SvREFCNT_dec_NN (data_sv);
2670 } 3380 }
2671 3381
2672 /* push result values */ 3382 /* push result values */
2673 { 3383 {
2674 dSP; 3384 dSP;
… …
2700 dSP; 3410 dSP;
2701 3411
2702 static SV *prio_cv; 3412 static SV *prio_cv;
2703 static SV *prio_sv; 3413 static SV *prio_sv;
2704 3414
2705 if (expect_false (!prio_cv)) 3415 if (ecb_expect_false (!prio_cv))
2706 { 3416 {
2707 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3417 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2708 prio_sv = newSViv (0); 3418 prio_sv = newSViv (0);
2709 } 3419 }
2710 3420
… …
2729 3439
2730 for (i = 0; i < items; ++i) 3440 for (i = 0; i < items; ++i)
2731 PUSHs (arg [i]); 3441 PUSHs (arg [i]);
2732 3442
2733 /* now push the callback closure */ 3443 /* now push the callback closure */
2734 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))));
2735 3445
2736 /* now call the AIO function - we assume our request is uncancelable */ 3446 /* now call the AIO function - we assume our request is uncancelable */
2737 PUTBACK; 3447 PUTBACK;
2738 call_sv ((SV *)req, G_VOID | G_DISCARD); 3448 call_sv ((SV *)req, G_VOID | G_DISCARD);
2739 } 3449 }
2740 3450
2741 /* 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 */
2742 frame->data = (void *)state; 3452 frame->data = (void *)state;
2743 frame->prepare = prepare_schedule; 3453 frame->prepare = prepare_schedule;
2744 frame->check = slf_check_aio_req; 3454 frame->check = slf_check_aio_req;
2745} 3455}
2746 3456
… …
2758 3468
2759#if CORO_CLONE 3469#if CORO_CLONE
2760# include "clone.c" 3470# include "clone.c"
2761#endif 3471#endif
2762 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
2763MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3598MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2764 3599
2765PROTOTYPES: DISABLE 3600PROTOTYPES: DISABLE
2766 3601
2767BOOT: 3602BOOT:
2768{ 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"
2769#ifdef USE_ITHREADS 3606#ifdef USE_ITHREADS
2770# if CORO_PTHREAD 3607# if CORO_PTHREAD
2771 coro_thx = PERL_GET_CONTEXT; 3608 coro_thx = PERL_GET_CONTEXT;
2772# endif 3609# endif
2773#endif 3610#endif
2774 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;
2775 3617
2776 cctx_current = cctx_new_empty (); 3618 cctx_current = cctx_new_empty ();
2777 3619
2778 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3620 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2779 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3621 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2780 3622
2781 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;
2782 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;
2783 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;
2784 3626
2785 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2786 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));
2787 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));
2788 3629
2789 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3630 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2790 3631
… …
2819 coroapi.prepare_nop = prepare_nop; 3660 coroapi.prepare_nop = prepare_nop;
2820 coroapi.prepare_schedule = prepare_schedule; 3661 coroapi.prepare_schedule = prepare_schedule;
2821 coroapi.prepare_cede = prepare_cede; 3662 coroapi.prepare_cede = prepare_cede;
2822 coroapi.prepare_cede_notself = prepare_cede_notself; 3663 coroapi.prepare_cede_notself = prepare_cede_notself;
2823 3664
2824 { 3665 time_init (aTHX);
2825 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2826 3666
2827 if (!svp) croak ("Time::HiRes is required");
2828 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2829
2830 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2831 }
2832
2833 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
2834} 3673}
2835 3674
2836SV * 3675SV *
2837new (char *klass, ...) 3676new (SV *klass, ...)
2838 ALIAS: 3677 ALIAS:
2839 Coro::new = 1 3678 Coro::new = 1
2840 CODE: 3679 CODE:
2841{ 3680 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2842 struct coro *coro; 3681 OUTPUT:
2843 MAGIC *mg;
2844 HV *hv;
2845 CV *cb;
2846 int i;
2847
2848 if (items > 1)
2849 {
2850 cb = coro_sv_2cv (aTHX_ ST (1));
2851
2852 if (!ix)
2853 {
2854 if (CvISXSUB (cb))
2855 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2856
2857 if (!CvROOT (cb))
2858 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2859 }
2860 }
2861
2862 Newz (0, coro, 1, struct coro);
2863 coro->args = newAV ();
2864 coro->flags = CF_NEW;
2865
2866 if (coro_first) coro_first->prev = coro;
2867 coro->next = coro_first;
2868 coro_first = coro;
2869
2870 coro->hv = hv = newHV ();
2871 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2872 mg->mg_flags |= MGf_DUP;
2873 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2874
2875 if (items > 1)
2876 {
2877 av_extend (coro->args, items - 1 + ix - 1);
2878
2879 if (ix)
2880 {
2881 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2882 cb = cv_coro_run;
2883 }
2884
2885 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2886
2887 for (i = 2; i < items; i++)
2888 av_push (coro->args, newSVsv (ST (i)));
2889 }
2890}
2891 OUTPUT:
2892 RETVAL 3682 RETVAL
2893 3683
2894void 3684void
2895transfer (...) 3685transfer (...)
2896 PROTOTYPE: $$ 3686 PROTOTYPE: $$
2897 CODE: 3687 CODE:
2898 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3688 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2899 3689
2900bool
2901_destroy (SV *coro_sv)
2902 CODE:
2903 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2904 OUTPUT:
2905 RETVAL
2906
2907void
2908_exit (int code)
2909 PROTOTYPE: $
2910 CODE:
2911 _exit (code);
2912
2913SV * 3690SV *
2914clone (Coro::State coro) 3691clone (Coro::State coro)
2915 CODE: 3692 CODE:
2916{ 3693{
2917#if CORO_CLONE 3694#if CORO_CLONE
2918 struct coro *ncoro = coro_clone (coro); 3695 struct coro *ncoro = coro_clone (aTHX_ coro);
2919 MAGIC *mg; 3696 MAGIC *mg;
2920 /* TODO: too much duplication */ 3697 /* TODO: too much duplication */
2921 ncoro->hv = newHV (); 3698 ncoro->hv = newHV ();
2922 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);
2923 mg->mg_flags |= MGf_DUP; 3700 mg->mg_flags |= MGf_DUP;
… …
2971void 3748void
2972list () 3749list ()
2973 PROTOTYPE: 3750 PROTOTYPE:
2974 PPCODE: 3751 PPCODE:
2975{ 3752{
2976 struct coro *coro; 3753 struct coro *coro;
2977 for (coro = coro_first; coro; coro = coro->next) 3754 for (coro = coro_first; coro; coro = coro->next)
2978 if (coro->hv) 3755 if (coro->hv)
2979 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3756 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2980} 3757}
2981 3758
… …
2985 eval = 1 3762 eval = 1
2986 CODE: 3763 CODE:
2987{ 3764{
2988 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3765 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2989 { 3766 {
2990 struct coro temp; 3767 struct coro *current = SvSTATE_current;
3768 struct CoroSLF slf_save;
2991 3769
2992 if (!(coro->flags & CF_RUNNING)) 3770 if (current != coro)
2993 { 3771 {
2994 PUTBACK; 3772 PUTBACK;
2995 save_perl (aTHX_ &temp); 3773 save_perl (aTHX_ current);
2996 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;
2997 } 3785 }
2998 3786
2999 {
3000 dSP;
3001 ENTER;
3002 SAVETMPS;
3003 PUTBACK;
3004 PUSHSTACK; 3787 PUSHSTACK;
3788
3005 PUSHMARK (SP); 3789 PUSHMARK (SP);
3790 PUTBACK;
3006 3791
3007 if (ix) 3792 if (ix)
3008 eval_sv (coderef, 0); 3793 eval_sv (coderef, 0);
3009 else 3794 else
3010 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3795 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3011 3796
3012 POPSTACK; 3797 POPSTACK;
3013 SPAGAIN; 3798 SPAGAIN;
3014 FREETMPS;
3015 LEAVE;
3016 PUTBACK;
3017 }
3018 3799
3019 if (!(coro->flags & CF_RUNNING)) 3800 if (current != coro)
3020 { 3801 {
3802 PUTBACK;
3803 slf_frame = slf_save;
3021 save_perl (aTHX_ coro); 3804 save_perl (aTHX_ coro);
3022 load_perl (aTHX_ &temp); 3805 load_perl (aTHX_ current);
3023 SPAGAIN; 3806 SPAGAIN;
3024 } 3807 }
3025 } 3808 }
3026} 3809}
3027 3810
… …
3030 PROTOTYPE: $ 3813 PROTOTYPE: $
3031 ALIAS: 3814 ALIAS:
3032 is_ready = CF_READY 3815 is_ready = CF_READY
3033 is_running = CF_RUNNING 3816 is_running = CF_RUNNING
3034 is_new = CF_NEW 3817 is_new = CF_NEW
3035 is_destroyed = CF_DESTROYED 3818 is_destroyed = CF_ZOMBIE
3819 is_zombie = CF_ZOMBIE
3820 is_suspended = CF_SUSPENDED
3036 CODE: 3821 CODE:
3037 RETVAL = boolSV (coro->flags & ix); 3822 RETVAL = boolSV (coro->flags & ix);
3038 OUTPUT: 3823 OUTPUT:
3039 RETVAL 3824 RETVAL
3040 3825
3041void 3826void
3042throw (Coro::State self, SV *throw = &PL_sv_undef) 3827throw (SV *self, SV *exception = &PL_sv_undef)
3043 PROTOTYPE: $;$ 3828 PROTOTYPE: $;$
3044 CODE: 3829 CODE:
3045{ 3830{
3831 struct coro *coro = SvSTATE (self);
3046 struct coro *current = SvSTATE_current; 3832 struct coro *current = SvSTATE_current;
3047 SV **throwp = self == current ? &CORO_THROW : &self->except; 3833 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3048 SvREFCNT_dec (*throwp); 3834 SvREFCNT_dec (*exceptionp);
3049 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3835 SvGETMAGIC (exception);
3836 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3837
3838 api_ready (aTHX_ self);
3050} 3839}
3051 3840
3052void 3841void
3053api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3842api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3054 PROTOTYPE: $;$ 3843 PROTOTYPE: $;$
… …
3105 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3894 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3106 3895
3107 SV *tmp = *src; *src = *dst; *dst = tmp; 3896 SV *tmp = *src; *src = *dst; *dst = tmp;
3108 } 3897 }
3109 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
3110 3988
3111MODULE = Coro::State PACKAGE = Coro 3989MODULE = Coro::State PACKAGE = Coro
3112 3990
3113BOOT: 3991BOOT:
3114{ 3992{
3115 int i; 3993 if (SVt_LAST > 32)
3994 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3116 3995
3117 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3996 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3118 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3997 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3119 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3998 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3120 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3121 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);
3122 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4000 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3123 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4001 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3124 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4002 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3125 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4003 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3126 4004
3127 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);
3128 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4006 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3129 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);
3130 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 */
3131 4009
3132 coro_stash = gv_stashpv ("Coro", TRUE); 4010 coro_stash = gv_stashpv ("Coro", TRUE);
3133 4011
3134 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4012 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3135 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4013 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3136 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4014 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3137 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4015 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3138 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4016 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3139 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4017 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3140
3141 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3142 coro_ready[i] = newAV ();
3143 4018
3144 { 4019 {
3145 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4020 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3146 4021
3147 coroapi.schedule = api_schedule; 4022 coroapi.schedule = api_schedule;
… …
3151 coroapi.ready = api_ready; 4026 coroapi.ready = api_ready;
3152 coroapi.is_ready = api_is_ready; 4027 coroapi.is_ready = api_is_ready;
3153 coroapi.nready = coro_nready; 4028 coroapi.nready = coro_nready;
3154 coroapi.current = coro_current; 4029 coroapi.current = coro_current;
3155 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
3156 /*GCoroAPI = &coroapi;*/ 4035 /*GCoroAPI = &coroapi;*/
3157 sv_setiv (sv, (IV)&coroapi); 4036 sv_setiv (sv, (IV)&coroapi);
3158 SvREADONLY_on (sv); 4037 SvREADONLY_on (sv);
3159 } 4038 }
3160} 4039}
3161 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
3162void 4066void
3163terminate (...) 4067terminate (...)
3164 CODE: 4068 CODE:
3165 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4069 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3166 4070
3167void 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
3168schedule (...) 4081schedule (...)
3169 CODE: 4082 CODE:
3170 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4083 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3171 4084
3172void 4085void
… …
3188cede_notself (...) 4101cede_notself (...)
3189 CODE: 4102 CODE:
3190 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4103 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3191 4104
3192void 4105void
3193_cancel (Coro::State self)
3194 CODE:
3195 coro_state_destroy (aTHX_ self);
3196 coro_call_on_destroy (aTHX_ self);
3197
3198void
3199_set_current (SV *current) 4106_set_current (SV *current)
3200 PROTOTYPE: $ 4107 PROTOTYPE: $
3201 CODE: 4108 CODE:
3202 SvREFCNT_dec (SvRV (coro_current)); 4109 SvREFCNT_dec_NN (SvRV (coro_current));
3203 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4110 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3204 4111
3205void 4112void
3206_set_readyhook (SV *hook) 4113_set_readyhook (SV *hook)
3207 PROTOTYPE: $ 4114 PROTOTYPE: $
3208 CODE: 4115 CODE:
3209 SvREFCNT_dec (coro_readyhook); 4116 SvREFCNT_dec (coro_readyhook);
4117 SvGETMAGIC (hook);
4118 if (SvOK (hook))
4119 {
3210 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 }
3211 4128
3212int 4129int
3213prio (Coro::State coro, int newprio = 0) 4130prio (Coro::State coro, int newprio = 0)
3214 PROTOTYPE: $;$ 4131 PROTOTYPE: $;$
3215 ALIAS: 4132 ALIAS:
… …
3221 if (items > 1) 4138 if (items > 1)
3222 { 4139 {
3223 if (ix) 4140 if (ix)
3224 newprio = coro->prio - newprio; 4141 newprio = coro->prio - newprio;
3225 4142
3226 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4143 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3227 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4144 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3228 4145
3229 coro->prio = newprio; 4146 coro->prio = newprio;
3230 } 4147 }
3231} 4148}
3232 OUTPUT: 4149 OUTPUT:
… …
3247 RETVAL = coro_nready; 4164 RETVAL = coro_nready;
3248 OUTPUT: 4165 OUTPUT:
3249 RETVAL 4166 RETVAL
3250 4167
3251void 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
3252_pool_handler (...) 4181_pool_handler (...)
3253 CODE: 4182 CODE:
3254 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4183 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3255 4184
3256void 4185void
… …
3267 for (i = 1; i < items; ++i) 4196 for (i = 1; i < items; ++i)
3268 av_push (av, SvREFCNT_inc_NN (ST (i))); 4197 av_push (av, SvREFCNT_inc_NN (ST (i)));
3269 4198
3270 if ((SV *)hv == &PL_sv_undef) 4199 if ((SV *)hv == &PL_sv_undef)
3271 { 4200 {
3272 PUSHMARK (SP); 4201 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3273 EXTEND (SP, 2);
3274 PUSHs (sv_Coro);
3275 PUSHs ((SV *)cv_pool_handler);
3276 PUTBACK;
3277 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3278 SPAGAIN;
3279
3280 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4202 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4203 SvREFCNT_dec_NN (sv);
3281 } 4204 }
3282 4205
3283 { 4206 {
3284 struct coro *coro = SvSTATE_hv (hv); 4207 struct coro *coro = SvSTATE_hv (hv);
3285 4208
… …
3292 api_ready (aTHX_ (SV *)hv); 4215 api_ready (aTHX_ (SV *)hv);
3293 4216
3294 if (GIMME_V != G_VOID) 4217 if (GIMME_V != G_VOID)
3295 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4218 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3296 else 4219 else
3297 SvREFCNT_dec (hv); 4220 SvREFCNT_dec_NN (hv);
3298} 4221}
3299 4222
3300SV * 4223SV *
3301rouse_cb () 4224rouse_cb ()
3302 PROTOTYPE: 4225 PROTOTYPE:
… …
3309rouse_wait (...) 4232rouse_wait (...)
3310 PROTOTYPE: ;$ 4233 PROTOTYPE: ;$
3311 PPCODE: 4234 PPCODE:
3312 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4235 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3313 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
3314 4262
3315MODULE = Coro::State PACKAGE = PerlIO::cede 4263MODULE = Coro::State PACKAGE = PerlIO::cede
3316 4264
3317BOOT: 4265BOOT:
3318 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4266 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3321MODULE = Coro::State PACKAGE = Coro::Semaphore 4269MODULE = Coro::State PACKAGE = Coro::Semaphore
3322 4270
3323SV * 4271SV *
3324new (SV *klass, SV *count = 0) 4272new (SV *klass, SV *count = 0)
3325 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
3326 RETVAL = sv_bless ( 4285 RETVAL = sv_bless (
3327 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4286 coro_waitarray_new (aTHX_ semcnt),
3328 GvSTASH (CvGV (cv)) 4287 GvSTASH (CvGV (cv))
3329 ); 4288 );
4289}
3330 OUTPUT: 4290 OUTPUT:
3331 RETVAL 4291 RETVAL
3332 4292
3333# helper for Coro::Channel 4293# helper for Coro::Channel and others
3334SV * 4294SV *
3335_alloc (int count) 4295_alloc (int count)
3336 CODE: 4296 CODE:
3337 RETVAL = coro_waitarray_new (aTHX_ count); 4297 RETVAL = coro_waitarray_new (aTHX_ count);
3338 OUTPUT: 4298 OUTPUT:
… …
3344 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4304 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3345 OUTPUT: 4305 OUTPUT:
3346 RETVAL 4306 RETVAL
3347 4307
3348void 4308void
3349up (SV *self, int adjust = 1) 4309up (SV *self)
3350 ALIAS:
3351 adjust = 1
3352 CODE: 4310 CODE:
4311 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4312
4313void
4314adjust (SV *self, int adjust)
4315 CODE:
3353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4316 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3354 4317
3355void 4318void
3356down (...) 4319down (...)
3357 CODE: 4320 CODE:
3358 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4321 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3380 XSRETURN_NO; 4343 XSRETURN_NO;
3381} 4344}
3382 4345
3383void 4346void
3384waiters (SV *self) 4347waiters (SV *self)
3385 PPCODE: 4348 PPCODE:
3386{ 4349{
3387 AV *av = (AV *)SvRV (self); 4350 AV *av = (AV *)SvRV (self);
3388 int wcount = AvFILLp (av) + 1 - 1; 4351 int wcount = AvFILLp (av) + 1 - 1;
3389 4352
3390 if (GIMME_V == G_SCALAR) 4353 if (GIMME_V == G_SCALAR)
… …
3396 for (i = 1; i <= wcount; ++i) 4359 for (i = 1; i <= wcount; ++i)
3397 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4360 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3398 } 4361 }
3399} 4362}
3400 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
3401MODULE = Coro::State PACKAGE = Coro::Signal 4380MODULE = Coro::State PACKAGE = Coro::Signal
3402 4381
3403SV * 4382SV *
3404new (SV *klass) 4383new (SV *klass)
3405 CODE: 4384 CODE:
… …
3417 4396
3418void 4397void
3419broadcast (SV *self) 4398broadcast (SV *self)
3420 CODE: 4399 CODE:
3421{ 4400{
3422 AV *av = (AV *)SvRV (self); 4401 AV *av = (AV *)SvRV (self);
3423 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4402 coro_signal_wake (aTHX_ av, AvFILLp (av));
3424} 4403}
3425 4404
3426void 4405void
3427send (SV *self) 4406send (SV *self)
… …
3435 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4414 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3436} 4415}
3437 4416
3438IV 4417IV
3439awaited (SV *self) 4418awaited (SV *self)
3440 CODE: 4419 CODE:
3441 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4420 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3442 OUTPUT: 4421 OUTPUT:
3443 RETVAL 4422 RETVAL
3444 4423
3445 4424
… …
3450 4429
3451void 4430void
3452_schedule (...) 4431_schedule (...)
3453 CODE: 4432 CODE:
3454{ 4433{
3455 static int incede; 4434 static int incede;
3456 4435
3457 api_cede_notself (aTHX); 4436 api_cede_notself (aTHX);
3458 4437
3459 ++incede; 4438 ++incede;
3460 while (coro_nready >= incede && api_cede (aTHX)) 4439 while (coro_nready >= incede && api_cede (aTHX))
… …
3476 4455
3477void 4456void
3478_register (char *target, char *proto, SV *req) 4457_register (char *target, char *proto, SV *req)
3479 CODE: 4458 CODE:
3480{ 4459{
3481 CV *req_cv = coro_sv_2cv (aTHX_ req); 4460 SV *req_cv = s_get_cv_croak (req);
3482 /* newXSproto doesn't return the CV on 5.8 */ 4461 /* newXSproto doesn't return the CV on 5.8 */
3483 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4462 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3484 sv_setpv ((SV *)slf_cv, proto); 4463 sv_setpv ((SV *)slf_cv, proto);
3485 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);
3486} 4465}
3487 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