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

Diff Legend

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