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.365 by root, Mon Jul 20 16:18:30 2009 UTC vs.
Revision 1.415 by root, Tue Aug 30 07:48:53 2011 UTC

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

Diff Legend

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