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.398 by root, Sat May 7 14:11:10 2011 UTC vs.
Revision 1.446 by root, Wed Sep 3 14:26:34 2014 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
22#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
24#endif 52#endif
25 53
26#if defined(_WIN32) 54#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 55# undef HAS_GETTIMEOFDAY
28# undef setjmp 56# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
32#else 60#else
33# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
34#endif 62#endif
35 63
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
65 66
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 69#endif
73 70
74/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
87#endif 84#endif
88 85
89#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
90 87
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 88#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
108 90
109#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
110# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
166static char times_valid; 148static char times_valid;
167 149
168static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
170 152
171enum { 153enum
154{
172 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 164typedef struct coro_cctx
182{ 165{
183 struct coro_cctx *next; 166 struct coro_cctx *next;
184 167
185 /* the stack */ 168 /* the stack */
186 void *sptr; 169 struct coro_stack stack;
187 size_t ssize;
188 170
189 /* cpu state */ 171 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
192 JMPENV *top_env; 176 JMPENV *top_env;
193 coro_context cctx; 177 coro_context cctx;
194 178
195 U32 gen; 179 U32 gen;
196#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
… …
201 185
202static coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
203 187
204/*****************************************************************************/ 188/*****************************************************************************/
205 189
190static MGVTBL coro_state_vtbl;
191
206enum { 192enum
193{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 200};
214 201
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 203typedef struct
217{ 204{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
224# include "state.h" 206 #include "state.h"
225#undef VAR
226} perl_slots; 207} perl_slots;
227 208
228// how many context stack entries do we need for perl_slots 209/* how many context stack entries do we need for perl_slots */
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 211
231/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
232struct coro { 213struct coro
214{
233 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 216 coro_cctx *cctx;
235 217
236 /* ready queue */ 218 /* ready queue */
237 struct coro *next_ready; 219 struct coro *next_ready;
… …
239 /* state data */ 221 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 223 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
243 225
244 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
245 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
246 int refcnt; /* coroutines are refcounted, yes */
247 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
248 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
249 230
250 /* statistics */ 231 /* statistics */
251 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
252 233
253 /* coro process data */ 234 /* coro process data */
254 int prio; 235 int prio;
255 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
256 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
257 240
258 /* async_pool */ 241 /* async_pool */
259 SV *saved_deffh; 242 SV *saved_deffh;
260 SV *invoke_cb; 243 SV *invoke_cb;
261 AV *invoke_av; 244 AV *invoke_av;
… …
297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
298static CV *cv_coro_run; 281static CV *cv_coro_run;
299static struct coro *coro_first; 282static struct coro *coro_first;
300#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
301 284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
307
302/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
303 309
304static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select; 311static SV *coro_select_select;
306 312
… …
321 327
322/** time stuff **************************************************************/ 328/** time stuff **************************************************************/
323 329
324#ifdef HAS_GETTIMEOFDAY 330#ifdef HAS_GETTIMEOFDAY
325 331
326static void 332ecb_inline void
327coro_u2time (pTHX_ UV ret[2]) 333coro_u2time (pTHX_ UV ret[2])
328{ 334{
329 struct timeval tv; 335 struct timeval tv;
330 gettimeofday (&tv, 0); 336 gettimeofday (&tv, 0);
331 337
332 ret [0] = tv.tv_sec; 338 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec; 339 ret [1] = tv.tv_usec;
334} 340}
335 341
336static double 342ecb_inline double
337coro_nvtime () 343coro_nvtime (void)
338{ 344{
339 struct timeval tv; 345 struct timeval tv;
340 gettimeofday (&tv, 0); 346 gettimeofday (&tv, 0);
341 347
342 return tv.tv_sec + tv.tv_usec * 1e-6; 348 return tv.tv_sec + tv.tv_usec * 1e-6;
343} 349}
344 350
345static void 351ecb_inline void
346time_init (pTHX) 352time_init (pTHX)
347{ 353{
348 nvtime = coro_nvtime; 354 nvtime = coro_nvtime;
349 u2time = coro_u2time; 355 u2time = coro_u2time;
350} 356}
351 357
352#else 358#else
353 359
354static void 360ecb_inline void
355time_init (pTHX) 361time_init (pTHX)
356{ 362{
357 SV **svp; 363 SV **svp;
358 364
359 require_pv ("Time/HiRes.pm"); 365 require_pv ("Time/HiRes.pm");
360 366
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362 368
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365 371
… …
371 377
372#endif 378#endif
373 379
374/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
375 381
376static SV * 382static SV * ecb_noinline
377coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
378{ 384{
379#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
380 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
381 get_sv (name, create); 387 get_sv (name, create);
382#endif 388#endif
383 return get_sv (name, create); 389 return get_sv (name, create);
384} 390}
385 391
386static AV * 392static AV * ecb_noinline
387coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
388{ 394{
389#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
391 get_av (name, create); 397 get_av (name, create);
392#endif 398#endif
393 return get_av (name, create); 399 return get_av (name, create);
394} 400}
395 401
396static HV * 402static HV * ecb_noinline
397coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
398{ 404{
399#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
401 get_hv (name, create); 407 get_hv (name, create);
402#endif 408#endif
403 return get_hv (name, create); 409 return get_hv (name, create);
404} 410}
405 411
406INLINE void 412ecb_inline void
407coro_times_update () 413coro_times_update (void)
408{ 414{
409#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
410 struct timespec ts; 416 struct timespec ts;
411 417
412 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
424 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
426#endif 432#endif
427} 433}
428 434
429INLINE void 435ecb_inline void
430coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
431{ 437{
432 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
436 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
439} 445}
440 446
441INLINE void 447ecb_inline void
442coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
443{ 449{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
445 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
454/* magic glue */ 460/* magic glue */
455 461
456#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
457#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
458 464
459#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
460 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
461 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
462 : mg_find (sv, type)) 468 : mg_find (sv, type))
463 469
464#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
465 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
466 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
467 : 0) 473 : 0)
468 474
469#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
470#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
471 477
472INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
473SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
474{ 495{
475 HV *stash;
476 MAGIC *mg; 496 MAGIC *mg;
477 497
478 if (SvROK (coro)) 498 if (SvROK (coro))
479 coro = SvRV (coro); 499 coro = SvRV (coro);
480 500
481 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
482 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
483 504
484 stash = SvSTASH (coro);
485 if (expect_false (stash != coro_stash && stash != coro_state_stash))
486 {
487 /* very slow, but rare, check */
488 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
489 croak ("Coro::State object required");
490 }
491
492 mg = CORO_MAGIC_state (coro);
493 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
494} 506}
495 507
496#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
497 509
… …
500#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
501 513
502/*****************************************************************************/ 514/*****************************************************************************/
503/* padlist management and caching */ 515/* padlist management and caching */
504 516
505static AV * 517ecb_inline PADLIST *
506coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
507{ 519{
508 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
509 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
510 524
511 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
512 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
513#if PERL_VERSION_ATLEAST (5,10,0)
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
515#else
516 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
517#endif 554#endif
518 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
519 --AvFILLp (padlist);
520 555
521 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
522 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
523 560
524 return newpadlist; 561 return newpadlist;
525} 562}
526 563
527static void 564ecb_inline void
528free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
529{ 566{
530 /* may be during global destruction */ 567 /* may be during global destruction */
531 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
532 { 569 {
533 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
534 571
535 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
536 { 573 {
537 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
538 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
539 I32 j = AvFILLp (av);
540 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
541 while (j >= 0) 581 while (j >= 0)
542 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
543 583
544 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
545 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
546 } 587 }
547 588
548 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
549 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
550 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
551 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
552 } 599 }
553} 600}
554 601
555static int 602static int
556coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
557{ 604{
558 AV *padlist; 605 PADLIST *padlist;
559 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
560 608
561 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
562 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
563 return 0; 611 return 0;
564 612
565 /* casting is fun. */ 613 while (len--)
566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
567 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
568
569 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
570 615
571 return 0; 616 return 0;
572} 617}
573 618
574static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
575 0, 0, 0, 0, 620 0, 0, 0, 0,
576 coro_cv_free 621 coro_cv_free
577}; 622};
578 623
579/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
580static void 625ecb_inline void
581get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
582{ 627{
583 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
584 AV *av; 629 size_t *lenp;
585 630
586 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
587 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
588 else 633 else
589 { 634 {
590#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
591 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
592 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
598 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
599#endif 644#endif
600 } 645 }
601} 646}
602 647
603static void 648ecb_inline void
604put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
605{ 650{
606 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
607 AV *av;
608 652
609 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
610 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
611 663
612 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
613
614 if (expect_false (AvFILLp (av) >= AvMAX (av)))
615 av_extend (av, AvFILLp (av) + 1);
616
617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
618} 665}
619 666
620/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
621 668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
622/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
623static void 708static void
624swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
625{ 710{
626 int i; 711 int i;
627 712
628 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
629 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667} 715}
668 716
669#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
672 720
673static void 721static void
674on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
675 723
… …
679 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
680 c->slot = 0; 728 c->slot = 0;
681 729
682 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
683 731
684 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
685 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
686 GvSV (PL_errgv) = slot->errsv; 734#else
687 GvSV (irsgv) = slot->irsgv;
688 GvHV (PL_hintgv) = slot->hinthv;
689
690 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
691 # include "state.h" 736 #include "state.h"
692 #undef VAR 737#endif
693 738
694 { 739 {
695 dSP; 740 dSP;
696 741
697 CV *cv; 742 CV *cv;
698 743
699 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
700 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
701 { 746 {
702 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
703 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
704 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
705 } 750 }
706 751
707 PUTBACK; 752 PUTBACK;
708 } 753 }
709 754
710 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
711 CORO_THROW = c->except; 756 CORO_THROW = c->except;
712 757
713 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
714 { 759 {
715 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
716 coro_times_update (); 761 coro_times_update ();
717 762
718 coro_times_sub (c); 763 coro_times_sub (c);
719 } 764 }
720 765
721 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
722 { 767 {
723 int i; 768 int i;
724 769
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
732static void 777static void
733save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
734{ 779{
735 SWAP_SVS (c); 780 SWAP_SVS (c);
736 781
737 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
738 { 783 {
739 int i; 784 int i;
740 785
741 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 } 788 }
744 789
745 times_valid = 0; 790 times_valid = 0;
746 791
747 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
748 { 793 {
749 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
750 coro_times_add (c); 795 coro_times_add (c);
751 } 796 }
752 797
… …
766 811
767 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
768 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
769 for (;;) 814 for (;;)
770 { 815 {
771 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
772 { 817 {
773 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
774 819
775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
776 { 821 {
777 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
778 823
779 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
780 { 825 {
781 EXTEND (SP, 3); 826 EXTEND (SP, 3);
782 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
783 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
784 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
787 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
788 } 833 }
789 } 834 }
790 } 835 }
791 836
792 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
793 break; 838 break;
794 839
795 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
796 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
797 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
799 844
800 PUTBACK; 845 PUTBACK;
801 } 846 }
802 847
803 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
805 { 850 {
806 unsigned int i; 851 unsigned int i;
807 852
808 for (i = 0; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 854 CXINC;
… …
814 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
815 860
816 { 861 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 863
819 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
820 slot->defsv = DEFSV; 865 save_perl_slots (slot);
821 slot->errsv = ERRSV; 866#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 868 #include "state.h"
827 #undef VAR 869#endif
828 } 870 }
829} 871}
830 872
831/* 873/*
832 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
863#endif 905#endif
864 906
865 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
868 913
869 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 916 PL_savestack_max = 24;
872 917
… …
900 } 945 }
901 946
902 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 948 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
905 Safefree (PL_savestack); 953 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 955 Safefree (PL_retstack);
908#endif 956#endif
909} 957}
… …
955#endif 1003#endif
956 1004
957/* 1005/*
958 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1009 * we just provide our own readback here.
962 */ 1010 */
963static int 1011static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1013{
966 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
967 1015
968 if (*s == '_') 1016 if (*s == '_')
969 { 1017 {
970 SV **svp = 0; 1018 SV **svp = 0;
971 1019
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1022
975 if (svp) 1023 if (svp)
976 { 1024 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
978 return 0; 1035 return 0;
979 } 1036 }
980 } 1037 }
981 1038
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1040}
984 1041
985static int 1042static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1044{
988 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
989 1046
990 if (*s == '_') 1047 if (*s == '_')
… …
1004 } 1061 }
1005 1062
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1064}
1008 1065
1009static int 1066static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1068{
1012 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
1013 1070
1014 if (*s == '_') 1071 if (*s == '_')
… …
1049 return 1; 1106 return 1;
1050} 1107}
1051 1108
1052static UNOP init_perl_op; 1109static UNOP init_perl_op;
1053 1110
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
1056{ 1113{
1057 /* 1114 /*
1058 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
1059 */ 1116 */
… …
1074 PL_parser = 0; 1131 PL_parser = 0;
1075#endif 1132#endif
1076 PL_hints = 0; 1133 PL_hints = 0;
1077 1134
1078 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1138
1082 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = newHV ();
1144#if PERL_VERSION_ATLEAST (5,10,0)
1145 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1146#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1149
1090 { 1150 {
1091 dSP; 1151 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1166 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1167 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1168 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1169 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1170 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1171 slf_frame.destroy = 0;
1111 1172
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1173 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1174 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1175 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1176 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1181 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1182 CORO_THROW = coro->except;
1122 1183
1123 SWAP_SVS (coro); 1184 SWAP_SVS (coro);
1124 1185
1125 if (expect_false (enable_times)) 1186 if (ecb_expect_false (enable_times))
1126 { 1187 {
1127 coro_times_update (); 1188 coro_times_update ();
1128 coro_times_sub (coro); 1189 coro_times_sub (coro);
1129 } 1190 }
1130} 1191}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1228 SvRV_set (coro_current, (SV *)coro->hv);
1168 1229
1169 load_perl (aTHX_ coro); 1230 load_perl (aTHX_ coro);
1170 1231
1171 coro_unwind_stacks (aTHX); 1232 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1233
1174 /* restore swapped sv's */ 1234 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1235 SWAP_SVS (coro);
1176 1236
1237 coro_destruct_stacks (aTHX);
1238
1177 // now save some sv's to be free'd later 1239 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1240 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1241 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1242 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1243 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1244 svf [4] = PL_rs;
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1264 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1265 SvREFCNT_dec (coro->invoke_av);
1204 } 1266 }
1205} 1267}
1206 1268
1207INLINE void 1269ecb_inline void
1208free_coro_mortal (pTHX) 1270free_coro_mortal (pTHX)
1209{ 1271{
1210 if (expect_true (coro_mortal)) 1272 if (ecb_expect_true (coro_mortal))
1211 { 1273 {
1212 SvREFCNT_dec (coro_mortal); 1274 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1275 coro_mortal = 0;
1214 } 1276 }
1215} 1277}
1216 1278
1217static int 1279static int
… …
1350 1412
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1413 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1414}
1353 1415
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1416/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1417static void ecb_noinline
1356cctx_prepare (pTHX) 1418cctx_prepare (pTHX)
1357{ 1419{
1358 PL_top_env = &PL_start_env; 1420 PL_top_env = &PL_start_env;
1359 1421
1360 if (cctx_current->flags & CC_TRACE) 1422 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1433 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1434 slf_frame.check = slf_check_set_stacklevel;
1373} 1435}
1374 1436
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1437/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1438ecb_inline void
1377transfer_tail (pTHX) 1439transfer_tail (pTHX)
1378{ 1440{
1379 free_coro_mortal (aTHX); 1441 free_coro_mortal (aTHX);
1442}
1443
1444/* try to exit the same way perl's main function would do */
1445/* we do not bother resetting the environment or other things *7
1446/* that are not, uhm, essential */
1447/* this obviously also doesn't work when perl is embedded */
1448static void ecb_noinline ecb_cold
1449perlish_exit (pTHX)
1450{
1451 int exitstatus = perl_destruct (PL_curinterp);
1452 perl_free (PL_curinterp);
1453 exit (exitstatus);
1380} 1454}
1381 1455
1382/* 1456/*
1383 * this is a _very_ stripped down perl interpreter ;) 1457 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1458 */
… …
1413 */ 1487 */
1414 1488
1415 /* 1489 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1490 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1491 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1492 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1493 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1494 */
1424 PL_top_env = main_top_env; 1495 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1496 }
1427} 1497}
1428 1498
1429static coro_cctx * 1499static coro_cctx *
1430cctx_new () 1500cctx_new (void)
1431{ 1501{
1432 coro_cctx *cctx; 1502 coro_cctx *cctx;
1433 1503
1434 ++cctx_count; 1504 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1505 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1511 return cctx;
1442} 1512}
1443 1513
1444/* create a new cctx only suitable as source */ 1514/* create a new cctx only suitable as source */
1445static coro_cctx * 1515static coro_cctx *
1446cctx_new_empty () 1516cctx_new_empty (void)
1447{ 1517{
1448 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1449 1519
1450 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1522
1453 return cctx; 1523 return cctx;
1454} 1524}
1455 1525
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1527static coro_cctx *
1458cctx_new_run () 1528cctx_new_run (void)
1459{ 1529{
1460 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1531
1464#if HAVE_MMAP 1532 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1468
1469 if (cctx->sptr != (void *)-1)
1470 {
1471 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1473 #endif
1474 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1475 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1476 cctx->flags |= CC_MAPPED;
1477 } 1533 {
1478 else
1479#endif
1480 {
1481 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1482 New (0, cctx->sptr, cctx_stacksize, long);
1483
1484 if (!cctx->sptr)
1485 {
1486 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1536 }
1493 1537
1494 #if CORO_USE_VALGRIND
1495 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1496 #endif
1497
1498 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1539
1500 return cctx; 1540 return cctx;
1501} 1541}
1502 1542
1503static void 1543static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1550
1511 --cctx_count; 1551 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1513 1553
1514 /* coro_transfer creates new, empty cctx's */ 1554 coro_stack_free (&cctx->stack);
1515 if (cctx->sptr)
1516 {
1517 #if CORO_USE_VALGRIND
1518 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1519 #endif
1520
1521#if HAVE_MMAP
1522 if (cctx->flags & CC_MAPPED)
1523 munmap (cctx->sptr, cctx->ssize);
1524 else
1525#endif
1526 Safefree (cctx->sptr);
1527 }
1528 1555
1529 Safefree (cctx); 1556 Safefree (cctx);
1530} 1557}
1531 1558
1532/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1560#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1561
1535static coro_cctx * 1562static coro_cctx *
1536cctx_get (pTHX) 1563cctx_get (pTHX)
1537{ 1564{
1538 while (expect_true (cctx_first)) 1565 while (ecb_expect_true (cctx_first))
1539 { 1566 {
1540 coro_cctx *cctx = cctx_first; 1567 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1568 cctx_first = cctx->next;
1542 --cctx_idle; 1569 --cctx_idle;
1543 1570
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1571 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1572 return cctx;
1546 1573
1547 cctx_destroy (cctx); 1574 cctx_destroy (cctx);
1548 } 1575 }
1549 1576
… …
1551} 1578}
1552 1579
1553static void 1580static void
1554cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1555{ 1582{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1583 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1584
1558 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1587 {
1561 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1589 cctx_first = first->next;
1563 --cctx_idle; 1590 --cctx_idle;
1564 1591
… …
1575static void 1602static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1603transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1604{
1578 /* TODO: throwing up here is considered harmful */ 1605 /* TODO: throwing up here is considered harmful */
1579 1606
1580 if (expect_true (prev != next)) 1607 if (ecb_expect_true (prev != next))
1581 { 1608 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1609 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1610 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1611
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1612 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1613 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1614
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1615#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1616 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1617 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1618#endif
1592 } 1619 }
1593} 1620}
1594 1621
1595/* always use the TRANSFER macro */ 1622/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1623static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1624transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1625{
1599 dSTACKLEVEL; 1626 dSTACKLEVEL;
1600 1627
1601 /* sometimes transfer is only called to set idle_sp */ 1628 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1629 if (ecb_expect_false (!prev))
1603 { 1630 {
1604 cctx_current->idle_sp = STACKLEVEL; 1631 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1632 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1633 }
1607 else if (expect_true (prev != next)) 1634 else if (ecb_expect_true (prev != next))
1608 { 1635 {
1609 coro_cctx *cctx_prev; 1636 coro_cctx *cctx_prev;
1610 1637
1611 if (expect_false (prev->flags & CF_NEW)) 1638 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1639 {
1613 /* create a new empty/source context */ 1640 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1641 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1642 prev->flags |= CF_RUNNING;
1616 } 1643 }
… …
1619 next->flags |= CF_RUNNING; 1646 next->flags |= CF_RUNNING;
1620 1647
1621 /* first get rid of the old state */ 1648 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1649 save_perl (aTHX_ prev);
1623 1650
1624 if (expect_false (next->flags & CF_NEW)) 1651 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1652 {
1626 /* need to start coroutine */ 1653 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1654 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1655 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1656 init_perl (aTHX_ next);
1630 } 1657 }
1631 else 1658 else
1632 load_perl (aTHX_ next); 1659 load_perl (aTHX_ next);
1633 1660
1634 /* possibly untie and reuse the cctx */ 1661 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1662 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1663 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1664 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1665 && !force_cctx
1639 )) 1666 ))
1640 { 1667 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1668 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1669 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1670
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1671 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1672 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1673 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1674 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1675 next->cctx = cctx_get (aTHX);
1649 1676
1650 cctx_put (cctx_current); 1677 cctx_put (cctx_current);
1651 } 1678 }
1652 else 1679 else
1653 prev->cctx = cctx_current; 1680 prev->cctx = cctx_current;
1654 1681
1655 ++next->usecount; 1682 ++next->usecount;
1656 1683
1657 cctx_prev = cctx_current; 1684 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1685 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1686
1660 next->cctx = 0; 1687 next->cctx = 0;
1661 1688
1662 if (expect_false (cctx_prev != cctx_current)) 1689 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1690 {
1664 cctx_prev->top_env = PL_top_env; 1691 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1692 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1693 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1694 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1700#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1701#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1702
1676/** high level stuff ********************************************************/ 1703/** high level stuff ********************************************************/
1677 1704
1705/* this function is actually Coro, not Coro::State, but we call it from here */
1706/* because it is convenient - but it hasn't been declared yet for that reason */
1707static void
1708coro_call_on_destroy (pTHX_ struct coro *coro);
1709
1678static void 1710static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1711coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1712{
1681 if (coro->flags & CF_DESTROYED) 1713 if (coro->flags & CF_ZOMBIE)
1682 return; 1714 return;
1683 1715
1684 slf_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1685 1717
1686 coro->flags |= CF_DESTROYED; 1718 coro->flags |= CF_ZOMBIE;
1687 1719
1688 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1689 { 1721 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1724 --coro_nready;
1693 } 1725 }
1694 else 1726 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1727 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1728
1729 if (coro->next) coro->next->prev = coro->prev;
1730 if (coro->prev) coro->prev->next = coro->next;
1731 if (coro == coro_first) coro_first = coro->next;
1696 1732
1697 if (coro->mainstack 1733 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1734 && coro->mainstack != main_mainstack
1699 && coro->slot 1735 && coro->slot
1700 && !PL_dirty) 1736 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1737 destroy_perl (aTHX_ coro);
1702 1738
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1739 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1740 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1741 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1742 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1743 SvREFCNT_dec (CORO_THROW);
1744
1745 coro_call_on_destroy (aTHX_ coro);
1746
1747 /* more destruction mayhem in coro_state_free */
1712} 1748}
1713 1749
1714static int 1750static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1751coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1752{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1754 mg->mg_ptr = 0;
1719 1755
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1756 coro_state_destroy (aTHX_ coro);
1757 SvREFCNT_dec (coro->on_destroy);
1758 SvREFCNT_dec (coro->status);
1759
1725 Safefree (coro); 1760 Safefree (coro);
1726 }
1727 1761
1728 return 0; 1762 return 0;
1729} 1763}
1730 1764
1731static int 1765static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1766coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1767{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1769 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1770 mg->mg_ptr = 0;
1771 mg->mg_virtual = 0;
1737 1772
1738 return 0; 1773 return 0;
1739} 1774}
1740 1775
1741static MGVTBL coro_state_vtbl = { 1776static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1801 TRANSFER (ta, 1);
1767} 1802}
1768 1803
1769/** Coro ********************************************************************/ 1804/** Coro ********************************************************************/
1770 1805
1771INLINE void 1806ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1807coro_enq (pTHX_ struct coro *coro)
1773{ 1808{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1809 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1810
1776 SvREFCNT_inc_NN (coro->hv); 1811 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1813 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1814 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1815 ready [1] = coro;
1781} 1816}
1782 1817
1783INLINE struct coro * 1818ecb_inline struct coro *
1784coro_deq (pTHX) 1819coro_deq (pTHX)
1785{ 1820{
1786 int prio; 1821 int prio;
1787 1822
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1823 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1876{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1877 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1878}
1844 1879
1845/* expects to own a reference to next->hv */ 1880/* expects to own a reference to next->hv */
1846INLINE void 1881ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1882prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1883{
1849 SV *prev_sv = SvRV (coro_current); 1884 SV *prev_sv = SvRV (coro_current);
1850 1885
1851 ta->prev = SvSTATE_hv (prev_sv); 1886 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1899{
1865 for (;;) 1900 for (;;)
1866 { 1901 {
1867 struct coro *next = coro_deq (aTHX); 1902 struct coro *next = coro_deq (aTHX);
1868 1903
1869 if (expect_true (next)) 1904 if (ecb_expect_true (next))
1870 { 1905 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1906 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1907 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1908 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1909 else
1875 { 1910 {
1876 next->flags &= ~CF_READY; 1911 next->flags &= ~CF_READY;
1877 --coro_nready; 1912 --coro_nready;
… …
1885 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle) 1921 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle))) 1922 && SvOBJECT (SvRV (sv_idle)))
1888 { 1923 {
1889 if (SvRV (sv_idle) == SvRV (coro_current)) 1924 if (SvRV (sv_idle) == SvRV (coro_current))
1925 {
1926 require_pv ("Carp");
1927
1928 {
1929 dSP;
1930
1931 ENTER;
1932 SAVETMPS;
1933
1934 PUSHMARK (SP);
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1941 }
1942 }
1891 1943
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready; 1946 --coro_nready;
1895 } 1947 }
… …
1910 } 1962 }
1911 } 1963 }
1912 } 1964 }
1913} 1965}
1914 1966
1915INLINE void 1967ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1969{
1918 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1920} 1972}
1921 1973
1922INLINE void 1974ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1976{
1925 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1926 1978
1927 if (coro_nready) 1979 if (coro_nready)
… …
1957{ 2009{
1958 struct coro_transfer_args ta; 2010 struct coro_transfer_args ta;
1959 2011
1960 prepare_cede (aTHX_ &ta); 2012 prepare_cede (aTHX_ &ta);
1961 2013
1962 if (expect_true (ta.prev != ta.next)) 2014 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2015 {
1964 TRANSFER (ta, 1); 2016 TRANSFER (ta, 1);
1965 return 1; 2017 return 1;
1966 } 2018 }
1967 else 2019 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2062 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2063 }
2012} 2064}
2013 2065
2014static void 2066static void
2067coro_push_av (pTHX_ AV *av, I32 gimme_v)
2068{
2069 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2070 {
2071 dSP;
2072
2073 if (gimme_v == G_SCALAR)
2074 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2075 else
2076 {
2077 int i;
2078 EXTEND (SP, AvFILLp (av) + 1);
2079
2080 for (i = 0; i <= AvFILLp (av); ++i)
2081 PUSHs (AvARRAY (av)[i]);
2082 }
2083
2084 PUTBACK;
2085 }
2086}
2087
2088static void
2089coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2090{
2091 if (!coro->on_destroy)
2092 coro->on_destroy = newAV ();
2093
2094 av_push (coro->on_destroy, cb);
2095}
2096
2097static void
2098slf_destroy_join (pTHX_ struct CoroSLF *frame)
2099{
2100 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2101}
2102
2103static int
2104slf_check_join (pTHX_ struct CoroSLF *frame)
2105{
2106 struct coro *coro = (struct coro *)frame->data;
2107
2108 if (!coro->status)
2109 return 1;
2110
2111 frame->destroy = 0;
2112
2113 coro_push_av (aTHX_ coro->status, GIMME_V);
2114
2115 SvREFCNT_dec ((SV *)coro->hv);
2116
2117 return 0;
2118}
2119
2120static void
2121slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2122{
2123 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2124
2125 if (items > 1)
2126 croak ("join called with too many arguments");
2127
2128 if (coro->status)
2129 frame->prepare = prepare_nop;
2130 else
2131 {
2132 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2133 frame->prepare = prepare_schedule;
2134 }
2135
2136 frame->check = slf_check_join;
2137 frame->destroy = slf_destroy_join;
2138 frame->data = (void *)coro;
2139 SvREFCNT_inc (coro->hv);
2140}
2141
2142static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2143coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2144{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2145 AV *od = coro->on_destroy;
2018 2146
2019 if (on_destroyp) 2147 if (!od)
2020 { 2148 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
2025 while (AvFILLp (on_destroy) >= 0) 2153 while (AvFILLp (od) >= 0)
2154 {
2155 SV *cb = sv_2mortal (av_pop (od));
2156
2157 /* coro hv's (and only hv's at the moment) are supported as well */
2158 if (SvSTATEhv_p (aTHX_ cb))
2159 api_ready (aTHX_ cb);
2160 else
2026 { 2161 {
2027 dSP; /* don't disturb outer sp */ 2162 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2163 PUSHMARK (SP);
2031 2164
2032 if (statusp) 2165 if (coro->status)
2033 { 2166 {
2034 int i; 2167 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2168 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2169 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2170 }
2040 2171
2041 PUTBACK; 2172 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2173 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2174 }
2044 } 2175 }
2045} 2176}
2046 2177
2047static void 2178static void
2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2180{
2050 AV *av = newAV (); 2181 AV *av;
2182
2183 if (coro->status)
2184 {
2185 av = coro->status;
2186 av_clear (av);
2187 }
2188 else
2189 av = coro->status = newAV ();
2051 2190
2052 /* items are actually not so common, so optimise for this case */ 2191 /* items are actually not so common, so optimise for this case */
2053 if (items) 2192 if (items)
2054 { 2193 {
2055 int i; 2194 int i;
… …
2057 av_extend (av, items - 1); 2196 av_extend (av, items - 1);
2058 2197
2059 for (i = 0; i < items; ++i) 2198 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2199 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2200 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2201}
2065 2202
2066static void 2203static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2204slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2205{
… …
2080static void 2217static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2218slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2219{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2220 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2221
2085 coro_set_status (aTHX_ coro_hv, arg, items); 2222 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2223 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2224}
2088 2225
2089static void 2226static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2227slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2096 croak ("Coro::cancel called without coro object,"); 2233 croak ("Coro::cancel called without coro object,");
2097 2234
2098 coro = SvSTATE (arg [0]); 2235 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2236 coro_hv = coro->hv;
2100 2237
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1); 2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2239
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2241 {
2105 /* coro currently busy cancelling something, so just notify it */ 2242 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2243 coro->slf_frame.data = (void *)coro;
2107 2244
2108 frame->prepare = prepare_nop; 2245 frame->prepare = prepare_nop;
… …
2114 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2252 }
2116 else 2253 else
2117 { 2254 {
2118 struct coro *self = SvSTATE_current; 2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2119 2259
2120 /* otherwise we cancel directly, purely for speed reasons 2260 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as 2261 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation. 2262 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed. 2263 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2264 * besides, I can't get the slow-but-safe version working...
2125 */ 2265 */
2126 slf_frame.data = 0; 2266 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2267 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2268 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2269 self->flags &= ~CF_NOCANCEL;
2133 2270
2134 if (slf_frame.data) 2271 if (slf_frame.data)
2135 { 2272 {
2136 /* while we were busy we have been cancelled, so terminate */ 2273 /* while we were busy we have been cancelled, so terminate */
… …
2161 if (coro->cctx) 2298 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2299 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2300
2164 if (coro->flags & CF_NEW) 2301 if (coro->flags & CF_NEW)
2165 { 2302 {
2166 coro_set_status (aTHX_ coro->hv, arg, items); 2303 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2304 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2305 }
2170 else 2306 else
2171 { 2307 {
2172 if (!coro->slf_frame.prepare) 2308 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2309 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2310
2175 slf_destroy (aTHX_ coro); 2311 slf_destroy (aTHX_ coro);
2176 2312
2177 coro_set_status (aTHX_ coro->hv, arg, items); 2313 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2314 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2315 coro->slf_frame.check = slf_check_safe_cancel;
2180 2316
2181 api_ready (aTHX_ coro->hv); 2317 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2318 }
2183 2319
2184 return 1; 2320 return 1;
2185} 2321}
2186 2322
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2356slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2357{
2222 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2359 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2360
2225 if (expect_true (coro->saved_deffh)) 2361 if (ecb_expect_true (coro->saved_deffh))
2226 { 2362 {
2227 /* subsequent iteration */ 2363 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2364 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2365 coro->saved_deffh = 0;
2230 2366
… …
2290 2426
2291static int 2427static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2429{
2294 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
2295 2431
2296 if (CORO_THROW) 2432 if (CORO_THROW)
2297 return 0; 2433 return 0;
2298 2434
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2436 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
2338 } 2474 }
2339 2475
2340 if (!SvROK (cb) 2476 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2480
2345 { 2481 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2469 2605
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2606/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void 2607static void
2472slf_destroy (pTHX_ struct coro *coro) 2608slf_destroy (pTHX_ struct coro *coro)
2473{ 2609{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2610 struct CoroSLF frame = coro->slf_frame;
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477 2611
2478 /* 2612 /*
2479 * The on_destroy above most likely is from an SLF call. 2613 * The on_destroy below most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2614 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2615 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions. 2616 * cleanup functions cannot call SLF functions.
2483 */ 2617 */
2484 coro->slf_frame.prepare = 0; 2618 coro->slf_frame.prepare = 0;
2619
2620 /* this callback is reserved for slf functions needing to do cleanup */
2621 if (frame.destroy && frame.prepare && !PL_dirty)
2622 frame.destroy (aTHX_ &frame);
2485} 2623}
2486 2624
2487/* 2625/*
2488 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2489 * function to increase chances that they all will call transfer with the same 2627 * function to increase chances that they all will call transfer with the same
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2634 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2635
2498 /* set up the slf frame, unless it has already been set-up */ 2636 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2637 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2638 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2639 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2640 {
2503 /* first iteration */ 2641 /* first iteration */
2504 dSP; 2642 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2643 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2644 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2685 while (slf_frame.check (aTHX_ &slf_frame));
2548 2686
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2687 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2688
2551 /* exception handling */ 2689 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2690 if (ecb_expect_false (CORO_THROW))
2553 { 2691 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2692 SV *exception = sv_2mortal (CORO_THROW);
2555 2693
2556 CORO_THROW = 0; 2694 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2695 sv_setsv (ERRSV, exception);
2558 croak (0); 2696 croak (0);
2559 } 2697 }
2560 2698
2561 /* return value handling - mostly like entersub */ 2699 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2700 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2701 if (GIMME_V == G_SCALAR
2702 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2703 {
2565 dSP; 2704 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2705 SV **bot = PL_stack_base + checkmark;
2567 2706
2568 if (sp == bot) /* too few, push undef */ 2707 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2708 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2709 else /* too many, take last one */
2571 bot [1] = *sp; 2710 bot [1] = *sp;
2572 2711
2573 SP = bot + 1; 2712 SP = bot + 1;
2574 2713
2575 PUTBACK; 2714 PUTBACK;
… …
2682{ 2821{
2683 PerlIOBuf base; 2822 PerlIOBuf base;
2684 NV next, every; 2823 NV next, every;
2685} PerlIOCede; 2824} PerlIOCede;
2686 2825
2687static IV 2826static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2827PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2828{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2829 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2830
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2831 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2832 self->next = nvtime () + self->every;
2694 2833
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2834 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2835}
2697 2836
2698static SV * 2837static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2838PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2839{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2841
2703 return newSVnv (self->every); 2842 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2954 SvREFCNT_dec (cb);
2816 } 2955 }
2817} 2956}
2818 2957
2819static void 2958static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2959coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2960{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2961 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2962 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2963}
2825 2964
2826static int 2965static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2966slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2967{
2829 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2970 SV *coro_hv = SvRV (coro_current);
2971
2972 frame->destroy = 0;
2831 2973
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2974 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2975 if (ecb_expect_false (CORO_THROW))
2976 {
2977 /* we still might be responsible for the semaphore, so wake up others */
2978 coro_semaphore_adjust (aTHX_ av, 0);
2979
2834 return 0; 2980 return 0;
2981 }
2835 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2836 { 2983 {
2837 frame->destroy = 0;
2838
2839 if (acquire) 2984 if (acquire)
2840 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2841 else 2986 else
2842 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2843 2988
… …
2847 { 2992 {
2848 int i; 2993 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 2994 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 2995 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 2996 /* this avoids some degenerate memory usage cases */
2852 2997 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 2998 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 2999 return 1;
2856 3000
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 3002 return 1;
2859 } 3003 }
2860} 3004}
2861 3005
2862static int 3006static int
… …
3066 /* it quickly returns */ 3210 /* it quickly returns */
3067 if (CORO_THROW) 3211 if (CORO_THROW)
3068 return 0; 3212 return 0;
3069 3213
3070 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
3071 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3072 return 1; 3216 return 1;
3073 3217
3074 /* restore status */ 3218 /* restore status */
3075 { 3219 {
3076 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
3115 dSP; 3259 dSP;
3116 3260
3117 static SV *prio_cv; 3261 static SV *prio_cv;
3118 static SV *prio_sv; 3262 static SV *prio_sv;
3119 3263
3120 if (expect_false (!prio_cv)) 3264 if (ecb_expect_false (!prio_cv))
3121 { 3265 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3266 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3267 prio_sv = newSViv (0);
3124 } 3268 }
3125 3269
… …
3231 } 3375 }
3232 3376
3233 return coro_sv; 3377 return coro_sv;
3234} 3378}
3235 3379
3380#ifndef __cplusplus
3381ecb_cold XS(boot_Coro__State);
3382#endif
3383
3384#if CORO_JIT
3385
3386static void ecb_noinline ecb_cold
3387pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3388{
3389 dSP;
3390 AV *av = newAV ();
3391
3392 av_store (av, 3, newSVuv (d));
3393 av_store (av, 2, newSVuv (c));
3394 av_store (av, 1, newSVuv (b));
3395 av_store (av, 0, newSVuv (a));
3396
3397 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3398
3399 PUTBACK;
3400}
3401
3402static void ecb_noinline ecb_cold
3403jit_init (pTHX)
3404{
3405 dSP;
3406 SV *load, *save;
3407 char *map_base;
3408 char *load_ptr, *save_ptr;
3409 STRLEN load_len, save_len, map_len;
3410 int count;
3411
3412 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3413
3414 PUSHMARK (SP);
3415 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3416 #include "state.h"
3417 count = call_pv ("Coro::State::_jit", G_ARRAY);
3418 SPAGAIN;
3419
3420 save = POPs; save_ptr = SvPVbyte (save, save_len);
3421 load = POPs; load_ptr = SvPVbyte (load, load_len);
3422
3423 map_len = load_len + save_len + 16;
3424
3425 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3426
3427 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3428
3429 load_perl_slots = (load_save_perl_slots_type)map_base;
3430 memcpy (map_base, load_ptr, load_len);
3431
3432 map_base += (load_len + 15) & ~15;
3433
3434 save_perl_slots = (load_save_perl_slots_type)map_base;
3435 memcpy (map_base, save_ptr, save_len);
3436
3437 /* we are good citizens and try to make the page read-only, so the evil evil */
3438 /* hackers might have it a bit more difficult */
3439 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3440
3441 PUTBACK;
3442 eval_pv ("undef &Coro::State::_jit", 1);
3443}
3444
3445#endif
3446
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3447MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3448
3238PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
3239 3450
3240BOOT: 3451BOOT:
3241{ 3452{
3453#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3454#include "state.h"
3242#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3456# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
3245# endif 3458# endif
3246#endif 3459#endif
3247 BOOT_PAGESIZE; 3460 /* perl defines these to check for existance first, but why it doesn't */
3461 /* just create them one at init time is not clear to me, except for */
3462 /* programs trying to delete them, but... */
3463 /* anyway, we declare this as invalid and make sure they are initialised here */
3464 DEFSV;
3465 ERRSV;
3248 3466
3249 cctx_current = cctx_new_empty (); 3467 cctx_current = cctx_new_empty ();
3250 3468
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3469 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3470 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3513 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3514
3297 time_init (aTHX); 3515 time_init (aTHX);
3298 3516
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3517 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3518#if CORO_JIT
3519 PUTBACK;
3520 jit_init (aTHX);
3521 SPAGAIN;
3522#endif
3300} 3523}
3301 3524
3302SV * 3525SV *
3303new (SV *klass, ...) 3526new (SV *klass, ...)
3304 ALIAS: 3527 ALIAS:
… …
3311void 3534void
3312transfer (...) 3535transfer (...)
3313 PROTOTYPE: $$ 3536 PROTOTYPE: $$
3314 CODE: 3537 CODE:
3315 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3316
3317void
3318_exit (int code)
3319 PROTOTYPE: $
3320 CODE:
3321 _exit (code);
3322 3539
3323SV * 3540SV *
3324clone (Coro::State coro) 3541clone (Coro::State coro)
3325 CODE: 3542 CODE:
3326{ 3543{
… …
3381void 3598void
3382list () 3599list ()
3383 PROTOTYPE: 3600 PROTOTYPE:
3384 PPCODE: 3601 PPCODE:
3385{ 3602{
3386 struct coro *coro; 3603 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3605 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3607}
3391 3608
… …
3446 PROTOTYPE: $ 3663 PROTOTYPE: $
3447 ALIAS: 3664 ALIAS:
3448 is_ready = CF_READY 3665 is_ready = CF_READY
3449 is_running = CF_RUNNING 3666 is_running = CF_RUNNING
3450 is_new = CF_NEW 3667 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3668 is_destroyed = CF_ZOMBIE
3669 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3670 is_suspended = CF_SUSPENDED
3453 CODE: 3671 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3672 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3673 OUTPUT:
3456 RETVAL 3674 RETVAL
3457 3675
3458void 3676void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3677throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
3461 CODE: 3679 CODE:
3462{ 3680{
3681 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3682 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3683 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3684 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3685 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3686 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3687
3688 api_ready (aTHX_ self);
3468} 3689}
3469 3690
3470void 3691void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3692api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3693 PROTOTYPE: $;$
… …
3549 3770
3550void 3771void
3551times (Coro::State self) 3772times (Coro::State self)
3552 PPCODE: 3773 PPCODE:
3553{ 3774{
3554 struct coro *current = SvSTATE (coro_current); 3775 struct coro *current = SvSTATE (coro_current);
3555 3776
3556 if (expect_false (current == self)) 3777 if (ecb_expect_false (current == self))
3557 { 3778 {
3558 coro_times_update (); 3779 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3780 coro_times_add (SvSTATE (coro_current));
3560 } 3781 }
3561 3782
3562 EXTEND (SP, 2); 3783 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3784 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3785 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3786
3566 if (expect_false (current == self)) 3787 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3788 coro_times_sub (SvSTATE (coro_current));
3568} 3789}
3569 3790
3570void 3791void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3792swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3602 3823
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3824 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3825 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3826 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3827 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3828
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3830
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3833 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3644void 3865void
3645_destroy (Coro::State coro) 3866_destroy (Coro::State coro)
3646 CODE: 3867 CODE:
3647 /* used by the manager thread */ 3868 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3869 coro_state_destroy (aTHX_ coro);
3870
3871void
3872on_destroy (Coro::State coro, SV *cb)
3873 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3874 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3875
3876void
3877join (...)
3878 CODE:
3879 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3880
3651void 3881void
3652terminate (...) 3882terminate (...)
3653 CODE: 3883 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3884 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3825 on_leave = 1 4055 on_leave = 1
3826 PROTOTYPE: & 4056 PROTOTYPE: &
3827 CODE: 4057 CODE:
3828{ 4058{
3829 struct coro *coro = SvSTATE_current; 4059 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4061
3832 block = s_get_cv_croak (block); 4062 block = s_get_cv_croak (block);
3833 4063
3834 if (!*avp) 4064 if (!*avp)
3835 *avp = newAV (); 4065 *avp = newAV ();
… …
3855 4085
3856SV * 4086SV *
3857new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
3858 CODE: 4088 CODE:
3859{ 4089{
3860 int semcnt = 1; 4090 int semcnt = 1;
3861 4091
3862 if (count) 4092 if (count)
3863 { 4093 {
3864 SvGETMAGIC (count); 4094 SvGETMAGIC (count);
3865 4095
… …
3925 XSRETURN_NO; 4155 XSRETURN_NO;
3926} 4156}
3927 4157
3928void 4158void
3929waiters (SV *self) 4159waiters (SV *self)
3930 PPCODE: 4160 PPCODE:
3931{ 4161{
3932 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
3934 4164
3935 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
3944} 4174}
3945 4175
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4176MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4177
3948void 4178void
3949_may_delete (SV *sem, int count, int extra_refs) 4179_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4180 PPCODE:
3951{ 4181{
3952 AV *av = (AV *)SvRV (sem); 4182 AV *av = (AV *)SvRV (sem);
3953 4183
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4185 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4186 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4187 XSRETURN_YES;
… …
3978 4208
3979void 4209void
3980broadcast (SV *self) 4210broadcast (SV *self)
3981 CODE: 4211 CODE:
3982{ 4212{
3983 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4215}
3986 4216
3987void 4217void
3988send (SV *self) 4218send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4227}
3998 4228
3999IV 4229IV
4000awaited (SV *self) 4230awaited (SV *self)
4001 CODE: 4231 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4233 OUTPUT:
4004 RETVAL 4234 RETVAL
4005 4235
4006 4236
… …
4011 4241
4012void 4242void
4013_schedule (...) 4243_schedule (...)
4014 CODE: 4244 CODE:
4015{ 4245{
4016 static int incede; 4246 static int incede;
4017 4247
4018 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
4019 4249
4020 ++incede; 4250 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
4065 { 4295 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0; 4297 coro_old_pp_sselect = 0;
4068 } 4298 }
4069 4299
4300MODULE = Coro::State PACKAGE = Coro::Util
4301
4302void
4303_exit (int code)
4304 CODE:
4305 _exit (code);
4306
4307NV
4308time ()
4309 CODE:
4310 RETVAL = nvtime (aTHX);
4311 OUTPUT:
4312 RETVAL
4313
4314NV
4315gettimeofday ()
4316 PPCODE:
4317{
4318 UV tv [2];
4319 u2time (aTHX_ tv);
4320 EXTEND (SP, 2);
4321 PUSHs (sv_2mortal (newSVuv (tv [0])));
4322 PUSHs (sv_2mortal (newSVuv (tv [1])));
4323}
4324

Diff Legend

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