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.389 by root, Fri Mar 4 16:41:21 2011 UTC vs.
Revision 1.455 by root, Sun Oct 4 13:07:55 2015 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
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
24#endif 66#endif
25 67
26#if defined(_WIN32) 68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
32#else 74#else
33# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
34#endif 76#endif
35 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
65 80
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 83#endif
73 84
74/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
87#endif 98#endif
88 99
89#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
90 101
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" 102#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
108 104
109#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
110# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
126static void (*u2time)(pTHX_ UV ret[2]); 122static void (*u2time)(pTHX_ UV ret[2]);
127 123
128/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
131 128
132static U32 cctx_gen; 129static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
143 140
144static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
145static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
146static SV *rv_diehook; 143static SV *rv_diehook;
147static SV *rv_warnhook; 144static SV *rv_warnhook;
148static HV *hv_sig; /* %SIG */
149 145
150/* async_pool helper stuff */ 146/* async_pool helper stuff */
151static SV *sv_pool_rss; 147static SV *sv_pool_rss;
152static SV *sv_pool_size; 148static SV *sv_pool_size;
153static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
165static char times_valid; 161static char times_valid;
166 162
167static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
169 165
170enum { 166enum
167{
171 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 177typedef struct coro_cctx
181{ 178{
182 struct coro_cctx *next; 179 struct coro_cctx *next;
183 180
184 /* the stack */ 181 /* the stack */
185 void *sptr; 182 struct coro_stack stack;
186 size_t ssize;
187 183
188 /* cpu state */ 184 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
191 JMPENV *top_env; 189 JMPENV *top_env;
192 coro_context cctx; 190 coro_context cctx;
193 191
194 U32 gen; 192 U32 gen;
195#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
196 int valgrind_id; 194 int valgrind_id;
197#endif 195#endif
198 unsigned char flags; 196 unsigned char flags;
199} coro_cctx; 197} coro_cctx;
200 198
201coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
202 200
203/*****************************************************************************/ 201/*****************************************************************************/
204 202
203static MGVTBL coro_state_vtbl;
204
205enum { 205enum
206{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
211}; 213};
212 214
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 216typedef struct
215{ 217{
216 SV *defsv;
217 AV *defav;
218 SV *errsv;
219 SV *irsgv;
220 HV *hinthv;
221#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
222# include "state.h" 219 #include "state.h"
223#undef VAR
224} perl_slots; 220} perl_slots;
225 221
222/* how many context stack entries do we need for perl_slots */
226#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
227 224
228/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
229struct coro { 226struct coro
227{
230 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
231 coro_cctx *cctx; 229 coro_cctx *cctx;
232 230
233 /* ready queue */ 231 /* ready queue */
234 struct coro *next_ready; 232 struct coro *next_ready;
… …
236 /* state data */ 234 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 236 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
240 238
241 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
242 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
243 int refcnt; /* coroutines are refcounted, yes */
244 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
245 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
247 243
248 /* statistics */ 244 /* statistics */
249 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
250 246
251 /* coro process data */ 247 /* coro process data */
252 int prio; 248 int prio;
253 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
254 SV *rouse_cb; 250 SV *rouse_cb; /* last rouse callback */
251 AV *on_destroy; /* callbacks or coros to notify on destroy */
252 AV *status; /* the exit status list */
255 253
256 /* async_pool */ 254 /* async_pool */
257 SV *saved_deffh; 255 SV *saved_deffh;
258 SV *invoke_cb; 256 SV *invoke_cb;
259 AV *invoke_av; 257 AV *invoke_av;
260 258
261 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
262 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
263 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
264 262
265 /* swap_sv */ 263 /* swap_sv */
266 AV *swap_sv; 264 AV *swap_sv;
267 265
268 /* times */ 266 /* times */
… …
275typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
276typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
277 275
278/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
279/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
280/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
281static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
282 280
283/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
284 282
285#define CORO_PRIO_MAX 3 283#define CORO_PRIO_MAX 3
… …
291 289
292/* for Coro.pm */ 290/* for Coro.pm */
293static SV *coro_current; 291static SV *coro_current;
294static SV *coro_readyhook; 292static SV *coro_readyhook;
295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
296static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
297static struct coro *coro_first; 295static struct coro *coro_first;
298#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
297
298/** JIT *********************************************************************/
299
300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
303 #ifndef CORO_JIT_TYPE
304 #if ECB_AMD64 && CORO_JIT_UNIXY
305 #define CORO_JIT_TYPE "amd64-unix"
306 #elif __i386 && CORO_JIT_UNIXY
307 #define CORO_JIT_TYPE "x86-unix"
308 #endif
309 #endif
310#endif
311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
319#endif
299 320
300/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
301 322
302static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select; 324static SV *coro_select_select;
… …
319 340
320/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
321 342
322#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
323 344
324static void 345ecb_inline void
325coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
326{ 347{
327 struct timeval tv; 348 struct timeval tv;
328 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
329 350
330 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
332} 353}
333 354
334static double 355ecb_inline double
335coro_nvtime () 356coro_nvtime (void)
336{ 357{
337 struct timeval tv; 358 struct timeval tv;
338 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
339 360
340 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
341} 362}
342 363
343static void 364ecb_inline void
344time_init (pTHX) 365time_init (pTHX)
345{ 366{
346 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
347 u2time = coro_u2time; 368 u2time = coro_u2time;
348} 369}
349 370
350#else 371#else
351 372
352static void 373ecb_inline void
353time_init (pTHX) 374time_init (pTHX)
354{ 375{
355 SV **svp; 376 SV **svp;
356 377
357 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
358 379
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360 381
361 if (!svp) croak ("Time::HiRes is required, but missing."); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363 384
364 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 385 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365 386
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 387 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 388 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
369 390
370#endif 391#endif
371 392
372/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
373 394
374static SV * 395static SV * ecb_noinline
375coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
376{ 397{
377#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
378 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
379 get_sv (name, create); 400 get_sv (name, create);
380#endif 401#endif
381 return get_sv (name, create); 402 return get_sv (name, create);
382} 403}
383 404
384static AV * 405static AV * ecb_noinline
385coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
386{ 407{
387#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 409 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
389 get_av (name, create); 410 get_av (name, create);
390#endif 411#endif
391 return get_av (name, create); 412 return get_av (name, create);
392} 413}
393 414
394static HV * 415static HV * ecb_noinline
395coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
396{ 417{
397#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 419 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
399 get_hv (name, create); 420 get_hv (name, create);
400#endif 421#endif
401 return get_hv (name, create); 422 return get_hv (name, create);
402} 423}
403 424
404INLINE void 425ecb_inline void
405coro_times_update () 426coro_times_update (void)
406{ 427{
407#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
408 struct timespec ts; 429 struct timespec ts;
409 430
410 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
422 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
424#endif 445#endif
425} 446}
426 447
427INLINE void 448ecb_inline void
428coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
429{ 450{
430 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
434 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
437} 458}
438 459
439INLINE void 460ecb_inline void
440coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
441{ 462{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
452/* magic glue */ 473/* magic glue */
453 474
454#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
456 477
457#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
460 : mg_find (sv, type)) 481 : mg_find (sv, type))
461 482
462#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
465 : 0) 486 : 0)
466 487
467#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
468#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
469 490
470INLINE struct coro * 491ecb_inline MAGIC *
471SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
472{ 493{
473 HV *stash;
474 MAGIC *mg; 494 MAGIC *mg;
475 495
496 if (ecb_expect_true (
497 SvTYPE (coro) == SVt_PVHV
498 && (mg = CORO_MAGIC_state (coro))
499 && mg->mg_virtual == &coro_state_vtbl
500 ))
501 return mg;
502
503 return 0;
504}
505
506ecb_inline struct coro *
507SvSTATE_ (pTHX_ SV *coro_sv)
508{
509 MAGIC *mg;
510
476 if (SvROK (coro)) 511 if (SvROK (coro_sv))
477 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
478 513
479 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
480 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
481 517
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
492} 519}
493 520
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495 522
… …
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499 526
500/*****************************************************************************/ 527/*****************************************************************************/
501/* padlist management and caching */ 528/* padlist management and caching */
502 529
503static AV * 530ecb_inline PADLIST *
504coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
505{ 532{
506 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
507 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
508 538
509 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
510 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
511#if PERL_VERSION_ATLEAST (5,10,0)
512 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
513#else
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
515#endif 568#endif
516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
517 --AvFILLp (padlist);
518 569
519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
520 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
521 578
522 return newpadlist; 579 return newpadlist;
523} 580}
524 581
525static void 582ecb_inline void
526free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
527{ 584{
528 /* may be during global destruction */ 585 /* may be during global destruction */
529 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
530 { 587 {
531 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
532 589
533 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
534 { 591 {
535 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
536 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
537 I32 j = AvFILLp (av);
538 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
539 while (j >= 0) 599 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
541 601
542 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
543 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
544 } 605 }
545 606
546 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
547 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
548 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
549 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
550 } 617 }
551} 618}
552 619
553static int 620static int
554coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
555{ 622{
556 AV *padlist; 623 PADLIST *padlist;
557 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
558 626
559 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
561 return 0; 629 return 0;
562 630
563 /* casting is fun. */ 631 while (len--)
564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
565 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
566
567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
568 633
569 return 0; 634 return 0;
570} 635}
571 636
572static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
573 0, 0, 0, 0, 638 0, 0, 0, 0,
574 coro_cv_free 639 coro_cv_free
575}; 640};
576 641
577/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
578static void 643ecb_inline void
579get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
580{ 645{
581 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
582 AV *av; 647 size_t *lenp;
583 648
584 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
585 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
586 else 651 else
587 { 652 {
588#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
589 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
590 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
597#endif 662#endif
598 } 663 }
599} 664}
600 665
601static void 666ecb_inline void
602put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
603{ 668{
604 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
605 AV *av;
606 670
607 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
608 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
609 681
610 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
611
612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
613 av_extend (av, AvFILLp (av) + 1);
614
615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
616} 683}
617 684
618/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
619 686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
620/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
621static void 730static void
622swap_svs (pTHX_ Coro__State c) 731swap_svs (pTHX_ Coro__State c)
623{ 732{
624 int i; 733 int i;
625 734
626 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
627 { 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665} 737}
666 738
667#define SWAP_SVS(coro) \ 739#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \ 740 if (ecb_expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro)) 741 swap_svs (aTHX_ (coro))
670 742
671static void 743static void
672on_enterleave_call (pTHX_ SV *cb); 744on_enterleave_call (pTHX_ SV *cb);
673 745
… …
677 perl_slots *slot = c->slot; 749 perl_slots *slot = c->slot;
678 c->slot = 0; 750 c->slot = 0;
679 751
680 PL_mainstack = c->mainstack; 752 PL_mainstack = c->mainstack;
681 753
682 GvSV (PL_defgv) = slot->defsv; 754#if CORO_JIT
683 GvAV (PL_defgv) = slot->defav; 755 load_perl_slots (slot);
684 GvSV (PL_errgv) = slot->errsv; 756#else
685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
687
688 #define VAR(name,type) PL_ ## name = slot->name; 757 #define VARx(name,expr,type) expr = slot->name;
689 # include "state.h" 758 #include "state.h"
690 #undef VAR 759#endif
691 760
692 { 761 {
693 dSP; 762 dSP;
694 763
695 CV *cv; 764 CV *cv;
696 765
697 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
698 while (expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
699 { 768 {
700 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
701 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
702 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
703 } 772 }
704 773
705 PUTBACK; 774 PUTBACK;
706 } 775 }
707 776
708 slf_frame = c->slf_frame; 777 slf_frame = c->slf_frame;
709 CORO_THROW = c->except; 778 CORO_THROW = c->except;
710 779
711 if (expect_false (enable_times)) 780 if (ecb_expect_false (enable_times))
712 { 781 {
713 if (expect_false (!times_valid)) 782 if (ecb_expect_false (!times_valid))
714 coro_times_update (); 783 coro_times_update ();
715 784
716 coro_times_sub (c); 785 coro_times_sub (c);
717 } 786 }
718 787
719 if (expect_false (c->on_enter)) 788 if (ecb_expect_false (c->on_enter))
720 { 789 {
721 int i; 790 int i;
722 791
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
725 } 794 }
726 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
727 SWAP_SVS (c); 804 SWAP_SVS (c);
728} 805}
729 806
730static void 807static void
731save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
732{ 809{
733 SWAP_SVS (c); 810 SWAP_SVS (c);
734 811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
819
735 if (expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
736 { 821 {
737 int i; 822 int i;
738 823
739 for (i = AvFILLp (c->on_leave); i >= 0; --i) 824 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 825 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 } 826 }
742 827
743 times_valid = 0; 828 times_valid = 0;
744 829
745 if (expect_false (enable_times)) 830 if (ecb_expect_false (enable_times))
746 { 831 {
747 coro_times_update (); times_valid = 1; 832 coro_times_update (); times_valid = 1;
748 coro_times_add (c); 833 coro_times_add (c);
749 } 834 }
750 835
… …
764 849
765 XPUSHs (Nullsv); 850 XPUSHs (Nullsv);
766 /* this loop was inspired by pp_caller */ 851 /* this loop was inspired by pp_caller */
767 for (;;) 852 for (;;)
768 { 853 {
769 while (expect_true (cxix >= 0)) 854 while (ecb_expect_true (cxix >= 0))
770 { 855 {
771 PERL_CONTEXT *cx = &ccstk[cxix--]; 856 PERL_CONTEXT *cx = &ccstk[cxix--];
772 857
773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 858 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
774 { 859 {
775 CV *cv = cx->blk_sub.cv; 860 CV *cv = cx->blk_sub.cv;
776 861
777 if (expect_true (CvDEPTH (cv))) 862 if (ecb_expect_true (CvDEPTH (cv)))
778 { 863 {
779 EXTEND (SP, 3); 864 EXTEND (SP, 3);
780 PUSHs ((SV *)CvPADLIST (cv)); 865 PUSHs ((SV *)CvPADLIST (cv));
781 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 866 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
782 PUSHs ((SV *)cv); 867 PUSHs ((SV *)cv);
… …
785 get_padlist (aTHX_ cv); 870 get_padlist (aTHX_ cv);
786 } 871 }
787 } 872 }
788 } 873 }
789 874
790 if (expect_true (top_si->si_type == PERLSI_MAIN)) 875 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
791 break; 876 break;
792 877
793 top_si = top_si->si_prev; 878 top_si = top_si->si_prev;
794 ccstk = top_si->si_cxstack; 879 ccstk = top_si->si_cxstack;
795 cxix = top_si->si_cxix; 880 cxix = top_si->si_cxix;
… …
797 882
798 PUTBACK; 883 PUTBACK;
799 } 884 }
800 885
801 /* allocate some space on the context stack for our purposes */ 886 /* allocate some space on the context stack for our purposes */
802 /* we manually unroll here, as usually 2 slots is enough */ 887 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
803 if (SLOT_COUNT >= 1) CXINC;
804 if (SLOT_COUNT >= 2) CXINC;
805 if (SLOT_COUNT >= 3) CXINC;
806 { 888 {
807 unsigned int i; 889 unsigned int i;
890
808 for (i = 3; i < SLOT_COUNT; ++i) 891 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 892 CXINC;
810 } 893
811 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 894 cxstack_ix -= SLOT_COUNT; /* undo allocation */
895 }
812 896
813 c->mainstack = PL_mainstack; 897 c->mainstack = PL_mainstack;
814 898
815 { 899 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 900 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 901
818 slot->defav = GvAV (PL_defgv); 902#if CORO_JIT
819 slot->defsv = DEFSV; 903 save_perl_slots (slot);
820 slot->errsv = ERRSV; 904#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 905 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 906 #include "state.h"
826 #undef VAR 907#endif
827 } 908 }
828} 909}
829 910
830/* 911/*
831 * allocate various perl stacks. This is almost an exact copy 912 * allocate various perl stacks. This is almost an exact copy
… …
837# define coro_init_stacks(thx) init_stacks () 918# define coro_init_stacks(thx) init_stacks ()
838#else 919#else
839static void 920static void
840coro_init_stacks (pTHX) 921coro_init_stacks (pTHX)
841{ 922{
842 PL_curstackinfo = new_stackinfo(32, 8); 923 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
843 PL_curstackinfo->si_type = PERLSI_MAIN; 924 PL_curstackinfo->si_type = PERLSI_MAIN;
844 PL_curstack = PL_curstackinfo->si_stack; 925 PL_curstack = PL_curstackinfo->si_stack;
845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 926 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
846 927
847 PL_stack_base = AvARRAY(PL_curstack); 928 PL_stack_base = AvARRAY(PL_curstack);
… …
862#endif 943#endif
863 944
864 New(54,PL_scopestack,8,I32); 945 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 946 PL_scopestack_ix = 0;
866 PL_scopestack_max = 8; 947 PL_scopestack_max = 8;
948#if HAS_SCOPESTACK_NAME
949 New(54,PL_scopestack_name,8,const char*);
950#endif
867 951
868 New(54,PL_savestack,24,ANY); 952 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 953 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 954 PL_savestack_max = 24;
871 955
… …
899 } 983 }
900 984
901 Safefree (PL_tmps_stack); 985 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 986 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 987 Safefree (PL_scopestack);
988#if HAS_SCOPESTACK_NAME
989 Safefree (PL_scopestack_name);
990#endif
904 Safefree (PL_savestack); 991 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 993 Safefree (PL_retstack);
907#endif 994#endif
908} 995}
… …
954#endif 1041#endif
955 1042
956/* 1043/*
957 * This overrides the default magic get method of %SIG elements. 1044 * This overrides the default magic get method of %SIG elements.
958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1045 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
959 * and instead of trying to save and restore the hash elements, we just provide 1046 * and instead of trying to save and restore the hash elements (extremely slow),
960 * readback here. 1047 * we just provide our own readback here.
961 */ 1048 */
962static int 1049static int ecb_cold
963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
964{ 1051{
965 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
966 1053
967 if (*s == '_') 1054 if (*s == '_')
968 { 1055 {
969 SV **svp = 0; 1056 SV **svp = 0;
970 1057
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1060
974 if (svp) 1061 if (svp)
975 { 1062 {
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1063 SV *ssv;
1064
1065 if (!*svp)
1066 ssv = &PL_sv_undef;
1067 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1068 ssv = sv_2mortal (newRV_inc (*svp));
1069 else
1070 ssv = *svp;
1071
1072 sv_setsv (sv, ssv);
977 return 0; 1073 return 0;
978 } 1074 }
979 } 1075 }
980 1076
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1077 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
982} 1078}
983 1079
984static int 1080static int ecb_cold
985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1081coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
986{ 1082{
987 const char *s = MgPV_nolen_const (mg); 1083 const char *s = MgPV_nolen_const (mg);
988 1084
989 if (*s == '_') 1085 if (*s == '_')
… …
1003 } 1099 }
1004 1100
1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1101 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1006} 1102}
1007 1103
1008static int 1104static int ecb_cold
1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1105coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1010{ 1106{
1011 const char *s = MgPV_nolen_const (mg); 1107 const char *s = MgPV_nolen_const (mg);
1012 1108
1013 if (*s == '_') 1109 if (*s == '_')
… …
1048 return 1; 1144 return 1;
1049} 1145}
1050 1146
1051static UNOP init_perl_op; 1147static UNOP init_perl_op;
1052 1148
1053static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1149ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1054init_perl (pTHX_ struct coro *coro) 1150init_perl (pTHX_ struct coro *coro)
1055{ 1151{
1056 /* 1152 /*
1057 * emulate part of the perl startup here. 1153 * emulate part of the perl startup here.
1058 */ 1154 */
… …
1073 PL_parser = 0; 1169 PL_parser = 0;
1074#endif 1170#endif
1075 PL_hints = 0; 1171 PL_hints = 0;
1076 1172
1077 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1176
1081 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1086 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1088 1187
1089 { 1188 {
1090 dSP; 1189 dSP;
… …
1105 /* this newly created coroutine might be run on an existing cctx which most 1204 /* this newly created coroutine might be run on an existing cctx which most
1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1205 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1107 */ 1206 */
1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1207 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1208 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1209 slf_frame.destroy = 0;
1110 1210
1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1211 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1112 init_perl_op.op_next = PL_op; 1212 init_perl_op.op_next = PL_op;
1113 init_perl_op.op_type = OP_ENTERSUB; 1213 init_perl_op.op_type = OP_ENTERSUB;
1114 init_perl_op.op_ppaddr = pp_slf; 1214 init_perl_op.op_ppaddr = pp_slf;
… …
1119 /* copy throw, in case it was set before init_perl */ 1219 /* copy throw, in case it was set before init_perl */
1120 CORO_THROW = coro->except; 1220 CORO_THROW = coro->except;
1121 1221
1122 SWAP_SVS (coro); 1222 SWAP_SVS (coro);
1123 1223
1124 if (expect_false (enable_times)) 1224 if (ecb_expect_false (enable_times))
1125 { 1225 {
1126 coro_times_update (); 1226 coro_times_update ();
1127 coro_times_sub (coro); 1227 coro_times_sub (coro);
1128 } 1228 }
1129} 1229}
… …
1153destroy_perl (pTHX_ struct coro *coro) 1253destroy_perl (pTHX_ struct coro *coro)
1154{ 1254{
1155 SV *svf [9]; 1255 SV *svf [9];
1156 1256
1157 { 1257 {
1258 SV *old_current = SvRV (coro_current);
1158 struct coro *current = SvSTATE_current; 1259 struct coro *current = SvSTATE (old_current);
1159 1260
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1261 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161 1262
1162 save_perl (aTHX_ current); 1263 save_perl (aTHX_ current);
1264
1265 /* this will cause transfer_check to croak on block*/
1266 SvRV_set (coro_current, (SV *)coro->hv);
1267
1163 load_perl (aTHX_ coro); 1268 load_perl (aTHX_ coro);
1164 1269
1165 coro_unwind_stacks (aTHX); 1270 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
1167 1271
1168 /* restore swapped sv's */ 1272 /* restore swapped sv's */
1169 SWAP_SVS (coro); 1273 SWAP_SVS (coro);
1170 1274
1275 coro_destruct_stacks (aTHX);
1276
1171 // now save some sv's to be free'd later 1277 /* now save some sv's to be free'd later */
1172 svf [0] = GvSV (PL_defgv); 1278 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv); 1279 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv); 1280 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv; 1281 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs; 1282 svf [4] = PL_rs;
… …
1178 svf [6] = (SV *)GvHV (PL_hintgv); 1284 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook; 1285 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook; 1286 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf)); 1287 assert (9 == sizeof (svf) / sizeof (*svf));
1182 1288
1289 SvRV_set (coro_current, old_current);
1290
1183 load_perl (aTHX_ current); 1291 load_perl (aTHX_ current);
1184 } 1292 }
1185 1293
1186 { 1294 {
1187 unsigned int i; 1295 unsigned int i;
… …
1191 1299
1192 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1193 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1194 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1195 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1196 } 1306 }
1197} 1307}
1198 1308
1199INLINE void 1309ecb_inline void
1200free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
1201{ 1311{
1202 if (expect_true (coro_mortal)) 1312 if (ecb_expect_true (coro_mortal))
1203 { 1313 {
1204 SvREFCNT_dec (coro_mortal); 1314 SvREFCNT_dec ((SV *)coro_mortal);
1205 coro_mortal = 0; 1315 coro_mortal = 0;
1206 } 1316 }
1207} 1317}
1208 1318
1209static int 1319static int
… …
1263 1373
1264 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1265 { 1375 {
1266 SV **cb; 1376 SV **cb;
1267 1377
1268 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1269 { 1379 {
1270 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1271 1381
1272 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1273 { 1383 {
… …
1342 1452
1343 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1453 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1344} 1454}
1345 1455
1346/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1456/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1347static void NOINLINE 1457static void ecb_noinline
1348cctx_prepare (pTHX) 1458cctx_prepare (pTHX)
1349{ 1459{
1350 PL_top_env = &PL_start_env; 1460 PL_top_env = &PL_start_env;
1351 1461
1352 if (cctx_current->flags & CC_TRACE) 1462 if (cctx_current->flags & CC_TRACE)
… …
1363 slf_frame.prepare = slf_prepare_set_stacklevel; 1473 slf_frame.prepare = slf_prepare_set_stacklevel;
1364 slf_frame.check = slf_check_set_stacklevel; 1474 slf_frame.check = slf_check_set_stacklevel;
1365} 1475}
1366 1476
1367/* the tail of transfer: execute stuff we can only do after a transfer */ 1477/* the tail of transfer: execute stuff we can only do after a transfer */
1368INLINE void 1478ecb_inline void
1369transfer_tail (pTHX) 1479transfer_tail (pTHX)
1370{ 1480{
1371 free_coro_mortal (aTHX); 1481 free_coro_mortal (aTHX);
1482}
1483
1484/* try to exit the same way perl's main function would do */
1485/* we do not bother resetting the environment or other things *7
1486/* that are not, uhm, essential */
1487/* this obviously also doesn't work when perl is embedded */
1488static void ecb_noinline ecb_cold
1489perlish_exit (pTHX)
1490{
1491 int exitstatus = perl_destruct (PL_curinterp);
1492 perl_free (PL_curinterp);
1493 exit (exitstatus);
1372} 1494}
1373 1495
1374/* 1496/*
1375 * this is a _very_ stripped down perl interpreter ;) 1497 * this is a _very_ stripped down perl interpreter ;)
1376 */ 1498 */
… …
1405 */ 1527 */
1406 1528
1407 /* 1529 /*
1408 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1409 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1410 * reason for perl_run to return. We try to exit by jumping to the 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1411 * bootstrap-time "top" top_env, as we cannot restore the "main" 1533 * doing in that case. YMMV.
1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1415 */ 1534 */
1416 PL_top_env = main_top_env; 1535 perlish_exit (aTHX);
1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1418 } 1536 }
1419} 1537}
1420 1538
1421static coro_cctx * 1539static coro_cctx *
1422cctx_new () 1540cctx_new (void)
1423{ 1541{
1424 coro_cctx *cctx; 1542 coro_cctx *cctx;
1425 1543
1426 ++cctx_count; 1544 ++cctx_count;
1427 New (0, cctx, 1, coro_cctx); 1545 New (0, cctx, 1, coro_cctx);
… …
1433 return cctx; 1551 return cctx;
1434} 1552}
1435 1553
1436/* create a new cctx only suitable as source */ 1554/* create a new cctx only suitable as source */
1437static coro_cctx * 1555static coro_cctx *
1438cctx_new_empty () 1556cctx_new_empty (void)
1439{ 1557{
1440 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1441 1559
1442 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1443 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1444 1562
1445 return cctx; 1563 return cctx;
1446} 1564}
1447 1565
1448/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1449static coro_cctx * 1567static coro_cctx *
1450cctx_new_run () 1568cctx_new_run (void)
1451{ 1569{
1452 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1453 void *stack_start;
1454 size_t stack_size;
1455 1571
1456#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1457 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1458 /* mmap supposedly does allocate-on-write for us */
1459 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1460
1461 if (cctx->sptr != (void *)-1)
1462 {
1463 #if CORO_STACKGUARD
1464 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1465 #endif
1466 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1467 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1468 cctx->flags |= CC_MAPPED;
1469 } 1573 {
1470 else
1471#endif
1472 {
1473 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1474 New (0, cctx->sptr, cctx_stacksize, long);
1475
1476 if (!cctx->sptr)
1477 {
1478 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1479 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1480 }
1481
1482 stack_start = cctx->sptr;
1483 stack_size = cctx->ssize;
1484 } 1576 }
1485 1577
1486 #if CORO_USE_VALGRIND
1487 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1488 #endif
1489
1490 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1491 1579
1492 return cctx; 1580 return cctx;
1493} 1581}
1494 1582
1495static void 1583static void
1496cctx_destroy (coro_cctx *cctx) 1584cctx_destroy (coro_cctx *cctx)
1497{ 1585{
1498 if (!cctx) 1586 if (!cctx)
1499 return; 1587 return;
1500 1588
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1502 1590
1503 --cctx_count; 1591 --cctx_count;
1504 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1505 1593
1506 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1507 if (cctx->sptr)
1508 {
1509 #if CORO_USE_VALGRIND
1510 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1511 #endif
1512
1513#if HAVE_MMAP
1514 if (cctx->flags & CC_MAPPED)
1515 munmap (cctx->sptr, cctx->ssize);
1516 else
1517#endif
1518 Safefree (cctx->sptr);
1519 }
1520 1595
1521 Safefree (cctx); 1596 Safefree (cctx);
1522} 1597}
1523 1598
1524/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
1525#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1600#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1526 1601
1527static coro_cctx * 1602static coro_cctx *
1528cctx_get (pTHX) 1603cctx_get (pTHX)
1529{ 1604{
1530 while (expect_true (cctx_first)) 1605 while (ecb_expect_true (cctx_first))
1531 { 1606 {
1532 coro_cctx *cctx = cctx_first; 1607 coro_cctx *cctx = cctx_first;
1533 cctx_first = cctx->next; 1608 cctx_first = cctx->next;
1534 --cctx_idle; 1609 --cctx_idle;
1535 1610
1536 if (expect_true (!CCTX_EXPIRED (cctx))) 1611 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1537 return cctx; 1612 return cctx;
1538 1613
1539 cctx_destroy (cctx); 1614 cctx_destroy (cctx);
1540 } 1615 }
1541 1616
… …
1543} 1618}
1544 1619
1545static void 1620static void
1546cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1547{ 1622{
1548 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1549 1624
1550 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1551 if (expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1552 { 1627 {
1553 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
1554 cctx_first = first->next; 1629 cctx_first = first->next;
1555 --cctx_idle; 1630 --cctx_idle;
1556 1631
… …
1567static void 1642static void
1568transfer_check (pTHX_ struct coro *prev, struct coro *next) 1643transfer_check (pTHX_ struct coro *prev, struct coro *next)
1569{ 1644{
1570 /* TODO: throwing up here is considered harmful */ 1645 /* TODO: throwing up here is considered harmful */
1571 1646
1572 if (expect_true (prev != next)) 1647 if (ecb_expect_true (prev != next))
1573 { 1648 {
1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1649 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1650 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1576 1651
1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1652 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1653 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1579 1654
1580#if !PERL_VERSION_ATLEAST (5,10,0) 1655#if !PERL_VERSION_ATLEAST (5,10,0)
1581 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1656 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1657 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1583#endif 1658#endif
1584 } 1659 }
1585} 1660}
1586 1661
1587/* always use the TRANSFER macro */ 1662/* always use the TRANSFER macro */
1588static void NOINLINE /* noinline so we have a fixed stackframe */ 1663static void ecb_noinline /* noinline so we have a fixed stackframe */
1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1664transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1590{ 1665{
1591 dSTACKLEVEL; 1666 dSTACKLEVEL;
1592 1667
1593 /* sometimes transfer is only called to set idle_sp */ 1668 /* sometimes transfer is only called to set idle_sp */
1594 if (expect_false (!prev)) 1669 if (ecb_expect_false (!prev))
1595 { 1670 {
1596 cctx_current->idle_sp = STACKLEVEL; 1671 cctx_current->idle_sp = STACKLEVEL;
1597 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1672 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1598 } 1673 }
1599 else if (expect_true (prev != next)) 1674 else if (ecb_expect_true (prev != next))
1600 { 1675 {
1601 coro_cctx *cctx_prev; 1676 coro_cctx *cctx_prev;
1602 1677
1603 if (expect_false (prev->flags & CF_NEW)) 1678 if (ecb_expect_false (prev->flags & CF_NEW))
1604 { 1679 {
1605 /* create a new empty/source context */ 1680 /* create a new empty/source context */
1606 prev->flags &= ~CF_NEW; 1681 prev->flags &= ~CF_NEW;
1607 prev->flags |= CF_RUNNING; 1682 prev->flags |= CF_RUNNING;
1608 } 1683 }
… …
1611 next->flags |= CF_RUNNING; 1686 next->flags |= CF_RUNNING;
1612 1687
1613 /* first get rid of the old state */ 1688 /* first get rid of the old state */
1614 save_perl (aTHX_ prev); 1689 save_perl (aTHX_ prev);
1615 1690
1616 if (expect_false (next->flags & CF_NEW)) 1691 if (ecb_expect_false (next->flags & CF_NEW))
1617 { 1692 {
1618 /* need to start coroutine */ 1693 /* need to start coroutine */
1619 next->flags &= ~CF_NEW; 1694 next->flags &= ~CF_NEW;
1620 /* setup coroutine call */ 1695 /* setup coroutine call */
1621 init_perl (aTHX_ next); 1696 init_perl (aTHX_ next);
1622 } 1697 }
1623 else 1698 else
1624 load_perl (aTHX_ next); 1699 load_perl (aTHX_ next);
1625 1700
1626 /* possibly untie and reuse the cctx */ 1701 /* possibly untie and reuse the cctx */
1627 if (expect_true ( 1702 if (ecb_expect_true (
1628 cctx_current->idle_sp == STACKLEVEL 1703 cctx_current->idle_sp == STACKLEVEL
1629 && !(cctx_current->flags & CC_TRACE) 1704 && !(cctx_current->flags & CC_TRACE)
1630 && !force_cctx 1705 && !force_cctx
1631 )) 1706 ))
1632 { 1707 {
1633 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1708 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1634 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1709 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1635 1710
1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1711 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1637 /* without this the next cctx_get might destroy the running cctx while still in use */ 1712 /* without this the next cctx_get might destroy the running cctx while still in use */
1638 if (expect_false (CCTX_EXPIRED (cctx_current))) 1713 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1639 if (expect_true (!next->cctx)) 1714 if (ecb_expect_true (!next->cctx))
1640 next->cctx = cctx_get (aTHX); 1715 next->cctx = cctx_get (aTHX);
1641 1716
1642 cctx_put (cctx_current); 1717 cctx_put (cctx_current);
1643 } 1718 }
1644 else 1719 else
1645 prev->cctx = cctx_current; 1720 prev->cctx = cctx_current;
1646 1721
1647 ++next->usecount; 1722 ++next->usecount;
1648 1723
1649 cctx_prev = cctx_current; 1724 cctx_prev = cctx_current;
1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1725 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1651 1726
1652 next->cctx = 0; 1727 next->cctx = 0;
1653 1728
1654 if (expect_false (cctx_prev != cctx_current)) 1729 if (ecb_expect_false (cctx_prev != cctx_current))
1655 { 1730 {
1656 cctx_prev->top_env = PL_top_env; 1731 cctx_prev->top_env = PL_top_env;
1657 PL_top_env = cctx_current->top_env; 1732 PL_top_env = cctx_current->top_env;
1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1733 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1659 } 1734 }
… …
1665#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1740#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1666#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1741#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1667 1742
1668/** high level stuff ********************************************************/ 1743/** high level stuff ********************************************************/
1669 1744
1745/* this function is actually Coro, not Coro::State, but we call it from here */
1746/* because it is convenient - but it hasn't been declared yet for that reason */
1670static int 1747static void
1748coro_call_on_destroy (pTHX_ struct coro *coro);
1749
1750static void
1671coro_state_destroy (pTHX_ struct coro *coro) 1751coro_state_destroy (pTHX_ struct coro *coro)
1672{ 1752{
1673 if (coro->flags & CF_DESTROYED) 1753 if (coro->flags & CF_ZOMBIE)
1674 return 0; 1754 return;
1675 1755
1676 if (coro->on_destroy && !PL_dirty)
1677 coro->on_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1678 1757
1679 coro->flags |= CF_DESTROYED; 1758 coro->flags |= CF_ZOMBIE;
1680 1759
1681 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1682 { 1761 {
1683 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1684 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1685 --coro_nready; 1764 --coro_nready;
1686 } 1765 }
1687 else 1766 else
1688 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1767 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1768
1769 if (coro->next) coro->next->prev = coro->prev;
1770 if (coro->prev) coro->prev->next = coro->next;
1771 if (coro == coro_first) coro_first = coro->next;
1689 1772
1690 if (coro->mainstack 1773 if (coro->mainstack
1691 && coro->mainstack != main_mainstack 1774 && coro->mainstack != main_mainstack
1692 && coro->slot 1775 && coro->slot
1693 && !PL_dirty) 1776 && !PL_dirty)
1694 destroy_perl (aTHX_ coro); 1777 destroy_perl (aTHX_ coro);
1695 1778
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1699
1700 cctx_destroy (coro->cctx); 1779 cctx_destroy (coro->cctx);
1701 SvREFCNT_dec (coro->startcv); 1780 SvREFCNT_dec (coro->startcv);
1702 SvREFCNT_dec (coro->args); 1781 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv); 1782 SvREFCNT_dec (coro->swap_sv);
1704 SvREFCNT_dec (CORO_THROW); 1783 SvREFCNT_dec (CORO_THROW);
1705 1784
1706 return 1; 1785 coro_call_on_destroy (aTHX_ coro);
1786
1787 /* more destruction mayhem in coro_state_free */
1707} 1788}
1708 1789
1709static int 1790static int
1710coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1791coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1711{ 1792{
1712 struct coro *coro = (struct coro *)mg->mg_ptr; 1793 struct coro *coro = (struct coro *)mg->mg_ptr;
1713 mg->mg_ptr = 0; 1794 mg->mg_ptr = 0;
1714 1795
1715 coro->hv = 0;
1716
1717 if (--coro->refcnt < 0)
1718 {
1719 coro_state_destroy (aTHX_ coro); 1796 coro_state_destroy (aTHX_ coro);
1797 SvREFCNT_dec (coro->on_destroy);
1798 SvREFCNT_dec (coro->status);
1799
1720 Safefree (coro); 1800 Safefree (coro);
1721 }
1722 1801
1723 return 0; 1802 return 0;
1724} 1803}
1725 1804
1726static int 1805static int ecb_cold
1727coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1806coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1728{ 1807{
1729 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 /* called when perl clones the current process the slow way (windows process emulation) */
1730 1809 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1731 ++coro->refcnt; 1810 mg->mg_ptr = 0;
1811 mg->mg_virtual = 0;
1732 1812
1733 return 0; 1813 return 0;
1734} 1814}
1735 1815
1736static MGVTBL coro_state_vtbl = { 1816static MGVTBL coro_state_vtbl = {
… …
1761 TRANSFER (ta, 1); 1841 TRANSFER (ta, 1);
1762} 1842}
1763 1843
1764/** Coro ********************************************************************/ 1844/** Coro ********************************************************************/
1765 1845
1766INLINE void 1846ecb_inline void
1767coro_enq (pTHX_ struct coro *coro) 1847coro_enq (pTHX_ struct coro *coro)
1768{ 1848{
1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1849 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1770 1850
1771 SvREFCNT_inc_NN (coro->hv); 1851 SvREFCNT_inc_NN (coro->hv);
… …
1773 coro->next_ready = 0; 1853 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1854 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro; 1855 ready [1] = coro;
1776} 1856}
1777 1857
1778INLINE struct coro * 1858ecb_inline struct coro *
1779coro_deq (pTHX) 1859coro_deq (pTHX)
1780{ 1860{
1781 int prio; 1861 int prio;
1782 1862
1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1863 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1836{ 1916{
1837 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1917 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1838} 1918}
1839 1919
1840/* expects to own a reference to next->hv */ 1920/* expects to own a reference to next->hv */
1841INLINE void 1921ecb_inline void
1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1922prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1843{ 1923{
1844 SV *prev_sv = SvRV (coro_current); 1924 SV *prev_sv = SvRV (coro_current);
1845 1925
1846 ta->prev = SvSTATE_hv (prev_sv); 1926 ta->prev = SvSTATE_hv (prev_sv);
… …
1859{ 1939{
1860 for (;;) 1940 for (;;)
1861 { 1941 {
1862 struct coro *next = coro_deq (aTHX); 1942 struct coro *next = coro_deq (aTHX);
1863 1943
1864 if (expect_true (next)) 1944 if (ecb_expect_true (next))
1865 { 1945 {
1866 /* cannot transfer to destroyed coros, skip and look for next */ 1946 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1947 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1948 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1869 else 1949 else
1870 { 1950 {
1871 next->flags &= ~CF_READY; 1951 next->flags &= ~CF_READY;
1872 --coro_nready; 1952 --coro_nready;
… …
1880 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1883 { 1963 {
1884 if (SvRV (sv_idle) == SvRV (coro_current)) 1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1886 1983
1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1888 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready; 1986 --coro_nready;
1890 } 1987 }
… …
1905 } 2002 }
1906 } 2003 }
1907 } 2004 }
1908} 2005}
1909 2006
1910INLINE void 2007ecb_inline void
1911prepare_cede (pTHX_ struct coro_transfer_args *ta) 2008prepare_cede (pTHX_ struct coro_transfer_args *ta)
1912{ 2009{
1913 api_ready (aTHX_ coro_current); 2010 api_ready (aTHX_ coro_current);
1914 prepare_schedule (aTHX_ ta); 2011 prepare_schedule (aTHX_ ta);
1915} 2012}
1916 2013
1917INLINE void 2014ecb_inline void
1918prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2015prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1919{ 2016{
1920 SV *prev = SvRV (coro_current); 2017 SV *prev = SvRV (coro_current);
1921 2018
1922 if (coro_nready) 2019 if (coro_nready)
… …
1952{ 2049{
1953 struct coro_transfer_args ta; 2050 struct coro_transfer_args ta;
1954 2051
1955 prepare_cede (aTHX_ &ta); 2052 prepare_cede (aTHX_ &ta);
1956 2053
1957 if (expect_true (ta.prev != ta.next)) 2054 if (ecb_expect_true (ta.prev != ta.next))
1958 { 2055 {
1959 TRANSFER (ta, 1); 2056 TRANSFER (ta, 1);
1960 return 1; 2057 return 1;
1961 } 2058 }
1962 else 2059 else
… …
2005 coro->slot->runops = RUNOPS_DEFAULT; 2102 coro->slot->runops = RUNOPS_DEFAULT;
2006 } 2103 }
2007} 2104}
2008 2105
2009static void 2106static void
2107coro_push_av (pTHX_ AV *av, I32 gimme_v)
2108{
2109 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2110 {
2111 dSP;
2112
2113 if (gimme_v == G_SCALAR)
2114 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2115 else
2116 {
2117 int i;
2118 EXTEND (SP, AvFILLp (av) + 1);
2119
2120 for (i = 0; i <= AvFILLp (av); ++i)
2121 PUSHs (AvARRAY (av)[i]);
2122 }
2123
2124 PUTBACK;
2125 }
2126}
2127
2128static void
2129coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2130{
2131 if (!coro->on_destroy)
2132 coro->on_destroy = newAV ();
2133
2134 av_push (coro->on_destroy, cb);
2135}
2136
2137static void
2138slf_destroy_join (pTHX_ struct CoroSLF *frame)
2139{
2140 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2141}
2142
2143static int
2144slf_check_join (pTHX_ struct CoroSLF *frame)
2145{
2146 struct coro *coro = (struct coro *)frame->data;
2147
2148 if (!coro->status)
2149 return 1;
2150
2151 frame->destroy = 0;
2152
2153 coro_push_av (aTHX_ coro->status, GIMME_V);
2154
2155 SvREFCNT_dec ((SV *)coro->hv);
2156
2157 return 0;
2158}
2159
2160static void
2161slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2162{
2163 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2164
2165 if (items > 1)
2166 croak ("join called with too many arguments");
2167
2168 if (coro->status)
2169 frame->prepare = prepare_nop;
2170 else
2171 {
2172 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2173 frame->prepare = prepare_schedule;
2174 }
2175
2176 frame->check = slf_check_join;
2177 frame->destroy = slf_destroy_join;
2178 frame->data = (void *)coro;
2179 SvREFCNT_inc (coro->hv);
2180}
2181
2182static void
2010coro_call_on_destroy (pTHX_ struct coro *coro) 2183coro_call_on_destroy (pTHX_ struct coro *coro)
2011{ 2184{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2185 AV *od = coro->on_destroy;
2013 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2014 2186
2015 if (on_destroyp) 2187 if (!od)
2016 { 2188 return;
2017 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2018 2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2192
2019 while (AvFILLp (on_destroy) >= 0) 2193 while (AvFILLp (od) >= 0)
2194 {
2195 SV *cb = sv_2mortal (av_pop (od));
2196
2197 /* coro hv's (and only hv's at the moment) are supported as well */
2198 if (SvSTATEhv_p (aTHX_ cb))
2199 api_ready (aTHX_ cb);
2200 else
2020 { 2201 {
2021 dSP; /* don't disturb outer sp */ 2202 dSP; /* don't disturb outer sp */
2022 SV *cb = av_pop (on_destroy);
2023
2024 PUSHMARK (SP); 2203 PUSHMARK (SP);
2025 2204
2026 if (statusp) 2205 if (coro->status)
2027 { 2206 {
2028 int i; 2207 PUTBACK;
2029 AV *status = (AV *)SvRV (*statusp); 2208 coro_push_av (aTHX_ coro->status, G_ARRAY);
2030 EXTEND (SP, AvFILLp (status) + 1); 2209 SPAGAIN;
2031
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 } 2210 }
2035 2211
2036 PUTBACK; 2212 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2213 call_sv (cb, G_VOID | G_DISCARD);
2038 } 2214 }
2039 } 2215 }
2040} 2216}
2041 2217
2042static void 2218static void
2043slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2044{ 2220{
2045 int i; 2221 AV *av;
2046 HV *hv = (HV *)SvRV (coro_current); 2222
2047 AV *av = newAV (); 2223 if (coro->status)
2224 {
2225 av = coro->status;
2226 av_clear (av);
2227 }
2228 else
2229 av = coro->status = newAV ();
2048 2230
2049 /* items are actually not so common, so optimise for this case */ 2231 /* items are actually not so common, so optimise for this case */
2050 if (items) 2232 if (items)
2051 { 2233 {
2234 int i;
2235
2052 av_extend (av, items - 1); 2236 av_extend (av, items - 1);
2053 2237
2054 for (i = 0; i < items; ++i) 2238 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i])); 2239 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 } 2240 }
2241}
2057 2242
2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2243static void
2059 2244slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2245{
2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2246 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2061 api_ready (aTHX_ sv_manager); 2247 api_ready (aTHX_ sv_manager);
2062 2248
2063 frame->prepare = prepare_schedule; 2249 frame->prepare = prepare_schedule;
2064 frame->check = slf_check_repeat; 2250 frame->check = slf_check_repeat;
2065 2251
2066 /* as a minor optimisation, we could unwind all stacks here */ 2252 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */ 2253 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/ 2254 /*coro_unwind_stacks (aTHX);*/
2255}
2256
2257static void
2258slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2259{
2260 HV *coro_hv = (HV *)SvRV (coro_current);
2261
2262 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2263 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2264}
2265
2266static void
2267slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2268{
2269 HV *coro_hv;
2270 struct coro *coro;
2271
2272 if (items <= 0)
2273 croak ("Coro::cancel called without coro object,");
2274
2275 coro = SvSTATE (arg [0]);
2276 coro_hv = coro->hv;
2277
2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2279
2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2281 {
2282 /* coro currently busy cancelling something, so just notify it */
2283 coro->slf_frame.data = (void *)coro;
2284
2285 frame->prepare = prepare_nop;
2286 frame->check = slf_check_nop;
2287 }
2288 else if (coro_hv == (HV *)SvRV (coro_current))
2289 {
2290 /* cancelling the current coro is allowed, and equals terminate */
2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2292 }
2293 else
2294 {
2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2299
2300 /* otherwise we cancel directly, purely for speed reasons
2301 * unfortunately, this requires some magic trickery, as
2302 * somebody else could cancel us, so we have to fight the cancellation.
2303 * this is ugly, and hopefully fully worth the extra speed.
2304 * besides, I can't get the slow-but-safe version working...
2305 */
2306 slf_frame.data = 0;
2307 self->flags |= CF_NOCANCEL;
2308 coro_state_destroy (aTHX_ coro);
2309 self->flags &= ~CF_NOCANCEL;
2310
2311 if (slf_frame.data)
2312 {
2313 /* while we were busy we have been cancelled, so terminate */
2314 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2315 }
2316 else
2317 {
2318 frame->prepare = prepare_nop;
2319 frame->check = slf_check_nop;
2320 }
2321 }
2322}
2323
2324static int
2325slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2326{
2327 frame->prepare = 0;
2328 coro_unwind_stacks (aTHX);
2329
2330 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2331
2332 return 1;
2333}
2334
2335static int
2336safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2337{
2338 if (coro->cctx)
2339 croak ("coro inside C callback, unable to cancel at this time, caught");
2340
2341 if (coro->flags & CF_NEW)
2342 {
2343 coro_set_status (aTHX_ coro, arg, items);
2344 coro_state_destroy (aTHX_ coro);
2345 }
2346 else
2347 {
2348 if (!coro->slf_frame.prepare)
2349 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2350
2351 slf_destroy (aTHX_ coro);
2352
2353 coro_set_status (aTHX_ coro, arg, items);
2354 coro->slf_frame.prepare = prepare_nop;
2355 coro->slf_frame.check = slf_check_safe_cancel;
2356
2357 api_ready (aTHX_ (SV *)coro->hv);
2358 }
2359
2360 return 1;
2069} 2361}
2070 2362
2071/*****************************************************************************/ 2363/*****************************************************************************/
2072/* async pool handler */ 2364/* async pool handler */
2073 2365
… …
2104slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2396slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2105{ 2397{
2106 HV *hv = (HV *)SvRV (coro_current); 2398 HV *hv = (HV *)SvRV (coro_current);
2107 struct coro *coro = SvSTATE_hv ((SV *)hv); 2399 struct coro *coro = SvSTATE_hv ((SV *)hv);
2108 2400
2109 if (expect_true (coro->saved_deffh)) 2401 if (ecb_expect_true (coro->saved_deffh))
2110 { 2402 {
2111 /* subsequent iteration */ 2403 /* subsequent iteration */
2112 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2404 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2113 coro->saved_deffh = 0; 2405 coro->saved_deffh = 0;
2114 2406
2115 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2407 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2116 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2408 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2117 { 2409 {
2118 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2410 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2119 coro->invoke_av = newAV (); 2411 return;
2120
2121 frame->prepare = prepare_nop;
2122 } 2412 }
2123 else 2413 else
2124 { 2414 {
2125 av_clear (GvAV (PL_defgv)); 2415 av_clear (GvAV (PL_defgv));
2126 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2416 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2176 2466
2177static int 2467static int
2178slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2179{ 2469{
2180 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
2181 2471
2182 if (CORO_THROW) 2472 if (CORO_THROW)
2183 return 0; 2473 return 0;
2184 2474
2185 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2186 return 1; 2476 return 1;
… …
2222 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
2223 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
2224 } 2514 }
2225 2515
2226 if (!SvROK (cb) 2516 if (!SvROK (cb)
2227 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2229 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
2230 2520
2231 { 2521 {
2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2349static void 2639static void
2350slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2640slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2351{ 2641{
2352 frame->prepare = prepare_cede_notself; 2642 frame->prepare = prepare_cede_notself;
2353 frame->check = slf_check_nop; 2643 frame->check = slf_check_nop;
2644}
2645
2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2647static void
2648slf_destroy (pTHX_ struct coro *coro)
2649{
2650 struct CoroSLF frame = coro->slf_frame;
2651
2652 /*
2653 * The on_destroy below most likely is from an SLF call.
2654 * Since by definition the SLF call will not finish when we destroy
2655 * the coro, we will have to force-finish it here, otherwise
2656 * cleanup functions cannot call SLF functions.
2657 */
2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2354} 2663}
2355 2664
2356/* 2665/*
2357 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2358 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
… …
2365 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2674 I32 checkmark; /* mark SP to see how many elements check has pushed */
2366 2675
2367 /* set up the slf frame, unless it has already been set-up */ 2676 /* set up the slf frame, unless it has already been set-up */
2368 /* the latter happens when a new coro has been started */ 2677 /* the latter happens when a new coro has been started */
2369 /* or when a new cctx was attached to an existing coroutine */ 2678 /* or when a new cctx was attached to an existing coroutine */
2370 if (expect_true (!slf_frame.prepare)) 2679 if (ecb_expect_true (!slf_frame.prepare))
2371 { 2680 {
2372 /* first iteration */ 2681 /* first iteration */
2373 dSP; 2682 dSP;
2374 SV **arg = PL_stack_base + TOPMARK + 1; 2683 SV **arg = PL_stack_base + TOPMARK + 1;
2375 int items = SP - arg; /* args without function object */ 2684 int items = SP - arg; /* args without function object */
… …
2416 while (slf_frame.check (aTHX_ &slf_frame)); 2725 while (slf_frame.check (aTHX_ &slf_frame));
2417 2726
2418 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2727 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2419 2728
2420 /* exception handling */ 2729 /* exception handling */
2421 if (expect_false (CORO_THROW)) 2730 if (ecb_expect_false (CORO_THROW))
2422 { 2731 {
2423 SV *exception = sv_2mortal (CORO_THROW); 2732 SV *exception = sv_2mortal (CORO_THROW);
2424 2733
2425 CORO_THROW = 0; 2734 CORO_THROW = 0;
2426 sv_setsv (ERRSV, exception); 2735 sv_setsv (ERRSV, exception);
2427 croak (0); 2736 croak (0);
2428 } 2737 }
2429 2738
2430 /* return value handling - mostly like entersub */ 2739 /* return value handling - mostly like entersub */
2431 /* make sure we put something on the stack in scalar context */ 2740 /* make sure we put something on the stack in scalar context */
2432 if (GIMME_V == G_SCALAR) 2741 if (GIMME_V == G_SCALAR
2742 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2433 { 2743 {
2434 dSP; 2744 dSP;
2435 SV **bot = PL_stack_base + checkmark; 2745 SV **bot = PL_stack_base + checkmark;
2436 2746
2437 if (sp == bot) /* too few, push undef */ 2747 if (sp == bot) /* too few, push undef */
2438 bot [1] = &PL_sv_undef; 2748 bot [1] = &PL_sv_undef;
2439 else if (sp != bot + 1) /* too many, take last one */ 2749 else /* too many, take last one */
2440 bot [1] = *sp; 2750 bot [1] = *sp;
2441 2751
2442 SP = bot + 1; 2752 SP = bot + 1;
2443 2753
2444 PUTBACK; 2754 PUTBACK;
… …
2542{ 2852{
2543 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2544 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2545} 2855}
2546 2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2947}
2948
2547/*****************************************************************************/ 2949/*****************************************************************************/
2548/* PerlIO::cede */ 2950/* PerlIO::cede */
2549 2951
2550typedef struct 2952typedef struct
2551{ 2953{
2552 PerlIOBuf base; 2954 PerlIOBuf base;
2553 NV next, every; 2955 NV next, every;
2554} PerlIOCede; 2956} PerlIOCede;
2555 2957
2556static IV 2958static IV ecb_cold
2557PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2959PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2558{ 2960{
2559 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2961 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2560 2962
2561 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2963 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2562 self->next = nvtime () + self->every; 2964 self->next = nvtime () + self->every;
2563 2965
2564 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2966 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2565} 2967}
2566 2968
2567static SV * 2969static SV * ecb_cold
2568PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2970PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2569{ 2971{
2570 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2972 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2571 2973
2572 return newSVnv (self->every); 2974 return newSVnv (self->every);
… …
2679 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2680 PUTBACK; 3082 PUTBACK;
2681 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2682 } 3084 }
2683 3085
2684 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2685 } 3087 }
2686} 3088}
2687 3089
2688static void 3090static void
2689coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2690{ 3092{
2691 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3093 /* call $sem->adjust (0) to possibly wake up some other waiters */
2692 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3094 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2693} 3095}
2694 3096
2695static int 3097static int
2696slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3098slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2697{ 3099{
2698 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2699 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
3102 SV *coro_hv = SvRV (coro_current);
3103
3104 frame->destroy = 0;
2700 3105
2701 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2702 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2703 return 0; 3112 return 0;
3113 }
2704 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2705 { 3115 {
2706 SvSTATE_current->on_destroy = 0;
2707
2708 if (acquire) 3116 if (acquire)
2709 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2710 else 3118 else
2711 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2712 3120
… …
2716 { 3124 {
2717 int i; 3125 int i;
2718 /* if we were woken up but can't down, we look through the whole */ 3126 /* if we were woken up but can't down, we look through the whole */
2719 /* waiters list and only add us if we aren't in there already */ 3127 /* waiters list and only add us if we aren't in there already */
2720 /* this avoids some degenerate memory usage cases */ 3128 /* this avoids some degenerate memory usage cases */
2721 3129 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2722 for (i = 1; i <= AvFILLp (av); ++i)
2723 if (AvARRAY (av)[i] == SvRV (coro_current)) 3130 if (AvARRAY (av)[i] == coro_hv)
2724 return 1; 3131 return 1;
2725 3132
2726 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3133 av_push (av, SvREFCNT_inc (coro_hv));
2727 return 1; 3134 return 1;
2728 } 3135 }
2729} 3136}
2730 3137
2731static int 3138static int
… …
2754 { 3161 {
2755 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3162 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2756 3163
2757 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3164 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2758 frame->prepare = prepare_schedule; 3165 frame->prepare = prepare_schedule;
2759
2760 /* to avoid race conditions when a woken-up coro gets terminated */ 3166 /* to avoid race conditions when a woken-up coro gets terminated */
2761 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3167 /* we arrange for a temporary on_destroy that calls adjust (0) */
2762 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3168 frame->destroy = coro_semaphore_destroy;
2763 } 3169 }
2764} 3170}
2765 3171
2766static void 3172static void
2767slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3173slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2825 { 3231 {
2826 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
2827 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
2828 } 3234 }
2829 3235
2830 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
2831 3237
2832 --count; 3238 --count;
2833 } 3239 }
2834} 3240}
2835 3241
… …
2920 } 3326 }
2921 3327
2922 av_push (state, data_sv); 3328 av_push (state, data_sv);
2923 3329
2924 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
2925 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
2926 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
2927} 3333}
2928 3334
2929static int 3335static int
2930slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2931{ 3337{
… …
2936 /* it quickly returns */ 3342 /* it quickly returns */
2937 if (CORO_THROW) 3343 if (CORO_THROW)
2938 return 0; 3344 return 0;
2939 3345
2940 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
2941 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2942 return 1; 3348 return 1;
2943 3349
2944 /* restore status */ 3350 /* restore status */
2945 { 3351 {
2946 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
… …
2949 errno = data->errorno; 3355 errno = data->errorno;
2950 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
2951 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
2952 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
2953 3359
2954 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
2955 } 3361 }
2956 3362
2957 /* push result values */ 3363 /* push result values */
2958 { 3364 {
2959 dSP; 3365 dSP;
… …
2985 dSP; 3391 dSP;
2986 3392
2987 static SV *prio_cv; 3393 static SV *prio_cv;
2988 static SV *prio_sv; 3394 static SV *prio_sv;
2989 3395
2990 if (expect_false (!prio_cv)) 3396 if (ecb_expect_false (!prio_cv))
2991 { 3397 {
2992 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3398 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2993 prio_sv = newSViv (0); 3399 prio_sv = newSViv (0);
2994 } 3400 }
2995 3401
… …
3101 } 3507 }
3102 3508
3103 return coro_sv; 3509 return coro_sv;
3104} 3510}
3105 3511
3512#ifndef __cplusplus
3513ecb_cold XS(boot_Coro__State);
3514#endif
3515
3516#if CORO_JIT
3517
3518static void ecb_noinline ecb_cold
3519pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3520{
3521 dSP;
3522 AV *av = newAV ();
3523
3524 av_store (av, 3, newSVuv (d));
3525 av_store (av, 2, newSVuv (c));
3526 av_store (av, 1, newSVuv (b));
3527 av_store (av, 0, newSVuv (a));
3528
3529 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3530
3531 PUTBACK;
3532}
3533
3534static void ecb_noinline ecb_cold
3535jit_init (pTHX)
3536{
3537 dSP;
3538 SV *load, *save;
3539 char *map_base;
3540 char *load_ptr, *save_ptr;
3541 STRLEN load_len, save_len, map_len;
3542 int count;
3543
3544 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3545
3546 PUSHMARK (SP);
3547 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3548 #include "state.h"
3549 count = call_pv ("Coro::State::_jit", G_ARRAY);
3550 SPAGAIN;
3551
3552 save = POPs; save_ptr = SvPVbyte (save, save_len);
3553 load = POPs; load_ptr = SvPVbyte (load, load_len);
3554
3555 map_len = load_len + save_len + 16;
3556
3557 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3558
3559 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3560
3561 load_perl_slots = (load_save_perl_slots_type)map_base;
3562 memcpy (map_base, load_ptr, load_len);
3563
3564 map_base += (load_len + 15) & ~15;
3565
3566 save_perl_slots = (load_save_perl_slots_type)map_base;
3567 memcpy (map_base, save_ptr, save_len);
3568
3569 /* we are good citizens and try to make the page read-only, so the evil evil */
3570 /* hackers might have it a bit more difficult */
3571 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3572
3573 PUTBACK;
3574 eval_pv ("undef &Coro::State::_jit", 1);
3575}
3576
3577#endif
3578
3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3579MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3107 3580
3108PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3109 3582
3110BOOT: 3583BOOT:
3111{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3112#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3113# if CORO_PTHREAD 3588# if CORO_PTHREAD
3114 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3115# endif 3590# endif
3116#endif 3591#endif
3117 BOOT_PAGESIZE; 3592 /* perl defines these to check for existance first, but why it doesn't */
3593 /* just create them one at init time is not clear to me, except for */
3594 /* programs trying to delete them, but... */
3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3596 DEFSV;
3597 ERRSV;
3118 3598
3119 cctx_current = cctx_new_empty (); 3599 cctx_current = cctx_new_empty ();
3120 3600
3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3601 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3602 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3123 3603
3124 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3125 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3126 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3127 3607
3128 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3129 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3130 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3131 3610
3132 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3133 3612
… …
3165 coroapi.prepare_cede_notself = prepare_cede_notself; 3644 coroapi.prepare_cede_notself = prepare_cede_notself;
3166 3645
3167 time_init (aTHX); 3646 time_init (aTHX);
3168 3647
3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3648 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3649#if CORO_JIT
3650 PUTBACK;
3651 jit_init (aTHX);
3652 SPAGAIN;
3653#endif
3170} 3654}
3171 3655
3172SV * 3656SV *
3173new (SV *klass, ...) 3657new (SV *klass, ...)
3174 ALIAS: 3658 ALIAS:
… …
3181void 3665void
3182transfer (...) 3666transfer (...)
3183 PROTOTYPE: $$ 3667 PROTOTYPE: $$
3184 CODE: 3668 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3186
3187bool
3188_destroy (SV *coro_sv)
3189 CODE:
3190 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3191 OUTPUT:
3192 RETVAL
3193
3194void
3195_exit (int code)
3196 PROTOTYPE: $
3197 CODE:
3198 _exit (code);
3199 3670
3200SV * 3671SV *
3201clone (Coro::State coro) 3672clone (Coro::State coro)
3202 CODE: 3673 CODE:
3203{ 3674{
… …
3258void 3729void
3259list () 3730list ()
3260 PROTOTYPE: 3731 PROTOTYPE:
3261 PPCODE: 3732 PPCODE:
3262{ 3733{
3263 struct coro *coro; 3734 struct coro *coro;
3264 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
3265 if (coro->hv) 3736 if (coro->hv)
3266 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3267} 3738}
3268 3739
… …
3273 CODE: 3744 CODE:
3274{ 3745{
3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3746 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3276 { 3747 {
3277 struct coro *current = SvSTATE_current; 3748 struct coro *current = SvSTATE_current;
3749 struct CoroSLF slf_save;
3278 3750
3279 if (current != coro) 3751 if (current != coro)
3280 { 3752 {
3281 PUTBACK; 3753 PUTBACK;
3282 save_perl (aTHX_ current); 3754 save_perl (aTHX_ current);
3283 load_perl (aTHX_ coro); 3755 load_perl (aTHX_ coro);
3756 /* the coro is most likely in an active SLF call.
3757 * while not strictly required (the code we execute is
3758 * not allowed to call any SLF functions), it's cleaner
3759 * to reinitialise the slf_frame and restore it later.
3760 * This might one day allow us to actually do SLF calls
3761 * from code executed here.
3762 */
3763 slf_save = slf_frame;
3764 slf_frame.prepare = 0;
3284 SPAGAIN; 3765 SPAGAIN;
3285 } 3766 }
3286 3767
3287 PUSHSTACK; 3768 PUSHSTACK;
3288 3769
… …
3298 SPAGAIN; 3779 SPAGAIN;
3299 3780
3300 if (current != coro) 3781 if (current != coro)
3301 { 3782 {
3302 PUTBACK; 3783 PUTBACK;
3784 slf_frame = slf_save;
3303 save_perl (aTHX_ coro); 3785 save_perl (aTHX_ coro);
3304 load_perl (aTHX_ current); 3786 load_perl (aTHX_ current);
3305 SPAGAIN; 3787 SPAGAIN;
3306 } 3788 }
3307 } 3789 }
… …
3312 PROTOTYPE: $ 3794 PROTOTYPE: $
3313 ALIAS: 3795 ALIAS:
3314 is_ready = CF_READY 3796 is_ready = CF_READY
3315 is_running = CF_RUNNING 3797 is_running = CF_RUNNING
3316 is_new = CF_NEW 3798 is_new = CF_NEW
3317 is_destroyed = CF_DESTROYED 3799 is_destroyed = CF_ZOMBIE
3800 is_zombie = CF_ZOMBIE
3318 is_suspended = CF_SUSPENDED 3801 is_suspended = CF_SUSPENDED
3319 CODE: 3802 CODE:
3320 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
3321 OUTPUT: 3804 OUTPUT:
3322 RETVAL 3805 RETVAL
3323 3806
3324void 3807void
3325throw (Coro::State self, SV *exception = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
3326 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
3327 CODE: 3810 CODE:
3328{ 3811{
3812 struct coro *coro = SvSTATE (self);
3329 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3331 SvREFCNT_dec (*exceptionp); 3815 SvREFCNT_dec (*exceptionp);
3332 SvGETMAGIC (exception); 3816 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
3334} 3820}
3335 3821
3336void 3822void
3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3338 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
… …
3393 3879
3394void 3880void
3395cancel (Coro::State self) 3881cancel (Coro::State self)
3396 CODE: 3882 CODE:
3397 coro_state_destroy (aTHX_ self); 3883 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399
3400 3884
3401SV * 3885SV *
3402enable_times (int enabled = enable_times) 3886enable_times (int enabled = enable_times)
3403 CODE: 3887 CODE:
3404{ 3888{
… …
3417 3901
3418void 3902void
3419times (Coro::State self) 3903times (Coro::State self)
3420 PPCODE: 3904 PPCODE:
3421{ 3905{
3422 struct coro *current = SvSTATE (coro_current); 3906 struct coro *current = SvSTATE (coro_current);
3423 3907
3424 if (expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3425 { 3909 {
3426 coro_times_update (); 3910 coro_times_update ();
3427 coro_times_add (SvSTATE (coro_current)); 3911 coro_times_add (SvSTATE (coro_current));
3428 } 3912 }
3429 3913
3430 EXTEND (SP, 2); 3914 EXTEND (SP, 2);
3431 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3915 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3432 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3916 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3433 3917
3434 if (expect_false (current == self)) 3918 if (ecb_expect_false (current == self))
3435 coro_times_sub (SvSTATE (coro_current)); 3919 coro_times_sub (SvSTATE (coro_current));
3436} 3920}
3437 3921
3438void 3922void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3923swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3457 3941
3458MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3459 3943
3460BOOT: 3944BOOT:
3461{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3463 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3464 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3465 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3466 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3467 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3468 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3954 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3469 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3955 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3956 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3471 3957
3472 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3473 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3474 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3475 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3476 3962
3477 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3478 3964
3479 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3480 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3481 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3967 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3493 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3494 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3495 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3496 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3497 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3498 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3499 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3500 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3501 } 3991 }
3502} 3992}
… …
3509 api_ready (aTHX_ RETVAL); 3999 api_ready (aTHX_ RETVAL);
3510 OUTPUT: 4000 OUTPUT:
3511 RETVAL 4001 RETVAL
3512 4002
3513void 4003void
4004_destroy (Coro::State coro)
4005 CODE:
4006 /* used by the manager thread */
4007 coro_state_destroy (aTHX_ coro);
4008
4009void
4010on_destroy (Coro::State coro, SV *cb)
4011 CODE:
4012 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4013
4014void
4015join (...)
4016 CODE:
4017 CORO_EXECUTE_SLF_XS (slf_init_join);
4018
4019void
3514terminate (...) 4020terminate (...)
3515 CODE: 4021 CODE:
3516 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4022 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4023
4024void
4025cancel (...)
4026 CODE:
4027 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4028
4029int
4030safe_cancel (Coro::State self, ...)
4031 C_ARGS: aTHX_ self, &ST (1), items - 1
3517 4032
3518void 4033void
3519schedule (...) 4034schedule (...)
3520 CODE: 4035 CODE:
3521 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4036 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3542 4057
3543void 4058void
3544_set_current (SV *current) 4059_set_current (SV *current)
3545 PROTOTYPE: $ 4060 PROTOTYPE: $
3546 CODE: 4061 CODE:
3547 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3548 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3549 4064
3550void 4065void
3551_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3552 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
3636 4151
3637 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3638 { 4153 {
3639 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3640 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3641 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
3642 } 4157 }
3643 4158
3644 { 4159 {
3645 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
3646 4161
… …
3653 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
3654 4169
3655 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
3656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3657 else 4172 else
3658 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
3659} 4174}
3660 4175
3661SV * 4176SV *
3662rouse_cb () 4177rouse_cb ()
3663 PROTOTYPE: 4178 PROTOTYPE:
… …
3678 on_leave = 1 4193 on_leave = 1
3679 PROTOTYPE: & 4194 PROTOTYPE: &
3680 CODE: 4195 CODE:
3681{ 4196{
3682 struct coro *coro = SvSTATE_current; 4197 struct coro *coro = SvSTATE_current;
3683 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3684 4199
3685 block = s_get_cv_croak (block); 4200 block = s_get_cv_croak (block);
3686 4201
3687 if (!*avp) 4202 if (!*avp)
3688 *avp = newAV (); 4203 *avp = newAV ();
… …
3708 4223
3709SV * 4224SV *
3710new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
3711 CODE: 4226 CODE:
3712{ 4227{
3713 int semcnt = 1; 4228 int semcnt = 1;
3714 4229
3715 if (count) 4230 if (count)
3716 { 4231 {
3717 SvGETMAGIC (count); 4232 SvGETMAGIC (count);
3718 4233
… …
3778 XSRETURN_NO; 4293 XSRETURN_NO;
3779} 4294}
3780 4295
3781void 4296void
3782waiters (SV *self) 4297waiters (SV *self)
3783 PPCODE: 4298 PPCODE:
3784{ 4299{
3785 AV *av = (AV *)SvRV (self); 4300 AV *av = (AV *)SvRV (self);
3786 int wcount = AvFILLp (av) + 1 - 1; 4301 int wcount = AvFILLp (av) + 1 - 1;
3787 4302
3788 if (GIMME_V == G_SCALAR) 4303 if (GIMME_V == G_SCALAR)
… …
3797} 4312}
3798 4313
3799MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4314MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3800 4315
3801void 4316void
3802_may_delete (SV *sem, int count, int extra_refs) 4317_may_delete (SV *sem, int count, unsigned int extra_refs)
3803 PPCODE: 4318 PPCODE:
3804{ 4319{
3805 AV *av = (AV *)SvRV (sem); 4320 AV *av = (AV *)SvRV (sem);
3806 4321
3807 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4322 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3808 && AvFILLp (av) == 0 /* no waiters, just count */ 4323 && AvFILLp (av) == 0 /* no waiters, just count */
3809 && SvIV (AvARRAY (av)[0]) == count) 4324 && SvIV (AvARRAY (av)[0]) == count)
3810 XSRETURN_YES; 4325 XSRETURN_YES;
… …
3831 4346
3832void 4347void
3833broadcast (SV *self) 4348broadcast (SV *self)
3834 CODE: 4349 CODE:
3835{ 4350{
3836 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
3837 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4352 coro_signal_wake (aTHX_ av, AvFILLp (av));
3838} 4353}
3839 4354
3840void 4355void
3841send (SV *self) 4356send (SV *self)
… …
3849 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4364 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3850} 4365}
3851 4366
3852IV 4367IV
3853awaited (SV *self) 4368awaited (SV *self)
3854 CODE: 4369 CODE:
3855 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4370 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3856 OUTPUT: 4371 OUTPUT:
3857 RETVAL 4372 RETVAL
3858 4373
3859 4374
… …
3864 4379
3865void 4380void
3866_schedule (...) 4381_schedule (...)
3867 CODE: 4382 CODE:
3868{ 4383{
3869 static int incede; 4384 static int incede;
3870 4385
3871 api_cede_notself (aTHX); 4386 api_cede_notself (aTHX);
3872 4387
3873 ++incede; 4388 ++incede;
3874 while (coro_nready >= incede && api_cede (aTHX)) 4389 while (coro_nready >= incede && api_cede (aTHX))
… …
3918 { 4433 {
3919 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4434 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3920 coro_old_pp_sselect = 0; 4435 coro_old_pp_sselect = 0;
3921 } 4436 }
3922 4437
4438MODULE = Coro::State PACKAGE = Coro::Util
4439
4440void
4441_exit (int code)
4442 CODE:
4443 _exit (code);
4444
4445NV
4446time ()
4447 CODE:
4448 RETVAL = nvtime (aTHX);
4449 OUTPUT:
4450 RETVAL
4451
4452NV
4453gettimeofday ()
4454 PPCODE:
4455{
4456 UV tv [2];
4457 u2time (aTHX_ tv);
4458 EXTEND (SP, 2);
4459 PUSHs (sv_2mortal (newSVuv (tv [0])));
4460 PUSHs (sv_2mortal (newSVuv (tv [1])));
4461}
4462

Diff Legend

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