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.368 by root, Thu Aug 13 02:35:41 2009 UTC vs.
Revision 1.405 by root, Sat Jun 11 13:01:26 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
… …
76# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
77#endif 89#endif
78 90
79#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
80 92
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" 93#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
98 95
99#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
100# if CORO_PTHREAD 97# if CORO_PTHREAD
101static void *coro_thx; 98static void *coro_thx;
102# endif 99# endif
103#endif 100#endif
101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104 104
105#ifdef __linux 105#ifdef __linux
106# include <time.h> /* for timespec */ 106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 108# ifdef SYS_clock_gettime
… …
116static void (*u2time)(pTHX_ UV ret[2]); 116static void (*u2time)(pTHX_ UV ret[2]);
117 117
118/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
121 122
122static U32 cctx_gen; 123static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 143static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 144static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 145static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 146static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 147static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 148
149/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
150static SV *sv_activity; 150static SV *sv_activity;
151 151
152/* enable processtime/realtime profiling */ 152/* enable processtime/realtime profiling */
… …
156static char times_valid; 156static char times_valid;
157 157
158static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
160 160
161enum { 161enum
162{
162 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
187 int valgrind_id; 188 int valgrind_id;
188#endif 189#endif
189 unsigned char flags; 190 unsigned char flags;
190} coro_cctx; 191} coro_cctx;
191 192
192coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
193 194
194/*****************************************************************************/ 195/*****************************************************************************/
195 196
197static MGVTBL coro_state_vtbl;
198
196enum { 199enum
200{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 207};
203 208
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 210typedef struct
206{ 211{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
213# include "state.h" 213# include "state.h"
214#undef VAR 214#undef VARx
215} perl_slots; 215} perl_slots;
216 216
217// how many context stack entries do we need for perl_slots
217#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 219
219/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
220struct coro { 221struct coro
222{
221 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 224 coro_cctx *cctx;
223 225
224 /* ready queue */ 226 /* ready queue */
225 struct coro *next_ready; 227 struct coro *next_ready;
… …
227 /* state data */ 229 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 231 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
231 233
232 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 238
239 /* statistics */ 239 /* statistics */
240 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
241 241
242 /* coro process data */ 242 /* coro process data */
243 int prio; 243 int prio;
244 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 245 SV *rouse_cb; /* last rouse callback */
246 AV *on_destroy; /* callbacks or coros to notify on destroy */
247 AV *status; /* the exit status list */
246 248
247 /* async_pool */ 249 /* async_pool */
248 SV *saved_deffh; 250 SV *saved_deffh;
249 SV *invoke_cb; 251 SV *invoke_cb;
250 AV *invoke_av; 252 AV *invoke_av;
251 253
252 /* on_enter/on_leave */ 254 /* on_enter/on_leave */
253 AV *on_enter; 255 AV *on_enter;
254 AV *on_leave; 256 AV *on_leave;
255 257
258 /* swap_sv */
259 AV *swap_sv;
260
256 /* times */ 261 /* times */
257 coro_ts t_cpu, t_real; 262 coro_ts t_cpu, t_real;
258 263
259 /* linked list */ 264 /* linked list */
260 struct coro *next, *prev; 265 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
265 270
266/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
270 275
271/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
272 277
273#define CORO_PRIO_MAX 3 278#define CORO_PRIO_MAX 3
… …
279 284
280/* for Coro.pm */ 285/* for Coro.pm */
281static SV *coro_current; 286static SV *coro_current;
282static SV *coro_readyhook; 287static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
285static struct coro *coro_first; 290static struct coro *coro_first;
286#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
287 292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 #ifndef CORO_JIT_TYPE
297 #if __linux && __amd64
298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *);
300 #else
301 #undef CORO_JIT
302 #endif
303 #endif
304#endif
305
306#if CORO_JIT
307
308static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif
311
288/** Coro::Select ************************************************************/ 312/** Coro::Select ************************************************************/
289 313
290static OP *(*coro_old_pp_sselect) (pTHX); 314static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 315static SV *coro_select_select;
292 316
293/* horrible hack, but if it works... */ 317/* horrible hack, but if it works... */
294static OP * 318static OP *
295coro_pp_sselect (aTHX) 319coro_pp_sselect (pTHX)
296{ 320{
297 dSP; 321 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 322 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 323 XPUSHs (coro_select_select);
300 PUTBACK; 324 PUTBACK;
… …
303 PL_op->op_flags |= OPf_STACKED; 327 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 328 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 329 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 330}
307 331
332/** time stuff **************************************************************/
333
334#ifdef HAS_GETTIMEOFDAY
335
336ECB_INLINE void
337coro_u2time (pTHX_ UV ret[2])
338{
339 struct timeval tv;
340 gettimeofday (&tv, 0);
341
342 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec;
344}
345
346ECB_INLINE double
347coro_nvtime ()
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 return tv.tv_sec + tv.tv_usec * 1e-6;
353}
354
355ECB_INLINE void
356time_init (pTHX)
357{
358 nvtime = coro_nvtime;
359 u2time = coro_u2time;
360}
361
362#else
363
364ECB_INLINE void
365time_init (pTHX)
366{
367 SV **svp;
368
369 require_pv ("Time/HiRes.pm");
370
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
375
376 nvtime = INT2PTR (double (*)(), SvIV (*svp));
377
378 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
379 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
380}
381
382#endif
383
308/** lowlevel stuff **********************************************************/ 384/** lowlevel stuff **********************************************************/
309 385
310static SV * 386static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 387coro_get_sv (pTHX_ const char *name, int create)
312{ 388{
313#if PERL_VERSION_ATLEAST (5,10,0) 389#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_sv (name, create); 391 get_sv (name, create);
316#endif 392#endif
317 return get_sv (name, create); 393 return get_sv (name, create);
318} 394}
319 395
320static AV * 396static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 397coro_get_av (pTHX_ const char *name, int create)
322{ 398{
323#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
324 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
325 get_av (name, create); 401 get_av (name, create);
326#endif 402#endif
327 return get_av (name, create); 403 return get_av (name, create);
328} 404}
329 405
330static HV * 406static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 407coro_get_hv (pTHX_ const char *name, int create)
332{ 408{
333#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
334 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
335 get_hv (name, create); 411 get_hv (name, create);
336#endif 412#endif
337 return get_hv (name, create); 413 return get_hv (name, create);
338} 414}
339 415
340INLINE void 416ECB_INLINE void
341coro_times_update () 417coro_times_update ()
342{ 418{
343#ifdef coro_clock_gettime 419#ifdef coro_clock_gettime
344 struct timespec ts; 420 struct timespec ts;
345 421
… …
358 time_real [0] = tv [0]; 434 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 435 time_real [1] = tv [1] * 1000;
360#endif 436#endif
361} 437}
362 438
363INLINE void 439ECB_INLINE void
364coro_times_add (struct coro *c) 440coro_times_add (struct coro *c)
365{ 441{
366 c->t_real [1] += time_real [1]; 442 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 443 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 444 c->t_real [0] += time_real [0];
… …
370 c->t_cpu [1] += time_cpu [1]; 446 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 447 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 448 c->t_cpu [0] += time_cpu [0];
373} 449}
374 450
375INLINE void 451ECB_INLINE void
376coro_times_sub (struct coro *c) 452coro_times_sub (struct coro *c)
377{ 453{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 454 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1]; 455 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 456 c->t_real [0] -= time_real [0];
… …
388/* magic glue */ 464/* magic glue */
389 465
390#define CORO_MAGIC_type_cv 26 466#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 467#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 468
393#define CORO_MAGIC_NN(sv, type) \ 469#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 470 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 471 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 472 : mg_find (sv, type))
397 473
398#define CORO_MAGIC(sv, type) \ 474#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 475 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 476 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 477 : 0)
402 478
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 479#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 480#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 481
482ECB_INLINE MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro)
484{
485 MAGIC *mg;
486
487 if (ecb_expect_true (
488 SvTYPE (coro) == SVt_PVHV
489 && (mg = CORO_MAGIC_state (coro))
490 && mg->mg_virtual == &coro_state_vtbl
491 ))
492 return mg;
493
494 return 0;
495}
496
406INLINE struct coro * 497ECB_INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro) 498SvSTATE_ (pTHX_ SV *coro)
408{ 499{
409 HV *stash;
410 MAGIC *mg; 500 MAGIC *mg;
411 501
412 if (SvROK (coro)) 502 if (SvROK (coro))
413 coro = SvRV (coro); 503 coro = SvRV (coro);
414 504
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 505 mg = SvSTATEhv_p (aTHX_ coro);
506 if (!mg)
416 croak ("Coro::State object required"); 507 croak ("Coro::State object required");
417 508
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 509 return (struct coro *)mg->mg_ptr;
428} 510}
429 511
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 512#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 513
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 517
436/*****************************************************************************/ 518/*****************************************************************************/
437/* padlist management and caching */ 519/* padlist management and caching */
438 520
439static AV * 521ECB_INLINE AV *
440coro_derive_padlist (pTHX_ CV *cv) 522coro_derive_padlist (pTHX_ CV *cv)
441{ 523{
442 AV *padlist = CvPADLIST (cv); 524 AV *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 525 AV *newpadlist, *newpad;
444 526
… …
456 av_store (newpadlist, 1, (SV *)newpad); 538 av_store (newpadlist, 1, (SV *)newpad);
457 539
458 return newpadlist; 540 return newpadlist;
459} 541}
460 542
461static void 543ECB_INLINE void
462free_padlist (pTHX_ AV *padlist) 544free_padlist (pTHX_ AV *padlist)
463{ 545{
464 /* may be during global destruction */ 546 /* may be during global destruction */
465 if (!IN_DESTRUCT) 547 if (!IN_DESTRUCT)
466 { 548 {
… …
509 0, 0, 0, 0, 591 0, 0, 0, 0,
510 coro_cv_free 592 coro_cv_free
511}; 593};
512 594
513/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
514static void 596ECB_INLINE void
515get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
516{ 598{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 600 AV *av;
519 601
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
522 else 604 else
523 { 605 {
524#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 615#endif
534 } 616 }
535} 617}
536 618
537static void 619ECB_INLINE void
538put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
539{ 621{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av; 623 AV *av;
542 624
543 if (expect_false (!mg)) 625 if (ecb_expect_false (!mg))
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
545 627
546 av = (AV *)mg->mg_obj; 628 av = (AV *)mg->mg_obj;
547 629
548 if (expect_false (AvFILLp (av) >= AvMAX (av))) 630 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1); 631 av_extend (av, AvFILLp (av) + 1);
550 632
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 633 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 634}
553 635
554/** load & save, init *******************************************************/ 636/** load & save, init *******************************************************/
637
638/* swap sv heads, at least logically */
639static void
640swap_svs (pTHX_ Coro__State c)
641{
642 int i;
643
644 for (i = 0; i <= AvFILLp (c->swap_sv); )
645 {
646 SV *a = AvARRAY (c->swap_sv)[i++];
647 SV *b = AvARRAY (c->swap_sv)[i++];
648
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 complicates this _quite_ a bit, but it also is
662 * much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682 }
683}
684
685#define SWAP_SVS(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \
687 swap_svs (aTHX_ (coro))
555 688
556static void 689static void
557on_enterleave_call (pTHX_ SV *cb); 690on_enterleave_call (pTHX_ SV *cb);
558 691
559static void 692static void
… …
562 perl_slots *slot = c->slot; 695 perl_slots *slot = c->slot;
563 c->slot = 0; 696 c->slot = 0;
564 697
565 PL_mainstack = c->mainstack; 698 PL_mainstack = c->mainstack;
566 699
567 GvSV (PL_defgv) = slot->defsv; 700#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 701 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 702#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 703 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 704 # include "state.h"
575 #undef VAR 705 #undef VARx
706#endif
576 707
577 { 708 {
578 dSP; 709 dSP;
579 710
580 CV *cv; 711 CV *cv;
581 712
582 /* now do the ugly restore mess */ 713 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 714 while (ecb_expect_true (cv = (CV *)POPs))
584 { 715 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 716 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 717 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 718 CvPADLIST (cv) = (AV *)POPs;
588 } 719 }
… …
591 } 722 }
592 723
593 slf_frame = c->slf_frame; 724 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 725 CORO_THROW = c->except;
595 726
596 if (expect_false (enable_times)) 727 if (ecb_expect_false (enable_times))
597 { 728 {
598 if (expect_false (!times_valid)) 729 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 730 coro_times_update ();
600 731
601 coro_times_sub (c); 732 coro_times_sub (c);
602 } 733 }
603 734
604 if (expect_false (c->on_enter)) 735 if (ecb_expect_false (c->on_enter))
605 { 736 {
606 int i; 737 int i;
607 738
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 739 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 741 }
742
743 SWAP_SVS (c);
611} 744}
612 745
613static void 746static void
614save_perl (pTHX_ Coro__State c) 747save_perl (pTHX_ Coro__State c)
615{ 748{
749 SWAP_SVS (c);
750
616 if (expect_false (c->on_leave)) 751 if (ecb_expect_false (c->on_leave))
617 { 752 {
618 int i; 753 int i;
619 754
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 755 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 756 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 757 }
623 758
624 times_valid = 0; 759 times_valid = 0;
625 760
626 if (expect_false (enable_times)) 761 if (ecb_expect_false (enable_times))
627 { 762 {
628 coro_times_update (); times_valid = 1; 763 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 764 coro_times_add (c);
630 } 765 }
631 766
… …
645 780
646 XPUSHs (Nullsv); 781 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 782 /* this loop was inspired by pp_caller */
648 for (;;) 783 for (;;)
649 { 784 {
650 while (expect_true (cxix >= 0)) 785 while (ecb_expect_true (cxix >= 0))
651 { 786 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 787 PERL_CONTEXT *cx = &ccstk[cxix--];
653 788
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 789 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 790 {
656 CV *cv = cx->blk_sub.cv; 791 CV *cv = cx->blk_sub.cv;
657 792
658 if (expect_true (CvDEPTH (cv))) 793 if (ecb_expect_true (CvDEPTH (cv)))
659 { 794 {
660 EXTEND (SP, 3); 795 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 796 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 797 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 798 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 801 get_padlist (aTHX_ cv);
667 } 802 }
668 } 803 }
669 } 804 }
670 805
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 806 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 807 break;
673 808
674 top_si = top_si->si_prev; 809 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 810 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 811 cxix = top_si->si_cxix;
… …
678 813
679 PUTBACK; 814 PUTBACK;
680 } 815 }
681 816
682 /* allocate some space on the context stack for our purposes */ 817 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
684 if (SLOT_COUNT >= 1) CXINC;
685 if (SLOT_COUNT >= 2) CXINC;
686 if (SLOT_COUNT >= 3) CXINC;
687 { 819 {
688 unsigned int i; 820 unsigned int i;
821
689 for (i = 3; i < SLOT_COUNT; ++i) 822 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 823 CXINC;
691 } 824
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 825 cxstack_ix -= SLOT_COUNT; /* undo allocation */
826 }
693 827
694 c->mainstack = PL_mainstack; 828 c->mainstack = PL_mainstack;
695 829
696 { 830 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 831 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 832
699 slot->defav = GvAV (PL_defgv); 833#if CORO_JIT
700 slot->defsv = DEFSV; 834 save_perl_slots (slot);
701 slot->errsv = ERRSV; 835#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 836 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 837 # include "state.h"
707 #undef VAR 838 #undef VARx
839#endif
708 } 840 }
709} 841}
710 842
711/* 843/*
712 * allocate various perl stacks. This is almost an exact copy 844 * allocate various perl stacks. This is almost an exact copy
… …
718# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
719#else 851#else
720static void 852static void
721coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
722{ 854{
723 PL_curstackinfo = new_stackinfo(32, 8); 855 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
724 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 859
728 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
… …
835#endif 967#endif
836 968
837/* 969/*
838 * This overrides the default magic get method of %SIG elements. 970 * This overrides the default magic get method of %SIG elements.
839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 971 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
840 * and instead of trying to save and restore the hash elements, we just provide 972 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 973 * we just provide our own readback here.
842 */ 974 */
843static int 975static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 977{
846 const char *s = MgPV_nolen_const (mg); 978 const char *s = MgPV_nolen_const (mg);
847 979
848 if (*s == '_') 980 if (*s == '_')
… …
860 } 992 }
861 993
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 995}
864 996
865static int 997static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 998coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 999{
868 const char *s = MgPV_nolen_const (mg); 1000 const char *s = MgPV_nolen_const (mg);
869 1001
870 if (*s == '_') 1002 if (*s == '_')
… …
884 } 1016 }
885 1017
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1018 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1019}
888 1020
889static int 1021static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1022coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1023{
892 const char *s = MgPV_nolen_const (mg); 1024 const char *s = MgPV_nolen_const (mg);
893 1025
894 if (*s == '_') 1026 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1059slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1060{
929 return 1; 1061 return 1;
930} 1062}
931 1063
932static UNOP coro_setup_op; 1064static UNOP init_perl_op;
933 1065
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1066ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1067init_perl (pTHX_ struct coro *coro)
936{ 1068{
937 /* 1069 /*
938 * emulate part of the perl startup here. 1070 * emulate part of the perl startup here.
939 */ 1071 */
940 coro_init_stacks (aTHX); 1072 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1079 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1080 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1081 PL_curpm = 0;
950 PL_curpad = 0; 1082 PL_curpad = 0;
951 PL_localizing = 0; 1083 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1084 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1085#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1086 PL_parser = 0;
956#endif 1087#endif
957 PL_hints = 0; 1088 PL_hints = 0;
958 1089
959 /* recreate the die/warn hooks */ 1090 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1091 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1092 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1093
963 GvSV (PL_defgv) = newSV (0); 1094 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1095 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1096 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
987 /* this newly created coroutine might be run on an existing cctx which most 1118 /* this newly created coroutine might be run on an existing cctx which most
988 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1119 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1120 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1121 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1122 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1123 slf_frame.destroy = 0;
992 1124
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1125 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1127 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1129 /* no flags etc. required, as an init function won't be called */
998 1130
999 PL_op = (OP *)&coro_setup_op; 1131 PL_op = (OP *)&init_perl_op;
1000 1132
1001 /* copy throw, in case it was set before coro_setup */ 1133 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1134 CORO_THROW = coro->except;
1003 1135
1136 SWAP_SVS (coro);
1137
1004 if (expect_false (enable_times)) 1138 if (ecb_expect_false (enable_times))
1005 { 1139 {
1006 coro_times_update (); 1140 coro_times_update ();
1007 coro_times_sub (coro); 1141 coro_times_sub (coro);
1008 } 1142 }
1009} 1143}
… …
1028 dounwind (-1); 1162 dounwind (-1);
1029 } 1163 }
1030} 1164}
1031 1165
1032static void 1166static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1167destroy_perl (pTHX_ struct coro *coro)
1034{ 1168{
1035 SV *svf [9]; 1169 SV *svf [9];
1036 1170
1037 { 1171 {
1172 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1173 struct coro *current = SvSTATE (old_current);
1039 1174
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1175 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1176
1042 save_perl (aTHX_ current); 1177 save_perl (aTHX_ current);
1178
1179 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv);
1181
1043 load_perl (aTHX_ coro); 1182 load_perl (aTHX_ coro);
1044 1183
1045 coro_unwind_stacks (aTHX); 1184 coro_unwind_stacks (aTHX);
1185
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1046 coro_destruct_stacks (aTHX); 1189 coro_destruct_stacks (aTHX);
1047 1190
1048 // now save some sv's to be free'd later 1191 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv); 1192 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1193 svf [1] = (SV *)GvAV (PL_defgv);
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1198 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1199 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1200 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1201 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1202
1203 SvRV_set (coro_current, old_current);
1204
1060 load_perl (aTHX_ current); 1205 load_perl (aTHX_ current);
1061 } 1206 }
1062 1207
1063 { 1208 {
1064 unsigned int i; 1209 unsigned int i;
… …
1071 SvREFCNT_dec (coro->invoke_cb); 1216 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1217 SvREFCNT_dec (coro->invoke_av);
1073 } 1218 }
1074} 1219}
1075 1220
1076INLINE void 1221ECB_INLINE void
1077free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
1078{ 1223{
1079 if (expect_true (coro_mortal)) 1224 if (ecb_expect_true (coro_mortal))
1080 { 1225 {
1081 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1227 coro_mortal = 0;
1083 } 1228 }
1084} 1229}
1085 1230
1086static int 1231static int
… …
1219 1364
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1365 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1366}
1222 1367
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1368/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1369static void ecb_noinline
1225cctx_prepare (pTHX) 1370cctx_prepare (pTHX)
1226{ 1371{
1227 PL_top_env = &PL_start_env; 1372 PL_top_env = &PL_start_env;
1228 1373
1229 if (cctx_current->flags & CC_TRACE) 1374 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1385 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1386 slf_frame.check = slf_check_set_stacklevel;
1242} 1387}
1243 1388
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1389/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1390ECB_INLINE void
1246transfer_tail (pTHX) 1391transfer_tail (pTHX)
1247{ 1392{
1248 free_coro_mortal (aTHX); 1393 free_coro_mortal (aTHX);
1249} 1394}
1250 1395
… …
1373cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1374{ 1519{
1375 if (!cctx) 1520 if (!cctx)
1376 return; 1521 return;
1377 1522
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1524
1380 --cctx_count; 1525 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1382 1527
1383 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
… …
1402#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1547#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1403 1548
1404static coro_cctx * 1549static coro_cctx *
1405cctx_get (pTHX) 1550cctx_get (pTHX)
1406{ 1551{
1407 while (expect_true (cctx_first)) 1552 while (ecb_expect_true (cctx_first))
1408 { 1553 {
1409 coro_cctx *cctx = cctx_first; 1554 coro_cctx *cctx = cctx_first;
1410 cctx_first = cctx->next; 1555 cctx_first = cctx->next;
1411 --cctx_idle; 1556 --cctx_idle;
1412 1557
1413 if (expect_true (!CCTX_EXPIRED (cctx))) 1558 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1414 return cctx; 1559 return cctx;
1415 1560
1416 cctx_destroy (cctx); 1561 cctx_destroy (cctx);
1417 } 1562 }
1418 1563
… …
1423cctx_put (coro_cctx *cctx) 1568cctx_put (coro_cctx *cctx)
1424{ 1569{
1425 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1426 1571
1427 /* free another cctx if overlimit */ 1572 /* free another cctx if overlimit */
1428 if (expect_false (cctx_idle >= cctx_max_idle)) 1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1429 { 1574 {
1430 coro_cctx *first = cctx_first; 1575 coro_cctx *first = cctx_first;
1431 cctx_first = first->next; 1576 cctx_first = first->next;
1432 --cctx_idle; 1577 --cctx_idle;
1433 1578
… …
1444static void 1589static void
1445transfer_check (pTHX_ struct coro *prev, struct coro *next) 1590transfer_check (pTHX_ struct coro *prev, struct coro *next)
1446{ 1591{
1447 /* TODO: throwing up here is considered harmful */ 1592 /* TODO: throwing up here is considered harmful */
1448 1593
1449 if (expect_true (prev != next)) 1594 if (ecb_expect_true (prev != next))
1450 { 1595 {
1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1597 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1453 1598
1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1599 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1600 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1456 1601
1457#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1458 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1604 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1460#endif 1605#endif
1461 } 1606 }
1462} 1607}
1463 1608
1464/* always use the TRANSFER macro */ 1609/* always use the TRANSFER macro */
1465static void NOINLINE /* noinline so we have a fixed stackframe */ 1610static void ecb_noinline /* noinline so we have a fixed stackframe */
1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1611transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1467{ 1612{
1468 dSTACKLEVEL; 1613 dSTACKLEVEL;
1469 1614
1470 /* sometimes transfer is only called to set idle_sp */ 1615 /* sometimes transfer is only called to set idle_sp */
1471 if (expect_false (!prev)) 1616 if (ecb_expect_false (!prev))
1472 { 1617 {
1473 cctx_current->idle_sp = STACKLEVEL; 1618 cctx_current->idle_sp = STACKLEVEL;
1474 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1619 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1475 } 1620 }
1476 else if (expect_true (prev != next)) 1621 else if (ecb_expect_true (prev != next))
1477 { 1622 {
1478 coro_cctx *cctx_prev; 1623 coro_cctx *cctx_prev;
1479 1624
1480 if (expect_false (prev->flags & CF_NEW)) 1625 if (ecb_expect_false (prev->flags & CF_NEW))
1481 { 1626 {
1482 /* create a new empty/source context */ 1627 /* create a new empty/source context */
1483 prev->flags &= ~CF_NEW; 1628 prev->flags &= ~CF_NEW;
1484 prev->flags |= CF_RUNNING; 1629 prev->flags |= CF_RUNNING;
1485 } 1630 }
… …
1488 next->flags |= CF_RUNNING; 1633 next->flags |= CF_RUNNING;
1489 1634
1490 /* first get rid of the old state */ 1635 /* first get rid of the old state */
1491 save_perl (aTHX_ prev); 1636 save_perl (aTHX_ prev);
1492 1637
1493 if (expect_false (next->flags & CF_NEW)) 1638 if (ecb_expect_false (next->flags & CF_NEW))
1494 { 1639 {
1495 /* need to start coroutine */ 1640 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1641 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1642 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1643 init_perl (aTHX_ next);
1499 } 1644 }
1500 else 1645 else
1501 load_perl (aTHX_ next); 1646 load_perl (aTHX_ next);
1502 1647
1503 /* possibly untie and reuse the cctx */ 1648 /* possibly untie and reuse the cctx */
1504 if (expect_true ( 1649 if (ecb_expect_true (
1505 cctx_current->idle_sp == STACKLEVEL 1650 cctx_current->idle_sp == STACKLEVEL
1506 && !(cctx_current->flags & CC_TRACE) 1651 && !(cctx_current->flags & CC_TRACE)
1507 && !force_cctx 1652 && !force_cctx
1508 )) 1653 ))
1509 { 1654 {
1510 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1655 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1511 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1656 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1512 1657
1513 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1658 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1514 /* without this the next cctx_get might destroy the running cctx while still in use */ 1659 /* without this the next cctx_get might destroy the running cctx while still in use */
1515 if (expect_false (CCTX_EXPIRED (cctx_current))) 1660 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1516 if (expect_true (!next->cctx)) 1661 if (ecb_expect_true (!next->cctx))
1517 next->cctx = cctx_get (aTHX); 1662 next->cctx = cctx_get (aTHX);
1518 1663
1519 cctx_put (cctx_current); 1664 cctx_put (cctx_current);
1520 } 1665 }
1521 else 1666 else
1522 prev->cctx = cctx_current; 1667 prev->cctx = cctx_current;
1523 1668
1524 ++next->usecount; 1669 ++next->usecount;
1525 1670
1526 cctx_prev = cctx_current; 1671 cctx_prev = cctx_current;
1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1672 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1528 1673
1529 next->cctx = 0; 1674 next->cctx = 0;
1530 1675
1531 if (expect_false (cctx_prev != cctx_current)) 1676 if (ecb_expect_false (cctx_prev != cctx_current))
1532 { 1677 {
1533 cctx_prev->top_env = PL_top_env; 1678 cctx_prev->top_env = PL_top_env;
1534 PL_top_env = cctx_current->top_env; 1679 PL_top_env = cctx_current->top_env;
1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1680 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1536 } 1681 }
… …
1542#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1687#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1543#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1689
1545/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1546 1691
1692/* this function is actually Coro, not Coro::State, but we call it from here */
1693/* because it is convenient - but it hasn't been declared yet for that reason */
1547static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1699{
1550 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_ZOMBIE)
1551 return 0; 1701 return;
1552 1702
1553 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1555 1704
1556 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_ZOMBIE;
1557 1706
1558 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1559 { 1708 {
1560 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1709 /* reduce nready, as destroying a ready coro effectively unreadies it */
1561 /* alternative: look through all ready queues and remove the coro */ 1710 /* alternative: look through all ready queues and remove the coro */
1562 --coro_nready; 1711 --coro_nready;
1563 } 1712 }
1564 else 1713 else
1565 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1714 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1715
1716 if (coro->next) coro->next->prev = coro->prev;
1717 if (coro->prev) coro->prev->next = coro->next;
1718 if (coro == coro_first) coro_first = coro->next;
1566 1719
1567 if (coro->mainstack 1720 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1721 && coro->mainstack != main_mainstack
1569 && coro->slot 1722 && coro->slot
1570 && !PL_dirty) 1723 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1572 1725
1573 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1729 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1577 1731
1578 if (coro->next) coro->next->prev = coro->prev; 1732 coro_call_on_destroy (aTHX_ coro);
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581 1733
1582 return 1; 1734 /* more destruction mayhem in coro_state_free */
1583} 1735}
1584 1736
1585static int 1737static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1739{
1588 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1589 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1590 1742
1591 coro->hv = 0;
1592
1593 if (--coro->refcnt < 0)
1594 {
1595 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (aTHX_ coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1596 Safefree (coro); 1747 Safefree (coro);
1597 }
1598 1748
1599 return 0; 1749 return 0;
1600} 1750}
1601 1751
1602static int 1752static int ecb_cold
1603coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1604{ 1754{
1605 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1606 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1607 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1608 1759
1609 return 0; 1760 return 0;
1610} 1761}
1611 1762
1612static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
… …
1637 TRANSFER (ta, 1); 1788 TRANSFER (ta, 1);
1638} 1789}
1639 1790
1640/** Coro ********************************************************************/ 1791/** Coro ********************************************************************/
1641 1792
1642INLINE void 1793ECB_INLINE void
1643coro_enq (pTHX_ struct coro *coro) 1794coro_enq (pTHX_ struct coro *coro)
1644{ 1795{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1797
1647 SvREFCNT_inc_NN (coro->hv); 1798 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1800 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1802 ready [1] = coro;
1652} 1803}
1653 1804
1654INLINE struct coro * 1805ECB_INLINE struct coro *
1655coro_deq (pTHX) 1806coro_deq (pTHX)
1656{ 1807{
1657 int prio; 1808 int prio;
1658 1809
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1712{ 1863{
1713 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1864 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1714} 1865}
1715 1866
1716/* expects to own a reference to next->hv */ 1867/* expects to own a reference to next->hv */
1717INLINE void 1868ECB_INLINE void
1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1719{ 1870{
1720 SV *prev_sv = SvRV (coro_current); 1871 SV *prev_sv = SvRV (coro_current);
1721 1872
1722 ta->prev = SvSTATE_hv (prev_sv); 1873 ta->prev = SvSTATE_hv (prev_sv);
… …
1735{ 1886{
1736 for (;;) 1887 for (;;)
1737 { 1888 {
1738 struct coro *next = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1739 1890
1740 if (expect_true (next)) 1891 if (ecb_expect_true (next))
1741 { 1892 {
1742 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1894 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1895 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1745 else 1896 else
1746 { 1897 {
1747 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1748 --coro_nready; 1899 --coro_nready;
… …
1755 { 1906 {
1756 /* nothing to schedule: call the idle handler */ 1907 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1908 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1909 && SvOBJECT (SvRV (sv_idle)))
1759 { 1910 {
1911 if (SvRV (sv_idle) == SvRV (coro_current))
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1913
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1915 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1916 --coro_nready;
1763 } 1917 }
1764 else 1918 else
1765 { 1919 {
1920 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1921 dSP;
1767 1922
1768 ENTER; 1923 ENTER;
1769 SAVETMPS; 1924 SAVETMPS;
1770 1925
… …
1777 } 1932 }
1778 } 1933 }
1779 } 1934 }
1780} 1935}
1781 1936
1782INLINE void 1937ECB_INLINE void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 1938prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 1939{
1785 api_ready (aTHX_ coro_current); 1940 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 1941 prepare_schedule (aTHX_ ta);
1787} 1942}
1788 1943
1789INLINE void 1944ECB_INLINE void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 1946{
1792 SV *prev = SvRV (coro_current); 1947 SV *prev = SvRV (coro_current);
1793 1948
1794 if (coro_nready) 1949 if (coro_nready)
… …
1824{ 1979{
1825 struct coro_transfer_args ta; 1980 struct coro_transfer_args ta;
1826 1981
1827 prepare_cede (aTHX_ &ta); 1982 prepare_cede (aTHX_ &ta);
1828 1983
1829 if (expect_true (ta.prev != ta.next)) 1984 if (ecb_expect_true (ta.prev != ta.next))
1830 { 1985 {
1831 TRANSFER (ta, 1); 1986 TRANSFER (ta, 1);
1832 return 1; 1987 return 1;
1833 } 1988 }
1834 else 1989 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2033 }
1879} 2034}
1880 2035
1881static void 2036static void
2037coro_push_av (pTHX_ AV *av, I32 gimme_v)
2038{
2039 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2040 {
2041 dSP;
2042
2043 if (gimme_v == G_SCALAR)
2044 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2045 else
2046 {
2047 int i;
2048 EXTEND (SP, AvFILLp (av) + 1);
2049
2050 for (i = 0; i <= AvFILLp (av); ++i)
2051 PUSHs (AvARRAY (av)[i]);
2052 }
2053
2054 PUTBACK;
2055 }
2056}
2057
2058static void
2059coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2060{
2061 if (!coro->on_destroy)
2062 coro->on_destroy = newAV ();
2063
2064 av_push (coro->on_destroy, cb);
2065}
2066
2067static void
2068slf_destroy_join (pTHX_ struct CoroSLF *frame)
2069{
2070 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2071}
2072
2073static int
2074slf_check_join (pTHX_ struct CoroSLF *frame)
2075{
2076 struct coro *coro = (struct coro *)frame->data;
2077
2078 if (!coro->status)
2079 return 1;
2080
2081 frame->destroy = 0;
2082
2083 coro_push_av (aTHX_ coro->status, GIMME_V);
2084
2085 SvREFCNT_dec ((SV *)coro->hv);
2086
2087 return 0;
2088}
2089
2090static void
2091slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2092{
2093 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2094
2095 if (items > 1)
2096 croak ("join called with too many arguments");
2097
2098 if (coro->status)
2099 frame->prepare = prepare_nop;
2100 else
2101 {
2102 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2103 frame->prepare = prepare_schedule;
2104 }
2105
2106 frame->check = slf_check_join;
2107 frame->destroy = slf_destroy_join;
2108 frame->data = (void *)coro;
2109 SvREFCNT_inc (coro->hv);
2110}
2111
2112static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2113coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2114{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2115 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2116
1887 if (on_destroyp) 2117 if (!od)
1888 { 2118 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2119
1891 while (AvFILLp (on_destroy) >= 0) 2120 while (AvFILLp (od) >= 0)
2121 {
2122 SV *cb = sv_2mortal (av_pop (od));
2123
2124 /* coro hv's (and only hv's at the moment) are supported as well */
2125 if (SvSTATEhv_p (aTHX_ cb))
2126 api_ready (aTHX_ cb);
2127 else
1892 { 2128 {
1893 dSP; /* don't disturb outer sp */ 2129 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2130 PUSHMARK (SP);
1897 2131
1898 if (statusp) 2132 if (coro->status)
1899 { 2133 {
1900 int i; 2134 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2136 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2137 }
1907 2138
1908 PUTBACK; 2139 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2140 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2141 }
1911 } 2142 }
1912} 2143}
1913 2144
1914static void 2145static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2147{
1917 int i; 2148 AV *av;
1918 HV *hv = (HV *)SvRV (coro_current); 2149
1919 AV *av = newAV (); 2150 if (coro->status)
2151 {
2152 av = coro->status;
2153 av_clear (av);
2154 }
2155 else
2156 av = coro->status = newAV ();
1920 2157
1921 /* items are actually not so common, so optimise for this case */ 2158 /* items are actually not so common, so optimise for this case */
1922 if (items) 2159 if (items)
1923 { 2160 {
2161 int i;
2162
1924 av_extend (av, items - 1); 2163 av_extend (av, items - 1);
1925 2164
1926 for (i = 0; i < items; ++i) 2165 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2167 }
2168}
1929 2169
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2170static void
1931 2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2173 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2174 api_ready (aTHX_ sv_manager);
1934 2175
1935 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2177 frame->check = slf_check_repeat;
1937 2178
1938 /* as a minor optimisation, we could unwind all stacks here */ 2179 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2180 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2181 /*coro_unwind_stacks (aTHX);*/
2182}
2183
2184static void
2185slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{
2187 HV *coro_hv = (HV *)SvRV (coro_current);
2188
2189 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2190 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2191}
2192
2193static void
2194slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2195{
2196 HV *coro_hv;
2197 struct coro *coro;
2198
2199 if (items <= 0)
2200 croak ("Coro::cancel called without coro object,");
2201
2202 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv;
2204
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 {
2209 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro;
2211
2212 frame->prepare = prepare_nop;
2213 frame->check = slf_check_nop;
2214 }
2215 else if (coro_hv == (HV *)SvRV (coro_current))
2216 {
2217 /* cancelling the current coro is allowed, and equals terminate */
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 }
2220 else
2221 {
2222 struct coro *self = SvSTATE_current;
2223
2224 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed.
2228 * besides, I can't get the slow-but-safe version working...
2229 */
2230 slf_frame.data = 0;
2231 self->flags |= CF_NOCANCEL;
2232 coro_state_destroy (aTHX_ coro);
2233 self->flags &= ~CF_NOCANCEL;
2234
2235 if (slf_frame.data)
2236 {
2237 /* while we were busy we have been cancelled, so terminate */
2238 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2239 }
2240 else
2241 {
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 }
2246}
2247
2248static int
2249slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2250{
2251 frame->prepare = 0;
2252 coro_unwind_stacks (aTHX);
2253
2254 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2255
2256 return 1;
2257}
2258
2259static int
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{
2262 if (coro->cctx)
2263 croak ("coro inside C callback, unable to cancel at this time, caught");
2264
2265 if (coro->flags & CF_NEW)
2266 {
2267 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro);
2269 }
2270 else
2271 {
2272 if (!coro->slf_frame.prepare)
2273 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2274
2275 slf_destroy (aTHX_ coro);
2276
2277 coro_set_status (aTHX_ coro, arg, items);
2278 coro->slf_frame.prepare = prepare_nop;
2279 coro->slf_frame.check = slf_check_safe_cancel;
2280
2281 api_ready (aTHX_ (SV *)coro->hv);
2282 }
2283
2284 return 1;
1941} 2285}
1942 2286
1943/*****************************************************************************/ 2287/*****************************************************************************/
1944/* async pool handler */ 2288/* async pool handler */
1945 2289
… …
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2320slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{ 2321{
1978 HV *hv = (HV *)SvRV (coro_current); 2322 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv); 2323 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980 2324
1981 if (expect_true (coro->saved_deffh)) 2325 if (ecb_expect_true (coro->saved_deffh))
1982 { 2326 {
1983 /* subsequent iteration */ 2327 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2328 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
1986 2330
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2333 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2335 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2336 }
1995 else 2337 else
1996 { 2338 {
1997 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2221static void 2563static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2564slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2565{
2224 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2567 frame->check = slf_check_nop;
2568}
2569
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void
2572slf_destroy (pTHX_ struct coro *coro)
2573{
2574 /* this callback is reserved for slf functions needing to do cleanup */
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577
2578 /*
2579 * The on_destroy above most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions.
2583 */
2584 coro->slf_frame.prepare = 0;
2226} 2585}
2227 2586
2228/* 2587/*
2229 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2589 * 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 */ 2596 I32 checkmark; /* mark SP to see how many elements check has pushed */
2238 2597
2239 /* set up the slf frame, unless it has already been set-up */ 2598 /* set up the slf frame, unless it has already been set-up */
2240 /* the latter happens when a new coro has been started */ 2599 /* the latter happens when a new coro has been started */
2241 /* or when a new cctx was attached to an existing coroutine */ 2600 /* or when a new cctx was attached to an existing coroutine */
2242 if (expect_true (!slf_frame.prepare)) 2601 if (ecb_expect_true (!slf_frame.prepare))
2243 { 2602 {
2244 /* first iteration */ 2603 /* first iteration */
2245 dSP; 2604 dSP;
2246 SV **arg = PL_stack_base + TOPMARK + 1; 2605 SV **arg = PL_stack_base + TOPMARK + 1;
2247 int items = SP - arg; /* args without function object */ 2606 int items = SP - arg; /* args without function object */
… …
2288 while (slf_frame.check (aTHX_ &slf_frame)); 2647 while (slf_frame.check (aTHX_ &slf_frame));
2289 2648
2290 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2649 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2291 2650
2292 /* exception handling */ 2651 /* exception handling */
2293 if (expect_false (CORO_THROW)) 2652 if (ecb_expect_false (CORO_THROW))
2294 { 2653 {
2295 SV *exception = sv_2mortal (CORO_THROW); 2654 SV *exception = sv_2mortal (CORO_THROW);
2296 2655
2297 CORO_THROW = 0; 2656 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception); 2657 sv_setsv (ERRSV, exception);
2299 croak (0); 2658 croak (0);
2300 } 2659 }
2301 2660
2302 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2665 {
2306 dSP; 2666 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2308 2668
2309 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2312 bot [1] = *sp; 2672 bot [1] = *sp;
2313 2673
2314 SP = bot + 1; 2674 SP = bot + 1;
2315 2675
2316 PUTBACK; 2676 PUTBACK;
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2709 if (PL_op->op_flags & OPf_STACKED)
2350 { 2710 {
2351 if (items > slf_arga) 2711 if (items > slf_arga)
2352 { 2712 {
2353 slf_arga = items; 2713 slf_arga = items;
2354 free (slf_argv); 2714 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2715 New (0, slf_argv, slf_arga, SV *);
2356 } 2716 }
2357 2717
2358 slf_argc = items; 2718 slf_argc = items;
2359 2719
2360 for (i = 0; i < items; ++i) 2720 for (i = 0; i < items; ++i)
… …
2423{ 2783{
2424 PerlIOBuf base; 2784 PerlIOBuf base;
2425 NV next, every; 2785 NV next, every;
2426} PerlIOCede; 2786} PerlIOCede;
2427 2787
2428static IV 2788static IV ecb_cold
2429PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2789PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2430{ 2790{
2431 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2791 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2432 2792
2433 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2793 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2434 self->next = nvtime () + self->every; 2794 self->next = nvtime () + self->every;
2435 2795
2436 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2796 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2437} 2797}
2438 2798
2439static SV * 2799static SV * ecb_cold
2440PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2800PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2441{ 2801{
2442 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2802 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2443 2803
2444 return newSVnv (self->every); 2804 return newSVnv (self->every);
… …
2556 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2557 } 2917 }
2558} 2918}
2559 2919
2560static void 2920static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2562{ 2922{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2565} 2925}
2566 2926
2567static int 2927static int
2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2569{ 2929{
2570 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2571 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2572 2933
2573 /* if we are about to throw, don't actually acquire the lock, just throw */ 2934 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW) 2935 if (CORO_THROW)
2575 return 0; 2936 return 0;
2576 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2577 { 2938 {
2578 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2579 2940
2580 if (acquire) 2941 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 2943 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
… …
2588 { 2949 {
2589 int i; 2950 int i;
2590 /* if we were woken up but can't down, we look through the whole */ 2951 /* if we were woken up but can't down, we look through the whole */
2591 /* waiters list and only add us if we aren't in there already */ 2952 /* waiters list and only add us if we aren't in there already */
2592 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2593 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2594 for (i = 1; i <= AvFILLp (av); ++i)
2595 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2596 return 1; 2956 return 1;
2597 2957
2598 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2599 return 1; 2959 return 1;
2600 } 2960 }
2601} 2961}
2602 2962
2603static int 2963static int
… …
2626 { 2986 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 2988
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2635 } 2994 }
2636} 2995}
2637 2996
2638static void 2997static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2998slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2721 { 3080 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]); 3081 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3082 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 3083
2725 if (SvIVX (AvARRAY (av)[0])) 3084 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3085 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 3086
2728 frame->prepare = prepare_nop; 3087 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 3088 frame->check = slf_check_nop;
2730 } 3089 }
2731 else if (SvIVX (AvARRAY (av)[0])) 3090 else if (SvIVX (AvARRAY (av)[0]))
… …
2857 dSP; 3216 dSP;
2858 3217
2859 static SV *prio_cv; 3218 static SV *prio_cv;
2860 static SV *prio_sv; 3219 static SV *prio_sv;
2861 3220
2862 if (expect_false (!prio_cv)) 3221 if (ecb_expect_false (!prio_cv))
2863 { 3222 {
2864 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3223 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2865 prio_sv = newSViv (0); 3224 prio_sv = newSViv (0);
2866 } 3225 }
2867 3226
… …
2893 /* now call the AIO function - we assume our request is uncancelable */ 3252 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3253 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3254 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3255 }
2897 3256
2898 /* now that the requets is going, we loop toll we have a result */ 3257 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3258 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3259 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3260 frame->check = slf_check_aio_req;
2902} 3261}
2903 3262
… …
2918#endif 3277#endif
2919 3278
2920/*****************************************************************************/ 3279/*****************************************************************************/
2921 3280
2922static SV * 3281static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro) 3282coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2924{ 3283{
2925 SV *coro_sv; 3284 SV *coro_sv;
2926 struct coro *coro; 3285 struct coro *coro;
2927 MAGIC *mg; 3286 MAGIC *mg;
2928 HV *hv; 3287 HV *hv;
… …
2973 } 3332 }
2974 3333
2975 return coro_sv; 3334 return coro_sv;
2976} 3335}
2977 3336
3337#ifndef __cplusplus
3338ecb_cold XS(boot_Coro__State);
3339#endif
3340
3341#if CORO_JIT
3342
3343static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c)
3345{
3346 dSP;
3347 AV *av = newAV ();
3348
3349 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a));
3352
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3354
3355 PUTBACK;
3356}
3357
3358static void ecb_noinline ecb_cold
3359jit_init (pTHX)
3360{
3361 dSP;
3362 SV *load, *save;
3363 char *map_base;
3364 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len;
3366 int count;
3367
3368 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN;
3375
3376 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382
3383 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len);
3385
3386 map_base += (load_len + 15) & ~15;
3387
3388 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len);
3390}
3391
3392#endif
3393
2978MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2979 3395
2980PROTOTYPES: DISABLE 3396PROTOTYPES: DISABLE
2981 3397
2982BOOT: 3398BOOT:
… …
2986 coro_thx = PERL_GET_CONTEXT; 3402 coro_thx = PERL_GET_CONTEXT;
2987# endif 3403# endif
2988#endif 3404#endif
2989 BOOT_PAGESIZE; 3405 BOOT_PAGESIZE;
2990 3406
3407 /* perl defines these to check for existance first, but why it doesn't */
3408 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV;
3412 ERRSV;
3413
2991 cctx_current = cctx_new_empty (); 3414 cctx_current = cctx_new_empty ();
2992 3415
2993 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3416 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2994 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3417 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2995 3418
… …
3034 coroapi.prepare_nop = prepare_nop; 3457 coroapi.prepare_nop = prepare_nop;
3035 coroapi.prepare_schedule = prepare_schedule; 3458 coroapi.prepare_schedule = prepare_schedule;
3036 coroapi.prepare_cede = prepare_cede; 3459 coroapi.prepare_cede = prepare_cede;
3037 coroapi.prepare_cede_notself = prepare_cede_notself; 3460 coroapi.prepare_cede_notself = prepare_cede_notself;
3038 3461
3039 { 3462 time_init (aTHX);
3040 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3041
3042 if (!svp) croak ("Time::HiRes is required");
3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3044
3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3049 }
3050 3463
3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT
3466 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN;
3471#endif
3052} 3472}
3053 3473
3054SV * 3474SV *
3055new (SV *klass, ...) 3475new (SV *klass, ...)
3056 ALIAS: 3476 ALIAS:
3057 Coro::new = 1 3477 Coro::new = 1
3058 CODE: 3478 CODE:
3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix); 3479 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3060 OUTPUT: 3480 OUTPUT:
3061 RETVAL 3481 RETVAL
3062 3482
3063void 3483void
3064transfer (...) 3484transfer (...)
3065 PROTOTYPE: $$ 3485 PROTOTYPE: $$
3066 CODE: 3486 CODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3487 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3068
3069bool
3070_destroy (SV *coro_sv)
3071 CODE:
3072 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3073 OUTPUT:
3074 RETVAL
3075 3488
3076void 3489void
3077_exit (int code) 3490_exit (int code)
3078 PROTOTYPE: $ 3491 PROTOTYPE: $
3079 CODE: 3492 CODE:
… …
3155 CODE: 3568 CODE:
3156{ 3569{
3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3570 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3158 { 3571 {
3159 struct coro *current = SvSTATE_current; 3572 struct coro *current = SvSTATE_current;
3573 struct CoroSLF slf_save;
3160 3574
3161 if (current != coro) 3575 if (current != coro)
3162 { 3576 {
3163 PUTBACK; 3577 PUTBACK;
3164 save_perl (aTHX_ current); 3578 save_perl (aTHX_ current);
3165 load_perl (aTHX_ coro); 3579 load_perl (aTHX_ coro);
3580 /* the coro is most likely in an active SLF call.
3581 * while not strictly required (the code we execute is
3582 * not allowed to call any SLF functions), it's cleaner
3583 * to reinitialise the slf_frame and restore it later.
3584 * This might one day allow us to actually do SLF calls
3585 * from code executed here.
3586 */
3587 slf_save = slf_frame;
3588 slf_frame.prepare = 0;
3166 SPAGAIN; 3589 SPAGAIN;
3167 } 3590 }
3168 3591
3169 PUSHSTACK; 3592 PUSHSTACK;
3170 3593
… …
3180 SPAGAIN; 3603 SPAGAIN;
3181 3604
3182 if (current != coro) 3605 if (current != coro)
3183 { 3606 {
3184 PUTBACK; 3607 PUTBACK;
3608 slf_frame = slf_save;
3185 save_perl (aTHX_ coro); 3609 save_perl (aTHX_ coro);
3186 load_perl (aTHX_ current); 3610 load_perl (aTHX_ current);
3187 SPAGAIN; 3611 SPAGAIN;
3188 } 3612 }
3189 } 3613 }
… …
3194 PROTOTYPE: $ 3618 PROTOTYPE: $
3195 ALIAS: 3619 ALIAS:
3196 is_ready = CF_READY 3620 is_ready = CF_READY
3197 is_running = CF_RUNNING 3621 is_running = CF_RUNNING
3198 is_new = CF_NEW 3622 is_new = CF_NEW
3199 is_destroyed = CF_DESTROYED 3623 is_destroyed = CF_ZOMBIE
3624 is_zombie = CF_ZOMBIE
3200 is_suspended = CF_SUSPENDED 3625 is_suspended = CF_SUSPENDED
3201 CODE: 3626 CODE:
3202 RETVAL = boolSV (coro->flags & ix); 3627 RETVAL = boolSV (coro->flags & ix);
3203 OUTPUT: 3628 OUTPUT:
3204 RETVAL 3629 RETVAL
3205 3630
3206void 3631void
3207throw (Coro::State self, SV *throw = &PL_sv_undef) 3632throw (Coro::State self, SV *exception = &PL_sv_undef)
3208 PROTOTYPE: $;$ 3633 PROTOTYPE: $;$
3209 CODE: 3634 CODE:
3210{ 3635{
3211 struct coro *current = SvSTATE_current; 3636 struct coro *current = SvSTATE_current;
3212 SV **throwp = self == current ? &CORO_THROW : &self->except; 3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3213 SvREFCNT_dec (*throwp); 3638 SvREFCNT_dec (*exceptionp);
3214 SvGETMAGIC (throw); 3639 SvGETMAGIC (exception);
3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3216} 3641}
3217 3642
3218void 3643void
3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3220 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
… …
3275 3700
3276void 3701void
3277cancel (Coro::State self) 3702cancel (Coro::State self)
3278 CODE: 3703 CODE:
3279 coro_state_destroy (aTHX_ self); 3704 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282 3705
3283SV * 3706SV *
3284enable_times (int enabled = enable_times) 3707enable_times (int enabled = enable_times)
3285 CODE: 3708 CODE:
3286{ 3709{
… …
3301times (Coro::State self) 3724times (Coro::State self)
3302 PPCODE: 3725 PPCODE:
3303{ 3726{
3304 struct coro *current = SvSTATE (coro_current); 3727 struct coro *current = SvSTATE (coro_current);
3305 3728
3306 if (expect_false (current == self)) 3729 if (ecb_expect_false (current == self))
3307 { 3730 {
3308 coro_times_update (); 3731 coro_times_update ();
3309 coro_times_add (SvSTATE (coro_current)); 3732 coro_times_add (SvSTATE (coro_current));
3310 } 3733 }
3311 3734
3312 EXTEND (SP, 2); 3735 EXTEND (SP, 2);
3313 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3736 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3737 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315 3738
3316 if (expect_false (current == self)) 3739 if (ecb_expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current)); 3740 coro_times_sub (SvSTATE (coro_current));
3318} 3741}
3742
3743void
3744swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3745 CODE:
3746{
3747 struct coro *current = SvSTATE_current;
3748
3749 if (current == coro)
3750 SWAP_SVS (current);
3751
3752 if (!coro->swap_sv)
3753 coro->swap_sv = newAV ();
3754
3755 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3757
3758 if (current == coro)
3759 SWAP_SVS (current);
3760}
3761
3319 3762
3320MODULE = Coro::State PACKAGE = Coro 3763MODULE = Coro::State PACKAGE = Coro
3321 3764
3322BOOT: 3765BOOT:
3323{ 3766{
3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3767 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3325 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3768 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3326 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3769 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3327 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3328 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3770 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3329 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3771 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3330 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3772 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3331 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3773 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3774 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3333 3775
3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3777 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3778 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3779 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3338 3780
3339 coro_stash = gv_stashpv ("Coro", TRUE); 3781 coro_stash = gv_stashpv ("Coro", TRUE);
3340 3782
3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3365 3807
3366SV * 3808SV *
3367async (...) 3809async (...)
3368 PROTOTYPE: &@ 3810 PROTOTYPE: &@
3369 CODE: 3811 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1); 3812 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL); 3813 api_ready (aTHX_ RETVAL);
3372 OUTPUT: 3814 OUTPUT:
3373 RETVAL 3815 RETVAL
3816
3817void
3818_destroy (Coro::State coro)
3819 CODE:
3820 /* used by the manager thread */
3821 coro_state_destroy (aTHX_ coro);
3822
3823void
3824on_destroy (Coro::State coro, SV *cb)
3825 CODE:
3826 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3827
3828void
3829join (...)
3830 CODE:
3831 CORO_EXECUTE_SLF_XS (slf_init_join);
3374 3832
3375void 3833void
3376terminate (...) 3834terminate (...)
3377 CODE: 3835 CODE:
3378 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3836 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3837
3838void
3839cancel (...)
3840 CODE:
3841 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3842
3843int
3844safe_cancel (Coro::State self, ...)
3845 C_ARGS: aTHX_ self, &ST (1), items - 1
3379 3846
3380void 3847void
3381schedule (...) 3848schedule (...)
3382 CODE: 3849 CODE:
3383 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3850 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3496 for (i = 1; i < items; ++i) 3963 for (i = 1; i < items; ++i)
3497 av_push (av, SvREFCNT_inc_NN (ST (i))); 3964 av_push (av, SvREFCNT_inc_NN (ST (i)));
3498 3965
3499 if ((SV *)hv == &PL_sv_undef) 3966 if ((SV *)hv == &PL_sv_undef)
3500 { 3967 {
3501 PUSHMARK (SP); 3968 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3502 EXTEND (SP, 2);
3503 PUSHs (sv_Coro);
3504 PUSHs ((SV *)cv_pool_handler);
3505 PUTBACK;
3506 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3507 SPAGAIN;
3508
3509 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3969 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3970 SvREFCNT_dec (sv);
3510 } 3971 }
3511 3972
3512 { 3973 {
3513 struct coro *coro = SvSTATE_hv (hv); 3974 struct coro *coro = SvSTATE_hv (hv);
3514 3975
… …
3786 { 4247 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0; 4249 coro_old_pp_sselect = 0;
3789 } 4250 }
3790 4251
3791

Diff Legend

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