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.331 by root, Thu Nov 27 12:00:59 2008 UTC vs.
Revision 1.460 by root, Fri Jun 17 05:28:22 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
… …
135# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
136#endif 98#endif
137 99
138#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
139 101
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 102#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
157 104
158#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
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 (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
387 { 587 {
388 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
389 589
390 while (i >= 0) 590 while (i > 0) /* special-case index 0 */
391 { 591 {
392 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
393 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
394 594
395 I32 i = AvFILLp (av); 595 if (pad)
596 {
597 I32 j = PadMAX (pad);
396 598
397 while (i >= 0) 599 while (j >= 0)
398 SvREFCNT_dec (AvARRAY (av)[i--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
399 601
400 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
401 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
402 } 605 }
403 606
607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
404 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
405 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
406 } 617 }
407} 618}
408 619
409static int 620static int
410coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
411{ 622{
412 AV *padlist; 623 PADLIST *padlist;
413 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;
414 626
415 /* casting is fun. */ 627 /* perl manages to free our internal AV and _then_ call us */
416 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 628 if (IN_DESTRUCT)
629 return 0;
630
631 while (len--)
417 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
418
419 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
420 633
421 return 0; 634 return 0;
422} 635}
423
424#define CORO_MAGIC_type_cv 26
425#define CORO_MAGIC_type_state PERL_MAGIC_ext
426 636
427static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
428 0, 0, 0, 0, 638 0, 0, 0, 0,
429 coro_cv_free 639 coro_cv_free
430}; 640};
431 641
432#define CORO_MAGIC_NN(sv, type) \
433 (expect_true (SvMAGIC (sv)->mg_type == type) \
434 ? SvMAGIC (sv) \
435 : mg_find (sv, type))
436
437#define CORO_MAGIC(sv, type) \
438 (expect_true (SvMAGIC (sv)) \
439 ? CORO_MAGIC_NN (sv, type) \
440 : 0)
441
442#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
443#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
444
445INLINE struct coro *
446SvSTATE_ (pTHX_ SV *coro)
447{
448 HV *stash;
449 MAGIC *mg;
450
451 if (SvROK (coro))
452 coro = SvRV (coro);
453
454 if (expect_false (SvTYPE (coro) != SVt_PVHV))
455 croak ("Coro::State object required");
456
457 stash = SvSTASH (coro);
458 if (expect_false (stash != coro_stash && stash != coro_state_stash))
459 {
460 /* very slow, but rare, check */
461 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
462 croak ("Coro::State object required");
463 }
464
465 mg = CORO_MAGIC_state (coro);
466 return (struct coro *)mg->mg_ptr;
467}
468
469#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
470
471/* faster than SvSTATE, but expects a coroutine hv */
472#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
473#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
474
475/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
476static void 643ecb_inline void
477get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
478{ 645{
479 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
480 AV *av; 647 size_t *lenp;
481 648
482 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
483 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
484 else 651 else
485 { 652 {
486#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
487 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
488 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
494 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
495#endif 662#endif
496 } 663 }
497} 664}
498 665
499static void 666ecb_inline void
500put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
501{ 668{
502 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
503 AV *av;
504 670
505 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
506 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);
507 681
508 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
509
510 if (expect_false (AvFILLp (av) >= AvMAX (av)))
511 av_extend (av, AvFILLp (av) + 1);
512
513 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
514} 683}
515 684
516/** 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);
517 758
518static void 759static void
519load_perl (pTHX_ Coro__State c) 760load_perl (pTHX_ Coro__State c)
520{ 761{
521 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
522 c->slot = 0; 763 c->slot = 0;
523 764
524 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
525 766
526 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
527 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
528 GvSV (PL_errgv) = slot->errsv; 769#else
529 GvSV (irsgv) = slot->irsgv;
530 GvHV (PL_hintgv) = slot->hinthv;
531
532 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
533 # include "state.h" 771 #include "state.h"
534 #undef VAR 772#endif
535 773
536 { 774 {
537 dSP; 775 dSP;
538 776
539 CV *cv; 777 CV *cv;
540 778
541 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
542 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
543 { 781 {
544 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
545 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
546 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
547 } 785 }
548 786
549 PUTBACK; 787 PUTBACK;
550 } 788 }
551 789
552 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
553 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);
554} 818}
555 819
556static void 820static void
557save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
558{ 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
559 c->except = CORO_THROW; 849 c->except = CORO_THROW;
560 c->slf_frame = slf_frame; 850 c->slf_frame = slf_frame;
561 851
562 { 852 {
563 dSP; 853 dSP;
… …
572 862
573 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
574 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
575 for (;;) 865 for (;;)
576 { 866 {
577 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
578 { 868 {
579 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
580 870
581 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))
582 { 872 {
583 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
584 874
585 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
586 { 876 {
587 EXTEND (SP, 3); 877 EXTEND (SP, 3);
588 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
589 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
590 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
593 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
594 } 884 }
595 } 885 }
596 } 886 }
597 887
598 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
599 break; 889 break;
600 890
601 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
602 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
603 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
605 895
606 PUTBACK; 896 PUTBACK;
607 } 897 }
608 898
609 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
610 /* we manually unroll here, as usually 2 slots is enough */ 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
611 if (SLOT_COUNT >= 1) CXINC;
612 if (SLOT_COUNT >= 2) CXINC;
613 if (SLOT_COUNT >= 3) CXINC;
614 { 901 {
615 int i; 902 unsigned int i;
903
616 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
617 CXINC; 905 CXINC;
618 } 906
619 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
620 909
621 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
622 911
623 { 912 {
624 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
625 914
626 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
627 slot->defsv = DEFSV; 916 save_perl_slots (slot);
628 slot->errsv = ERRSV; 917#else
629 slot->irsgv = GvSV (irsgv);
630 slot->hinthv = GvHV (PL_hintgv);
631
632 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
633 # include "state.h" 919 #include "state.h"
634 #undef VAR 920#endif
635 } 921 }
636} 922}
637 923
638/* 924/*
639 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
645# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
646#else 932#else
647static void 933static void
648coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
649{ 935{
650 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() */
651 PL_curstackinfo->si_type = PERLSI_MAIN; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
652 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
653 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
654 940
655 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
670#endif 956#endif
671 957
672 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
673 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
674 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
675 964
676 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
677 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
678 PL_savestack_max = 24; 967 PL_savestack_max = 24;
679 968
… …
707 } 996 }
708 997
709 Safefree (PL_tmps_stack); 998 Safefree (PL_tmps_stack);
710 Safefree (PL_markstack); 999 Safefree (PL_markstack);
711 Safefree (PL_scopestack); 1000 Safefree (PL_scopestack);
1001#if HAS_SCOPESTACK_NAME
1002 Safefree (PL_scopestack_name);
1003#endif
712 Safefree (PL_savestack); 1004 Safefree (PL_savestack);
713#if !PERL_VERSION_ATLEAST (5,10,0) 1005#if !PERL_VERSION_ATLEAST (5,10,0)
714 Safefree (PL_retstack); 1006 Safefree (PL_retstack);
715#endif 1007#endif
716} 1008}
… …
762#endif 1054#endif
763 1055
764/* 1056/*
765 * This overrides the default magic get method of %SIG elements. 1057 * This overrides the default magic get method of %SIG elements.
766 * 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
767 * 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),
768 * readback here. 1060 * we just provide our own readback here.
769 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
770 * not expecting this to actually change the hook. This is a potential problem
771 * when a schedule happens then, but we ignore this.
772 */ 1061 */
773static int 1062static int ecb_cold
774coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1063coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
775{ 1064{
776 const char *s = MgPV_nolen_const (mg); 1065 const char *s = MgPV_nolen_const (mg);
777 1066
778 if (*s == '_') 1067 if (*s == '_')
779 { 1068 {
780 SV **svp = 0; 1069 SV **svp = 0;
781 1070
782 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1071 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
783 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1072 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
784 1073
785 if (svp) 1074 if (svp)
786 { 1075 {
787 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);
788 return 0; 1086 return 0;
789 } 1087 }
790 } 1088 }
791 1089
792 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
793} 1091}
794 1092
795static int 1093static int ecb_cold
796coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
797{ 1095{
798 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
799 1097
800 if (*s == '_') 1098 if (*s == '_')
… …
814 } 1112 }
815 1113
816 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1114 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
817} 1115}
818 1116
819static int 1117static int ecb_cold
820coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
821{ 1119{
822 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
823 1121
824 if (*s == '_') 1122 if (*s == '_')
… …
829 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1127 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
830 1128
831 if (svp) 1129 if (svp)
832 { 1130 {
833 SV *old = *svp; 1131 SV *old = *svp;
834 *svp = newSVsv (sv); 1132 *svp = SvOK (sv) ? newSVsv (sv) : 0;
835 SvREFCNT_dec (old); 1133 SvREFCNT_dec (old);
836 return 0; 1134 return 0;
837 } 1135 }
838 } 1136 }
839 1137
… …
857slf_check_repeat (pTHX_ struct CoroSLF *frame) 1155slf_check_repeat (pTHX_ struct CoroSLF *frame)
858{ 1156{
859 return 1; 1157 return 1;
860} 1158}
861 1159
862static UNOP coro_setup_op; 1160static UNOP init_perl_op;
863 1161
864static 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 */
865coro_setup (pTHX_ struct coro *coro) 1163init_perl (pTHX_ struct coro *coro)
866{ 1164{
867 /* 1165 /*
868 * emulate part of the perl startup here. 1166 * emulate part of the perl startup here.
869 */ 1167 */
870 coro_init_stacks (aTHX); 1168 coro_init_stacks (aTHX);
… …
877 PL_comppad_name_fill = 0; 1175 PL_comppad_name_fill = 0;
878 PL_comppad_name_floor = 0; 1176 PL_comppad_name_floor = 0;
879 PL_curpm = 0; 1177 PL_curpm = 0;
880 PL_curpad = 0; 1178 PL_curpad = 0;
881 PL_localizing = 0; 1179 PL_localizing = 0;
882 PL_dirty = 0;
883 PL_restartop = 0; 1180 PL_restartop = 0;
884#if PERL_VERSION_ATLEAST (5,10,0) 1181#if PERL_VERSION_ATLEAST (5,10,0)
885 PL_parser = 0; 1182 PL_parser = 0;
886#endif 1183#endif
887 PL_hints = 0; 1184 PL_hints = 0;
888 1185
889 /* recreate the die/warn hooks */ 1186 /* recreate the die/warn hooks */
890 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1187 PL_diehook = SvREFCNT_inc (rv_diehook);
891 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1188 PL_warnhook = SvREFCNT_inc (rv_warnhook);
892 1189
893 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
894 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
895 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
896 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);
897 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
898 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
899 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
900 1200
901 { 1201 {
902 dSP; 1202 dSP;
… …
917 /* 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
918 * 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.
919 */ 1219 */
920 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 */
921 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;
922 1223
923 /* 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 */
924 coro_setup_op.op_next = PL_op; 1225 init_perl_op.op_next = PL_op;
925 coro_setup_op.op_type = OP_ENTERSUB; 1226 init_perl_op.op_type = OP_ENTERSUB;
926 coro_setup_op.op_ppaddr = pp_slf; 1227 init_perl_op.op_ppaddr = pp_slf;
927 /* 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 */
928 1229
929 PL_op = (OP *)&coro_setup_op; 1230 PL_op = (OP *)&init_perl_op;
930 1231
931 /* copy throw, in case it was set before coro_setup */ 1232 /* copy throw, in case it was set before init_perl */
932 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
933}
934 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
935static void 1244static void
936coro_destruct (pTHX_ struct coro *coro) 1245coro_unwind_stacks (pTHX)
937{ 1246{
938 if (!IN_DESTRUCT) 1247 if (!IN_DESTRUCT)
939 { 1248 {
940 /* restore all saved variables and stuff */ 1249 /* restore all saved variables and stuff */
941 LEAVE_SCOPE (0); 1250 LEAVE_SCOPE (0);
… …
949 POPSTACK_TO (PL_mainstack); 1258 POPSTACK_TO (PL_mainstack);
950 1259
951 /* unwind main stack */ 1260 /* unwind main stack */
952 dounwind (-1); 1261 dounwind (-1);
953 } 1262 }
1263}
954 1264
955 SvREFCNT_dec (GvSV (PL_defgv)); 1265static void
956 SvREFCNT_dec (GvAV (PL_defgv)); 1266destroy_perl (pTHX_ struct coro *coro)
957 SvREFCNT_dec (GvSV (PL_errgv)); 1267{
958 SvREFCNT_dec (PL_defoutgv); 1268 SV *svf [9];
959 SvREFCNT_dec (PL_rs);
960 SvREFCNT_dec (GvSV (irsgv));
961 SvREFCNT_dec (GvHV (PL_hintgv));
962 1269
963 SvREFCNT_dec (PL_diehook);
964 SvREFCNT_dec (PL_warnhook);
965 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
966 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
967 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
968 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
969 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
970 1317 SvREFCNT_dec (coro->on_enter_xs);
971 coro_destruct_stacks (aTHX); 1318 SvREFCNT_dec (coro->on_leave_xs);
1319 }
972} 1320}
973 1321
974INLINE void 1322ecb_inline void
975free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
976{ 1324{
977 if (expect_true (coro_mortal)) 1325 if (ecb_expect_true (coro_mortal))
978 { 1326 {
979 SvREFCNT_dec (coro_mortal); 1327 SvREFCNT_dec ((SV *)coro_mortal);
980 coro_mortal = 0; 1328 coro_mortal = 0;
981 } 1329 }
982} 1330}
983 1331
984static int 1332static int
… …
1038 1386
1039 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1040 { 1388 {
1041 SV **cb; 1389 SV **cb;
1042 1390
1043 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1044 { 1392 {
1045 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1046 1394
1047 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1048 { 1396 {
… …
1117 1465
1118 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 */
1119} 1467}
1120 1468
1121/* 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 */
1122static void NOINLINE 1470static void ecb_noinline
1123cctx_prepare (pTHX) 1471cctx_prepare (pTHX)
1124{ 1472{
1125 PL_top_env = &PL_start_env; 1473 PL_top_env = &PL_start_env;
1126 1474
1127 if (cctx_current->flags & CC_TRACE) 1475 if (cctx_current->flags & CC_TRACE)
… …
1138 slf_frame.prepare = slf_prepare_set_stacklevel; 1486 slf_frame.prepare = slf_prepare_set_stacklevel;
1139 slf_frame.check = slf_check_set_stacklevel; 1487 slf_frame.check = slf_check_set_stacklevel;
1140} 1488}
1141 1489
1142/* 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 */
1143INLINE void 1491ecb_inline void
1144transfer_tail (pTHX) 1492transfer_tail (pTHX)
1145{ 1493{
1146 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);
1147} 1507}
1148 1508
1149/* 1509/*
1150 * this is a _very_ stripped down perl interpreter ;) 1510 * this is a _very_ stripped down perl interpreter ;)
1151 */ 1511 */
… …
1173 /* 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 */
1174 PL_restartop = PL_op; 1534 PL_restartop = PL_op;
1175 perl_run (PL_curinterp); 1535 perl_run (PL_curinterp);
1176 /* 1536 /*
1177 * 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
1178 * 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.
1179 */ 1540 */
1180 1541
1181 /* 1542 /*
1182 * 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
1183 * 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)
1184 * 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
1185 * bootstrap-time "top" top_env, as we cannot restore the "main" 1546 * doing in that case. YMMV.
1186 * coroutine as Coro has no such concept.
1187 * This actually isn't valid with the pthread backend, but OSes requiring
1188 * that backend are too broken to do it in a standards-compliant way.
1189 */ 1547 */
1190 PL_top_env = main_top_env; 1548 perlish_exit (aTHX);
1191 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1192 } 1549 }
1193} 1550}
1194 1551
1195static coro_cctx * 1552static coro_cctx *
1196cctx_new () 1553cctx_new (void)
1197{ 1554{
1198 coro_cctx *cctx; 1555 coro_cctx *cctx;
1199 1556
1200 ++cctx_count; 1557 ++cctx_count;
1201 New (0, cctx, 1, coro_cctx); 1558 New (0, cctx, 1, coro_cctx);
… …
1207 return cctx; 1564 return cctx;
1208} 1565}
1209 1566
1210/* create a new cctx only suitable as source */ 1567/* create a new cctx only suitable as source */
1211static coro_cctx * 1568static coro_cctx *
1212cctx_new_empty () 1569cctx_new_empty (void)
1213{ 1570{
1214 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1215 1572
1216 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1217 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1218 1575
1219 return cctx; 1576 return cctx;
1220} 1577}
1221 1578
1222/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1223static coro_cctx * 1580static coro_cctx *
1224cctx_new_run () 1581cctx_new_run (void)
1225{ 1582{
1226 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1227 void *stack_start;
1228 size_t stack_size;
1229 1584
1230#if HAVE_MMAP 1585 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1231 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1232 /* mmap supposedly does allocate-on-write for us */
1233 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1234
1235 if (cctx->sptr != (void *)-1)
1236 {
1237 #if CORO_STACKGUARD
1238 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1239 #endif
1240 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1241 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1242 cctx->flags |= CC_MAPPED;
1243 } 1586 {
1244 else
1245#endif
1246 {
1247 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1248 New (0, cctx->sptr, cctx_stacksize, long);
1249
1250 if (!cctx->sptr)
1251 {
1252 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1253 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1254 }
1255
1256 stack_start = cctx->sptr;
1257 stack_size = cctx->ssize;
1258 } 1589 }
1259 1590
1260 #if CORO_USE_VALGRIND
1261 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1262 #endif
1263
1264 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);
1265 1592
1266 return cctx; 1593 return cctx;
1267} 1594}
1268 1595
1269static void 1596static void
1270cctx_destroy (coro_cctx *cctx) 1597cctx_destroy (coro_cctx *cctx)
1271{ 1598{
1272 if (!cctx) 1599 if (!cctx)
1273 return; 1600 return;
1274 1601
1275 assert (cctx != cctx_current);//D temporary 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1276 1603
1277 --cctx_count; 1604 --cctx_count;
1278 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1279 1606
1280 /* coro_transfer creates new, empty cctx's */ 1607 coro_stack_free (&cctx->stack);
1281 if (cctx->sptr)
1282 {
1283 #if CORO_USE_VALGRIND
1284 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1285 #endif
1286
1287#if HAVE_MMAP
1288 if (cctx->flags & CC_MAPPED)
1289 munmap (cctx->sptr, cctx->ssize);
1290 else
1291#endif
1292 Safefree (cctx->sptr);
1293 }
1294 1608
1295 Safefree (cctx); 1609 Safefree (cctx);
1296} 1610}
1297 1611
1298/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1299#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))
1300 1614
1301static coro_cctx * 1615static coro_cctx *
1302cctx_get (pTHX) 1616cctx_get (pTHX)
1303{ 1617{
1304 while (expect_true (cctx_first)) 1618 while (ecb_expect_true (cctx_first))
1305 { 1619 {
1306 coro_cctx *cctx = cctx_first; 1620 coro_cctx *cctx = cctx_first;
1307 cctx_first = cctx->next; 1621 cctx_first = cctx->next;
1308 --cctx_idle; 1622 --cctx_idle;
1309 1623
1310 if (expect_true (!CCTX_EXPIRED (cctx))) 1624 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1311 return cctx; 1625 return cctx;
1312 1626
1313 cctx_destroy (cctx); 1627 cctx_destroy (cctx);
1314 } 1628 }
1315 1629
… …
1317} 1631}
1318 1632
1319static void 1633static void
1320cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1321{ 1635{
1322 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));
1323 1637
1324 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1325 if (expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1326 { 1640 {
1327 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1328 cctx_first = first->next; 1642 cctx_first = first->next;
1329 --cctx_idle; 1643 --cctx_idle;
1330 1644
… …
1341static void 1655static void
1342transfer_check (pTHX_ struct coro *prev, struct coro *next) 1656transfer_check (pTHX_ struct coro *prev, struct coro *next)
1343{ 1657{
1344 /* TODO: throwing up here is considered harmful */ 1658 /* TODO: throwing up here is considered harmful */
1345 1659
1346 if (expect_true (prev != next)) 1660 if (ecb_expect_true (prev != next))
1347 { 1661 {
1348 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1662 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1349 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,");
1350 1664
1351 if (expect_false (next->flags & CF_RUNNING)) 1665 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1352 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1353
1354 if (expect_false (next->flags & CF_DESTROYED))
1355 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,");
1356 1667
1357#if !PERL_VERSION_ATLEAST (5,10,0) 1668#if !PERL_VERSION_ATLEAST (5,10,0)
1358 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1669 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1359 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,");
1360#endif 1671#endif
1361 } 1672 }
1362} 1673}
1363 1674
1364/* always use the TRANSFER macro */ 1675/* always use the TRANSFER macro */
1365static void NOINLINE /* noinline so we have a fixed stackframe */ 1676static void ecb_noinline /* noinline so we have a fixed stackframe */
1366transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1677transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1367{ 1678{
1368 dSTACKLEVEL; 1679 dSTACKLEVEL;
1369 1680
1370 /* sometimes transfer is only called to set idle_sp */ 1681 /* sometimes transfer is only called to set idle_sp */
1371 if (expect_false (!prev)) 1682 if (ecb_expect_false (!prev))
1372 { 1683 {
1373 cctx_current->idle_sp = STACKLEVEL; 1684 cctx_current->idle_sp = STACKLEVEL;
1374 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 */
1375 } 1686 }
1376 else if (expect_true (prev != next)) 1687 else if (ecb_expect_true (prev != next))
1377 { 1688 {
1378 coro_cctx *cctx_prev; 1689 coro_cctx *cctx_prev;
1379 1690
1380 if (expect_false (prev->flags & CF_NEW)) 1691 if (ecb_expect_false (prev->flags & CF_NEW))
1381 { 1692 {
1382 /* create a new empty/source context */ 1693 /* create a new empty/source context */
1383 prev->flags &= ~CF_NEW; 1694 prev->flags &= ~CF_NEW;
1384 prev->flags |= CF_RUNNING; 1695 prev->flags |= CF_RUNNING;
1385 } 1696 }
… …
1388 next->flags |= CF_RUNNING; 1699 next->flags |= CF_RUNNING;
1389 1700
1390 /* first get rid of the old state */ 1701 /* first get rid of the old state */
1391 save_perl (aTHX_ prev); 1702 save_perl (aTHX_ prev);
1392 1703
1393 if (expect_false (next->flags & CF_NEW)) 1704 if (ecb_expect_false (next->flags & CF_NEW))
1394 { 1705 {
1395 /* need to start coroutine */ 1706 /* need to start coroutine */
1396 next->flags &= ~CF_NEW; 1707 next->flags &= ~CF_NEW;
1397 /* setup coroutine call */ 1708 /* setup coroutine call */
1398 coro_setup (aTHX_ next); 1709 init_perl (aTHX_ next);
1399 } 1710 }
1400 else 1711 else
1401 load_perl (aTHX_ next); 1712 load_perl (aTHX_ next);
1402 1713
1403 assert (!prev->cctx);//D temporary
1404
1405 /* possibly untie and reuse the cctx */ 1714 /* possibly untie and reuse the cctx */
1406 if (expect_true ( 1715 if (ecb_expect_true (
1407 cctx_current->idle_sp == STACKLEVEL 1716 cctx_current->idle_sp == STACKLEVEL
1408 && !(cctx_current->flags & CC_TRACE) 1717 && !(cctx_current->flags & CC_TRACE)
1409 && !force_cctx 1718 && !force_cctx
1410 )) 1719 ))
1411 { 1720 {
1412 /* 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 */
1413 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));
1414 1723
1415 /* 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. */
1416 /* 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 */
1417 if (expect_false (CCTX_EXPIRED (cctx_current))) 1726 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1418 if (expect_true (!next->cctx)) 1727 if (ecb_expect_true (!next->cctx))
1419 next->cctx = cctx_get (aTHX); 1728 next->cctx = cctx_get (aTHX);
1420 1729
1421 cctx_put (cctx_current); 1730 cctx_put (cctx_current);
1422 } 1731 }
1423 else 1732 else
1424 prev->cctx = cctx_current; 1733 prev->cctx = cctx_current;
1425 1734
1426 ++next->usecount; 1735 ++next->usecount;
1427 1736
1428 cctx_prev = cctx_current; 1737 cctx_prev = cctx_current;
1429 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1738 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1430 1739
1431 next->cctx = 0; 1740 next->cctx = 0;
1432 1741
1433 if (expect_false (cctx_prev != cctx_current)) 1742 if (ecb_expect_false (cctx_prev != cctx_current))
1434 { 1743 {
1435 cctx_prev->top_env = PL_top_env; 1744 cctx_prev->top_env = PL_top_env;
1436 PL_top_env = cctx_current->top_env; 1745 PL_top_env = cctx_current->top_env;
1437 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1746 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1438 } 1747 }
… …
1444#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))
1445#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1754#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1446 1755
1447/** high level stuff ********************************************************/ 1756/** high level stuff ********************************************************/
1448 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 */
1449static int 1760static void
1761coro_call_on_destroy (pTHX_ struct coro *coro);
1762
1763static void
1450coro_state_destroy (pTHX_ struct coro *coro) 1764coro_state_destroy (pTHX_ struct coro *coro)
1451{ 1765{
1452 if (coro->flags & CF_DESTROYED) 1766 if (coro->flags & CF_ZOMBIE)
1453 return 0; 1767 return;
1454 1768
1455 if (coro->on_destroy)
1456 coro->on_destroy (aTHX_ coro); 1769 slf_destroy (aTHX_ coro);
1457 1770
1458 coro->flags |= CF_DESTROYED; 1771 coro->flags |= CF_ZOMBIE;
1459 1772
1460 if (coro->flags & CF_READY) 1773 if (coro->flags & CF_READY)
1461 { 1774 {
1462 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1775 /* reduce nready, as destroying a ready coro effectively unreadies it */
1463 /* alternative: look through all ready queues and remove the coro */ 1776 /* alternative: look through all ready queues and remove the coro */
1464 --coro_nready; 1777 --coro_nready;
1465 } 1778 }
1466 else 1779 else
1467 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 */
1468 1781
1469 if (coro->mainstack && coro->mainstack != main_mainstack) 1782 if (coro->next) coro->next->prev = coro->prev;
1470 { 1783 if (coro->prev) coro->prev->next = coro->next;
1471 struct coro temp; 1784 if (coro == coro_first) coro_first = coro->next;
1472 1785
1473 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1786 if (coro->mainstack
1474 1787 && coro->mainstack != main_mainstack
1475 save_perl (aTHX_ &temp); 1788 && coro->slot
1789 && !PL_dirty)
1476 load_perl (aTHX_ coro); 1790 destroy_perl (aTHX_ coro);
1477
1478 coro_destruct (aTHX_ coro);
1479
1480 load_perl (aTHX_ &temp);
1481
1482 coro->slot = 0;
1483 }
1484 1791
1485 cctx_destroy (coro->cctx); 1792 cctx_destroy (coro->cctx);
1486 SvREFCNT_dec (coro->startcv); 1793 SvREFCNT_dec (coro->startcv);
1487 SvREFCNT_dec (coro->args); 1794 SvREFCNT_dec (coro->args);
1795 SvREFCNT_dec (coro->swap_sv);
1488 SvREFCNT_dec (CORO_THROW); 1796 SvREFCNT_dec (CORO_THROW);
1489 1797
1490 if (coro->next) coro->next->prev = coro->prev; 1798 coro_call_on_destroy (aTHX_ coro);
1491 if (coro->prev) coro->prev->next = coro->next;
1492 if (coro == coro_first) coro_first = coro->next;
1493 1799
1494 return 1; 1800 /* more destruction mayhem in coro_state_free */
1495} 1801}
1496 1802
1497static int 1803static int
1498coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1804coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1499{ 1805{
1500 struct coro *coro = (struct coro *)mg->mg_ptr; 1806 struct coro *coro = (struct coro *)mg->mg_ptr;
1501 mg->mg_ptr = 0; 1807 mg->mg_ptr = 0;
1502 1808
1503 coro->hv = 0;
1504
1505 if (--coro->refcnt < 0)
1506 {
1507 coro_state_destroy (aTHX_ coro); 1809 coro_state_destroy (aTHX_ coro);
1810 SvREFCNT_dec (coro->on_destroy);
1811 SvREFCNT_dec (coro->status);
1812
1508 Safefree (coro); 1813 Safefree (coro);
1509 }
1510 1814
1511 return 0; 1815 return 0;
1512} 1816}
1513 1817
1514static int 1818static int ecb_cold
1515coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1819coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1516{ 1820{
1517 struct coro *coro = (struct coro *)mg->mg_ptr; 1821 /* called when perl clones the current process the slow way (windows process emulation) */
1518 1822 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1519 ++coro->refcnt; 1823 mg->mg_ptr = 0;
1824 mg->mg_virtual = 0;
1520 1825
1521 return 0; 1826 return 0;
1522} 1827}
1523 1828
1524static MGVTBL coro_state_vtbl = { 1829static MGVTBL coro_state_vtbl = {
… …
1547 1852
1548 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1853 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1549 TRANSFER (ta, 1); 1854 TRANSFER (ta, 1);
1550} 1855}
1551 1856
1552/*****************************************************************************/
1553/* gensub: simple closure generation utility */
1554
1555#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1556
1557/* create a closure from XS, returns a code reference */
1558/* the arg can be accessed via GENSUB_ARG from the callback */
1559/* the callback must use dXSARGS/XSRETURN */
1560static SV *
1561gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1562{
1563 CV *cv = (CV *)newSV (0);
1564
1565 sv_upgrade ((SV *)cv, SVt_PVCV);
1566
1567 CvANON_on (cv);
1568 CvISXSUB_on (cv);
1569 CvXSUB (cv) = xsub;
1570 GENSUB_ARG = arg;
1571
1572 return newRV_noinc ((SV *)cv);
1573}
1574
1575/** Coro ********************************************************************/ 1857/** Coro ********************************************************************/
1576 1858
1577INLINE void 1859ecb_inline void
1578coro_enq (pTHX_ struct coro *coro) 1860coro_enq (pTHX_ struct coro *coro)
1579{ 1861{
1580 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1862 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1581}
1582 1863
1583INLINE 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 *
1584coro_deq (pTHX) 1872coro_deq (pTHX)
1585{ 1873{
1586 int prio; 1874 int prio;
1587 1875
1588 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1876 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1589 if (AvFILLp (coro_ready [prio]) >= 0) 1877 {
1590 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 }
1591 1887
1592 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;
1593} 1906}
1594 1907
1595static int 1908static int
1596api_ready (pTHX_ SV *coro_sv) 1909api_ready (pTHX_ SV *coro_sv)
1597{ 1910{
1598 struct coro *coro;
1599 SV *sv_hook;
1600 void (*xs_hook)(void);
1601
1602 coro = SvSTATE (coro_sv); 1911 struct coro *coro = SvSTATE (coro_sv);
1603 1912
1604 if (coro->flags & CF_READY) 1913 if (coro->flags & CF_READY)
1605 return 0; 1914 return 0;
1606 1915
1607 coro->flags |= CF_READY; 1916 coro->flags |= CF_READY;
1608 1917
1609 sv_hook = coro_nready ? 0 : coro_readyhook;
1610 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1611
1612 coro_enq (aTHX_ coro); 1918 coro_enq (aTHX_ coro);
1613 ++coro_nready;
1614 1919
1615 if (sv_hook) 1920 if (!coro_nready++)
1616 { 1921 if (coroapi.readyhook)
1617 dSP; 1922 coroapi.readyhook ();
1618
1619 ENTER;
1620 SAVETMPS;
1621
1622 PUSHMARK (SP);
1623 PUTBACK;
1624 call_sv (sv_hook, G_VOID | G_DISCARD);
1625
1626 FREETMPS;
1627 LEAVE;
1628 }
1629
1630 if (xs_hook)
1631 xs_hook ();
1632 1923
1633 return 1; 1924 return 1;
1634} 1925}
1635 1926
1636static int 1927static int
… …
1638{ 1929{
1639 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1930 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1640} 1931}
1641 1932
1642/* expects to own a reference to next->hv */ 1933/* expects to own a reference to next->hv */
1643INLINE void 1934ecb_inline void
1644prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1935prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1645{ 1936{
1646 SV *prev_sv = SvRV (coro_current); 1937 SV *prev_sv = SvRV (coro_current);
1647 1938
1648 ta->prev = SvSTATE_hv (prev_sv); 1939 ta->prev = SvSTATE_hv (prev_sv);
… …
1659static void 1950static void
1660prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1951prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1661{ 1952{
1662 for (;;) 1953 for (;;)
1663 { 1954 {
1664 SV *next_sv = coro_deq (aTHX); 1955 struct coro *next = coro_deq (aTHX);
1665 1956
1666 if (expect_true (next_sv)) 1957 if (ecb_expect_true (next))
1667 { 1958 {
1668 struct coro *next = SvSTATE_hv (next_sv);
1669
1670 /* cannot transfer to destroyed coros, skip and look for next */ 1959 /* cannot transfer to destroyed coros, skip and look for next */
1671 if (expect_false (next->flags & CF_DESTROYED)) 1960 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1672 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 */
1673 else 1962 else
1674 { 1963 {
1675 next->flags &= ~CF_READY; 1964 next->flags &= ~CF_READY;
1676 --coro_nready; 1965 --coro_nready;
1677 1966
… …
1683 { 1972 {
1684 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1685 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1686 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1687 { 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
1688 ++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 */
1689 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1690 --coro_nready; 1999 --coro_nready;
1691 } 2000 }
1692 else 2001 else
1693 { 2002 {
2003 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1694 dSP; 2004 dSP;
1695 2005
1696 ENTER; 2006 ENTER;
1697 SAVETMPS; 2007 SAVETMPS;
1698 2008
… …
1705 } 2015 }
1706 } 2016 }
1707 } 2017 }
1708} 2018}
1709 2019
1710INLINE void 2020ecb_inline void
1711prepare_cede (pTHX_ struct coro_transfer_args *ta) 2021prepare_cede (pTHX_ struct coro_transfer_args *ta)
1712{ 2022{
1713 api_ready (aTHX_ coro_current); 2023 api_ready (aTHX_ coro_current);
1714 prepare_schedule (aTHX_ ta); 2024 prepare_schedule (aTHX_ ta);
1715} 2025}
1716 2026
1717INLINE void 2027ecb_inline void
1718prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2028prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1719{ 2029{
1720 SV *prev = SvRV (coro_current); 2030 SV *prev = SvRV (coro_current);
1721 2031
1722 if (coro_nready) 2032 if (coro_nready)
… …
1752{ 2062{
1753 struct coro_transfer_args ta; 2063 struct coro_transfer_args ta;
1754 2064
1755 prepare_cede (aTHX_ &ta); 2065 prepare_cede (aTHX_ &ta);
1756 2066
1757 if (expect_true (ta.prev != ta.next)) 2067 if (ecb_expect_true (ta.prev != ta.next))
1758 { 2068 {
1759 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1760 return 1; 2070 return 1;
1761 } 2071 }
1762 else 2072 else
… …
1805 coro->slot->runops = RUNOPS_DEFAULT; 2115 coro->slot->runops = RUNOPS_DEFAULT;
1806 } 2116 }
1807} 2117}
1808 2118
1809static 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
1810coro_call_on_destroy (pTHX_ struct coro *coro) 2196coro_call_on_destroy (pTHX_ struct coro *coro)
1811{ 2197{
1812 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2198 AV *od = coro->on_destroy;
1813 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1814 2199
1815 if (on_destroyp) 2200 if (!od)
1816 { 2201 return;
1817 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1818 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
1819 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
1820 { 2214 {
1821 dSP; /* don't disturb outer sp */ 2215 dSP; /* don't disturb outer sp */
1822 SV *cb = av_pop (on_destroy);
1823
1824 PUSHMARK (SP); 2216 PUSHMARK (SP);
1825 2217
1826 if (statusp) 2218 if (coro->status)
1827 { 2219 {
1828 int i; 2220 PUTBACK;
1829 AV *status = (AV *)SvRV (*statusp); 2221 coro_push_av (aTHX_ coro->status, G_ARRAY);
1830 EXTEND (SP, AvFILLp (status) + 1); 2222 SPAGAIN;
1831
1832 for (i = 0; i <= AvFILLp (status); ++i)
1833 PUSHs (AvARRAY (status)[i]);
1834 } 2223 }
1835 2224
1836 PUTBACK; 2225 PUTBACK;
1837 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2226 call_sv (cb, G_VOID | G_DISCARD);
1838 } 2227 }
1839 } 2228 }
1840} 2229}
1841 2230
1842static void 2231static void
1843slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2232coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1844{ 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 {
1845 int i; 2247 int i;
1846 HV *hv = (HV *)SvRV (coro_current);
1847 AV *av = newAV ();
1848 2248
1849 av_extend (av, items - 1); 2249 av_extend (av, items - 1);
2250
1850 for (i = 0; i < items; ++i) 2251 for (i = 0; i < items; ++i)
1851 av_push (av, SvREFCNT_inc_NN (arg [i])); 2252 av_push (av, SvREFCNT_inc_NN (arg [i]));
2253 }
2254}
1852 2255
1853 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2256static void
1854 2257slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2258{
1855 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 */
1856 api_ready (aTHX_ sv_manager); 2260 api_ready (aTHX_ sv_manager);
1857 2261
1858 frame->prepare = prepare_schedule; 2262 frame->prepare = prepare_schedule;
1859 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;
1860} 2374}
1861 2375
1862/*****************************************************************************/ 2376/*****************************************************************************/
1863/* async pool handler */ 2377/* async pool handler */
1864 2378
… …
1895slf_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)
1896{ 2410{
1897 HV *hv = (HV *)SvRV (coro_current); 2411 HV *hv = (HV *)SvRV (coro_current);
1898 struct coro *coro = SvSTATE_hv ((SV *)hv); 2412 struct coro *coro = SvSTATE_hv ((SV *)hv);
1899 2413
1900 if (expect_true (coro->saved_deffh)) 2414 if (ecb_expect_true (coro->saved_deffh))
1901 { 2415 {
1902 /* subsequent iteration */ 2416 /* subsequent iteration */
1903 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2417 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1904 coro->saved_deffh = 0; 2418 coro->saved_deffh = 0;
1905 2419
1906 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2420 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1907 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2421 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1908 { 2422 {
1909 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2423 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1910 coro->invoke_av = newAV (); 2424 return;
1911
1912 frame->prepare = prepare_nop;
1913 } 2425 }
1914 else 2426 else
1915 { 2427 {
1916 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
1917 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);
1918 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 swap_svs_leave (coro);
2434 SvREFCNT_dec_NN (coro->swap_sv);
2435 coro->swap_sv = 0;
2436 }
2437
1919 coro->prio = 0; 2438 coro->prio = 0;
1920 2439
1921 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1922 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
1923 2442
1924 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
1925 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
1926 } 2445 }
… …
1942 2461
1943static void 2462static void
1944coro_rouse_callback (pTHX_ CV *cv) 2463coro_rouse_callback (pTHX_ CV *cv)
1945{ 2464{
1946 dXSARGS; 2465 dXSARGS;
1947 SV *data = (SV *)GENSUB_ARG; 2466 SV *data = (SV *)S_GENSUB_ARG;
1948 2467
1949 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2468 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1950 { 2469 {
1951 /* first call, set args */ 2470 /* first call, set args */
2471 SV *coro = SvRV (data);
1952 AV *av = newAV (); 2472 AV *av = newAV ();
1953 SV *coro = SvRV (data);
1954 2473
1955 SvRV_set (data, (SV *)av); 2474 SvRV_set (data, (SV *)av);
1956 api_ready (aTHX_ coro);
1957 SvREFCNT_dec (coro);
1958 2475
1959 /* better take a full copy of the arguments */ 2476 /* better take a full copy of the arguments */
1960 while (items--) 2477 while (items--)
1961 av_store (av, items, newSVsv (ST (items))); 2478 av_store (av, items, newSVsv (ST (items)));
2479
2480 api_ready (aTHX_ coro);
2481 SvREFCNT_dec (coro);
1962 } 2482 }
1963 2483
1964 XSRETURN_EMPTY; 2484 XSRETURN_EMPTY;
1965} 2485}
1966 2486
1967static int 2487static int
1968slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2488slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1969{ 2489{
1970 SV *data = (SV *)frame->data; 2490 SV *data = (SV *)frame->data;
1971 2491
1972 if (CORO_THROW) 2492 if (CORO_THROW)
1973 return 0; 2493 return 0;
1974 2494
1975 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2495 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1976 return 1; 2496 return 1;
… …
1983 2503
1984 EXTEND (SP, AvFILLp (av) + 1); 2504 EXTEND (SP, AvFILLp (av) + 1);
1985 for (i = 0; i <= AvFILLp (av); ++i) 2505 for (i = 0; i <= AvFILLp (av); ++i)
1986 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2506 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1987 2507
1988 /* we have stolen the elements, so ste length to zero and free */ 2508 /* we have stolen the elements, so set length to zero and free */
1989 AvFILLp (av) = -1; 2509 AvFILLp (av) = -1;
1990 av_undef (av); 2510 av_undef (av);
1991 2511
1992 PUTBACK; 2512 PUTBACK;
1993 } 2513 }
… …
2012 cb = sv_2mortal (coro->rouse_cb); 2532 cb = sv_2mortal (coro->rouse_cb);
2013 coro->rouse_cb = 0; 2533 coro->rouse_cb = 0;
2014 } 2534 }
2015 2535
2016 if (!SvROK (cb) 2536 if (!SvROK (cb)
2017 || SvTYPE (SvRV (cb)) != SVt_PVCV 2537 || SvTYPE (SvRV (cb)) != SVt_PVCV
2018 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2538 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2019 croak ("Coro::rouse_wait called with illegal callback argument,"); 2539 croak ("Coro::rouse_wait called with illegal callback argument,");
2020 2540
2021 { 2541 {
2022 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2542 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2023 SV *data = (SV *)GENSUB_ARG; 2543 SV *data = (SV *)S_GENSUB_ARG;
2024 2544
2025 frame->data = (void *)data; 2545 frame->data = (void *)data;
2026 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2546 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2027 frame->check = slf_check_rouse_wait; 2547 frame->check = slf_check_rouse_wait;
2028 } 2548 }
… …
2032coro_new_rouse_cb (pTHX) 2552coro_new_rouse_cb (pTHX)
2033{ 2553{
2034 HV *hv = (HV *)SvRV (coro_current); 2554 HV *hv = (HV *)SvRV (coro_current);
2035 struct coro *coro = SvSTATE_hv (hv); 2555 struct coro *coro = SvSTATE_hv (hv);
2036 SV *data = newRV_inc ((SV *)hv); 2556 SV *data = newRV_inc ((SV *)hv);
2037 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2557 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2038 2558
2039 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2559 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2040 SvREFCNT_dec (data); /* magicext increases the refcount */ 2560 SvREFCNT_dec (data); /* magicext increases the refcount */
2041 2561
2042 SvREFCNT_dec (coro->rouse_cb); 2562 SvREFCNT_dec (coro->rouse_cb);
… …
2139static void 2659static void
2140slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2660slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2141{ 2661{
2142 frame->prepare = prepare_cede_notself; 2662 frame->prepare = prepare_cede_notself;
2143 frame->check = slf_check_nop; 2663 frame->check = slf_check_nop;
2664}
2665
2666/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2667static void
2668slf_destroy (pTHX_ struct coro *coro)
2669{
2670 struct CoroSLF frame = coro->slf_frame;
2671
2672 /*
2673 * The on_destroy below most likely is from an SLF call.
2674 * Since by definition the SLF call will not finish when we destroy
2675 * the coro, we will have to force-finish it here, otherwise
2676 * cleanup functions cannot call SLF functions.
2677 */
2678 coro->slf_frame.prepare = 0;
2679
2680 /* this callback is reserved for slf functions needing to do cleanup */
2681 if (frame.destroy && frame.prepare && !PL_dirty)
2682 frame.destroy (aTHX_ &frame);
2144} 2683}
2145 2684
2146/* 2685/*
2147 * these not obviously related functions are all rolled into one 2686 * these not obviously related functions are all rolled into one
2148 * function to increase chances that they all will call transfer with the same 2687 * function to increase chances that they all will call transfer with the same
… …
2155 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2694 I32 checkmark; /* mark SP to see how many elements check has pushed */
2156 2695
2157 /* set up the slf frame, unless it has already been set-up */ 2696 /* set up the slf frame, unless it has already been set-up */
2158 /* the latter happens when a new coro has been started */ 2697 /* the latter happens when a new coro has been started */
2159 /* or when a new cctx was attached to an existing coroutine */ 2698 /* or when a new cctx was attached to an existing coroutine */
2160 if (expect_true (!slf_frame.prepare)) 2699 if (ecb_expect_true (!slf_frame.prepare))
2161 { 2700 {
2162 /* first iteration */ 2701 /* first iteration */
2163 dSP; 2702 dSP;
2164 SV **arg = PL_stack_base + TOPMARK + 1; 2703 SV **arg = PL_stack_base + TOPMARK + 1;
2165 int items = SP - arg; /* args without function object */ 2704 int items = SP - arg; /* args without function object */
… …
2206 while (slf_frame.check (aTHX_ &slf_frame)); 2745 while (slf_frame.check (aTHX_ &slf_frame));
2207 2746
2208 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2747 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2209 2748
2210 /* exception handling */ 2749 /* exception handling */
2211 if (expect_false (CORO_THROW)) 2750 if (ecb_expect_false (CORO_THROW))
2212 { 2751 {
2213 SV *exception = sv_2mortal (CORO_THROW); 2752 SV *exception = sv_2mortal (CORO_THROW);
2214 2753
2215 CORO_THROW = 0; 2754 CORO_THROW = 0;
2216 sv_setsv (ERRSV, exception); 2755 sv_setsv (ERRSV, exception);
2217 croak (0); 2756 croak (0);
2218 } 2757 }
2219 2758
2220 /* return value handling - mostly like entersub */ 2759 /* return value handling - mostly like entersub */
2221 /* make sure we put something on the stack in scalar context */ 2760 /* make sure we put something on the stack in scalar context */
2222 if (GIMME_V == G_SCALAR) 2761 if (GIMME_V == G_SCALAR
2762 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2223 { 2763 {
2224 dSP; 2764 dSP;
2225 SV **bot = PL_stack_base + checkmark; 2765 SV **bot = PL_stack_base + checkmark;
2226 2766
2227 if (sp == bot) /* too few, push undef */ 2767 if (sp == bot) /* too few, push undef */
2228 bot [1] = &PL_sv_undef; 2768 bot [1] = &PL_sv_undef;
2229 else if (sp != bot + 1) /* too many, take last one */ 2769 else /* too many, take last one */
2230 bot [1] = *sp; 2770 bot [1] = *sp;
2231 2771
2232 SP = bot + 1; 2772 SP = bot + 1;
2233 2773
2234 PUTBACK; 2774 PUTBACK;
… …
2267 if (PL_op->op_flags & OPf_STACKED) 2807 if (PL_op->op_flags & OPf_STACKED)
2268 { 2808 {
2269 if (items > slf_arga) 2809 if (items > slf_arga)
2270 { 2810 {
2271 slf_arga = items; 2811 slf_arga = items;
2272 free (slf_argv); 2812 Safefree (slf_argv);
2273 slf_argv = malloc (slf_arga * sizeof (SV *)); 2813 New (0, slf_argv, slf_arga, SV *);
2274 } 2814 }
2275 2815
2276 slf_argc = items; 2816 slf_argc = items;
2277 2817
2278 for (i = 0; i < items; ++i) 2818 for (i = 0; i < items; ++i)
… …
2283 2823
2284 PL_op->op_ppaddr = pp_slf; 2824 PL_op->op_ppaddr = pp_slf;
2285 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2825 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2286 2826
2287 PL_op = (OP *)&slf_restore; 2827 PL_op = (OP *)&slf_restore;
2828}
2829
2830/*****************************************************************************/
2831/* dynamic wind */
2832
2833static void
2834on_enterleave_call (pTHX_ SV *cb)
2835{
2836 dSP;
2837
2838 PUSHSTACK;
2839
2840 PUSHMARK (SP);
2841 PUTBACK;
2842 call_sv (cb, G_VOID | G_DISCARD);
2843 SPAGAIN;
2844
2845 POPSTACK;
2846}
2847
2848static SV *
2849coro_avp_pop_and_free (pTHX_ AV **avp)
2850{
2851 AV *av = *avp;
2852 SV *res = av_pop (av);
2853
2854 if (AvFILLp (av) < 0)
2855 {
2856 *avp = 0;
2857 SvREFCNT_dec (av);
2858 }
2859
2860 return res;
2861}
2862
2863static void
2864coro_pop_on_enter (pTHX_ void *coro)
2865{
2866 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2867 SvREFCNT_dec (cb);
2868}
2869
2870static void
2871coro_pop_on_leave (pTHX_ void *coro)
2872{
2873 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2874 on_enterleave_call (aTHX_ sv_2mortal (cb));
2875}
2876
2877static void
2878enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2879{
2880 if (!hook)
2881 return;
2882
2883 if (!*avp)
2884 {
2885 *avp = newAV ();
2886 AvREAL_off (*avp);
2887 }
2888
2889 av_push (*avp, (SV *)hook);
2890 av_push (*avp, (SV *)arg);
2891}
2892
2893static void
2894enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2895{
2896 AV *av = *avp;
2897 int i;
2898
2899 if (!av)
2900 return;
2901
2902 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2903 if (AvARRAY (av)[i] == (SV *)hook)
2904 {
2905 if (execute)
2906 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2907
2908 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2909 av_pop (av);
2910 av_pop (av);
2911 break;
2912 }
2913
2914 if (AvFILLp (av) >= 0)
2915 {
2916 *avp = 0;
2917 SvREFCNT_dec_NN (av);
2918 }
2919}
2920
2921static void
2922api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2923{
2924 struct coro *coro = SvSTATE (coro_sv);
2925
2926 if (SvSTATE_current == coro)
2927 if (enter)
2928 enter (aTHX_ enter_arg);
2929
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2931 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2932}
2933
2934static void
2935api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2936{
2937 struct coro *coro = SvSTATE (coro_sv);
2938
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2940 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2941}
2942
2943static void
2944savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2945{
2946 struct coro *coro = SvSTATE_current;
2947
2948 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2949}
2950
2951static void
2952savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE_current;
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2957}
2958
2959static void
2960api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2961{
2962 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2963
2964 /* this ought to be much cheaper than malloc + a single destructor call */
2965 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2966 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2288} 2967}
2289 2968
2290/*****************************************************************************/ 2969/*****************************************************************************/
2291/* PerlIO::cede */ 2970/* PerlIO::cede */
2292 2971
… …
2294{ 2973{
2295 PerlIOBuf base; 2974 PerlIOBuf base;
2296 NV next, every; 2975 NV next, every;
2297} PerlIOCede; 2976} PerlIOCede;
2298 2977
2299static IV 2978static IV ecb_cold
2300PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2979PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2301{ 2980{
2302 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2981 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2303 2982
2304 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2983 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2305 self->next = nvtime () + self->every; 2984 self->next = nvtime () + self->every;
2306 2985
2307 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2986 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2308} 2987}
2309 2988
2310static SV * 2989static SV * ecb_cold
2311PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2990PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2312{ 2991{
2313 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2314 2993
2315 return newSVnv (self->every); 2994 return newSVnv (self->every);
… …
2366/* Coro::Semaphore & Coro::Signal */ 3045/* Coro::Semaphore & Coro::Signal */
2367 3046
2368static SV * 3047static SV *
2369coro_waitarray_new (pTHX_ int count) 3048coro_waitarray_new (pTHX_ int count)
2370{ 3049{
2371 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3050 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2372 AV *av = newAV (); 3051 AV *av = newAV ();
2373 SV **ary; 3052 SV **ary;
2374 3053
2375 /* unfortunately, building manually saves memory */ 3054 /* unfortunately, building manually saves memory */
2376 Newx (ary, 2, SV *); 3055 Newx (ary, 2, SV *);
… …
2422 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3101 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2423 PUTBACK; 3102 PUTBACK;
2424 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3103 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2425 } 3104 }
2426 3105
2427 SvREFCNT_dec (cb); 3106 SvREFCNT_dec_NN (cb);
2428 } 3107 }
2429} 3108}
2430 3109
2431static void 3110static void
2432coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3111coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2433{ 3112{
2434 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3113 /* call $sem->adjust (0) to possibly wake up some other waiters */
2435 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3114 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2436} 3115}
2437 3116
2438static int 3117static int
2439slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3118slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2440{ 3119{
2441 AV *av = (AV *)frame->data; 3120 AV *av = (AV *)frame->data;
2442 SV *count_sv = AvARRAY (av)[0]; 3121 SV *count_sv = AvARRAY (av)[0];
3122 SV *coro_hv = SvRV (coro_current);
3123
3124 frame->destroy = 0;
2443 3125
2444 /* if we are about to throw, don't actually acquire the lock, just throw */ 3126 /* if we are about to throw, don't actually acquire the lock, just throw */
2445 if (CORO_THROW) 3127 if (ecb_expect_false (CORO_THROW))
3128 {
3129 /* we still might be responsible for the semaphore, so wake up others */
3130 coro_semaphore_adjust (aTHX_ av, 0);
3131
2446 return 0; 3132 return 0;
3133 }
2447 else if (SvIVX (count_sv) > 0) 3134 else if (SvIVX (count_sv) > 0)
2448 { 3135 {
2449 SvSTATE_current->on_destroy = 0;
2450
2451 if (acquire) 3136 if (acquire)
2452 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3137 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2453 else 3138 else
2454 coro_semaphore_adjust (aTHX_ av, 0); 3139 coro_semaphore_adjust (aTHX_ av, 0);
2455 3140
… …
2459 { 3144 {
2460 int i; 3145 int i;
2461 /* if we were woken up but can't down, we look through the whole */ 3146 /* if we were woken up but can't down, we look through the whole */
2462 /* waiters list and only add us if we aren't in there already */ 3147 /* waiters list and only add us if we aren't in there already */
2463 /* this avoids some degenerate memory usage cases */ 3148 /* this avoids some degenerate memory usage cases */
2464 3149 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2465 for (i = 1; i <= AvFILLp (av); ++i)
2466 if (AvARRAY (av)[i] == SvRV (coro_current)) 3150 if (AvARRAY (av)[i] == coro_hv)
2467 return 1; 3151 return 1;
2468 3152
2469 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3153 av_push (av, SvREFCNT_inc (coro_hv));
2470 return 1; 3154 return 1;
2471 } 3155 }
2472} 3156}
2473 3157
2474static int 3158static int
… …
2497 { 3181 {
2498 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3182 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2499 3183
2500 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3184 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2501 frame->prepare = prepare_schedule; 3185 frame->prepare = prepare_schedule;
2502
2503 /* to avoid race conditions when a woken-up coro gets terminated */ 3186 /* to avoid race conditions when a woken-up coro gets terminated */
2504 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3187 /* we arrange for a temporary on_destroy that calls adjust (0) */
2505 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3188 frame->destroy = coro_semaphore_destroy;
2506 } 3189 }
2507} 3190}
2508 3191
2509static void 3192static void
2510slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3193slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2518{ 3201{
2519 if (items >= 2) 3202 if (items >= 2)
2520 { 3203 {
2521 /* callback form */ 3204 /* callback form */
2522 AV *av = (AV *)SvRV (arg [0]); 3205 AV *av = (AV *)SvRV (arg [0]);
2523 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3206 SV *cb_cv = s_get_cv_croak (arg [1]);
2524 3207
2525 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3208 av_push (av, SvREFCNT_inc_NN (cb_cv));
2526 3209
2527 if (SvIVX (AvARRAY (av)[0]) > 0) 3210 if (SvIVX (AvARRAY (av)[0]) > 0)
2528 coro_semaphore_adjust (aTHX_ av, 0); 3211 coro_semaphore_adjust (aTHX_ av, 0);
2529 3212
2530 frame->prepare = prepare_nop; 3213 frame->prepare = prepare_nop;
… …
2554 AvARRAY (av)[0] = AvARRAY (av)[1]; 3237 AvARRAY (av)[0] = AvARRAY (av)[1];
2555 AvARRAY (av)[1] = cb; 3238 AvARRAY (av)[1] = cb;
2556 3239
2557 cb = av_shift (av); 3240 cb = av_shift (av);
2558 3241
3242 if (SvTYPE (cb) == SVt_PVCV)
3243 {
3244 dSP;
3245 PUSHMARK (SP);
3246 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3247 PUTBACK;
3248 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3249 }
3250 else
3251 {
2559 api_ready (aTHX_ cb); 3252 api_ready (aTHX_ cb);
2560 sv_setiv (cb, 0); /* signal waiter */ 3253 sv_setiv (cb, 0); /* signal waiter */
3254 }
3255
2561 SvREFCNT_dec (cb); 3256 SvREFCNT_dec_NN (cb);
2562 3257
2563 --count; 3258 --count;
2564 } 3259 }
2565} 3260}
2566 3261
… …
2574static void 3269static void
2575slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3270slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2576{ 3271{
2577 AV *av = (AV *)SvRV (arg [0]); 3272 AV *av = (AV *)SvRV (arg [0]);
2578 3273
3274 if (items >= 2)
3275 {
3276 SV *cb_cv = s_get_cv_croak (arg [1]);
3277 av_push (av, SvREFCNT_inc_NN (cb_cv));
3278
2579 if (SvIVX (AvARRAY (av)[0])) 3279 if (SvIVX (AvARRAY (av)[0]))
3280 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3281
3282 frame->prepare = prepare_nop;
3283 frame->check = slf_check_nop;
3284 }
3285 else if (SvIVX (AvARRAY (av)[0]))
2580 { 3286 {
2581 SvIVX (AvARRAY (av)[0]) = 0; 3287 SvIVX (AvARRAY (av)[0]) = 0;
2582 frame->prepare = prepare_nop; 3288 frame->prepare = prepare_nop;
2583 frame->check = slf_check_nop; 3289 frame->check = slf_check_nop;
2584 } 3290 }
2585 else 3291 else
2586 { 3292 {
2587 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3293 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2588 3294
2589 av_push (av, waiter); 3295 av_push (av, waiter);
2590 3296
2591 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3297 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2592 frame->prepare = prepare_schedule; 3298 frame->prepare = prepare_schedule;
… …
2610 3316
2611static void 3317static void
2612coro_aio_callback (pTHX_ CV *cv) 3318coro_aio_callback (pTHX_ CV *cv)
2613{ 3319{
2614 dXSARGS; 3320 dXSARGS;
2615 AV *state = (AV *)GENSUB_ARG; 3321 AV *state = (AV *)S_GENSUB_ARG;
2616 SV *coro = av_pop (state); 3322 SV *coro = av_pop (state);
2617 SV *data_sv = newSV (sizeof (struct io_state)); 3323 SV *data_sv = newSV (sizeof (struct io_state));
2618 3324
2619 av_extend (state, items - 1); 3325 av_extend (state, items - 1);
2620 3326
… …
2640 } 3346 }
2641 3347
2642 av_push (state, data_sv); 3348 av_push (state, data_sv);
2643 3349
2644 api_ready (aTHX_ coro); 3350 api_ready (aTHX_ coro);
2645 SvREFCNT_dec (coro); 3351 SvREFCNT_dec_NN (coro);
2646 SvREFCNT_dec ((AV *)state); 3352 SvREFCNT_dec_NN ((AV *)state);
2647} 3353}
2648 3354
2649static int 3355static int
2650slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3356slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2651{ 3357{
… …
2656 /* it quickly returns */ 3362 /* it quickly returns */
2657 if (CORO_THROW) 3363 if (CORO_THROW)
2658 return 0; 3364 return 0;
2659 3365
2660 /* one element that is an RV? repeat! */ 3366 /* one element that is an RV? repeat! */
2661 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3367 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2662 return 1; 3368 return 1;
2663 3369
2664 /* restore status */ 3370 /* restore status */
2665 { 3371 {
2666 SV *data_sv = av_pop (state); 3372 SV *data_sv = av_pop (state);
… …
2669 errno = data->errorno; 3375 errno = data->errorno;
2670 PL_laststype = data->laststype; 3376 PL_laststype = data->laststype;
2671 PL_laststatval = data->laststatval; 3377 PL_laststatval = data->laststatval;
2672 PL_statcache = data->statcache; 3378 PL_statcache = data->statcache;
2673 3379
2674 SvREFCNT_dec (data_sv); 3380 SvREFCNT_dec_NN (data_sv);
2675 } 3381 }
2676 3382
2677 /* push result values */ 3383 /* push result values */
2678 { 3384 {
2679 dSP; 3385 dSP;
… …
2705 dSP; 3411 dSP;
2706 3412
2707 static SV *prio_cv; 3413 static SV *prio_cv;
2708 static SV *prio_sv; 3414 static SV *prio_sv;
2709 3415
2710 if (expect_false (!prio_cv)) 3416 if (ecb_expect_false (!prio_cv))
2711 { 3417 {
2712 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3418 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2713 prio_sv = newSViv (0); 3419 prio_sv = newSViv (0);
2714 } 3420 }
2715 3421
… …
2734 3440
2735 for (i = 0; i < items; ++i) 3441 for (i = 0; i < items; ++i)
2736 PUSHs (arg [i]); 3442 PUSHs (arg [i]);
2737 3443
2738 /* now push the callback closure */ 3444 /* now push the callback closure */
2739 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3445 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2740 3446
2741 /* now call the AIO function - we assume our request is uncancelable */ 3447 /* now call the AIO function - we assume our request is uncancelable */
2742 PUTBACK; 3448 PUTBACK;
2743 call_sv ((SV *)req, G_VOID | G_DISCARD); 3449 call_sv ((SV *)req, G_VOID | G_DISCARD);
2744 } 3450 }
2745 3451
2746 /* now that the requets is going, we loop toll we have a result */ 3452 /* now that the request is going, we loop till we have a result */
2747 frame->data = (void *)state; 3453 frame->data = (void *)state;
2748 frame->prepare = prepare_schedule; 3454 frame->prepare = prepare_schedule;
2749 frame->check = slf_check_aio_req; 3455 frame->check = slf_check_aio_req;
2750} 3456}
2751 3457
… …
2763 3469
2764#if CORO_CLONE 3470#if CORO_CLONE
2765# include "clone.c" 3471# include "clone.c"
2766#endif 3472#endif
2767 3473
3474/*****************************************************************************/
3475
3476static SV *
3477coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3478{
3479 SV *coro_sv;
3480 struct coro *coro;
3481 MAGIC *mg;
3482 HV *hv;
3483 SV *cb;
3484 int i;
3485
3486 if (argc > 0)
3487 {
3488 cb = s_get_cv_croak (argv [0]);
3489
3490 if (!is_coro)
3491 {
3492 if (CvISXSUB (cb))
3493 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3494
3495 if (!CvROOT (cb))
3496 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3497 }
3498 }
3499
3500 Newz (0, coro, 1, struct coro);
3501 coro->args = newAV ();
3502 coro->flags = CF_NEW;
3503
3504 if (coro_first) coro_first->prev = coro;
3505 coro->next = coro_first;
3506 coro_first = coro;
3507
3508 coro->hv = hv = newHV ();
3509 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3510 mg->mg_flags |= MGf_DUP;
3511 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3512
3513 if (argc > 0)
3514 {
3515 av_extend (coro->args, argc + is_coro - 1);
3516
3517 if (is_coro)
3518 {
3519 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3520 cb = (SV *)cv_coro_run;
3521 }
3522
3523 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3524
3525 for (i = 1; i < argc; i++)
3526 av_push (coro->args, newSVsv (argv [i]));
3527 }
3528
3529 return coro_sv;
3530}
3531
3532#ifndef __cplusplus
3533ecb_cold XS(boot_Coro__State);
3534#endif
3535
3536#if CORO_JIT
3537
3538static void ecb_noinline ecb_cold
3539pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3540{
3541 dSP;
3542 AV *av = newAV ();
3543
3544 av_store (av, 3, newSVuv (d));
3545 av_store (av, 2, newSVuv (c));
3546 av_store (av, 1, newSVuv (b));
3547 av_store (av, 0, newSVuv (a));
3548
3549 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3550
3551 PUTBACK;
3552}
3553
3554static void ecb_noinline ecb_cold
3555jit_init (pTHX)
3556{
3557 dSP;
3558 SV *load, *save;
3559 char *map_base;
3560 char *load_ptr, *save_ptr;
3561 STRLEN load_len, save_len, map_len;
3562 int count;
3563
3564 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3565
3566 PUSHMARK (SP);
3567 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3568 #include "state.h"
3569 count = call_pv ("Coro::State::_jit", G_ARRAY);
3570 SPAGAIN;
3571
3572 save = POPs; save_ptr = SvPVbyte (save, save_len);
3573 load = POPs; load_ptr = SvPVbyte (load, load_len);
3574
3575 map_len = load_len + save_len + 16;
3576
3577 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3578
3579 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3580
3581 load_perl_slots = (load_save_perl_slots_type)map_base;
3582 memcpy (map_base, load_ptr, load_len);
3583
3584 map_base += (load_len + 15) & ~15;
3585
3586 save_perl_slots = (load_save_perl_slots_type)map_base;
3587 memcpy (map_base, save_ptr, save_len);
3588
3589 /* we are good citizens and try to make the page read-only, so the evil evil */
3590 /* hackers might have it a bit more difficult */
3591 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3592
3593 PUTBACK;
3594 eval_pv ("undef &Coro::State::_jit", 1);
3595}
3596
3597#endif
3598
2768MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3599MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2769 3600
2770PROTOTYPES: DISABLE 3601PROTOTYPES: DISABLE
2771 3602
2772BOOT: 3603BOOT:
2773{ 3604{
3605#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3606#include "state.h"
2774#ifdef USE_ITHREADS 3607#ifdef USE_ITHREADS
2775# if CORO_PTHREAD 3608# if CORO_PTHREAD
2776 coro_thx = PERL_GET_CONTEXT; 3609 coro_thx = PERL_GET_CONTEXT;
2777# endif 3610# endif
2778#endif 3611#endif
2779 BOOT_PAGESIZE; 3612 /* perl defines these to check for existance first, but why it doesn't */
3613 /* just create them one at init time is not clear to me, except for */
3614 /* programs trying to delete them, but... */
3615 /* anyway, we declare this as invalid and make sure they are initialised here */
3616 DEFSV;
3617 ERRSV;
2780 3618
2781 cctx_current = cctx_new_empty (); 3619 cctx_current = cctx_new_empty ();
2782 3620
2783 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3621 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2784 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3622 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2785 3623
2786 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3624 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2787 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3625 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2788 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3626 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2789 3627
2790 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2791 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3628 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2792 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3629 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2793 3630
2794 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3631 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2795 3632
… …
2824 coroapi.prepare_nop = prepare_nop; 3661 coroapi.prepare_nop = prepare_nop;
2825 coroapi.prepare_schedule = prepare_schedule; 3662 coroapi.prepare_schedule = prepare_schedule;
2826 coroapi.prepare_cede = prepare_cede; 3663 coroapi.prepare_cede = prepare_cede;
2827 coroapi.prepare_cede_notself = prepare_cede_notself; 3664 coroapi.prepare_cede_notself = prepare_cede_notself;
2828 3665
2829 { 3666 time_init (aTHX);
2830 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2831 3667
2832 if (!svp) croak ("Time::HiRes is required");
2833 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2834
2835 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2836 }
2837
2838 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3668 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3669#if CORO_JIT
3670 PUTBACK;
3671 jit_init (aTHX);
3672 SPAGAIN;
3673#endif
2839} 3674}
2840 3675
2841SV * 3676SV *
2842new (char *klass, ...) 3677new (SV *klass, ...)
2843 ALIAS: 3678 ALIAS:
2844 Coro::new = 1 3679 Coro::new = 1
2845 CODE: 3680 CODE:
2846{ 3681 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2847 struct coro *coro; 3682 OUTPUT:
2848 MAGIC *mg;
2849 HV *hv;
2850 CV *cb;
2851 int i;
2852
2853 if (items > 1)
2854 {
2855 cb = coro_sv_2cv (aTHX_ ST (1));
2856
2857 if (!ix)
2858 {
2859 if (CvISXSUB (cb))
2860 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2861
2862 if (!CvROOT (cb))
2863 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2864 }
2865 }
2866
2867 Newz (0, coro, 1, struct coro);
2868 coro->args = newAV ();
2869 coro->flags = CF_NEW;
2870
2871 if (coro_first) coro_first->prev = coro;
2872 coro->next = coro_first;
2873 coro_first = coro;
2874
2875 coro->hv = hv = newHV ();
2876 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2877 mg->mg_flags |= MGf_DUP;
2878 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2879
2880 if (items > 1)
2881 {
2882 av_extend (coro->args, items - 1 + ix - 1);
2883
2884 if (ix)
2885 {
2886 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2887 cb = cv_coro_run;
2888 }
2889
2890 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2891
2892 for (i = 2; i < items; i++)
2893 av_push (coro->args, newSVsv (ST (i)));
2894 }
2895}
2896 OUTPUT:
2897 RETVAL 3683 RETVAL
2898 3684
2899void 3685void
2900transfer (...) 3686transfer (...)
2901 PROTOTYPE: $$ 3687 PROTOTYPE: $$
2902 CODE: 3688 CODE:
2903 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3689 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2904 3690
2905bool
2906_destroy (SV *coro_sv)
2907 CODE:
2908 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2909 OUTPUT:
2910 RETVAL
2911
2912void
2913_exit (int code)
2914 PROTOTYPE: $
2915 CODE:
2916 _exit (code);
2917
2918SV * 3691SV *
2919clone (Coro::State coro) 3692clone (Coro::State coro)
2920 CODE: 3693 CODE:
2921{ 3694{
2922#if CORO_CLONE 3695#if CORO_CLONE
2923 struct coro *ncoro = coro_clone (coro); 3696 struct coro *ncoro = coro_clone (aTHX_ coro);
2924 MAGIC *mg; 3697 MAGIC *mg;
2925 /* TODO: too much duplication */ 3698 /* TODO: too much duplication */
2926 ncoro->hv = newHV (); 3699 ncoro->hv = newHV ();
2927 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3700 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2928 mg->mg_flags |= MGf_DUP; 3701 mg->mg_flags |= MGf_DUP;
… …
2976void 3749void
2977list () 3750list ()
2978 PROTOTYPE: 3751 PROTOTYPE:
2979 PPCODE: 3752 PPCODE:
2980{ 3753{
2981 struct coro *coro; 3754 struct coro *coro;
2982 for (coro = coro_first; coro; coro = coro->next) 3755 for (coro = coro_first; coro; coro = coro->next)
2983 if (coro->hv) 3756 if (coro->hv)
2984 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3757 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2985} 3758}
2986 3759
… …
2990 eval = 1 3763 eval = 1
2991 CODE: 3764 CODE:
2992{ 3765{
2993 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3766 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2994 { 3767 {
2995 struct coro temp; 3768 struct coro *current = SvSTATE_current;
3769 struct CoroSLF slf_save;
2996 3770
2997 if (!(coro->flags & CF_RUNNING)) 3771 if (current != coro)
2998 { 3772 {
2999 PUTBACK; 3773 PUTBACK;
3000 save_perl (aTHX_ &temp); 3774 save_perl (aTHX_ current);
3001 load_perl (aTHX_ coro); 3775 load_perl (aTHX_ coro);
3776 /* the coro is most likely in an active SLF call.
3777 * while not strictly required (the code we execute is
3778 * not allowed to call any SLF functions), it's cleaner
3779 * to reinitialise the slf_frame and restore it later.
3780 * This might one day allow us to actually do SLF calls
3781 * from code executed here.
3782 */
3783 slf_save = slf_frame;
3784 slf_frame.prepare = 0;
3785 SPAGAIN;
3002 } 3786 }
3003 3787
3004 {
3005 dSP;
3006 ENTER;
3007 SAVETMPS;
3008 PUTBACK;
3009 PUSHSTACK; 3788 PUSHSTACK;
3789
3010 PUSHMARK (SP); 3790 PUSHMARK (SP);
3791 PUTBACK;
3011 3792
3012 if (ix) 3793 if (ix)
3013 eval_sv (coderef, 0); 3794 eval_sv (coderef, 0);
3014 else 3795 else
3015 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3796 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3016 3797
3017 POPSTACK; 3798 POPSTACK;
3018 SPAGAIN; 3799 SPAGAIN;
3019 FREETMPS;
3020 LEAVE;
3021 PUTBACK;
3022 }
3023 3800
3024 if (!(coro->flags & CF_RUNNING)) 3801 if (current != coro)
3025 { 3802 {
3803 PUTBACK;
3804 slf_frame = slf_save;
3026 save_perl (aTHX_ coro); 3805 save_perl (aTHX_ coro);
3027 load_perl (aTHX_ &temp); 3806 load_perl (aTHX_ current);
3028 SPAGAIN; 3807 SPAGAIN;
3029 } 3808 }
3030 } 3809 }
3031} 3810}
3032 3811
… …
3035 PROTOTYPE: $ 3814 PROTOTYPE: $
3036 ALIAS: 3815 ALIAS:
3037 is_ready = CF_READY 3816 is_ready = CF_READY
3038 is_running = CF_RUNNING 3817 is_running = CF_RUNNING
3039 is_new = CF_NEW 3818 is_new = CF_NEW
3040 is_destroyed = CF_DESTROYED 3819 is_destroyed = CF_ZOMBIE
3820 is_zombie = CF_ZOMBIE
3821 is_suspended = CF_SUSPENDED
3041 CODE: 3822 CODE:
3042 RETVAL = boolSV (coro->flags & ix); 3823 RETVAL = boolSV (coro->flags & ix);
3043 OUTPUT: 3824 OUTPUT:
3044 RETVAL 3825 RETVAL
3045 3826
3046void 3827void
3047throw (Coro::State self, SV *throw = &PL_sv_undef) 3828throw (SV *self, SV *exception = &PL_sv_undef)
3048 PROTOTYPE: $;$ 3829 PROTOTYPE: $;$
3049 CODE: 3830 CODE:
3050{ 3831{
3832 struct coro *coro = SvSTATE (self);
3051 struct coro *current = SvSTATE_current; 3833 struct coro *current = SvSTATE_current;
3052 SV **throwp = self == current ? &CORO_THROW : &self->except; 3834 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3053 SvREFCNT_dec (*throwp); 3835 SvREFCNT_dec (*exceptionp);
3054 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3836 SvGETMAGIC (exception);
3837 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3838
3839 api_ready (aTHX_ self);
3055} 3840}
3056 3841
3057void 3842void
3058api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3843api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3059 PROTOTYPE: $;$ 3844 PROTOTYPE: $;$
… …
3110 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3895 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3111 3896
3112 SV *tmp = *src; *src = *dst; *dst = tmp; 3897 SV *tmp = *src; *src = *dst; *dst = tmp;
3113 } 3898 }
3114 3899
3900void
3901cancel (Coro::State self)
3902 CODE:
3903 coro_state_destroy (aTHX_ self);
3904
3905SV *
3906enable_times (int enabled = enable_times)
3907 CODE:
3908{
3909 RETVAL = boolSV (enable_times);
3910
3911 if (enabled != enable_times)
3912 {
3913 enable_times = enabled;
3914
3915 coro_times_update ();
3916 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3917 }
3918}
3919 OUTPUT:
3920 RETVAL
3921
3922void
3923times (Coro::State self)
3924 PPCODE:
3925{
3926 struct coro *current = SvSTATE (coro_current);
3927
3928 if (ecb_expect_false (current == self))
3929 {
3930 coro_times_update ();
3931 coro_times_add (SvSTATE (coro_current));
3932 }
3933
3934 EXTEND (SP, 2);
3935 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3936 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3937
3938 if (ecb_expect_false (current == self))
3939 coro_times_sub (SvSTATE (coro_current));
3940}
3941
3942void
3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3944 CODE:
3945{
3946 struct coro *current = SvSTATE_current;
3947 AV *swap_sv;
3948 int i;
3949
3950 sva = SvRV (sva);
3951 svb = SvRV (svb);
3952
3953 if (current == coro)
3954 SWAP_SVS_LEAVE (current);
3955
3956 if (!coro->swap_sv)
3957 coro->swap_sv = newAV ();
3958
3959 swap_sv = coro->swap_sv;
3960
3961 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3962 {
3963 SV *a = AvARRAY (swap_sv)[i ];
3964 SV *b = AvARRAY (swap_sv)[i + 1];
3965
3966 if (a == sva && b == svb)
3967 {
3968 SvREFCNT_dec_NN (a);
3969 SvREFCNT_dec_NN (b);
3970
3971 for (; i <= AvFILLp (swap_sv) - 2; i++)
3972 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3973
3974 AvFILLp (swap_sv) -= 2;
3975
3976 goto removed;
3977 }
3978 }
3979
3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3984
3985 if (current == coro)
3986 SWAP_SVS_ENTER (current);
3987}
3988
3115 3989
3116MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3117 3991
3118BOOT: 3992BOOT:
3119{ 3993{
3120 int i; 3994 if (SVt_LAST > 32)
3995 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3121 3996
3122 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3997 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3123 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3998 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3124 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3999 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3125 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3126 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4000 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3127 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3128 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4002 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3129 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4003 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3130 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4004 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3131 4005
3132 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4006 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3133 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4007 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3134 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4008 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3135 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4009 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3136 4010
3137 coro_stash = gv_stashpv ("Coro", TRUE); 4011 coro_stash = gv_stashpv ("Coro", TRUE);
3138 4012
3139 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4013 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3140 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4014 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3141 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4015 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3142 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4016 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3143 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4017 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3144 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4018 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3145
3146 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3147 coro_ready[i] = newAV ();
3148 4019
3149 { 4020 {
3150 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4021 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3151 4022
3152 coroapi.schedule = api_schedule; 4023 coroapi.schedule = api_schedule;
… …
3156 coroapi.ready = api_ready; 4027 coroapi.ready = api_ready;
3157 coroapi.is_ready = api_is_ready; 4028 coroapi.is_ready = api_is_ready;
3158 coroapi.nready = coro_nready; 4029 coroapi.nready = coro_nready;
3159 coroapi.current = coro_current; 4030 coroapi.current = coro_current;
3160 4031
4032 coroapi.enterleave_hook = api_enterleave_hook;
4033 coroapi.enterleave_unhook = api_enterleave_unhook;
4034 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4035
3161 /*GCoroAPI = &coroapi;*/ 4036 /*GCoroAPI = &coroapi;*/
3162 sv_setiv (sv, (IV)&coroapi); 4037 sv_setiv (sv, (IV)&coroapi);
3163 SvREADONLY_on (sv); 4038 SvREADONLY_on (sv);
3164 } 4039 }
3165} 4040}
3166 4041
4042SV *
4043async (...)
4044 PROTOTYPE: &@
4045 CODE:
4046 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4047 api_ready (aTHX_ RETVAL);
4048 OUTPUT:
4049 RETVAL
4050
4051void
4052_destroy (Coro::State coro)
4053 CODE:
4054 /* used by the manager thread */
4055 coro_state_destroy (aTHX_ coro);
4056
4057void
4058on_destroy (Coro::State coro, SV *cb)
4059 CODE:
4060 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4061
4062void
4063join (...)
4064 CODE:
4065 CORO_EXECUTE_SLF_XS (slf_init_join);
4066
3167void 4067void
3168terminate (...) 4068terminate (...)
3169 CODE: 4069 CODE:
3170 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4070 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3171 4071
3172void 4072void
4073cancel (...)
4074 CODE:
4075 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4076
4077int
4078safe_cancel (Coro::State self, ...)
4079 C_ARGS: aTHX_ self, &ST (1), items - 1
4080
4081void
3173schedule (...) 4082schedule (...)
3174 CODE: 4083 CODE:
3175 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4084 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3176 4085
3177void 4086void
… …
3193cede_notself (...) 4102cede_notself (...)
3194 CODE: 4103 CODE:
3195 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4104 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3196 4105
3197void 4106void
3198_cancel (Coro::State self)
3199 CODE:
3200 coro_state_destroy (aTHX_ self);
3201 coro_call_on_destroy (aTHX_ self);
3202
3203void
3204_set_current (SV *current) 4107_set_current (SV *current)
3205 PROTOTYPE: $ 4108 PROTOTYPE: $
3206 CODE: 4109 CODE:
3207 SvREFCNT_dec (SvRV (coro_current)); 4110 SvREFCNT_dec_NN (SvRV (coro_current));
3208 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4111 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3209 4112
3210void 4113void
3211_set_readyhook (SV *hook) 4114_set_readyhook (SV *hook)
3212 PROTOTYPE: $ 4115 PROTOTYPE: $
3213 CODE: 4116 CODE:
3214 SvREFCNT_dec (coro_readyhook); 4117 SvREFCNT_dec (coro_readyhook);
4118 SvGETMAGIC (hook);
4119 if (SvOK (hook))
4120 {
3215 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4121 coro_readyhook = newSVsv (hook);
4122 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4123 }
4124 else
4125 {
4126 coro_readyhook = 0;
4127 CORO_READYHOOK = 0;
4128 }
3216 4129
3217int 4130int
3218prio (Coro::State coro, int newprio = 0) 4131prio (Coro::State coro, int newprio = 0)
3219 PROTOTYPE: $;$ 4132 PROTOTYPE: $;$
3220 ALIAS: 4133 ALIAS:
… …
3226 if (items > 1) 4139 if (items > 1)
3227 { 4140 {
3228 if (ix) 4141 if (ix)
3229 newprio = coro->prio - newprio; 4142 newprio = coro->prio - newprio;
3230 4143
3231 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4144 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3232 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4145 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3233 4146
3234 coro->prio = newprio; 4147 coro->prio = newprio;
3235 } 4148 }
3236} 4149}
3237 OUTPUT: 4150 OUTPUT:
… …
3252 RETVAL = coro_nready; 4165 RETVAL = coro_nready;
3253 OUTPUT: 4166 OUTPUT:
3254 RETVAL 4167 RETVAL
3255 4168
3256void 4169void
4170suspend (Coro::State self)
4171 PROTOTYPE: $
4172 CODE:
4173 self->flags |= CF_SUSPENDED;
4174
4175void
4176resume (Coro::State self)
4177 PROTOTYPE: $
4178 CODE:
4179 self->flags &= ~CF_SUSPENDED;
4180
4181void
3257_pool_handler (...) 4182_pool_handler (...)
3258 CODE: 4183 CODE:
3259 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4184 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3260 4185
3261void 4186void
… …
3272 for (i = 1; i < items; ++i) 4197 for (i = 1; i < items; ++i)
3273 av_push (av, SvREFCNT_inc_NN (ST (i))); 4198 av_push (av, SvREFCNT_inc_NN (ST (i)));
3274 4199
3275 if ((SV *)hv == &PL_sv_undef) 4200 if ((SV *)hv == &PL_sv_undef)
3276 { 4201 {
3277 PUSHMARK (SP); 4202 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3278 EXTEND (SP, 2);
3279 PUSHs (sv_Coro);
3280 PUSHs ((SV *)cv_pool_handler);
3281 PUTBACK;
3282 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3283 SPAGAIN;
3284
3285 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4203 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4204 SvREFCNT_dec_NN (sv);
3286 } 4205 }
3287 4206
3288 { 4207 {
3289 struct coro *coro = SvSTATE_hv (hv); 4208 struct coro *coro = SvSTATE_hv (hv);
3290 4209
… …
3297 api_ready (aTHX_ (SV *)hv); 4216 api_ready (aTHX_ (SV *)hv);
3298 4217
3299 if (GIMME_V != G_VOID) 4218 if (GIMME_V != G_VOID)
3300 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4219 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3301 else 4220 else
3302 SvREFCNT_dec (hv); 4221 SvREFCNT_dec_NN (hv);
3303} 4222}
3304 4223
3305SV * 4224SV *
3306rouse_cb () 4225rouse_cb ()
3307 PROTOTYPE: 4226 PROTOTYPE:
… …
3314rouse_wait (...) 4233rouse_wait (...)
3315 PROTOTYPE: ;$ 4234 PROTOTYPE: ;$
3316 PPCODE: 4235 PPCODE:
3317 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4236 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3318 4237
4238void
4239on_enter (SV *block)
4240 ALIAS:
4241 on_leave = 1
4242 PROTOTYPE: &
4243 CODE:
4244{
4245 struct coro *coro = SvSTATE_current;
4246 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4247
4248 block = s_get_cv_croak (block);
4249
4250 if (!*avp)
4251 *avp = newAV ();
4252
4253 av_push (*avp, SvREFCNT_inc (block));
4254
4255 if (!ix)
4256 on_enterleave_call (aTHX_ block);
4257
4258 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4259 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4260 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4261}
4262
3319 4263
3320MODULE = Coro::State PACKAGE = PerlIO::cede 4264MODULE = Coro::State PACKAGE = PerlIO::cede
3321 4265
3322BOOT: 4266BOOT:
3323 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4267 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3326MODULE = Coro::State PACKAGE = Coro::Semaphore 4270MODULE = Coro::State PACKAGE = Coro::Semaphore
3327 4271
3328SV * 4272SV *
3329new (SV *klass, SV *count = 0) 4273new (SV *klass, SV *count = 0)
3330 CODE: 4274 CODE:
4275{
4276 int semcnt = 1;
4277
4278 if (count)
4279 {
4280 SvGETMAGIC (count);
4281
4282 if (SvOK (count))
4283 semcnt = SvIV (count);
4284 }
4285
3331 RETVAL = sv_bless ( 4286 RETVAL = sv_bless (
3332 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4287 coro_waitarray_new (aTHX_ semcnt),
3333 GvSTASH (CvGV (cv)) 4288 GvSTASH (CvGV (cv))
3334 ); 4289 );
4290}
3335 OUTPUT: 4291 OUTPUT:
3336 RETVAL 4292 RETVAL
3337 4293
3338# helper for Coro::Channel 4294# helper for Coro::Channel and others
3339SV * 4295SV *
3340_alloc (int count) 4296_alloc (int count)
3341 CODE: 4297 CODE:
3342 RETVAL = coro_waitarray_new (aTHX_ count); 4298 RETVAL = coro_waitarray_new (aTHX_ count);
3343 OUTPUT: 4299 OUTPUT:
… …
3349 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3350 OUTPUT: 4306 OUTPUT:
3351 RETVAL 4307 RETVAL
3352 4308
3353void 4309void
3354up (SV *self, int adjust = 1) 4310up (SV *self)
3355 ALIAS:
3356 adjust = 1
3357 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
3358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3359 4318
3360void 4319void
3361down (...) 4320down (...)
3362 CODE: 4321 CODE:
3363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4322 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3385 XSRETURN_NO; 4344 XSRETURN_NO;
3386} 4345}
3387 4346
3388void 4347void
3389waiters (SV *self) 4348waiters (SV *self)
3390 PPCODE: 4349 PPCODE:
3391{ 4350{
3392 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
3393 int wcount = AvFILLp (av) + 1 - 1; 4352 int wcount = AvFILLp (av) + 1 - 1;
3394 4353
3395 if (GIMME_V == G_SCALAR) 4354 if (GIMME_V == G_SCALAR)
… …
3401 for (i = 1; i <= wcount; ++i) 4360 for (i = 1; i <= wcount; ++i)
3402 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4361 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3403 } 4362 }
3404} 4363}
3405 4364
4365MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4366
4367void
4368_may_delete (SV *sem, int count, unsigned int extra_refs)
4369 PPCODE:
4370{
4371 AV *av = (AV *)SvRV (sem);
4372
4373 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4374 && AvFILLp (av) == 0 /* no waiters, just count */
4375 && SvIV (AvARRAY (av)[0]) == count)
4376 XSRETURN_YES;
4377
4378 XSRETURN_NO;
4379}
4380
3406MODULE = Coro::State PACKAGE = Coro::Signal 4381MODULE = Coro::State PACKAGE = Coro::Signal
3407 4382
3408SV * 4383SV *
3409new (SV *klass) 4384new (SV *klass)
3410 CODE: 4385 CODE:
… …
3422 4397
3423void 4398void
3424broadcast (SV *self) 4399broadcast (SV *self)
3425 CODE: 4400 CODE:
3426{ 4401{
3427 AV *av = (AV *)SvRV (self); 4402 AV *av = (AV *)SvRV (self);
3428 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4403 coro_signal_wake (aTHX_ av, AvFILLp (av));
3429} 4404}
3430 4405
3431void 4406void
3432send (SV *self) 4407send (SV *self)
… …
3440 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4415 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3441} 4416}
3442 4417
3443IV 4418IV
3444awaited (SV *self) 4419awaited (SV *self)
3445 CODE: 4420 CODE:
3446 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4421 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3447 OUTPUT: 4422 OUTPUT:
3448 RETVAL 4423 RETVAL
3449 4424
3450 4425
… …
3455 4430
3456void 4431void
3457_schedule (...) 4432_schedule (...)
3458 CODE: 4433 CODE:
3459{ 4434{
3460 static int incede; 4435 static int incede;
3461 4436
3462 api_cede_notself (aTHX); 4437 api_cede_notself (aTHX);
3463 4438
3464 ++incede; 4439 ++incede;
3465 while (coro_nready >= incede && api_cede (aTHX)) 4440 while (coro_nready >= incede && api_cede (aTHX))
… …
3481 4456
3482void 4457void
3483_register (char *target, char *proto, SV *req) 4458_register (char *target, char *proto, SV *req)
3484 CODE: 4459 CODE:
3485{ 4460{
3486 CV *req_cv = coro_sv_2cv (aTHX_ req); 4461 SV *req_cv = s_get_cv_croak (req);
3487 /* newXSproto doesn't return the CV on 5.8 */ 4462 /* newXSproto doesn't return the CV on 5.8 */
3488 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4463 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3489 sv_setpv ((SV *)slf_cv, proto); 4464 sv_setpv ((SV *)slf_cv, proto);
3490 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4465 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3491} 4466}
3492 4467
4468MODULE = Coro::State PACKAGE = Coro::Select
4469
4470void
4471patch_pp_sselect ()
4472 CODE:
4473 if (!coro_old_pp_sselect)
4474 {
4475 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4476 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4477 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4478 }
4479
4480void
4481unpatch_pp_sselect ()
4482 CODE:
4483 if (coro_old_pp_sselect)
4484 {
4485 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4486 coro_old_pp_sselect = 0;
4487 }
4488
4489MODULE = Coro::State PACKAGE = Coro::Util
4490
4491void
4492_exit (int code)
4493 CODE:
4494 _exit (code);
4495
4496NV
4497time ()
4498 CODE:
4499 RETVAL = nvtime (aTHX);
4500 OUTPUT:
4501 RETVAL
4502
4503NV
4504gettimeofday ()
4505 PPCODE:
4506{
4507 UV tv [2];
4508 u2time (aTHX_ tv);
4509 EXTEND (SP, 2);
4510 PUSHs (sv_2mortal (newSVuv (tv [0])));
4511 PUSHs (sv_2mortal (newSVuv (tv [1])));
4512}
4513

Diff Legend

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