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.367 by root, Mon Aug 3 09:19:57 2009 UTC vs.
Revision 1.404 by root, Fri Jun 10 12:27:02 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
… …
116static void (*u2time)(pTHX_ UV ret[2]); 113static void (*u2time)(pTHX_ UV ret[2]);
117 114
118/* we hijack an hopefully unused CV flag for our purposes */ 115/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 116#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 117static OP *pp_slf (pTHX);
118static void slf_destroy (pTHX_ struct coro *coro);
121 119
122static U32 cctx_gen; 120static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 121static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 122static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 123static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 140static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 141static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 142static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 143static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 144static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 145
149/* Coro::AnyEvent */ 146/* Coro::AnyEvent */
150static SV *sv_activity; 147static SV *sv_activity;
151 148
152/* enable processtime/realtime profiling */ 149/* enable processtime/realtime profiling */
… …
156static char times_valid; 153static char times_valid;
157 154
158static struct coro_cctx *cctx_first; 155static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 156static int cctx_count, cctx_idle;
160 157
161enum { 158enum
159{
162 CC_MAPPED = 0x01, 160 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 161 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 162 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 163 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 164 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
187 int valgrind_id; 185 int valgrind_id;
188#endif 186#endif
189 unsigned char flags; 187 unsigned char flags;
190} coro_cctx; 188} coro_cctx;
191 189
192coro_cctx *cctx_current; /* the currently running cctx */ 190static coro_cctx *cctx_current; /* the currently running cctx */
193 191
194/*****************************************************************************/ 192/*****************************************************************************/
195 193
194static MGVTBL coro_state_vtbl;
195
196enum { 196enum
197{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 198 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 202 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
203 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 204};
203 205
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 206/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 207typedef struct
206{ 208{
… …
212#define VAR(name,type) type name; 214#define VAR(name,type) type name;
213# include "state.h" 215# include "state.h"
214#undef VAR 216#undef VAR
215} perl_slots; 217} perl_slots;
216 218
219// 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)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 221
219/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
220struct coro { 223struct coro
224{
221 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 226 coro_cctx *cctx;
223 227
224 /* ready queue */ 228 /* ready queue */
225 struct coro *next_ready; 229 struct coro *next_ready;
… …
227 /* state data */ 231 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 233 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
231 235
232 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 240
239 /* statistics */ 241 /* statistics */
240 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
241 243
242 /* coro process data */ 244 /* coro process data */
243 int prio; 245 int prio;
244 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
246 250
247 /* async_pool */ 251 /* async_pool */
248 SV *saved_deffh; 252 SV *saved_deffh;
249 SV *invoke_cb; 253 SV *invoke_cb;
250 AV *invoke_av; 254 AV *invoke_av;
251 255
252 /* on_enter/on_leave */ 256 /* on_enter/on_leave */
253 AV *on_enter; 257 AV *on_enter;
254 AV *on_leave; 258 AV *on_leave;
255 259
260 /* swap_sv */
261 AV *swap_sv;
262
256 /* times */ 263 /* times */
257 coro_ts t_cpu, t_real; 264 coro_ts t_cpu, t_real;
258 265
259 /* linked list */ 266 /* linked list */
260 struct coro *next, *prev; 267 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
265 272
266/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
270 277
271/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
272 279
273#define CORO_PRIO_MAX 3 280#define CORO_PRIO_MAX 3
… …
279 286
280/* for Coro.pm */ 287/* for Coro.pm */
281static SV *coro_current; 288static SV *coro_current;
282static SV *coro_readyhook; 289static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
285static struct coro *coro_first; 292static struct coro *coro_first;
286#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
287 294
288/** Coro::Select ************************************************************/ 295/** Coro::Select ************************************************************/
289 296
290static OP *(*coro_old_pp_sselect) (pTHX); 297static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 298static SV *coro_select_select;
292 299
293/* horrible hack, but if it works... */ 300/* horrible hack, but if it works... */
294static OP * 301static OP *
295coro_pp_sselect (aTHX) 302coro_pp_sselect (pTHX)
296{ 303{
297 dSP; 304 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 305 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 306 XPUSHs (coro_select_select);
300 PUTBACK; 307 PUTBACK;
… …
303 PL_op->op_flags |= OPf_STACKED; 310 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 311 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 312 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 313}
307 314
315/** time stuff **************************************************************/
316
317#ifdef HAS_GETTIMEOFDAY
318
319ECB_INLINE void
320coro_u2time (pTHX_ UV ret[2])
321{
322 struct timeval tv;
323 gettimeofday (&tv, 0);
324
325 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec;
327}
328
329ECB_INLINE double
330coro_nvtime ()
331{
332 struct timeval tv;
333 gettimeofday (&tv, 0);
334
335 return tv.tv_sec + tv.tv_usec * 1e-6;
336}
337
338ECB_INLINE void
339time_init (pTHX)
340{
341 nvtime = coro_nvtime;
342 u2time = coro_u2time;
343}
344
345#else
346
347ECB_INLINE void
348time_init (pTHX)
349{
350 SV **svp;
351
352 require_pv ("Time/HiRes.pm");
353
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
358
359 nvtime = INT2PTR (double (*)(), SvIV (*svp));
360
361 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
362 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
363}
364
365#endif
366
308/** lowlevel stuff **********************************************************/ 367/** lowlevel stuff **********************************************************/
309 368
310static SV * 369static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 370coro_get_sv (pTHX_ const char *name, int create)
312{ 371{
313#if PERL_VERSION_ATLEAST (5,10,0) 372#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_sv (name, create); 374 get_sv (name, create);
316#endif 375#endif
317 return get_sv (name, create); 376 return get_sv (name, create);
318} 377}
319 378
320static AV * 379static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 380coro_get_av (pTHX_ const char *name, int create)
322{ 381{
323#if PERL_VERSION_ATLEAST (5,10,0) 382#if PERL_VERSION_ATLEAST (5,10,0)
324 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 383 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
325 get_av (name, create); 384 get_av (name, create);
326#endif 385#endif
327 return get_av (name, create); 386 return get_av (name, create);
328} 387}
329 388
330static HV * 389static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 390coro_get_hv (pTHX_ const char *name, int create)
332{ 391{
333#if PERL_VERSION_ATLEAST (5,10,0) 392#if PERL_VERSION_ATLEAST (5,10,0)
334 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 393 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
335 get_hv (name, create); 394 get_hv (name, create);
336#endif 395#endif
337 return get_hv (name, create); 396 return get_hv (name, create);
338} 397}
339 398
340INLINE void 399ECB_INLINE void
341coro_times_update () 400coro_times_update ()
342{ 401{
343#ifdef coro_clock_gettime 402#ifdef coro_clock_gettime
344 struct timespec ts; 403 struct timespec ts;
345 404
… …
358 time_real [0] = tv [0]; 417 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 418 time_real [1] = tv [1] * 1000;
360#endif 419#endif
361} 420}
362 421
363INLINE void 422ECB_INLINE void
364coro_times_add (struct coro *c) 423coro_times_add (struct coro *c)
365{ 424{
366 c->t_real [1] += time_real [1]; 425 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 427 c->t_real [0] += time_real [0];
… …
370 c->t_cpu [1] += time_cpu [1]; 429 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 431 c->t_cpu [0] += time_cpu [0];
373} 432}
374 433
375INLINE void 434ECB_INLINE void
376coro_times_sub (struct coro *c) 435coro_times_sub (struct coro *c)
377{ 436{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 437 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]; 438 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 439 c->t_real [0] -= time_real [0];
… …
388/* magic glue */ 447/* magic glue */
389 448
390#define CORO_MAGIC_type_cv 26 449#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 450#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 451
393#define CORO_MAGIC_NN(sv, type) \ 452#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 453 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 454 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 455 : mg_find (sv, type))
397 456
398#define CORO_MAGIC(sv, type) \ 457#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 458 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 459 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 460 : 0)
402 461
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 462#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) 463#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 464
465ECB_INLINE MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro)
467{
468 MAGIC *mg;
469
470 if (ecb_expect_true (
471 SvTYPE (coro) == SVt_PVHV
472 && (mg = CORO_MAGIC_state (coro))
473 && mg->mg_virtual == &coro_state_vtbl
474 ))
475 return mg;
476
477 return 0;
478}
479
406INLINE struct coro * 480ECB_INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro) 481SvSTATE_ (pTHX_ SV *coro)
408{ 482{
409 HV *stash;
410 MAGIC *mg; 483 MAGIC *mg;
411 484
412 if (SvROK (coro)) 485 if (SvROK (coro))
413 coro = SvRV (coro); 486 coro = SvRV (coro);
414 487
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 488 mg = SvSTATEhv_p (aTHX_ coro);
489 if (!mg)
416 croak ("Coro::State object required"); 490 croak ("Coro::State object required");
417 491
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; 492 return (struct coro *)mg->mg_ptr;
428} 493}
429 494
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 496
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 500
436/*****************************************************************************/ 501/*****************************************************************************/
437/* padlist management and caching */ 502/* padlist management and caching */
438 503
439static AV * 504ECB_INLINE AV *
440coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
441{ 506{
442 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
444 509
… …
456 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
457 522
458 return newpadlist; 523 return newpadlist;
459} 524}
460 525
461static void 526ECB_INLINE void
462free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
463{ 528{
464 /* may be during global destruction */ 529 /* may be during global destruction */
465 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
466 { 531 {
… …
509 0, 0, 0, 0, 574 0, 0, 0, 0,
510 coro_cv_free 575 coro_cv_free
511}; 576};
512 577
513/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
514static void 579ECB_INLINE void
515get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
516{ 581{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 582 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 583 AV *av;
519 584
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
522 else 587 else
523 { 588 {
524#if CORO_PREFER_PERL_FUNCTIONS 589#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 590 /* this is probably cleaner? but also slower! */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 598#endif
534 } 599 }
535} 600}
536 601
537static void 602ECB_INLINE void
538put_padlist (pTHX_ CV *cv) 603put_padlist (pTHX_ CV *cv)
539{ 604{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av; 606 AV *av;
542 607
543 if (expect_false (!mg)) 608 if (ecb_expect_false (!mg))
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
545 610
546 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
547 612
548 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
550 615
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 617}
553 618
554/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
555 671
556static void 672static void
557on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
558 674
559static void 675static void
… …
578 dSP; 694 dSP;
579 695
580 CV *cv; 696 CV *cv;
581 697
582 /* now do the ugly restore mess */ 698 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 699 while (ecb_expect_true (cv = (CV *)POPs))
584 { 700 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 701 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 702 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 703 CvPADLIST (cv) = (AV *)POPs;
588 } 704 }
… …
591 } 707 }
592 708
593 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 710 CORO_THROW = c->except;
595 711
596 if (expect_false (enable_times)) 712 if (ecb_expect_false (enable_times))
597 { 713 {
598 if (expect_false (!times_valid)) 714 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 715 coro_times_update ();
600 716
601 coro_times_sub (c); 717 coro_times_sub (c);
602 } 718 }
603 719
604 if (expect_false (c->on_enter)) 720 if (ecb_expect_false (c->on_enter))
605 { 721 {
606 int i; 722 int i;
607 723
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 726 }
727
728 SWAP_SVS (c);
611} 729}
612 730
613static void 731static void
614save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
615{ 733{
734 SWAP_SVS (c);
735
616 if (expect_false (c->on_leave)) 736 if (ecb_expect_false (c->on_leave))
617 { 737 {
618 int i; 738 int i;
619 739
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 742 }
623 743
624 times_valid = 0; 744 times_valid = 0;
625 745
626 if (expect_false (enable_times)) 746 if (ecb_expect_false (enable_times))
627 { 747 {
628 coro_times_update (); times_valid = 1; 748 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 749 coro_times_add (c);
630 } 750 }
631 751
… …
645 765
646 XPUSHs (Nullsv); 766 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 767 /* this loop was inspired by pp_caller */
648 for (;;) 768 for (;;)
649 { 769 {
650 while (expect_true (cxix >= 0)) 770 while (ecb_expect_true (cxix >= 0))
651 { 771 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
653 773
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 774 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 775 {
656 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
657 777
658 if (expect_true (CvDEPTH (cv))) 778 if (ecb_expect_true (CvDEPTH (cv)))
659 { 779 {
660 EXTEND (SP, 3); 780 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 786 get_padlist (aTHX_ cv);
667 } 787 }
668 } 788 }
669 } 789 }
670 790
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 791 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 792 break;
673 793
674 top_si = top_si->si_prev; 794 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 795 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 796 cxix = top_si->si_cxix;
… …
678 798
679 PUTBACK; 799 PUTBACK;
680 } 800 }
681 801
682 /* allocate some space on the context stack for our purposes */ 802 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 803 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 { 804 {
688 unsigned int i; 805 unsigned int i;
806
689 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 808 CXINC;
691 } 809
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
811 }
693 812
694 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
695 814
696 { 815 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
718# define coro_init_stacks(thx) init_stacks () 837# define coro_init_stacks(thx) init_stacks ()
719#else 838#else
720static void 839static void
721coro_init_stacks (pTHX) 840coro_init_stacks (pTHX)
722{ 841{
723 PL_curstackinfo = new_stackinfo(32, 8); 842 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; 843 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 844 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 846
728 PL_stack_base = AvARRAY(PL_curstack); 847 PL_stack_base = AvARRAY(PL_curstack);
… …
835#endif 954#endif
836 955
837/* 956/*
838 * This overrides the default magic get method of %SIG elements. 957 * 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 958 * 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 959 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 960 * we just provide our own readback here.
842 */ 961 */
843static int 962static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 964{
846 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
847 966
848 if (*s == '_') 967 if (*s == '_')
… …
860 } 979 }
861 980
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 982}
864 983
865static int 984static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 986{
868 const char *s = MgPV_nolen_const (mg); 987 const char *s = MgPV_nolen_const (mg);
869 988
870 if (*s == '_') 989 if (*s == '_')
… …
884 } 1003 }
885 1004
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1006}
888 1007
889static int 1008static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1010{
892 const char *s = MgPV_nolen_const (mg); 1011 const char *s = MgPV_nolen_const (mg);
893 1012
894 if (*s == '_') 1013 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1047{
929 return 1; 1048 return 1;
930} 1049}
931 1050
932static UNOP coro_setup_op; 1051static UNOP init_perl_op;
933 1052
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
936{ 1055{
937 /* 1056 /*
938 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
939 */ 1058 */
940 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1068 PL_curpm = 0;
950 PL_curpad = 0; 1069 PL_curpad = 0;
951 PL_localizing = 0; 1070 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1071 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1073 PL_parser = 0;
956#endif 1074#endif
957 PL_hints = 0; 1075 PL_hints = 0;
958 1076
959 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1080
963 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1084 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 1105 /* 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. 1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1107 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 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 */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1110 slf_frame.destroy = 0;
992 1111
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* 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; 1113 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
998 1117
999 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
1000 1119
1001 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1003 1122
1123 SWAP_SVS (coro);
1124
1004 if (expect_false (enable_times)) 1125 if (ecb_expect_false (enable_times))
1005 { 1126 {
1006 coro_times_update (); 1127 coro_times_update ();
1007 coro_times_sub (coro); 1128 coro_times_sub (coro);
1008 } 1129 }
1009} 1130}
… …
1028 dounwind (-1); 1149 dounwind (-1);
1029 } 1150 }
1030} 1151}
1031 1152
1032static void 1153static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1034{ 1155{
1035 SV *svf [9]; 1156 SV *svf [9];
1036 1157
1037 { 1158 {
1159 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1160 struct coro *current = SvSTATE (old_current);
1039 1161
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1163
1042 save_perl (aTHX_ current); 1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1043 load_perl (aTHX_ coro); 1169 load_perl (aTHX_ coro);
1044 1170
1045 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1172
1173 /* restore swapped sv's */
1174 SWAP_SVS (coro);
1175
1046 coro_destruct_stacks (aTHX); 1176 coro_destruct_stacks (aTHX);
1047 1177
1048 // now save some sv's to be free'd later 1178 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv); 1179 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1180 svf [1] = (SV *)GvAV (PL_defgv);
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1185 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1186 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1187 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1188 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1189
1190 SvRV_set (coro_current, old_current);
1191
1060 load_perl (aTHX_ current); 1192 load_perl (aTHX_ current);
1061 } 1193 }
1062 1194
1063 { 1195 {
1064 unsigned int i; 1196 unsigned int i;
… …
1071 SvREFCNT_dec (coro->invoke_cb); 1203 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1204 SvREFCNT_dec (coro->invoke_av);
1073 } 1205 }
1074} 1206}
1075 1207
1076INLINE void 1208ECB_INLINE void
1077free_coro_mortal (pTHX) 1209free_coro_mortal (pTHX)
1078{ 1210{
1079 if (expect_true (coro_mortal)) 1211 if (ecb_expect_true (coro_mortal))
1080 { 1212 {
1081 SvREFCNT_dec (coro_mortal); 1213 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1214 coro_mortal = 0;
1083 } 1215 }
1084} 1216}
1085 1217
1086static int 1218static int
… …
1219 1351
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1352 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1353}
1222 1354
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1355/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1356static void ecb_noinline
1225cctx_prepare (pTHX) 1357cctx_prepare (pTHX)
1226{ 1358{
1227 PL_top_env = &PL_start_env; 1359 PL_top_env = &PL_start_env;
1228 1360
1229 if (cctx_current->flags & CC_TRACE) 1361 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1372 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1373 slf_frame.check = slf_check_set_stacklevel;
1242} 1374}
1243 1375
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1376/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1377ECB_INLINE void
1246transfer_tail (pTHX) 1378transfer_tail (pTHX)
1247{ 1379{
1248 free_coro_mortal (aTHX); 1380 free_coro_mortal (aTHX);
1249} 1381}
1250 1382
… …
1373cctx_destroy (coro_cctx *cctx) 1505cctx_destroy (coro_cctx *cctx)
1374{ 1506{
1375 if (!cctx) 1507 if (!cctx)
1376 return; 1508 return;
1377 1509
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1511
1380 --cctx_count; 1512 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1513 coro_destroy (&cctx->cctx);
1382 1514
1383 /* coro_transfer creates new, empty cctx's */ 1515 /* coro_transfer creates new, empty cctx's */
… …
1402#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1534#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1403 1535
1404static coro_cctx * 1536static coro_cctx *
1405cctx_get (pTHX) 1537cctx_get (pTHX)
1406{ 1538{
1407 while (expect_true (cctx_first)) 1539 while (ecb_expect_true (cctx_first))
1408 { 1540 {
1409 coro_cctx *cctx = cctx_first; 1541 coro_cctx *cctx = cctx_first;
1410 cctx_first = cctx->next; 1542 cctx_first = cctx->next;
1411 --cctx_idle; 1543 --cctx_idle;
1412 1544
1413 if (expect_true (!CCTX_EXPIRED (cctx))) 1545 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1414 return cctx; 1546 return cctx;
1415 1547
1416 cctx_destroy (cctx); 1548 cctx_destroy (cctx);
1417 } 1549 }
1418 1550
… …
1423cctx_put (coro_cctx *cctx) 1555cctx_put (coro_cctx *cctx)
1424{ 1556{
1425 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1557 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1426 1558
1427 /* free another cctx if overlimit */ 1559 /* free another cctx if overlimit */
1428 if (expect_false (cctx_idle >= cctx_max_idle)) 1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1429 { 1561 {
1430 coro_cctx *first = cctx_first; 1562 coro_cctx *first = cctx_first;
1431 cctx_first = first->next; 1563 cctx_first = first->next;
1432 --cctx_idle; 1564 --cctx_idle;
1433 1565
… …
1444static void 1576static void
1445transfer_check (pTHX_ struct coro *prev, struct coro *next) 1577transfer_check (pTHX_ struct coro *prev, struct coro *next)
1446{ 1578{
1447 /* TODO: throwing up here is considered harmful */ 1579 /* TODO: throwing up here is considered harmful */
1448 1580
1449 if (expect_true (prev != next)) 1581 if (ecb_expect_true (prev != next))
1450 { 1582 {
1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1583 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1584 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1453 1585
1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1586 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1587 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1456 1588
1457#if !PERL_VERSION_ATLEAST (5,10,0) 1589#if !PERL_VERSION_ATLEAST (5,10,0)
1458 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1590 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1591 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1460#endif 1592#endif
1461 } 1593 }
1462} 1594}
1463 1595
1464/* always use the TRANSFER macro */ 1596/* always use the TRANSFER macro */
1465static void NOINLINE /* noinline so we have a fixed stackframe */ 1597static void ecb_noinline /* noinline so we have a fixed stackframe */
1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1598transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1467{ 1599{
1468 dSTACKLEVEL; 1600 dSTACKLEVEL;
1469 1601
1470 /* sometimes transfer is only called to set idle_sp */ 1602 /* sometimes transfer is only called to set idle_sp */
1471 if (expect_false (!prev)) 1603 if (ecb_expect_false (!prev))
1472 { 1604 {
1473 cctx_current->idle_sp = STACKLEVEL; 1605 cctx_current->idle_sp = STACKLEVEL;
1474 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1606 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1475 } 1607 }
1476 else if (expect_true (prev != next)) 1608 else if (ecb_expect_true (prev != next))
1477 { 1609 {
1478 coro_cctx *cctx_prev; 1610 coro_cctx *cctx_prev;
1479 1611
1480 if (expect_false (prev->flags & CF_NEW)) 1612 if (ecb_expect_false (prev->flags & CF_NEW))
1481 { 1613 {
1482 /* create a new empty/source context */ 1614 /* create a new empty/source context */
1483 prev->flags &= ~CF_NEW; 1615 prev->flags &= ~CF_NEW;
1484 prev->flags |= CF_RUNNING; 1616 prev->flags |= CF_RUNNING;
1485 } 1617 }
… …
1488 next->flags |= CF_RUNNING; 1620 next->flags |= CF_RUNNING;
1489 1621
1490 /* first get rid of the old state */ 1622 /* first get rid of the old state */
1491 save_perl (aTHX_ prev); 1623 save_perl (aTHX_ prev);
1492 1624
1493 if (expect_false (next->flags & CF_NEW)) 1625 if (ecb_expect_false (next->flags & CF_NEW))
1494 { 1626 {
1495 /* need to start coroutine */ 1627 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1628 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1629 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1630 init_perl (aTHX_ next);
1499 } 1631 }
1500 else 1632 else
1501 load_perl (aTHX_ next); 1633 load_perl (aTHX_ next);
1502 1634
1503 /* possibly untie and reuse the cctx */ 1635 /* possibly untie and reuse the cctx */
1504 if (expect_true ( 1636 if (ecb_expect_true (
1505 cctx_current->idle_sp == STACKLEVEL 1637 cctx_current->idle_sp == STACKLEVEL
1506 && !(cctx_current->flags & CC_TRACE) 1638 && !(cctx_current->flags & CC_TRACE)
1507 && !force_cctx 1639 && !force_cctx
1508 )) 1640 ))
1509 { 1641 {
1510 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1642 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1511 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1643 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1512 1644
1513 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1645 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1514 /* without this the next cctx_get might destroy the running cctx while still in use */ 1646 /* without this the next cctx_get might destroy the running cctx while still in use */
1515 if (expect_false (CCTX_EXPIRED (cctx_current))) 1647 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1516 if (expect_true (!next->cctx)) 1648 if (ecb_expect_true (!next->cctx))
1517 next->cctx = cctx_get (aTHX); 1649 next->cctx = cctx_get (aTHX);
1518 1650
1519 cctx_put (cctx_current); 1651 cctx_put (cctx_current);
1520 } 1652 }
1521 else 1653 else
1522 prev->cctx = cctx_current; 1654 prev->cctx = cctx_current;
1523 1655
1524 ++next->usecount; 1656 ++next->usecount;
1525 1657
1526 cctx_prev = cctx_current; 1658 cctx_prev = cctx_current;
1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1659 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1528 1660
1529 next->cctx = 0; 1661 next->cctx = 0;
1530 1662
1531 if (expect_false (cctx_prev != cctx_current)) 1663 if (ecb_expect_false (cctx_prev != cctx_current))
1532 { 1664 {
1533 cctx_prev->top_env = PL_top_env; 1665 cctx_prev->top_env = PL_top_env;
1534 PL_top_env = cctx_current->top_env; 1666 PL_top_env = cctx_current->top_env;
1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1667 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1536 } 1668 }
… …
1542#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1674#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1543#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1675#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1676
1545/** high level stuff ********************************************************/ 1677/** high level stuff ********************************************************/
1546 1678
1679/* this function is actually Coro, not Coro::State, but we call it from here */
1680/* because it is convenient - but it hasn't been declared yet for that reason */
1547static int 1681static void
1682coro_call_on_destroy (pTHX_ struct coro *coro);
1683
1684static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1685coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1686{
1550 if (coro->flags & CF_DESTROYED) 1687 if (coro->flags & CF_ZOMBIE)
1551 return 0; 1688 return;
1552 1689
1553 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1690 slf_destroy (aTHX_ coro);
1555 1691
1556 coro->flags |= CF_DESTROYED; 1692 coro->flags |= CF_ZOMBIE;
1557 1693
1558 if (coro->flags & CF_READY) 1694 if (coro->flags & CF_READY)
1559 { 1695 {
1560 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1696 /* reduce nready, as destroying a ready coro effectively unreadies it */
1561 /* alternative: look through all ready queues and remove the coro */ 1697 /* alternative: look through all ready queues and remove the coro */
1562 --coro_nready; 1698 --coro_nready;
1563 } 1699 }
1564 else 1700 else
1565 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1701 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1702
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1566 1706
1567 if (coro->mainstack 1707 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1708 && coro->mainstack != main_mainstack
1569 && coro->slot 1709 && coro->slot
1570 && !PL_dirty) 1710 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1711 destroy_perl (aTHX_ coro);
1572 1712
1573 cctx_destroy (coro->cctx); 1713 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1714 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1715 SvREFCNT_dec (coro->args);
1716 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1717 SvREFCNT_dec (CORO_THROW);
1577 1718
1578 if (coro->next) coro->next->prev = coro->prev; 1719 coro_call_on_destroy (aTHX_ coro);
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581 1720
1582 return 1; 1721 /* more destruction mayhem in coro_state_free */
1583} 1722}
1584 1723
1585static int 1724static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1725coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1726{
1588 struct coro *coro = (struct coro *)mg->mg_ptr; 1727 struct coro *coro = (struct coro *)mg->mg_ptr;
1589 mg->mg_ptr = 0; 1728 mg->mg_ptr = 0;
1590 1729
1591 coro->hv = 0;
1592
1593 if (--coro->refcnt < 0)
1594 {
1595 coro_state_destroy (aTHX_ coro); 1730 coro_state_destroy (aTHX_ coro);
1731 SvREFCNT_dec (coro->on_destroy);
1732 SvREFCNT_dec (coro->status);
1733
1596 Safefree (coro); 1734 Safefree (coro);
1597 }
1598 1735
1599 return 0; 1736 return 0;
1600} 1737}
1601 1738
1602static int 1739static int ecb_cold
1603coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1740coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1604{ 1741{
1605 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 /* called when perl clones the current process the slow way (windows process emulation) */
1606 1743 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1607 ++coro->refcnt; 1744 mg->mg_ptr = 0;
1745 mg->mg_virtual = 0;
1608 1746
1609 return 0; 1747 return 0;
1610} 1748}
1611 1749
1612static MGVTBL coro_state_vtbl = { 1750static MGVTBL coro_state_vtbl = {
… …
1637 TRANSFER (ta, 1); 1775 TRANSFER (ta, 1);
1638} 1776}
1639 1777
1640/** Coro ********************************************************************/ 1778/** Coro ********************************************************************/
1641 1779
1642INLINE void 1780ECB_INLINE void
1643coro_enq (pTHX_ struct coro *coro) 1781coro_enq (pTHX_ struct coro *coro)
1644{ 1782{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1784
1647 SvREFCNT_inc_NN (coro->hv); 1785 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1787 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1789 ready [1] = coro;
1652} 1790}
1653 1791
1654INLINE struct coro * 1792ECB_INLINE struct coro *
1655coro_deq (pTHX) 1793coro_deq (pTHX)
1656{ 1794{
1657 int prio; 1795 int prio;
1658 1796
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1712{ 1850{
1713 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1851 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1714} 1852}
1715 1853
1716/* expects to own a reference to next->hv */ 1854/* expects to own a reference to next->hv */
1717INLINE void 1855ECB_INLINE void
1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1719{ 1857{
1720 SV *prev_sv = SvRV (coro_current); 1858 SV *prev_sv = SvRV (coro_current);
1721 1859
1722 ta->prev = SvSTATE_hv (prev_sv); 1860 ta->prev = SvSTATE_hv (prev_sv);
… …
1735{ 1873{
1736 for (;;) 1874 for (;;)
1737 { 1875 {
1738 struct coro *next = coro_deq (aTHX); 1876 struct coro *next = coro_deq (aTHX);
1739 1877
1740 if (expect_true (next)) 1878 if (ecb_expect_true (next))
1741 { 1879 {
1742 /* cannot transfer to destroyed coros, skip and look for next */ 1880 /* cannot transfer to destroyed coros, skip and look for next */
1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1881 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1882 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1745 else 1883 else
1746 { 1884 {
1747 next->flags &= ~CF_READY; 1885 next->flags &= ~CF_READY;
1748 --coro_nready; 1886 --coro_nready;
… …
1755 { 1893 {
1756 /* nothing to schedule: call the idle handler */ 1894 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1895 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1896 && SvOBJECT (SvRV (sv_idle)))
1759 { 1897 {
1898 if (SvRV (sv_idle) == SvRV (coro_current))
1899 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1900
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1901 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1902 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1903 --coro_nready;
1763 } 1904 }
1764 else 1905 else
1765 { 1906 {
1907 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1908 dSP;
1767 1909
1768 ENTER; 1910 ENTER;
1769 SAVETMPS; 1911 SAVETMPS;
1770 1912
… …
1777 } 1919 }
1778 } 1920 }
1779 } 1921 }
1780} 1922}
1781 1923
1782INLINE void 1924ECB_INLINE void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 1925prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 1926{
1785 api_ready (aTHX_ coro_current); 1927 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 1928 prepare_schedule (aTHX_ ta);
1787} 1929}
1788 1930
1789INLINE void 1931ECB_INLINE void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 1933{
1792 SV *prev = SvRV (coro_current); 1934 SV *prev = SvRV (coro_current);
1793 1935
1794 if (coro_nready) 1936 if (coro_nready)
… …
1824{ 1966{
1825 struct coro_transfer_args ta; 1967 struct coro_transfer_args ta;
1826 1968
1827 prepare_cede (aTHX_ &ta); 1969 prepare_cede (aTHX_ &ta);
1828 1970
1829 if (expect_true (ta.prev != ta.next)) 1971 if (ecb_expect_true (ta.prev != ta.next))
1830 { 1972 {
1831 TRANSFER (ta, 1); 1973 TRANSFER (ta, 1);
1832 return 1; 1974 return 1;
1833 } 1975 }
1834 else 1976 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2019 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2020 }
1879} 2021}
1880 2022
1881static void 2023static void
2024coro_push_av (pTHX_ AV *av, I32 gimme_v)
2025{
2026 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2027 {
2028 dSP;
2029
2030 if (gimme_v == G_SCALAR)
2031 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2032 else
2033 {
2034 int i;
2035 EXTEND (SP, AvFILLp (av) + 1);
2036
2037 for (i = 0; i <= AvFILLp (av); ++i)
2038 PUSHs (AvARRAY (av)[i]);
2039 }
2040
2041 PUTBACK;
2042 }
2043}
2044
2045static void
2046coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2047{
2048 if (!coro->on_destroy)
2049 coro->on_destroy = newAV ();
2050
2051 av_push (coro->on_destroy, cb);
2052}
2053
2054static void
2055slf_destroy_join (pTHX_ struct CoroSLF *frame)
2056{
2057 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2058}
2059
2060static int
2061slf_check_join (pTHX_ struct CoroSLF *frame)
2062{
2063 struct coro *coro = (struct coro *)frame->data;
2064
2065 if (!coro->status)
2066 return 1;
2067
2068 frame->destroy = 0;
2069
2070 coro_push_av (aTHX_ coro->status, GIMME_V);
2071
2072 SvREFCNT_dec ((SV *)coro->hv);
2073
2074 return 0;
2075}
2076
2077static void
2078slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2079{
2080 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2081
2082 if (items > 1)
2083 croak ("join called with too many arguments");
2084
2085 if (coro->status)
2086 frame->prepare = prepare_nop;
2087 else
2088 {
2089 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2090 frame->prepare = prepare_schedule;
2091 }
2092
2093 frame->check = slf_check_join;
2094 frame->destroy = slf_destroy_join;
2095 frame->data = (void *)coro;
2096 SvREFCNT_inc (coro->hv);
2097}
2098
2099static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2100coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2101{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2102 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2103
1887 if (on_destroyp) 2104 if (!od)
1888 { 2105 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2106
1891 while (AvFILLp (on_destroy) >= 0) 2107 while (AvFILLp (od) >= 0)
2108 {
2109 SV *cb = sv_2mortal (av_pop (od));
2110
2111 /* coro hv's (and only hv's at the moment) are supported as well */
2112 if (SvSTATEhv_p (aTHX_ cb))
2113 api_ready (aTHX_ cb);
2114 else
1892 { 2115 {
1893 dSP; /* don't disturb outer sp */ 2116 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2117 PUSHMARK (SP);
1897 2118
1898 if (statusp) 2119 if (coro->status)
1899 { 2120 {
1900 int i; 2121 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2122 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2123 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2124 }
1907 2125
1908 PUTBACK; 2126 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2127 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2128 }
1911 } 2129 }
1912} 2130}
1913 2131
1914static void 2132static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2134{
2135 AV *av;
2136
2137 if (coro->status)
2138 {
2139 av = coro->status;
2140 av_clear (av);
2141 }
2142 else
2143 av = coro->status = newAV ();
2144
2145 /* items are actually not so common, so optimise for this case */
2146 if (items)
2147 {
1917 int i; 2148 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV ();
1920 2149
1921 av_extend (av, items - 1); 2150 av_extend (av, items - 1);
2151
1922 for (i = 0; i < items; ++i) 2152 for (i = 0; i < items; ++i)
1923 av_push (av, SvREFCNT_inc_NN (arg [i])); 2153 av_push (av, SvREFCNT_inc_NN (arg [i]));
2154 }
2155}
1924 2156
1925 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2157static void
1926 2158slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2159{
1927 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2160 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1928 api_ready (aTHX_ sv_manager); 2161 api_ready (aTHX_ sv_manager);
1929 2162
1930 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
1931 frame->check = slf_check_repeat; 2164 frame->check = slf_check_repeat;
1932 2165
1933 /* as a minor optimisation, we could unwind all stacks here */ 2166 /* as a minor optimisation, we could unwind all stacks here */
1934 /* but that puts extra pressure on pp_slf, and is not worth much */ 2167 /* but that puts extra pressure on pp_slf, and is not worth much */
1935 /*coro_unwind_stacks (aTHX);*/ 2168 /*coro_unwind_stacks (aTHX);*/
2169}
2170
2171static void
2172slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2173{
2174 HV *coro_hv = (HV *)SvRV (coro_current);
2175
2176 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2177 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2178}
2179
2180static void
2181slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{
2183 HV *coro_hv;
2184 struct coro *coro;
2185
2186 if (items <= 0)
2187 croak ("Coro::cancel called without coro object,");
2188
2189 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv;
2191
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 {
2196 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro;
2198
2199 frame->prepare = prepare_nop;
2200 frame->check = slf_check_nop;
2201 }
2202 else if (coro_hv == (HV *)SvRV (coro_current))
2203 {
2204 /* cancelling the current coro is allowed, and equals terminate */
2205 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2206 }
2207 else
2208 {
2209 struct coro *self = SvSTATE_current;
2210
2211 /* otherwise we cancel directly, purely for speed reasons
2212 * unfortunately, this requires some magic trickery, as
2213 * somebody else could cancel us, so we have to fight the cancellation.
2214 * this is ugly, and hopefully fully worth the extra speed.
2215 * besides, I can't get the slow-but-safe version working...
2216 */
2217 slf_frame.data = 0;
2218 self->flags |= CF_NOCANCEL;
2219 coro_state_destroy (aTHX_ coro);
2220 self->flags &= ~CF_NOCANCEL;
2221
2222 if (slf_frame.data)
2223 {
2224 /* while we were busy we have been cancelled, so terminate */
2225 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2226 }
2227 else
2228 {
2229 frame->prepare = prepare_nop;
2230 frame->check = slf_check_nop;
2231 }
2232 }
2233}
2234
2235static int
2236slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2237{
2238 frame->prepare = 0;
2239 coro_unwind_stacks (aTHX);
2240
2241 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2242
2243 return 1;
2244}
2245
2246static int
2247safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2248{
2249 if (coro->cctx)
2250 croak ("coro inside C callback, unable to cancel at this time, caught");
2251
2252 if (coro->flags & CF_NEW)
2253 {
2254 coro_set_status (aTHX_ coro, arg, items);
2255 coro_state_destroy (aTHX_ coro);
2256 }
2257 else
2258 {
2259 if (!coro->slf_frame.prepare)
2260 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2261
2262 slf_destroy (aTHX_ coro);
2263
2264 coro_set_status (aTHX_ coro, arg, items);
2265 coro->slf_frame.prepare = prepare_nop;
2266 coro->slf_frame.check = slf_check_safe_cancel;
2267
2268 api_ready (aTHX_ (SV *)coro->hv);
2269 }
2270
2271 return 1;
1936} 2272}
1937 2273
1938/*****************************************************************************/ 2274/*****************************************************************************/
1939/* async pool handler */ 2275/* async pool handler */
1940 2276
… …
1971slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2307slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1972{ 2308{
1973 HV *hv = (HV *)SvRV (coro_current); 2309 HV *hv = (HV *)SvRV (coro_current);
1974 struct coro *coro = SvSTATE_hv ((SV *)hv); 2310 struct coro *coro = SvSTATE_hv ((SV *)hv);
1975 2311
1976 if (expect_true (coro->saved_deffh)) 2312 if (ecb_expect_true (coro->saved_deffh))
1977 { 2313 {
1978 /* subsequent iteration */ 2314 /* subsequent iteration */
1979 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2315 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1980 coro->saved_deffh = 0; 2316 coro->saved_deffh = 0;
1981 2317
1982 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2318 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1983 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2319 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1984 { 2320 {
1985 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2321 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1986 coro->invoke_av = newAV (); 2322 return;
1987
1988 frame->prepare = prepare_nop;
1989 } 2323 }
1990 else 2324 else
1991 { 2325 {
1992 av_clear (GvAV (PL_defgv)); 2326 av_clear (GvAV (PL_defgv));
1993 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2327 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2216static void 2550static void
2217slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2551slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{ 2552{
2219 frame->prepare = prepare_cede_notself; 2553 frame->prepare = prepare_cede_notself;
2220 frame->check = slf_check_nop; 2554 frame->check = slf_check_nop;
2555}
2556
2557/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2558static void
2559slf_destroy (pTHX_ struct coro *coro)
2560{
2561 /* this callback is reserved for slf functions needing to do cleanup */
2562 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2563 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2564
2565 /*
2566 * The on_destroy above most likely is from an SLF call.
2567 * Since by definition the SLF call will not finish when we destroy
2568 * the coro, we will have to force-finish it here, otherwise
2569 * cleanup functions cannot call SLF functions.
2570 */
2571 coro->slf_frame.prepare = 0;
2221} 2572}
2222 2573
2223/* 2574/*
2224 * these not obviously related functions are all rolled into one 2575 * these not obviously related functions are all rolled into one
2225 * function to increase chances that they all will call transfer with the same 2576 * function to increase chances that they all will call transfer with the same
… …
2232 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2583 I32 checkmark; /* mark SP to see how many elements check has pushed */
2233 2584
2234 /* set up the slf frame, unless it has already been set-up */ 2585 /* set up the slf frame, unless it has already been set-up */
2235 /* the latter happens when a new coro has been started */ 2586 /* the latter happens when a new coro has been started */
2236 /* or when a new cctx was attached to an existing coroutine */ 2587 /* or when a new cctx was attached to an existing coroutine */
2237 if (expect_true (!slf_frame.prepare)) 2588 if (ecb_expect_true (!slf_frame.prepare))
2238 { 2589 {
2239 /* first iteration */ 2590 /* first iteration */
2240 dSP; 2591 dSP;
2241 SV **arg = PL_stack_base + TOPMARK + 1; 2592 SV **arg = PL_stack_base + TOPMARK + 1;
2242 int items = SP - arg; /* args without function object */ 2593 int items = SP - arg; /* args without function object */
… …
2283 while (slf_frame.check (aTHX_ &slf_frame)); 2634 while (slf_frame.check (aTHX_ &slf_frame));
2284 2635
2285 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2636 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2286 2637
2287 /* exception handling */ 2638 /* exception handling */
2288 if (expect_false (CORO_THROW)) 2639 if (ecb_expect_false (CORO_THROW))
2289 { 2640 {
2290 SV *exception = sv_2mortal (CORO_THROW); 2641 SV *exception = sv_2mortal (CORO_THROW);
2291 2642
2292 CORO_THROW = 0; 2643 CORO_THROW = 0;
2293 sv_setsv (ERRSV, exception); 2644 sv_setsv (ERRSV, exception);
2294 croak (0); 2645 croak (0);
2295 } 2646 }
2296 2647
2297 /* return value handling - mostly like entersub */ 2648 /* return value handling - mostly like entersub */
2298 /* make sure we put something on the stack in scalar context */ 2649 /* make sure we put something on the stack in scalar context */
2299 if (GIMME_V == G_SCALAR) 2650 if (GIMME_V == G_SCALAR
2651 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2300 { 2652 {
2301 dSP; 2653 dSP;
2302 SV **bot = PL_stack_base + checkmark; 2654 SV **bot = PL_stack_base + checkmark;
2303 2655
2304 if (sp == bot) /* too few, push undef */ 2656 if (sp == bot) /* too few, push undef */
2305 bot [1] = &PL_sv_undef; 2657 bot [1] = &PL_sv_undef;
2306 else if (sp != bot + 1) /* too many, take last one */ 2658 else /* too many, take last one */
2307 bot [1] = *sp; 2659 bot [1] = *sp;
2308 2660
2309 SP = bot + 1; 2661 SP = bot + 1;
2310 2662
2311 PUTBACK; 2663 PUTBACK;
… …
2344 if (PL_op->op_flags & OPf_STACKED) 2696 if (PL_op->op_flags & OPf_STACKED)
2345 { 2697 {
2346 if (items > slf_arga) 2698 if (items > slf_arga)
2347 { 2699 {
2348 slf_arga = items; 2700 slf_arga = items;
2349 free (slf_argv); 2701 Safefree (slf_argv);
2350 slf_argv = malloc (slf_arga * sizeof (SV *)); 2702 New (0, slf_argv, slf_arga, SV *);
2351 } 2703 }
2352 2704
2353 slf_argc = items; 2705 slf_argc = items;
2354 2706
2355 for (i = 0; i < items; ++i) 2707 for (i = 0; i < items; ++i)
… …
2418{ 2770{
2419 PerlIOBuf base; 2771 PerlIOBuf base;
2420 NV next, every; 2772 NV next, every;
2421} PerlIOCede; 2773} PerlIOCede;
2422 2774
2423static IV 2775static IV ecb_cold
2424PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2776PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2425{ 2777{
2426 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2778 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2427 2779
2428 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2780 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2429 self->next = nvtime () + self->every; 2781 self->next = nvtime () + self->every;
2430 2782
2431 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2783 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2432} 2784}
2433 2785
2434static SV * 2786static SV * ecb_cold
2435PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2787PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2436{ 2788{
2437 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2438 2790
2439 return newSVnv (self->every); 2791 return newSVnv (self->every);
… …
2551 SvREFCNT_dec (cb); 2903 SvREFCNT_dec (cb);
2552 } 2904 }
2553} 2905}
2554 2906
2555static void 2907static void
2556coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2557{ 2909{
2558 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2910 /* call $sem->adjust (0) to possibly wake up some other waiters */
2559 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2911 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2560} 2912}
2561 2913
2562static int 2914static int
2563slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2915slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2564{ 2916{
2565 AV *av = (AV *)frame->data; 2917 AV *av = (AV *)frame->data;
2566 SV *count_sv = AvARRAY (av)[0]; 2918 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current);
2567 2920
2568 /* if we are about to throw, don't actually acquire the lock, just throw */ 2921 /* if we are about to throw, don't actually acquire the lock, just throw */
2569 if (CORO_THROW) 2922 if (CORO_THROW)
2570 return 0; 2923 return 0;
2571 else if (SvIVX (count_sv) > 0) 2924 else if (SvIVX (count_sv) > 0)
2572 { 2925 {
2573 SvSTATE_current->on_destroy = 0; 2926 frame->destroy = 0;
2574 2927
2575 if (acquire) 2928 if (acquire)
2576 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2929 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2577 else 2930 else
2578 coro_semaphore_adjust (aTHX_ av, 0); 2931 coro_semaphore_adjust (aTHX_ av, 0);
… …
2583 { 2936 {
2584 int i; 2937 int i;
2585 /* if we were woken up but can't down, we look through the whole */ 2938 /* if we were woken up but can't down, we look through the whole */
2586 /* waiters list and only add us if we aren't in there already */ 2939 /* waiters list and only add us if we aren't in there already */
2587 /* this avoids some degenerate memory usage cases */ 2940 /* this avoids some degenerate memory usage cases */
2588 2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2589 for (i = 1; i <= AvFILLp (av); ++i)
2590 if (AvARRAY (av)[i] == SvRV (coro_current)) 2942 if (AvARRAY (av)[i] == coro_hv)
2591 return 1; 2943 return 1;
2592 2944
2593 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2945 av_push (av, SvREFCNT_inc (coro_hv));
2594 return 1; 2946 return 1;
2595 } 2947 }
2596} 2948}
2597 2949
2598static int 2950static int
… …
2621 { 2973 {
2622 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2974 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2623 2975
2624 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2976 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2625 frame->prepare = prepare_schedule; 2977 frame->prepare = prepare_schedule;
2626
2627 /* to avoid race conditions when a woken-up coro gets terminated */ 2978 /* to avoid race conditions when a woken-up coro gets terminated */
2628 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2979 /* we arrange for a temporary on_destroy that calls adjust (0) */
2629 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2980 frame->destroy = coro_semaphore_destroy;
2630 } 2981 }
2631} 2982}
2632 2983
2633static void 2984static void
2634slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2985slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2716 { 3067 {
2717 SV *cb_cv = s_get_cv_croak (arg [1]); 3068 SV *cb_cv = s_get_cv_croak (arg [1]);
2718 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3069 av_push (av, SvREFCNT_inc_NN (cb_cv));
2719 3070
2720 if (SvIVX (AvARRAY (av)[0])) 3071 if (SvIVX (AvARRAY (av)[0]))
2721 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3072 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2722 3073
2723 frame->prepare = prepare_nop; 3074 frame->prepare = prepare_nop;
2724 frame->check = slf_check_nop; 3075 frame->check = slf_check_nop;
2725 } 3076 }
2726 else if (SvIVX (AvARRAY (av)[0])) 3077 else if (SvIVX (AvARRAY (av)[0]))
… …
2852 dSP; 3203 dSP;
2853 3204
2854 static SV *prio_cv; 3205 static SV *prio_cv;
2855 static SV *prio_sv; 3206 static SV *prio_sv;
2856 3207
2857 if (expect_false (!prio_cv)) 3208 if (ecb_expect_false (!prio_cv))
2858 { 3209 {
2859 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3210 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2860 prio_sv = newSViv (0); 3211 prio_sv = newSViv (0);
2861 } 3212 }
2862 3213
… …
2888 /* now call the AIO function - we assume our request is uncancelable */ 3239 /* now call the AIO function - we assume our request is uncancelable */
2889 PUTBACK; 3240 PUTBACK;
2890 call_sv ((SV *)req, G_VOID | G_DISCARD); 3241 call_sv ((SV *)req, G_VOID | G_DISCARD);
2891 } 3242 }
2892 3243
2893 /* now that the requets is going, we loop toll we have a result */ 3244 /* now that the request is going, we loop till we have a result */
2894 frame->data = (void *)state; 3245 frame->data = (void *)state;
2895 frame->prepare = prepare_schedule; 3246 frame->prepare = prepare_schedule;
2896 frame->check = slf_check_aio_req; 3247 frame->check = slf_check_aio_req;
2897} 3248}
2898 3249
… …
2908 3259
2909/*****************************************************************************/ 3260/*****************************************************************************/
2910 3261
2911#if CORO_CLONE 3262#if CORO_CLONE
2912# include "clone.c" 3263# include "clone.c"
3264#endif
3265
3266/*****************************************************************************/
3267
3268static SV *
3269coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3270{
3271 SV *coro_sv;
3272 struct coro *coro;
3273 MAGIC *mg;
3274 HV *hv;
3275 SV *cb;
3276 int i;
3277
3278 if (argc > 0)
3279 {
3280 cb = s_get_cv_croak (argv [0]);
3281
3282 if (!is_coro)
3283 {
3284 if (CvISXSUB (cb))
3285 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3286
3287 if (!CvROOT (cb))
3288 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3289 }
3290 }
3291
3292 Newz (0, coro, 1, struct coro);
3293 coro->args = newAV ();
3294 coro->flags = CF_NEW;
3295
3296 if (coro_first) coro_first->prev = coro;
3297 coro->next = coro_first;
3298 coro_first = coro;
3299
3300 coro->hv = hv = newHV ();
3301 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3302 mg->mg_flags |= MGf_DUP;
3303 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3304
3305 if (argc > 0)
3306 {
3307 av_extend (coro->args, argc + is_coro - 1);
3308
3309 if (is_coro)
3310 {
3311 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3312 cb = (SV *)cv_coro_run;
3313 }
3314
3315 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3316
3317 for (i = 1; i < argc; i++)
3318 av_push (coro->args, newSVsv (argv [i]));
3319 }
3320
3321 return coro_sv;
3322}
3323
3324#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State);
2913#endif 3326#endif
2914 3327
2915MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2916 3329
2917PROTOTYPES: DISABLE 3330PROTOTYPES: DISABLE
… …
2971 coroapi.prepare_nop = prepare_nop; 3384 coroapi.prepare_nop = prepare_nop;
2972 coroapi.prepare_schedule = prepare_schedule; 3385 coroapi.prepare_schedule = prepare_schedule;
2973 coroapi.prepare_cede = prepare_cede; 3386 coroapi.prepare_cede = prepare_cede;
2974 coroapi.prepare_cede_notself = prepare_cede_notself; 3387 coroapi.prepare_cede_notself = prepare_cede_notself;
2975 3388
2976 { 3389 time_init (aTHX);
2977 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2978
2979 if (!svp) croak ("Time::HiRes is required");
2980 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2981
2982 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2983
2984 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2985 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2986 }
2987 3390
2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2989} 3392}
2990 3393
2991SV * 3394SV *
2992new (char *klass, ...) 3395new (SV *klass, ...)
2993 ALIAS: 3396 ALIAS:
2994 Coro::new = 1 3397 Coro::new = 1
2995 CODE: 3398 CODE:
2996{ 3399 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2997 struct coro *coro; 3400 OUTPUT:
2998 MAGIC *mg;
2999 HV *hv;
3000 SV *cb;
3001 int i;
3002
3003 if (items > 1)
3004 {
3005 cb = s_get_cv_croak (ST (1));
3006
3007 if (!ix)
3008 {
3009 if (CvISXSUB (cb))
3010 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3011
3012 if (!CvROOT (cb))
3013 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3014 }
3015 }
3016
3017 Newz (0, coro, 1, struct coro);
3018 coro->args = newAV ();
3019 coro->flags = CF_NEW;
3020
3021 if (coro_first) coro_first->prev = coro;
3022 coro->next = coro_first;
3023 coro_first = coro;
3024
3025 coro->hv = hv = newHV ();
3026 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3027 mg->mg_flags |= MGf_DUP;
3028 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3029
3030 if (items > 1)
3031 {
3032 av_extend (coro->args, items - 1 + ix - 1);
3033
3034 if (ix)
3035 {
3036 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3037 cb = (SV *)cv_coro_run;
3038 }
3039
3040 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3041
3042 for (i = 2; i < items; i++)
3043 av_push (coro->args, newSVsv (ST (i)));
3044 }
3045}
3046 OUTPUT:
3047 RETVAL 3401 RETVAL
3048 3402
3049void 3403void
3050transfer (...) 3404transfer (...)
3051 PROTOTYPE: $$ 3405 PROTOTYPE: $$
3052 CODE: 3406 CODE:
3053 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3407 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3054
3055bool
3056_destroy (SV *coro_sv)
3057 CODE:
3058 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3059 OUTPUT:
3060 RETVAL
3061 3408
3062void 3409void
3063_exit (int code) 3410_exit (int code)
3064 PROTOTYPE: $ 3411 PROTOTYPE: $
3065 CODE: 3412 CODE:
… …
3141 CODE: 3488 CODE:
3142{ 3489{
3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3490 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3144 { 3491 {
3145 struct coro *current = SvSTATE_current; 3492 struct coro *current = SvSTATE_current;
3493 struct CoroSLF slf_save;
3146 3494
3147 if (current != coro) 3495 if (current != coro)
3148 { 3496 {
3149 PUTBACK; 3497 PUTBACK;
3150 save_perl (aTHX_ current); 3498 save_perl (aTHX_ current);
3151 load_perl (aTHX_ coro); 3499 load_perl (aTHX_ coro);
3500 /* the coro is most likely in an active SLF call.
3501 * while not strictly required (the code we execute is
3502 * not allowed to call any SLF functions), it's cleaner
3503 * to reinitialise the slf_frame and restore it later.
3504 * This might one day allow us to actually do SLF calls
3505 * from code executed here.
3506 */
3507 slf_save = slf_frame;
3508 slf_frame.prepare = 0;
3152 SPAGAIN; 3509 SPAGAIN;
3153 } 3510 }
3154 3511
3155 PUSHSTACK; 3512 PUSHSTACK;
3156 3513
… …
3166 SPAGAIN; 3523 SPAGAIN;
3167 3524
3168 if (current != coro) 3525 if (current != coro)
3169 { 3526 {
3170 PUTBACK; 3527 PUTBACK;
3528 slf_frame = slf_save;
3171 save_perl (aTHX_ coro); 3529 save_perl (aTHX_ coro);
3172 load_perl (aTHX_ current); 3530 load_perl (aTHX_ current);
3173 SPAGAIN; 3531 SPAGAIN;
3174 } 3532 }
3175 } 3533 }
… …
3180 PROTOTYPE: $ 3538 PROTOTYPE: $
3181 ALIAS: 3539 ALIAS:
3182 is_ready = CF_READY 3540 is_ready = CF_READY
3183 is_running = CF_RUNNING 3541 is_running = CF_RUNNING
3184 is_new = CF_NEW 3542 is_new = CF_NEW
3185 is_destroyed = CF_DESTROYED 3543 is_destroyed = CF_ZOMBIE
3544 is_zombie = CF_ZOMBIE
3186 is_suspended = CF_SUSPENDED 3545 is_suspended = CF_SUSPENDED
3187 CODE: 3546 CODE:
3188 RETVAL = boolSV (coro->flags & ix); 3547 RETVAL = boolSV (coro->flags & ix);
3189 OUTPUT: 3548 OUTPUT:
3190 RETVAL 3549 RETVAL
3191 3550
3192void 3551void
3193throw (Coro::State self, SV *throw = &PL_sv_undef) 3552throw (Coro::State self, SV *exception = &PL_sv_undef)
3194 PROTOTYPE: $;$ 3553 PROTOTYPE: $;$
3195 CODE: 3554 CODE:
3196{ 3555{
3197 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
3198 SV **throwp = self == current ? &CORO_THROW : &self->except; 3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3199 SvREFCNT_dec (*throwp); 3558 SvREFCNT_dec (*exceptionp);
3200 SvGETMAGIC (throw); 3559 SvGETMAGIC (exception);
3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3202} 3561}
3203 3562
3204void 3563void
3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3206 PROTOTYPE: $;$ 3565 PROTOTYPE: $;$
… …
3261 3620
3262void 3621void
3263cancel (Coro::State self) 3622cancel (Coro::State self)
3264 CODE: 3623 CODE:
3265 coro_state_destroy (aTHX_ self); 3624 coro_state_destroy (aTHX_ self);
3266 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3267
3268 3625
3269SV * 3626SV *
3270enable_times (int enabled = enable_times) 3627enable_times (int enabled = enable_times)
3271 CODE: 3628 CODE:
3272{ 3629{
… …
3287times (Coro::State self) 3644times (Coro::State self)
3288 PPCODE: 3645 PPCODE:
3289{ 3646{
3290 struct coro *current = SvSTATE (coro_current); 3647 struct coro *current = SvSTATE (coro_current);
3291 3648
3292 if (expect_false (current == self)) 3649 if (ecb_expect_false (current == self))
3293 { 3650 {
3294 coro_times_update (); 3651 coro_times_update ();
3295 coro_times_add (SvSTATE (coro_current)); 3652 coro_times_add (SvSTATE (coro_current));
3296 } 3653 }
3297 3654
3298 EXTEND (SP, 2); 3655 EXTEND (SP, 2);
3299 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3656 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3300 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3657 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3301 3658
3302 if (expect_false (current == self)) 3659 if (ecb_expect_false (current == self))
3303 coro_times_sub (SvSTATE (coro_current)); 3660 coro_times_sub (SvSTATE (coro_current));
3304} 3661}
3662
3663void
3664swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3665 CODE:
3666{
3667 struct coro *current = SvSTATE_current;
3668
3669 if (current == coro)
3670 SWAP_SVS (current);
3671
3672 if (!coro->swap_sv)
3673 coro->swap_sv = newAV ();
3674
3675 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3676 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3677
3678 if (current == coro)
3679 SWAP_SVS (current);
3680}
3681
3305 3682
3306MODULE = Coro::State PACKAGE = Coro 3683MODULE = Coro::State PACKAGE = Coro
3307 3684
3308BOOT: 3685BOOT:
3309{ 3686{
3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3687 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3688 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3689 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3313 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3314 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3690 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3315 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3691 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3316 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3692 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3317 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3693 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3318 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3694 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3319 3695
3320 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3696 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3321 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3697 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3322 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3698 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3323 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3699 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3324 3700
3325 coro_stash = gv_stashpv ("Coro", TRUE); 3701 coro_stash = gv_stashpv ("Coro", TRUE);
3326 3702
3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3329 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3347 sv_setiv (sv, (IV)&coroapi); 3723 sv_setiv (sv, (IV)&coroapi);
3348 SvREADONLY_on (sv); 3724 SvREADONLY_on (sv);
3349 } 3725 }
3350} 3726}
3351 3727
3728SV *
3729async (...)
3730 PROTOTYPE: &@
3731 CODE:
3732 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3733 api_ready (aTHX_ RETVAL);
3734 OUTPUT:
3735 RETVAL
3736
3737void
3738_destroy (Coro::State coro)
3739 CODE:
3740 /* used by the manager thread */
3741 coro_state_destroy (aTHX_ coro);
3742
3743void
3744on_destroy (Coro::State coro, SV *cb)
3745 CODE:
3746 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3747
3748void
3749join (...)
3750 CODE:
3751 CORO_EXECUTE_SLF_XS (slf_init_join);
3752
3352void 3753void
3353terminate (...) 3754terminate (...)
3354 CODE: 3755 CODE:
3355 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3756 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3757
3758void
3759cancel (...)
3760 CODE:
3761 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3762
3763int
3764safe_cancel (Coro::State self, ...)
3765 C_ARGS: aTHX_ self, &ST (1), items - 1
3356 3766
3357void 3767void
3358schedule (...) 3768schedule (...)
3359 CODE: 3769 CODE:
3360 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3770 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3473 for (i = 1; i < items; ++i) 3883 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i))); 3884 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475 3885
3476 if ((SV *)hv == &PL_sv_undef) 3886 if ((SV *)hv == &PL_sv_undef)
3477 { 3887 {
3478 PUSHMARK (SP); 3888 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3479 EXTEND (SP, 2);
3480 PUSHs (sv_Coro);
3481 PUSHs ((SV *)cv_pool_handler);
3482 PUTBACK;
3483 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3484 SPAGAIN;
3485
3486 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3889 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3890 SvREFCNT_dec (sv);
3487 } 3891 }
3488 3892
3489 { 3893 {
3490 struct coro *coro = SvSTATE_hv (hv); 3894 struct coro *coro = SvSTATE_hv (hv);
3491 3895
… …
3763 { 4167 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4168 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0; 4169 coro_old_pp_sselect = 0;
3766 } 4170 }
3767 4171
3768

Diff Legend

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