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.373 by root, Thu Oct 1 23:51:33 2009 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 2016 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
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 */
… …
155static char times_valid; 161static char times_valid;
156 162
157static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
159 165
160enum { 166enum
167{
161 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
170typedef struct coro_cctx 177typedef struct coro_cctx
171{ 178{
172 struct coro_cctx *next; 179 struct coro_cctx *next;
173 180
174 /* the stack */ 181 /* the stack */
175 void *sptr; 182 struct coro_stack stack;
176 size_t ssize;
177 183
178 /* cpu state */ 184 /* cpu state */
179 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
180 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
181 JMPENV *top_env; 189 JMPENV *top_env;
182 coro_context cctx; 190 coro_context cctx;
183 191
184 U32 gen; 192 U32 gen;
185#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
186 int valgrind_id; 194 int valgrind_id;
187#endif 195#endif
188 unsigned char flags; 196 unsigned char flags;
189} coro_cctx; 197} coro_cctx;
190 198
191coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
192 200
193/*****************************************************************************/ 201/*****************************************************************************/
194 202
203static MGVTBL coro_state_vtbl;
204
195enum { 205enum
206{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 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) */
201}; 213};
202 214
203/* 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 */
204typedef struct 216typedef struct
205{ 217{
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210 HV *hinthv;
211#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
212# include "state.h" 219 #include "state.h"
213#undef VAR
214} perl_slots; 220} perl_slots;
215 221
222/* how many context stack entries do we need for perl_slots */
216#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))
217 224
218/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
219struct coro { 226struct coro
227{
220 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 229 coro_cctx *cctx;
222 230
223 /* ready queue */ 231 /* ready queue */
224 struct coro *next_ready; 232 struct coro *next_ready;
… …
226 /* state data */ 234 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 236 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
230 238
231 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 243
238 /* statistics */ 244 /* statistics */
239 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
240 246
241 /* coro process data */ 247 /* coro process data */
242 int prio; 248 int prio;
243 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
244 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 */
245 253
246 /* async_pool */ 254 /* async_pool */
247 SV *saved_deffh; 255 SV *saved_deffh;
248 SV *invoke_cb; 256 SV *invoke_cb;
249 AV *invoke_av; 257 AV *invoke_av;
250 258
251 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
252 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
253 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
262
263 /* swap_sv */
264 AV *swap_sv;
254 265
255 /* times */ 266 /* times */
256 coro_ts t_cpu, t_real; 267 coro_ts t_cpu, t_real;
257 268
258 /* linked list */ 269 /* linked list */
… …
262typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
264 275
265/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
269 280
270/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
271 282
272#define CORO_PRIO_MAX 3 283#define CORO_PRIO_MAX 3
… …
278 289
279/* for Coro.pm */ 290/* for Coro.pm */
280static SV *coro_current; 291static SV *coro_current;
281static SV *coro_readyhook; 292static SV *coro_readyhook;
282static 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 */
283static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
284static struct coro *coro_first; 295static struct coro *coro_first;
285#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
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
286 320
287/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
288 322
289static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 324static SV *coro_select_select;
… …
302 PL_op->op_flags |= OPf_STACKED; 336 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 337 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 338 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 339}
306 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
307/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
308 394
309static SV * 395static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
311{ 397{
312#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
313 /* 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 */
314 get_sv (name, create); 400 get_sv (name, create);
315#endif 401#endif
316 return get_sv (name, create); 402 return get_sv (name, create);
317} 403}
318 404
319static AV * 405static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
321{ 407{
322#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
323 /* 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 */
324 get_av (name, create); 410 get_av (name, create);
325#endif 411#endif
326 return get_av (name, create); 412 return get_av (name, create);
327} 413}
328 414
329static HV * 415static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
331{ 417{
332#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_hv (name, create); 420 get_hv (name, create);
335#endif 421#endif
336 return get_hv (name, create); 422 return get_hv (name, create);
337} 423}
338 424
339INLINE void 425ecb_inline void
340coro_times_update () 426coro_times_update (void)
341{ 427{
342#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
343 struct timespec ts; 429 struct timespec ts;
344 430
345 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
357 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
359#endif 445#endif
360} 446}
361 447
362INLINE void 448ecb_inline void
363coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
364{ 450{
365 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
366 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]; }
367 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
369 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
370 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]; }
371 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
372} 458}
373 459
374INLINE void 460ecb_inline void
375coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
376{ 462{
377 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]; }
378 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
387/* magic glue */ 473/* magic glue */
388 474
389#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 477
392#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
395 : mg_find (sv, type)) 481 : mg_find (sv, type))
396 482
397#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
400 : 0) 486 : 0)
401 487
402#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)
403#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)
404 490
405INLINE struct coro * 491ecb_inline MAGIC *
406SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
407{ 493{
408 HV *stash;
409 MAGIC *mg; 494 MAGIC *mg;
410 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
411 if (SvROK (coro)) 511 if (SvROK (coro_sv))
412 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
413 513
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
415 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
416 517
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
427} 519}
428 520
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 522
… …
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434 526
435/*****************************************************************************/ 527/*****************************************************************************/
436/* padlist management and caching */ 528/* padlist management and caching */
437 529
438static AV * 530ecb_inline PADLIST *
439coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
440{ 532{
441 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
442 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
443 538
444 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. */
445 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
446#if PERL_VERSION_ATLEAST (5,10,0)
447 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
448#else
449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
450#endif 568#endif
451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
452 --AvFILLp (padlist);
453 569
454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
455 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;
456 578
457 return newpadlist; 579 return newpadlist;
458} 580}
459 581
460static void 582ecb_inline void
461free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
462{ 584{
463 /* may be during global destruction */ 585 /* may be during global destruction */
464 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
465 { 587 {
466 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
467 589
468 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
469 { 591 {
470 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
471 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
472 I32 j = AvFILLp (av);
473 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
474 while (j >= 0) 599 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
476 601
477 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
478 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
479 } 605 }
480 606
481 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
482 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
483 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
484 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
485 } 617 }
486} 618}
487 619
488static int 620static int
489coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
490{ 622{
491 AV *padlist; 623 PADLIST *padlist;
492 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;
493 626
494 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
496 return 0; 629 return 0;
497 630
498 /* casting is fun. */ 631 while (len--)
499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
500 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
501
502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
503 633
504 return 0; 634 return 0;
505} 635}
506 636
507static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
508 0, 0, 0, 0, 638 0, 0, 0, 0,
509 coro_cv_free 639 coro_cv_free
510}; 640};
511 641
512/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
513static void 643ecb_inline void
514get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
515{ 645{
516 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
517 AV *av; 647 size_t *lenp;
518 648
519 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
520 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
521 else 651 else
522 { 652 {
523#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
524 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
525 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
532#endif 662#endif
533 } 663 }
534} 664}
535 665
536static void 666ecb_inline void
537put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
538{ 668{
539 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
540 AV *av;
541 670
542 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
543 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);
544 681
545 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
546
547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
548 av_extend (av, AvFILLp (av) + 1);
549
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 683}
552 684
553/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
729/* swap sv heads, at least logically */
730static void
731swap_svs_enter (pTHX_ Coro__State c)
732{
733 int i;
734
735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
737}
738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
748#define SWAP_SVS_ENTER(coro) \
749 if (ecb_expect_false ((coro)->swap_sv)) \
750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
554 755
555static void 756static void
556on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
557 758
558static void 759static void
… …
561 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
562 c->slot = 0; 763 c->slot = 0;
563 764
564 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
565 766
566 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
567 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
568 GvSV (PL_errgv) = slot->errsv; 769#else
569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
571
572 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
573 # include "state.h" 771 #include "state.h"
574 #undef VAR 772#endif
575 773
576 { 774 {
577 dSP; 775 dSP;
578 776
579 CV *cv; 777 CV *cv;
580 778
581 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
582 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
583 { 781 {
584 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
585 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
586 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
587 } 785 }
588 786
589 PUTBACK; 787 PUTBACK;
590 } 788 }
591 789
592 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
593 CORO_THROW = c->except; 791 CORO_THROW = c->except;
594 792
595 if (expect_false (enable_times)) 793 if (ecb_expect_false (enable_times))
596 { 794 {
597 if (expect_false (!times_valid)) 795 if (ecb_expect_false (!times_valid))
598 coro_times_update (); 796 coro_times_update ();
599 797
600 coro_times_sub (c); 798 coro_times_sub (c);
601 } 799 }
602 800
603 if (expect_false (c->on_enter)) 801 if (ecb_expect_false (c->on_enter))
604 { 802 {
605 int i; 803 int i;
606 804
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 807 }
808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
817 SWAP_SVS_ENTER (c);
610} 818}
611 819
612static void 820static void
613save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
614{ 822{
823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
832
615 if (expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
616 { 834 {
617 int i; 835 int i;
618 836
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 837 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 838 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 } 839 }
622 840
623 times_valid = 0; 841 times_valid = 0;
624 842
625 if (expect_false (enable_times)) 843 if (ecb_expect_false (enable_times))
626 { 844 {
627 coro_times_update (); times_valid = 1; 845 coro_times_update (); times_valid = 1;
628 coro_times_add (c); 846 coro_times_add (c);
629 } 847 }
630 848
… …
644 862
645 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
646 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
647 for (;;) 865 for (;;)
648 { 866 {
649 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
650 { 868 {
651 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
652 870
653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 871 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
654 { 872 {
655 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
656 874
657 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
658 { 876 {
659 EXTEND (SP, 3); 877 EXTEND (SP, 3);
660 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
661 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
662 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
665 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
666 } 884 }
667 } 885 }
668 } 886 }
669 887
670 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
671 break; 889 break;
672 890
673 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
674 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
675 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
677 895
678 PUTBACK; 896 PUTBACK;
679 } 897 }
680 898
681 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
683 if (SLOT_COUNT >= 1) CXINC;
684 if (SLOT_COUNT >= 2) CXINC;
685 if (SLOT_COUNT >= 3) CXINC;
686 { 901 {
687 unsigned int i; 902 unsigned int i;
903
688 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 905 CXINC;
690 } 906
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
692 909
693 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
694 911
695 { 912 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
697 914
698 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
699 slot->defsv = DEFSV; 916 save_perl_slots (slot);
700 slot->errsv = ERRSV; 917#else
701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
703
704 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
705 # include "state.h" 919 #include "state.h"
706 #undef VAR 920#endif
707 } 921 }
708} 922}
709 923
710/* 924/*
711 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
717# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
718#else 932#else
719static void 933static void
720coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
721{ 935{
722 PL_curstackinfo = new_stackinfo(32, 8); 936 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 940
727 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 956#endif
743 957
744 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
745 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
746 PL_scopestack_max = 8; 960 PL_scopestack_max = 8;
961#if HAS_SCOPESTACK_NAME
962 New(54,PL_scopestack_name,8,const char*);
963#endif
747 964
748 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
749 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
750 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
751 973
752#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
753 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
754 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
755 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
779 } 1001 }
780 1002
781 Safefree (PL_tmps_stack); 1003 Safefree (PL_tmps_stack);
782 Safefree (PL_markstack); 1004 Safefree (PL_markstack);
783 Safefree (PL_scopestack); 1005 Safefree (PL_scopestack);
1006#if HAS_SCOPESTACK_NAME
1007 Safefree (PL_scopestack_name);
1008#endif
784 Safefree (PL_savestack); 1009 Safefree (PL_savestack);
785#if !PERL_VERSION_ATLEAST (5,10,0) 1010#if !PERL_VERSION_ATLEAST (5,10,0)
786 Safefree (PL_retstack); 1011 Safefree (PL_retstack);
787#endif 1012#endif
788} 1013}
… …
834#endif 1059#endif
835 1060
836/* 1061/*
837 * This overrides the default magic get method of %SIG elements. 1062 * This overrides the default magic get method of %SIG elements.
838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1063 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
839 * and instead of trying to save and restore the hash elements, we just provide 1064 * and instead of trying to save and restore the hash elements (extremely slow),
840 * readback here. 1065 * we just provide our own readback here.
841 */ 1066 */
842static int 1067static int ecb_cold
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1068coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 1069{
845 const char *s = MgPV_nolen_const (mg); 1070 const char *s = MgPV_nolen_const (mg);
846 1071
847 if (*s == '_') 1072 if (*s == '_')
848 { 1073 {
849 SV **svp = 0; 1074 SV **svp = 0;
850 1075
851 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1076 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
852 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1077 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
853 1078
854 if (svp) 1079 if (svp)
855 { 1080 {
856 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1081 SV *ssv;
1082
1083 if (!*svp)
1084 ssv = &PL_sv_undef;
1085 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1086 ssv = sv_2mortal (newRV_inc (*svp));
1087 else
1088 ssv = *svp;
1089
1090 sv_setsv (sv, ssv);
857 return 0; 1091 return 0;
858 } 1092 }
859 } 1093 }
860 1094
861 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1095 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
862} 1096}
863 1097
864static int 1098static int ecb_cold
865coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1099coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
866{ 1100{
867 const char *s = MgPV_nolen_const (mg); 1101 const char *s = MgPV_nolen_const (mg);
868 1102
869 if (*s == '_') 1103 if (*s == '_')
… …
883 } 1117 }
884 1118
885 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1119 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
886} 1120}
887 1121
888static int 1122static int ecb_cold
889coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1123coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
890{ 1124{
891 const char *s = MgPV_nolen_const (mg); 1125 const char *s = MgPV_nolen_const (mg);
892 1126
893 if (*s == '_') 1127 if (*s == '_')
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1160slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1161{
928 return 1; 1162 return 1;
929} 1163}
930 1164
931static UNOP coro_setup_op; 1165static UNOP init_perl_op;
932 1166
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1167ecb_noinline static void /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1168init_perl (pTHX_ struct coro *coro)
935{ 1169{
936 /* 1170 /*
937 * emulate part of the perl startup here. 1171 * emulate part of the perl startup here.
938 */ 1172 */
939 coro_init_stacks (aTHX); 1173 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1180 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1181 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1182 PL_curpm = 0;
949 PL_curpad = 0; 1183 PL_curpad = 0;
950 PL_localizing = 0; 1184 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1185 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1186#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1187 PL_parser = 0;
955#endif 1188#endif
956 PL_hints = 0; 1189 PL_hints = 0;
957 1190
958 /* recreate the die/warn hooks */ 1191 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1192 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1193 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1194
962 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1198 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0; 1199 GvHV (PL_hintgv) = newHV ();
1200#if PERL_VERSION_ATLEAST (5,10,0)
1201 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1202#endif
967 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
969 1205
970 { 1206 {
971 dSP; 1207 dSP;
… …
986 /* this newly created coroutine might be run on an existing cctx which most 1222 /* this newly created coroutine might be run on an existing cctx which most
987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1223 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
988 */ 1224 */
989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1225 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1226 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1227 slf_frame.destroy = 0;
991 1228
992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1229 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op; 1230 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1231 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1232 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1233 /* no flags etc. required, as an init function won't be called */
997 1234
998 PL_op = (OP *)&coro_setup_op; 1235 PL_op = (OP *)&init_perl_op;
999 1236
1000 /* copy throw, in case it was set before coro_setup */ 1237 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1002 1239
1240 SWAP_SVS_ENTER (coro);
1241
1003 if (expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1004 { 1243 {
1005 coro_times_update (); 1244 coro_times_update ();
1006 coro_times_sub (coro); 1245 coro_times_sub (coro);
1007 } 1246 }
1008} 1247}
… …
1027 dounwind (-1); 1266 dounwind (-1);
1028 } 1267 }
1029} 1268}
1030 1269
1031static void 1270static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1271destroy_perl (pTHX_ struct coro *coro)
1033{ 1272{
1034 SV *svf [9]; 1273 SV *svf [9];
1035 1274
1036 { 1275 {
1276 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1277 struct coro *current = SvSTATE (old_current);
1038 1278
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1279 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1280
1041 save_perl (aTHX_ current); 1281 save_perl (aTHX_ current);
1282
1283 /* this will cause transfer_check to croak on block*/
1284 SvRV_set (coro_current, (SV *)coro->hv);
1285
1042 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1043 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1044 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1292
1045 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1046 1294
1047 // now save some sv's to be free'd later 1295 /* now save some sv's to be free'd later */
1048 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1297 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1298 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv; 1299 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs; 1300 svf [4] = PL_rs;
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1302 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1303 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1304 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1305 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1306
1307 SvRV_set (coro_current, old_current);
1308
1059 load_perl (aTHX_ current); 1309 load_perl (aTHX_ current);
1060 } 1310 }
1061 1311
1062 { 1312 {
1063 unsigned int i; 1313 unsigned int i;
… …
1067 1317
1068 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1069 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1070 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1071 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1072 } 1324 }
1073} 1325}
1074 1326
1075INLINE void 1327ecb_inline void
1076free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
1077{ 1329{
1078 if (expect_true (coro_mortal)) 1330 if (ecb_expect_true (coro_mortal))
1079 { 1331 {
1080 SvREFCNT_dec (coro_mortal); 1332 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1333 coro_mortal = 0;
1082 } 1334 }
1083} 1335}
1084 1336
1085static int 1337static int
… …
1139 1391
1140 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1141 { 1393 {
1142 SV **cb; 1394 SV **cb;
1143 1395
1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1145 { 1397 {
1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1147 1399
1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1149 { 1401 {
… …
1218 1470
1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1471 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1220} 1472}
1221 1473
1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1474/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1223static void NOINLINE 1475static void ecb_noinline
1224cctx_prepare (pTHX) 1476cctx_prepare (pTHX)
1225{ 1477{
1226 PL_top_env = &PL_start_env; 1478 PL_top_env = &PL_start_env;
1227 1479
1228 if (cctx_current->flags & CC_TRACE) 1480 if (cctx_current->flags & CC_TRACE)
… …
1239 slf_frame.prepare = slf_prepare_set_stacklevel; 1491 slf_frame.prepare = slf_prepare_set_stacklevel;
1240 slf_frame.check = slf_check_set_stacklevel; 1492 slf_frame.check = slf_check_set_stacklevel;
1241} 1493}
1242 1494
1243/* the tail of transfer: execute stuff we can only do after a transfer */ 1495/* the tail of transfer: execute stuff we can only do after a transfer */
1244INLINE void 1496ecb_inline void
1245transfer_tail (pTHX) 1497transfer_tail (pTHX)
1246{ 1498{
1247 free_coro_mortal (aTHX); 1499 free_coro_mortal (aTHX);
1500}
1501
1502/* try to exit the same way perl's main function would do */
1503/* we do not bother resetting the environment or other things *7
1504/* that are not, uhm, essential */
1505/* this obviously also doesn't work when perl is embedded */
1506static void ecb_noinline ecb_cold
1507perlish_exit (pTHX)
1508{
1509 int exitstatus = perl_destruct (PL_curinterp);
1510 perl_free (PL_curinterp);
1511 exit (exitstatus);
1248} 1512}
1249 1513
1250/* 1514/*
1251 * this is a _very_ stripped down perl interpreter ;) 1515 * this is a _very_ stripped down perl interpreter ;)
1252 */ 1516 */
… …
1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1543 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread. 1544 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1545 */
1282 1546
1283 /* 1547 /*
1548 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1549 * requires PL_scopestack_ix, so do it here if required.
1550 */
1551 if (!PL_scopestack_ix)
1552 ENTER;
1553
1554 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1555 * 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) 1556 * 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 1557 * 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" 1558 * 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 */ 1559 */
1292 PL_top_env = main_top_env; 1560 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1561 }
1295} 1562}
1296 1563
1297static coro_cctx * 1564static coro_cctx *
1298cctx_new () 1565cctx_new (void)
1299{ 1566{
1300 coro_cctx *cctx; 1567 coro_cctx *cctx;
1301 1568
1302 ++cctx_count; 1569 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1570 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1576 return cctx;
1310} 1577}
1311 1578
1312/* create a new cctx only suitable as source */ 1579/* create a new cctx only suitable as source */
1313static coro_cctx * 1580static coro_cctx *
1314cctx_new_empty () 1581cctx_new_empty (void)
1315{ 1582{
1316 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1317 1584
1318 cctx->sptr = 0; 1585 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1586 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1587
1321 return cctx; 1588 return cctx;
1322} 1589}
1323 1590
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1591/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1592static coro_cctx *
1326cctx_new_run () 1593cctx_new_run (void)
1327{ 1594{
1328 coro_cctx *cctx = cctx_new (); 1595 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1596
1332#if HAVE_MMAP 1597 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 } 1598 {
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."); 1599 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1600 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1601 }
1361 1602
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); 1603 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1604
1368 return cctx; 1605 return cctx;
1369} 1606}
1370 1607
1371static void 1608static void
1372cctx_destroy (coro_cctx *cctx) 1609cctx_destroy (coro_cctx *cctx)
1373{ 1610{
1374 if (!cctx) 1611 if (!cctx)
1375 return; 1612 return;
1376 1613
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1614 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1615
1379 --cctx_count; 1616 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1617 coro_destroy (&cctx->cctx);
1381 1618
1382 /* coro_transfer creates new, empty cctx's */ 1619 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 1620
1397 Safefree (cctx); 1621 Safefree (cctx);
1398} 1622}
1399 1623
1400/* wether this cctx should be destructed */ 1624/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1625#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1626
1403static coro_cctx * 1627static coro_cctx *
1404cctx_get (pTHX) 1628cctx_get (pTHX)
1405{ 1629{
1406 while (expect_true (cctx_first)) 1630 while (ecb_expect_true (cctx_first))
1407 { 1631 {
1408 coro_cctx *cctx = cctx_first; 1632 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1633 cctx_first = cctx->next;
1410 --cctx_idle; 1634 --cctx_idle;
1411 1635
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1636 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1637 return cctx;
1414 1638
1415 cctx_destroy (cctx); 1639 cctx_destroy (cctx);
1416 } 1640 }
1417 1641
… …
1419} 1643}
1420 1644
1421static void 1645static void
1422cctx_put (coro_cctx *cctx) 1646cctx_put (coro_cctx *cctx)
1423{ 1647{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1648 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1649
1426 /* free another cctx if overlimit */ 1650 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1651 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1652 {
1429 coro_cctx *first = cctx_first; 1653 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1654 cctx_first = first->next;
1431 --cctx_idle; 1655 --cctx_idle;
1432 1656
… …
1443static void 1667static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1668transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1669{
1446 /* TODO: throwing up here is considered harmful */ 1670 /* TODO: throwing up here is considered harmful */
1447 1671
1448 if (expect_true (prev != next)) 1672 if (ecb_expect_true (prev != next))
1449 { 1673 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1674 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,"); 1675 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1676
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1677 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,"); 1678 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1679
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1680#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1681 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,"); 1682 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1683#endif
1460 } 1684 }
1461} 1685}
1462 1686
1463/* always use the TRANSFER macro */ 1687/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1688static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1689transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1690{
1467 dSTACKLEVEL; 1691 dSTACKLEVEL;
1468 1692
1469 /* sometimes transfer is only called to set idle_sp */ 1693 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1694 if (ecb_expect_false (!prev))
1471 { 1695 {
1472 cctx_current->idle_sp = STACKLEVEL; 1696 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1697 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1698 }
1475 else if (expect_true (prev != next)) 1699 else if (ecb_expect_true (prev != next))
1476 { 1700 {
1477 coro_cctx *cctx_prev; 1701 coro_cctx *cctx_prev;
1478 1702
1479 if (expect_false (prev->flags & CF_NEW)) 1703 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1704 {
1481 /* create a new empty/source context */ 1705 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1706 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1707 prev->flags |= CF_RUNNING;
1484 } 1708 }
… …
1487 next->flags |= CF_RUNNING; 1711 next->flags |= CF_RUNNING;
1488 1712
1489 /* first get rid of the old state */ 1713 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1714 save_perl (aTHX_ prev);
1491 1715
1492 if (expect_false (next->flags & CF_NEW)) 1716 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1717 {
1494 /* need to start coroutine */ 1718 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1719 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1720 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1721 init_perl (aTHX_ next);
1498 } 1722 }
1499 else 1723 else
1500 load_perl (aTHX_ next); 1724 load_perl (aTHX_ next);
1501 1725
1502 /* possibly untie and reuse the cctx */ 1726 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1727 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1728 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1729 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1730 && !force_cctx
1507 )) 1731 ))
1508 { 1732 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1733 /* 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)); 1734 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1735
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1736 /* 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 */ 1737 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1738 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1739 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1740 next->cctx = cctx_get (aTHX);
1517 1741
1518 cctx_put (cctx_current); 1742 cctx_put (cctx_current);
1519 } 1743 }
1520 else 1744 else
1521 prev->cctx = cctx_current; 1745 prev->cctx = cctx_current;
1522 1746
1523 ++next->usecount; 1747 ++next->usecount;
1524 1748
1525 cctx_prev = cctx_current; 1749 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1750 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1751
1528 next->cctx = 0; 1752 next->cctx = 0;
1529 1753
1530 if (expect_false (cctx_prev != cctx_current)) 1754 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1755 {
1532 cctx_prev->top_env = PL_top_env; 1756 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1757 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1758 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1759 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1765#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) 1766#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1767
1544/** high level stuff ********************************************************/ 1768/** high level stuff ********************************************************/
1545 1769
1770/* this function is actually Coro, not Coro::State, but we call it from here */
1771/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1772static void
1773coro_call_on_destroy (pTHX_ struct coro *coro);
1774
1775static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1776coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1777{
1549 if (coro->flags & CF_DESTROYED) 1778 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1779 return;
1551 1780
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1781 slf_destroy (aTHX_ coro);
1554 1782
1555 coro->flags |= CF_DESTROYED; 1783 coro->flags |= CF_ZOMBIE;
1556 1784
1557 if (coro->flags & CF_READY) 1785 if (coro->flags & CF_READY)
1558 { 1786 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1787 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1788 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1789 --coro_nready;
1562 } 1790 }
1563 else 1791 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1792 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1793
1794 if (coro->next) coro->next->prev = coro->prev;
1795 if (coro->prev) coro->prev->next = coro->next;
1796 if (coro == coro_first) coro_first = coro->next;
1565 1797
1566 if (coro->mainstack 1798 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1799 && coro->mainstack != main_mainstack
1568 && coro->slot 1800 && coro->slot
1569 && !PL_dirty) 1801 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1802 destroy_perl (aTHX_ coro);
1571 1803
1572 cctx_destroy (coro->cctx); 1804 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1805 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1806 SvREFCNT_dec (coro->args);
1807 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1808 SvREFCNT_dec (CORO_THROW);
1576 1809
1577 if (coro->next) coro->next->prev = coro->prev; 1810 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 1811
1581 return 1; 1812 /* more destruction mayhem in coro_state_free */
1582} 1813}
1583 1814
1584static int 1815static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1816coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1817{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1818 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1819 mg->mg_ptr = 0;
1589 1820
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1821 coro_state_destroy (aTHX_ coro);
1822 SvREFCNT_dec (coro->on_destroy);
1823 SvREFCNT_dec (coro->status);
1824
1595 Safefree (coro); 1825 Safefree (coro);
1596 }
1597 1826
1598 return 0; 1827 return 0;
1599} 1828}
1600 1829
1601static int 1830static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1831coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1832{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1833 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1834 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1835 mg->mg_ptr = 0;
1836 mg->mg_virtual = 0;
1607 1837
1608 return 0; 1838 return 0;
1609} 1839}
1610 1840
1611static MGVTBL coro_state_vtbl = { 1841static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1866 TRANSFER (ta, 1);
1637} 1867}
1638 1868
1639/** Coro ********************************************************************/ 1869/** Coro ********************************************************************/
1640 1870
1641INLINE void 1871ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1872coro_enq (pTHX_ struct coro *coro)
1643{ 1873{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1874 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1875
1646 SvREFCNT_inc_NN (coro->hv); 1876 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1878 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1879 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1880 ready [1] = coro;
1651} 1881}
1652 1882
1653INLINE struct coro * 1883ecb_inline struct coro *
1654coro_deq (pTHX) 1884coro_deq (pTHX)
1655{ 1885{
1656 int prio; 1886 int prio;
1657 1887
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1888 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1941{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1942 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1943}
1714 1944
1715/* expects to own a reference to next->hv */ 1945/* expects to own a reference to next->hv */
1716INLINE void 1946ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1947prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1948{
1719 SV *prev_sv = SvRV (coro_current); 1949 SV *prev_sv = SvRV (coro_current);
1720 1950
1721 ta->prev = SvSTATE_hv (prev_sv); 1951 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1964{
1735 for (;;) 1965 for (;;)
1736 { 1966 {
1737 struct coro *next = coro_deq (aTHX); 1967 struct coro *next = coro_deq (aTHX);
1738 1968
1739 if (expect_true (next)) 1969 if (ecb_expect_true (next))
1740 { 1970 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1971 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1972 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 */ 1973 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1974 else
1745 { 1975 {
1746 next->flags &= ~CF_READY; 1976 next->flags &= ~CF_READY;
1747 --coro_nready; 1977 --coro_nready;
… …
1754 { 1984 {
1755 /* nothing to schedule: call the idle handler */ 1985 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1986 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1987 && SvOBJECT (SvRV (sv_idle)))
1758 { 1988 {
1989 if (SvRV (sv_idle) == SvRV (coro_current))
1990 {
1991 require_pv ("Carp");
1992
1993 {
1994 dSP;
1995
1996 ENTER;
1997 SAVETMPS;
1998
1999 PUSHMARK (SP);
2000 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2001 PUTBACK;
2002 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2003
2004 FREETMPS;
2005 LEAVE;
2006 }
2007 }
2008
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2009 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 2010 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 2011 --coro_nready;
1762 } 2012 }
1763 else 2013 else
… …
1777 } 2027 }
1778 } 2028 }
1779 } 2029 }
1780} 2030}
1781 2031
1782INLINE void 2032ecb_inline void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 2033prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 2034{
1785 api_ready (aTHX_ coro_current); 2035 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 2036 prepare_schedule (aTHX_ ta);
1787} 2037}
1788 2038
1789INLINE void 2039ecb_inline void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2040prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 2041{
1792 SV *prev = SvRV (coro_current); 2042 SV *prev = SvRV (coro_current);
1793 2043
1794 if (coro_nready) 2044 if (coro_nready)
… …
1824{ 2074{
1825 struct coro_transfer_args ta; 2075 struct coro_transfer_args ta;
1826 2076
1827 prepare_cede (aTHX_ &ta); 2077 prepare_cede (aTHX_ &ta);
1828 2078
1829 if (expect_true (ta.prev != ta.next)) 2079 if (ecb_expect_true (ta.prev != ta.next))
1830 { 2080 {
1831 TRANSFER (ta, 1); 2081 TRANSFER (ta, 1);
1832 return 1; 2082 return 1;
1833 } 2083 }
1834 else 2084 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2127 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2128 }
1879} 2129}
1880 2130
1881static void 2131static void
2132coro_push_av (pTHX_ AV *av, I32 gimme_v)
2133{
2134 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2135 {
2136 dSP;
2137
2138 if (gimme_v == G_SCALAR)
2139 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2140 else
2141 {
2142 int i;
2143 EXTEND (SP, AvFILLp (av) + 1);
2144
2145 for (i = 0; i <= AvFILLp (av); ++i)
2146 PUSHs (AvARRAY (av)[i]);
2147 }
2148
2149 PUTBACK;
2150 }
2151}
2152
2153static void
2154coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2155{
2156 if (!coro->on_destroy)
2157 coro->on_destroy = newAV ();
2158
2159 av_push (coro->on_destroy, cb);
2160}
2161
2162static void
2163slf_destroy_join (pTHX_ struct CoroSLF *frame)
2164{
2165 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2166}
2167
2168static int
2169slf_check_join (pTHX_ struct CoroSLF *frame)
2170{
2171 struct coro *coro = (struct coro *)frame->data;
2172
2173 if (!coro->status)
2174 return 1;
2175
2176 frame->destroy = 0;
2177
2178 coro_push_av (aTHX_ coro->status, GIMME_V);
2179
2180 SvREFCNT_dec ((SV *)coro->hv);
2181
2182 return 0;
2183}
2184
2185static void
2186slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2187{
2188 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2189
2190 if (items > 1)
2191 croak ("join called with too many arguments");
2192
2193 if (coro->status)
2194 frame->prepare = prepare_nop;
2195 else
2196 {
2197 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2198 frame->prepare = prepare_schedule;
2199 }
2200
2201 frame->check = slf_check_join;
2202 frame->destroy = slf_destroy_join;
2203 frame->data = (void *)coro;
2204 SvREFCNT_inc (coro->hv);
2205}
2206
2207static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2208coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2209{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2210 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2211
1887 if (on_destroyp) 2212 if (!od)
1888 { 2213 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2214
2215 coro->on_destroy = 0;
2216 sv_2mortal ((SV *)od);
2217
1891 while (AvFILLp (on_destroy) >= 0) 2218 while (AvFILLp (od) >= 0)
2219 {
2220 SV *cb = sv_2mortal (av_pop (od));
2221
2222 /* coro hv's (and only hv's at the moment) are supported as well */
2223 if (SvSTATEhv_p (aTHX_ cb))
2224 api_ready (aTHX_ cb);
2225 else
1892 { 2226 {
1893 dSP; /* don't disturb outer sp */ 2227 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2228 PUSHMARK (SP);
1897 2229
1898 if (statusp) 2230 if (coro->status)
1899 { 2231 {
1900 int i; 2232 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2233 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2234 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2235 }
1907 2236
1908 PUTBACK; 2237 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2238 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2239 }
1911 } 2240 }
1912} 2241}
1913 2242
1914static void 2243static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2244coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2245{
1917 int i; 2246 AV *av;
1918 HV *hv = (HV *)SvRV (coro_current); 2247
1919 AV *av = newAV (); 2248 if (coro->status)
2249 {
2250 av = coro->status;
2251 av_clear (av);
2252 }
2253 else
2254 av = coro->status = newAV ();
1920 2255
1921 /* items are actually not so common, so optimise for this case */ 2256 /* items are actually not so common, so optimise for this case */
1922 if (items) 2257 if (items)
1923 { 2258 {
2259 int i;
2260
1924 av_extend (av, items - 1); 2261 av_extend (av, items - 1);
1925 2262
1926 for (i = 0; i < items; ++i) 2263 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2264 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2265 }
2266}
1929 2267
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2268static void
1931 2269slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2270{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2271 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2272 api_ready (aTHX_ sv_manager);
1934 2273
1935 frame->prepare = prepare_schedule; 2274 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2275 frame->check = slf_check_repeat;
1937 2276
1938 /* as a minor optimisation, we could unwind all stacks here */ 2277 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2278 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2279 /*coro_unwind_stacks (aTHX);*/
2280}
2281
2282static void
2283slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2284{
2285 HV *coro_hv = (HV *)SvRV (coro_current);
2286
2287 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2289}
2290
2291static void
2292slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2293{
2294 HV *coro_hv;
2295 struct coro *coro;
2296
2297 if (items <= 0)
2298 croak ("Coro::cancel called without coro object,");
2299
2300 coro = SvSTATE (arg [0]);
2301 coro_hv = coro->hv;
2302
2303 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2304
2305 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2306 {
2307 /* coro currently busy cancelling something, so just notify it */
2308 coro->slf_frame.data = (void *)coro;
2309
2310 frame->prepare = prepare_nop;
2311 frame->check = slf_check_nop;
2312 }
2313 else if (coro_hv == (HV *)SvRV (coro_current))
2314 {
2315 /* cancelling the current coro is allowed, and equals terminate */
2316 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2317 }
2318 else
2319 {
2320 struct coro *self = SvSTATE_current;
2321
2322 if (!self)
2323 croak ("Coro::cancel called outside of thread content,");
2324
2325 /* otherwise we cancel directly, purely for speed reasons
2326 * unfortunately, this requires some magic trickery, as
2327 * somebody else could cancel us, so we have to fight the cancellation.
2328 * this is ugly, and hopefully fully worth the extra speed.
2329 * besides, I can't get the slow-but-safe version working...
2330 */
2331 slf_frame.data = 0;
2332 self->flags |= CF_NOCANCEL;
2333 coro_state_destroy (aTHX_ coro);
2334 self->flags &= ~CF_NOCANCEL;
2335
2336 if (slf_frame.data)
2337 {
2338 /* while we were busy we have been cancelled, so terminate */
2339 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2340 }
2341 else
2342 {
2343 frame->prepare = prepare_nop;
2344 frame->check = slf_check_nop;
2345 }
2346 }
2347}
2348
2349static int
2350slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2351{
2352 frame->prepare = 0;
2353 coro_unwind_stacks (aTHX);
2354
2355 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2356
2357 return 1;
2358}
2359
2360static int
2361safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2362{
2363 if (coro->cctx)
2364 croak ("coro inside C callback, unable to cancel at this time, caught");
2365
2366 if (coro->flags & CF_NEW)
2367 {
2368 coro_set_status (aTHX_ coro, arg, items);
2369 coro_state_destroy (aTHX_ coro);
2370 }
2371 else
2372 {
2373 if (!coro->slf_frame.prepare)
2374 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2375
2376 slf_destroy (aTHX_ coro);
2377
2378 coro_set_status (aTHX_ coro, arg, items);
2379 coro->slf_frame.prepare = prepare_nop;
2380 coro->slf_frame.check = slf_check_safe_cancel;
2381
2382 api_ready (aTHX_ (SV *)coro->hv);
2383 }
2384
2385 return 1;
1941} 2386}
1942 2387
1943/*****************************************************************************/ 2388/*****************************************************************************/
1944/* async pool handler */ 2389/* async pool handler */
1945 2390
… …
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2421slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{ 2422{
1978 HV *hv = (HV *)SvRV (coro_current); 2423 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv); 2424 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980 2425
1981 if (expect_true (coro->saved_deffh)) 2426 if (ecb_expect_true (coro->saved_deffh))
1982 { 2427 {
1983 /* subsequent iteration */ 2428 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2429 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0; 2430 coro->saved_deffh = 0;
1986 2431
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2432 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2433 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2434 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2435 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2436 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2437 }
1995 else 2438 else
1996 { 2439 {
1997 av_clear (GvAV (PL_defgv)); 2440 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2441 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1999 2442
2443 if (ecb_expect_false (coro->swap_sv))
2444 {
2445 swap_svs_leave (coro);
2446 SvREFCNT_dec_NN (coro->swap_sv);
2447 coro->swap_sv = 0;
2448 }
2449
2000 coro->prio = 0; 2450 coro->prio = 0;
2001 2451
2002 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2452 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2003 api_trace (aTHX_ coro_current, 0); 2453 api_trace (aTHX_ coro_current, 0);
2004 2454
2005 frame->prepare = prepare_schedule; 2455 frame->prepare = prepare_schedule;
2006 av_push (av_async_pool, SvREFCNT_inc (hv)); 2456 av_push (av_async_pool, SvREFCNT_inc (hv));
2007 } 2457 }
… …
2048 2498
2049static int 2499static int
2050slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2500slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2051{ 2501{
2052 SV *data = (SV *)frame->data; 2502 SV *data = (SV *)frame->data;
2053 2503
2054 if (CORO_THROW) 2504 if (CORO_THROW)
2055 return 0; 2505 return 0;
2056 2506
2057 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2507 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2058 return 1; 2508 return 1;
… …
2094 cb = sv_2mortal (coro->rouse_cb); 2544 cb = sv_2mortal (coro->rouse_cb);
2095 coro->rouse_cb = 0; 2545 coro->rouse_cb = 0;
2096 } 2546 }
2097 2547
2098 if (!SvROK (cb) 2548 if (!SvROK (cb)
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2549 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2550 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2551 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2552
2103 { 2553 {
2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2554 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2221static void 2671static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2672slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2673{
2224 frame->prepare = prepare_cede_notself; 2674 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2675 frame->check = slf_check_nop;
2676}
2677
2678/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2679static void
2680slf_destroy (pTHX_ struct coro *coro)
2681{
2682 struct CoroSLF frame = coro->slf_frame;
2683
2684 /*
2685 * The on_destroy below most likely is from an SLF call.
2686 * Since by definition the SLF call will not finish when we destroy
2687 * the coro, we will have to force-finish it here, otherwise
2688 * cleanup functions cannot call SLF functions.
2689 */
2690 coro->slf_frame.prepare = 0;
2691
2692 /* this callback is reserved for slf functions needing to do cleanup */
2693 if (frame.destroy && frame.prepare && !PL_dirty)
2694 frame.destroy (aTHX_ &frame);
2226} 2695}
2227 2696
2228/* 2697/*
2229 * these not obviously related functions are all rolled into one 2698 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2699 * function to increase chances that they all will call transfer with the same
… …
2237 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2706 I32 checkmark; /* mark SP to see how many elements check has pushed */
2238 2707
2239 /* set up the slf frame, unless it has already been set-up */ 2708 /* set up the slf frame, unless it has already been set-up */
2240 /* the latter happens when a new coro has been started */ 2709 /* the latter happens when a new coro has been started */
2241 /* or when a new cctx was attached to an existing coroutine */ 2710 /* or when a new cctx was attached to an existing coroutine */
2242 if (expect_true (!slf_frame.prepare)) 2711 if (ecb_expect_true (!slf_frame.prepare))
2243 { 2712 {
2244 /* first iteration */ 2713 /* first iteration */
2245 dSP; 2714 dSP;
2246 SV **arg = PL_stack_base + TOPMARK + 1; 2715 SV **arg = PL_stack_base + TOPMARK + 1;
2247 int items = SP - arg; /* args without function object */ 2716 int items = SP - arg; /* args without function object */
… …
2288 while (slf_frame.check (aTHX_ &slf_frame)); 2757 while (slf_frame.check (aTHX_ &slf_frame));
2289 2758
2290 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2759 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2291 2760
2292 /* exception handling */ 2761 /* exception handling */
2293 if (expect_false (CORO_THROW)) 2762 if (ecb_expect_false (CORO_THROW))
2294 { 2763 {
2295 SV *exception = sv_2mortal (CORO_THROW); 2764 SV *exception = sv_2mortal (CORO_THROW);
2296 2765
2297 CORO_THROW = 0; 2766 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception); 2767 sv_setsv (ERRSV, exception);
2299 croak (0); 2768 croak (0);
2300 } 2769 }
2301 2770
2302 /* return value handling - mostly like entersub */ 2771 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2772 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2773 if (GIMME_V == G_SCALAR
2774 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2775 {
2306 dSP; 2776 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2777 SV **bot = PL_stack_base + checkmark;
2308 2778
2309 if (sp == bot) /* too few, push undef */ 2779 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2780 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2781 else /* too many, take last one */
2312 bot [1] = *sp; 2782 bot [1] = *sp;
2313 2783
2314 SP = bot + 1; 2784 SP = bot + 1;
2315 2785
2316 PUTBACK; 2786 PUTBACK;
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2819 if (PL_op->op_flags & OPf_STACKED)
2350 { 2820 {
2351 if (items > slf_arga) 2821 if (items > slf_arga)
2352 { 2822 {
2353 slf_arga = items; 2823 slf_arga = items;
2354 free (slf_argv); 2824 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2825 New (0, slf_argv, slf_arga, SV *);
2356 } 2826 }
2357 2827
2358 slf_argc = items; 2828 slf_argc = items;
2359 2829
2360 for (i = 0; i < items; ++i) 2830 for (i = 0; i < items; ++i)
… …
2414{ 2884{
2415 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2885 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2416 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2886 on_enterleave_call (aTHX_ sv_2mortal (cb));
2417} 2887}
2418 2888
2889static void
2890enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2891{
2892 if (!hook)
2893 return;
2894
2895 if (!*avp)
2896 {
2897 *avp = newAV ();
2898 AvREAL_off (*avp);
2899 }
2900
2901 av_push (*avp, (SV *)hook);
2902 av_push (*avp, (SV *)arg);
2903}
2904
2905static void
2906enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2907{
2908 AV *av = *avp;
2909 int i;
2910
2911 if (!av)
2912 return;
2913
2914 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2915 if (AvARRAY (av)[i] == (SV *)hook)
2916 {
2917 if (execute)
2918 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2919
2920 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2921 av_pop (av);
2922 av_pop (av);
2923 break;
2924 }
2925
2926 if (AvFILLp (av) >= 0)
2927 {
2928 *avp = 0;
2929 SvREFCNT_dec_NN (av);
2930 }
2931}
2932
2933static void
2934api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 if (SvSTATE_current == coro)
2939 if (enter)
2940 enter (aTHX_ enter_arg);
2941
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2943 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2944}
2945
2946static void
2947api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2948{
2949 struct coro *coro = SvSTATE (coro_sv);
2950
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2952 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2953}
2954
2955static void
2956savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2957{
2958 struct coro *coro = SvSTATE_current;
2959
2960 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2961}
2962
2963static void
2964savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2965{
2966 struct coro *coro = SvSTATE_current;
2967
2968 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2969}
2970
2971static void
2972api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2975
2976 /* this ought to be much cheaper than malloc + a single destructor call */
2977 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2978 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2979}
2980
2419/*****************************************************************************/ 2981/*****************************************************************************/
2420/* PerlIO::cede */ 2982/* PerlIO::cede */
2421 2983
2422typedef struct 2984typedef struct
2423{ 2985{
2424 PerlIOBuf base; 2986 PerlIOBuf base;
2425 NV next, every; 2987 NV next, every;
2426} PerlIOCede; 2988} PerlIOCede;
2427 2989
2428static IV 2990static IV ecb_cold
2429PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2991PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2430{ 2992{
2431 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2993 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2432 2994
2433 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2995 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2434 self->next = nvtime () + self->every; 2996 self->next = nvtime () + self->every;
2435 2997
2436 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2998 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2437} 2999}
2438 3000
2439static SV * 3001static SV * ecb_cold
2440PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3002PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2441{ 3003{
2442 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3004 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2443 3005
2444 return newSVnv (self->every); 3006 return newSVnv (self->every);
… …
2551 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3113 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2552 PUTBACK; 3114 PUTBACK;
2553 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3115 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2554 } 3116 }
2555 3117
2556 SvREFCNT_dec (cb); 3118 SvREFCNT_dec_NN (cb);
2557 } 3119 }
2558} 3120}
2559 3121
2560static void 3122static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3123coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2562{ 3124{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3125 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3126 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2565} 3127}
2566 3128
2567static int 3129static int
2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3130slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2569{ 3131{
2570 AV *av = (AV *)frame->data; 3132 AV *av = (AV *)frame->data;
2571 SV *count_sv = AvARRAY (av)[0]; 3133 SV *count_sv = AvARRAY (av)[0];
3134 SV *coro_hv = SvRV (coro_current);
3135
3136 frame->destroy = 0;
2572 3137
2573 /* if we are about to throw, don't actually acquire the lock, just throw */ 3138 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW) 3139 if (ecb_expect_false (CORO_THROW))
3140 {
3141 /* we still might be responsible for the semaphore, so wake up others */
3142 coro_semaphore_adjust (aTHX_ av, 0);
3143
2575 return 0; 3144 return 0;
3145 }
2576 else if (SvIVX (count_sv) > 0) 3146 else if (SvIVX (count_sv) > 0)
2577 { 3147 {
2578 SvSTATE_current->on_destroy = 0;
2579
2580 if (acquire) 3148 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3149 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 3150 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 3151 coro_semaphore_adjust (aTHX_ av, 0);
2584 3152
… …
2588 { 3156 {
2589 int i; 3157 int i;
2590 /* if we were woken up but can't down, we look through the whole */ 3158 /* if we were woken up but can't down, we look through the whole */
2591 /* waiters list and only add us if we aren't in there already */ 3159 /* waiters list and only add us if we aren't in there already */
2592 /* this avoids some degenerate memory usage cases */ 3160 /* this avoids some degenerate memory usage cases */
2593 3161 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2594 for (i = 1; i <= AvFILLp (av); ++i)
2595 if (AvARRAY (av)[i] == SvRV (coro_current)) 3162 if (AvARRAY (av)[i] == coro_hv)
2596 return 1; 3163 return 1;
2597 3164
2598 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3165 av_push (av, SvREFCNT_inc (coro_hv));
2599 return 1; 3166 return 1;
2600 } 3167 }
2601} 3168}
2602 3169
2603static int 3170static int
… …
2626 { 3193 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3194 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 3195
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3196 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 3197 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 3198 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3199 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3200 frame->destroy = coro_semaphore_destroy;
2635 } 3201 }
2636} 3202}
2637 3203
2638static void 3204static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3205slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2697 { 3263 {
2698 api_ready (aTHX_ cb); 3264 api_ready (aTHX_ cb);
2699 sv_setiv (cb, 0); /* signal waiter */ 3265 sv_setiv (cb, 0); /* signal waiter */
2700 } 3266 }
2701 3267
2702 SvREFCNT_dec (cb); 3268 SvREFCNT_dec_NN (cb);
2703 3269
2704 --count; 3270 --count;
2705 } 3271 }
2706} 3272}
2707 3273
… …
2721 { 3287 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]); 3288 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3289 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 3290
2725 if (SvIVX (AvARRAY (av)[0])) 3291 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3292 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 3293
2728 frame->prepare = prepare_nop; 3294 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 3295 frame->check = slf_check_nop;
2730 } 3296 }
2731 else if (SvIVX (AvARRAY (av)[0])) 3297 else if (SvIVX (AvARRAY (av)[0]))
… …
2792 } 3358 }
2793 3359
2794 av_push (state, data_sv); 3360 av_push (state, data_sv);
2795 3361
2796 api_ready (aTHX_ coro); 3362 api_ready (aTHX_ coro);
2797 SvREFCNT_dec (coro); 3363 SvREFCNT_dec_NN (coro);
2798 SvREFCNT_dec ((AV *)state); 3364 SvREFCNT_dec_NN ((AV *)state);
2799} 3365}
2800 3366
2801static int 3367static int
2802slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3368slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2803{ 3369{
… …
2808 /* it quickly returns */ 3374 /* it quickly returns */
2809 if (CORO_THROW) 3375 if (CORO_THROW)
2810 return 0; 3376 return 0;
2811 3377
2812 /* one element that is an RV? repeat! */ 3378 /* one element that is an RV? repeat! */
2813 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3379 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2814 return 1; 3380 return 1;
2815 3381
2816 /* restore status */ 3382 /* restore status */
2817 { 3383 {
2818 SV *data_sv = av_pop (state); 3384 SV *data_sv = av_pop (state);
… …
2821 errno = data->errorno; 3387 errno = data->errorno;
2822 PL_laststype = data->laststype; 3388 PL_laststype = data->laststype;
2823 PL_laststatval = data->laststatval; 3389 PL_laststatval = data->laststatval;
2824 PL_statcache = data->statcache; 3390 PL_statcache = data->statcache;
2825 3391
2826 SvREFCNT_dec (data_sv); 3392 SvREFCNT_dec_NN (data_sv);
2827 } 3393 }
2828 3394
2829 /* push result values */ 3395 /* push result values */
2830 { 3396 {
2831 dSP; 3397 dSP;
… …
2857 dSP; 3423 dSP;
2858 3424
2859 static SV *prio_cv; 3425 static SV *prio_cv;
2860 static SV *prio_sv; 3426 static SV *prio_sv;
2861 3427
2862 if (expect_false (!prio_cv)) 3428 if (ecb_expect_false (!prio_cv))
2863 { 3429 {
2864 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3430 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2865 prio_sv = newSViv (0); 3431 prio_sv = newSViv (0);
2866 } 3432 }
2867 3433
… …
2893 /* now call the AIO function - we assume our request is uncancelable */ 3459 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3460 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3461 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3462 }
2897 3463
2898 /* now that the requets is going, we loop toll we have a result */ 3464 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3465 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3466 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3467 frame->check = slf_check_aio_req;
2902} 3468}
2903 3469
… …
2973 } 3539 }
2974 3540
2975 return coro_sv; 3541 return coro_sv;
2976} 3542}
2977 3543
3544#ifndef __cplusplus
3545ecb_cold XS(boot_Coro__State);
3546#endif
3547
3548#if CORO_JIT
3549
3550static void ecb_noinline ecb_cold
3551pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3552{
3553 dSP;
3554 AV *av = newAV ();
3555
3556 av_store (av, 3, newSVuv (d));
3557 av_store (av, 2, newSVuv (c));
3558 av_store (av, 1, newSVuv (b));
3559 av_store (av, 0, newSVuv (a));
3560
3561 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3562
3563 PUTBACK;
3564}
3565
3566static void ecb_noinline ecb_cold
3567jit_init (pTHX)
3568{
3569 dSP;
3570 SV *load, *save;
3571 char *map_base;
3572 char *load_ptr, *save_ptr;
3573 STRLEN load_len, save_len, map_len;
3574 int count;
3575
3576 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3577
3578 PUSHMARK (SP);
3579 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3580 #include "state.h"
3581 count = call_pv ("Coro::State::_jit", G_ARRAY);
3582 SPAGAIN;
3583
3584 save = POPs; save_ptr = SvPVbyte (save, save_len);
3585 load = POPs; load_ptr = SvPVbyte (load, load_len);
3586
3587 map_len = load_len + save_len + 16;
3588
3589 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3590
3591 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3592
3593 load_perl_slots = (load_save_perl_slots_type)map_base;
3594 memcpy (map_base, load_ptr, load_len);
3595
3596 map_base += (load_len + 15) & ~15;
3597
3598 save_perl_slots = (load_save_perl_slots_type)map_base;
3599 memcpy (map_base, save_ptr, save_len);
3600
3601 /* we are good citizens and try to make the page read-only, so the evil evil */
3602 /* hackers might have it a bit more difficult */
3603 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3604
3605 PUTBACK;
3606 eval_pv ("undef &Coro::State::_jit", 1);
3607}
3608
3609#endif
3610
2978MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3611MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2979 3612
2980PROTOTYPES: DISABLE 3613PROTOTYPES: DISABLE
2981 3614
2982BOOT: 3615BOOT:
2983{ 3616{
3617#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3618#include "state.h"
2984#ifdef USE_ITHREADS 3619#ifdef USE_ITHREADS
2985# if CORO_PTHREAD 3620# if CORO_PTHREAD
2986 coro_thx = PERL_GET_CONTEXT; 3621 coro_thx = PERL_GET_CONTEXT;
2987# endif 3622# endif
2988#endif 3623#endif
2989 BOOT_PAGESIZE; 3624 /* perl defines these to check for existance first, but why it doesn't */
3625 /* just create them one at init time is not clear to me, except for */
3626 /* programs trying to delete them, but... */
3627 /* anyway, we declare this as invalid and make sure they are initialised here */
3628 DEFSV;
3629 ERRSV;
2990 3630
2991 cctx_current = cctx_new_empty (); 3631 cctx_current = cctx_new_empty ();
2992 3632
2993 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3633 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2994 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3634 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2995 3635
2996 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3636 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2997 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3637 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2998 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3638 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2999 3639
3000 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3001 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3640 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3002 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3641 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3003 3642
3004 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3643 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3005 3644
… …
3034 coroapi.prepare_nop = prepare_nop; 3673 coroapi.prepare_nop = prepare_nop;
3035 coroapi.prepare_schedule = prepare_schedule; 3674 coroapi.prepare_schedule = prepare_schedule;
3036 coroapi.prepare_cede = prepare_cede; 3675 coroapi.prepare_cede = prepare_cede;
3037 coroapi.prepare_cede_notself = prepare_cede_notself; 3676 coroapi.prepare_cede_notself = prepare_cede_notself;
3038 3677
3039 { 3678 time_init (aTHX);
3040 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3041
3042 if (!svp) croak ("Time::HiRes is required");
3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3044
3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3049 }
3050 3679
3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3680 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3681#if CORO_JIT
3682 PUTBACK;
3683 jit_init (aTHX);
3684 SPAGAIN;
3685#endif
3052} 3686}
3053 3687
3054SV * 3688SV *
3055new (SV *klass, ...) 3689new (SV *klass, ...)
3056 ALIAS: 3690 ALIAS:
… …
3063void 3697void
3064transfer (...) 3698transfer (...)
3065 PROTOTYPE: $$ 3699 PROTOTYPE: $$
3066 CODE: 3700 CODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3701 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3068
3069bool
3070_destroy (SV *coro_sv)
3071 CODE:
3072 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3073 OUTPUT:
3074 RETVAL
3075
3076void
3077_exit (int code)
3078 PROTOTYPE: $
3079 CODE:
3080 _exit (code);
3081 3702
3082SV * 3703SV *
3083clone (Coro::State coro) 3704clone (Coro::State coro)
3084 CODE: 3705 CODE:
3085{ 3706{
… …
3140void 3761void
3141list () 3762list ()
3142 PROTOTYPE: 3763 PROTOTYPE:
3143 PPCODE: 3764 PPCODE:
3144{ 3765{
3145 struct coro *coro; 3766 struct coro *coro;
3146 for (coro = coro_first; coro; coro = coro->next) 3767 for (coro = coro_first; coro; coro = coro->next)
3147 if (coro->hv) 3768 if (coro->hv)
3148 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3769 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3149} 3770}
3150 3771
… …
3155 CODE: 3776 CODE:
3156{ 3777{
3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3778 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3158 { 3779 {
3159 struct coro *current = SvSTATE_current; 3780 struct coro *current = SvSTATE_current;
3781 struct CoroSLF slf_save;
3160 3782
3161 if (current != coro) 3783 if (current != coro)
3162 { 3784 {
3163 PUTBACK; 3785 PUTBACK;
3164 save_perl (aTHX_ current); 3786 save_perl (aTHX_ current);
3165 load_perl (aTHX_ coro); 3787 load_perl (aTHX_ coro);
3788 /* the coro is most likely in an active SLF call.
3789 * while not strictly required (the code we execute is
3790 * not allowed to call any SLF functions), it's cleaner
3791 * to reinitialise the slf_frame and restore it later.
3792 * This might one day allow us to actually do SLF calls
3793 * from code executed here.
3794 */
3795 slf_save = slf_frame;
3796 slf_frame.prepare = 0;
3166 SPAGAIN; 3797 SPAGAIN;
3167 } 3798 }
3168 3799
3169 PUSHSTACK; 3800 PUSHSTACK;
3170 3801
… …
3180 SPAGAIN; 3811 SPAGAIN;
3181 3812
3182 if (current != coro) 3813 if (current != coro)
3183 { 3814 {
3184 PUTBACK; 3815 PUTBACK;
3816 slf_frame = slf_save;
3185 save_perl (aTHX_ coro); 3817 save_perl (aTHX_ coro);
3186 load_perl (aTHX_ current); 3818 load_perl (aTHX_ current);
3187 SPAGAIN; 3819 SPAGAIN;
3188 } 3820 }
3189 } 3821 }
… …
3194 PROTOTYPE: $ 3826 PROTOTYPE: $
3195 ALIAS: 3827 ALIAS:
3196 is_ready = CF_READY 3828 is_ready = CF_READY
3197 is_running = CF_RUNNING 3829 is_running = CF_RUNNING
3198 is_new = CF_NEW 3830 is_new = CF_NEW
3199 is_destroyed = CF_DESTROYED 3831 is_destroyed = CF_ZOMBIE
3832 is_zombie = CF_ZOMBIE
3200 is_suspended = CF_SUSPENDED 3833 is_suspended = CF_SUSPENDED
3201 CODE: 3834 CODE:
3202 RETVAL = boolSV (coro->flags & ix); 3835 RETVAL = boolSV (coro->flags & ix);
3203 OUTPUT: 3836 OUTPUT:
3204 RETVAL 3837 RETVAL
3205 3838
3206void 3839void
3207throw (Coro::State self, SV *throw = &PL_sv_undef) 3840throw (SV *self, SV *exception = &PL_sv_undef)
3208 PROTOTYPE: $;$ 3841 PROTOTYPE: $;$
3209 CODE: 3842 CODE:
3210{ 3843{
3844 struct coro *coro = SvSTATE (self);
3211 struct coro *current = SvSTATE_current; 3845 struct coro *current = SvSTATE_current;
3212 SV **throwp = self == current ? &CORO_THROW : &self->except; 3846 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3213 SvREFCNT_dec (*throwp); 3847 SvREFCNT_dec (*exceptionp);
3214 SvGETMAGIC (throw); 3848 SvGETMAGIC (exception);
3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3849 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3850
3851 api_ready (aTHX_ self);
3216} 3852}
3217 3853
3218void 3854void
3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3855api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3220 PROTOTYPE: $;$ 3856 PROTOTYPE: $;$
… …
3275 3911
3276void 3912void
3277cancel (Coro::State self) 3913cancel (Coro::State self)
3278 CODE: 3914 CODE:
3279 coro_state_destroy (aTHX_ self); 3915 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282 3916
3283SV * 3917SV *
3284enable_times (int enabled = enable_times) 3918enable_times (int enabled = enable_times)
3285 CODE: 3919 CODE:
3286{ 3920{
… …
3299 3933
3300void 3934void
3301times (Coro::State self) 3935times (Coro::State self)
3302 PPCODE: 3936 PPCODE:
3303{ 3937{
3304 struct coro *current = SvSTATE (coro_current); 3938 struct coro *current = SvSTATE (coro_current);
3305 3939
3306 if (expect_false (current == self)) 3940 if (ecb_expect_false (current == self))
3307 { 3941 {
3308 coro_times_update (); 3942 coro_times_update ();
3309 coro_times_add (SvSTATE (coro_current)); 3943 coro_times_add (SvSTATE (coro_current));
3310 } 3944 }
3311 3945
3312 EXTEND (SP, 2); 3946 EXTEND (SP, 2);
3313 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3947 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3948 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315 3949
3316 if (expect_false (current == self)) 3950 if (ecb_expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current)); 3951 coro_times_sub (SvSTATE (coro_current));
3318} 3952}
3319 3953
3954void
3955swap_sv (Coro::State coro, SV *sva, SV *svb)
3956 CODE:
3957{
3958 struct coro *current = SvSTATE_current;
3959 AV *swap_sv;
3960 int i;
3961
3962 sva = SvRV (sva);
3963 svb = SvRV (svb);
3964
3965 if (current == coro)
3966 SWAP_SVS_LEAVE (current);
3967
3968 if (!coro->swap_sv)
3969 coro->swap_sv = newAV ();
3970
3971 swap_sv = coro->swap_sv;
3972
3973 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3974 {
3975 SV *a = AvARRAY (swap_sv)[i ];
3976 SV *b = AvARRAY (swap_sv)[i + 1];
3977
3978 if (a == sva && b == svb)
3979 {
3980 SvREFCNT_dec_NN (a);
3981 SvREFCNT_dec_NN (b);
3982
3983 for (; i <= AvFILLp (swap_sv) - 2; i++)
3984 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3985
3986 AvFILLp (swap_sv) -= 2;
3987
3988 goto removed;
3989 }
3990 }
3991
3992 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3993 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3994
3995 removed:
3996
3997 if (current == coro)
3998 SWAP_SVS_ENTER (current);
3999}
4000
4001
3320MODULE = Coro::State PACKAGE = Coro 4002MODULE = Coro::State PACKAGE = Coro
3321 4003
3322BOOT: 4004BOOT:
3323{ 4005{
4006 if (SVt_LAST > 32)
4007 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4008
3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4009 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3325 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4010 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3326 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4011 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3327 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3328 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4012 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3329 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4013 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3330 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4014 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3331 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4015 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4016 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3333 4017
3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4018 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4019 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4020 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3337 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4021 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3338 4022
3339 coro_stash = gv_stashpv ("Coro", TRUE); 4023 coro_stash = gv_stashpv ("Coro", TRUE);
3340 4024
3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4025 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4026 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4027 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3355 coroapi.ready = api_ready; 4039 coroapi.ready = api_ready;
3356 coroapi.is_ready = api_is_ready; 4040 coroapi.is_ready = api_is_ready;
3357 coroapi.nready = coro_nready; 4041 coroapi.nready = coro_nready;
3358 coroapi.current = coro_current; 4042 coroapi.current = coro_current;
3359 4043
4044 coroapi.enterleave_hook = api_enterleave_hook;
4045 coroapi.enterleave_unhook = api_enterleave_unhook;
4046 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4047
3360 /*GCoroAPI = &coroapi;*/ 4048 /*GCoroAPI = &coroapi;*/
3361 sv_setiv (sv, (IV)&coroapi); 4049 sv_setiv (sv, (IV)&coroapi);
3362 SvREADONLY_on (sv); 4050 SvREADONLY_on (sv);
3363 } 4051 }
3364} 4052}
… …
3371 api_ready (aTHX_ RETVAL); 4059 api_ready (aTHX_ RETVAL);
3372 OUTPUT: 4060 OUTPUT:
3373 RETVAL 4061 RETVAL
3374 4062
3375void 4063void
4064_destroy (Coro::State coro)
4065 CODE:
4066 /* used by the manager thread */
4067 coro_state_destroy (aTHX_ coro);
4068
4069void
4070on_destroy (Coro::State coro, SV *cb)
4071 CODE:
4072 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4073
4074void
4075join (...)
4076 CODE:
4077 CORO_EXECUTE_SLF_XS (slf_init_join);
4078
4079void
3376terminate (...) 4080terminate (...)
3377 CODE: 4081 CODE:
3378 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4082 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4083
4084void
4085cancel (...)
4086 CODE:
4087 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4088
4089int
4090safe_cancel (Coro::State self, ...)
4091 C_ARGS: aTHX_ self, &ST (1), items - 1
3379 4092
3380void 4093void
3381schedule (...) 4094schedule (...)
3382 CODE: 4095 CODE:
3383 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4096 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3404 4117
3405void 4118void
3406_set_current (SV *current) 4119_set_current (SV *current)
3407 PROTOTYPE: $ 4120 PROTOTYPE: $
3408 CODE: 4121 CODE:
3409 SvREFCNT_dec (SvRV (coro_current)); 4122 SvREFCNT_dec_NN (SvRV (coro_current));
3410 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4123 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3411 4124
3412void 4125void
3413_set_readyhook (SV *hook) 4126_set_readyhook (SV *hook)
3414 PROTOTYPE: $ 4127 PROTOTYPE: $
… …
3498 4211
3499 if ((SV *)hv == &PL_sv_undef) 4212 if ((SV *)hv == &PL_sv_undef)
3500 { 4213 {
3501 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4214 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3502 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4215 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3503 SvREFCNT_dec (sv); 4216 SvREFCNT_dec_NN (sv);
3504 } 4217 }
3505 4218
3506 { 4219 {
3507 struct coro *coro = SvSTATE_hv (hv); 4220 struct coro *coro = SvSTATE_hv (hv);
3508 4221
… …
3515 api_ready (aTHX_ (SV *)hv); 4228 api_ready (aTHX_ (SV *)hv);
3516 4229
3517 if (GIMME_V != G_VOID) 4230 if (GIMME_V != G_VOID)
3518 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4231 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3519 else 4232 else
3520 SvREFCNT_dec (hv); 4233 SvREFCNT_dec_NN (hv);
3521} 4234}
3522 4235
3523SV * 4236SV *
3524rouse_cb () 4237rouse_cb ()
3525 PROTOTYPE: 4238 PROTOTYPE:
… …
3540 on_leave = 1 4253 on_leave = 1
3541 PROTOTYPE: & 4254 PROTOTYPE: &
3542 CODE: 4255 CODE:
3543{ 4256{
3544 struct coro *coro = SvSTATE_current; 4257 struct coro *coro = SvSTATE_current;
3545 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4258 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3546 4259
3547 block = s_get_cv_croak (block); 4260 block = s_get_cv_croak (block);
3548 4261
3549 if (!*avp) 4262 if (!*avp)
3550 *avp = newAV (); 4263 *avp = newAV ();
… …
3570 4283
3571SV * 4284SV *
3572new (SV *klass, SV *count = 0) 4285new (SV *klass, SV *count = 0)
3573 CODE: 4286 CODE:
3574{ 4287{
3575 int semcnt = 1; 4288 int semcnt = 1;
3576 4289
3577 if (count) 4290 if (count)
3578 { 4291 {
3579 SvGETMAGIC (count); 4292 SvGETMAGIC (count);
3580 4293
… …
3604 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4317 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3605 OUTPUT: 4318 OUTPUT:
3606 RETVAL 4319 RETVAL
3607 4320
3608void 4321void
3609up (SV *self, int adjust = 1) 4322up (SV *self)
3610 ALIAS:
3611 adjust = 1
3612 CODE: 4323 CODE:
4324 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4325
4326void
4327adjust (SV *self, int adjust)
4328 CODE:
3613 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4329 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3614 4330
3615void 4331void
3616down (...) 4332down (...)
3617 CODE: 4333 CODE:
3618 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4334 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3640 XSRETURN_NO; 4356 XSRETURN_NO;
3641} 4357}
3642 4358
3643void 4359void
3644waiters (SV *self) 4360waiters (SV *self)
3645 PPCODE: 4361 PPCODE:
3646{ 4362{
3647 AV *av = (AV *)SvRV (self); 4363 AV *av = (AV *)SvRV (self);
3648 int wcount = AvFILLp (av) + 1 - 1; 4364 int wcount = AvFILLp (av) + 1 - 1;
3649 4365
3650 if (GIMME_V == G_SCALAR) 4366 if (GIMME_V == G_SCALAR)
… …
3659} 4375}
3660 4376
3661MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4377MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3662 4378
3663void 4379void
3664_may_delete (SV *sem, int count, int extra_refs) 4380_may_delete (SV *sem, int count, unsigned int extra_refs)
3665 PPCODE: 4381 PPCODE:
3666{ 4382{
3667 AV *av = (AV *)SvRV (sem); 4383 AV *av = (AV *)SvRV (sem);
3668 4384
3669 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4385 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3670 && AvFILLp (av) == 0 /* no waiters, just count */ 4386 && AvFILLp (av) == 0 /* no waiters, just count */
3671 && SvIV (AvARRAY (av)[0]) == count) 4387 && SvIV (AvARRAY (av)[0]) == count)
3672 XSRETURN_YES; 4388 XSRETURN_YES;
… …
3693 4409
3694void 4410void
3695broadcast (SV *self) 4411broadcast (SV *self)
3696 CODE: 4412 CODE:
3697{ 4413{
3698 AV *av = (AV *)SvRV (self); 4414 AV *av = (AV *)SvRV (self);
3699 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4415 coro_signal_wake (aTHX_ av, AvFILLp (av));
3700} 4416}
3701 4417
3702void 4418void
3703send (SV *self) 4419send (SV *self)
… …
3711 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4427 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3712} 4428}
3713 4429
3714IV 4430IV
3715awaited (SV *self) 4431awaited (SV *self)
3716 CODE: 4432 CODE:
3717 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4433 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3718 OUTPUT: 4434 OUTPUT:
3719 RETVAL 4435 RETVAL
3720 4436
3721 4437
… …
3726 4442
3727void 4443void
3728_schedule (...) 4444_schedule (...)
3729 CODE: 4445 CODE:
3730{ 4446{
3731 static int incede; 4447 static int incede;
3732 4448
3733 api_cede_notself (aTHX); 4449 api_cede_notself (aTHX);
3734 4450
3735 ++incede; 4451 ++incede;
3736 while (coro_nready >= incede && api_cede (aTHX)) 4452 while (coro_nready >= incede && api_cede (aTHX))
… …
3780 { 4496 {
3781 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4497 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3782 coro_old_pp_sselect = 0; 4498 coro_old_pp_sselect = 0;
3783 } 4499 }
3784 4500
4501MODULE = Coro::State PACKAGE = Coro::Util
3785 4502
4503void
4504_exit (int code)
4505 CODE:
4506 _exit (code);
4507
4508NV
4509time ()
4510 CODE:
4511 RETVAL = nvtime (aTHX);
4512 OUTPUT:
4513 RETVAL
4514
4515NV
4516gettimeofday ()
4517 PPCODE:
4518{
4519 UV tv [2];
4520 u2time (aTHX_ tv);
4521 EXTEND (SP, 2);
4522 PUSHs (sv_2mortal (newSVuv (tv [0])));
4523 PUSHs (sv_2mortal (newSVuv (tv [1])));
4524}
4525

Diff Legend

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