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.365 by root, Mon Jul 20 16:18:30 2009 UTC vs.
Revision 1.455 by root, Sun Oct 4 13:07:55 2015 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
… …
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.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#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 83#endif
63 84
64/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
77#endif 98#endif
78 99
79#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
80 101
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 102#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
98 104
99#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
100# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 122static void (*u2time)(pTHX_ UV ret[2]);
117 123
118/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
121 128
122static U32 cctx_gen; 129static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
133 140
134static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
135static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
136static SV *rv_diehook; 143static SV *rv_diehook;
137static SV *rv_warnhook; 144static SV *rv_warnhook;
138static HV *hv_sig; /* %SIG */
139 145
140/* async_pool helper stuff */ 146/* async_pool helper stuff */
141static SV *sv_pool_rss; 147static SV *sv_pool_rss;
142static SV *sv_pool_size; 148static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 152static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 153
149/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
150static SV *sv_activity; 155static SV *sv_activity;
151 156
152/* enable processtime/realtime profiling */ 157/* enable processtime/realtime profiling */
… …
156static char times_valid; 161static char times_valid;
157 162
158static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
160 165
161enum { 166enum
167{
162 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
171typedef struct coro_cctx 177typedef struct coro_cctx
172{ 178{
173 struct coro_cctx *next; 179 struct coro_cctx *next;
174 180
175 /* the stack */ 181 /* the stack */
176 void *sptr; 182 struct coro_stack stack;
177 size_t ssize;
178 183
179 /* cpu state */ 184 /* cpu state */
180 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
181 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
182 JMPENV *top_env; 189 JMPENV *top_env;
183 coro_context cctx; 190 coro_context cctx;
184 191
185 U32 gen; 192 U32 gen;
186#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
187 int valgrind_id; 194 int valgrind_id;
188#endif 195#endif
189 unsigned char flags; 196 unsigned char flags;
190} coro_cctx; 197} coro_cctx;
191 198
192coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
193 200
194/*****************************************************************************/ 201/*****************************************************************************/
195 202
203static MGVTBL coro_state_vtbl;
204
196enum { 205enum
206{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 213};
203 214
204/* 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 */
205typedef struct 216typedef struct
206{ 217{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
213# include "state.h" 219 #include "state.h"
214#undef VAR
215} perl_slots; 220} perl_slots;
216 221
222/* how many context stack entries do we need for perl_slots */
217#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))
218 224
219/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
220struct coro { 226struct coro
227{
221 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 229 coro_cctx *cctx;
223 230
224 /* ready queue */ 231 /* ready queue */
225 struct coro *next_ready; 232 struct coro *next_ready;
… …
227 /* state data */ 234 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 236 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
231 238
232 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 243
239 /* statistics */ 244 /* statistics */
240 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
241 246
242 /* coro process data */ 247 /* coro process data */
243 int prio; 248 int prio;
244 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
245 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 */
246 253
247 /* async_pool */ 254 /* async_pool */
248 SV *saved_deffh; 255 SV *saved_deffh;
249 SV *invoke_cb; 256 SV *invoke_cb;
250 AV *invoke_av; 257 AV *invoke_av;
251 258
252 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
253 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
262
263 /* swap_sv */
264 AV *swap_sv;
255 265
256 /* times */ 266 /* times */
257 coro_ts t_cpu, t_real; 267 coro_ts t_cpu, t_real;
258 268
259 /* linked list */ 269 /* linked list */
… …
263typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
265 275
266/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
270 280
271/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
272 282
273#define CORO_PRIO_MAX 3 283#define CORO_PRIO_MAX 3
… …
279 289
280/* for Coro.pm */ 290/* for Coro.pm */
281static SV *coro_current; 291static SV *coro_current;
282static SV *coro_readyhook; 292static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
285static struct coro *coro_first; 295static struct coro *coro_first;
286#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
287 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
288/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
289 322
290static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 324static SV *coro_select_select;
292 325
293/* horrible hack, but if it works... */ 326/* horrible hack, but if it works... */
294static OP * 327static OP *
295coro_pp_sselect (aTHX) 328coro_pp_sselect (pTHX)
296{ 329{
297 dSP; 330 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 331 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 332 XPUSHs (coro_select_select);
300 PUTBACK; 333 PUTBACK;
… …
303 PL_op->op_flags |= OPf_STACKED; 336 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 337 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 338 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 339}
307 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
308/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
309 394
310static SV * 395static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
312{ 397{
313#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
314 /* 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 */
315 get_sv (name, create); 400 get_sv (name, create);
316#endif 401#endif
317 return get_sv (name, create); 402 return get_sv (name, create);
318} 403}
319 404
320static AV * 405static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
322{ 407{
323#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
324 /* 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 */
325 get_av (name, create); 410 get_av (name, create);
326#endif 411#endif
327 return get_av (name, create); 412 return get_av (name, create);
328} 413}
329 414
330static HV * 415static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
332{ 417{
333#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
334 /* 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 */
335 get_hv (name, create); 420 get_hv (name, create);
336#endif 421#endif
337 return get_hv (name, create); 422 return get_hv (name, create);
338} 423}
339 424
340INLINE void 425ecb_inline void
341coro_times_update () 426coro_times_update (void)
342{ 427{
343#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
344 struct timespec ts; 429 struct timespec ts;
345 430
346 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
358 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
360#endif 445#endif
361} 446}
362 447
363INLINE void 448ecb_inline void
364coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
365{ 450{
366 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
370 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
373} 458}
374 459
375INLINE void 460ecb_inline void
376coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
377{ 462{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
388/* magic glue */ 473/* magic glue */
389 474
390#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 477
393#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 481 : mg_find (sv, type))
397 482
398#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 486 : 0)
402 487
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 490
406INLINE struct coro * 491ecb_inline MAGIC *
407SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
408{ 493{
409 HV *stash;
410 MAGIC *mg; 494 MAGIC *mg;
411 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
412 if (SvROK (coro)) 511 if (SvROK (coro_sv))
413 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
414 513
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
416 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
417 517
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
428} 519}
429 520
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 522
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 526
436/*****************************************************************************/ 527/*****************************************************************************/
437/* padlist management and caching */ 528/* padlist management and caching */
438 529
439static AV * 530ecb_inline PADLIST *
440coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
441{ 532{
442 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
444 538
445 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. */
446 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
447#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
449#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
451#endif 568#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
453 --AvFILLp (padlist);
454 569
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
456 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;
457 578
458 return newpadlist; 579 return newpadlist;
459} 580}
460 581
461static void 582ecb_inline void
462free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
463{ 584{
464 /* may be during global destruction */ 585 /* may be during global destruction */
465 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
466 { 587 {
467 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
468 589
469 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
470 { 591 {
471 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av);
474 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
475 while (j >= 0) 599 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 601
478 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
480 } 605 }
481 606
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
483 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
484 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
486 } 617 }
487} 618}
488 619
489static int 620static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 622{
492 AV *padlist; 623 PADLIST *padlist;
493 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;
494 626
495 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
497 return 0; 629 return 0;
498 630
499 /* casting is fun. */ 631 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 633
505 return 0; 634 return 0;
506} 635}
507 636
508static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 638 0, 0, 0, 0,
510 coro_cv_free 639 coro_cv_free
511}; 640};
512 641
513/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
514static void 643ecb_inline void
515get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
516{ 645{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 647 size_t *lenp;
519 648
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 651 else
523 { 652 {
524#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 662#endif
534 } 663 }
535} 664}
536 665
537static void 666ecb_inline void
538put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
539{ 668{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 670
543 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
544 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);
545 681
546 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
547
548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1);
550
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 683}
553 684
554/** 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 (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
739#define SWAP_SVS(coro) \
740 if (ecb_expect_false ((coro)->swap_sv)) \
741 swap_svs (aTHX_ (coro))
555 742
556static void 743static void
557on_enterleave_call (pTHX_ SV *cb); 744on_enterleave_call (pTHX_ SV *cb);
558 745
559static void 746static void
… …
562 perl_slots *slot = c->slot; 749 perl_slots *slot = c->slot;
563 c->slot = 0; 750 c->slot = 0;
564 751
565 PL_mainstack = c->mainstack; 752 PL_mainstack = c->mainstack;
566 753
567 GvSV (PL_defgv) = slot->defsv; 754#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 755 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 756#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 757 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 758 #include "state.h"
575 #undef VAR 759#endif
576 760
577 { 761 {
578 dSP; 762 dSP;
579 763
580 CV *cv; 764 CV *cv;
581 765
582 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
584 { 768 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 772 }
589 773
590 PUTBACK; 774 PUTBACK;
591 } 775 }
592 776
593 slf_frame = c->slf_frame; 777 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 778 CORO_THROW = c->except;
595 779
596 if (expect_false (enable_times)) 780 if (ecb_expect_false (enable_times))
597 { 781 {
598 if (expect_false (!times_valid)) 782 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 783 coro_times_update ();
600 784
601 coro_times_sub (c); 785 coro_times_sub (c);
602 } 786 }
603 787
604 if (expect_false (c->on_enter)) 788 if (ecb_expect_false (c->on_enter))
605 { 789 {
606 int i; 790 int i;
607 791
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 794 }
795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
804 SWAP_SVS (c);
611} 805}
612 806
613static void 807static void
614save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
615{ 809{
810 SWAP_SVS (c);
811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
819
616 if (expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
617 { 821 {
618 int i; 822 int i;
619 823
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 824 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 825 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 826 }
623 827
624 times_valid = 0; 828 times_valid = 0;
625 829
626 if (expect_false (enable_times)) 830 if (ecb_expect_false (enable_times))
627 { 831 {
628 coro_times_update (); times_valid = 1; 832 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 833 coro_times_add (c);
630 } 834 }
631 835
… …
645 849
646 XPUSHs (Nullsv); 850 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 851 /* this loop was inspired by pp_caller */
648 for (;;) 852 for (;;)
649 { 853 {
650 while (expect_true (cxix >= 0)) 854 while (ecb_expect_true (cxix >= 0))
651 { 855 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 856 PERL_CONTEXT *cx = &ccstk[cxix--];
653 857
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 858 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 859 {
656 CV *cv = cx->blk_sub.cv; 860 CV *cv = cx->blk_sub.cv;
657 861
658 if (expect_true (CvDEPTH (cv))) 862 if (ecb_expect_true (CvDEPTH (cv)))
659 { 863 {
660 EXTEND (SP, 3); 864 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 865 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 866 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 867 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 870 get_padlist (aTHX_ cv);
667 } 871 }
668 } 872 }
669 } 873 }
670 874
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 875 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 876 break;
673 877
674 top_si = top_si->si_prev; 878 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 879 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 880 cxix = top_si->si_cxix;
… …
678 882
679 PUTBACK; 883 PUTBACK;
680 } 884 }
681 885
682 /* allocate some space on the context stack for our purposes */ 886 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 887 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
684 if (SLOT_COUNT >= 1) CXINC;
685 if (SLOT_COUNT >= 2) CXINC;
686 if (SLOT_COUNT >= 3) CXINC;
687 { 888 {
688 unsigned int i; 889 unsigned int i;
890
689 for (i = 3; i < SLOT_COUNT; ++i) 891 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 892 CXINC;
691 } 893
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 894 cxstack_ix -= SLOT_COUNT; /* undo allocation */
895 }
693 896
694 c->mainstack = PL_mainstack; 897 c->mainstack = PL_mainstack;
695 898
696 { 899 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 900 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 901
699 slot->defav = GvAV (PL_defgv); 902#if CORO_JIT
700 slot->defsv = DEFSV; 903 save_perl_slots (slot);
701 slot->errsv = ERRSV; 904#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 905 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 906 #include "state.h"
707 #undef VAR 907#endif
708 } 908 }
709} 909}
710 910
711/* 911/*
712 * allocate various perl stacks. This is almost an exact copy 912 * allocate various perl stacks. This is almost an exact copy
… …
718# define coro_init_stacks(thx) init_stacks () 918# define coro_init_stacks(thx) init_stacks ()
719#else 919#else
720static void 920static void
721coro_init_stacks (pTHX) 921coro_init_stacks (pTHX)
722{ 922{
723 PL_curstackinfo = new_stackinfo(32, 8); 923 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
724 PL_curstackinfo->si_type = PERLSI_MAIN; 924 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 925 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 926 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 927
728 PL_stack_base = AvARRAY(PL_curstack); 928 PL_stack_base = AvARRAY(PL_curstack);
… …
743#endif 943#endif
744 944
745 New(54,PL_scopestack,8,I32); 945 New(54,PL_scopestack,8,I32);
746 PL_scopestack_ix = 0; 946 PL_scopestack_ix = 0;
747 PL_scopestack_max = 8; 947 PL_scopestack_max = 8;
948#if HAS_SCOPESTACK_NAME
949 New(54,PL_scopestack_name,8,const char*);
950#endif
748 951
749 New(54,PL_savestack,24,ANY); 952 New(54,PL_savestack,24,ANY);
750 PL_savestack_ix = 0; 953 PL_savestack_ix = 0;
751 PL_savestack_max = 24; 954 PL_savestack_max = 24;
752 955
… …
780 } 983 }
781 984
782 Safefree (PL_tmps_stack); 985 Safefree (PL_tmps_stack);
783 Safefree (PL_markstack); 986 Safefree (PL_markstack);
784 Safefree (PL_scopestack); 987 Safefree (PL_scopestack);
988#if HAS_SCOPESTACK_NAME
989 Safefree (PL_scopestack_name);
990#endif
785 Safefree (PL_savestack); 991 Safefree (PL_savestack);
786#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
787 Safefree (PL_retstack); 993 Safefree (PL_retstack);
788#endif 994#endif
789} 995}
… …
835#endif 1041#endif
836 1042
837/* 1043/*
838 * This overrides the default magic get method of %SIG elements. 1044 * This overrides the default magic get method of %SIG elements.
839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1045 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
840 * and instead of trying to save and restore the hash elements, we just provide 1046 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 1047 * we just provide our own readback here.
842 */ 1048 */
843static int 1049static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 1051{
846 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
847 1053
848 if (*s == '_') 1054 if (*s == '_')
849 { 1055 {
850 SV **svp = 0; 1056 SV **svp = 0;
851 1057
852 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
853 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
854 1060
855 if (svp) 1061 if (svp)
856 { 1062 {
857 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1063 SV *ssv;
1064
1065 if (!*svp)
1066 ssv = &PL_sv_undef;
1067 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1068 ssv = sv_2mortal (newRV_inc (*svp));
1069 else
1070 ssv = *svp;
1071
1072 sv_setsv (sv, ssv);
858 return 0; 1073 return 0;
859 } 1074 }
860 } 1075 }
861 1076
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1077 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 1078}
864 1079
865static int 1080static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1081coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 1082{
868 const char *s = MgPV_nolen_const (mg); 1083 const char *s = MgPV_nolen_const (mg);
869 1084
870 if (*s == '_') 1085 if (*s == '_')
… …
884 } 1099 }
885 1100
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1101 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1102}
888 1103
889static int 1104static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1105coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1106{
892 const char *s = MgPV_nolen_const (mg); 1107 const char *s = MgPV_nolen_const (mg);
893 1108
894 if (*s == '_') 1109 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1142slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1143{
929 return 1; 1144 return 1;
930} 1145}
931 1146
932static UNOP coro_setup_op; 1147static UNOP init_perl_op;
933 1148
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1149ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1150init_perl (pTHX_ struct coro *coro)
936{ 1151{
937 /* 1152 /*
938 * emulate part of the perl startup here. 1153 * emulate part of the perl startup here.
939 */ 1154 */
940 coro_init_stacks (aTHX); 1155 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1162 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1163 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1164 PL_curpm = 0;
950 PL_curpad = 0; 1165 PL_curpad = 0;
951 PL_localizing = 0; 1166 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1167 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1168#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1169 PL_parser = 0;
956#endif 1170#endif
957 PL_hints = 0; 1171 PL_hints = 0;
958 1172
959 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1176
963 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
968 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
970 1187
971 { 1188 {
972 dSP; 1189 dSP;
… …
987 /* this newly created coroutine might be run on an existing cctx which most 1204 /* this newly created coroutine might be run on an existing cctx which most
988 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1205 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1206 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1207 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1208 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1209 slf_frame.destroy = 0;
992 1210
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1211 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1212 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1213 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1214 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1215 /* no flags etc. required, as an init function won't be called */
998 1216
999 PL_op = (OP *)&coro_setup_op; 1217 PL_op = (OP *)&init_perl_op;
1000 1218
1001 /* copy throw, in case it was set before coro_setup */ 1219 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1220 CORO_THROW = coro->except;
1003 1221
1222 SWAP_SVS (coro);
1223
1004 if (expect_false (enable_times)) 1224 if (ecb_expect_false (enable_times))
1005 { 1225 {
1006 coro_times_update (); 1226 coro_times_update ();
1007 coro_times_sub (coro); 1227 coro_times_sub (coro);
1008 } 1228 }
1009} 1229}
… …
1028 dounwind (-1); 1248 dounwind (-1);
1029 } 1249 }
1030} 1250}
1031 1251
1032static void 1252static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1253destroy_perl (pTHX_ struct coro *coro)
1034{ 1254{
1035 SV *svf [9]; 1255 SV *svf [9];
1036 1256
1037 { 1257 {
1258 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1259 struct coro *current = SvSTATE (old_current);
1039 1260
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1261 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1262
1042 save_perl (aTHX_ current); 1263 save_perl (aTHX_ current);
1264
1265 /* this will cause transfer_check to croak on block*/
1266 SvRV_set (coro_current, (SV *)coro->hv);
1267
1043 load_perl (aTHX_ coro); 1268 load_perl (aTHX_ coro);
1044 1269
1045 coro_unwind_stacks (aTHX); 1270 coro_unwind_stacks (aTHX);
1271
1272 /* restore swapped sv's */
1273 SWAP_SVS (coro);
1274
1046 coro_destruct_stacks (aTHX); 1275 coro_destruct_stacks (aTHX);
1047 1276
1048 // now save some sv's to be free'd later 1277 /* now save some sv's to be free'd later */
1049 svf [0] = GvSV (PL_defgv); 1278 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1279 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1280 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv; 1281 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs; 1282 svf [4] = PL_rs;
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1284 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1285 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1286 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1287 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1288
1289 SvRV_set (coro_current, old_current);
1290
1060 load_perl (aTHX_ current); 1291 load_perl (aTHX_ current);
1061 } 1292 }
1062 1293
1063 { 1294 {
1064 unsigned int i; 1295 unsigned int i;
… …
1068 1299
1069 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1070 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1071 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1073 } 1306 }
1074} 1307}
1075 1308
1076INLINE void 1309ecb_inline void
1077free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
1078{ 1311{
1079 if (expect_true (coro_mortal)) 1312 if (ecb_expect_true (coro_mortal))
1080 { 1313 {
1081 SvREFCNT_dec (coro_mortal); 1314 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1315 coro_mortal = 0;
1083 } 1316 }
1084} 1317}
1085 1318
1086static int 1319static int
… …
1140 1373
1141 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1142 { 1375 {
1143 SV **cb; 1376 SV **cb;
1144 1377
1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1146 { 1379 {
1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1148 1381
1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1150 { 1383 {
… …
1219 1452
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1453 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1454}
1222 1455
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1456/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1457static void ecb_noinline
1225cctx_prepare (pTHX) 1458cctx_prepare (pTHX)
1226{ 1459{
1227 PL_top_env = &PL_start_env; 1460 PL_top_env = &PL_start_env;
1228 1461
1229 if (cctx_current->flags & CC_TRACE) 1462 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1473 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1474 slf_frame.check = slf_check_set_stacklevel;
1242} 1475}
1243 1476
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1477/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1478ecb_inline void
1246transfer_tail (pTHX) 1479transfer_tail (pTHX)
1247{ 1480{
1248 free_coro_mortal (aTHX); 1481 free_coro_mortal (aTHX);
1482}
1483
1484/* try to exit the same way perl's main function would do */
1485/* we do not bother resetting the environment or other things *7
1486/* that are not, uhm, essential */
1487/* this obviously also doesn't work when perl is embedded */
1488static void ecb_noinline ecb_cold
1489perlish_exit (pTHX)
1490{
1491 int exitstatus = perl_destruct (PL_curinterp);
1492 perl_free (PL_curinterp);
1493 exit (exitstatus);
1249} 1494}
1250 1495
1251/* 1496/*
1252 * this is a _very_ stripped down perl interpreter ;) 1497 * this is a _very_ stripped down perl interpreter ;)
1253 */ 1498 */
… …
1275 /* somebody or something will hit me for both perl_run and PL_restartop */ 1520 /* somebody or something will hit me for both perl_run and PL_restartop */
1276 PL_restartop = PL_op; 1521 PL_restartop = PL_op;
1277 perl_run (PL_curinterp); 1522 perl_run (PL_curinterp);
1278 /* 1523 /*
1279 * Unfortunately, there is no way to get at the return values of the 1524 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these 1525 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1526 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1527 */
1282 1528
1283 /* 1529 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1286 * reason for perl_run to return. We try to exit by jumping to the 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1287 * bootstrap-time "top" top_env, as we cannot restore the "main" 1533 * doing in that case. YMMV.
1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1291 */ 1534 */
1292 PL_top_env = main_top_env; 1535 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1536 }
1295} 1537}
1296 1538
1297static coro_cctx * 1539static coro_cctx *
1298cctx_new () 1540cctx_new (void)
1299{ 1541{
1300 coro_cctx *cctx; 1542 coro_cctx *cctx;
1301 1543
1302 ++cctx_count; 1544 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1545 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1551 return cctx;
1310} 1552}
1311 1553
1312/* create a new cctx only suitable as source */ 1554/* create a new cctx only suitable as source */
1313static coro_cctx * 1555static coro_cctx *
1314cctx_new_empty () 1556cctx_new_empty (void)
1315{ 1557{
1316 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1317 1559
1318 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1562
1321 return cctx; 1563 return cctx;
1322} 1564}
1323 1565
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1567static coro_cctx *
1326cctx_new_run () 1568cctx_new_run (void)
1327{ 1569{
1328 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1571
1332#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1333 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1334 /* mmap supposedly does allocate-on-write for us */
1335 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1336
1337 if (cctx->sptr != (void *)-1)
1338 {
1339 #if CORO_STACKGUARD
1340 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1341 #endif
1342 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1343 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1344 cctx->flags |= CC_MAPPED;
1345 } 1573 {
1346 else
1347#endif
1348 {
1349 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1350 New (0, cctx->sptr, cctx_stacksize, long);
1351
1352 if (!cctx->sptr)
1353 {
1354 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1576 }
1361 1577
1362 #if CORO_USE_VALGRIND
1363 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1364 #endif
1365
1366 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1579
1368 return cctx; 1580 return cctx;
1369} 1581}
1370 1582
1371static void 1583static void
1372cctx_destroy (coro_cctx *cctx) 1584cctx_destroy (coro_cctx *cctx)
1373{ 1585{
1374 if (!cctx) 1586 if (!cctx)
1375 return; 1587 return;
1376 1588
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1590
1379 --cctx_count; 1591 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1381 1593
1382 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1383 if (cctx->sptr)
1384 {
1385 #if CORO_USE_VALGRIND
1386 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1387 #endif
1388
1389#if HAVE_MMAP
1390 if (cctx->flags & CC_MAPPED)
1391 munmap (cctx->sptr, cctx->ssize);
1392 else
1393#endif
1394 Safefree (cctx->sptr);
1395 }
1396 1595
1397 Safefree (cctx); 1596 Safefree (cctx);
1398} 1597}
1399 1598
1400/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1600#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1601
1403static coro_cctx * 1602static coro_cctx *
1404cctx_get (pTHX) 1603cctx_get (pTHX)
1405{ 1604{
1406 while (expect_true (cctx_first)) 1605 while (ecb_expect_true (cctx_first))
1407 { 1606 {
1408 coro_cctx *cctx = cctx_first; 1607 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1608 cctx_first = cctx->next;
1410 --cctx_idle; 1609 --cctx_idle;
1411 1610
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1611 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1612 return cctx;
1414 1613
1415 cctx_destroy (cctx); 1614 cctx_destroy (cctx);
1416 } 1615 }
1417 1616
… …
1419} 1618}
1420 1619
1421static void 1620static void
1422cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1423{ 1622{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1624
1426 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1627 {
1429 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1629 cctx_first = first->next;
1431 --cctx_idle; 1630 --cctx_idle;
1432 1631
… …
1443static void 1642static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1643transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1644{
1446 /* TODO: throwing up here is considered harmful */ 1645 /* TODO: throwing up here is considered harmful */
1447 1646
1448 if (expect_true (prev != next)) 1647 if (ecb_expect_true (prev != next))
1449 { 1648 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1649 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1650 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1651
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1652 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1653 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1654
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1655#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1656 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1657 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1658#endif
1460 } 1659 }
1461} 1660}
1462 1661
1463/* always use the TRANSFER macro */ 1662/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1663static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1664transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1665{
1467 dSTACKLEVEL; 1666 dSTACKLEVEL;
1468 1667
1469 /* sometimes transfer is only called to set idle_sp */ 1668 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1669 if (ecb_expect_false (!prev))
1471 { 1670 {
1472 cctx_current->idle_sp = STACKLEVEL; 1671 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1672 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1673 }
1475 else if (expect_true (prev != next)) 1674 else if (ecb_expect_true (prev != next))
1476 { 1675 {
1477 coro_cctx *cctx_prev; 1676 coro_cctx *cctx_prev;
1478 1677
1479 if (expect_false (prev->flags & CF_NEW)) 1678 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1679 {
1481 /* create a new empty/source context */ 1680 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1681 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1682 prev->flags |= CF_RUNNING;
1484 } 1683 }
… …
1487 next->flags |= CF_RUNNING; 1686 next->flags |= CF_RUNNING;
1488 1687
1489 /* first get rid of the old state */ 1688 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1689 save_perl (aTHX_ prev);
1491 1690
1492 if (expect_false (next->flags & CF_NEW)) 1691 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1692 {
1494 /* need to start coroutine */ 1693 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1694 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1695 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1696 init_perl (aTHX_ next);
1498 } 1697 }
1499 else 1698 else
1500 load_perl (aTHX_ next); 1699 load_perl (aTHX_ next);
1501 1700
1502 /* possibly untie and reuse the cctx */ 1701 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1702 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1703 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1704 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1705 && !force_cctx
1507 )) 1706 ))
1508 { 1707 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1708 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1709 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1710
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1711 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1513 /* without this the next cctx_get might destroy the running cctx while still in use */ 1712 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1713 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1714 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1715 next->cctx = cctx_get (aTHX);
1517 1716
1518 cctx_put (cctx_current); 1717 cctx_put (cctx_current);
1519 } 1718 }
1520 else 1719 else
1521 prev->cctx = cctx_current; 1720 prev->cctx = cctx_current;
1522 1721
1523 ++next->usecount; 1722 ++next->usecount;
1524 1723
1525 cctx_prev = cctx_current; 1724 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1725 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1726
1528 next->cctx = 0; 1727 next->cctx = 0;
1529 1728
1530 if (expect_false (cctx_prev != cctx_current)) 1729 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1730 {
1532 cctx_prev->top_env = PL_top_env; 1731 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1732 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1733 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1734 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1740#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1741#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1742
1544/** high level stuff ********************************************************/ 1743/** high level stuff ********************************************************/
1545 1744
1745/* this function is actually Coro, not Coro::State, but we call it from here */
1746/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1747static void
1748coro_call_on_destroy (pTHX_ struct coro *coro);
1749
1750static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1751coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1752{
1549 if (coro->flags & CF_DESTROYED) 1753 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1754 return;
1551 1755
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1554 1757
1555 coro->flags |= CF_DESTROYED; 1758 coro->flags |= CF_ZOMBIE;
1556 1759
1557 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1558 { 1761 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1764 --coro_nready;
1562 } 1765 }
1563 else 1766 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1767 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1768
1769 if (coro->next) coro->next->prev = coro->prev;
1770 if (coro->prev) coro->prev->next = coro->next;
1771 if (coro == coro_first) coro_first = coro->next;
1565 1772
1566 if (coro->mainstack 1773 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1774 && coro->mainstack != main_mainstack
1568 && coro->slot 1775 && coro->slot
1569 && !PL_dirty) 1776 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1777 destroy_perl (aTHX_ coro);
1571 1778
1572 cctx_destroy (coro->cctx); 1779 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1780 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1781 SvREFCNT_dec (coro->args);
1782 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1783 SvREFCNT_dec (CORO_THROW);
1576 1784
1577 if (coro->next) coro->next->prev = coro->prev; 1785 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1786
1581 return 1; 1787 /* more destruction mayhem in coro_state_free */
1582} 1788}
1583 1789
1584static int 1790static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1791coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1792{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1793 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1794 mg->mg_ptr = 0;
1589 1795
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1796 coro_state_destroy (aTHX_ coro);
1797 SvREFCNT_dec (coro->on_destroy);
1798 SvREFCNT_dec (coro->status);
1799
1595 Safefree (coro); 1800 Safefree (coro);
1596 }
1597 1801
1598 return 0; 1802 return 0;
1599} 1803}
1600 1804
1601static int 1805static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1806coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1807{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1809 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1810 mg->mg_ptr = 0;
1811 mg->mg_virtual = 0;
1607 1812
1608 return 0; 1813 return 0;
1609} 1814}
1610 1815
1611static MGVTBL coro_state_vtbl = { 1816static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1841 TRANSFER (ta, 1);
1637} 1842}
1638 1843
1639/** Coro ********************************************************************/ 1844/** Coro ********************************************************************/
1640 1845
1641INLINE void 1846ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1847coro_enq (pTHX_ struct coro *coro)
1643{ 1848{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1849 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1850
1646 SvREFCNT_inc_NN (coro->hv); 1851 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1853 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1854 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1855 ready [1] = coro;
1651} 1856}
1652 1857
1653INLINE struct coro * 1858ecb_inline struct coro *
1654coro_deq (pTHX) 1859coro_deq (pTHX)
1655{ 1860{
1656 int prio; 1861 int prio;
1657 1862
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1863 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1916{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1917 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1918}
1714 1919
1715/* expects to own a reference to next->hv */ 1920/* expects to own a reference to next->hv */
1716INLINE void 1921ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1922prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1923{
1719 SV *prev_sv = SvRV (coro_current); 1924 SV *prev_sv = SvRV (coro_current);
1720 1925
1721 ta->prev = SvSTATE_hv (prev_sv); 1926 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1939{
1735 for (;;) 1940 for (;;)
1736 { 1941 {
1737 struct coro *next = coro_deq (aTHX); 1942 struct coro *next = coro_deq (aTHX);
1738 1943
1739 if (expect_true (next)) 1944 if (ecb_expect_true (next))
1740 { 1945 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1946 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1947 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1948 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1949 else
1745 { 1950 {
1746 next->flags &= ~CF_READY; 1951 next->flags &= ~CF_READY;
1747 --coro_nready; 1952 --coro_nready;
… …
1754 { 1959 {
1755 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1758 { 1963 {
1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1983
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1986 --coro_nready;
1762 } 1987 }
1763 else 1988 else
1764 { 1989 {
1990 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 1991 dSP;
1766 1992
1767 ENTER; 1993 ENTER;
1768 SAVETMPS; 1994 SAVETMPS;
1769 1995
… …
1776 } 2002 }
1777 } 2003 }
1778 } 2004 }
1779} 2005}
1780 2006
1781INLINE void 2007ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 2008prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 2009{
1784 api_ready (aTHX_ coro_current); 2010 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 2011 prepare_schedule (aTHX_ ta);
1786} 2012}
1787 2013
1788INLINE void 2014ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2015prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 2016{
1791 SV *prev = SvRV (coro_current); 2017 SV *prev = SvRV (coro_current);
1792 2018
1793 if (coro_nready) 2019 if (coro_nready)
… …
1823{ 2049{
1824 struct coro_transfer_args ta; 2050 struct coro_transfer_args ta;
1825 2051
1826 prepare_cede (aTHX_ &ta); 2052 prepare_cede (aTHX_ &ta);
1827 2053
1828 if (expect_true (ta.prev != ta.next)) 2054 if (ecb_expect_true (ta.prev != ta.next))
1829 { 2055 {
1830 TRANSFER (ta, 1); 2056 TRANSFER (ta, 1);
1831 return 1; 2057 return 1;
1832 } 2058 }
1833 else 2059 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2102 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2103 }
1878} 2104}
1879 2105
1880static void 2106static void
2107coro_push_av (pTHX_ AV *av, I32 gimme_v)
2108{
2109 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2110 {
2111 dSP;
2112
2113 if (gimme_v == G_SCALAR)
2114 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2115 else
2116 {
2117 int i;
2118 EXTEND (SP, AvFILLp (av) + 1);
2119
2120 for (i = 0; i <= AvFILLp (av); ++i)
2121 PUSHs (AvARRAY (av)[i]);
2122 }
2123
2124 PUTBACK;
2125 }
2126}
2127
2128static void
2129coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2130{
2131 if (!coro->on_destroy)
2132 coro->on_destroy = newAV ();
2133
2134 av_push (coro->on_destroy, cb);
2135}
2136
2137static void
2138slf_destroy_join (pTHX_ struct CoroSLF *frame)
2139{
2140 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2141}
2142
2143static int
2144slf_check_join (pTHX_ struct CoroSLF *frame)
2145{
2146 struct coro *coro = (struct coro *)frame->data;
2147
2148 if (!coro->status)
2149 return 1;
2150
2151 frame->destroy = 0;
2152
2153 coro_push_av (aTHX_ coro->status, GIMME_V);
2154
2155 SvREFCNT_dec ((SV *)coro->hv);
2156
2157 return 0;
2158}
2159
2160static void
2161slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2162{
2163 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2164
2165 if (items > 1)
2166 croak ("join called with too many arguments");
2167
2168 if (coro->status)
2169 frame->prepare = prepare_nop;
2170 else
2171 {
2172 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2173 frame->prepare = prepare_schedule;
2174 }
2175
2176 frame->check = slf_check_join;
2177 frame->destroy = slf_destroy_join;
2178 frame->data = (void *)coro;
2179 SvREFCNT_inc (coro->hv);
2180}
2181
2182static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2183coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2184{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2185 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2186
1886 if (on_destroyp) 2187 if (!od)
1887 { 2188 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2192
1890 while (AvFILLp (on_destroy) >= 0) 2193 while (AvFILLp (od) >= 0)
2194 {
2195 SV *cb = sv_2mortal (av_pop (od));
2196
2197 /* coro hv's (and only hv's at the moment) are supported as well */
2198 if (SvSTATEhv_p (aTHX_ cb))
2199 api_ready (aTHX_ cb);
2200 else
1891 { 2201 {
1892 dSP; /* don't disturb outer sp */ 2202 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2203 PUSHMARK (SP);
1896 2204
1897 if (statusp) 2205 if (coro->status)
1898 { 2206 {
1899 int i; 2207 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2208 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2209 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2210 }
1906 2211
1907 PUTBACK; 2212 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2213 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2214 }
1910 } 2215 }
1911} 2216}
1912 2217
1913static void 2218static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2220{
2221 AV *av;
2222
2223 if (coro->status)
2224 {
2225 av = coro->status;
2226 av_clear (av);
2227 }
2228 else
2229 av = coro->status = newAV ();
2230
2231 /* items are actually not so common, so optimise for this case */
2232 if (items)
2233 {
1916 int i; 2234 int i;
1917 HV *hv = (HV *)SvRV (coro_current);
1918 AV *av = newAV ();
1919 2235
1920 av_extend (av, items - 1); 2236 av_extend (av, items - 1);
2237
1921 for (i = 0; i < items; ++i) 2238 for (i = 0; i < items; ++i)
1922 av_push (av, SvREFCNT_inc_NN (arg [i])); 2239 av_push (av, SvREFCNT_inc_NN (arg [i]));
2240 }
2241}
1923 2242
1924 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2243static void
1925 2244slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2245{
1926 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2246 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1927 api_ready (aTHX_ sv_manager); 2247 api_ready (aTHX_ sv_manager);
1928 2248
1929 frame->prepare = prepare_schedule; 2249 frame->prepare = prepare_schedule;
1930 frame->check = slf_check_repeat; 2250 frame->check = slf_check_repeat;
1931 2251
1932 /* as a minor optimisation, we could unwind all stacks here */ 2252 /* as a minor optimisation, we could unwind all stacks here */
1933 /* but that puts extra pressure on pp_slf, and is not worth much */ 2253 /* but that puts extra pressure on pp_slf, and is not worth much */
1934 /*coro_unwind_stacks (aTHX);*/ 2254 /*coro_unwind_stacks (aTHX);*/
2255}
2256
2257static void
2258slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2259{
2260 HV *coro_hv = (HV *)SvRV (coro_current);
2261
2262 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2263 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2264}
2265
2266static void
2267slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2268{
2269 HV *coro_hv;
2270 struct coro *coro;
2271
2272 if (items <= 0)
2273 croak ("Coro::cancel called without coro object,");
2274
2275 coro = SvSTATE (arg [0]);
2276 coro_hv = coro->hv;
2277
2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2279
2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2281 {
2282 /* coro currently busy cancelling something, so just notify it */
2283 coro->slf_frame.data = (void *)coro;
2284
2285 frame->prepare = prepare_nop;
2286 frame->check = slf_check_nop;
2287 }
2288 else if (coro_hv == (HV *)SvRV (coro_current))
2289 {
2290 /* cancelling the current coro is allowed, and equals terminate */
2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2292 }
2293 else
2294 {
2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2299
2300 /* otherwise we cancel directly, purely for speed reasons
2301 * unfortunately, this requires some magic trickery, as
2302 * somebody else could cancel us, so we have to fight the cancellation.
2303 * this is ugly, and hopefully fully worth the extra speed.
2304 * besides, I can't get the slow-but-safe version working...
2305 */
2306 slf_frame.data = 0;
2307 self->flags |= CF_NOCANCEL;
2308 coro_state_destroy (aTHX_ coro);
2309 self->flags &= ~CF_NOCANCEL;
2310
2311 if (slf_frame.data)
2312 {
2313 /* while we were busy we have been cancelled, so terminate */
2314 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2315 }
2316 else
2317 {
2318 frame->prepare = prepare_nop;
2319 frame->check = slf_check_nop;
2320 }
2321 }
2322}
2323
2324static int
2325slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2326{
2327 frame->prepare = 0;
2328 coro_unwind_stacks (aTHX);
2329
2330 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2331
2332 return 1;
2333}
2334
2335static int
2336safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2337{
2338 if (coro->cctx)
2339 croak ("coro inside C callback, unable to cancel at this time, caught");
2340
2341 if (coro->flags & CF_NEW)
2342 {
2343 coro_set_status (aTHX_ coro, arg, items);
2344 coro_state_destroy (aTHX_ coro);
2345 }
2346 else
2347 {
2348 if (!coro->slf_frame.prepare)
2349 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2350
2351 slf_destroy (aTHX_ coro);
2352
2353 coro_set_status (aTHX_ coro, arg, items);
2354 coro->slf_frame.prepare = prepare_nop;
2355 coro->slf_frame.check = slf_check_safe_cancel;
2356
2357 api_ready (aTHX_ (SV *)coro->hv);
2358 }
2359
2360 return 1;
1935} 2361}
1936 2362
1937/*****************************************************************************/ 2363/*****************************************************************************/
1938/* async pool handler */ 2364/* async pool handler */
1939 2365
… …
1970slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2396slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1971{ 2397{
1972 HV *hv = (HV *)SvRV (coro_current); 2398 HV *hv = (HV *)SvRV (coro_current);
1973 struct coro *coro = SvSTATE_hv ((SV *)hv); 2399 struct coro *coro = SvSTATE_hv ((SV *)hv);
1974 2400
1975 if (expect_true (coro->saved_deffh)) 2401 if (ecb_expect_true (coro->saved_deffh))
1976 { 2402 {
1977 /* subsequent iteration */ 2403 /* subsequent iteration */
1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2404 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1979 coro->saved_deffh = 0; 2405 coro->saved_deffh = 0;
1980 2406
1981 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2407 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2408 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 { 2409 {
1984 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2410 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1985 coro->invoke_av = newAV (); 2411 return;
1986
1987 frame->prepare = prepare_nop;
1988 } 2412 }
1989 else 2413 else
1990 { 2414 {
1991 av_clear (GvAV (PL_defgv)); 2415 av_clear (GvAV (PL_defgv));
1992 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2416 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2042 2466
2043static int 2467static int
2044slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2045{ 2469{
2046 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
2047 2471
2048 if (CORO_THROW) 2472 if (CORO_THROW)
2049 return 0; 2473 return 0;
2050 2474
2051 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2052 return 1; 2476 return 1;
… …
2088 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
2089 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
2090 } 2514 }
2091 2515
2092 if (!SvROK (cb) 2516 if (!SvROK (cb)
2093 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2095 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
2096 2520
2097 { 2521 {
2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2215static void 2639static void
2216slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2640slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{ 2641{
2218 frame->prepare = prepare_cede_notself; 2642 frame->prepare = prepare_cede_notself;
2219 frame->check = slf_check_nop; 2643 frame->check = slf_check_nop;
2644}
2645
2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2647static void
2648slf_destroy (pTHX_ struct coro *coro)
2649{
2650 struct CoroSLF frame = coro->slf_frame;
2651
2652 /*
2653 * The on_destroy below most likely is from an SLF call.
2654 * Since by definition the SLF call will not finish when we destroy
2655 * the coro, we will have to force-finish it here, otherwise
2656 * cleanup functions cannot call SLF functions.
2657 */
2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2220} 2663}
2221 2664
2222/* 2665/*
2223 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2224 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
… …
2231 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2674 I32 checkmark; /* mark SP to see how many elements check has pushed */
2232 2675
2233 /* set up the slf frame, unless it has already been set-up */ 2676 /* set up the slf frame, unless it has already been set-up */
2234 /* the latter happens when a new coro has been started */ 2677 /* the latter happens when a new coro has been started */
2235 /* or when a new cctx was attached to an existing coroutine */ 2678 /* or when a new cctx was attached to an existing coroutine */
2236 if (expect_true (!slf_frame.prepare)) 2679 if (ecb_expect_true (!slf_frame.prepare))
2237 { 2680 {
2238 /* first iteration */ 2681 /* first iteration */
2239 dSP; 2682 dSP;
2240 SV **arg = PL_stack_base + TOPMARK + 1; 2683 SV **arg = PL_stack_base + TOPMARK + 1;
2241 int items = SP - arg; /* args without function object */ 2684 int items = SP - arg; /* args without function object */
… …
2282 while (slf_frame.check (aTHX_ &slf_frame)); 2725 while (slf_frame.check (aTHX_ &slf_frame));
2283 2726
2284 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2727 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2285 2728
2286 /* exception handling */ 2729 /* exception handling */
2287 if (expect_false (CORO_THROW)) 2730 if (ecb_expect_false (CORO_THROW))
2288 { 2731 {
2289 SV *exception = sv_2mortal (CORO_THROW); 2732 SV *exception = sv_2mortal (CORO_THROW);
2290 2733
2291 CORO_THROW = 0; 2734 CORO_THROW = 0;
2292 sv_setsv (ERRSV, exception); 2735 sv_setsv (ERRSV, exception);
2293 croak (0); 2736 croak (0);
2294 } 2737 }
2295 2738
2296 /* return value handling - mostly like entersub */ 2739 /* return value handling - mostly like entersub */
2297 /* make sure we put something on the stack in scalar context */ 2740 /* make sure we put something on the stack in scalar context */
2298 if (GIMME_V == G_SCALAR) 2741 if (GIMME_V == G_SCALAR
2742 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2299 { 2743 {
2300 dSP; 2744 dSP;
2301 SV **bot = PL_stack_base + checkmark; 2745 SV **bot = PL_stack_base + checkmark;
2302 2746
2303 if (sp == bot) /* too few, push undef */ 2747 if (sp == bot) /* too few, push undef */
2304 bot [1] = &PL_sv_undef; 2748 bot [1] = &PL_sv_undef;
2305 else if (sp != bot + 1) /* too many, take last one */ 2749 else /* too many, take last one */
2306 bot [1] = *sp; 2750 bot [1] = *sp;
2307 2751
2308 SP = bot + 1; 2752 SP = bot + 1;
2309 2753
2310 PUTBACK; 2754 PUTBACK;
… …
2343 if (PL_op->op_flags & OPf_STACKED) 2787 if (PL_op->op_flags & OPf_STACKED)
2344 { 2788 {
2345 if (items > slf_arga) 2789 if (items > slf_arga)
2346 { 2790 {
2347 slf_arga = items; 2791 slf_arga = items;
2348 free (slf_argv); 2792 Safefree (slf_argv);
2349 slf_argv = malloc (slf_arga * sizeof (SV *)); 2793 New (0, slf_argv, slf_arga, SV *);
2350 } 2794 }
2351 2795
2352 slf_argc = items; 2796 slf_argc = items;
2353 2797
2354 for (i = 0; i < items; ++i) 2798 for (i = 0; i < items; ++i)
… …
2408{ 2852{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2410 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2411} 2855}
2412 2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2947}
2948
2413/*****************************************************************************/ 2949/*****************************************************************************/
2414/* PerlIO::cede */ 2950/* PerlIO::cede */
2415 2951
2416typedef struct 2952typedef struct
2417{ 2953{
2418 PerlIOBuf base; 2954 PerlIOBuf base;
2419 NV next, every; 2955 NV next, every;
2420} PerlIOCede; 2956} PerlIOCede;
2421 2957
2422static IV 2958static IV ecb_cold
2423PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2959PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2424{ 2960{
2425 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2961 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2426 2962
2427 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2963 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2428 self->next = nvtime () + self->every; 2964 self->next = nvtime () + self->every;
2429 2965
2430 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2966 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2431} 2967}
2432 2968
2433static SV * 2969static SV * ecb_cold
2434PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2970PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2435{ 2971{
2436 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2972 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2437 2973
2438 return newSVnv (self->every); 2974 return newSVnv (self->every);
… …
2545 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2546 PUTBACK; 3082 PUTBACK;
2547 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2548 } 3084 }
2549 3085
2550 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2551 } 3087 }
2552} 3088}
2553 3089
2554static void 3090static void
2555coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2556{ 3092{
2557 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3093 /* call $sem->adjust (0) to possibly wake up some other waiters */
2558 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3094 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2559} 3095}
2560 3096
2561static int 3097static int
2562slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3098slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2563{ 3099{
2564 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2565 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
3102 SV *coro_hv = SvRV (coro_current);
3103
3104 frame->destroy = 0;
2566 3105
2567 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2568 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2569 return 0; 3112 return 0;
3113 }
2570 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2571 { 3115 {
2572 SvSTATE_current->on_destroy = 0;
2573
2574 if (acquire) 3116 if (acquire)
2575 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2576 else 3118 else
2577 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2578 3120
… …
2582 { 3124 {
2583 int i; 3125 int i;
2584 /* if we were woken up but can't down, we look through the whole */ 3126 /* if we were woken up but can't down, we look through the whole */
2585 /* waiters list and only add us if we aren't in there already */ 3127 /* waiters list and only add us if we aren't in there already */
2586 /* this avoids some degenerate memory usage cases */ 3128 /* this avoids some degenerate memory usage cases */
2587 3129 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2588 for (i = 1; i <= AvFILLp (av); ++i)
2589 if (AvARRAY (av)[i] == SvRV (coro_current)) 3130 if (AvARRAY (av)[i] == coro_hv)
2590 return 1; 3131 return 1;
2591 3132
2592 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3133 av_push (av, SvREFCNT_inc (coro_hv));
2593 return 1; 3134 return 1;
2594 } 3135 }
2595} 3136}
2596 3137
2597static int 3138static int
… …
2620 { 3161 {
2621 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3162 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2622 3163
2623 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3164 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2624 frame->prepare = prepare_schedule; 3165 frame->prepare = prepare_schedule;
2625
2626 /* to avoid race conditions when a woken-up coro gets terminated */ 3166 /* to avoid race conditions when a woken-up coro gets terminated */
2627 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3167 /* we arrange for a temporary on_destroy that calls adjust (0) */
2628 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3168 frame->destroy = coro_semaphore_destroy;
2629 } 3169 }
2630} 3170}
2631 3171
2632static void 3172static void
2633slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3173slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2691 { 3231 {
2692 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
2693 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
2694 } 3234 }
2695 3235
2696 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
2697 3237
2698 --count; 3238 --count;
2699 } 3239 }
2700} 3240}
2701 3241
… …
2715 { 3255 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]); 3256 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3257 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718 3258
2719 if (SvIVX (AvARRAY (av)[0])) 3259 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3260 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2721 3261
2722 frame->prepare = prepare_nop; 3262 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop; 3263 frame->check = slf_check_nop;
2724 } 3264 }
2725 else if (SvIVX (AvARRAY (av)[0])) 3265 else if (SvIVX (AvARRAY (av)[0]))
… …
2786 } 3326 }
2787 3327
2788 av_push (state, data_sv); 3328 av_push (state, data_sv);
2789 3329
2790 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
2791 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
2792 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
2793} 3333}
2794 3334
2795static int 3335static int
2796slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2797{ 3337{
… …
2802 /* it quickly returns */ 3342 /* it quickly returns */
2803 if (CORO_THROW) 3343 if (CORO_THROW)
2804 return 0; 3344 return 0;
2805 3345
2806 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
2807 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2808 return 1; 3348 return 1;
2809 3349
2810 /* restore status */ 3350 /* restore status */
2811 { 3351 {
2812 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
… …
2815 errno = data->errorno; 3355 errno = data->errorno;
2816 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
2817 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
2818 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
2819 3359
2820 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
2821 } 3361 }
2822 3362
2823 /* push result values */ 3363 /* push result values */
2824 { 3364 {
2825 dSP; 3365 dSP;
… …
2851 dSP; 3391 dSP;
2852 3392
2853 static SV *prio_cv; 3393 static SV *prio_cv;
2854 static SV *prio_sv; 3394 static SV *prio_sv;
2855 3395
2856 if (expect_false (!prio_cv)) 3396 if (ecb_expect_false (!prio_cv))
2857 { 3397 {
2858 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3398 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2859 prio_sv = newSViv (0); 3399 prio_sv = newSViv (0);
2860 } 3400 }
2861 3401
… …
2887 /* now call the AIO function - we assume our request is uncancelable */ 3427 /* now call the AIO function - we assume our request is uncancelable */
2888 PUTBACK; 3428 PUTBACK;
2889 call_sv ((SV *)req, G_VOID | G_DISCARD); 3429 call_sv ((SV *)req, G_VOID | G_DISCARD);
2890 } 3430 }
2891 3431
2892 /* now that the requets is going, we loop toll we have a result */ 3432 /* now that the request is going, we loop till we have a result */
2893 frame->data = (void *)state; 3433 frame->data = (void *)state;
2894 frame->prepare = prepare_schedule; 3434 frame->prepare = prepare_schedule;
2895 frame->check = slf_check_aio_req; 3435 frame->check = slf_check_aio_req;
2896} 3436}
2897 3437
… …
2909 3449
2910#if CORO_CLONE 3450#if CORO_CLONE
2911# include "clone.c" 3451# include "clone.c"
2912#endif 3452#endif
2913 3453
3454/*****************************************************************************/
3455
3456static SV *
3457coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3458{
3459 SV *coro_sv;
3460 struct coro *coro;
3461 MAGIC *mg;
3462 HV *hv;
3463 SV *cb;
3464 int i;
3465
3466 if (argc > 0)
3467 {
3468 cb = s_get_cv_croak (argv [0]);
3469
3470 if (!is_coro)
3471 {
3472 if (CvISXSUB (cb))
3473 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3474
3475 if (!CvROOT (cb))
3476 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3477 }
3478 }
3479
3480 Newz (0, coro, 1, struct coro);
3481 coro->args = newAV ();
3482 coro->flags = CF_NEW;
3483
3484 if (coro_first) coro_first->prev = coro;
3485 coro->next = coro_first;
3486 coro_first = coro;
3487
3488 coro->hv = hv = newHV ();
3489 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3490 mg->mg_flags |= MGf_DUP;
3491 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3492
3493 if (argc > 0)
3494 {
3495 av_extend (coro->args, argc + is_coro - 1);
3496
3497 if (is_coro)
3498 {
3499 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3500 cb = (SV *)cv_coro_run;
3501 }
3502
3503 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3504
3505 for (i = 1; i < argc; i++)
3506 av_push (coro->args, newSVsv (argv [i]));
3507 }
3508
3509 return coro_sv;
3510}
3511
3512#ifndef __cplusplus
3513ecb_cold XS(boot_Coro__State);
3514#endif
3515
3516#if CORO_JIT
3517
3518static void ecb_noinline ecb_cold
3519pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3520{
3521 dSP;
3522 AV *av = newAV ();
3523
3524 av_store (av, 3, newSVuv (d));
3525 av_store (av, 2, newSVuv (c));
3526 av_store (av, 1, newSVuv (b));
3527 av_store (av, 0, newSVuv (a));
3528
3529 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3530
3531 PUTBACK;
3532}
3533
3534static void ecb_noinline ecb_cold
3535jit_init (pTHX)
3536{
3537 dSP;
3538 SV *load, *save;
3539 char *map_base;
3540 char *load_ptr, *save_ptr;
3541 STRLEN load_len, save_len, map_len;
3542 int count;
3543
3544 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3545
3546 PUSHMARK (SP);
3547 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3548 #include "state.h"
3549 count = call_pv ("Coro::State::_jit", G_ARRAY);
3550 SPAGAIN;
3551
3552 save = POPs; save_ptr = SvPVbyte (save, save_len);
3553 load = POPs; load_ptr = SvPVbyte (load, load_len);
3554
3555 map_len = load_len + save_len + 16;
3556
3557 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3558
3559 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3560
3561 load_perl_slots = (load_save_perl_slots_type)map_base;
3562 memcpy (map_base, load_ptr, load_len);
3563
3564 map_base += (load_len + 15) & ~15;
3565
3566 save_perl_slots = (load_save_perl_slots_type)map_base;
3567 memcpy (map_base, save_ptr, save_len);
3568
3569 /* we are good citizens and try to make the page read-only, so the evil evil */
3570 /* hackers might have it a bit more difficult */
3571 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3572
3573 PUTBACK;
3574 eval_pv ("undef &Coro::State::_jit", 1);
3575}
3576
3577#endif
3578
2914MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3579MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2915 3580
2916PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
2917 3582
2918BOOT: 3583BOOT:
2919{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
2920#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
2921# if CORO_PTHREAD 3588# if CORO_PTHREAD
2922 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
2923# endif 3590# endif
2924#endif 3591#endif
2925 BOOT_PAGESIZE; 3592 /* perl defines these to check for existance first, but why it doesn't */
3593 /* just create them one at init time is not clear to me, except for */
3594 /* programs trying to delete them, but... */
3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3596 DEFSV;
3597 ERRSV;
2926 3598
2927 cctx_current = cctx_new_empty (); 3599 cctx_current = cctx_new_empty ();
2928 3600
2929 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3601 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2930 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3602 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2931 3603
2932 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2933 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2934 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2935 3607
2936 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2937 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2938 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2939 3610
2940 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2941 3612
… …
2970 coroapi.prepare_nop = prepare_nop; 3641 coroapi.prepare_nop = prepare_nop;
2971 coroapi.prepare_schedule = prepare_schedule; 3642 coroapi.prepare_schedule = prepare_schedule;
2972 coroapi.prepare_cede = prepare_cede; 3643 coroapi.prepare_cede = prepare_cede;
2973 coroapi.prepare_cede_notself = prepare_cede_notself; 3644 coroapi.prepare_cede_notself = prepare_cede_notself;
2974 3645
2975 { 3646 time_init (aTHX);
2976 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2977
2978 if (!svp) croak ("Time::HiRes is required");
2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2980
2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2985 }
2986 3647
2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3648 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3649#if CORO_JIT
3650 PUTBACK;
3651 jit_init (aTHX);
3652 SPAGAIN;
3653#endif
2988} 3654}
2989 3655
2990SV * 3656SV *
2991new (char *klass, ...) 3657new (SV *klass, ...)
2992 ALIAS: 3658 ALIAS:
2993 Coro::new = 1 3659 Coro::new = 1
2994 CODE: 3660 CODE:
2995{ 3661 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2996 struct coro *coro; 3662 OUTPUT:
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (items > 1)
3003 {
3004 cb = s_get_cv_croak (ST (1));
3005
3006 if (!ix)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3028
3029 if (items > 1)
3030 {
3031 av_extend (coro->args, items - 1 + ix - 1);
3032
3033 if (ix)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 2; i < items; i++)
3042 av_push (coro->args, newSVsv (ST (i)));
3043 }
3044}
3045 OUTPUT:
3046 RETVAL 3663 RETVAL
3047 3664
3048void 3665void
3049transfer (...) 3666transfer (...)
3050 PROTOTYPE: $$ 3667 PROTOTYPE: $$
3051 CODE: 3668 CODE:
3052 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3053
3054bool
3055_destroy (SV *coro_sv)
3056 CODE:
3057 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3058 OUTPUT:
3059 RETVAL
3060
3061void
3062_exit (int code)
3063 PROTOTYPE: $
3064 CODE:
3065 _exit (code);
3066 3670
3067SV * 3671SV *
3068clone (Coro::State coro) 3672clone (Coro::State coro)
3069 CODE: 3673 CODE:
3070{ 3674{
… …
3125void 3729void
3126list () 3730list ()
3127 PROTOTYPE: 3731 PROTOTYPE:
3128 PPCODE: 3732 PPCODE:
3129{ 3733{
3130 struct coro *coro; 3734 struct coro *coro;
3131 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
3132 if (coro->hv) 3736 if (coro->hv)
3133 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3134} 3738}
3135 3739
… …
3140 CODE: 3744 CODE:
3141{ 3745{
3142 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3746 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3143 { 3747 {
3144 struct coro *current = SvSTATE_current; 3748 struct coro *current = SvSTATE_current;
3749 struct CoroSLF slf_save;
3145 3750
3146 if (current != coro) 3751 if (current != coro)
3147 { 3752 {
3148 PUTBACK; 3753 PUTBACK;
3149 save_perl (aTHX_ current); 3754 save_perl (aTHX_ current);
3150 load_perl (aTHX_ coro); 3755 load_perl (aTHX_ coro);
3756 /* the coro is most likely in an active SLF call.
3757 * while not strictly required (the code we execute is
3758 * not allowed to call any SLF functions), it's cleaner
3759 * to reinitialise the slf_frame and restore it later.
3760 * This might one day allow us to actually do SLF calls
3761 * from code executed here.
3762 */
3763 slf_save = slf_frame;
3764 slf_frame.prepare = 0;
3151 SPAGAIN; 3765 SPAGAIN;
3152 } 3766 }
3153 3767
3154 PUSHSTACK; 3768 PUSHSTACK;
3155 3769
… …
3165 SPAGAIN; 3779 SPAGAIN;
3166 3780
3167 if (current != coro) 3781 if (current != coro)
3168 { 3782 {
3169 PUTBACK; 3783 PUTBACK;
3784 slf_frame = slf_save;
3170 save_perl (aTHX_ coro); 3785 save_perl (aTHX_ coro);
3171 load_perl (aTHX_ current); 3786 load_perl (aTHX_ current);
3172 SPAGAIN; 3787 SPAGAIN;
3173 } 3788 }
3174 } 3789 }
… …
3179 PROTOTYPE: $ 3794 PROTOTYPE: $
3180 ALIAS: 3795 ALIAS:
3181 is_ready = CF_READY 3796 is_ready = CF_READY
3182 is_running = CF_RUNNING 3797 is_running = CF_RUNNING
3183 is_new = CF_NEW 3798 is_new = CF_NEW
3184 is_destroyed = CF_DESTROYED 3799 is_destroyed = CF_ZOMBIE
3800 is_zombie = CF_ZOMBIE
3185 is_suspended = CF_SUSPENDED 3801 is_suspended = CF_SUSPENDED
3186 CODE: 3802 CODE:
3187 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
3188 OUTPUT: 3804 OUTPUT:
3189 RETVAL 3805 RETVAL
3190 3806
3191void 3807void
3192throw (Coro::State self, SV *throw = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
3193 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
3194 CODE: 3810 CODE:
3195{ 3811{
3812 struct coro *coro = SvSTATE (self);
3196 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
3197 SV **throwp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3198 SvREFCNT_dec (*throwp); 3815 SvREFCNT_dec (*exceptionp);
3199 SvGETMAGIC (throw); 3816 SvGETMAGIC (exception);
3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
3201} 3820}
3202 3821
3203void 3822void
3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3205 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
… …
3260 3879
3261void 3880void
3262cancel (Coro::State self) 3881cancel (Coro::State self)
3263 CODE: 3882 CODE:
3264 coro_state_destroy (aTHX_ self); 3883 coro_state_destroy (aTHX_ self);
3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3266
3267 3884
3268SV * 3885SV *
3269enable_times (int enabled = enable_times) 3886enable_times (int enabled = enable_times)
3270 CODE: 3887 CODE:
3271{ 3888{
… …
3284 3901
3285void 3902void
3286times (Coro::State self) 3903times (Coro::State self)
3287 PPCODE: 3904 PPCODE:
3288{ 3905{
3289 struct coro *current = SvSTATE (coro_current); 3906 struct coro *current = SvSTATE (coro_current);
3290 3907
3291 if (expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3292 { 3909 {
3293 coro_times_update (); 3910 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current)); 3911 coro_times_add (SvSTATE (coro_current));
3295 } 3912 }
3296 3913
3297 EXTEND (SP, 2); 3914 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3915 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3916 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300 3917
3301 if (expect_false (current == self)) 3918 if (ecb_expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current)); 3919 coro_times_sub (SvSTATE (coro_current));
3303} 3920}
3304 3921
3922void
3923swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3924 CODE:
3925{
3926 struct coro *current = SvSTATE_current;
3927
3928 if (current == coro)
3929 SWAP_SVS (current);
3930
3931 if (!coro->swap_sv)
3932 coro->swap_sv = newAV ();
3933
3934 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3935 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3936
3937 if (current == coro)
3938 SWAP_SVS (current);
3939}
3940
3941
3305MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3306 3943
3307BOOT: 3944BOOT:
3308{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3314 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3315 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3954 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3316 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3955 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3317 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3956 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3318 3957
3319 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3320 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3323 3962
3324 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3325 3964
3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3340 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3341 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3342 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3343 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3344 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3345 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3346 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3347 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3348 } 3991 }
3349} 3992}
3350 3993
3994SV *
3995async (...)
3996 PROTOTYPE: &@
3997 CODE:
3998 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3999 api_ready (aTHX_ RETVAL);
4000 OUTPUT:
4001 RETVAL
4002
4003void
4004_destroy (Coro::State coro)
4005 CODE:
4006 /* used by the manager thread */
4007 coro_state_destroy (aTHX_ coro);
4008
4009void
4010on_destroy (Coro::State coro, SV *cb)
4011 CODE:
4012 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4013
4014void
4015join (...)
4016 CODE:
4017 CORO_EXECUTE_SLF_XS (slf_init_join);
4018
3351void 4019void
3352terminate (...) 4020terminate (...)
3353 CODE: 4021 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4022 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3355 4023
3356void 4024void
4025cancel (...)
4026 CODE:
4027 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4028
4029int
4030safe_cancel (Coro::State self, ...)
4031 C_ARGS: aTHX_ self, &ST (1), items - 1
4032
4033void
3357schedule (...) 4034schedule (...)
3358 CODE: 4035 CODE:
3359 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4036 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3360 4037
3361void 4038void
… …
3380 4057
3381void 4058void
3382_set_current (SV *current) 4059_set_current (SV *current)
3383 PROTOTYPE: $ 4060 PROTOTYPE: $
3384 CODE: 4061 CODE:
3385 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3386 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3387 4064
3388void 4065void
3389_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3390 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
3393 SvGETMAGIC (hook); 4070 SvGETMAGIC (hook);
3394 if (SvOK (hook)) 4071 if (SvOK (hook))
3395 { 4072 {
3396 coro_readyhook = newSVsv (hook); 4073 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper; 4074 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 CORO_READYHOOK ();
3399 } 4075 }
3400 else 4076 else
3401 { 4077 {
3402 coro_readyhook = 0; 4078 coro_readyhook = 0;
3403 CORO_READYHOOK = 0; 4079 CORO_READYHOOK = 0;
… …
3473 for (i = 1; i < items; ++i) 4149 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i))); 4150 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475 4151
3476 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3477 { 4153 {
3478 PUSHMARK (SP); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3479 EXTEND (SP, 2);
3480 PUSHs (sv_Coro);
3481 PUSHs ((SV *)cv_pool_handler);
3482 PUTBACK;
3483 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3484 SPAGAIN;
3485
3486 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4156 SvREFCNT_dec_NN (sv);
3487 } 4157 }
3488 4158
3489 { 4159 {
3490 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
3491 4161
… …
3498 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
3499 4169
3500 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
3501 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3502 else 4172 else
3503 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
3504} 4174}
3505 4175
3506SV * 4176SV *
3507rouse_cb () 4177rouse_cb ()
3508 PROTOTYPE: 4178 PROTOTYPE:
… …
3523 on_leave = 1 4193 on_leave = 1
3524 PROTOTYPE: & 4194 PROTOTYPE: &
3525 CODE: 4195 CODE:
3526{ 4196{
3527 struct coro *coro = SvSTATE_current; 4197 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529 4199
3530 block = s_get_cv_croak (block); 4200 block = s_get_cv_croak (block);
3531 4201
3532 if (!*avp) 4202 if (!*avp)
3533 *avp = newAV (); 4203 *avp = newAV ();
… …
3553 4223
3554SV * 4224SV *
3555new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
3556 CODE: 4226 CODE:
3557{ 4227{
3558 int semcnt = 1; 4228 int semcnt = 1;
3559 4229
3560 if (count) 4230 if (count)
3561 { 4231 {
3562 SvGETMAGIC (count); 4232 SvGETMAGIC (count);
3563 4233
… …
3623 XSRETURN_NO; 4293 XSRETURN_NO;
3624} 4294}
3625 4295
3626void 4296void
3627waiters (SV *self) 4297waiters (SV *self)
3628 PPCODE: 4298 PPCODE:
3629{ 4299{
3630 AV *av = (AV *)SvRV (self); 4300 AV *av = (AV *)SvRV (self);
3631 int wcount = AvFILLp (av) + 1 - 1; 4301 int wcount = AvFILLp (av) + 1 - 1;
3632 4302
3633 if (GIMME_V == G_SCALAR) 4303 if (GIMME_V == G_SCALAR)
… …
3642} 4312}
3643 4313
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4314MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645 4315
3646void 4316void
3647_may_delete (SV *sem, int count, int extra_refs) 4317_may_delete (SV *sem, int count, unsigned int extra_refs)
3648 PPCODE: 4318 PPCODE:
3649{ 4319{
3650 AV *av = (AV *)SvRV (sem); 4320 AV *av = (AV *)SvRV (sem);
3651 4321
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4322 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */ 4323 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count) 4324 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES; 4325 XSRETURN_YES;
… …
3676 4346
3677void 4347void
3678broadcast (SV *self) 4348broadcast (SV *self)
3679 CODE: 4349 CODE:
3680{ 4350{
3681 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
3682 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4352 coro_signal_wake (aTHX_ av, AvFILLp (av));
3683} 4353}
3684 4354
3685void 4355void
3686send (SV *self) 4356send (SV *self)
… …
3694 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4364 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3695} 4365}
3696 4366
3697IV 4367IV
3698awaited (SV *self) 4368awaited (SV *self)
3699 CODE: 4369 CODE:
3700 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4370 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3701 OUTPUT: 4371 OUTPUT:
3702 RETVAL 4372 RETVAL
3703 4373
3704 4374
… …
3709 4379
3710void 4380void
3711_schedule (...) 4381_schedule (...)
3712 CODE: 4382 CODE:
3713{ 4383{
3714 static int incede; 4384 static int incede;
3715 4385
3716 api_cede_notself (aTHX); 4386 api_cede_notself (aTHX);
3717 4387
3718 ++incede; 4388 ++incede;
3719 while (coro_nready >= incede && api_cede (aTHX)) 4389 while (coro_nready >= incede && api_cede (aTHX))
… …
3763 { 4433 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4434 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0; 4435 coro_old_pp_sselect = 0;
3766 } 4436 }
3767 4437
4438MODULE = Coro::State PACKAGE = Coro::Util
3768 4439
4440void
4441_exit (int code)
4442 CODE:
4443 _exit (code);
4444
4445NV
4446time ()
4447 CODE:
4448 RETVAL = nvtime (aTHX);
4449 OUTPUT:
4450 RETVAL
4451
4452NV
4453gettimeofday ()
4454 PPCODE:
4455{
4456 UV tv [2];
4457 u2time (aTHX_ tv);
4458 EXTEND (SP, 2);
4459 PUSHs (sv_2mortal (newSVuv (tv [0])));
4460 PUSHs (sv_2mortal (newSVuv (tv [1])));
4461}
4462

Diff Legend

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