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.397 by root, Fri May 6 21:15:17 2011 UTC vs.
Revision 1.448 by root, Thu Jun 4 22:58:28 2015 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#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
24#endif 58#endif
25 59
26#if defined(_WIN32) 60#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 61# undef HAS_GETTIMEOFDAY
28# undef setjmp 62# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
32#else 66#else
33# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
34#endif 68#endif
35 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
65 72
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 74# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 75#endif
73 76
74/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 89# define STACKLEVEL ((void *)&stacklevel)
87#endif 90#endif
88 91
89#define IN_DESTRUCT PL_dirty 92#define IN_DESTRUCT PL_dirty
90 93
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" 94#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 95#define GCoroAPI (&coroapi) /* very sneaky */
108 96
109#ifdef USE_ITHREADS 97#ifdef USE_ITHREADS
110# if CORO_PTHREAD 98# if CORO_PTHREAD
… …
166static char times_valid; 154static char times_valid;
167 155
168static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
170 158
171enum { 159enum
160{
172 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 170typedef struct coro_cctx
182{ 171{
183 struct coro_cctx *next; 172 struct coro_cctx *next;
184 173
185 /* the stack */ 174 /* the stack */
186 void *sptr; 175 struct coro_stack stack;
187 size_t ssize;
188 176
189 /* cpu state */ 177 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
192 JMPENV *top_env; 182 JMPENV *top_env;
193 coro_context cctx; 183 coro_context cctx;
194 184
195 U32 gen; 185 U32 gen;
196#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
… …
201 191
202static coro_cctx *cctx_current; /* the currently running cctx */ 192static coro_cctx *cctx_current; /* the currently running cctx */
203 193
204/*****************************************************************************/ 194/*****************************************************************************/
205 195
196static MGVTBL coro_state_vtbl;
197
206enum { 198enum
199{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 206};
214 207
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 209typedef struct
217{ 210{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
224# include "state.h" 212 #include "state.h"
225#undef VAR
226} perl_slots; 213} perl_slots;
227 214
215/* how many context stack entries do we need for perl_slots */
228#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
229 217
230/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
231struct coro { 219struct coro
220{
232 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
233 coro_cctx *cctx; 222 coro_cctx *cctx;
234 223
235 /* ready queue */ 224 /* ready queue */
236 struct coro *next_ready; 225 struct coro *next_ready;
… …
238 /* state data */ 227 /* state data */
239 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
240 AV *mainstack; 229 AV *mainstack;
241 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
242 231
243 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
248 236
249 /* statistics */ 237 /* statistics */
250 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
251 239
252 /* coro process data */ 240 /* coro process data */
253 int prio; 241 int prio;
254 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 243 SV *rouse_cb; /* last rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */
256 246
257 /* async_pool */ 247 /* async_pool */
258 SV *saved_deffh; 248 SV *saved_deffh;
259 SV *invoke_cb; 249 SV *invoke_cb;
260 AV *invoke_av; 250 AV *invoke_av;
… …
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run; 287static CV *cv_coro_run;
298static struct coro *coro_first; 288static struct coro *coro_first;
299#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
300 290
291/** JIT *********************************************************************/
292
293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE
297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix"
299 #elif __i386 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "x86-unix"
301 #endif
302 #endif
303#endif
304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
313
301/** Coro::Select ************************************************************/ 314/** Coro::Select ************************************************************/
302 315
303static OP *(*coro_old_pp_sselect) (pTHX); 316static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 317static SV *coro_select_select;
305 318
… …
320 333
321/** time stuff **************************************************************/ 334/** time stuff **************************************************************/
322 335
323#ifdef HAS_GETTIMEOFDAY 336#ifdef HAS_GETTIMEOFDAY
324 337
325static void 338ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 339coro_u2time (pTHX_ UV ret[2])
327{ 340{
328 struct timeval tv; 341 struct timeval tv;
329 gettimeofday (&tv, 0); 342 gettimeofday (&tv, 0);
330 343
331 ret [0] = tv.tv_sec; 344 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 345 ret [1] = tv.tv_usec;
333} 346}
334 347
335static double 348ecb_inline double
336coro_nvtime () 349coro_nvtime (void)
337{ 350{
338 struct timeval tv; 351 struct timeval tv;
339 gettimeofday (&tv, 0); 352 gettimeofday (&tv, 0);
340 353
341 return tv.tv_sec + tv.tv_usec * 1e-6; 354 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 355}
343 356
344static void 357ecb_inline void
345time_init (pTHX) 358time_init (pTHX)
346{ 359{
347 nvtime = coro_nvtime; 360 nvtime = coro_nvtime;
348 u2time = coro_u2time; 361 u2time = coro_u2time;
349} 362}
350 363
351#else 364#else
352 365
353static void 366ecb_inline void
354time_init (pTHX) 367time_init (pTHX)
355{ 368{
356 SV **svp; 369 SV **svp;
357 370
358 require_pv ("Time/HiRes.pm"); 371 require_pv ("Time/HiRes.pm");
359 372
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 374
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 377
… …
370 383
371#endif 384#endif
372 385
373/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
374 387
375static SV * 388static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
377{ 390{
378#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 393 get_sv (name, create);
381#endif 394#endif
382 return get_sv (name, create); 395 return get_sv (name, create);
383} 396}
384 397
385static AV * 398static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
387{ 400{
388#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 403 get_av (name, create);
391#endif 404#endif
392 return get_av (name, create); 405 return get_av (name, create);
393} 406}
394 407
395static HV * 408static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
397{ 410{
398#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 413 get_hv (name, create);
401#endif 414#endif
402 return get_hv (name, create); 415 return get_hv (name, create);
403} 416}
404 417
405INLINE void 418ecb_inline void
406coro_times_update () 419coro_times_update (void)
407{ 420{
408#ifdef coro_clock_gettime 421#ifdef coro_clock_gettime
409 struct timespec ts; 422 struct timespec ts;
410 423
411 ts.tv_sec = ts.tv_nsec = 0; 424 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 436 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 437 time_real [1] = tv [1] * 1000;
425#endif 438#endif
426} 439}
427 440
428INLINE void 441ecb_inline void
429coro_times_add (struct coro *c) 442coro_times_add (struct coro *c)
430{ 443{
431 c->t_real [1] += time_real [1]; 444 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 446 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 448 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 450 c->t_cpu [0] += time_cpu [0];
438} 451}
439 452
440INLINE void 453ecb_inline void
441coro_times_sub (struct coro *c) 454coro_times_sub (struct coro *c)
442{ 455{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1]; 457 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 458 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 466/* magic glue */
454 467
455#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 470
458#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 474 : mg_find (sv, type))
462 475
463#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 479 : 0)
467 480
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 483
471INLINE struct coro * 484ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro)
486{
487 MAGIC *mg;
488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
499ecb_inline struct coro *
472SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro)
473{ 501{
474 HV *stash;
475 MAGIC *mg; 502 MAGIC *mg;
476 503
477 if (SvROK (coro)) 504 if (SvROK (coro))
478 coro = SvRV (coro); 505 coro = SvRV (coro);
479 506
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
481 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
482 510
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
493} 512}
494 513
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 515
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 519
501/*****************************************************************************/ 520/*****************************************************************************/
502/* padlist management and caching */ 521/* padlist management and caching */
503 522
504static AV * 523ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
506{ 525{
507 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
509 531
510 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 561#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 562
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
522 571
523 return newpadlist; 572 return newpadlist;
524} 573}
525 574
526static void 575ecb_inline void
527free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
528{ 577{
529 /* may be during global destruction */ 578 /* may be during global destruction */
530 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
531 { 580 {
532 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
533 582
534 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
535 { 584 {
536 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
540 while (j >= 0) 592 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 594
543 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
545 } 598 }
546 599
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
548 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
549 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
551 } 610 }
552} 611}
553 612
554static int 613static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 615{
557 AV *padlist; 616 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
559 619
560 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
562 return 0; 622 return 0;
563 623
564 /* casting is fun. */ 624 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 626
570 return 0; 627 return 0;
571} 628}
572 629
573static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 631 0, 0, 0, 0,
575 coro_cv_free 632 coro_cv_free
576}; 633};
577 634
578/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
579static void 636ecb_inline void
580get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
581{ 638{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 640 size_t *lenp;
584 641
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 644 else
588 { 645 {
589#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 655#endif
599 } 656 }
600} 657}
601 658
602static void 659ecb_inline void
603put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
604{ 661{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 663
608 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
610 674
611 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 676}
618 677
619/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
620 679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
621/* swap sv heads, at least logically */ 718/* swap sv heads, at least logically */
622static void 719static void
623swap_svs (pTHX_ Coro__State c) 720swap_svs (pTHX_ Coro__State c)
624{ 721{
625 int i; 722 int i;
626 723
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 726}
667 727
668#define SWAP_SVS(coro) \ 728#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 729 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 730 swap_svs (aTHX_ (coro))
671 731
672static void 732static void
673on_enterleave_call (pTHX_ SV *cb); 733on_enterleave_call (pTHX_ SV *cb);
674 734
… …
678 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
679 c->slot = 0; 739 c->slot = 0;
680 740
681 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
682 742
683 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 745#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 747 #include "state.h"
691 #undef VAR 748#endif
692 749
693 { 750 {
694 dSP; 751 dSP;
695 752
696 CV *cv; 753 CV *cv;
697 754
698 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
700 { 757 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 761 }
705 762
706 PUTBACK; 763 PUTBACK;
707 } 764 }
708 765
709 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 767 CORO_THROW = c->except;
711 768
712 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
713 { 770 {
714 if (expect_false (!times_valid)) 771 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 772 coro_times_update ();
716 773
717 coro_times_sub (c); 774 coro_times_sub (c);
718 } 775 }
719 776
720 if (expect_false (c->on_enter)) 777 if (ecb_expect_false (c->on_enter))
721 { 778 {
722 int i; 779 int i;
723 780
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 788static void
732save_perl (pTHX_ Coro__State c) 789save_perl (pTHX_ Coro__State c)
733{ 790{
734 SWAP_SVS (c); 791 SWAP_SVS (c);
735 792
736 if (expect_false (c->on_leave)) 793 if (ecb_expect_false (c->on_leave))
737 { 794 {
738 int i; 795 int i;
739 796
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 797 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 798 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 799 }
743 800
744 times_valid = 0; 801 times_valid = 0;
745 802
746 if (expect_false (enable_times)) 803 if (ecb_expect_false (enable_times))
747 { 804 {
748 coro_times_update (); times_valid = 1; 805 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 806 coro_times_add (c);
750 } 807 }
751 808
… …
765 822
766 XPUSHs (Nullsv); 823 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 824 /* this loop was inspired by pp_caller */
768 for (;;) 825 for (;;)
769 { 826 {
770 while (expect_true (cxix >= 0)) 827 while (ecb_expect_true (cxix >= 0))
771 { 828 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 829 PERL_CONTEXT *cx = &ccstk[cxix--];
773 830
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 831 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 832 {
776 CV *cv = cx->blk_sub.cv; 833 CV *cv = cx->blk_sub.cv;
777 834
778 if (expect_true (CvDEPTH (cv))) 835 if (ecb_expect_true (CvDEPTH (cv)))
779 { 836 {
780 EXTEND (SP, 3); 837 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 838 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 839 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 840 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 843 get_padlist (aTHX_ cv);
787 } 844 }
788 } 845 }
789 } 846 }
790 847
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 848 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 849 break;
793 850
794 top_si = top_si->si_prev; 851 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 852 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 853 cxix = top_si->si_cxix;
… …
798 855
799 PUTBACK; 856 PUTBACK;
800 } 857 }
801 858
802 /* allocate some space on the context stack for our purposes */ 859 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 860 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 861 {
808 unsigned int i; 862 unsigned int i;
863
809 for (i = 3; i < SLOT_COUNT; ++i) 864 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 865 CXINC;
811 } 866
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 867 cxstack_ix -= SLOT_COUNT; /* undo allocation */
868 }
813 869
814 c->mainstack = PL_mainstack; 870 c->mainstack = PL_mainstack;
815 871
816 { 872 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 873 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 874
819 slot->defav = GvAV (PL_defgv); 875#if CORO_JIT
820 slot->defsv = DEFSV; 876 save_perl_slots (slot);
821 slot->errsv = ERRSV; 877#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 878 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 879 #include "state.h"
827 #undef VAR 880#endif
828 } 881 }
829} 882}
830 883
831/* 884/*
832 * allocate various perl stacks. This is almost an exact copy 885 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 891# define coro_init_stacks(thx) init_stacks ()
839#else 892#else
840static void 893static void
841coro_init_stacks (pTHX) 894coro_init_stacks (pTHX)
842{ 895{
843 PL_curstackinfo = new_stackinfo(32, 8); 896 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 897 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 898 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 899 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 900
848 PL_stack_base = AvARRAY(PL_curstack); 901 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 916#endif
864 917
865 New(54,PL_scopestack,8,I32); 918 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 919 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 920 PL_scopestack_max = 8;
921#if HAS_SCOPESTACK_NAME
922 New(54,PL_scopestack_name,8,const char*);
923#endif
868 924
869 New(54,PL_savestack,24,ANY); 925 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 926 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 927 PL_savestack_max = 24;
872 928
… …
900 } 956 }
901 957
902 Safefree (PL_tmps_stack); 958 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 959 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 960 Safefree (PL_scopestack);
961#if HAS_SCOPESTACK_NAME
962 Safefree (PL_scopestack_name);
963#endif
905 Safefree (PL_savestack); 964 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 965#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 966 Safefree (PL_retstack);
908#endif 967#endif
909} 968}
… …
955#endif 1014#endif
956 1015
957/* 1016/*
958 * This overrides the default magic get method of %SIG elements. 1017 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1018 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1019 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1020 * we just provide our own readback here.
962 */ 1021 */
963static int 1022static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1024{
966 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
967 1026
968 if (*s == '_') 1027 if (*s == '_')
969 { 1028 {
970 SV **svp = 0; 1029 SV **svp = 0;
971 1030
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1033
975 if (svp) 1034 if (svp)
976 { 1035 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
978 return 0; 1046 return 0;
979 } 1047 }
980 } 1048 }
981 1049
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1051}
984 1052
985static int 1053static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1055{
988 const char *s = MgPV_nolen_const (mg); 1056 const char *s = MgPV_nolen_const (mg);
989 1057
990 if (*s == '_') 1058 if (*s == '_')
… …
1004 } 1072 }
1005 1073
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1075}
1008 1076
1009static int 1077static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1079{
1012 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
1013 1081
1014 if (*s == '_') 1082 if (*s == '_')
… …
1049 return 1; 1117 return 1;
1050} 1118}
1051 1119
1052static UNOP init_perl_op; 1120static UNOP init_perl_op;
1053 1121
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1122ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1123init_perl (pTHX_ struct coro *coro)
1056{ 1124{
1057 /* 1125 /*
1058 * emulate part of the perl startup here. 1126 * emulate part of the perl startup here.
1059 */ 1127 */
… …
1074 PL_parser = 0; 1142 PL_parser = 0;
1075#endif 1143#endif
1076 PL_hints = 0; 1144 PL_hints = 0;
1077 1145
1078 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1149
1082 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1160
1090 { 1161 {
1091 dSP; 1162 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1177 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1178 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1179 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1180 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1181 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1182 slf_frame.destroy = 0;
1111 1183
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1184 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1185 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1186 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1187 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1192 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1193 CORO_THROW = coro->except;
1122 1194
1123 SWAP_SVS (coro); 1195 SWAP_SVS (coro);
1124 1196
1125 if (expect_false (enable_times)) 1197 if (ecb_expect_false (enable_times))
1126 { 1198 {
1127 coro_times_update (); 1199 coro_times_update ();
1128 coro_times_sub (coro); 1200 coro_times_sub (coro);
1129 } 1201 }
1130} 1202}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1239 SvRV_set (coro_current, (SV *)coro->hv);
1168 1240
1169 load_perl (aTHX_ coro); 1241 load_perl (aTHX_ coro);
1170 1242
1171 coro_unwind_stacks (aTHX); 1243 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1244
1174 /* restore swapped sv's */ 1245 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1246 SWAP_SVS (coro);
1176 1247
1248 coro_destruct_stacks (aTHX);
1249
1177 // now save some sv's to be free'd later 1250 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1251 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1252 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1253 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1254 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1255 svf [4] = PL_rs;
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1275 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1276 SvREFCNT_dec (coro->invoke_av);
1204 } 1277 }
1205} 1278}
1206 1279
1207INLINE void 1280ecb_inline void
1208free_coro_mortal (pTHX) 1281free_coro_mortal (pTHX)
1209{ 1282{
1210 if (expect_true (coro_mortal)) 1283 if (ecb_expect_true (coro_mortal))
1211 { 1284 {
1212 SvREFCNT_dec (coro_mortal); 1285 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1286 coro_mortal = 0;
1214 } 1287 }
1215} 1288}
1216 1289
1217static int 1290static int
… …
1350 1423
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1424 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1425}
1353 1426
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1427/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1428static void ecb_noinline
1356cctx_prepare (pTHX) 1429cctx_prepare (pTHX)
1357{ 1430{
1358 PL_top_env = &PL_start_env; 1431 PL_top_env = &PL_start_env;
1359 1432
1360 if (cctx_current->flags & CC_TRACE) 1433 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1444 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1445 slf_frame.check = slf_check_set_stacklevel;
1373} 1446}
1374 1447
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1448/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1449ecb_inline void
1377transfer_tail (pTHX) 1450transfer_tail (pTHX)
1378{ 1451{
1379 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1453}
1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1380} 1465}
1381 1466
1382/* 1467/*
1383 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1469 */
… …
1413 */ 1498 */
1414 1499
1415 /* 1500 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1501 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1502 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1503 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1504 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1505 */
1424 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1507 }
1427} 1508}
1428 1509
1429static coro_cctx * 1510static coro_cctx *
1430cctx_new () 1511cctx_new (void)
1431{ 1512{
1432 coro_cctx *cctx; 1513 coro_cctx *cctx;
1433 1514
1434 ++cctx_count; 1515 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1516 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1522 return cctx;
1442} 1523}
1443 1524
1444/* create a new cctx only suitable as source */ 1525/* create a new cctx only suitable as source */
1445static coro_cctx * 1526static coro_cctx *
1446cctx_new_empty () 1527cctx_new_empty (void)
1447{ 1528{
1448 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1449 1530
1450 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1533
1453 return cctx; 1534 return cctx;
1454} 1535}
1455 1536
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1538static coro_cctx *
1458cctx_new_run () 1539cctx_new_run (void)
1459{ 1540{
1460 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1542
1464#if HAVE_MMAP 1543 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1468
1469 if (cctx->sptr != (void *)-1)
1470 {
1471 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1473 #endif
1474 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1475 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1476 cctx->flags |= CC_MAPPED;
1477 } 1544 {
1478 else
1479#endif
1480 {
1481 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1482 New (0, cctx->sptr, cctx_stacksize, long);
1483
1484 if (!cctx->sptr)
1485 {
1486 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1547 }
1493 1548
1494 #if CORO_USE_VALGRIND
1495 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1496 #endif
1497
1498 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1550
1500 return cctx; 1551 return cctx;
1501} 1552}
1502 1553
1503static void 1554static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1561
1511 --cctx_count; 1562 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1513 1564
1514 /* coro_transfer creates new, empty cctx's */ 1565 coro_stack_free (&cctx->stack);
1515 if (cctx->sptr)
1516 {
1517 #if CORO_USE_VALGRIND
1518 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1519 #endif
1520
1521#if HAVE_MMAP
1522 if (cctx->flags & CC_MAPPED)
1523 munmap (cctx->sptr, cctx->ssize);
1524 else
1525#endif
1526 Safefree (cctx->sptr);
1527 }
1528 1566
1529 Safefree (cctx); 1567 Safefree (cctx);
1530} 1568}
1531 1569
1532/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1571#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1572
1535static coro_cctx * 1573static coro_cctx *
1536cctx_get (pTHX) 1574cctx_get (pTHX)
1537{ 1575{
1538 while (expect_true (cctx_first)) 1576 while (ecb_expect_true (cctx_first))
1539 { 1577 {
1540 coro_cctx *cctx = cctx_first; 1578 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1579 cctx_first = cctx->next;
1542 --cctx_idle; 1580 --cctx_idle;
1543 1581
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1582 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1583 return cctx;
1546 1584
1547 cctx_destroy (cctx); 1585 cctx_destroy (cctx);
1548 } 1586 }
1549 1587
… …
1551} 1589}
1552 1590
1553static void 1591static void
1554cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1555{ 1593{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1595
1558 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1598 {
1561 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1600 cctx_first = first->next;
1563 --cctx_idle; 1601 --cctx_idle;
1564 1602
… …
1575static void 1613static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1614transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1615{
1578 /* TODO: throwing up here is considered harmful */ 1616 /* TODO: throwing up here is considered harmful */
1579 1617
1580 if (expect_true (prev != next)) 1618 if (ecb_expect_true (prev != next))
1581 { 1619 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1620 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1621 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1622
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1623 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1624 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1625
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1626#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1627 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1628 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1629#endif
1592 } 1630 }
1593} 1631}
1594 1632
1595/* always use the TRANSFER macro */ 1633/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1634static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1635transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1636{
1599 dSTACKLEVEL; 1637 dSTACKLEVEL;
1600 1638
1601 /* sometimes transfer is only called to set idle_sp */ 1639 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1640 if (ecb_expect_false (!prev))
1603 { 1641 {
1604 cctx_current->idle_sp = STACKLEVEL; 1642 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1643 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1644 }
1607 else if (expect_true (prev != next)) 1645 else if (ecb_expect_true (prev != next))
1608 { 1646 {
1609 coro_cctx *cctx_prev; 1647 coro_cctx *cctx_prev;
1610 1648
1611 if (expect_false (prev->flags & CF_NEW)) 1649 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1650 {
1613 /* create a new empty/source context */ 1651 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1652 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1653 prev->flags |= CF_RUNNING;
1616 } 1654 }
… …
1619 next->flags |= CF_RUNNING; 1657 next->flags |= CF_RUNNING;
1620 1658
1621 /* first get rid of the old state */ 1659 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1660 save_perl (aTHX_ prev);
1623 1661
1624 if (expect_false (next->flags & CF_NEW)) 1662 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1663 {
1626 /* need to start coroutine */ 1664 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1665 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1666 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1667 init_perl (aTHX_ next);
1630 } 1668 }
1631 else 1669 else
1632 load_perl (aTHX_ next); 1670 load_perl (aTHX_ next);
1633 1671
1634 /* possibly untie and reuse the cctx */ 1672 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1673 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1674 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1675 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1676 && !force_cctx
1639 )) 1677 ))
1640 { 1678 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1679 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1680 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1681
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1682 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1683 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1684 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1685 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1686 next->cctx = cctx_get (aTHX);
1649 1687
1650 cctx_put (cctx_current); 1688 cctx_put (cctx_current);
1651 } 1689 }
1652 else 1690 else
1653 prev->cctx = cctx_current; 1691 prev->cctx = cctx_current;
1654 1692
1655 ++next->usecount; 1693 ++next->usecount;
1656 1694
1657 cctx_prev = cctx_current; 1695 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1696 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1697
1660 next->cctx = 0; 1698 next->cctx = 0;
1661 1699
1662 if (expect_false (cctx_prev != cctx_current)) 1700 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1701 {
1664 cctx_prev->top_env = PL_top_env; 1702 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1703 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1704 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1705 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1711#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1712#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1713
1676/** high level stuff ********************************************************/ 1714/** high level stuff ********************************************************/
1677 1715
1716/* this function is actually Coro, not Coro::State, but we call it from here */
1717/* because it is convenient - but it hasn't been declared yet for that reason */
1718static void
1719coro_call_on_destroy (pTHX_ struct coro *coro);
1720
1678static void 1721static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1722coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1723{
1681 if (coro->flags & CF_DESTROYED) 1724 if (coro->flags & CF_ZOMBIE)
1682 return; 1725 return;
1683 1726
1684 slf_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1685 1728
1686 coro->flags |= CF_DESTROYED; 1729 coro->flags |= CF_ZOMBIE;
1687 1730
1688 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1689 { 1732 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1735 --coro_nready;
1693 } 1736 }
1694 else 1737 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1738 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1739
1740 if (coro->next) coro->next->prev = coro->prev;
1741 if (coro->prev) coro->prev->next = coro->next;
1742 if (coro == coro_first) coro_first = coro->next;
1696 1743
1697 if (coro->mainstack 1744 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1745 && coro->mainstack != main_mainstack
1699 && coro->slot 1746 && coro->slot
1700 && !PL_dirty) 1747 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1748 destroy_perl (aTHX_ coro);
1702 1749
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1750 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1751 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1752 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1753 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1754 SvREFCNT_dec (CORO_THROW);
1755
1756 coro_call_on_destroy (aTHX_ coro);
1757
1758 /* more destruction mayhem in coro_state_free */
1712} 1759}
1713 1760
1714static int 1761static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1762coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1763{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1765 mg->mg_ptr = 0;
1719 1766
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1767 coro_state_destroy (aTHX_ coro);
1768 SvREFCNT_dec (coro->on_destroy);
1769 SvREFCNT_dec (coro->status);
1770
1725 Safefree (coro); 1771 Safefree (coro);
1726 }
1727 1772
1728 return 0; 1773 return 0;
1729} 1774}
1730 1775
1731static int 1776static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1777coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1778{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1779 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1780 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1781 mg->mg_ptr = 0;
1782 mg->mg_virtual = 0;
1737 1783
1738 return 0; 1784 return 0;
1739} 1785}
1740 1786
1741static MGVTBL coro_state_vtbl = { 1787static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1812 TRANSFER (ta, 1);
1767} 1813}
1768 1814
1769/** Coro ********************************************************************/ 1815/** Coro ********************************************************************/
1770 1816
1771INLINE void 1817ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1818coro_enq (pTHX_ struct coro *coro)
1773{ 1819{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1820 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1821
1776 SvREFCNT_inc_NN (coro->hv); 1822 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1824 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1825 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1826 ready [1] = coro;
1781} 1827}
1782 1828
1783INLINE struct coro * 1829ecb_inline struct coro *
1784coro_deq (pTHX) 1830coro_deq (pTHX)
1785{ 1831{
1786 int prio; 1832 int prio;
1787 1833
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1834 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1887{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1888 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1889}
1844 1890
1845/* expects to own a reference to next->hv */ 1891/* expects to own a reference to next->hv */
1846INLINE void 1892ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1893prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1894{
1849 SV *prev_sv = SvRV (coro_current); 1895 SV *prev_sv = SvRV (coro_current);
1850 1896
1851 ta->prev = SvSTATE_hv (prev_sv); 1897 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1910{
1865 for (;;) 1911 for (;;)
1866 { 1912 {
1867 struct coro *next = coro_deq (aTHX); 1913 struct coro *next = coro_deq (aTHX);
1868 1914
1869 if (expect_true (next)) 1915 if (ecb_expect_true (next))
1870 { 1916 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1917 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1918 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1919 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1920 else
1875 { 1921 {
1876 next->flags &= ~CF_READY; 1922 next->flags &= ~CF_READY;
1877 --coro_nready; 1923 --coro_nready;
… …
1885 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1888 { 1934 {
1889 if (SvRV (sv_idle) == SvRV (coro_current)) 1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1891 1954
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready; 1957 --coro_nready;
1895 } 1958 }
… …
1910 } 1973 }
1911 } 1974 }
1912 } 1975 }
1913} 1976}
1914 1977
1915INLINE void 1978ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1980{
1918 api_ready (aTHX_ coro_current); 1981 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1982 prepare_schedule (aTHX_ ta);
1920} 1983}
1921 1984
1922INLINE void 1985ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1986prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1987{
1925 SV *prev = SvRV (coro_current); 1988 SV *prev = SvRV (coro_current);
1926 1989
1927 if (coro_nready) 1990 if (coro_nready)
… …
1957{ 2020{
1958 struct coro_transfer_args ta; 2021 struct coro_transfer_args ta;
1959 2022
1960 prepare_cede (aTHX_ &ta); 2023 prepare_cede (aTHX_ &ta);
1961 2024
1962 if (expect_true (ta.prev != ta.next)) 2025 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2026 {
1964 TRANSFER (ta, 1); 2027 TRANSFER (ta, 1);
1965 return 1; 2028 return 1;
1966 } 2029 }
1967 else 2030 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2073 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2074 }
2012} 2075}
2013 2076
2014static void 2077static void
2078coro_push_av (pTHX_ AV *av, I32 gimme_v)
2079{
2080 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2081 {
2082 dSP;
2083
2084 if (gimme_v == G_SCALAR)
2085 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2086 else
2087 {
2088 int i;
2089 EXTEND (SP, AvFILLp (av) + 1);
2090
2091 for (i = 0; i <= AvFILLp (av); ++i)
2092 PUSHs (AvARRAY (av)[i]);
2093 }
2094
2095 PUTBACK;
2096 }
2097}
2098
2099static void
2100coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2101{
2102 if (!coro->on_destroy)
2103 coro->on_destroy = newAV ();
2104
2105 av_push (coro->on_destroy, cb);
2106}
2107
2108static void
2109slf_destroy_join (pTHX_ struct CoroSLF *frame)
2110{
2111 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2112}
2113
2114static int
2115slf_check_join (pTHX_ struct CoroSLF *frame)
2116{
2117 struct coro *coro = (struct coro *)frame->data;
2118
2119 if (!coro->status)
2120 return 1;
2121
2122 frame->destroy = 0;
2123
2124 coro_push_av (aTHX_ coro->status, GIMME_V);
2125
2126 SvREFCNT_dec ((SV *)coro->hv);
2127
2128 return 0;
2129}
2130
2131static void
2132slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2133{
2134 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2135
2136 if (items > 1)
2137 croak ("join called with too many arguments");
2138
2139 if (coro->status)
2140 frame->prepare = prepare_nop;
2141 else
2142 {
2143 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2144 frame->prepare = prepare_schedule;
2145 }
2146
2147 frame->check = slf_check_join;
2148 frame->destroy = slf_destroy_join;
2149 frame->data = (void *)coro;
2150 SvREFCNT_inc (coro->hv);
2151}
2152
2153static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2154coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2155{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2156 AV *od = coro->on_destroy;
2018 2157
2019 if (on_destroyp) 2158 if (!od)
2020 { 2159 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
2025 while (AvFILLp (on_destroy) >= 0) 2164 while (AvFILLp (od) >= 0)
2165 {
2166 SV *cb = sv_2mortal (av_pop (od));
2167
2168 /* coro hv's (and only hv's at the moment) are supported as well */
2169 if (SvSTATEhv_p (aTHX_ cb))
2170 api_ready (aTHX_ cb);
2171 else
2026 { 2172 {
2027 dSP; /* don't disturb outer sp */ 2173 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2174 PUSHMARK (SP);
2031 2175
2032 if (statusp) 2176 if (coro->status)
2033 { 2177 {
2034 int i; 2178 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2179 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2180 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2181 }
2040 2182
2041 PUTBACK; 2183 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2184 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2185 }
2044 } 2186 }
2045} 2187}
2046 2188
2047static void 2189static void
2048coro_set_status (HV *coro_hv, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2191{
2050 AV *av = newAV (); 2192 AV *av;
2193
2194 if (coro->status)
2195 {
2196 av = coro->status;
2197 av_clear (av);
2198 }
2199 else
2200 av = coro->status = newAV ();
2051 2201
2052 /* items are actually not so common, so optimise for this case */ 2202 /* items are actually not so common, so optimise for this case */
2053 if (items) 2203 if (items)
2054 { 2204 {
2055 int i; 2205 int i;
… …
2057 av_extend (av, items - 1); 2207 av_extend (av, items - 1);
2058 2208
2059 for (i = 0; i < items; ++i) 2209 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2210 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2211 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2212}
2065 2213
2066static void 2214static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2215slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2216{
… …
2080static void 2228static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2229slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2230{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2231 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2232
2085 coro_set_status (coro_hv, arg, items); 2233 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (frame, coro_hv); 2234 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2235}
2088 2236
2089static void 2237static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2238slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{ 2239{
… …
2096 croak ("Coro::cancel called without coro object,"); 2244 croak ("Coro::cancel called without coro object,");
2097 2245
2098 coro = SvSTATE (arg [0]); 2246 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2247 coro_hv = coro->hv;
2100 2248
2101 coro_set_status (coro_hv, arg + 1, items - 1); 2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2250
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2252 {
2105 /* coro currently busy cancelling something, so just notify it */ 2253 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2254 coro->slf_frame.data = (void *)coro;
2107 2255
2108 frame->prepare = prepare_nop; 2256 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop; 2257 frame->check = slf_check_nop;
2110 } 2258 }
2111 else if (coro_hv == (HV *)SvRV (coro_current)) 2259 else if (coro_hv == (HV *)SvRV (coro_current))
2112 { 2260 {
2113 /* cancelling the current coro is allowed, and equals terminate */ 2261 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (frame, coro_hv); 2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2263 }
2116 else 2264 else
2117 { 2265 {
2118 struct coro *self = SvSTATE_current; 2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2119 2270
2120 /* otherwise we cancel directly, purely for speed reasons 2271 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as 2272 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation. 2273 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed. 2274 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2275 * besides, I can't get the slow-but-safe version working...
2125 */ 2276 */
2126 slf_frame.data = 0; 2277 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2278 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2279 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2280 self->flags &= ~CF_NOCANCEL;
2133 2281
2134 if (slf_frame.data) 2282 if (slf_frame.data)
2135 { 2283 {
2136 /* while we were busy we have been cancelled, so terminate */ 2284 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (frame, self->hv); 2285 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 } 2286 }
2139 else 2287 else
2140 { 2288 {
2141 frame->prepare = prepare_nop; 2289 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop; 2290 frame->check = slf_check_nop;
… …
2146 2294
2147static int 2295static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame) 2296slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{ 2297{
2150 frame->prepare = 0; 2298 frame->prepare = 0;
2151 coro_unwind_stacks (); 2299 coro_unwind_stacks (aTHX);
2152 2300
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current)); 2301 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154 2302
2155 return 1; 2303 return 1;
2156} 2304}
… …
2161 if (coro->cctx) 2309 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2310 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2311
2164 if (coro->flags & CF_NEW) 2312 if (coro->flags & CF_NEW)
2165 { 2313 {
2166 coro_set_status (coro->hv, arg, items); 2314 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2315 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2316 }
2170 else 2317 else
2171 { 2318 {
2172 if (!coro->slf_frame.prepare) 2319 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2320 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2321
2175 slf_destroy (coro); 2322 slf_destroy (aTHX_ coro);
2176 2323
2177 coro_set_status (coro->hv, arg, items); 2324 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2325 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2326 coro->slf_frame.check = slf_check_safe_cancel;
2180 2327
2181 api_ready (aTHX_ coro->hv); 2328 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2329 }
2183 2330
2184 return 1; 2331 return 1;
2185} 2332}
2186 2333
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2367slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2368{
2222 HV *hv = (HV *)SvRV (coro_current); 2369 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2370 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2371
2225 if (expect_true (coro->saved_deffh)) 2372 if (ecb_expect_true (coro->saved_deffh))
2226 { 2373 {
2227 /* subsequent iteration */ 2374 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2375 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2376 coro->saved_deffh = 0;
2230 2377
… …
2290 2437
2291static int 2438static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2440{
2294 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
2295 2442
2296 if (CORO_THROW) 2443 if (CORO_THROW)
2297 return 0; 2444 return 0;
2298 2445
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2447 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2338 } 2485 }
2339 2486
2340 if (!SvROK (cb) 2487 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2491
2345 { 2492 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2469 2616
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void 2618static void
2472slf_destroy (pTHX_ struct coro *coro) 2619slf_destroy (pTHX_ struct coro *coro)
2473{ 2620{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2621 struct CoroSLF frame = coro->slf_frame;
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477 2622
2478 /* 2623 /*
2479 * The on_destroy above most likely is from an SLF call. 2624 * The on_destroy below most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2625 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2626 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions. 2627 * cleanup functions cannot call SLF functions.
2483 */ 2628 */
2484 coro->slf_frame.prepare = 0; 2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2485} 2634}
2486 2635
2487/* 2636/*
2488 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2489 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2645 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2646
2498 /* set up the slf frame, unless it has already been set-up */ 2647 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2648 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2649 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2650 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2651 {
2503 /* first iteration */ 2652 /* first iteration */
2504 dSP; 2653 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2654 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2655 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2696 while (slf_frame.check (aTHX_ &slf_frame));
2548 2697
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2698 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2699
2551 /* exception handling */ 2700 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2701 if (ecb_expect_false (CORO_THROW))
2553 { 2702 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2703 SV *exception = sv_2mortal (CORO_THROW);
2555 2704
2556 CORO_THROW = 0; 2705 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2706 sv_setsv (ERRSV, exception);
2558 croak (0); 2707 croak (0);
2559 } 2708 }
2560 2709
2561 /* return value handling - mostly like entersub */ 2710 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2711 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2712 if (GIMME_V == G_SCALAR
2713 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2714 {
2565 dSP; 2715 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2716 SV **bot = PL_stack_base + checkmark;
2567 2717
2568 if (sp == bot) /* too few, push undef */ 2718 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2719 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2720 else /* too many, take last one */
2571 bot [1] = *sp; 2721 bot [1] = *sp;
2572 2722
2573 SP = bot + 1; 2723 SP = bot + 1;
2574 2724
2575 PUTBACK; 2725 PUTBACK;
… …
2682{ 2832{
2683 PerlIOBuf base; 2833 PerlIOBuf base;
2684 NV next, every; 2834 NV next, every;
2685} PerlIOCede; 2835} PerlIOCede;
2686 2836
2687static IV 2837static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2838PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2839{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2841
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2842 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2843 self->next = nvtime () + self->every;
2694 2844
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2845 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2846}
2697 2847
2698static SV * 2848static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2849PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2850{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2852
2703 return newSVnv (self->every); 2853 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2965 SvREFCNT_dec (cb);
2816 } 2966 }
2817} 2967}
2818 2968
2819static void 2969static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2971{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2972 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2973 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2974}
2825 2975
2826static int 2976static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2977slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2978{
2829 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2981 SV *coro_hv = SvRV (coro_current);
2982
2983 frame->destroy = 0;
2831 2984
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2834 return 0; 2991 return 0;
2992 }
2835 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2836 { 2994 {
2837 frame->destroy = 0;
2838
2839 if (acquire) 2995 if (acquire)
2840 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2841 else 2997 else
2842 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2843 2999
… …
2847 { 3003 {
2848 int i; 3004 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 3005 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 3006 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 3007 /* this avoids some degenerate memory usage cases */
2852 3008 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 3009 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 3010 return 1;
2856 3011
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3012 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 3013 return 1;
2859 } 3014 }
2860} 3015}
2861 3016
2862static int 3017static int
… …
3066 /* it quickly returns */ 3221 /* it quickly returns */
3067 if (CORO_THROW) 3222 if (CORO_THROW)
3068 return 0; 3223 return 0;
3069 3224
3070 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
3071 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3072 return 1; 3227 return 1;
3073 3228
3074 /* restore status */ 3229 /* restore status */
3075 { 3230 {
3076 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
3115 dSP; 3270 dSP;
3116 3271
3117 static SV *prio_cv; 3272 static SV *prio_cv;
3118 static SV *prio_sv; 3273 static SV *prio_sv;
3119 3274
3120 if (expect_false (!prio_cv)) 3275 if (ecb_expect_false (!prio_cv))
3121 { 3276 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3277 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3278 prio_sv = newSViv (0);
3124 } 3279 }
3125 3280
… …
3231 } 3386 }
3232 3387
3233 return coro_sv; 3388 return coro_sv;
3234} 3389}
3235 3390
3391#ifndef __cplusplus
3392ecb_cold XS(boot_Coro__State);
3393#endif
3394
3395#if CORO_JIT
3396
3397static void ecb_noinline ecb_cold
3398pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3399{
3400 dSP;
3401 AV *av = newAV ();
3402
3403 av_store (av, 3, newSVuv (d));
3404 av_store (av, 2, newSVuv (c));
3405 av_store (av, 1, newSVuv (b));
3406 av_store (av, 0, newSVuv (a));
3407
3408 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3409
3410 PUTBACK;
3411}
3412
3413static void ecb_noinline ecb_cold
3414jit_init (pTHX)
3415{
3416 dSP;
3417 SV *load, *save;
3418 char *map_base;
3419 char *load_ptr, *save_ptr;
3420 STRLEN load_len, save_len, map_len;
3421 int count;
3422
3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3424
3425 PUSHMARK (SP);
3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3427 #include "state.h"
3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3429 SPAGAIN;
3430
3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
3433
3434 map_len = load_len + save_len + 16;
3435
3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3437
3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3439
3440 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len);
3442
3443 map_base += (load_len + 15) & ~15;
3444
3445 save_perl_slots = (load_save_perl_slots_type)map_base;
3446 memcpy (map_base, save_ptr, save_len);
3447
3448 /* we are good citizens and try to make the page read-only, so the evil evil */
3449 /* hackers might have it a bit more difficult */
3450 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3451
3452 PUTBACK;
3453 eval_pv ("undef &Coro::State::_jit", 1);
3454}
3455
3456#endif
3457
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3458MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3459
3238PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
3239 3461
3240BOOT: 3462BOOT:
3241{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
3242#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3467# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
3245# endif 3469# endif
3246#endif 3470#endif
3247 BOOT_PAGESIZE; 3471 /* perl defines these to check for existance first, but why it doesn't */
3472 /* just create them one at init time is not clear to me, except for */
3473 /* programs trying to delete them, but... */
3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3475 DEFSV;
3476 ERRSV;
3248 3477
3249 cctx_current = cctx_new_empty (); 3478 cctx_current = cctx_new_empty ();
3250 3479
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3524 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3525
3297 time_init (aTHX); 3526 time_init (aTHX);
3298 3527
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3528 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3529#if CORO_JIT
3530 PUTBACK;
3531 jit_init (aTHX);
3532 SPAGAIN;
3533#endif
3300} 3534}
3301 3535
3302SV * 3536SV *
3303new (SV *klass, ...) 3537new (SV *klass, ...)
3304 ALIAS: 3538 ALIAS:
… …
3311void 3545void
3312transfer (...) 3546transfer (...)
3313 PROTOTYPE: $$ 3547 PROTOTYPE: $$
3314 CODE: 3548 CODE:
3315 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3316
3317void
3318_exit (int code)
3319 PROTOTYPE: $
3320 CODE:
3321 _exit (code);
3322 3550
3323SV * 3551SV *
3324clone (Coro::State coro) 3552clone (Coro::State coro)
3325 CODE: 3553 CODE:
3326{ 3554{
… …
3381void 3609void
3382list () 3610list ()
3383 PROTOTYPE: 3611 PROTOTYPE:
3384 PPCODE: 3612 PPCODE:
3385{ 3613{
3386 struct coro *coro; 3614 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3616 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3618}
3391 3619
… …
3446 PROTOTYPE: $ 3674 PROTOTYPE: $
3447 ALIAS: 3675 ALIAS:
3448 is_ready = CF_READY 3676 is_ready = CF_READY
3449 is_running = CF_RUNNING 3677 is_running = CF_RUNNING
3450 is_new = CF_NEW 3678 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3679 is_destroyed = CF_ZOMBIE
3680 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3681 is_suspended = CF_SUSPENDED
3453 CODE: 3682 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3684 OUTPUT:
3456 RETVAL 3685 RETVAL
3457 3686
3458void 3687void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
3461 CODE: 3690 CODE:
3462{ 3691{
3692 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3695 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3696 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
3468} 3700}
3469 3701
3470void 3702void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
3549 3781
3550void 3782void
3551times (Coro::State self) 3783times (Coro::State self)
3552 PPCODE: 3784 PPCODE:
3553{ 3785{
3554 struct coro *current = SvSTATE (coro_current); 3786 struct coro *current = SvSTATE (coro_current);
3555 3787
3556 if (expect_false (current == self)) 3788 if (ecb_expect_false (current == self))
3557 { 3789 {
3558 coro_times_update (); 3790 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3791 coro_times_add (SvSTATE (coro_current));
3560 } 3792 }
3561 3793
3562 EXTEND (SP, 2); 3794 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3795 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3796 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3797
3566 if (expect_false (current == self)) 3798 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3799 coro_times_sub (SvSTATE (coro_current));
3568} 3800}
3569 3801
3570void 3802void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3803swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3602 3834
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3836 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3837 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3839
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3841
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3644void 3876void
3645_destroy (Coro::State coro) 3877_destroy (Coro::State coro)
3646 CODE: 3878 CODE:
3647 /* used by the manager thread */ 3879 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3880 coro_state_destroy (aTHX_ coro);
3881
3882void
3883on_destroy (Coro::State coro, SV *cb)
3884 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3885 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3886
3887void
3888join (...)
3889 CODE:
3890 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3891
3651void 3892void
3652terminate (...) 3893terminate (...)
3653 CODE: 3894 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3895 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3825 on_leave = 1 4066 on_leave = 1
3826 PROTOTYPE: & 4067 PROTOTYPE: &
3827 CODE: 4068 CODE:
3828{ 4069{
3829 struct coro *coro = SvSTATE_current; 4070 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4072
3832 block = s_get_cv_croak (block); 4073 block = s_get_cv_croak (block);
3833 4074
3834 if (!*avp) 4075 if (!*avp)
3835 *avp = newAV (); 4076 *avp = newAV ();
… …
3855 4096
3856SV * 4097SV *
3857new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
3858 CODE: 4099 CODE:
3859{ 4100{
3860 int semcnt = 1; 4101 int semcnt = 1;
3861 4102
3862 if (count) 4103 if (count)
3863 { 4104 {
3864 SvGETMAGIC (count); 4105 SvGETMAGIC (count);
3865 4106
… …
3925 XSRETURN_NO; 4166 XSRETURN_NO;
3926} 4167}
3927 4168
3928void 4169void
3929waiters (SV *self) 4170waiters (SV *self)
3930 PPCODE: 4171 PPCODE:
3931{ 4172{
3932 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
3934 4175
3935 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
3944} 4185}
3945 4186
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4187MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4188
3948void 4189void
3949_may_delete (SV *sem, int count, int extra_refs) 4190_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4191 PPCODE:
3951{ 4192{
3952 AV *av = (AV *)SvRV (sem); 4193 AV *av = (AV *)SvRV (sem);
3953 4194
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4196 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4197 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4198 XSRETURN_YES;
… …
3978 4219
3979void 4220void
3980broadcast (SV *self) 4221broadcast (SV *self)
3981 CODE: 4222 CODE:
3982{ 4223{
3983 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4226}
3986 4227
3987void 4228void
3988send (SV *self) 4229send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4238}
3998 4239
3999IV 4240IV
4000awaited (SV *self) 4241awaited (SV *self)
4001 CODE: 4242 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4244 OUTPUT:
4004 RETVAL 4245 RETVAL
4005 4246
4006 4247
… …
4011 4252
4012void 4253void
4013_schedule (...) 4254_schedule (...)
4014 CODE: 4255 CODE:
4015{ 4256{
4016 static int incede; 4257 static int incede;
4017 4258
4018 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
4019 4260
4020 ++incede; 4261 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
4065 { 4306 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0; 4308 coro_old_pp_sselect = 0;
4068 } 4309 }
4069 4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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