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.372 by root, Thu Oct 1 23:50:23 2009 UTC vs.
Revision 1.414 by root, Wed Jun 29 16:08:31 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
57# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
58#endif 74#endif
59 75
60#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
76# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
77#endif 93#endif
78 94
79#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
80 96
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 97#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
98 99
99#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
100# if CORO_PTHREAD 101# if CORO_PTHREAD
101static void *coro_thx; 102static void *coro_thx;
102# endif 103# endif
103#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
104 108
105#ifdef __linux 109#ifdef __linux
106# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
116static void (*u2time)(pTHX_ UV ret[2]); 120static void (*u2time)(pTHX_ UV ret[2]);
117 121
118/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
121 126
122static U32 cctx_gen; 127static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
155static char times_valid; 160static char times_valid;
156 161
157static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
159 164
160enum { 165enum
166{
161 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
186 int valgrind_id; 192 int valgrind_id;
187#endif 193#endif
188 unsigned char flags; 194 unsigned char flags;
189} coro_cctx; 195} coro_cctx;
190 196
191coro_cctx *cctx_current; /* the currently running cctx */ 197static coro_cctx *cctx_current; /* the currently running cctx */
192 198
193/*****************************************************************************/ 199/*****************************************************************************/
194 200
201static MGVTBL coro_state_vtbl;
202
195enum { 203enum
204{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
210 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
201}; 211};
202 212
203/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct 214typedef struct
205{ 215{
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210 HV *hinthv;
211#define VAR(name,type) type name; 216#define VARx(name,expr,type) type name;
212# include "state.h" 217# include "state.h"
213#undef VAR 218#undef VARx
214} perl_slots; 219} perl_slots;
215 220
221/* how many context stack entries do we need for perl_slots */
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217 223
218/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
219struct coro { 225struct coro
226{
220 /* the C coroutine allocated to this perl coroutine, if any */ 227 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 228 coro_cctx *cctx;
222 229
223 /* ready queue */ 230 /* ready queue */
224 struct coro *next_ready; 231 struct coro *next_ready;
… …
226 /* state data */ 233 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 234 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 235 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 236 perl_slots *slot; /* basically the saved sp */
230 237
231 CV *startcv; /* the CV to execute */ 238 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 239 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 241 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 242
238 /* statistics */ 243 /* statistics */
239 int usecount; /* number of transfers to this coro */ 244 int usecount; /* number of transfers to this coro */
240 245
241 /* coro process data */ 246 /* coro process data */
242 int prio; 247 int prio;
243 SV *except; /* exception to be thrown */ 248 SV *except; /* exception to be thrown */
244 SV *rouse_cb; 249 SV *rouse_cb; /* last rouse callback */
250 AV *on_destroy; /* callbacks or coros to notify on destroy */
251 AV *status; /* the exit status list */
245 252
246 /* async_pool */ 253 /* async_pool */
247 SV *saved_deffh; 254 SV *saved_deffh;
248 SV *invoke_cb; 255 SV *invoke_cb;
249 AV *invoke_av; 256 AV *invoke_av;
250 257
251 /* on_enter/on_leave */ 258 /* on_enter/on_leave */
252 AV *on_enter; 259 AV *on_enter;
253 AV *on_leave; 260 AV *on_leave;
254 261
262 /* swap_sv */
263 AV *swap_sv;
264
255 /* times */ 265 /* times */
256 coro_ts t_cpu, t_real; 266 coro_ts t_cpu, t_real;
257 267
258 /* linked list */ 268 /* linked list */
259 struct coro *next, *prev; 269 struct coro *next, *prev;
… …
262typedef struct coro *Coro__State; 272typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 273typedef struct coro *Coro__State_or_hashref;
264 274
265/* the following variables are effectively part of the perl context */ 275/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 276/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 277/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 278static struct CoroSLF slf_frame; /* the current slf frame */
269 279
270/** Coro ********************************************************************/ 280/** Coro ********************************************************************/
271 281
272#define CORO_PRIO_MAX 3 282#define CORO_PRIO_MAX 3
… …
278 288
279/* for Coro.pm */ 289/* for Coro.pm */
280static SV *coro_current; 290static SV *coro_current;
281static SV *coro_readyhook; 291static SV *coro_readyhook;
282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 292static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate; 293static CV *cv_coro_run;
284static struct coro *coro_first; 294static struct coro *coro_first;
285#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
296
297/** JIT *********************************************************************/
298
299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix"
307 #endif
308 #endif
309#endif
310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
318#endif
286 319
287/** Coro::Select ************************************************************/ 320/** Coro::Select ************************************************************/
288 321
289static OP *(*coro_old_pp_sselect) (pTHX); 322static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 323static SV *coro_select_select;
… …
302 PL_op->op_flags |= OPf_STACKED; 335 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 336 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 337 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 338}
306 339
340/** time stuff **************************************************************/
341
342#ifdef HAS_GETTIMEOFDAY
343
344ecb_inline void
345coro_u2time (pTHX_ UV ret[2])
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 ret [0] = tv.tv_sec;
351 ret [1] = tv.tv_usec;
352}
353
354ecb_inline double
355coro_nvtime (void)
356{
357 struct timeval tv;
358 gettimeofday (&tv, 0);
359
360 return tv.tv_sec + tv.tv_usec * 1e-6;
361}
362
363ecb_inline void
364time_init (pTHX)
365{
366 nvtime = coro_nvtime;
367 u2time = coro_u2time;
368}
369
370#else
371
372ecb_inline void
373time_init (pTHX)
374{
375 SV **svp;
376
377 require_pv ("Time/HiRes.pm");
378
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383
384 nvtime = INT2PTR (double (*)(), SvIV (*svp));
385
386 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
387 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
388}
389
390#endif
391
307/** lowlevel stuff **********************************************************/ 392/** lowlevel stuff **********************************************************/
308 393
309static SV * 394static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 395coro_get_sv (pTHX_ const char *name, int create)
311{ 396{
312#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 399 get_sv (name, create);
315#endif 400#endif
316 return get_sv (name, create); 401 return get_sv (name, create);
317} 402}
318 403
319static AV * 404static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 405coro_get_av (pTHX_ const char *name, int create)
321{ 406{
322#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 409 get_av (name, create);
325#endif 410#endif
326 return get_av (name, create); 411 return get_av (name, create);
327} 412}
328 413
329static HV * 414static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 415coro_get_hv (pTHX_ const char *name, int create)
331{ 416{
332#if PERL_VERSION_ATLEAST (5,10,0) 417#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 418 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 419 get_hv (name, create);
335#endif 420#endif
336 return get_hv (name, create); 421 return get_hv (name, create);
337} 422}
338 423
339INLINE void 424ecb_inline void
340coro_times_update () 425coro_times_update (void)
341{ 426{
342#ifdef coro_clock_gettime 427#ifdef coro_clock_gettime
343 struct timespec ts; 428 struct timespec ts;
344 429
345 ts.tv_sec = ts.tv_nsec = 0; 430 ts.tv_sec = ts.tv_nsec = 0;
… …
357 time_real [0] = tv [0]; 442 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000; 443 time_real [1] = tv [1] * 1000;
359#endif 444#endif
360} 445}
361 446
362INLINE void 447ecb_inline void
363coro_times_add (struct coro *c) 448coro_times_add (struct coro *c)
364{ 449{
365 c->t_real [1] += time_real [1]; 450 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0]; 452 c->t_real [0] += time_real [0];
… …
369 c->t_cpu [1] += time_cpu [1]; 454 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0]; 456 c->t_cpu [0] += time_cpu [0];
372} 457}
373 458
374INLINE void 459ecb_inline void
375coro_times_sub (struct coro *c) 460coro_times_sub (struct coro *c)
376{ 461{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 462 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1]; 463 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0]; 464 c->t_real [0] -= time_real [0];
… …
387/* magic glue */ 472/* magic glue */
388 473
389#define CORO_MAGIC_type_cv 26 474#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext 475#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 476
392#define CORO_MAGIC_NN(sv, type) \ 477#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \ 478 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \ 479 ? SvMAGIC (sv) \
395 : mg_find (sv, type)) 480 : mg_find (sv, type))
396 481
397#define CORO_MAGIC(sv, type) \ 482#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \ 483 (ecb_expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \ 484 ? CORO_MAGIC_NN (sv, type) \
400 : 0) 485 : 0)
401 486
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 487#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404 489
405INLINE struct coro * 490ecb_inline MAGIC *
491SvSTATEhv_p (pTHX_ SV *coro)
492{
493 MAGIC *mg;
494
495 if (ecb_expect_true (
496 SvTYPE (coro) == SVt_PVHV
497 && (mg = CORO_MAGIC_state (coro))
498 && mg->mg_virtual == &coro_state_vtbl
499 ))
500 return mg;
501
502 return 0;
503}
504
505ecb_inline struct coro *
406SvSTATE_ (pTHX_ SV *coro) 506SvSTATE_ (pTHX_ SV *coro)
407{ 507{
408 HV *stash;
409 MAGIC *mg; 508 MAGIC *mg;
410 509
411 if (SvROK (coro)) 510 if (SvROK (coro))
412 coro = SvRV (coro); 511 coro = SvRV (coro);
413 512
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 513 mg = SvSTATEhv_p (aTHX_ coro);
514 if (!mg)
415 croak ("Coro::State object required"); 515 croak ("Coro::State object required");
416 516
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr; 517 return (struct coro *)mg->mg_ptr;
427} 518}
428 519
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 520#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 521
… …
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434 525
435/*****************************************************************************/ 526/*****************************************************************************/
436/* padlist management and caching */ 527/* padlist management and caching */
437 528
438static AV * 529ecb_inline AV *
439coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
440{ 531{
441 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
442 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
443 534
… …
455 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
456 547
457 return newpadlist; 548 return newpadlist;
458} 549}
459 550
460static void 551ecb_inline void
461free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
462{ 553{
463 /* may be during global destruction */ 554 /* may be during global destruction */
464 if (!IN_DESTRUCT) 555 if (!IN_DESTRUCT)
465 { 556 {
… …
508 0, 0, 0, 0, 599 0, 0, 0, 0,
509 coro_cv_free 600 coro_cv_free
510}; 601};
511 602
512/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
513static void 604ecb_inline void
514get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
515{ 606{
516 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
517 AV *av; 608 AV *av;
518 609
519 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
520 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
521 else 612 else
522 { 613 {
523#if CORO_PREFER_PERL_FUNCTIONS 614#if CORO_PREFER_PERL_FUNCTIONS
524 /* this is probably cleaner? but also slower! */ 615 /* this is probably cleaner? but also slower! */
… …
531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
532#endif 623#endif
533 } 624 }
534} 625}
535 626
536static void 627ecb_inline void
537put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
538{ 629{
539 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
540 AV *av; 631 AV *av;
541 632
542 if (expect_false (!mg)) 633 if (ecb_expect_false (!mg))
543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
544 635
545 av = (AV *)mg->mg_obj; 636 av = (AV *)mg->mg_obj;
546 637
547 if (expect_false (AvFILLp (av) >= AvMAX (av))) 638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
548 av_extend (av, AvFILLp (av) + 1); 639 av_extend (av, AvFILLp (av) + 1);
549 640
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 642}
552 643
553/** load & save, init *******************************************************/ 644/** load & save, init *******************************************************/
645
646/* swap sv heads, at least logically */
647static void
648swap_svs (pTHX_ Coro__State c)
649{
650 int i;
651
652 for (i = 0; i <= AvFILLp (c->swap_sv); )
653 {
654 SV *a = AvARRAY (c->swap_sv)[i++];
655 SV *b = AvARRAY (c->swap_sv)[i++];
656
657 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
658 SV tmp;
659
660 /* swap sv_any */
661 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
662
663 /* swap sv_flags */
664 SvFLAGS (&tmp) = SvFLAGS (a);
665 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
666 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
667
668#if PERL_VERSION_ATLEAST (5,10,0)
669 /* perl 5.10 complicates this _quite_ a bit, but it also is
670 * much faster, so no quarrels here. alternatively, we could
671 * sv_upgrade to avoid this.
672 */
673 {
674 /* swap sv_u */
675 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
676
677 /* if SvANY points to the head, we need to adjust the pointers,
678 * as the pointer for a still points to b, and maybe vice versa.
679 */
680 #define svany_in_head(type) \
681 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
682
683 if (svany_in_head (SvTYPE (a)))
684 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
685
686 if (svany_in_head (SvTYPE (b)))
687 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
688 }
689#endif
690 }
691}
692
693#define SWAP_SVS(coro) \
694 if (ecb_expect_false ((coro)->swap_sv)) \
695 swap_svs (aTHX_ (coro))
554 696
555static void 697static void
556on_enterleave_call (pTHX_ SV *cb); 698on_enterleave_call (pTHX_ SV *cb);
557 699
558static void 700static void
… …
561 perl_slots *slot = c->slot; 703 perl_slots *slot = c->slot;
562 c->slot = 0; 704 c->slot = 0;
563 705
564 PL_mainstack = c->mainstack; 706 PL_mainstack = c->mainstack;
565 707
566 GvSV (PL_defgv) = slot->defsv; 708#if CORO_JIT
567 GvAV (PL_defgv) = slot->defav; 709 load_perl_slots (slot);
568 GvSV (PL_errgv) = slot->errsv; 710#else
569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
571
572 #define VAR(name,type) PL_ ## name = slot->name; 711 #define VARx(name,expr,type) expr = slot->name;
573 # include "state.h" 712 # include "state.h"
574 #undef VAR 713 #undef VARx
714#endif
575 715
576 { 716 {
577 dSP; 717 dSP;
578 718
579 CV *cv; 719 CV *cv;
580 720
581 /* now do the ugly restore mess */ 721 /* now do the ugly restore mess */
582 while (expect_true (cv = (CV *)POPs)) 722 while (ecb_expect_true (cv = (CV *)POPs))
583 { 723 {
584 put_padlist (aTHX_ cv); /* mark this padlist as available */ 724 put_padlist (aTHX_ cv); /* mark this padlist as available */
585 CvDEPTH (cv) = PTR2IV (POPs); 725 CvDEPTH (cv) = PTR2IV (POPs);
586 CvPADLIST (cv) = (AV *)POPs; 726 CvPADLIST (cv) = (AV *)POPs;
587 } 727 }
… …
590 } 730 }
591 731
592 slf_frame = c->slf_frame; 732 slf_frame = c->slf_frame;
593 CORO_THROW = c->except; 733 CORO_THROW = c->except;
594 734
595 if (expect_false (enable_times)) 735 if (ecb_expect_false (enable_times))
596 { 736 {
597 if (expect_false (!times_valid)) 737 if (ecb_expect_false (!times_valid))
598 coro_times_update (); 738 coro_times_update ();
599 739
600 coro_times_sub (c); 740 coro_times_sub (c);
601 } 741 }
602 742
603 if (expect_false (c->on_enter)) 743 if (ecb_expect_false (c->on_enter))
604 { 744 {
605 int i; 745 int i;
606 746
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 747 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 749 }
750
751 SWAP_SVS (c);
610} 752}
611 753
612static void 754static void
613save_perl (pTHX_ Coro__State c) 755save_perl (pTHX_ Coro__State c)
614{ 756{
757 SWAP_SVS (c);
758
615 if (expect_false (c->on_leave)) 759 if (ecb_expect_false (c->on_leave))
616 { 760 {
617 int i; 761 int i;
618 762
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 763 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 764 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 } 765 }
622 766
623 times_valid = 0; 767 times_valid = 0;
624 768
625 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
626 { 770 {
627 coro_times_update (); times_valid = 1; 771 coro_times_update (); times_valid = 1;
628 coro_times_add (c); 772 coro_times_add (c);
629 } 773 }
630 774
… …
644 788
645 XPUSHs (Nullsv); 789 XPUSHs (Nullsv);
646 /* this loop was inspired by pp_caller */ 790 /* this loop was inspired by pp_caller */
647 for (;;) 791 for (;;)
648 { 792 {
649 while (expect_true (cxix >= 0)) 793 while (ecb_expect_true (cxix >= 0))
650 { 794 {
651 PERL_CONTEXT *cx = &ccstk[cxix--]; 795 PERL_CONTEXT *cx = &ccstk[cxix--];
652 796
653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 797 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
654 { 798 {
655 CV *cv = cx->blk_sub.cv; 799 CV *cv = cx->blk_sub.cv;
656 800
657 if (expect_true (CvDEPTH (cv))) 801 if (ecb_expect_true (CvDEPTH (cv)))
658 { 802 {
659 EXTEND (SP, 3); 803 EXTEND (SP, 3);
660 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
661 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
662 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
… …
665 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
666 } 810 }
667 } 811 }
668 } 812 }
669 813
670 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
671 break; 815 break;
672 816
673 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
674 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
675 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
677 821
678 PUTBACK; 822 PUTBACK;
679 } 823 }
680 824
681 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
683 if (SLOT_COUNT >= 1) CXINC;
684 if (SLOT_COUNT >= 2) CXINC;
685 if (SLOT_COUNT >= 3) CXINC;
686 { 827 {
687 unsigned int i; 828 unsigned int i;
829
688 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 831 CXINC;
690 } 832
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
692 835
693 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
694 837
695 { 838 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
697 840
698 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
699 slot->defsv = DEFSV; 842 save_perl_slots (slot);
700 slot->errsv = ERRSV; 843#else
701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
703
704 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
705 # include "state.h" 845 # include "state.h"
706 #undef VAR 846 #undef VARx
847#endif
707 } 848 }
708} 849}
709 850
710/* 851/*
711 * allocate various perl stacks. This is almost an exact copy 852 * allocate various perl stacks. This is almost an exact copy
… …
717# define coro_init_stacks(thx) init_stacks () 858# define coro_init_stacks(thx) init_stacks ()
718#else 859#else
719static void 860static void
720coro_init_stacks (pTHX) 861coro_init_stacks (pTHX)
721{ 862{
722 PL_curstackinfo = new_stackinfo(32, 8); 863 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 864 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 865 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 866 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 867
727 PL_stack_base = AvARRAY(PL_curstack); 868 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 883#endif
743 884
744 New(54,PL_scopestack,8,I32); 885 New(54,PL_scopestack,8,I32);
745 PL_scopestack_ix = 0; 886 PL_scopestack_ix = 0;
746 PL_scopestack_max = 8; 887 PL_scopestack_max = 8;
888#if HAS_SCOPESTACK_NAME
889 New(54,PL_scopestack_name,8,const char*);
890#endif
747 891
748 New(54,PL_savestack,24,ANY); 892 New(54,PL_savestack,24,ANY);
749 PL_savestack_ix = 0; 893 PL_savestack_ix = 0;
750 PL_savestack_max = 24; 894 PL_savestack_max = 24;
751 895
… …
779 } 923 }
780 924
781 Safefree (PL_tmps_stack); 925 Safefree (PL_tmps_stack);
782 Safefree (PL_markstack); 926 Safefree (PL_markstack);
783 Safefree (PL_scopestack); 927 Safefree (PL_scopestack);
928#if HAS_SCOPESTACK_NAME
929 Safefree (PL_scopestack_name);
930#endif
784 Safefree (PL_savestack); 931 Safefree (PL_savestack);
785#if !PERL_VERSION_ATLEAST (5,10,0) 932#if !PERL_VERSION_ATLEAST (5,10,0)
786 Safefree (PL_retstack); 933 Safefree (PL_retstack);
787#endif 934#endif
788} 935}
… …
834#endif 981#endif
835 982
836/* 983/*
837 * This overrides the default magic get method of %SIG elements. 984 * This overrides the default magic get method of %SIG elements.
838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 985 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
839 * and instead of trying to save and restore the hash elements, we just provide 986 * and instead of trying to save and restore the hash elements (extremely slow),
840 * readback here. 987 * we just provide our own readback here.
841 */ 988 */
842static int 989static int ecb_cold
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 990coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 991{
845 const char *s = MgPV_nolen_const (mg); 992 const char *s = MgPV_nolen_const (mg);
846 993
847 if (*s == '_') 994 if (*s == '_')
… …
859 } 1006 }
860 1007
861 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1008 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
862} 1009}
863 1010
864static int 1011static int ecb_cold
865coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
866{ 1013{
867 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
868 1015
869 if (*s == '_') 1016 if (*s == '_')
… …
883 } 1030 }
884 1031
885 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1032 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
886} 1033}
887 1034
888static int 1035static int ecb_cold
889coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1036coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
890{ 1037{
891 const char *s = MgPV_nolen_const (mg); 1038 const char *s = MgPV_nolen_const (mg);
892 1039
893 if (*s == '_') 1040 if (*s == '_')
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1073slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1074{
928 return 1; 1075 return 1;
929} 1076}
930 1077
931static UNOP coro_setup_op; 1078static UNOP init_perl_op;
932 1079
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1080ecb_noinline static void /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1081init_perl (pTHX_ struct coro *coro)
935{ 1082{
936 /* 1083 /*
937 * emulate part of the perl startup here. 1084 * emulate part of the perl startup here.
938 */ 1085 */
939 coro_init_stacks (aTHX); 1086 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1093 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1094 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1095 PL_curpm = 0;
949 PL_curpad = 0; 1096 PL_curpad = 0;
950 PL_localizing = 0; 1097 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1098 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1099#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1100 PL_parser = 0;
955#endif 1101#endif
956 PL_hints = 0; 1102 PL_hints = 0;
957 1103
958 /* recreate the die/warn hooks */ 1104 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1105 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1106 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1107
962 GvSV (PL_defgv) = newSV (0); 1108 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1109 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1110 GvSV (PL_errgv) = newSV (0);
965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1111 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
986 /* this newly created coroutine might be run on an existing cctx which most 1132 /* this newly created coroutine might be run on an existing cctx which most
987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1133 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
988 */ 1134 */
989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1135 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1136 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1137 slf_frame.destroy = 0;
991 1138
992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1139 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op; 1140 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1141 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1142 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1143 /* no flags etc. required, as an init function won't be called */
997 1144
998 PL_op = (OP *)&coro_setup_op; 1145 PL_op = (OP *)&init_perl_op;
999 1146
1000 /* copy throw, in case it was set before coro_setup */ 1147 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1148 CORO_THROW = coro->except;
1002 1149
1150 SWAP_SVS (coro);
1151
1003 if (expect_false (enable_times)) 1152 if (ecb_expect_false (enable_times))
1004 { 1153 {
1005 coro_times_update (); 1154 coro_times_update ();
1006 coro_times_sub (coro); 1155 coro_times_sub (coro);
1007 } 1156 }
1008} 1157}
… …
1027 dounwind (-1); 1176 dounwind (-1);
1028 } 1177 }
1029} 1178}
1030 1179
1031static void 1180static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1181destroy_perl (pTHX_ struct coro *coro)
1033{ 1182{
1034 SV *svf [9]; 1183 SV *svf [9];
1035 1184
1036 { 1185 {
1186 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1187 struct coro *current = SvSTATE (old_current);
1038 1188
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1189 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1190
1041 save_perl (aTHX_ current); 1191 save_perl (aTHX_ current);
1192
1193 /* this will cause transfer_check to croak on block*/
1194 SvRV_set (coro_current, (SV *)coro->hv);
1195
1042 load_perl (aTHX_ coro); 1196 load_perl (aTHX_ coro);
1043 1197
1044 coro_unwind_stacks (aTHX); 1198 coro_unwind_stacks (aTHX);
1199
1200 /* restore swapped sv's */
1201 SWAP_SVS (coro);
1202
1045 coro_destruct_stacks (aTHX); 1203 coro_destruct_stacks (aTHX);
1046 1204
1047 // now save some sv's to be free'd later 1205 /* now save some sv's to be free'd later */
1048 svf [0] = GvSV (PL_defgv); 1206 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1207 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1208 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv; 1209 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs; 1210 svf [4] = PL_rs;
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1212 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1213 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1214 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1215 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1216
1217 SvRV_set (coro_current, old_current);
1218
1059 load_perl (aTHX_ current); 1219 load_perl (aTHX_ current);
1060 } 1220 }
1061 1221
1062 { 1222 {
1063 unsigned int i; 1223 unsigned int i;
… …
1070 SvREFCNT_dec (coro->invoke_cb); 1230 SvREFCNT_dec (coro->invoke_cb);
1071 SvREFCNT_dec (coro->invoke_av); 1231 SvREFCNT_dec (coro->invoke_av);
1072 } 1232 }
1073} 1233}
1074 1234
1075INLINE void 1235ecb_inline void
1076free_coro_mortal (pTHX) 1236free_coro_mortal (pTHX)
1077{ 1237{
1078 if (expect_true (coro_mortal)) 1238 if (ecb_expect_true (coro_mortal))
1079 { 1239 {
1080 SvREFCNT_dec (coro_mortal); 1240 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1241 coro_mortal = 0;
1082 } 1242 }
1083} 1243}
1084 1244
1085static int 1245static int
… …
1218 1378
1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1379 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1220} 1380}
1221 1381
1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1382/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1223static void NOINLINE 1383static void ecb_noinline
1224cctx_prepare (pTHX) 1384cctx_prepare (pTHX)
1225{ 1385{
1226 PL_top_env = &PL_start_env; 1386 PL_top_env = &PL_start_env;
1227 1387
1228 if (cctx_current->flags & CC_TRACE) 1388 if (cctx_current->flags & CC_TRACE)
… …
1239 slf_frame.prepare = slf_prepare_set_stacklevel; 1399 slf_frame.prepare = slf_prepare_set_stacklevel;
1240 slf_frame.check = slf_check_set_stacklevel; 1400 slf_frame.check = slf_check_set_stacklevel;
1241} 1401}
1242 1402
1243/* the tail of transfer: execute stuff we can only do after a transfer */ 1403/* the tail of transfer: execute stuff we can only do after a transfer */
1244INLINE void 1404ecb_inline void
1245transfer_tail (pTHX) 1405transfer_tail (pTHX)
1246{ 1406{
1247 free_coro_mortal (aTHX); 1407 free_coro_mortal (aTHX);
1248} 1408}
1249 1409
… …
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1453 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1454 }
1295} 1455}
1296 1456
1297static coro_cctx * 1457static coro_cctx *
1298cctx_new () 1458cctx_new (void)
1299{ 1459{
1300 coro_cctx *cctx; 1460 coro_cctx *cctx;
1301 1461
1302 ++cctx_count; 1462 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1463 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1469 return cctx;
1310} 1470}
1311 1471
1312/* create a new cctx only suitable as source */ 1472/* create a new cctx only suitable as source */
1313static coro_cctx * 1473static coro_cctx *
1314cctx_new_empty () 1474cctx_new_empty (void)
1315{ 1475{
1316 coro_cctx *cctx = cctx_new (); 1476 coro_cctx *cctx = cctx_new ();
1317 1477
1318 cctx->sptr = 0; 1478 cctx->sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1479 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1321 return cctx; 1481 return cctx;
1322} 1482}
1323 1483
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1484/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1485static coro_cctx *
1326cctx_new_run () 1486cctx_new_run (void)
1327{ 1487{
1328 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1329 void *stack_start; 1489 void *stack_start;
1330 size_t stack_size; 1490 size_t stack_size;
1331 1491
1332#if HAVE_MMAP 1492#if HAVE_MMAP
1333 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1493 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1334 /* mmap supposedly does allocate-on-write for us */ 1494 /* mmap supposedly does allocate-on-write for us */
1335 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1495 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1336 1496
1337 if (cctx->sptr != (void *)-1) 1497 if (cctx->sptr != (void *)-1)
1338 { 1498 {
1339 #if CORO_STACKGUARD 1499 #if CORO_STACKGUARD
1340 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1500 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1372cctx_destroy (coro_cctx *cctx) 1532cctx_destroy (coro_cctx *cctx)
1373{ 1533{
1374 if (!cctx) 1534 if (!cctx)
1375 return; 1535 return;
1376 1536
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1537 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1538
1379 --cctx_count; 1539 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1540 coro_destroy (&cctx->cctx);
1381 1541
1382 /* coro_transfer creates new, empty cctx's */ 1542 /* coro_transfer creates new, empty cctx's */
… …
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1561#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1562
1403static coro_cctx * 1563static coro_cctx *
1404cctx_get (pTHX) 1564cctx_get (pTHX)
1405{ 1565{
1406 while (expect_true (cctx_first)) 1566 while (ecb_expect_true (cctx_first))
1407 { 1567 {
1408 coro_cctx *cctx = cctx_first; 1568 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1569 cctx_first = cctx->next;
1410 --cctx_idle; 1570 --cctx_idle;
1411 1571
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1572 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1573 return cctx;
1414 1574
1415 cctx_destroy (cctx); 1575 cctx_destroy (cctx);
1416 } 1576 }
1417 1577
… …
1422cctx_put (coro_cctx *cctx) 1582cctx_put (coro_cctx *cctx)
1423{ 1583{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1584 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1425 1585
1426 /* free another cctx if overlimit */ 1586 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1587 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1588 {
1429 coro_cctx *first = cctx_first; 1589 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1590 cctx_first = first->next;
1431 --cctx_idle; 1591 --cctx_idle;
1432 1592
… …
1443static void 1603static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1604transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1605{
1446 /* TODO: throwing up here is considered harmful */ 1606 /* TODO: throwing up here is considered harmful */
1447 1607
1448 if (expect_true (prev != next)) 1608 if (ecb_expect_true (prev != next))
1449 { 1609 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1610 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1611 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1612
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1613 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1614 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1615
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1616#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1617 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1618 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1619#endif
1460 } 1620 }
1461} 1621}
1462 1622
1463/* always use the TRANSFER macro */ 1623/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1624static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1625transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1626{
1467 dSTACKLEVEL; 1627 dSTACKLEVEL;
1468 1628
1469 /* sometimes transfer is only called to set idle_sp */ 1629 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1630 if (ecb_expect_false (!prev))
1471 { 1631 {
1472 cctx_current->idle_sp = STACKLEVEL; 1632 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1633 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1634 }
1475 else if (expect_true (prev != next)) 1635 else if (ecb_expect_true (prev != next))
1476 { 1636 {
1477 coro_cctx *cctx_prev; 1637 coro_cctx *cctx_prev;
1478 1638
1479 if (expect_false (prev->flags & CF_NEW)) 1639 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1640 {
1481 /* create a new empty/source context */ 1641 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1642 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1643 prev->flags |= CF_RUNNING;
1484 } 1644 }
… …
1487 next->flags |= CF_RUNNING; 1647 next->flags |= CF_RUNNING;
1488 1648
1489 /* first get rid of the old state */ 1649 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1650 save_perl (aTHX_ prev);
1491 1651
1492 if (expect_false (next->flags & CF_NEW)) 1652 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1653 {
1494 /* need to start coroutine */ 1654 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1655 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1656 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1657 init_perl (aTHX_ next);
1498 } 1658 }
1499 else 1659 else
1500 load_perl (aTHX_ next); 1660 load_perl (aTHX_ next);
1501 1661
1502 /* possibly untie and reuse the cctx */ 1662 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1663 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1664 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1665 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1666 && !force_cctx
1507 )) 1667 ))
1508 { 1668 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1669 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1670 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1671
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1672 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1513 /* without this the next cctx_get might destroy the running cctx while still in use */ 1673 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1674 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1675 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1676 next->cctx = cctx_get (aTHX);
1517 1677
1518 cctx_put (cctx_current); 1678 cctx_put (cctx_current);
1519 } 1679 }
1520 else 1680 else
1521 prev->cctx = cctx_current; 1681 prev->cctx = cctx_current;
1522 1682
1523 ++next->usecount; 1683 ++next->usecount;
1524 1684
1525 cctx_prev = cctx_current; 1685 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1686 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1687
1528 next->cctx = 0; 1688 next->cctx = 0;
1529 1689
1530 if (expect_false (cctx_prev != cctx_current)) 1690 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1691 {
1532 cctx_prev->top_env = PL_top_env; 1692 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1693 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1694 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1695 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1701#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1702#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1703
1544/** high level stuff ********************************************************/ 1704/** high level stuff ********************************************************/
1545 1705
1706/* this function is actually Coro, not Coro::State, but we call it from here */
1707/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1708static void
1709coro_call_on_destroy (pTHX_ struct coro *coro);
1710
1711static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1712coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1713{
1549 if (coro->flags & CF_DESTROYED) 1714 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1715 return;
1551 1716
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1717 slf_destroy (aTHX_ coro);
1554 1718
1555 coro->flags |= CF_DESTROYED; 1719 coro->flags |= CF_ZOMBIE;
1556 1720
1557 if (coro->flags & CF_READY) 1721 if (coro->flags & CF_READY)
1558 { 1722 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1723 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1724 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1725 --coro_nready;
1562 } 1726 }
1563 else 1727 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1728 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1729
1730 if (coro->next) coro->next->prev = coro->prev;
1731 if (coro->prev) coro->prev->next = coro->next;
1732 if (coro == coro_first) coro_first = coro->next;
1565 1733
1566 if (coro->mainstack 1734 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1735 && coro->mainstack != main_mainstack
1568 && coro->slot 1736 && coro->slot
1569 && !PL_dirty) 1737 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1738 destroy_perl (aTHX_ coro);
1571 1739
1572 cctx_destroy (coro->cctx); 1740 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1741 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1742 SvREFCNT_dec (coro->args);
1743 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1744 SvREFCNT_dec (CORO_THROW);
1576 1745
1577 if (coro->next) coro->next->prev = coro->prev; 1746 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1747
1581 return 1; 1748 /* more destruction mayhem in coro_state_free */
1582} 1749}
1583 1750
1584static int 1751static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1752coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1753{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1754 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1755 mg->mg_ptr = 0;
1589 1756
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1757 coro_state_destroy (aTHX_ coro);
1758 SvREFCNT_dec (coro->on_destroy);
1759 SvREFCNT_dec (coro->status);
1760
1595 Safefree (coro); 1761 Safefree (coro);
1596 }
1597 1762
1598 return 0; 1763 return 0;
1599} 1764}
1600 1765
1601static int 1766static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1767coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1768{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1769 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1770 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1771 mg->mg_ptr = 0;
1772 mg->mg_virtual = 0;
1607 1773
1608 return 0; 1774 return 0;
1609} 1775}
1610 1776
1611static MGVTBL coro_state_vtbl = { 1777static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1802 TRANSFER (ta, 1);
1637} 1803}
1638 1804
1639/** Coro ********************************************************************/ 1805/** Coro ********************************************************************/
1640 1806
1641INLINE void 1807ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1808coro_enq (pTHX_ struct coro *coro)
1643{ 1809{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1810 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1811
1646 SvREFCNT_inc_NN (coro->hv); 1812 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1814 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1815 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1816 ready [1] = coro;
1651} 1817}
1652 1818
1653INLINE struct coro * 1819ecb_inline struct coro *
1654coro_deq (pTHX) 1820coro_deq (pTHX)
1655{ 1821{
1656 int prio; 1822 int prio;
1657 1823
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1824 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1877{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1878 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1879}
1714 1880
1715/* expects to own a reference to next->hv */ 1881/* expects to own a reference to next->hv */
1716INLINE void 1882ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1883prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1884{
1719 SV *prev_sv = SvRV (coro_current); 1885 SV *prev_sv = SvRV (coro_current);
1720 1886
1721 ta->prev = SvSTATE_hv (prev_sv); 1887 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1900{
1735 for (;;) 1901 for (;;)
1736 { 1902 {
1737 struct coro *next = coro_deq (aTHX); 1903 struct coro *next = coro_deq (aTHX);
1738 1904
1739 if (expect_true (next)) 1905 if (ecb_expect_true (next))
1740 { 1906 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1907 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1908 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1909 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1910 else
1745 { 1911 {
1746 next->flags &= ~CF_READY; 1912 next->flags &= ~CF_READY;
1747 --coro_nready; 1913 --coro_nready;
… …
1754 { 1920 {
1755 /* nothing to schedule: call the idle handler */ 1921 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1922 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1923 && SvOBJECT (SvRV (sv_idle)))
1758 { 1924 {
1925 if (SvRV (sv_idle) == SvRV (coro_current))
1926 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1927
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1928 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1929 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1930 --coro_nready;
1762 } 1931 }
1763 else 1932 else
… …
1777 } 1946 }
1778 } 1947 }
1779 } 1948 }
1780} 1949}
1781 1950
1782INLINE void 1951ecb_inline void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 1952prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 1953{
1785 api_ready (aTHX_ coro_current); 1954 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 1955 prepare_schedule (aTHX_ ta);
1787} 1956}
1788 1957
1789INLINE void 1958ecb_inline void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1959prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 1960{
1792 SV *prev = SvRV (coro_current); 1961 SV *prev = SvRV (coro_current);
1793 1962
1794 if (coro_nready) 1963 if (coro_nready)
… …
1824{ 1993{
1825 struct coro_transfer_args ta; 1994 struct coro_transfer_args ta;
1826 1995
1827 prepare_cede (aTHX_ &ta); 1996 prepare_cede (aTHX_ &ta);
1828 1997
1829 if (expect_true (ta.prev != ta.next)) 1998 if (ecb_expect_true (ta.prev != ta.next))
1830 { 1999 {
1831 TRANSFER (ta, 1); 2000 TRANSFER (ta, 1);
1832 return 1; 2001 return 1;
1833 } 2002 }
1834 else 2003 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2046 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2047 }
1879} 2048}
1880 2049
1881static void 2050static void
2051coro_push_av (pTHX_ AV *av, I32 gimme_v)
2052{
2053 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2054 {
2055 dSP;
2056
2057 if (gimme_v == G_SCALAR)
2058 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2059 else
2060 {
2061 int i;
2062 EXTEND (SP, AvFILLp (av) + 1);
2063
2064 for (i = 0; i <= AvFILLp (av); ++i)
2065 PUSHs (AvARRAY (av)[i]);
2066 }
2067
2068 PUTBACK;
2069 }
2070}
2071
2072static void
2073coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2074{
2075 if (!coro->on_destroy)
2076 coro->on_destroy = newAV ();
2077
2078 av_push (coro->on_destroy, cb);
2079}
2080
2081static void
2082slf_destroy_join (pTHX_ struct CoroSLF *frame)
2083{
2084 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2085}
2086
2087static int
2088slf_check_join (pTHX_ struct CoroSLF *frame)
2089{
2090 struct coro *coro = (struct coro *)frame->data;
2091
2092 if (!coro->status)
2093 return 1;
2094
2095 frame->destroy = 0;
2096
2097 coro_push_av (aTHX_ coro->status, GIMME_V);
2098
2099 SvREFCNT_dec ((SV *)coro->hv);
2100
2101 return 0;
2102}
2103
2104static void
2105slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2106{
2107 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2108
2109 if (items > 1)
2110 croak ("join called with too many arguments");
2111
2112 if (coro->status)
2113 frame->prepare = prepare_nop;
2114 else
2115 {
2116 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2117 frame->prepare = prepare_schedule;
2118 }
2119
2120 frame->check = slf_check_join;
2121 frame->destroy = slf_destroy_join;
2122 frame->data = (void *)coro;
2123 SvREFCNT_inc (coro->hv);
2124}
2125
2126static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2127coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2128{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2129 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2130
1887 if (on_destroyp) 2131 if (!od)
1888 { 2132 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2133
1891 while (AvFILLp (on_destroy) >= 0) 2134 while (AvFILLp (od) >= 0)
2135 {
2136 SV *cb = sv_2mortal (av_pop (od));
2137
2138 /* coro hv's (and only hv's at the moment) are supported as well */
2139 if (SvSTATEhv_p (aTHX_ cb))
2140 api_ready (aTHX_ cb);
2141 else
1892 { 2142 {
1893 dSP; /* don't disturb outer sp */ 2143 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2144 PUSHMARK (SP);
1897 2145
1898 if (statusp) 2146 if (coro->status)
1899 { 2147 {
1900 int i; 2148 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2149 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2150 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2151 }
1907 2152
1908 PUTBACK; 2153 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2154 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2155 }
1911 } 2156 }
1912} 2157}
1913 2158
1914static void 2159static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2160coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2161{
1917 int i; 2162 AV *av;
1918 HV *hv = (HV *)SvRV (coro_current); 2163
1919 AV *av = newAV (); 2164 if (coro->status)
2165 {
2166 av = coro->status;
2167 av_clear (av);
2168 }
2169 else
2170 av = coro->status = newAV ();
1920 2171
1921 /* items are actually not so common, so optimise for this case */ 2172 /* items are actually not so common, so optimise for this case */
1922 if (items) 2173 if (items)
1923 { 2174 {
2175 int i;
2176
1924 av_extend (av, items - 1); 2177 av_extend (av, items - 1);
1925 2178
1926 for (i = 0; i < items; ++i) 2179 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2180 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2181 }
2182}
1929 2183
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2184static void
1931 2185slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2186{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2187 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2188 api_ready (aTHX_ sv_manager);
1934 2189
1935 frame->prepare = prepare_schedule; 2190 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2191 frame->check = slf_check_repeat;
1937 2192
1938 /* as a minor optimisation, we could unwind all stacks here */ 2193 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2194 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2195 /*coro_unwind_stacks (aTHX);*/
2196}
2197
2198static void
2199slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2200{
2201 HV *coro_hv = (HV *)SvRV (coro_current);
2202
2203 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2204 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2205}
2206
2207static void
2208slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2209{
2210 HV *coro_hv;
2211 struct coro *coro;
2212
2213 if (items <= 0)
2214 croak ("Coro::cancel called without coro object,");
2215
2216 coro = SvSTATE (arg [0]);
2217 coro_hv = coro->hv;
2218
2219 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2220
2221 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2222 {
2223 /* coro currently busy cancelling something, so just notify it */
2224 coro->slf_frame.data = (void *)coro;
2225
2226 frame->prepare = prepare_nop;
2227 frame->check = slf_check_nop;
2228 }
2229 else if (coro_hv == (HV *)SvRV (coro_current))
2230 {
2231 /* cancelling the current coro is allowed, and equals terminate */
2232 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2233 }
2234 else
2235 {
2236 struct coro *self = SvSTATE_current;
2237
2238 /* otherwise we cancel directly, purely for speed reasons
2239 * unfortunately, this requires some magic trickery, as
2240 * somebody else could cancel us, so we have to fight the cancellation.
2241 * this is ugly, and hopefully fully worth the extra speed.
2242 * besides, I can't get the slow-but-safe version working...
2243 */
2244 slf_frame.data = 0;
2245 self->flags |= CF_NOCANCEL;
2246 coro_state_destroy (aTHX_ coro);
2247 self->flags &= ~CF_NOCANCEL;
2248
2249 if (slf_frame.data)
2250 {
2251 /* while we were busy we have been cancelled, so terminate */
2252 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2253 }
2254 else
2255 {
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 }
2260}
2261
2262static int
2263slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2264{
2265 frame->prepare = 0;
2266 coro_unwind_stacks (aTHX);
2267
2268 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2269
2270 return 1;
2271}
2272
2273static int
2274safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2275{
2276 if (coro->cctx)
2277 croak ("coro inside C callback, unable to cancel at this time, caught");
2278
2279 if (coro->flags & CF_NEW)
2280 {
2281 coro_set_status (aTHX_ coro, arg, items);
2282 coro_state_destroy (aTHX_ coro);
2283 }
2284 else
2285 {
2286 if (!coro->slf_frame.prepare)
2287 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2288
2289 slf_destroy (aTHX_ coro);
2290
2291 coro_set_status (aTHX_ coro, arg, items);
2292 coro->slf_frame.prepare = prepare_nop;
2293 coro->slf_frame.check = slf_check_safe_cancel;
2294
2295 api_ready (aTHX_ (SV *)coro->hv);
2296 }
2297
2298 return 1;
1941} 2299}
1942 2300
1943/*****************************************************************************/ 2301/*****************************************************************************/
1944/* async pool handler */ 2302/* async pool handler */
1945 2303
… …
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2334slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{ 2335{
1978 HV *hv = (HV *)SvRV (coro_current); 2336 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv); 2337 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980 2338
1981 if (expect_true (coro->saved_deffh)) 2339 if (ecb_expect_true (coro->saved_deffh))
1982 { 2340 {
1983 /* subsequent iteration */ 2341 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2342 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0; 2343 coro->saved_deffh = 0;
1986 2344
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2345 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2346 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2347 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2348 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2349 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2350 }
1995 else 2351 else
1996 { 2352 {
1997 av_clear (GvAV (PL_defgv)); 2353 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2354 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2221static void 2577static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2578slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2579{
2224 frame->prepare = prepare_cede_notself; 2580 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2581 frame->check = slf_check_nop;
2582}
2583
2584/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2585static void
2586slf_destroy (pTHX_ struct coro *coro)
2587{
2588 /* this callback is reserved for slf functions needing to do cleanup */
2589 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2590 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2591
2592 /*
2593 * The on_destroy above most likely is from an SLF call.
2594 * Since by definition the SLF call will not finish when we destroy
2595 * the coro, we will have to force-finish it here, otherwise
2596 * cleanup functions cannot call SLF functions.
2597 */
2598 coro->slf_frame.prepare = 0;
2226} 2599}
2227 2600
2228/* 2601/*
2229 * these not obviously related functions are all rolled into one 2602 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2603 * function to increase chances that they all will call transfer with the same
… …
2237 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2610 I32 checkmark; /* mark SP to see how many elements check has pushed */
2238 2611
2239 /* set up the slf frame, unless it has already been set-up */ 2612 /* set up the slf frame, unless it has already been set-up */
2240 /* the latter happens when a new coro has been started */ 2613 /* the latter happens when a new coro has been started */
2241 /* or when a new cctx was attached to an existing coroutine */ 2614 /* or when a new cctx was attached to an existing coroutine */
2242 if (expect_true (!slf_frame.prepare)) 2615 if (ecb_expect_true (!slf_frame.prepare))
2243 { 2616 {
2244 /* first iteration */ 2617 /* first iteration */
2245 dSP; 2618 dSP;
2246 SV **arg = PL_stack_base + TOPMARK + 1; 2619 SV **arg = PL_stack_base + TOPMARK + 1;
2247 int items = SP - arg; /* args without function object */ 2620 int items = SP - arg; /* args without function object */
… …
2288 while (slf_frame.check (aTHX_ &slf_frame)); 2661 while (slf_frame.check (aTHX_ &slf_frame));
2289 2662
2290 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2663 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2291 2664
2292 /* exception handling */ 2665 /* exception handling */
2293 if (expect_false (CORO_THROW)) 2666 if (ecb_expect_false (CORO_THROW))
2294 { 2667 {
2295 SV *exception = sv_2mortal (CORO_THROW); 2668 SV *exception = sv_2mortal (CORO_THROW);
2296 2669
2297 CORO_THROW = 0; 2670 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception); 2671 sv_setsv (ERRSV, exception);
2299 croak (0); 2672 croak (0);
2300 } 2673 }
2301 2674
2302 /* return value handling - mostly like entersub */ 2675 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2676 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2677 if (GIMME_V == G_SCALAR
2678 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2679 {
2306 dSP; 2680 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2681 SV **bot = PL_stack_base + checkmark;
2308 2682
2309 if (sp == bot) /* too few, push undef */ 2683 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2684 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2685 else /* too many, take last one */
2312 bot [1] = *sp; 2686 bot [1] = *sp;
2313 2687
2314 SP = bot + 1; 2688 SP = bot + 1;
2315 2689
2316 PUTBACK; 2690 PUTBACK;
… …
2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2705 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2332 && PL_op->op_ppaddr != pp_slf) 2706 && PL_op->op_ppaddr != pp_slf)
2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2707 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2334 2708
2335 CvFLAGS (cv) |= CVf_SLF; 2709 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
2337 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2710 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2338 slf_cv = cv; 2711 slf_cv = cv;
2339 2712
2340 /* we patch the op, and then re-run the whole call */ 2713 /* we patch the op, and then re-run the whole call */
2341 /* we have to put the same argument on the stack for this to work */ 2714 /* we have to put the same argument on the stack for this to work */
… …
2350 if (PL_op->op_flags & OPf_STACKED) 2723 if (PL_op->op_flags & OPf_STACKED)
2351 { 2724 {
2352 if (items > slf_arga) 2725 if (items > slf_arga)
2353 { 2726 {
2354 slf_arga = items; 2727 slf_arga = items;
2355 free (slf_argv); 2728 Safefree (slf_argv);
2356 slf_argv = malloc (slf_arga * sizeof (SV *)); 2729 New (0, slf_argv, slf_arga, SV *);
2357 } 2730 }
2358 2731
2359 slf_argc = items; 2732 slf_argc = items;
2360 2733
2361 for (i = 0; i < items; ++i) 2734 for (i = 0; i < items; ++i)
… …
2424{ 2797{
2425 PerlIOBuf base; 2798 PerlIOBuf base;
2426 NV next, every; 2799 NV next, every;
2427} PerlIOCede; 2800} PerlIOCede;
2428 2801
2429static IV 2802static IV ecb_cold
2430PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2803PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2431{ 2804{
2432 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2805 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2433 2806
2434 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2807 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2435 self->next = nvtime () + self->every; 2808 self->next = nvtime () + self->every;
2436 2809
2437 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2810 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2438} 2811}
2439 2812
2440static SV * 2813static SV * ecb_cold
2441PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2814PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2442{ 2815{
2443 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2816 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2444 2817
2445 return newSVnv (self->every); 2818 return newSVnv (self->every);
… …
2557 SvREFCNT_dec (cb); 2930 SvREFCNT_dec (cb);
2558 } 2931 }
2559} 2932}
2560 2933
2561static void 2934static void
2562coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2935coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2563{ 2936{
2564 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2937 /* call $sem->adjust (0) to possibly wake up some other waiters */
2565 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2938 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2566} 2939}
2567 2940
2568static int 2941static int
2569slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2942slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2570{ 2943{
2571 AV *av = (AV *)frame->data; 2944 AV *av = (AV *)frame->data;
2572 SV *count_sv = AvARRAY (av)[0]; 2945 SV *count_sv = AvARRAY (av)[0];
2946 SV *coro_hv = SvRV (coro_current);
2573 2947
2574 /* if we are about to throw, don't actually acquire the lock, just throw */ 2948 /* if we are about to throw, don't actually acquire the lock, just throw */
2575 if (CORO_THROW) 2949 if (CORO_THROW)
2576 return 0; 2950 return 0;
2577 else if (SvIVX (count_sv) > 0) 2951 else if (SvIVX (count_sv) > 0)
2578 { 2952 {
2579 SvSTATE_current->on_destroy = 0; 2953 frame->destroy = 0;
2580 2954
2581 if (acquire) 2955 if (acquire)
2582 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2956 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2583 else 2957 else
2584 coro_semaphore_adjust (aTHX_ av, 0); 2958 coro_semaphore_adjust (aTHX_ av, 0);
… …
2589 { 2963 {
2590 int i; 2964 int i;
2591 /* if we were woken up but can't down, we look through the whole */ 2965 /* if we were woken up but can't down, we look through the whole */
2592 /* waiters list and only add us if we aren't in there already */ 2966 /* waiters list and only add us if we aren't in there already */
2593 /* this avoids some degenerate memory usage cases */ 2967 /* this avoids some degenerate memory usage cases */
2594 2968 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2595 for (i = 1; i <= AvFILLp (av); ++i)
2596 if (AvARRAY (av)[i] == SvRV (coro_current)) 2969 if (AvARRAY (av)[i] == coro_hv)
2597 return 1; 2970 return 1;
2598 2971
2599 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2972 av_push (av, SvREFCNT_inc (coro_hv));
2600 return 1; 2973 return 1;
2601 } 2974 }
2602} 2975}
2603 2976
2604static int 2977static int
… …
2627 { 3000 {
2628 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2629 3002
2630 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3003 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2631 frame->prepare = prepare_schedule; 3004 frame->prepare = prepare_schedule;
2632
2633 /* to avoid race conditions when a woken-up coro gets terminated */ 3005 /* to avoid race conditions when a woken-up coro gets terminated */
2634 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3006 /* we arrange for a temporary on_destroy that calls adjust (0) */
2635 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3007 frame->destroy = coro_semaphore_destroy;
2636 } 3008 }
2637} 3009}
2638 3010
2639static void 3011static void
2640slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3012slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2722 { 3094 {
2723 SV *cb_cv = s_get_cv_croak (arg [1]); 3095 SV *cb_cv = s_get_cv_croak (arg [1]);
2724 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3096 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725 3097
2726 if (SvIVX (AvARRAY (av)[0])) 3098 if (SvIVX (AvARRAY (av)[0]))
2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3099 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2728 3100
2729 frame->prepare = prepare_nop; 3101 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop; 3102 frame->check = slf_check_nop;
2731 } 3103 }
2732 else if (SvIVX (AvARRAY (av)[0])) 3104 else if (SvIVX (AvARRAY (av)[0]))
… …
2858 dSP; 3230 dSP;
2859 3231
2860 static SV *prio_cv; 3232 static SV *prio_cv;
2861 static SV *prio_sv; 3233 static SV *prio_sv;
2862 3234
2863 if (expect_false (!prio_cv)) 3235 if (ecb_expect_false (!prio_cv))
2864 { 3236 {
2865 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3237 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2866 prio_sv = newSViv (0); 3238 prio_sv = newSViv (0);
2867 } 3239 }
2868 3240
… …
2894 /* now call the AIO function - we assume our request is uncancelable */ 3266 /* now call the AIO function - we assume our request is uncancelable */
2895 PUTBACK; 3267 PUTBACK;
2896 call_sv ((SV *)req, G_VOID | G_DISCARD); 3268 call_sv ((SV *)req, G_VOID | G_DISCARD);
2897 } 3269 }
2898 3270
2899 /* now that the requets is going, we loop toll we have a result */ 3271 /* now that the request is going, we loop till we have a result */
2900 frame->data = (void *)state; 3272 frame->data = (void *)state;
2901 frame->prepare = prepare_schedule; 3273 frame->prepare = prepare_schedule;
2902 frame->check = slf_check_aio_req; 3274 frame->check = slf_check_aio_req;
2903} 3275}
2904 3276
… …
2974 } 3346 }
2975 3347
2976 return coro_sv; 3348 return coro_sv;
2977} 3349}
2978 3350
3351#ifndef __cplusplus
3352ecb_cold XS(boot_Coro__State);
3353#endif
3354
3355#if CORO_JIT
3356
3357static void ecb_noinline ecb_cold
3358pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3359{
3360 dSP;
3361 AV *av = newAV ();
3362
3363 av_store (av, 3, newSVuv (d));
3364 av_store (av, 2, newSVuv (c));
3365 av_store (av, 1, newSVuv (b));
3366 av_store (av, 0, newSVuv (a));
3367
3368 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3369
3370 PUTBACK;
3371}
3372
3373static void ecb_noinline ecb_cold
3374jit_init (pTHX)
3375{
3376 dSP;
3377 SV *load, *save;
3378 char *map_base;
3379 char *load_ptr, *save_ptr;
3380 STRLEN load_len, save_len, map_len;
3381 int count;
3382
3383 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3384
3385 PUSHMARK (SP);
3386#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3387# include "state.h"
3388#undef VARx
3389 count = call_pv ("Coro::State::_jit", G_ARRAY);
3390 SPAGAIN;
3391
3392 save = POPs; save_ptr = SvPVbyte (save, save_len);
3393 load = POPs; load_ptr = SvPVbyte (load, load_len);
3394
3395 map_len = load_len + save_len + 16;
3396
3397 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3398
3399 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3400
3401 load_perl_slots = (load_save_perl_slots_type)map_base;
3402 memcpy (map_base, load_ptr, load_len);
3403
3404 map_base += (load_len + 15) & ~15;
3405
3406 save_perl_slots = (load_save_perl_slots_type)map_base;
3407 memcpy (map_base, save_ptr, save_len);
3408
3409 /* we are good citizens and try to make the page read-only, so the evil evil */
3410 /* hackers might have it a bit more difficult */
3411 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3412
3413 PUTBACK;
3414 eval_pv ("undef &Coro::State::_jit", 1);
3415}
3416
3417#endif
3418
2979MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3419MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2980 3420
2981PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
2982 3422
2983BOOT: 3423BOOT:
… …
2986# if CORO_PTHREAD 3426# if CORO_PTHREAD
2987 coro_thx = PERL_GET_CONTEXT; 3427 coro_thx = PERL_GET_CONTEXT;
2988# endif 3428# endif
2989#endif 3429#endif
2990 BOOT_PAGESIZE; 3430 BOOT_PAGESIZE;
3431
3432 /* perl defines these to check for existance first, but why it doesn't */
3433 /* just create them one at init time is not clear to me, except for */
3434 /* programs trying to delete them, but... */
3435 /* anyway, we declare this as invalid and make sure they are initialised here */
3436 DEFSV;
3437 ERRSV;
2991 3438
2992 cctx_current = cctx_new_empty (); 3439 cctx_current = cctx_new_empty ();
2993 3440
2994 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3441 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2995 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3442 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3035 coroapi.prepare_nop = prepare_nop; 3482 coroapi.prepare_nop = prepare_nop;
3036 coroapi.prepare_schedule = prepare_schedule; 3483 coroapi.prepare_schedule = prepare_schedule;
3037 coroapi.prepare_cede = prepare_cede; 3484 coroapi.prepare_cede = prepare_cede;
3038 coroapi.prepare_cede_notself = prepare_cede_notself; 3485 coroapi.prepare_cede_notself = prepare_cede_notself;
3039 3486
3040 { 3487 time_init (aTHX);
3041 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3042
3043 if (!svp) croak ("Time::HiRes is required");
3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3045
3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3050 }
3051 3488
3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3489 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3490#if CORO_JIT
3491 PUTBACK;
3492 jit_init (aTHX);
3493 SPAGAIN;
3494#endif
3053} 3495}
3054 3496
3055SV * 3497SV *
3056new (SV *klass, ...) 3498new (SV *klass, ...)
3057 ALIAS: 3499 ALIAS:
… …
3064void 3506void
3065transfer (...) 3507transfer (...)
3066 PROTOTYPE: $$ 3508 PROTOTYPE: $$
3067 CODE: 3509 CODE:
3068 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3510 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3069
3070bool
3071_destroy (SV *coro_sv)
3072 CODE:
3073 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3074 OUTPUT:
3075 RETVAL
3076 3511
3077void 3512void
3078_exit (int code) 3513_exit (int code)
3079 PROTOTYPE: $ 3514 PROTOTYPE: $
3080 CODE: 3515 CODE:
… …
3156 CODE: 3591 CODE:
3157{ 3592{
3158 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3593 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3159 { 3594 {
3160 struct coro *current = SvSTATE_current; 3595 struct coro *current = SvSTATE_current;
3596 struct CoroSLF slf_save;
3161 3597
3162 if (current != coro) 3598 if (current != coro)
3163 { 3599 {
3164 PUTBACK; 3600 PUTBACK;
3165 save_perl (aTHX_ current); 3601 save_perl (aTHX_ current);
3166 load_perl (aTHX_ coro); 3602 load_perl (aTHX_ coro);
3603 /* the coro is most likely in an active SLF call.
3604 * while not strictly required (the code we execute is
3605 * not allowed to call any SLF functions), it's cleaner
3606 * to reinitialise the slf_frame and restore it later.
3607 * This might one day allow us to actually do SLF calls
3608 * from code executed here.
3609 */
3610 slf_save = slf_frame;
3611 slf_frame.prepare = 0;
3167 SPAGAIN; 3612 SPAGAIN;
3168 } 3613 }
3169 3614
3170 PUSHSTACK; 3615 PUSHSTACK;
3171 3616
… …
3181 SPAGAIN; 3626 SPAGAIN;
3182 3627
3183 if (current != coro) 3628 if (current != coro)
3184 { 3629 {
3185 PUTBACK; 3630 PUTBACK;
3631 slf_frame = slf_save;
3186 save_perl (aTHX_ coro); 3632 save_perl (aTHX_ coro);
3187 load_perl (aTHX_ current); 3633 load_perl (aTHX_ current);
3188 SPAGAIN; 3634 SPAGAIN;
3189 } 3635 }
3190 } 3636 }
… …
3195 PROTOTYPE: $ 3641 PROTOTYPE: $
3196 ALIAS: 3642 ALIAS:
3197 is_ready = CF_READY 3643 is_ready = CF_READY
3198 is_running = CF_RUNNING 3644 is_running = CF_RUNNING
3199 is_new = CF_NEW 3645 is_new = CF_NEW
3200 is_destroyed = CF_DESTROYED 3646 is_destroyed = CF_ZOMBIE
3647 is_zombie = CF_ZOMBIE
3201 is_suspended = CF_SUSPENDED 3648 is_suspended = CF_SUSPENDED
3202 CODE: 3649 CODE:
3203 RETVAL = boolSV (coro->flags & ix); 3650 RETVAL = boolSV (coro->flags & ix);
3204 OUTPUT: 3651 OUTPUT:
3205 RETVAL 3652 RETVAL
3206 3653
3207void 3654void
3208throw (Coro::State self, SV *throw = &PL_sv_undef) 3655throw (Coro::State self, SV *exception = &PL_sv_undef)
3209 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
3210 CODE: 3657 CODE:
3211{ 3658{
3212 struct coro *current = SvSTATE_current; 3659 struct coro *current = SvSTATE_current;
3213 SV **throwp = self == current ? &CORO_THROW : &self->except; 3660 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3214 SvREFCNT_dec (*throwp); 3661 SvREFCNT_dec (*exceptionp);
3215 SvGETMAGIC (throw); 3662 SvGETMAGIC (exception);
3216 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3663 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3217} 3664}
3218 3665
3219void 3666void
3220api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3667api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3221 PROTOTYPE: $;$ 3668 PROTOTYPE: $;$
… …
3276 3723
3277void 3724void
3278cancel (Coro::State self) 3725cancel (Coro::State self)
3279 CODE: 3726 CODE:
3280 coro_state_destroy (aTHX_ self); 3727 coro_state_destroy (aTHX_ self);
3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3282
3283 3728
3284SV * 3729SV *
3285enable_times (int enabled = enable_times) 3730enable_times (int enabled = enable_times)
3286 CODE: 3731 CODE:
3287{ 3732{
… …
3302times (Coro::State self) 3747times (Coro::State self)
3303 PPCODE: 3748 PPCODE:
3304{ 3749{
3305 struct coro *current = SvSTATE (coro_current); 3750 struct coro *current = SvSTATE (coro_current);
3306 3751
3307 if (expect_false (current == self)) 3752 if (ecb_expect_false (current == self))
3308 { 3753 {
3309 coro_times_update (); 3754 coro_times_update ();
3310 coro_times_add (SvSTATE (coro_current)); 3755 coro_times_add (SvSTATE (coro_current));
3311 } 3756 }
3312 3757
3313 EXTEND (SP, 2); 3758 EXTEND (SP, 2);
3314 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3759 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3760 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316 3761
3317 if (expect_false (current == self)) 3762 if (ecb_expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current)); 3763 coro_times_sub (SvSTATE (coro_current));
3319} 3764}
3765
3766void
3767swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3768 CODE:
3769{
3770 struct coro *current = SvSTATE_current;
3771
3772 if (current == coro)
3773 SWAP_SVS (current);
3774
3775 if (!coro->swap_sv)
3776 coro->swap_sv = newAV ();
3777
3778 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3779 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3780
3781 if (current == coro)
3782 SWAP_SVS (current);
3783}
3784
3320 3785
3321MODULE = Coro::State PACKAGE = Coro 3786MODULE = Coro::State PACKAGE = Coro
3322 3787
3323BOOT: 3788BOOT:
3324{ 3789{
3325 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3790 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3326 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3791 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3327 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3792 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3328 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3329 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3793 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3330 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3331 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3795 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3332 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3796 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3333 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3797 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3372 api_ready (aTHX_ RETVAL); 3836 api_ready (aTHX_ RETVAL);
3373 OUTPUT: 3837 OUTPUT:
3374 RETVAL 3838 RETVAL
3375 3839
3376void 3840void
3841_destroy (Coro::State coro)
3842 CODE:
3843 /* used by the manager thread */
3844 coro_state_destroy (aTHX_ coro);
3845
3846void
3847on_destroy (Coro::State coro, SV *cb)
3848 CODE:
3849 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3850
3851void
3852join (...)
3853 CODE:
3854 CORO_EXECUTE_SLF_XS (slf_init_join);
3855
3856void
3377terminate (...) 3857terminate (...)
3378 CODE: 3858 CODE:
3379 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3859 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3860
3861void
3862cancel (...)
3863 CODE:
3864 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3865
3866int
3867safe_cancel (Coro::State self, ...)
3868 C_ARGS: aTHX_ self, &ST (1), items - 1
3380 3869
3381void 3870void
3382schedule (...) 3871schedule (...)
3383 CODE: 3872 CODE:
3384 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3873 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3660} 4149}
3661 4150
3662MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4151MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3663 4152
3664void 4153void
3665_may_delete (SV *sem, int count, int extra_refs) 4154_may_delete (SV *sem, int count, unsigned int extra_refs)
3666 PPCODE: 4155 PPCODE:
3667{ 4156{
3668 AV *av = (AV *)SvRV (sem); 4157 AV *av = (AV *)SvRV (sem);
3669 4158
3670 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4159 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3781 { 4270 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4271 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0; 4272 coro_old_pp_sselect = 0;
3784 } 4273 }
3785 4274
3786

Diff Legend

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