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

Diff Legend

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