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

Diff Legend

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