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.392 by root, Fri Apr 29 15:43:27 2011 UTC vs.
Revision 1.447 by root, Tue Oct 14 21:53:32 2014 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
22#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
24#endif 52#endif
25 53
26#if defined(_WIN32) 54#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 55# undef HAS_GETTIMEOFDAY
28# undef setjmp 56# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
32#else 60#else
33# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
34#endif 62#endif
35 63
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
65 66
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 69#endif
73 70
74/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
87#endif 84#endif
88 85
89#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
90 87
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 88#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
108 90
109#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
110# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
126static void (*u2time)(pTHX_ UV ret[2]); 108static void (*u2time)(pTHX_ UV ret[2]);
127 109
128/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
131 114
132static U32 cctx_gen; 115static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 148static char times_valid;
166 149
167static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
169 152
170enum { 153enum
154{
171 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 164typedef struct coro_cctx
181{ 165{
182 struct coro_cctx *next; 166 struct coro_cctx *next;
183 167
184 /* the stack */ 168 /* the stack */
185 void *sptr; 169 struct coro_stack stack;
186 size_t ssize;
187 170
188 /* cpu state */ 171 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
191 JMPENV *top_env; 176 JMPENV *top_env;
192 coro_context cctx; 177 coro_context cctx;
193 178
194 U32 gen; 179 U32 gen;
195#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
196 int valgrind_id; 181 int valgrind_id;
197#endif 182#endif
198 unsigned char flags; 183 unsigned char flags;
199} coro_cctx; 184} coro_cctx;
200 185
201coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
202 187
203/*****************************************************************************/ 188/*****************************************************************************/
204 189
190static MGVTBL coro_state_vtbl;
191
205enum { 192enum
193{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
211}; 200};
212 201
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 203typedef struct
215{ 204{
216 SV *defsv;
217 AV *defav;
218 SV *errsv;
219 SV *irsgv;
220 HV *hinthv;
221#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
222# include "state.h" 206 #include "state.h"
223#undef VAR
224} perl_slots; 207} perl_slots;
225 208
209/* how many context stack entries do we need for perl_slots */
226#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
227 211
228/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
229struct coro { 213struct coro
214{
230 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
231 coro_cctx *cctx; 216 coro_cctx *cctx;
232 217
233 /* ready queue */ 218 /* ready queue */
234 struct coro *next_ready; 219 struct coro *next_ready;
… …
236 /* state data */ 221 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 223 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
240 225
241 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
242 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
243 int refcnt; /* coroutines are refcounted, yes */
244 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
245 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
247 230
248 /* statistics */ 231 /* statistics */
249 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
250 233
251 /* coro process data */ 234 /* coro process data */
252 int prio; 235 int prio;
253 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
254 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
255 240
256 /* async_pool */ 241 /* async_pool */
257 SV *saved_deffh; 242 SV *saved_deffh;
258 SV *invoke_cb; 243 SV *invoke_cb;
259 AV *invoke_av; 244 AV *invoke_av;
… …
275typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
276typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
277 262
278/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
279/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
280/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
281static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
282 267
283/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
284 269
285#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
291 276
292/* for Coro.pm */ 277/* for Coro.pm */
293static SV *coro_current; 278static SV *coro_current;
294static SV *coro_readyhook; 279static SV *coro_readyhook;
295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
296static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
297static struct coro *coro_first; 282static struct coro *coro_first;
298#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
299 307
300/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
301 309
302static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select; 311static SV *coro_select_select;
… …
319 327
320/** time stuff **************************************************************/ 328/** time stuff **************************************************************/
321 329
322#ifdef HAS_GETTIMEOFDAY 330#ifdef HAS_GETTIMEOFDAY
323 331
324static void 332ecb_inline void
325coro_u2time (pTHX_ UV ret[2]) 333coro_u2time (pTHX_ UV ret[2])
326{ 334{
327 struct timeval tv; 335 struct timeval tv;
328 gettimeofday (&tv, 0); 336 gettimeofday (&tv, 0);
329 337
330 ret [0] = tv.tv_sec; 338 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec; 339 ret [1] = tv.tv_usec;
332} 340}
333 341
334static double 342ecb_inline double
335coro_nvtime () 343coro_nvtime (void)
336{ 344{
337 struct timeval tv; 345 struct timeval tv;
338 gettimeofday (&tv, 0); 346 gettimeofday (&tv, 0);
339 347
340 return tv.tv_sec + tv.tv_usec * 1e-6; 348 return tv.tv_sec + tv.tv_usec * 1e-6;
341} 349}
342 350
343static void 351ecb_inline void
344time_init (pTHX) 352time_init (pTHX)
345{ 353{
346 nvtime = coro_nvtime; 354 nvtime = coro_nvtime;
347 u2time = coro_u2time; 355 u2time = coro_u2time;
348} 356}
349 357
350#else 358#else
351 359
352static void 360ecb_inline void
353time_init (pTHX) 361time_init (pTHX)
354{ 362{
355 SV **svp; 363 SV **svp;
356 364
357 require_pv ("Time/HiRes.pm"); 365 require_pv ("Time/HiRes.pm");
358 366
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360 368
361 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363 371
… …
369 377
370#endif 378#endif
371 379
372/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
373 381
374static SV * 382static SV * ecb_noinline
375coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
376{ 384{
377#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
378 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
379 get_sv (name, create); 387 get_sv (name, create);
380#endif 388#endif
381 return get_sv (name, create); 389 return get_sv (name, create);
382} 390}
383 391
384static AV * 392static AV * ecb_noinline
385coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
386{ 394{
387#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
389 get_av (name, create); 397 get_av (name, create);
390#endif 398#endif
391 return get_av (name, create); 399 return get_av (name, create);
392} 400}
393 401
394static HV * 402static HV * ecb_noinline
395coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
396{ 404{
397#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
399 get_hv (name, create); 407 get_hv (name, create);
400#endif 408#endif
401 return get_hv (name, create); 409 return get_hv (name, create);
402} 410}
403 411
404INLINE void 412ecb_inline void
405coro_times_update () 413coro_times_update (void)
406{ 414{
407#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
408 struct timespec ts; 416 struct timespec ts;
409 417
410 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
422 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
424#endif 432#endif
425} 433}
426 434
427INLINE void 435ecb_inline void
428coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
429{ 437{
430 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
434 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
437} 445}
438 446
439INLINE void 447ecb_inline void
440coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
441{ 449{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
452/* magic glue */ 460/* magic glue */
453 461
454#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
456 464
457#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
460 : mg_find (sv, type)) 468 : mg_find (sv, type))
461 469
462#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
465 : 0) 473 : 0)
466 474
467#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
468#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
469 477
470INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
471SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
472{ 495{
473 HV *stash;
474 MAGIC *mg; 496 MAGIC *mg;
475 497
476 if (SvROK (coro)) 498 if (SvROK (coro))
477 coro = SvRV (coro); 499 coro = SvRV (coro);
478 500
479 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
480 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
481 504
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
492} 506}
493 507
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495 509
… …
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499 513
500/*****************************************************************************/ 514/*****************************************************************************/
501/* padlist management and caching */ 515/* padlist management and caching */
502 516
503static AV * 517ecb_inline PADLIST *
504coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
505{ 519{
506 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
507 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
508 524
509 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
510 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
511#if PERL_VERSION_ATLEAST (5,10,0)
512 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
513#else
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
515#endif 554#endif
516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
517 --AvFILLp (padlist);
518 555
519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
520 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
521 560
522 return newpadlist; 561 return newpadlist;
523} 562}
524 563
525static void 564ecb_inline void
526free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
527{ 566{
528 /* may be during global destruction */ 567 /* may be during global destruction */
529 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
530 { 569 {
531 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
532 571
533 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
534 { 573 {
535 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
536 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
537 I32 j = AvFILLp (av);
538 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
539 while (j >= 0) 581 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
541 583
542 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
543 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
544 } 587 }
545 588
546 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
547 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
548 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
549 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
550 } 599 }
551} 600}
552 601
553static int 602static int
554coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
555{ 604{
556 AV *padlist; 605 PADLIST *padlist;
557 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
558 608
559 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
561 return 0; 611 return 0;
562 612
563 /* casting is fun. */ 613 while (len--)
564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
565 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
566
567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
568 615
569 return 0; 616 return 0;
570} 617}
571 618
572static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
573 0, 0, 0, 0, 620 0, 0, 0, 0,
574 coro_cv_free 621 coro_cv_free
575}; 622};
576 623
577/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
578static void 625ecb_inline void
579get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
580{ 627{
581 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
582 AV *av; 629 size_t *lenp;
583 630
584 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
585 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
586 else 633 else
587 { 634 {
588#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
589 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
590 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
597#endif 644#endif
598 } 645 }
599} 646}
600 647
601static void 648ecb_inline void
602put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
603{ 650{
604 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
605 AV *av;
606 652
607 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
608 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
609 663
610 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
611
612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
613 av_extend (av, AvFILLp (av) + 1);
614
615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
616} 665}
617 666
618/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
619 668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
620/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
621static void 708static void
622swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
623{ 710{
624 int i; 711 int i;
625 712
626 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
627 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665} 715}
666 716
667#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
670 720
671static void 721static void
672on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
673 723
… …
677 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
678 c->slot = 0; 728 c->slot = 0;
679 729
680 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
681 731
682 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
683 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
684 GvSV (PL_errgv) = slot->errsv; 734#else
685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
687
688 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
689 # include "state.h" 736 #include "state.h"
690 #undef VAR 737#endif
691 738
692 { 739 {
693 dSP; 740 dSP;
694 741
695 CV *cv; 742 CV *cv;
696 743
697 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
698 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
699 { 746 {
700 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
701 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
702 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
703 } 750 }
704 751
705 PUTBACK; 752 PUTBACK;
706 } 753 }
707 754
708 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
709 CORO_THROW = c->except; 756 CORO_THROW = c->except;
710 757
711 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
712 { 759 {
713 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
714 coro_times_update (); 761 coro_times_update ();
715 762
716 coro_times_sub (c); 763 coro_times_sub (c);
717 } 764 }
718 765
719 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
720 { 767 {
721 int i; 768 int i;
722 769
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
730static void 777static void
731save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
732{ 779{
733 SWAP_SVS (c); 780 SWAP_SVS (c);
734 781
735 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
736 { 783 {
737 int i; 784 int i;
738 785
739 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 } 788 }
742 789
743 times_valid = 0; 790 times_valid = 0;
744 791
745 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
746 { 793 {
747 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
748 coro_times_add (c); 795 coro_times_add (c);
749 } 796 }
750 797
… …
764 811
765 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
766 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
767 for (;;) 814 for (;;)
768 { 815 {
769 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
770 { 817 {
771 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
772 819
773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
774 { 821 {
775 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
776 823
777 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
778 { 825 {
779 EXTEND (SP, 3); 826 EXTEND (SP, 3);
780 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
781 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
782 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
785 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
786 } 833 }
787 } 834 }
788 } 835 }
789 836
790 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
791 break; 838 break;
792 839
793 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
794 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
795 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
797 844
798 PUTBACK; 845 PUTBACK;
799 } 846 }
800 847
801 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
802 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
803 if (SLOT_COUNT >= 1) CXINC;
804 if (SLOT_COUNT >= 2) CXINC;
805 if (SLOT_COUNT >= 3) CXINC;
806 { 850 {
807 unsigned int i; 851 unsigned int i;
852
808 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 854 CXINC;
810 } 855
811 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
812 858
813 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
814 860
815 { 861 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 863
818 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
819 slot->defsv = DEFSV; 865 save_perl_slots (slot);
820 slot->errsv = ERRSV; 866#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 868 #include "state.h"
826 #undef VAR 869#endif
827 } 870 }
828} 871}
829 872
830/* 873/*
831 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
837# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
838#else 881#else
839static void 882static void
840coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
841{ 884{
842 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
843 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
844 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
846 889
847 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
862#endif 905#endif
863 906
864 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
866 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
867 913
868 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 916 PL_savestack_max = 24;
871 917
… …
899 } 945 }
900 946
901 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 948 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
904 Safefree (PL_savestack); 953 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 955 Safefree (PL_retstack);
907#endif 956#endif
908} 957}
… …
954#endif 1003#endif
955 1004
956/* 1005/*
957 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
959 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
960 * readback here. 1009 * we just provide our own readback here.
961 */ 1010 */
962static int 1011static int ecb_cold
963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
964{ 1013{
965 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
966 1015
967 if (*s == '_') 1016 if (*s == '_')
968 { 1017 {
969 SV **svp = 0; 1018 SV **svp = 0;
970 1019
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1022
974 if (svp) 1023 if (svp)
975 { 1024 {
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
977 return 0; 1035 return 0;
978 } 1036 }
979 } 1037 }
980 1038
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
982} 1040}
983 1041
984static int 1042static int ecb_cold
985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
986{ 1044{
987 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
988 1046
989 if (*s == '_') 1047 if (*s == '_')
… …
1003 } 1061 }
1004 1062
1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1006} 1064}
1007 1065
1008static int 1066static int ecb_cold
1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1010{ 1068{
1011 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
1012 1070
1013 if (*s == '_') 1071 if (*s == '_')
… …
1048 return 1; 1106 return 1;
1049} 1107}
1050 1108
1051static UNOP init_perl_op; 1109static UNOP init_perl_op;
1052 1110
1053static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1054init_perl (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
1055{ 1113{
1056 /* 1114 /*
1057 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
1058 */ 1116 */
… …
1073 PL_parser = 0; 1131 PL_parser = 0;
1074#endif 1132#endif
1075 PL_hints = 0; 1133 PL_hints = 0;
1076 1134
1077 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1138
1081 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = newHV ();
1144#if PERL_VERSION_ATLEAST (5,10,0)
1145 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1146#endif
1086 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1088 1149
1089 { 1150 {
1090 dSP; 1151 dSP;
… …
1105 /* this newly created coroutine might be run on an existing cctx which most 1166 /* this newly created coroutine might be run on an existing cctx which most
1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1167 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1107 */ 1168 */
1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1169 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1170 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1171 slf_frame.destroy = 0;
1110 1172
1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1173 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1112 init_perl_op.op_next = PL_op; 1174 init_perl_op.op_next = PL_op;
1113 init_perl_op.op_type = OP_ENTERSUB; 1175 init_perl_op.op_type = OP_ENTERSUB;
1114 init_perl_op.op_ppaddr = pp_slf; 1176 init_perl_op.op_ppaddr = pp_slf;
… …
1119 /* copy throw, in case it was set before init_perl */ 1181 /* copy throw, in case it was set before init_perl */
1120 CORO_THROW = coro->except; 1182 CORO_THROW = coro->except;
1121 1183
1122 SWAP_SVS (coro); 1184 SWAP_SVS (coro);
1123 1185
1124 if (expect_false (enable_times)) 1186 if (ecb_expect_false (enable_times))
1125 { 1187 {
1126 coro_times_update (); 1188 coro_times_update ();
1127 coro_times_sub (coro); 1189 coro_times_sub (coro);
1128 } 1190 }
1129} 1191}
… …
1153destroy_perl (pTHX_ struct coro *coro) 1215destroy_perl (pTHX_ struct coro *coro)
1154{ 1216{
1155 SV *svf [9]; 1217 SV *svf [9];
1156 1218
1157 { 1219 {
1220 SV *old_current = SvRV (coro_current);
1158 struct coro *current = SvSTATE_current; 1221 struct coro *current = SvSTATE (old_current);
1159 1222
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1223 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161 1224
1162 save_perl (aTHX_ current); 1225 save_perl (aTHX_ current);
1226
1227 /* this will cause transfer_check to croak on block*/
1228 SvRV_set (coro_current, (SV *)coro->hv);
1229
1163 load_perl (aTHX_ coro); 1230 load_perl (aTHX_ coro);
1164 1231
1165 coro_unwind_stacks (aTHX); 1232 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
1167 1233
1168 /* restore swapped sv's */ 1234 /* restore swapped sv's */
1169 SWAP_SVS (coro); 1235 SWAP_SVS (coro);
1170 1236
1237 coro_destruct_stacks (aTHX);
1238
1171 // now save some sv's to be free'd later 1239 /* now save some sv's to be free'd later */
1172 svf [0] = GvSV (PL_defgv); 1240 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv); 1241 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv); 1242 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv; 1243 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs; 1244 svf [4] = PL_rs;
… …
1178 svf [6] = (SV *)GvHV (PL_hintgv); 1246 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook; 1247 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook; 1248 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf)); 1249 assert (9 == sizeof (svf) / sizeof (*svf));
1182 1250
1251 SvRV_set (coro_current, old_current);
1252
1183 load_perl (aTHX_ current); 1253 load_perl (aTHX_ current);
1184 } 1254 }
1185 1255
1186 { 1256 {
1187 unsigned int i; 1257 unsigned int i;
… …
1194 SvREFCNT_dec (coro->invoke_cb); 1264 SvREFCNT_dec (coro->invoke_cb);
1195 SvREFCNT_dec (coro->invoke_av); 1265 SvREFCNT_dec (coro->invoke_av);
1196 } 1266 }
1197} 1267}
1198 1268
1199INLINE void 1269ecb_inline void
1200free_coro_mortal (pTHX) 1270free_coro_mortal (pTHX)
1201{ 1271{
1202 if (expect_true (coro_mortal)) 1272 if (ecb_expect_true (coro_mortal))
1203 { 1273 {
1204 SvREFCNT_dec (coro_mortal); 1274 SvREFCNT_dec ((SV *)coro_mortal);
1205 coro_mortal = 0; 1275 coro_mortal = 0;
1206 } 1276 }
1207} 1277}
1208 1278
1209static int 1279static int
… …
1342 1412
1343 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1413 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1344} 1414}
1345 1415
1346/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1416/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1347static void NOINLINE 1417static void ecb_noinline
1348cctx_prepare (pTHX) 1418cctx_prepare (pTHX)
1349{ 1419{
1350 PL_top_env = &PL_start_env; 1420 PL_top_env = &PL_start_env;
1351 1421
1352 if (cctx_current->flags & CC_TRACE) 1422 if (cctx_current->flags & CC_TRACE)
… …
1363 slf_frame.prepare = slf_prepare_set_stacklevel; 1433 slf_frame.prepare = slf_prepare_set_stacklevel;
1364 slf_frame.check = slf_check_set_stacklevel; 1434 slf_frame.check = slf_check_set_stacklevel;
1365} 1435}
1366 1436
1367/* the tail of transfer: execute stuff we can only do after a transfer */ 1437/* the tail of transfer: execute stuff we can only do after a transfer */
1368INLINE void 1438ecb_inline void
1369transfer_tail (pTHX) 1439transfer_tail (pTHX)
1370{ 1440{
1371 free_coro_mortal (aTHX); 1441 free_coro_mortal (aTHX);
1442}
1443
1444/* try to exit the same way perl's main function would do */
1445/* we do not bother resetting the environment or other things *7
1446/* that are not, uhm, essential */
1447/* this obviously also doesn't work when perl is embedded */
1448static void ecb_noinline ecb_cold
1449perlish_exit (pTHX)
1450{
1451 int exitstatus = perl_destruct (PL_curinterp);
1452 perl_free (PL_curinterp);
1453 exit (exitstatus);
1372} 1454}
1373 1455
1374/* 1456/*
1375 * this is a _very_ stripped down perl interpreter ;) 1457 * this is a _very_ stripped down perl interpreter ;)
1376 */ 1458 */
… …
1405 */ 1487 */
1406 1488
1407 /* 1489 /*
1408 * If perl-run returns we assume exit() was being called or the coro 1490 * If perl-run returns we assume exit() was being called or the coro
1409 * fell off the end, which seems to be the only valid (non-bug) 1491 * fell off the end, which seems to be the only valid (non-bug)
1410 * reason for perl_run to return. We try to exit by jumping to the 1492 * reason for perl_run to return. We try to mimic whatever perl is normally
1411 * bootstrap-time "top" top_env, as we cannot restore the "main" 1493 * doing in that case. YMMV.
1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1415 */ 1494 */
1416 PL_top_env = main_top_env; 1495 perlish_exit (aTHX);
1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1418 } 1496 }
1419} 1497}
1420 1498
1421static coro_cctx * 1499static coro_cctx *
1422cctx_new () 1500cctx_new (void)
1423{ 1501{
1424 coro_cctx *cctx; 1502 coro_cctx *cctx;
1425 1503
1426 ++cctx_count; 1504 ++cctx_count;
1427 New (0, cctx, 1, coro_cctx); 1505 New (0, cctx, 1, coro_cctx);
… …
1433 return cctx; 1511 return cctx;
1434} 1512}
1435 1513
1436/* create a new cctx only suitable as source */ 1514/* create a new cctx only suitable as source */
1437static coro_cctx * 1515static coro_cctx *
1438cctx_new_empty () 1516cctx_new_empty (void)
1439{ 1517{
1440 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1441 1519
1442 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1443 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1444 1522
1445 return cctx; 1523 return cctx;
1446} 1524}
1447 1525
1448/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1449static coro_cctx * 1527static coro_cctx *
1450cctx_new_run () 1528cctx_new_run (void)
1451{ 1529{
1452 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1453 void *stack_start;
1454 size_t stack_size;
1455 1531
1456#if HAVE_MMAP 1532 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1457 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1458 /* mmap supposedly does allocate-on-write for us */
1459 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1460
1461 if (cctx->sptr != (void *)-1)
1462 {
1463 #if CORO_STACKGUARD
1464 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1465 #endif
1466 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1467 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1468 cctx->flags |= CC_MAPPED;
1469 } 1533 {
1470 else
1471#endif
1472 {
1473 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1474 New (0, cctx->sptr, cctx_stacksize, long);
1475
1476 if (!cctx->sptr)
1477 {
1478 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1479 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1480 }
1481
1482 stack_start = cctx->sptr;
1483 stack_size = cctx->ssize;
1484 } 1536 }
1485 1537
1486 #if CORO_USE_VALGRIND
1487 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1488 #endif
1489
1490 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1491 1539
1492 return cctx; 1540 return cctx;
1493} 1541}
1494 1542
1495static void 1543static void
1496cctx_destroy (coro_cctx *cctx) 1544cctx_destroy (coro_cctx *cctx)
1497{ 1545{
1498 if (!cctx) 1546 if (!cctx)
1499 return; 1547 return;
1500 1548
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1502 1550
1503 --cctx_count; 1551 --cctx_count;
1504 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1505 1553
1506 /* coro_transfer creates new, empty cctx's */ 1554 coro_stack_free (&cctx->stack);
1507 if (cctx->sptr)
1508 {
1509 #if CORO_USE_VALGRIND
1510 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1511 #endif
1512
1513#if HAVE_MMAP
1514 if (cctx->flags & CC_MAPPED)
1515 munmap (cctx->sptr, cctx->ssize);
1516 else
1517#endif
1518 Safefree (cctx->sptr);
1519 }
1520 1555
1521 Safefree (cctx); 1556 Safefree (cctx);
1522} 1557}
1523 1558
1524/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
1525#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1560#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1526 1561
1527static coro_cctx * 1562static coro_cctx *
1528cctx_get (pTHX) 1563cctx_get (pTHX)
1529{ 1564{
1530 while (expect_true (cctx_first)) 1565 while (ecb_expect_true (cctx_first))
1531 { 1566 {
1532 coro_cctx *cctx = cctx_first; 1567 coro_cctx *cctx = cctx_first;
1533 cctx_first = cctx->next; 1568 cctx_first = cctx->next;
1534 --cctx_idle; 1569 --cctx_idle;
1535 1570
1536 if (expect_true (!CCTX_EXPIRED (cctx))) 1571 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1537 return cctx; 1572 return cctx;
1538 1573
1539 cctx_destroy (cctx); 1574 cctx_destroy (cctx);
1540 } 1575 }
1541 1576
… …
1543} 1578}
1544 1579
1545static void 1580static void
1546cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1547{ 1582{
1548 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1583 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1549 1584
1550 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1551 if (expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1552 { 1587 {
1553 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
1554 cctx_first = first->next; 1589 cctx_first = first->next;
1555 --cctx_idle; 1590 --cctx_idle;
1556 1591
… …
1567static void 1602static void
1568transfer_check (pTHX_ struct coro *prev, struct coro *next) 1603transfer_check (pTHX_ struct coro *prev, struct coro *next)
1569{ 1604{
1570 /* TODO: throwing up here is considered harmful */ 1605 /* TODO: throwing up here is considered harmful */
1571 1606
1572 if (expect_true (prev != next)) 1607 if (ecb_expect_true (prev != next))
1573 { 1608 {
1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1609 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1610 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1576 1611
1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1612 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1613 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1579 1614
1580#if !PERL_VERSION_ATLEAST (5,10,0) 1615#if !PERL_VERSION_ATLEAST (5,10,0)
1581 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1616 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1617 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1583#endif 1618#endif
1584 } 1619 }
1585} 1620}
1586 1621
1587/* always use the TRANSFER macro */ 1622/* always use the TRANSFER macro */
1588static void NOINLINE /* noinline so we have a fixed stackframe */ 1623static void ecb_noinline /* noinline so we have a fixed stackframe */
1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1624transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1590{ 1625{
1591 dSTACKLEVEL; 1626 dSTACKLEVEL;
1592 1627
1593 /* sometimes transfer is only called to set idle_sp */ 1628 /* sometimes transfer is only called to set idle_sp */
1594 if (expect_false (!prev)) 1629 if (ecb_expect_false (!prev))
1595 { 1630 {
1596 cctx_current->idle_sp = STACKLEVEL; 1631 cctx_current->idle_sp = STACKLEVEL;
1597 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1632 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1598 } 1633 }
1599 else if (expect_true (prev != next)) 1634 else if (ecb_expect_true (prev != next))
1600 { 1635 {
1601 coro_cctx *cctx_prev; 1636 coro_cctx *cctx_prev;
1602 1637
1603 if (expect_false (prev->flags & CF_NEW)) 1638 if (ecb_expect_false (prev->flags & CF_NEW))
1604 { 1639 {
1605 /* create a new empty/source context */ 1640 /* create a new empty/source context */
1606 prev->flags &= ~CF_NEW; 1641 prev->flags &= ~CF_NEW;
1607 prev->flags |= CF_RUNNING; 1642 prev->flags |= CF_RUNNING;
1608 } 1643 }
… …
1611 next->flags |= CF_RUNNING; 1646 next->flags |= CF_RUNNING;
1612 1647
1613 /* first get rid of the old state */ 1648 /* first get rid of the old state */
1614 save_perl (aTHX_ prev); 1649 save_perl (aTHX_ prev);
1615 1650
1616 if (expect_false (next->flags & CF_NEW)) 1651 if (ecb_expect_false (next->flags & CF_NEW))
1617 { 1652 {
1618 /* need to start coroutine */ 1653 /* need to start coroutine */
1619 next->flags &= ~CF_NEW; 1654 next->flags &= ~CF_NEW;
1620 /* setup coroutine call */ 1655 /* setup coroutine call */
1621 init_perl (aTHX_ next); 1656 init_perl (aTHX_ next);
1622 } 1657 }
1623 else 1658 else
1624 load_perl (aTHX_ next); 1659 load_perl (aTHX_ next);
1625 1660
1626 /* possibly untie and reuse the cctx */ 1661 /* possibly untie and reuse the cctx */
1627 if (expect_true ( 1662 if (ecb_expect_true (
1628 cctx_current->idle_sp == STACKLEVEL 1663 cctx_current->idle_sp == STACKLEVEL
1629 && !(cctx_current->flags & CC_TRACE) 1664 && !(cctx_current->flags & CC_TRACE)
1630 && !force_cctx 1665 && !force_cctx
1631 )) 1666 ))
1632 { 1667 {
1633 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1668 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1634 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1669 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1635 1670
1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1671 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1637 /* without this the next cctx_get might destroy the running cctx while still in use */ 1672 /* without this the next cctx_get might destroy the running cctx while still in use */
1638 if (expect_false (CCTX_EXPIRED (cctx_current))) 1673 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1639 if (expect_true (!next->cctx)) 1674 if (ecb_expect_true (!next->cctx))
1640 next->cctx = cctx_get (aTHX); 1675 next->cctx = cctx_get (aTHX);
1641 1676
1642 cctx_put (cctx_current); 1677 cctx_put (cctx_current);
1643 } 1678 }
1644 else 1679 else
1645 prev->cctx = cctx_current; 1680 prev->cctx = cctx_current;
1646 1681
1647 ++next->usecount; 1682 ++next->usecount;
1648 1683
1649 cctx_prev = cctx_current; 1684 cctx_prev = cctx_current;
1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1685 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1651 1686
1652 next->cctx = 0; 1687 next->cctx = 0;
1653 1688
1654 if (expect_false (cctx_prev != cctx_current)) 1689 if (ecb_expect_false (cctx_prev != cctx_current))
1655 { 1690 {
1656 cctx_prev->top_env = PL_top_env; 1691 cctx_prev->top_env = PL_top_env;
1657 PL_top_env = cctx_current->top_env; 1692 PL_top_env = cctx_current->top_env;
1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1693 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1659 } 1694 }
… …
1665#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1700#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1666#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1701#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1667 1702
1668/** high level stuff ********************************************************/ 1703/** high level stuff ********************************************************/
1669 1704
1705/* this function is actually Coro, not Coro::State, but we call it from here */
1706/* because it is convenient - but it hasn't been declared yet for that reason */
1670static int 1707static void
1708coro_call_on_destroy (pTHX_ struct coro *coro);
1709
1710static void
1671coro_state_destroy (pTHX_ struct coro *coro) 1711coro_state_destroy (pTHX_ struct coro *coro)
1672{ 1712{
1673 if (coro->flags & CF_DESTROYED) 1713 if (coro->flags & CF_ZOMBIE)
1674 return 0; 1714 return;
1675 1715
1676 if (coro->on_destroy && !PL_dirty)
1677 coro->on_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1678 1717
1679 coro->flags |= CF_DESTROYED; 1718 coro->flags |= CF_ZOMBIE;
1680 1719
1681 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1682 { 1721 {
1683 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1684 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1685 --coro_nready; 1724 --coro_nready;
1686 } 1725 }
1687 else 1726 else
1688 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1727 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1728
1729 if (coro->next) coro->next->prev = coro->prev;
1730 if (coro->prev) coro->prev->next = coro->next;
1731 if (coro == coro_first) coro_first = coro->next;
1689 1732
1690 if (coro->mainstack 1733 if (coro->mainstack
1691 && coro->mainstack != main_mainstack 1734 && coro->mainstack != main_mainstack
1692 && coro->slot 1735 && coro->slot
1693 && !PL_dirty) 1736 && !PL_dirty)
1694 destroy_perl (aTHX_ coro); 1737 destroy_perl (aTHX_ coro);
1695 1738
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1699
1700 cctx_destroy (coro->cctx); 1739 cctx_destroy (coro->cctx);
1701 SvREFCNT_dec (coro->startcv); 1740 SvREFCNT_dec (coro->startcv);
1702 SvREFCNT_dec (coro->args); 1741 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv); 1742 SvREFCNT_dec (coro->swap_sv);
1704 SvREFCNT_dec (CORO_THROW); 1743 SvREFCNT_dec (CORO_THROW);
1705 1744
1706 return 1; 1745 coro_call_on_destroy (aTHX_ coro);
1746
1747 /* more destruction mayhem in coro_state_free */
1707} 1748}
1708 1749
1709static int 1750static int
1710coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1751coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1711{ 1752{
1712 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 struct coro *coro = (struct coro *)mg->mg_ptr;
1713 mg->mg_ptr = 0; 1754 mg->mg_ptr = 0;
1714 1755
1715 coro->hv = 0;
1716
1717 if (--coro->refcnt < 0)
1718 {
1719 coro_state_destroy (aTHX_ coro); 1756 coro_state_destroy (aTHX_ coro);
1757 SvREFCNT_dec (coro->on_destroy);
1758 SvREFCNT_dec (coro->status);
1759
1720 Safefree (coro); 1760 Safefree (coro);
1721 }
1722 1761
1723 return 0; 1762 return 0;
1724} 1763}
1725 1764
1726static int 1765static int ecb_cold
1727coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1766coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1728{ 1767{
1729 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 /* called when perl clones the current process the slow way (windows process emulation) */
1730 1769 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1731 ++coro->refcnt; 1770 mg->mg_ptr = 0;
1771 mg->mg_virtual = 0;
1732 1772
1733 return 0; 1773 return 0;
1734} 1774}
1735 1775
1736static MGVTBL coro_state_vtbl = { 1776static MGVTBL coro_state_vtbl = {
… …
1761 TRANSFER (ta, 1); 1801 TRANSFER (ta, 1);
1762} 1802}
1763 1803
1764/** Coro ********************************************************************/ 1804/** Coro ********************************************************************/
1765 1805
1766INLINE void 1806ecb_inline void
1767coro_enq (pTHX_ struct coro *coro) 1807coro_enq (pTHX_ struct coro *coro)
1768{ 1808{
1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1809 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1770 1810
1771 SvREFCNT_inc_NN (coro->hv); 1811 SvREFCNT_inc_NN (coro->hv);
… …
1773 coro->next_ready = 0; 1813 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1814 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro; 1815 ready [1] = coro;
1776} 1816}
1777 1817
1778INLINE struct coro * 1818ecb_inline struct coro *
1779coro_deq (pTHX) 1819coro_deq (pTHX)
1780{ 1820{
1781 int prio; 1821 int prio;
1782 1822
1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1823 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1836{ 1876{
1837 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1877 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1838} 1878}
1839 1879
1840/* expects to own a reference to next->hv */ 1880/* expects to own a reference to next->hv */
1841INLINE void 1881ecb_inline void
1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1882prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1843{ 1883{
1844 SV *prev_sv = SvRV (coro_current); 1884 SV *prev_sv = SvRV (coro_current);
1845 1885
1846 ta->prev = SvSTATE_hv (prev_sv); 1886 ta->prev = SvSTATE_hv (prev_sv);
… …
1859{ 1899{
1860 for (;;) 1900 for (;;)
1861 { 1901 {
1862 struct coro *next = coro_deq (aTHX); 1902 struct coro *next = coro_deq (aTHX);
1863 1903
1864 if (expect_true (next)) 1904 if (ecb_expect_true (next))
1865 { 1905 {
1866 /* cannot transfer to destroyed coros, skip and look for next */ 1906 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1907 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1908 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1869 else 1909 else
1870 { 1910 {
1871 next->flags &= ~CF_READY; 1911 next->flags &= ~CF_READY;
1872 --coro_nready; 1912 --coro_nready;
… …
1880 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle) 1921 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle))) 1922 && SvOBJECT (SvRV (sv_idle)))
1883 { 1923 {
1884 if (SvRV (sv_idle) == SvRV (coro_current)) 1924 if (SvRV (sv_idle) == SvRV (coro_current))
1925 {
1926 require_pv ("Carp");
1927
1928 {
1929 dSP;
1930
1931 ENTER;
1932 SAVETMPS;
1933
1934 PUSHMARK (SP);
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1941 }
1942 }
1886 1943
1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1888 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready; 1946 --coro_nready;
1890 } 1947 }
… …
1905 } 1962 }
1906 } 1963 }
1907 } 1964 }
1908} 1965}
1909 1966
1910INLINE void 1967ecb_inline void
1911prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1912{ 1969{
1913 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1914 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1915} 1972}
1916 1973
1917INLINE void 1974ecb_inline void
1918prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1919{ 1976{
1920 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1921 1978
1922 if (coro_nready) 1979 if (coro_nready)
… …
1952{ 2009{
1953 struct coro_transfer_args ta; 2010 struct coro_transfer_args ta;
1954 2011
1955 prepare_cede (aTHX_ &ta); 2012 prepare_cede (aTHX_ &ta);
1956 2013
1957 if (expect_true (ta.prev != ta.next)) 2014 if (ecb_expect_true (ta.prev != ta.next))
1958 { 2015 {
1959 TRANSFER (ta, 1); 2016 TRANSFER (ta, 1);
1960 return 1; 2017 return 1;
1961 } 2018 }
1962 else 2019 else
… …
2005 coro->slot->runops = RUNOPS_DEFAULT; 2062 coro->slot->runops = RUNOPS_DEFAULT;
2006 } 2063 }
2007} 2064}
2008 2065
2009static void 2066static void
2067coro_push_av (pTHX_ AV *av, I32 gimme_v)
2068{
2069 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2070 {
2071 dSP;
2072
2073 if (gimme_v == G_SCALAR)
2074 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2075 else
2076 {
2077 int i;
2078 EXTEND (SP, AvFILLp (av) + 1);
2079
2080 for (i = 0; i <= AvFILLp (av); ++i)
2081 PUSHs (AvARRAY (av)[i]);
2082 }
2083
2084 PUTBACK;
2085 }
2086}
2087
2088static void
2089coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2090{
2091 if (!coro->on_destroy)
2092 coro->on_destroy = newAV ();
2093
2094 av_push (coro->on_destroy, cb);
2095}
2096
2097static void
2098slf_destroy_join (pTHX_ struct CoroSLF *frame)
2099{
2100 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2101}
2102
2103static int
2104slf_check_join (pTHX_ struct CoroSLF *frame)
2105{
2106 struct coro *coro = (struct coro *)frame->data;
2107
2108 if (!coro->status)
2109 return 1;
2110
2111 frame->destroy = 0;
2112
2113 coro_push_av (aTHX_ coro->status, GIMME_V);
2114
2115 SvREFCNT_dec ((SV *)coro->hv);
2116
2117 return 0;
2118}
2119
2120static void
2121slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2122{
2123 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2124
2125 if (items > 1)
2126 croak ("join called with too many arguments");
2127
2128 if (coro->status)
2129 frame->prepare = prepare_nop;
2130 else
2131 {
2132 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2133 frame->prepare = prepare_schedule;
2134 }
2135
2136 frame->check = slf_check_join;
2137 frame->destroy = slf_destroy_join;
2138 frame->data = (void *)coro;
2139 SvREFCNT_inc (coro->hv);
2140}
2141
2142static void
2010coro_call_on_destroy (pTHX_ struct coro *coro) 2143coro_call_on_destroy (pTHX_ struct coro *coro)
2011{ 2144{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2145 AV *od = coro->on_destroy;
2013 2146
2014 if (on_destroyp) 2147 if (!od)
2015 { 2148 return;
2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2019 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
2020 while (AvFILLp (on_destroy) >= 0) 2153 while (AvFILLp (od) >= 0)
2154 {
2155 SV *cb = sv_2mortal (av_pop (od));
2156
2157 /* coro hv's (and only hv's at the moment) are supported as well */
2158 if (SvSTATEhv_p (aTHX_ cb))
2159 api_ready (aTHX_ cb);
2160 else
2021 { 2161 {
2022 dSP; /* don't disturb outer sp */ 2162 dSP; /* don't disturb outer sp */
2023 SV *cb = av_pop (on_destroy);
2024
2025 PUSHMARK (SP); 2163 PUSHMARK (SP);
2026 2164
2027 if (statusp) 2165 if (coro->status)
2028 { 2166 {
2029 int i; 2167 PUTBACK;
2030 EXTEND (SP, AvFILLp (status) + 1); 2168 coro_push_av (aTHX_ coro->status, G_ARRAY);
2031 2169 SPAGAIN;
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 } 2170 }
2035 2171
2036 PUTBACK; 2172 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2173 call_sv (cb, G_VOID | G_DISCARD);
2038 } 2174 }
2039 } 2175 }
2040} 2176}
2041 2177
2042static void 2178static void
2043coro_set_status (HV *coro_hv, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2044{ 2180{
2045 AV *av = newAV (); 2181 AV *av;
2182
2183 if (coro->status)
2184 {
2185 av = coro->status;
2186 av_clear (av);
2187 }
2188 else
2189 av = coro->status = newAV ();
2046 2190
2047 /* items are actually not so common, so optimise for this case */ 2191 /* items are actually not so common, so optimise for this case */
2048 if (items) 2192 if (items)
2049 { 2193 {
2050 int i; 2194 int i;
… …
2052 av_extend (av, items - 1); 2196 av_extend (av, items - 1);
2053 2197
2054 for (i = 0; i < items; ++i) 2198 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i])); 2199 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 } 2200 }
2057
2058 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2059} 2201}
2060 2202
2061static void 2203static void
2062slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2204slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2063{ 2205{
… …
2075static void 2217static void
2076slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2218slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2077{ 2219{
2078 HV *coro_hv = (HV *)SvRV (coro_current); 2220 HV *coro_hv = (HV *)SvRV (coro_current);
2079 2221
2080 coro_set_status (coro_hv, arg, items); 2222 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2081 slf_init_terminate_cancel_common (frame, coro_hv); 2223 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2082} 2224}
2083 2225
2084static void 2226static void
2085slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2227slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2228{
… …
2091 croak ("Coro::cancel called without coro object,"); 2233 croak ("Coro::cancel called without coro object,");
2092 2234
2093 coro = SvSTATE (arg [0]); 2235 coro = SvSTATE (arg [0]);
2094 coro_hv = coro->hv; 2236 coro_hv = coro->hv;
2095 2237
2096 coro_set_status (coro_hv, arg + 1, items - 1); 2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2097 2239
2098 /* cancelling the current coro is allowed, and equals terminate */ 2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2099 if (coro_hv == (HV *)SvRV (coro_current))
2100 slf_init_terminate_cancel_common (frame, coro_hv);
2101 else
2102 { 2241 {
2103 /* otherwise we cancel ourselves */ 2242 /* coro currently busy cancelling something, so just notify it */
2104 coro_state_destroy (aTHX_ coro); 2243 coro->slf_frame.data = (void *)coro;
2105 coro_call_on_destroy (aTHX_ coro);
2106 2244
2107 frame->prepare = prepare_nop; 2245 frame->prepare = prepare_nop;
2108 frame->check = slf_check_nop; 2246 frame->check = slf_check_nop;
2109 } 2247 }
2248 else if (coro_hv == (HV *)SvRV (coro_current))
2249 {
2250 /* cancelling the current coro is allowed, and equals terminate */
2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2252 }
2253 else
2254 {
2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2259
2260 /* otherwise we cancel directly, purely for speed reasons
2261 * unfortunately, this requires some magic trickery, as
2262 * somebody else could cancel us, so we have to fight the cancellation.
2263 * this is ugly, and hopefully fully worth the extra speed.
2264 * besides, I can't get the slow-but-safe version working...
2265 */
2266 slf_frame.data = 0;
2267 self->flags |= CF_NOCANCEL;
2268 coro_state_destroy (aTHX_ coro);
2269 self->flags &= ~CF_NOCANCEL;
2270
2271 if (slf_frame.data)
2272 {
2273 /* while we were busy we have been cancelled, so terminate */
2274 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2275 }
2276 else
2277 {
2278 frame->prepare = prepare_nop;
2279 frame->check = slf_check_nop;
2280 }
2281 }
2282}
2283
2284static int
2285slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2286{
2287 frame->prepare = 0;
2288 coro_unwind_stacks (aTHX);
2289
2290 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2291
2292 return 1;
2293}
2294
2295static int
2296safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2297{
2298 if (coro->cctx)
2299 croak ("coro inside C callback, unable to cancel at this time, caught");
2300
2301 if (coro->flags & CF_NEW)
2302 {
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro_state_destroy (aTHX_ coro);
2305 }
2306 else
2307 {
2308 if (!coro->slf_frame.prepare)
2309 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2310
2311 slf_destroy (aTHX_ coro);
2312
2313 coro_set_status (aTHX_ coro, arg, items);
2314 coro->slf_frame.prepare = prepare_nop;
2315 coro->slf_frame.check = slf_check_safe_cancel;
2316
2317 api_ready (aTHX_ (SV *)coro->hv);
2318 }
2319
2320 return 1;
2110} 2321}
2111 2322
2112/*****************************************************************************/ 2323/*****************************************************************************/
2113/* async pool handler */ 2324/* async pool handler */
2114 2325
… …
2145slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2356slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2146{ 2357{
2147 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2148 struct coro *coro = SvSTATE_hv ((SV *)hv); 2359 struct coro *coro = SvSTATE_hv ((SV *)hv);
2149 2360
2150 if (expect_true (coro->saved_deffh)) 2361 if (ecb_expect_true (coro->saved_deffh))
2151 { 2362 {
2152 /* subsequent iteration */ 2363 /* subsequent iteration */
2153 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2364 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2154 coro->saved_deffh = 0; 2365 coro->saved_deffh = 0;
2155 2366
2156 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2367 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2157 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2368 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2158 { 2369 {
2159 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2370 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2160 coro->invoke_av = newAV (); 2371 return;
2161
2162 frame->prepare = prepare_nop;
2163 } 2372 }
2164 else 2373 else
2165 { 2374 {
2166 av_clear (GvAV (PL_defgv)); 2375 av_clear (GvAV (PL_defgv));
2167 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2376 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2217 2426
2218static int 2427static int
2219slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2220{ 2429{
2221 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
2222 2431
2223 if (CORO_THROW) 2432 if (CORO_THROW)
2224 return 0; 2433 return 0;
2225 2434
2226 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2227 return 1; 2436 return 1;
… …
2263 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
2264 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
2265 } 2474 }
2266 2475
2267 if (!SvROK (cb) 2476 if (!SvROK (cb)
2268 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
2269 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2270 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
2271 2480
2272 { 2481 {
2273 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2390static void 2599static void
2391slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2600slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2392{ 2601{
2393 frame->prepare = prepare_cede_notself; 2602 frame->prepare = prepare_cede_notself;
2394 frame->check = slf_check_nop; 2603 frame->check = slf_check_nop;
2604}
2605
2606/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2607static void
2608slf_destroy (pTHX_ struct coro *coro)
2609{
2610 struct CoroSLF frame = coro->slf_frame;
2611
2612 /*
2613 * The on_destroy below most likely is from an SLF call.
2614 * Since by definition the SLF call will not finish when we destroy
2615 * the coro, we will have to force-finish it here, otherwise
2616 * cleanup functions cannot call SLF functions.
2617 */
2618 coro->slf_frame.prepare = 0;
2619
2620 /* this callback is reserved for slf functions needing to do cleanup */
2621 if (frame.destroy && frame.prepare && !PL_dirty)
2622 frame.destroy (aTHX_ &frame);
2395} 2623}
2396 2624
2397/* 2625/*
2398 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2399 * function to increase chances that they all will call transfer with the same 2627 * function to increase chances that they all will call transfer with the same
… …
2406 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2634 I32 checkmark; /* mark SP to see how many elements check has pushed */
2407 2635
2408 /* set up the slf frame, unless it has already been set-up */ 2636 /* set up the slf frame, unless it has already been set-up */
2409 /* the latter happens when a new coro has been started */ 2637 /* the latter happens when a new coro has been started */
2410 /* or when a new cctx was attached to an existing coroutine */ 2638 /* or when a new cctx was attached to an existing coroutine */
2411 if (expect_true (!slf_frame.prepare)) 2639 if (ecb_expect_true (!slf_frame.prepare))
2412 { 2640 {
2413 /* first iteration */ 2641 /* first iteration */
2414 dSP; 2642 dSP;
2415 SV **arg = PL_stack_base + TOPMARK + 1; 2643 SV **arg = PL_stack_base + TOPMARK + 1;
2416 int items = SP - arg; /* args without function object */ 2644 int items = SP - arg; /* args without function object */
… …
2457 while (slf_frame.check (aTHX_ &slf_frame)); 2685 while (slf_frame.check (aTHX_ &slf_frame));
2458 2686
2459 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2687 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2460 2688
2461 /* exception handling */ 2689 /* exception handling */
2462 if (expect_false (CORO_THROW)) 2690 if (ecb_expect_false (CORO_THROW))
2463 { 2691 {
2464 SV *exception = sv_2mortal (CORO_THROW); 2692 SV *exception = sv_2mortal (CORO_THROW);
2465 2693
2466 CORO_THROW = 0; 2694 CORO_THROW = 0;
2467 sv_setsv (ERRSV, exception); 2695 sv_setsv (ERRSV, exception);
2468 croak (0); 2696 croak (0);
2469 } 2697 }
2470 2698
2471 /* return value handling - mostly like entersub */ 2699 /* return value handling - mostly like entersub */
2472 /* make sure we put something on the stack in scalar context */ 2700 /* make sure we put something on the stack in scalar context */
2473 if (GIMME_V == G_SCALAR) 2701 if (GIMME_V == G_SCALAR
2702 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2474 { 2703 {
2475 dSP; 2704 dSP;
2476 SV **bot = PL_stack_base + checkmark; 2705 SV **bot = PL_stack_base + checkmark;
2477 2706
2478 if (sp == bot) /* too few, push undef */ 2707 if (sp == bot) /* too few, push undef */
2479 bot [1] = &PL_sv_undef; 2708 bot [1] = &PL_sv_undef;
2480 else if (sp != bot + 1) /* too many, take last one */ 2709 else /* too many, take last one */
2481 bot [1] = *sp; 2710 bot [1] = *sp;
2482 2711
2483 SP = bot + 1; 2712 SP = bot + 1;
2484 2713
2485 PUTBACK; 2714 PUTBACK;
… …
2592{ 2821{
2593 PerlIOBuf base; 2822 PerlIOBuf base;
2594 NV next, every; 2823 NV next, every;
2595} PerlIOCede; 2824} PerlIOCede;
2596 2825
2597static IV 2826static IV ecb_cold
2598PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2827PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2599{ 2828{
2600 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2829 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2601 2830
2602 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2831 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2603 self->next = nvtime () + self->every; 2832 self->next = nvtime () + self->every;
2604 2833
2605 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2834 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2606} 2835}
2607 2836
2608static SV * 2837static SV * ecb_cold
2609PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2838PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2610{ 2839{
2611 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2612 2841
2613 return newSVnv (self->every); 2842 return newSVnv (self->every);
… …
2725 SvREFCNT_dec (cb); 2954 SvREFCNT_dec (cb);
2726 } 2955 }
2727} 2956}
2728 2957
2729static void 2958static void
2730coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2959coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2731{ 2960{
2732 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2961 /* call $sem->adjust (0) to possibly wake up some other waiters */
2733 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2962 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2734} 2963}
2735 2964
2736static int 2965static int
2737slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2966slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2738{ 2967{
2739 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2740 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2970 SV *coro_hv = SvRV (coro_current);
2971
2972 frame->destroy = 0;
2741 2973
2742 /* if we are about to throw, don't actually acquire the lock, just throw */ 2974 /* if we are about to throw, don't actually acquire the lock, just throw */
2743 if (CORO_THROW) 2975 if (ecb_expect_false (CORO_THROW))
2976 {
2977 /* we still might be responsible for the semaphore, so wake up others */
2978 coro_semaphore_adjust (aTHX_ av, 0);
2979
2744 return 0; 2980 return 0;
2981 }
2745 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2746 { 2983 {
2747 SvSTATE_current->on_destroy = 0;
2748
2749 if (acquire) 2984 if (acquire)
2750 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2751 else 2986 else
2752 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2753 2988
… …
2757 { 2992 {
2758 int i; 2993 int i;
2759 /* if we were woken up but can't down, we look through the whole */ 2994 /* if we were woken up but can't down, we look through the whole */
2760 /* waiters list and only add us if we aren't in there already */ 2995 /* waiters list and only add us if we aren't in there already */
2761 /* this avoids some degenerate memory usage cases */ 2996 /* this avoids some degenerate memory usage cases */
2762 2997 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2763 for (i = 1; i <= AvFILLp (av); ++i)
2764 if (AvARRAY (av)[i] == SvRV (coro_current)) 2998 if (AvARRAY (av)[i] == coro_hv)
2765 return 1; 2999 return 1;
2766 3000
2767 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (coro_hv));
2768 return 1; 3002 return 1;
2769 } 3003 }
2770} 3004}
2771 3005
2772static int 3006static int
… …
2795 { 3029 {
2796 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3030 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2797 3031
2798 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3032 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2799 frame->prepare = prepare_schedule; 3033 frame->prepare = prepare_schedule;
2800
2801 /* to avoid race conditions when a woken-up coro gets terminated */ 3034 /* to avoid race conditions when a woken-up coro gets terminated */
2802 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3035 /* we arrange for a temporary on_destroy that calls adjust (0) */
2803 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3036 frame->destroy = coro_semaphore_destroy;
2804 } 3037 }
2805} 3038}
2806 3039
2807static void 3040static void
2808slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3041slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2977 /* it quickly returns */ 3210 /* it quickly returns */
2978 if (CORO_THROW) 3211 if (CORO_THROW)
2979 return 0; 3212 return 0;
2980 3213
2981 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
2982 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2983 return 1; 3216 return 1;
2984 3217
2985 /* restore status */ 3218 /* restore status */
2986 { 3219 {
2987 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
3026 dSP; 3259 dSP;
3027 3260
3028 static SV *prio_cv; 3261 static SV *prio_cv;
3029 static SV *prio_sv; 3262 static SV *prio_sv;
3030 3263
3031 if (expect_false (!prio_cv)) 3264 if (ecb_expect_false (!prio_cv))
3032 { 3265 {
3033 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3266 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3034 prio_sv = newSViv (0); 3267 prio_sv = newSViv (0);
3035 } 3268 }
3036 3269
… …
3142 } 3375 }
3143 3376
3144 return coro_sv; 3377 return coro_sv;
3145} 3378}
3146 3379
3380#ifndef __cplusplus
3381ecb_cold XS(boot_Coro__State);
3382#endif
3383
3384#if CORO_JIT
3385
3386static void ecb_noinline ecb_cold
3387pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3388{
3389 dSP;
3390 AV *av = newAV ();
3391
3392 av_store (av, 3, newSVuv (d));
3393 av_store (av, 2, newSVuv (c));
3394 av_store (av, 1, newSVuv (b));
3395 av_store (av, 0, newSVuv (a));
3396
3397 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3398
3399 PUTBACK;
3400}
3401
3402static void ecb_noinline ecb_cold
3403jit_init (pTHX)
3404{
3405 dSP;
3406 SV *load, *save;
3407 char *map_base;
3408 char *load_ptr, *save_ptr;
3409 STRLEN load_len, save_len, map_len;
3410 int count;
3411
3412 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3413
3414 PUSHMARK (SP);
3415 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3416 #include "state.h"
3417 count = call_pv ("Coro::State::_jit", G_ARRAY);
3418 SPAGAIN;
3419
3420 save = POPs; save_ptr = SvPVbyte (save, save_len);
3421 load = POPs; load_ptr = SvPVbyte (load, load_len);
3422
3423 map_len = load_len + save_len + 16;
3424
3425 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3426
3427 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3428
3429 load_perl_slots = (load_save_perl_slots_type)map_base;
3430 memcpy (map_base, load_ptr, load_len);
3431
3432 map_base += (load_len + 15) & ~15;
3433
3434 save_perl_slots = (load_save_perl_slots_type)map_base;
3435 memcpy (map_base, save_ptr, save_len);
3436
3437 /* we are good citizens and try to make the page read-only, so the evil evil */
3438 /* hackers might have it a bit more difficult */
3439 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3440
3441 PUTBACK;
3442 eval_pv ("undef &Coro::State::_jit", 1);
3443}
3444
3445#endif
3446
3147MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3447MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3148 3448
3149PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
3150 3450
3151BOOT: 3451BOOT:
3152{ 3452{
3453#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3454#include "state.h"
3153#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
3154# if CORO_PTHREAD 3456# if CORO_PTHREAD
3155 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
3156# endif 3458# endif
3157#endif 3459#endif
3158 BOOT_PAGESIZE; 3460 /* perl defines these to check for existance first, but why it doesn't */
3461 /* just create them one at init time is not clear to me, except for */
3462 /* programs trying to delete them, but... */
3463 /* anyway, we declare this as invalid and make sure they are initialised here */
3464 DEFSV;
3465 ERRSV;
3159 3466
3160 cctx_current = cctx_new_empty (); 3467 cctx_current = cctx_new_empty ();
3161 3468
3162 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3469 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3163 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3470 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3206 coroapi.prepare_cede_notself = prepare_cede_notself; 3513 coroapi.prepare_cede_notself = prepare_cede_notself;
3207 3514
3208 time_init (aTHX); 3515 time_init (aTHX);
3209 3516
3210 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3517 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3518#if CORO_JIT
3519 PUTBACK;
3520 jit_init (aTHX);
3521 SPAGAIN;
3522#endif
3211} 3523}
3212 3524
3213SV * 3525SV *
3214new (SV *klass, ...) 3526new (SV *klass, ...)
3215 ALIAS: 3527 ALIAS:
… …
3222void 3534void
3223transfer (...) 3535transfer (...)
3224 PROTOTYPE: $$ 3536 PROTOTYPE: $$
3225 CODE: 3537 CODE:
3226 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3227
3228void
3229_exit (int code)
3230 PROTOTYPE: $
3231 CODE:
3232 _exit (code);
3233 3539
3234SV * 3540SV *
3235clone (Coro::State coro) 3541clone (Coro::State coro)
3236 CODE: 3542 CODE:
3237{ 3543{
… …
3292void 3598void
3293list () 3599list ()
3294 PROTOTYPE: 3600 PROTOTYPE:
3295 PPCODE: 3601 PPCODE:
3296{ 3602{
3297 struct coro *coro; 3603 struct coro *coro;
3298 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
3299 if (coro->hv) 3605 if (coro->hv)
3300 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3301} 3607}
3302 3608
… …
3307 CODE: 3613 CODE:
3308{ 3614{
3309 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3615 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3310 { 3616 {
3311 struct coro *current = SvSTATE_current; 3617 struct coro *current = SvSTATE_current;
3618 struct CoroSLF slf_save;
3312 3619
3313 if (current != coro) 3620 if (current != coro)
3314 { 3621 {
3315 PUTBACK; 3622 PUTBACK;
3316 save_perl (aTHX_ current); 3623 save_perl (aTHX_ current);
3317 load_perl (aTHX_ coro); 3624 load_perl (aTHX_ coro);
3625 /* the coro is most likely in an active SLF call.
3626 * while not strictly required (the code we execute is
3627 * not allowed to call any SLF functions), it's cleaner
3628 * to reinitialise the slf_frame and restore it later.
3629 * This might one day allow us to actually do SLF calls
3630 * from code executed here.
3631 */
3632 slf_save = slf_frame;
3633 slf_frame.prepare = 0;
3318 SPAGAIN; 3634 SPAGAIN;
3319 } 3635 }
3320 3636
3321 PUSHSTACK; 3637 PUSHSTACK;
3322 3638
… …
3332 SPAGAIN; 3648 SPAGAIN;
3333 3649
3334 if (current != coro) 3650 if (current != coro)
3335 { 3651 {
3336 PUTBACK; 3652 PUTBACK;
3653 slf_frame = slf_save;
3337 save_perl (aTHX_ coro); 3654 save_perl (aTHX_ coro);
3338 load_perl (aTHX_ current); 3655 load_perl (aTHX_ current);
3339 SPAGAIN; 3656 SPAGAIN;
3340 } 3657 }
3341 } 3658 }
… …
3346 PROTOTYPE: $ 3663 PROTOTYPE: $
3347 ALIAS: 3664 ALIAS:
3348 is_ready = CF_READY 3665 is_ready = CF_READY
3349 is_running = CF_RUNNING 3666 is_running = CF_RUNNING
3350 is_new = CF_NEW 3667 is_new = CF_NEW
3351 is_destroyed = CF_DESTROYED 3668 is_destroyed = CF_ZOMBIE
3669 is_zombie = CF_ZOMBIE
3352 is_suspended = CF_SUSPENDED 3670 is_suspended = CF_SUSPENDED
3353 CODE: 3671 CODE:
3354 RETVAL = boolSV (coro->flags & ix); 3672 RETVAL = boolSV (coro->flags & ix);
3355 OUTPUT: 3673 OUTPUT:
3356 RETVAL 3674 RETVAL
3357 3675
3358void 3676void
3359throw (Coro::State self, SV *exception = &PL_sv_undef) 3677throw (SV *self, SV *exception = &PL_sv_undef)
3360 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
3361 CODE: 3679 CODE:
3362{ 3680{
3681 struct coro *coro = SvSTATE (self);
3363 struct coro *current = SvSTATE_current; 3682 struct coro *current = SvSTATE_current;
3364 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3683 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3365 SvREFCNT_dec (*exceptionp); 3684 SvREFCNT_dec (*exceptionp);
3366 SvGETMAGIC (exception); 3685 SvGETMAGIC (exception);
3367 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3686 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3687
3688 api_ready (aTHX_ self);
3368} 3689}
3369 3690
3370void 3691void
3371api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3692api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3372 PROTOTYPE: $;$ 3693 PROTOTYPE: $;$
… …
3449 3770
3450void 3771void
3451times (Coro::State self) 3772times (Coro::State self)
3452 PPCODE: 3773 PPCODE:
3453{ 3774{
3454 struct coro *current = SvSTATE (coro_current); 3775 struct coro *current = SvSTATE (coro_current);
3455 3776
3456 if (expect_false (current == self)) 3777 if (ecb_expect_false (current == self))
3457 { 3778 {
3458 coro_times_update (); 3779 coro_times_update ();
3459 coro_times_add (SvSTATE (coro_current)); 3780 coro_times_add (SvSTATE (coro_current));
3460 } 3781 }
3461 3782
3462 EXTEND (SP, 2); 3783 EXTEND (SP, 2);
3463 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3784 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3464 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3785 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3465 3786
3466 if (expect_false (current == self)) 3787 if (ecb_expect_false (current == self))
3467 coro_times_sub (SvSTATE (coro_current)); 3788 coro_times_sub (SvSTATE (coro_current));
3468} 3789}
3469 3790
3470void 3791void
3471swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3792swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3492BOOT: 3813BOOT:
3493{ 3814{
3494 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3815 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3495 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3816 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3496 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3817 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3497 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3498 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3818 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3499 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3500 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3820 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3501 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3821 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3502 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3822 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3503 3823
3504 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3824 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3505 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3825 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3506 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3826 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3507 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3827 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3508 3828
3509 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3510 3830
3511 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3512 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3513 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3833 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3545void 3865void
3546_destroy (Coro::State coro) 3866_destroy (Coro::State coro)
3547 CODE: 3867 CODE:
3548 /* used by the manager thread */ 3868 /* used by the manager thread */
3549 coro_state_destroy (aTHX_ coro); 3869 coro_state_destroy (aTHX_ coro);
3870
3871void
3872on_destroy (Coro::State coro, SV *cb)
3873 CODE:
3550 coro_call_on_destroy (aTHX_ coro); 3874 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3875
3876void
3877join (...)
3878 CODE:
3879 CORO_EXECUTE_SLF_XS (slf_init_join);
3551 3880
3552void 3881void
3553terminate (...) 3882terminate (...)
3554 CODE: 3883 CODE:
3555 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3884 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3556 3885
3557void 3886void
3558cancel (...) 3887cancel (...)
3559 CODE: 3888 CODE:
3560 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3889 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3890
3891int
3892safe_cancel (Coro::State self, ...)
3893 C_ARGS: aTHX_ self, &ST (1), items - 1
3561 3894
3562void 3895void
3563schedule (...) 3896schedule (...)
3564 CODE: 3897 CODE:
3565 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3898 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3722 on_leave = 1 4055 on_leave = 1
3723 PROTOTYPE: & 4056 PROTOTYPE: &
3724 CODE: 4057 CODE:
3725{ 4058{
3726 struct coro *coro = SvSTATE_current; 4059 struct coro *coro = SvSTATE_current;
3727 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3728 4061
3729 block = s_get_cv_croak (block); 4062 block = s_get_cv_croak (block);
3730 4063
3731 if (!*avp) 4064 if (!*avp)
3732 *avp = newAV (); 4065 *avp = newAV ();
… …
3752 4085
3753SV * 4086SV *
3754new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
3755 CODE: 4088 CODE:
3756{ 4089{
3757 int semcnt = 1; 4090 int semcnt = 1;
3758 4091
3759 if (count) 4092 if (count)
3760 { 4093 {
3761 SvGETMAGIC (count); 4094 SvGETMAGIC (count);
3762 4095
… …
3822 XSRETURN_NO; 4155 XSRETURN_NO;
3823} 4156}
3824 4157
3825void 4158void
3826waiters (SV *self) 4159waiters (SV *self)
3827 PPCODE: 4160 PPCODE:
3828{ 4161{
3829 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
3830 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
3831 4164
3832 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
3841} 4174}
3842 4175
3843MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4176MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3844 4177
3845void 4178void
3846_may_delete (SV *sem, int count, int extra_refs) 4179_may_delete (SV *sem, int count, unsigned int extra_refs)
3847 PPCODE: 4180 PPCODE:
3848{ 4181{
3849 AV *av = (AV *)SvRV (sem); 4182 AV *av = (AV *)SvRV (sem);
3850 4183
3851 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3852 && AvFILLp (av) == 0 /* no waiters, just count */ 4185 && AvFILLp (av) == 0 /* no waiters, just count */
3853 && SvIV (AvARRAY (av)[0]) == count) 4186 && SvIV (AvARRAY (av)[0]) == count)
3854 XSRETURN_YES; 4187 XSRETURN_YES;
… …
3875 4208
3876void 4209void
3877broadcast (SV *self) 4210broadcast (SV *self)
3878 CODE: 4211 CODE:
3879{ 4212{
3880 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
3881 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
3882} 4215}
3883 4216
3884void 4217void
3885send (SV *self) 4218send (SV *self)
… …
3893 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3894} 4227}
3895 4228
3896IV 4229IV
3897awaited (SV *self) 4230awaited (SV *self)
3898 CODE: 4231 CODE:
3899 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3900 OUTPUT: 4233 OUTPUT:
3901 RETVAL 4234 RETVAL
3902 4235
3903 4236
… …
3908 4241
3909void 4242void
3910_schedule (...) 4243_schedule (...)
3911 CODE: 4244 CODE:
3912{ 4245{
3913 static int incede; 4246 static int incede;
3914 4247
3915 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
3916 4249
3917 ++incede; 4250 ++incede;
3918 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
3962 { 4295 {
3963 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3964 coro_old_pp_sselect = 0; 4297 coro_old_pp_sselect = 0;
3965 } 4298 }
3966 4299
4300MODULE = Coro::State PACKAGE = Coro::Util
4301
4302void
4303_exit (int code)
4304 CODE:
4305 _exit (code);
4306
4307NV
4308time ()
4309 CODE:
4310 RETVAL = nvtime (aTHX);
4311 OUTPUT:
4312 RETVAL
4313
4314NV
4315gettimeofday ()
4316 PPCODE:
4317{
4318 UV tv [2];
4319 u2time (aTHX_ tv);
4320 EXTEND (SP, 2);
4321 PUSHs (sv_2mortal (newSVuv (tv [0])));
4322 PUSHs (sv_2mortal (newSVuv (tv [1])));
4323}
4324

Diff Legend

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