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.331 by root, Thu Nov 27 12:00:59 2008 UTC vs.
Revision 1.448 by root, Thu Jun 4 22:58:28 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
58#endif
59
60#if defined(_WIN32)
61# undef HAS_GETTIMEOFDAY
18# undef setjmp 62# undef setjmp
19# undef longjmp 63# undef longjmp
20# undef _exit 64# undef _exit
21# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
22#else 66#else
23# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
24#endif 68#endif
25 69
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 70/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
55 72
56#define PERL_VERSION_ATLEAST(a,b,c) \ 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 74# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 75#endif
122 76
123/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 89# define STACKLEVEL ((void *)&stacklevel)
136#endif 90#endif
137 91
138#define IN_DESTRUCT PL_dirty 92#define IN_DESTRUCT PL_dirty
139 93
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 94#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 95#define GCoroAPI (&coroapi) /* very sneaky */
157 96
158#ifdef USE_ITHREADS 97#ifdef USE_ITHREADS
159# if CORO_PTHREAD 98# if CORO_PTHREAD
160static void *coro_thx; 99static void *coro_thx;
161# endif 100# endif
162#endif 101#endif
163 102
103#ifdef __linux
104# include <time.h> /* for timespec */
105# include <syscall.h> /* for SYS_* */
106# ifdef SYS_clock_gettime
107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
108# define CORO_CLOCK_MONOTONIC 1
109# define CORO_CLOCK_THREAD_CPUTIME_ID 3
110# endif
111#endif
112
164static double (*nvtime)(); /* so why doesn't it take void? */ 113static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]);
165 115
166/* we hijack an hopefully unused CV flag for our purposes */ 116/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 117#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 118static OP *pp_slf (pTHX);
119static void slf_destroy (pTHX_ struct coro *coro);
169 120
170static U32 cctx_gen; 121static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 122static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 141static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 142static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 143static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 144static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 145static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 146
197/* Coro::AnyEvent */ 147/* Coro::AnyEvent */
198static SV *sv_activity; 148static SV *sv_activity;
199 149
150/* enable processtime/realtime profiling */
151static char enable_times;
152typedef U32 coro_ts[2];
153static coro_ts time_real, time_cpu;
154static char times_valid;
155
200static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
202 158
203enum { 159enum
160{
204 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 170typedef struct coro_cctx
214{ 171{
215 struct coro_cctx *next; 172 struct coro_cctx *next;
216 173
217 /* the stack */ 174 /* the stack */
218 void *sptr; 175 struct coro_stack stack;
219 size_t ssize;
220 176
221 /* cpu state */ 177 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
224 JMPENV *top_env; 182 JMPENV *top_env;
225 coro_context cctx; 183 coro_context cctx;
226 184
227 U32 gen; 185 U32 gen;
228#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
229 int valgrind_id; 187 int valgrind_id;
230#endif 188#endif
231 unsigned char flags; 189 unsigned char flags;
232} coro_cctx; 190} coro_cctx;
233 191
234coro_cctx *cctx_current; /* the currently running cctx */ 192static coro_cctx *cctx_current; /* the currently running cctx */
235 193
236/*****************************************************************************/ 194/*****************************************************************************/
237 195
196static MGVTBL coro_state_vtbl;
197
238enum { 198enum
199{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 206};
244 207
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 209typedef struct
247{ 210{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
254# include "state.h" 212 #include "state.h"
255#undef VAR
256} perl_slots; 213} perl_slots;
257 214
215/* how many context stack entries do we need for perl_slots */
258#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 217
260/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
261struct coro { 219struct coro
220{
262 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
264 226
265 /* state data */ 227 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 229 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
269 231
270 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 236
277 /* statistics */ 237 /* statistics */
278 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
279 239
280 /* coro process data */ 240 /* coro process data */
281 int prio; 241 int prio;
282 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
283 SV *rouse_cb; 243 SV *rouse_cb; /* last rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */
284 246
285 /* async_pool */ 247 /* async_pool */
286 SV *saved_deffh; 248 SV *saved_deffh;
287 SV *invoke_cb; 249 SV *invoke_cb;
288 AV *invoke_av; 250 AV *invoke_av;
289 251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* swap_sv */
257 AV *swap_sv;
258
259 /* times */
260 coro_ts t_cpu, t_real;
261
290 /* linked list */ 262 /* linked list */
291 struct coro *next, *prev; 263 struct coro *next, *prev;
292}; 264};
293 265
294typedef struct coro *Coro__State; 266typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 267typedef struct coro *Coro__State_or_hashref;
296 268
297/* the following variables are effectively part of the perl context */ 269/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 270/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 271/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 272static struct CoroSLF slf_frame; /* the current slf frame */
301 273
302/** Coro ********************************************************************/ 274/** Coro ********************************************************************/
303 275
304#define PRIO_MAX 3 276#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 277#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 278#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 279#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 280#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 281#define CORO_PRIO_MIN -4
310 282
311/* for Coro.pm */ 283/* for Coro.pm */
312static SV *coro_current; 284static SV *coro_current;
313static SV *coro_readyhook; 285static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 287static CV *cv_coro_run;
316static struct coro *coro_first; 288static struct coro *coro_first;
317#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
318 290
291/** JIT *********************************************************************/
292
293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE
297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix"
299 #elif __i386 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "x86-unix"
301 #endif
302 #endif
303#endif
304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
313
314/** Coro::Select ************************************************************/
315
316static OP *(*coro_old_pp_sselect) (pTHX);
317static SV *coro_select_select;
318
319/* horrible hack, but if it works... */
320static OP *
321coro_pp_sselect (pTHX)
322{
323 dSP;
324 PUSHMARK (SP - 4); /* fake argument list */
325 XPUSHs (coro_select_select);
326 PUTBACK;
327
328 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
329 PL_op->op_flags |= OPf_STACKED;
330 PL_op->op_private = 0;
331 return PL_ppaddr [OP_ENTERSUB](aTHX);
332}
333
334/** time stuff **************************************************************/
335
336#ifdef HAS_GETTIMEOFDAY
337
338ecb_inline void
339coro_u2time (pTHX_ UV ret[2])
340{
341 struct timeval tv;
342 gettimeofday (&tv, 0);
343
344 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec;
346}
347
348ecb_inline double
349coro_nvtime (void)
350{
351 struct timeval tv;
352 gettimeofday (&tv, 0);
353
354 return tv.tv_sec + tv.tv_usec * 1e-6;
355}
356
357ecb_inline void
358time_init (pTHX)
359{
360 nvtime = coro_nvtime;
361 u2time = coro_u2time;
362}
363
364#else
365
366ecb_inline void
367time_init (pTHX)
368{
369 SV **svp;
370
371 require_pv ("Time/HiRes.pm");
372
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
377
378 nvtime = INT2PTR (double (*)(), SvIV (*svp));
379
380 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
381 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
382}
383
384#endif
385
319/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
320 387
321static SV * 388static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
323{ 390{
324#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 393 get_sv (name, create);
327#endif 394#endif
328 return get_sv (name, create); 395 return get_sv (name, create);
329} 396}
330 397
331static AV * 398static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
333{ 400{
334#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 403 get_av (name, create);
337#endif 404#endif
338 return get_av (name, create); 405 return get_av (name, create);
339} 406}
340 407
341static HV * 408static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
343{ 410{
344#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 413 get_hv (name, create);
347#endif 414#endif
348 return get_hv (name, create); 415 return get_hv (name, create);
349} 416}
350 417
351/* may croak */ 418ecb_inline void
352INLINE CV * 419coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 420{
355 HV *st; 421#ifdef coro_clock_gettime
356 GV *gvp; 422 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0);
358}
359 423
360static AV * 424 ts.tv_sec = ts.tv_nsec = 0;
425 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
426 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
427
428 ts.tv_sec = ts.tv_nsec = 0;
429 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
430 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
431#else
432 dTHX;
433 UV tv[2];
434
435 u2time (aTHX_ tv);
436 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000;
438#endif
439}
440
441ecb_inline void
442coro_times_add (struct coro *c)
443{
444 c->t_real [1] += time_real [1];
445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
446 c->t_real [0] += time_real [0];
447
448 c->t_cpu [1] += time_cpu [1];
449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
450 c->t_cpu [0] += time_cpu [0];
451}
452
453ecb_inline void
454coro_times_sub (struct coro *c)
455{
456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
457 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0];
459
460 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
461 c->t_cpu [1] -= time_cpu [1];
462 c->t_cpu [0] -= time_cpu [0];
463}
464
465/*****************************************************************************/
466/* magic glue */
467
468#define CORO_MAGIC_type_cv 26
469#define CORO_MAGIC_type_state PERL_MAGIC_ext
470
471#define CORO_MAGIC_NN(sv, type) \
472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
473 ? SvMAGIC (sv) \
474 : mg_find (sv, type))
475
476#define CORO_MAGIC(sv, type) \
477 (ecb_expect_true (SvMAGIC (sv)) \
478 ? CORO_MAGIC_NN (sv, type) \
479 : 0)
480
481#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
483
484ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro)
486{
487 MAGIC *mg;
488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
499ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro)
501{
502 MAGIC *mg;
503
504 if (SvROK (coro))
505 coro = SvRV (coro);
506
507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
509 croak ("Coro::State object required");
510
511 return (struct coro *)mg->mg_ptr;
512}
513
514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
515
516/* faster than SvSTATE, but expects a coroutine hv */
517#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
519
520/*****************************************************************************/
521/* padlist management and caching */
522
523ecb_inline PADLIST *
361coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
362{ 525{
363 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
364 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
365 531
366 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
367 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
368#if PERL_VERSION_ATLEAST (5,10,0)
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
370#else
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 561#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist);
375 562
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 563 /* Already extended to 2 elements by newPADLIST. */
377 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
378 571
379 return newpadlist; 572 return newpadlist;
380} 573}
381 574
382static void 575ecb_inline void
383free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
384{ 577{
385 /* may be during global destruction */ 578 /* may be during global destruction */
386 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
387 { 580 {
388 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
389 582
390 while (i >= 0) 583 while (i > 0) /* special-case index 0 */
391 { 584 {
392 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
393 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
394 587
395 I32 i = AvFILLp (av); 588 if (pad)
589 {
590 I32 j = PadMAX (pad);
396 591
397 while (i >= 0) 592 while (j >= 0)
398 SvREFCNT_dec (AvARRAY (av)[i--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
399 594
400 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
401 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
402 } 598 }
403 599
600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
404 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
405 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
406 } 610 }
407} 611}
408 612
409static int 613static int
410coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
411{ 615{
412 AV *padlist; 616 PADLIST *padlist;
413 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
414 619
415 /* casting is fun. */ 620 /* perl manages to free our internal AV and _then_ call us */
416 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 621 if (IN_DESTRUCT)
622 return 0;
623
624 while (len--)
417 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
418
419 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
420 626
421 return 0; 627 return 0;
422} 628}
423
424#define CORO_MAGIC_type_cv 26
425#define CORO_MAGIC_type_state PERL_MAGIC_ext
426 629
427static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
428 0, 0, 0, 0, 631 0, 0, 0, 0,
429 coro_cv_free 632 coro_cv_free
430}; 633};
431 634
432#define CORO_MAGIC_NN(sv, type) \
433 (expect_true (SvMAGIC (sv)->mg_type == type) \
434 ? SvMAGIC (sv) \
435 : mg_find (sv, type))
436
437#define CORO_MAGIC(sv, type) \
438 (expect_true (SvMAGIC (sv)) \
439 ? CORO_MAGIC_NN (sv, type) \
440 : 0)
441
442#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
443#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
444
445INLINE struct coro *
446SvSTATE_ (pTHX_ SV *coro)
447{
448 HV *stash;
449 MAGIC *mg;
450
451 if (SvROK (coro))
452 coro = SvRV (coro);
453
454 if (expect_false (SvTYPE (coro) != SVt_PVHV))
455 croak ("Coro::State object required");
456
457 stash = SvSTASH (coro);
458 if (expect_false (stash != coro_stash && stash != coro_state_stash))
459 {
460 /* very slow, but rare, check */
461 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
462 croak ("Coro::State object required");
463 }
464
465 mg = CORO_MAGIC_state (coro);
466 return (struct coro *)mg->mg_ptr;
467}
468
469#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
470
471/* faster than SvSTATE, but expects a coroutine hv */
472#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
473#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
474
475/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
476static void 636ecb_inline void
477get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
478{ 638{
479 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
480 AV *av; 640 size_t *lenp;
481 641
482 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
483 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
484 else 644 else
485 { 645 {
486#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
487 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
488 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
494 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
495#endif 655#endif
496 } 656 }
497} 657}
498 658
499static void 659ecb_inline void
500put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
501{ 661{
502 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
503 AV *av;
504 663
505 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
506 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
507 674
508 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
509
510 if (expect_false (AvFILLp (av) >= AvMAX (av)))
511 av_extend (av, AvFILLp (av) + 1);
512
513 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
514} 676}
515 677
516/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
718/* swap sv heads, at least logically */
719static void
720swap_svs (pTHX_ Coro__State c)
721{
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
726}
727
728#define SWAP_SVS(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \
730 swap_svs (aTHX_ (coro))
731
732static void
733on_enterleave_call (pTHX_ SV *cb);
517 734
518static void 735static void
519load_perl (pTHX_ Coro__State c) 736load_perl (pTHX_ Coro__State c)
520{ 737{
521 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
522 c->slot = 0; 739 c->slot = 0;
523 740
524 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
525 742
526 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
527 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
528 GvSV (PL_errgv) = slot->errsv; 745#else
529 GvSV (irsgv) = slot->irsgv;
530 GvHV (PL_hintgv) = slot->hinthv;
531
532 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
533 # include "state.h" 747 #include "state.h"
534 #undef VAR 748#endif
535 749
536 { 750 {
537 dSP; 751 dSP;
538 752
539 CV *cv; 753 CV *cv;
540 754
541 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
542 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
543 { 757 {
544 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
545 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
546 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
547 } 761 }
548 762
549 PUTBACK; 763 PUTBACK;
550 } 764 }
551 765
552 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
553 CORO_THROW = c->except; 767 CORO_THROW = c->except;
768
769 if (ecb_expect_false (enable_times))
770 {
771 if (ecb_expect_false (!times_valid))
772 coro_times_update ();
773
774 coro_times_sub (c);
775 }
776
777 if (ecb_expect_false (c->on_enter))
778 {
779 int i;
780
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 }
784
785 SWAP_SVS (c);
554} 786}
555 787
556static void 788static void
557save_perl (pTHX_ Coro__State c) 789save_perl (pTHX_ Coro__State c)
558{ 790{
791 SWAP_SVS (c);
792
793 if (ecb_expect_false (c->on_leave))
794 {
795 int i;
796
797 for (i = AvFILLp (c->on_leave); i >= 0; --i)
798 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
799 }
800
801 times_valid = 0;
802
803 if (ecb_expect_false (enable_times))
804 {
805 coro_times_update (); times_valid = 1;
806 coro_times_add (c);
807 }
808
559 c->except = CORO_THROW; 809 c->except = CORO_THROW;
560 c->slf_frame = slf_frame; 810 c->slf_frame = slf_frame;
561 811
562 { 812 {
563 dSP; 813 dSP;
… …
572 822
573 XPUSHs (Nullsv); 823 XPUSHs (Nullsv);
574 /* this loop was inspired by pp_caller */ 824 /* this loop was inspired by pp_caller */
575 for (;;) 825 for (;;)
576 { 826 {
577 while (expect_true (cxix >= 0)) 827 while (ecb_expect_true (cxix >= 0))
578 { 828 {
579 PERL_CONTEXT *cx = &ccstk[cxix--]; 829 PERL_CONTEXT *cx = &ccstk[cxix--];
580 830
581 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 831 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
582 { 832 {
583 CV *cv = cx->blk_sub.cv; 833 CV *cv = cx->blk_sub.cv;
584 834
585 if (expect_true (CvDEPTH (cv))) 835 if (ecb_expect_true (CvDEPTH (cv)))
586 { 836 {
587 EXTEND (SP, 3); 837 EXTEND (SP, 3);
588 PUSHs ((SV *)CvPADLIST (cv)); 838 PUSHs ((SV *)CvPADLIST (cv));
589 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 839 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
590 PUSHs ((SV *)cv); 840 PUSHs ((SV *)cv);
… …
593 get_padlist (aTHX_ cv); 843 get_padlist (aTHX_ cv);
594 } 844 }
595 } 845 }
596 } 846 }
597 847
598 if (expect_true (top_si->si_type == PERLSI_MAIN)) 848 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
599 break; 849 break;
600 850
601 top_si = top_si->si_prev; 851 top_si = top_si->si_prev;
602 ccstk = top_si->si_cxstack; 852 ccstk = top_si->si_cxstack;
603 cxix = top_si->si_cxix; 853 cxix = top_si->si_cxix;
… …
605 855
606 PUTBACK; 856 PUTBACK;
607 } 857 }
608 858
609 /* allocate some space on the context stack for our purposes */ 859 /* allocate some space on the context stack for our purposes */
610 /* we manually unroll here, as usually 2 slots is enough */ 860 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
611 if (SLOT_COUNT >= 1) CXINC;
612 if (SLOT_COUNT >= 2) CXINC;
613 if (SLOT_COUNT >= 3) CXINC;
614 { 861 {
615 int i; 862 unsigned int i;
863
616 for (i = 3; i < SLOT_COUNT; ++i) 864 for (i = 0; i < SLOT_COUNT; ++i)
617 CXINC; 865 CXINC;
618 } 866
619 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 867 cxstack_ix -= SLOT_COUNT; /* undo allocation */
868 }
620 869
621 c->mainstack = PL_mainstack; 870 c->mainstack = PL_mainstack;
622 871
623 { 872 {
624 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 873 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
625 874
626 slot->defav = GvAV (PL_defgv); 875#if CORO_JIT
627 slot->defsv = DEFSV; 876 save_perl_slots (slot);
628 slot->errsv = ERRSV; 877#else
629 slot->irsgv = GvSV (irsgv);
630 slot->hinthv = GvHV (PL_hintgv);
631
632 #define VAR(name,type) slot->name = PL_ ## name; 878 #define VARx(name,expr,type) slot->name = expr;
633 # include "state.h" 879 #include "state.h"
634 #undef VAR 880#endif
635 } 881 }
636} 882}
637 883
638/* 884/*
639 * allocate various perl stacks. This is almost an exact copy 885 * allocate various perl stacks. This is almost an exact copy
… …
645# define coro_init_stacks(thx) init_stacks () 891# define coro_init_stacks(thx) init_stacks ()
646#else 892#else
647static void 893static void
648coro_init_stacks (pTHX) 894coro_init_stacks (pTHX)
649{ 895{
650 PL_curstackinfo = new_stackinfo(32, 8); 896 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
651 PL_curstackinfo->si_type = PERLSI_MAIN; 897 PL_curstackinfo->si_type = PERLSI_MAIN;
652 PL_curstack = PL_curstackinfo->si_stack; 898 PL_curstack = PL_curstackinfo->si_stack;
653 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 899 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
654 900
655 PL_stack_base = AvARRAY(PL_curstack); 901 PL_stack_base = AvARRAY(PL_curstack);
… …
670#endif 916#endif
671 917
672 New(54,PL_scopestack,8,I32); 918 New(54,PL_scopestack,8,I32);
673 PL_scopestack_ix = 0; 919 PL_scopestack_ix = 0;
674 PL_scopestack_max = 8; 920 PL_scopestack_max = 8;
921#if HAS_SCOPESTACK_NAME
922 New(54,PL_scopestack_name,8,const char*);
923#endif
675 924
676 New(54,PL_savestack,24,ANY); 925 New(54,PL_savestack,24,ANY);
677 PL_savestack_ix = 0; 926 PL_savestack_ix = 0;
678 PL_savestack_max = 24; 927 PL_savestack_max = 24;
679 928
… …
707 } 956 }
708 957
709 Safefree (PL_tmps_stack); 958 Safefree (PL_tmps_stack);
710 Safefree (PL_markstack); 959 Safefree (PL_markstack);
711 Safefree (PL_scopestack); 960 Safefree (PL_scopestack);
961#if HAS_SCOPESTACK_NAME
962 Safefree (PL_scopestack_name);
963#endif
712 Safefree (PL_savestack); 964 Safefree (PL_savestack);
713#if !PERL_VERSION_ATLEAST (5,10,0) 965#if !PERL_VERSION_ATLEAST (5,10,0)
714 Safefree (PL_retstack); 966 Safefree (PL_retstack);
715#endif 967#endif
716} 968}
… …
762#endif 1014#endif
763 1015
764/* 1016/*
765 * This overrides the default magic get method of %SIG elements. 1017 * This overrides the default magic get method of %SIG elements.
766 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1018 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
767 * and instead of tryign to save and restore the hash elements, we just provide 1019 * and instead of trying to save and restore the hash elements (extremely slow),
768 * readback here. 1020 * we just provide our own readback here.
769 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
770 * not expecting this to actually change the hook. This is a potential problem
771 * when a schedule happens then, but we ignore this.
772 */ 1021 */
773static int 1022static int ecb_cold
774coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
775{ 1024{
776 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
777 1026
778 if (*s == '_') 1027 if (*s == '_')
779 { 1028 {
780 SV **svp = 0; 1029 SV **svp = 0;
781 1030
782 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
783 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
784 1033
785 if (svp) 1034 if (svp)
786 { 1035 {
787 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
788 return 0; 1046 return 0;
789 } 1047 }
790 } 1048 }
791 1049
792 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
793} 1051}
794 1052
795static int 1053static int ecb_cold
796coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
797{ 1055{
798 const char *s = MgPV_nolen_const (mg); 1056 const char *s = MgPV_nolen_const (mg);
799 1057
800 if (*s == '_') 1058 if (*s == '_')
… …
814 } 1072 }
815 1073
816 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
817} 1075}
818 1076
819static int 1077static int ecb_cold
820coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
821{ 1079{
822 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
823 1081
824 if (*s == '_') 1082 if (*s == '_')
… …
829 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1087 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
830 1088
831 if (svp) 1089 if (svp)
832 { 1090 {
833 SV *old = *svp; 1091 SV *old = *svp;
834 *svp = newSVsv (sv); 1092 *svp = SvOK (sv) ? newSVsv (sv) : 0;
835 SvREFCNT_dec (old); 1093 SvREFCNT_dec (old);
836 return 0; 1094 return 0;
837 } 1095 }
838 } 1096 }
839 1097
… …
857slf_check_repeat (pTHX_ struct CoroSLF *frame) 1115slf_check_repeat (pTHX_ struct CoroSLF *frame)
858{ 1116{
859 return 1; 1117 return 1;
860} 1118}
861 1119
862static UNOP coro_setup_op; 1120static UNOP init_perl_op;
863 1121
864static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1122ecb_noinline static void /* noinline to keep it out of the transfer fast path */
865coro_setup (pTHX_ struct coro *coro) 1123init_perl (pTHX_ struct coro *coro)
866{ 1124{
867 /* 1125 /*
868 * emulate part of the perl startup here. 1126 * emulate part of the perl startup here.
869 */ 1127 */
870 coro_init_stacks (aTHX); 1128 coro_init_stacks (aTHX);
… …
877 PL_comppad_name_fill = 0; 1135 PL_comppad_name_fill = 0;
878 PL_comppad_name_floor = 0; 1136 PL_comppad_name_floor = 0;
879 PL_curpm = 0; 1137 PL_curpm = 0;
880 PL_curpad = 0; 1138 PL_curpad = 0;
881 PL_localizing = 0; 1139 PL_localizing = 0;
882 PL_dirty = 0;
883 PL_restartop = 0; 1140 PL_restartop = 0;
884#if PERL_VERSION_ATLEAST (5,10,0) 1141#if PERL_VERSION_ATLEAST (5,10,0)
885 PL_parser = 0; 1142 PL_parser = 0;
886#endif 1143#endif
887 PL_hints = 0; 1144 PL_hints = 0;
888 1145
889 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
890 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
891 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
892 1149
893 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
894 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
895 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
896 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
897 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
898 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
899 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
900 1160
901 { 1161 {
902 dSP; 1162 dSP;
… …
917 /* this newly created coroutine might be run on an existing cctx which most 1177 /* this newly created coroutine might be run on an existing cctx which most
918 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1178 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
919 */ 1179 */
920 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1180 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
921 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1181 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1182 slf_frame.destroy = 0;
922 1183
923 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1184 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
924 coro_setup_op.op_next = PL_op; 1185 init_perl_op.op_next = PL_op;
925 coro_setup_op.op_type = OP_ENTERSUB; 1186 init_perl_op.op_type = OP_ENTERSUB;
926 coro_setup_op.op_ppaddr = pp_slf; 1187 init_perl_op.op_ppaddr = pp_slf;
927 /* no flags etc. required, as an init function won't be called */ 1188 /* no flags etc. required, as an init function won't be called */
928 1189
929 PL_op = (OP *)&coro_setup_op; 1190 PL_op = (OP *)&init_perl_op;
930 1191
931 /* copy throw, in case it was set before coro_setup */ 1192 /* copy throw, in case it was set before init_perl */
932 CORO_THROW = coro->except; 1193 CORO_THROW = coro->except;
933}
934 1194
1195 SWAP_SVS (coro);
1196
1197 if (ecb_expect_false (enable_times))
1198 {
1199 coro_times_update ();
1200 coro_times_sub (coro);
1201 }
1202}
1203
935static void 1204static void
936coro_destruct (pTHX_ struct coro *coro) 1205coro_unwind_stacks (pTHX)
937{ 1206{
938 if (!IN_DESTRUCT) 1207 if (!IN_DESTRUCT)
939 { 1208 {
940 /* restore all saved variables and stuff */ 1209 /* restore all saved variables and stuff */
941 LEAVE_SCOPE (0); 1210 LEAVE_SCOPE (0);
… …
949 POPSTACK_TO (PL_mainstack); 1218 POPSTACK_TO (PL_mainstack);
950 1219
951 /* unwind main stack */ 1220 /* unwind main stack */
952 dounwind (-1); 1221 dounwind (-1);
953 } 1222 }
1223}
954 1224
955 SvREFCNT_dec (GvSV (PL_defgv)); 1225static void
956 SvREFCNT_dec (GvAV (PL_defgv)); 1226destroy_perl (pTHX_ struct coro *coro)
957 SvREFCNT_dec (GvSV (PL_errgv)); 1227{
958 SvREFCNT_dec (PL_defoutgv); 1228 SV *svf [9];
959 SvREFCNT_dec (PL_rs);
960 SvREFCNT_dec (GvSV (irsgv));
961 SvREFCNT_dec (GvHV (PL_hintgv));
962 1229
963 SvREFCNT_dec (PL_diehook);
964 SvREFCNT_dec (PL_warnhook);
965 1230 {
1231 SV *old_current = SvRV (coro_current);
1232 struct coro *current = SvSTATE (old_current);
1233
1234 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1235
1236 save_perl (aTHX_ current);
1237
1238 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv);
1240
1241 load_perl (aTHX_ coro);
1242
1243 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247
1248 coro_destruct_stacks (aTHX);
1249
1250 /* now save some sv's to be free'd later */
1251 svf [0] = GvSV (PL_defgv);
1252 svf [1] = (SV *)GvAV (PL_defgv);
1253 svf [2] = GvSV (PL_errgv);
1254 svf [3] = (SV *)PL_defoutgv;
1255 svf [4] = PL_rs;
1256 svf [5] = GvSV (irsgv);
1257 svf [6] = (SV *)GvHV (PL_hintgv);
1258 svf [7] = PL_diehook;
1259 svf [8] = PL_warnhook;
1260 assert (9 == sizeof (svf) / sizeof (*svf));
1261
1262 SvRV_set (coro_current, old_current);
1263
1264 load_perl (aTHX_ current);
1265 }
1266
1267 {
1268 unsigned int i;
1269
1270 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1271 SvREFCNT_dec (svf [i]);
1272
966 SvREFCNT_dec (coro->saved_deffh); 1273 SvREFCNT_dec (coro->saved_deffh);
967 SvREFCNT_dec (coro->rouse_cb); 1274 SvREFCNT_dec (coro->rouse_cb);
968 SvREFCNT_dec (coro->invoke_cb); 1275 SvREFCNT_dec (coro->invoke_cb);
969 SvREFCNT_dec (coro->invoke_av); 1276 SvREFCNT_dec (coro->invoke_av);
970 1277 }
971 coro_destruct_stacks (aTHX);
972} 1278}
973 1279
974INLINE void 1280ecb_inline void
975free_coro_mortal (pTHX) 1281free_coro_mortal (pTHX)
976{ 1282{
977 if (expect_true (coro_mortal)) 1283 if (ecb_expect_true (coro_mortal))
978 { 1284 {
979 SvREFCNT_dec (coro_mortal); 1285 SvREFCNT_dec ((SV *)coro_mortal);
980 coro_mortal = 0; 1286 coro_mortal = 0;
981 } 1287 }
982} 1288}
983 1289
984static int 1290static int
… …
1117 1423
1118 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1424 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1119} 1425}
1120 1426
1121/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1427/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1122static void NOINLINE 1428static void ecb_noinline
1123cctx_prepare (pTHX) 1429cctx_prepare (pTHX)
1124{ 1430{
1125 PL_top_env = &PL_start_env; 1431 PL_top_env = &PL_start_env;
1126 1432
1127 if (cctx_current->flags & CC_TRACE) 1433 if (cctx_current->flags & CC_TRACE)
… …
1138 slf_frame.prepare = slf_prepare_set_stacklevel; 1444 slf_frame.prepare = slf_prepare_set_stacklevel;
1139 slf_frame.check = slf_check_set_stacklevel; 1445 slf_frame.check = slf_check_set_stacklevel;
1140} 1446}
1141 1447
1142/* the tail of transfer: execute stuff we can only do after a transfer */ 1448/* the tail of transfer: execute stuff we can only do after a transfer */
1143INLINE void 1449ecb_inline void
1144transfer_tail (pTHX) 1450transfer_tail (pTHX)
1145{ 1451{
1146 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1453}
1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1147} 1465}
1148 1466
1149/* 1467/*
1150 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1151 */ 1469 */
… …
1173 /* somebody or something will hit me for both perl_run and PL_restartop */ 1491 /* somebody or something will hit me for both perl_run and PL_restartop */
1174 PL_restartop = PL_op; 1492 PL_restartop = PL_op;
1175 perl_run (PL_curinterp); 1493 perl_run (PL_curinterp);
1176 /* 1494 /*
1177 * Unfortunately, there is no way to get at the return values of the 1495 * Unfortunately, there is no way to get at the return values of the
1178 * coro body here, as perl_run destroys these 1496 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1497 * runtime errors here, as this is just a random interpreter, not a thread.
1179 */ 1498 */
1180 1499
1181 /* 1500 /*
1182 * If perl-run returns we assume exit() was being called or the coro 1501 * If perl-run returns we assume exit() was being called or the coro
1183 * fell off the end, which seems to be the only valid (non-bug) 1502 * fell off the end, which seems to be the only valid (non-bug)
1184 * reason for perl_run to return. We try to exit by jumping to the 1503 * reason for perl_run to return. We try to mimic whatever perl is normally
1185 * bootstrap-time "top" top_env, as we cannot restore the "main" 1504 * doing in that case. YMMV.
1186 * coroutine as Coro has no such concept.
1187 * This actually isn't valid with the pthread backend, but OSes requiring
1188 * that backend are too broken to do it in a standards-compliant way.
1189 */ 1505 */
1190 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1191 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1192 } 1507 }
1193} 1508}
1194 1509
1195static coro_cctx * 1510static coro_cctx *
1196cctx_new () 1511cctx_new (void)
1197{ 1512{
1198 coro_cctx *cctx; 1513 coro_cctx *cctx;
1199 1514
1200 ++cctx_count; 1515 ++cctx_count;
1201 New (0, cctx, 1, coro_cctx); 1516 New (0, cctx, 1, coro_cctx);
… …
1207 return cctx; 1522 return cctx;
1208} 1523}
1209 1524
1210/* create a new cctx only suitable as source */ 1525/* create a new cctx only suitable as source */
1211static coro_cctx * 1526static coro_cctx *
1212cctx_new_empty () 1527cctx_new_empty (void)
1213{ 1528{
1214 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1215 1530
1216 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1217 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1218 1533
1219 return cctx; 1534 return cctx;
1220} 1535}
1221 1536
1222/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1223static coro_cctx * 1538static coro_cctx *
1224cctx_new_run () 1539cctx_new_run (void)
1225{ 1540{
1226 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1227 void *stack_start;
1228 size_t stack_size;
1229 1542
1230#if HAVE_MMAP 1543 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1231 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1232 /* mmap supposedly does allocate-on-write for us */
1233 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1234
1235 if (cctx->sptr != (void *)-1)
1236 {
1237 #if CORO_STACKGUARD
1238 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1239 #endif
1240 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1241 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1242 cctx->flags |= CC_MAPPED;
1243 } 1544 {
1244 else
1245#endif
1246 {
1247 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1248 New (0, cctx->sptr, cctx_stacksize, long);
1249
1250 if (!cctx->sptr)
1251 {
1252 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1253 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1254 }
1255
1256 stack_start = cctx->sptr;
1257 stack_size = cctx->ssize;
1258 } 1547 }
1259 1548
1260 #if CORO_USE_VALGRIND
1261 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1262 #endif
1263
1264 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1265 1550
1266 return cctx; 1551 return cctx;
1267} 1552}
1268 1553
1269static void 1554static void
1270cctx_destroy (coro_cctx *cctx) 1555cctx_destroy (coro_cctx *cctx)
1271{ 1556{
1272 if (!cctx) 1557 if (!cctx)
1273 return; 1558 return;
1274 1559
1275 assert (cctx != cctx_current);//D temporary 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1276 1561
1277 --cctx_count; 1562 --cctx_count;
1278 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1279 1564
1280 /* coro_transfer creates new, empty cctx's */ 1565 coro_stack_free (&cctx->stack);
1281 if (cctx->sptr)
1282 {
1283 #if CORO_USE_VALGRIND
1284 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1285 #endif
1286
1287#if HAVE_MMAP
1288 if (cctx->flags & CC_MAPPED)
1289 munmap (cctx->sptr, cctx->ssize);
1290 else
1291#endif
1292 Safefree (cctx->sptr);
1293 }
1294 1566
1295 Safefree (cctx); 1567 Safefree (cctx);
1296} 1568}
1297 1569
1298/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
1299#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1571#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1300 1572
1301static coro_cctx * 1573static coro_cctx *
1302cctx_get (pTHX) 1574cctx_get (pTHX)
1303{ 1575{
1304 while (expect_true (cctx_first)) 1576 while (ecb_expect_true (cctx_first))
1305 { 1577 {
1306 coro_cctx *cctx = cctx_first; 1578 coro_cctx *cctx = cctx_first;
1307 cctx_first = cctx->next; 1579 cctx_first = cctx->next;
1308 --cctx_idle; 1580 --cctx_idle;
1309 1581
1310 if (expect_true (!CCTX_EXPIRED (cctx))) 1582 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1311 return cctx; 1583 return cctx;
1312 1584
1313 cctx_destroy (cctx); 1585 cctx_destroy (cctx);
1314 } 1586 }
1315 1587
… …
1317} 1589}
1318 1590
1319static void 1591static void
1320cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1321{ 1593{
1322 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1323 1595
1324 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1325 if (expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1326 { 1598 {
1327 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
1328 cctx_first = first->next; 1600 cctx_first = first->next;
1329 --cctx_idle; 1601 --cctx_idle;
1330 1602
… …
1341static void 1613static void
1342transfer_check (pTHX_ struct coro *prev, struct coro *next) 1614transfer_check (pTHX_ struct coro *prev, struct coro *next)
1343{ 1615{
1344 /* TODO: throwing up here is considered harmful */ 1616 /* TODO: throwing up here is considered harmful */
1345 1617
1346 if (expect_true (prev != next)) 1618 if (ecb_expect_true (prev != next))
1347 { 1619 {
1348 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1620 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1349 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1621 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1350 1622
1351 if (expect_false (next->flags & CF_RUNNING)) 1623 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1352 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1353
1354 if (expect_false (next->flags & CF_DESTROYED))
1355 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1624 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1356 1625
1357#if !PERL_VERSION_ATLEAST (5,10,0) 1626#if !PERL_VERSION_ATLEAST (5,10,0)
1358 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1627 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1359 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1628 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1360#endif 1629#endif
1361 } 1630 }
1362} 1631}
1363 1632
1364/* always use the TRANSFER macro */ 1633/* always use the TRANSFER macro */
1365static void NOINLINE /* noinline so we have a fixed stackframe */ 1634static void ecb_noinline /* noinline so we have a fixed stackframe */
1366transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1635transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1367{ 1636{
1368 dSTACKLEVEL; 1637 dSTACKLEVEL;
1369 1638
1370 /* sometimes transfer is only called to set idle_sp */ 1639 /* sometimes transfer is only called to set idle_sp */
1371 if (expect_false (!prev)) 1640 if (ecb_expect_false (!prev))
1372 { 1641 {
1373 cctx_current->idle_sp = STACKLEVEL; 1642 cctx_current->idle_sp = STACKLEVEL;
1374 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1643 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1375 } 1644 }
1376 else if (expect_true (prev != next)) 1645 else if (ecb_expect_true (prev != next))
1377 { 1646 {
1378 coro_cctx *cctx_prev; 1647 coro_cctx *cctx_prev;
1379 1648
1380 if (expect_false (prev->flags & CF_NEW)) 1649 if (ecb_expect_false (prev->flags & CF_NEW))
1381 { 1650 {
1382 /* create a new empty/source context */ 1651 /* create a new empty/source context */
1383 prev->flags &= ~CF_NEW; 1652 prev->flags &= ~CF_NEW;
1384 prev->flags |= CF_RUNNING; 1653 prev->flags |= CF_RUNNING;
1385 } 1654 }
… …
1388 next->flags |= CF_RUNNING; 1657 next->flags |= CF_RUNNING;
1389 1658
1390 /* first get rid of the old state */ 1659 /* first get rid of the old state */
1391 save_perl (aTHX_ prev); 1660 save_perl (aTHX_ prev);
1392 1661
1393 if (expect_false (next->flags & CF_NEW)) 1662 if (ecb_expect_false (next->flags & CF_NEW))
1394 { 1663 {
1395 /* need to start coroutine */ 1664 /* need to start coroutine */
1396 next->flags &= ~CF_NEW; 1665 next->flags &= ~CF_NEW;
1397 /* setup coroutine call */ 1666 /* setup coroutine call */
1398 coro_setup (aTHX_ next); 1667 init_perl (aTHX_ next);
1399 } 1668 }
1400 else 1669 else
1401 load_perl (aTHX_ next); 1670 load_perl (aTHX_ next);
1402 1671
1403 assert (!prev->cctx);//D temporary
1404
1405 /* possibly untie and reuse the cctx */ 1672 /* possibly untie and reuse the cctx */
1406 if (expect_true ( 1673 if (ecb_expect_true (
1407 cctx_current->idle_sp == STACKLEVEL 1674 cctx_current->idle_sp == STACKLEVEL
1408 && !(cctx_current->flags & CC_TRACE) 1675 && !(cctx_current->flags & CC_TRACE)
1409 && !force_cctx 1676 && !force_cctx
1410 )) 1677 ))
1411 { 1678 {
1412 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1679 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1413 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1680 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1414 1681
1415 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1682 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1416 /* without this the next cctx_get might destroy the running cctx while still in use */ 1683 /* without this the next cctx_get might destroy the running cctx while still in use */
1417 if (expect_false (CCTX_EXPIRED (cctx_current))) 1684 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1418 if (expect_true (!next->cctx)) 1685 if (ecb_expect_true (!next->cctx))
1419 next->cctx = cctx_get (aTHX); 1686 next->cctx = cctx_get (aTHX);
1420 1687
1421 cctx_put (cctx_current); 1688 cctx_put (cctx_current);
1422 } 1689 }
1423 else 1690 else
1424 prev->cctx = cctx_current; 1691 prev->cctx = cctx_current;
1425 1692
1426 ++next->usecount; 1693 ++next->usecount;
1427 1694
1428 cctx_prev = cctx_current; 1695 cctx_prev = cctx_current;
1429 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1696 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1430 1697
1431 next->cctx = 0; 1698 next->cctx = 0;
1432 1699
1433 if (expect_false (cctx_prev != cctx_current)) 1700 if (ecb_expect_false (cctx_prev != cctx_current))
1434 { 1701 {
1435 cctx_prev->top_env = PL_top_env; 1702 cctx_prev->top_env = PL_top_env;
1436 PL_top_env = cctx_current->top_env; 1703 PL_top_env = cctx_current->top_env;
1437 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1704 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1438 } 1705 }
… …
1444#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1711#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1445#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1712#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1446 1713
1447/** high level stuff ********************************************************/ 1714/** high level stuff ********************************************************/
1448 1715
1716/* this function is actually Coro, not Coro::State, but we call it from here */
1717/* because it is convenient - but it hasn't been declared yet for that reason */
1449static int 1718static void
1719coro_call_on_destroy (pTHX_ struct coro *coro);
1720
1721static void
1450coro_state_destroy (pTHX_ struct coro *coro) 1722coro_state_destroy (pTHX_ struct coro *coro)
1451{ 1723{
1452 if (coro->flags & CF_DESTROYED) 1724 if (coro->flags & CF_ZOMBIE)
1453 return 0; 1725 return;
1454 1726
1455 if (coro->on_destroy)
1456 coro->on_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1457 1728
1458 coro->flags |= CF_DESTROYED; 1729 coro->flags |= CF_ZOMBIE;
1459 1730
1460 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1461 { 1732 {
1462 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1463 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1464 --coro_nready; 1735 --coro_nready;
1465 } 1736 }
1466 else 1737 else
1467 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1738 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1468 1739
1469 if (coro->mainstack && coro->mainstack != main_mainstack) 1740 if (coro->next) coro->next->prev = coro->prev;
1470 { 1741 if (coro->prev) coro->prev->next = coro->next;
1471 struct coro temp; 1742 if (coro == coro_first) coro_first = coro->next;
1472 1743
1473 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1744 if (coro->mainstack
1474 1745 && coro->mainstack != main_mainstack
1475 save_perl (aTHX_ &temp); 1746 && coro->slot
1747 && !PL_dirty)
1476 load_perl (aTHX_ coro); 1748 destroy_perl (aTHX_ coro);
1477
1478 coro_destruct (aTHX_ coro);
1479
1480 load_perl (aTHX_ &temp);
1481
1482 coro->slot = 0;
1483 }
1484 1749
1485 cctx_destroy (coro->cctx); 1750 cctx_destroy (coro->cctx);
1486 SvREFCNT_dec (coro->startcv); 1751 SvREFCNT_dec (coro->startcv);
1487 SvREFCNT_dec (coro->args); 1752 SvREFCNT_dec (coro->args);
1753 SvREFCNT_dec (coro->swap_sv);
1488 SvREFCNT_dec (CORO_THROW); 1754 SvREFCNT_dec (CORO_THROW);
1489 1755
1490 if (coro->next) coro->next->prev = coro->prev; 1756 coro_call_on_destroy (aTHX_ coro);
1491 if (coro->prev) coro->prev->next = coro->next;
1492 if (coro == coro_first) coro_first = coro->next;
1493 1757
1494 return 1; 1758 /* more destruction mayhem in coro_state_free */
1495} 1759}
1496 1760
1497static int 1761static int
1498coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1762coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1499{ 1763{
1500 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 struct coro *coro = (struct coro *)mg->mg_ptr;
1501 mg->mg_ptr = 0; 1765 mg->mg_ptr = 0;
1502 1766
1503 coro->hv = 0;
1504
1505 if (--coro->refcnt < 0)
1506 {
1507 coro_state_destroy (aTHX_ coro); 1767 coro_state_destroy (aTHX_ coro);
1768 SvREFCNT_dec (coro->on_destroy);
1769 SvREFCNT_dec (coro->status);
1770
1508 Safefree (coro); 1771 Safefree (coro);
1509 }
1510 1772
1511 return 0; 1773 return 0;
1512} 1774}
1513 1775
1514static int 1776static int ecb_cold
1515coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1777coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1516{ 1778{
1517 struct coro *coro = (struct coro *)mg->mg_ptr; 1779 /* called when perl clones the current process the slow way (windows process emulation) */
1518 1780 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1519 ++coro->refcnt; 1781 mg->mg_ptr = 0;
1782 mg->mg_virtual = 0;
1520 1783
1521 return 0; 1784 return 0;
1522} 1785}
1523 1786
1524static MGVTBL coro_state_vtbl = { 1787static MGVTBL coro_state_vtbl = {
… …
1547 1810
1548 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1811 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1549 TRANSFER (ta, 1); 1812 TRANSFER (ta, 1);
1550} 1813}
1551 1814
1552/*****************************************************************************/
1553/* gensub: simple closure generation utility */
1554
1555#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1556
1557/* create a closure from XS, returns a code reference */
1558/* the arg can be accessed via GENSUB_ARG from the callback */
1559/* the callback must use dXSARGS/XSRETURN */
1560static SV *
1561gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1562{
1563 CV *cv = (CV *)newSV (0);
1564
1565 sv_upgrade ((SV *)cv, SVt_PVCV);
1566
1567 CvANON_on (cv);
1568 CvISXSUB_on (cv);
1569 CvXSUB (cv) = xsub;
1570 GENSUB_ARG = arg;
1571
1572 return newRV_noinc ((SV *)cv);
1573}
1574
1575/** Coro ********************************************************************/ 1815/** Coro ********************************************************************/
1576 1816
1577INLINE void 1817ecb_inline void
1578coro_enq (pTHX_ struct coro *coro) 1818coro_enq (pTHX_ struct coro *coro)
1579{ 1819{
1580 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1820 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1581}
1582 1821
1583INLINE SV * 1822 SvREFCNT_inc_NN (coro->hv);
1823
1824 coro->next_ready = 0;
1825 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1826 ready [1] = coro;
1827}
1828
1829ecb_inline struct coro *
1584coro_deq (pTHX) 1830coro_deq (pTHX)
1585{ 1831{
1586 int prio; 1832 int prio;
1587 1833
1588 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1834 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1589 if (AvFILLp (coro_ready [prio]) >= 0) 1835 {
1590 return av_shift (coro_ready [prio]); 1836 struct coro **ready = coro_ready [prio];
1837
1838 if (ready [0])
1839 {
1840 struct coro *coro = ready [0];
1841 ready [0] = coro->next_ready;
1842 return coro;
1843 }
1844 }
1591 1845
1592 return 0; 1846 return 0;
1847}
1848
1849static void
1850invoke_sv_ready_hook_helper (void)
1851{
1852 dTHX;
1853 dSP;
1854
1855 ENTER;
1856 SAVETMPS;
1857
1858 PUSHMARK (SP);
1859 PUTBACK;
1860 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1861
1862 FREETMPS;
1863 LEAVE;
1593} 1864}
1594 1865
1595static int 1866static int
1596api_ready (pTHX_ SV *coro_sv) 1867api_ready (pTHX_ SV *coro_sv)
1597{ 1868{
1598 struct coro *coro;
1599 SV *sv_hook;
1600 void (*xs_hook)(void);
1601
1602 coro = SvSTATE (coro_sv); 1869 struct coro *coro = SvSTATE (coro_sv);
1603 1870
1604 if (coro->flags & CF_READY) 1871 if (coro->flags & CF_READY)
1605 return 0; 1872 return 0;
1606 1873
1607 coro->flags |= CF_READY; 1874 coro->flags |= CF_READY;
1608 1875
1609 sv_hook = coro_nready ? 0 : coro_readyhook;
1610 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1611
1612 coro_enq (aTHX_ coro); 1876 coro_enq (aTHX_ coro);
1613 ++coro_nready;
1614 1877
1615 if (sv_hook) 1878 if (!coro_nready++)
1616 { 1879 if (coroapi.readyhook)
1617 dSP; 1880 coroapi.readyhook ();
1618
1619 ENTER;
1620 SAVETMPS;
1621
1622 PUSHMARK (SP);
1623 PUTBACK;
1624 call_sv (sv_hook, G_VOID | G_DISCARD);
1625
1626 FREETMPS;
1627 LEAVE;
1628 }
1629
1630 if (xs_hook)
1631 xs_hook ();
1632 1881
1633 return 1; 1882 return 1;
1634} 1883}
1635 1884
1636static int 1885static int
… …
1638{ 1887{
1639 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1888 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1640} 1889}
1641 1890
1642/* expects to own a reference to next->hv */ 1891/* expects to own a reference to next->hv */
1643INLINE void 1892ecb_inline void
1644prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1893prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1645{ 1894{
1646 SV *prev_sv = SvRV (coro_current); 1895 SV *prev_sv = SvRV (coro_current);
1647 1896
1648 ta->prev = SvSTATE_hv (prev_sv); 1897 ta->prev = SvSTATE_hv (prev_sv);
… …
1659static void 1908static void
1660prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1909prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1661{ 1910{
1662 for (;;) 1911 for (;;)
1663 { 1912 {
1664 SV *next_sv = coro_deq (aTHX); 1913 struct coro *next = coro_deq (aTHX);
1665 1914
1666 if (expect_true (next_sv)) 1915 if (ecb_expect_true (next))
1667 { 1916 {
1668 struct coro *next = SvSTATE_hv (next_sv);
1669
1670 /* cannot transfer to destroyed coros, skip and look for next */ 1917 /* cannot transfer to destroyed coros, skip and look for next */
1671 if (expect_false (next->flags & CF_DESTROYED)) 1918 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1672 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1919 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1673 else 1920 else
1674 { 1921 {
1675 next->flags &= ~CF_READY; 1922 next->flags &= ~CF_READY;
1676 --coro_nready; 1923 --coro_nready;
1677 1924
… …
1683 { 1930 {
1684 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1685 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1686 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1687 { 1934 {
1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1954
1688 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1689 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1690 --coro_nready; 1957 --coro_nready;
1691 } 1958 }
1692 else 1959 else
1693 { 1960 {
1961 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1694 dSP; 1962 dSP;
1695 1963
1696 ENTER; 1964 ENTER;
1697 SAVETMPS; 1965 SAVETMPS;
1698 1966
… …
1705 } 1973 }
1706 } 1974 }
1707 } 1975 }
1708} 1976}
1709 1977
1710INLINE void 1978ecb_inline void
1711prepare_cede (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede (pTHX_ struct coro_transfer_args *ta)
1712{ 1980{
1713 api_ready (aTHX_ coro_current); 1981 api_ready (aTHX_ coro_current);
1714 prepare_schedule (aTHX_ ta); 1982 prepare_schedule (aTHX_ ta);
1715} 1983}
1716 1984
1717INLINE void 1985ecb_inline void
1718prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1986prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1719{ 1987{
1720 SV *prev = SvRV (coro_current); 1988 SV *prev = SvRV (coro_current);
1721 1989
1722 if (coro_nready) 1990 if (coro_nready)
… …
1752{ 2020{
1753 struct coro_transfer_args ta; 2021 struct coro_transfer_args ta;
1754 2022
1755 prepare_cede (aTHX_ &ta); 2023 prepare_cede (aTHX_ &ta);
1756 2024
1757 if (expect_true (ta.prev != ta.next)) 2025 if (ecb_expect_true (ta.prev != ta.next))
1758 { 2026 {
1759 TRANSFER (ta, 1); 2027 TRANSFER (ta, 1);
1760 return 1; 2028 return 1;
1761 } 2029 }
1762 else 2030 else
… …
1805 coro->slot->runops = RUNOPS_DEFAULT; 2073 coro->slot->runops = RUNOPS_DEFAULT;
1806 } 2074 }
1807} 2075}
1808 2076
1809static void 2077static void
2078coro_push_av (pTHX_ AV *av, I32 gimme_v)
2079{
2080 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2081 {
2082 dSP;
2083
2084 if (gimme_v == G_SCALAR)
2085 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2086 else
2087 {
2088 int i;
2089 EXTEND (SP, AvFILLp (av) + 1);
2090
2091 for (i = 0; i <= AvFILLp (av); ++i)
2092 PUSHs (AvARRAY (av)[i]);
2093 }
2094
2095 PUTBACK;
2096 }
2097}
2098
2099static void
2100coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2101{
2102 if (!coro->on_destroy)
2103 coro->on_destroy = newAV ();
2104
2105 av_push (coro->on_destroy, cb);
2106}
2107
2108static void
2109slf_destroy_join (pTHX_ struct CoroSLF *frame)
2110{
2111 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2112}
2113
2114static int
2115slf_check_join (pTHX_ struct CoroSLF *frame)
2116{
2117 struct coro *coro = (struct coro *)frame->data;
2118
2119 if (!coro->status)
2120 return 1;
2121
2122 frame->destroy = 0;
2123
2124 coro_push_av (aTHX_ coro->status, GIMME_V);
2125
2126 SvREFCNT_dec ((SV *)coro->hv);
2127
2128 return 0;
2129}
2130
2131static void
2132slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2133{
2134 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2135
2136 if (items > 1)
2137 croak ("join called with too many arguments");
2138
2139 if (coro->status)
2140 frame->prepare = prepare_nop;
2141 else
2142 {
2143 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2144 frame->prepare = prepare_schedule;
2145 }
2146
2147 frame->check = slf_check_join;
2148 frame->destroy = slf_destroy_join;
2149 frame->data = (void *)coro;
2150 SvREFCNT_inc (coro->hv);
2151}
2152
2153static void
1810coro_call_on_destroy (pTHX_ struct coro *coro) 2154coro_call_on_destroy (pTHX_ struct coro *coro)
1811{ 2155{
1812 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2156 AV *od = coro->on_destroy;
1813 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1814 2157
1815 if (on_destroyp) 2158 if (!od)
1816 { 2159 return;
1817 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1818 2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
1819 while (AvFILLp (on_destroy) >= 0) 2164 while (AvFILLp (od) >= 0)
2165 {
2166 SV *cb = sv_2mortal (av_pop (od));
2167
2168 /* coro hv's (and only hv's at the moment) are supported as well */
2169 if (SvSTATEhv_p (aTHX_ cb))
2170 api_ready (aTHX_ cb);
2171 else
1820 { 2172 {
1821 dSP; /* don't disturb outer sp */ 2173 dSP; /* don't disturb outer sp */
1822 SV *cb = av_pop (on_destroy);
1823
1824 PUSHMARK (SP); 2174 PUSHMARK (SP);
1825 2175
1826 if (statusp) 2176 if (coro->status)
1827 { 2177 {
1828 int i; 2178 PUTBACK;
1829 AV *status = (AV *)SvRV (*statusp); 2179 coro_push_av (aTHX_ coro->status, G_ARRAY);
1830 EXTEND (SP, AvFILLp (status) + 1); 2180 SPAGAIN;
1831
1832 for (i = 0; i <= AvFILLp (status); ++i)
1833 PUSHs (AvARRAY (status)[i]);
1834 } 2181 }
1835 2182
1836 PUTBACK; 2183 PUTBACK;
1837 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2184 call_sv (cb, G_VOID | G_DISCARD);
1838 } 2185 }
1839 } 2186 }
1840} 2187}
1841 2188
1842static void 2189static void
1843slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1844{ 2191{
2192 AV *av;
2193
2194 if (coro->status)
2195 {
2196 av = coro->status;
2197 av_clear (av);
2198 }
2199 else
2200 av = coro->status = newAV ();
2201
2202 /* items are actually not so common, so optimise for this case */
2203 if (items)
2204 {
1845 int i; 2205 int i;
1846 HV *hv = (HV *)SvRV (coro_current);
1847 AV *av = newAV ();
1848 2206
1849 av_extend (av, items - 1); 2207 av_extend (av, items - 1);
2208
1850 for (i = 0; i < items; ++i) 2209 for (i = 0; i < items; ++i)
1851 av_push (av, SvREFCNT_inc_NN (arg [i])); 2210 av_push (av, SvREFCNT_inc_NN (arg [i]));
2211 }
2212}
1852 2213
1853 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2214static void
1854 2215slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2216{
1855 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2217 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1856 api_ready (aTHX_ sv_manager); 2218 api_ready (aTHX_ sv_manager);
1857 2219
1858 frame->prepare = prepare_schedule; 2220 frame->prepare = prepare_schedule;
1859 frame->check = slf_check_repeat; 2221 frame->check = slf_check_repeat;
2222
2223 /* as a minor optimisation, we could unwind all stacks here */
2224 /* but that puts extra pressure on pp_slf, and is not worth much */
2225 /*coro_unwind_stacks (aTHX);*/
2226}
2227
2228static void
2229slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2230{
2231 HV *coro_hv = (HV *)SvRV (coro_current);
2232
2233 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2234 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2235}
2236
2237static void
2238slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2239{
2240 HV *coro_hv;
2241 struct coro *coro;
2242
2243 if (items <= 0)
2244 croak ("Coro::cancel called without coro object,");
2245
2246 coro = SvSTATE (arg [0]);
2247 coro_hv = coro->hv;
2248
2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2250
2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2252 {
2253 /* coro currently busy cancelling something, so just notify it */
2254 coro->slf_frame.data = (void *)coro;
2255
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 else if (coro_hv == (HV *)SvRV (coro_current))
2260 {
2261 /* cancelling the current coro is allowed, and equals terminate */
2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2263 }
2264 else
2265 {
2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2270
2271 /* otherwise we cancel directly, purely for speed reasons
2272 * unfortunately, this requires some magic trickery, as
2273 * somebody else could cancel us, so we have to fight the cancellation.
2274 * this is ugly, and hopefully fully worth the extra speed.
2275 * besides, I can't get the slow-but-safe version working...
2276 */
2277 slf_frame.data = 0;
2278 self->flags |= CF_NOCANCEL;
2279 coro_state_destroy (aTHX_ coro);
2280 self->flags &= ~CF_NOCANCEL;
2281
2282 if (slf_frame.data)
2283 {
2284 /* while we were busy we have been cancelled, so terminate */
2285 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2286 }
2287 else
2288 {
2289 frame->prepare = prepare_nop;
2290 frame->check = slf_check_nop;
2291 }
2292 }
2293}
2294
2295static int
2296slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2297{
2298 frame->prepare = 0;
2299 coro_unwind_stacks (aTHX);
2300
2301 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2302
2303 return 1;
2304}
2305
2306static int
2307safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2308{
2309 if (coro->cctx)
2310 croak ("coro inside C callback, unable to cancel at this time, caught");
2311
2312 if (coro->flags & CF_NEW)
2313 {
2314 coro_set_status (aTHX_ coro, arg, items);
2315 coro_state_destroy (aTHX_ coro);
2316 }
2317 else
2318 {
2319 if (!coro->slf_frame.prepare)
2320 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2321
2322 slf_destroy (aTHX_ coro);
2323
2324 coro_set_status (aTHX_ coro, arg, items);
2325 coro->slf_frame.prepare = prepare_nop;
2326 coro->slf_frame.check = slf_check_safe_cancel;
2327
2328 api_ready (aTHX_ (SV *)coro->hv);
2329 }
2330
2331 return 1;
1860} 2332}
1861 2333
1862/*****************************************************************************/ 2334/*****************************************************************************/
1863/* async pool handler */ 2335/* async pool handler */
1864 2336
… …
1895slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2367slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1896{ 2368{
1897 HV *hv = (HV *)SvRV (coro_current); 2369 HV *hv = (HV *)SvRV (coro_current);
1898 struct coro *coro = SvSTATE_hv ((SV *)hv); 2370 struct coro *coro = SvSTATE_hv ((SV *)hv);
1899 2371
1900 if (expect_true (coro->saved_deffh)) 2372 if (ecb_expect_true (coro->saved_deffh))
1901 { 2373 {
1902 /* subsequent iteration */ 2374 /* subsequent iteration */
1903 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2375 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1904 coro->saved_deffh = 0; 2376 coro->saved_deffh = 0;
1905 2377
1906 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2378 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1907 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2379 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1908 { 2380 {
1909 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2381 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1910 coro->invoke_av = newAV (); 2382 return;
1911
1912 frame->prepare = prepare_nop;
1913 } 2383 }
1914 else 2384 else
1915 { 2385 {
1916 av_clear (GvAV (PL_defgv)); 2386 av_clear (GvAV (PL_defgv));
1917 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1942 2412
1943static void 2413static void
1944coro_rouse_callback (pTHX_ CV *cv) 2414coro_rouse_callback (pTHX_ CV *cv)
1945{ 2415{
1946 dXSARGS; 2416 dXSARGS;
1947 SV *data = (SV *)GENSUB_ARG; 2417 SV *data = (SV *)S_GENSUB_ARG;
1948 2418
1949 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2419 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1950 { 2420 {
1951 /* first call, set args */ 2421 /* first call, set args */
2422 SV *coro = SvRV (data);
1952 AV *av = newAV (); 2423 AV *av = newAV ();
1953 SV *coro = SvRV (data);
1954 2424
1955 SvRV_set (data, (SV *)av); 2425 SvRV_set (data, (SV *)av);
1956 api_ready (aTHX_ coro);
1957 SvREFCNT_dec (coro);
1958 2426
1959 /* better take a full copy of the arguments */ 2427 /* better take a full copy of the arguments */
1960 while (items--) 2428 while (items--)
1961 av_store (av, items, newSVsv (ST (items))); 2429 av_store (av, items, newSVsv (ST (items)));
2430
2431 api_ready (aTHX_ coro);
2432 SvREFCNT_dec (coro);
1962 } 2433 }
1963 2434
1964 XSRETURN_EMPTY; 2435 XSRETURN_EMPTY;
1965} 2436}
1966 2437
1967static int 2438static int
1968slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1969{ 2440{
1970 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
1971 2442
1972 if (CORO_THROW) 2443 if (CORO_THROW)
1973 return 0; 2444 return 0;
1974 2445
1975 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1976 return 1; 2447 return 1;
… …
1983 2454
1984 EXTEND (SP, AvFILLp (av) + 1); 2455 EXTEND (SP, AvFILLp (av) + 1);
1985 for (i = 0; i <= AvFILLp (av); ++i) 2456 for (i = 0; i <= AvFILLp (av); ++i)
1986 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2457 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1987 2458
1988 /* we have stolen the elements, so ste length to zero and free */ 2459 /* we have stolen the elements, so set length to zero and free */
1989 AvFILLp (av) = -1; 2460 AvFILLp (av) = -1;
1990 av_undef (av); 2461 av_undef (av);
1991 2462
1992 PUTBACK; 2463 PUTBACK;
1993 } 2464 }
… …
2012 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2013 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2014 } 2485 }
2015 2486
2016 if (!SvROK (cb) 2487 if (!SvROK (cb)
2017 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2018 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2019 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2020 2491
2021 { 2492 {
2022 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2023 SV *data = (SV *)GENSUB_ARG; 2494 SV *data = (SV *)S_GENSUB_ARG;
2024 2495
2025 frame->data = (void *)data; 2496 frame->data = (void *)data;
2026 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2497 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2027 frame->check = slf_check_rouse_wait; 2498 frame->check = slf_check_rouse_wait;
2028 } 2499 }
… …
2032coro_new_rouse_cb (pTHX) 2503coro_new_rouse_cb (pTHX)
2033{ 2504{
2034 HV *hv = (HV *)SvRV (coro_current); 2505 HV *hv = (HV *)SvRV (coro_current);
2035 struct coro *coro = SvSTATE_hv (hv); 2506 struct coro *coro = SvSTATE_hv (hv);
2036 SV *data = newRV_inc ((SV *)hv); 2507 SV *data = newRV_inc ((SV *)hv);
2037 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2508 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2038 2509
2039 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2510 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2040 SvREFCNT_dec (data); /* magicext increases the refcount */ 2511 SvREFCNT_dec (data); /* magicext increases the refcount */
2041 2512
2042 SvREFCNT_dec (coro->rouse_cb); 2513 SvREFCNT_dec (coro->rouse_cb);
… …
2139static void 2610static void
2140slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2611slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2141{ 2612{
2142 frame->prepare = prepare_cede_notself; 2613 frame->prepare = prepare_cede_notself;
2143 frame->check = slf_check_nop; 2614 frame->check = slf_check_nop;
2615}
2616
2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2618static void
2619slf_destroy (pTHX_ struct coro *coro)
2620{
2621 struct CoroSLF frame = coro->slf_frame;
2622
2623 /*
2624 * The on_destroy below most likely is from an SLF call.
2625 * Since by definition the SLF call will not finish when we destroy
2626 * the coro, we will have to force-finish it here, otherwise
2627 * cleanup functions cannot call SLF functions.
2628 */
2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2144} 2634}
2145 2635
2146/* 2636/*
2147 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2148 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2155 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2645 I32 checkmark; /* mark SP to see how many elements check has pushed */
2156 2646
2157 /* set up the slf frame, unless it has already been set-up */ 2647 /* set up the slf frame, unless it has already been set-up */
2158 /* the latter happens when a new coro has been started */ 2648 /* the latter happens when a new coro has been started */
2159 /* or when a new cctx was attached to an existing coroutine */ 2649 /* or when a new cctx was attached to an existing coroutine */
2160 if (expect_true (!slf_frame.prepare)) 2650 if (ecb_expect_true (!slf_frame.prepare))
2161 { 2651 {
2162 /* first iteration */ 2652 /* first iteration */
2163 dSP; 2653 dSP;
2164 SV **arg = PL_stack_base + TOPMARK + 1; 2654 SV **arg = PL_stack_base + TOPMARK + 1;
2165 int items = SP - arg; /* args without function object */ 2655 int items = SP - arg; /* args without function object */
… …
2206 while (slf_frame.check (aTHX_ &slf_frame)); 2696 while (slf_frame.check (aTHX_ &slf_frame));
2207 2697
2208 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2698 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2209 2699
2210 /* exception handling */ 2700 /* exception handling */
2211 if (expect_false (CORO_THROW)) 2701 if (ecb_expect_false (CORO_THROW))
2212 { 2702 {
2213 SV *exception = sv_2mortal (CORO_THROW); 2703 SV *exception = sv_2mortal (CORO_THROW);
2214 2704
2215 CORO_THROW = 0; 2705 CORO_THROW = 0;
2216 sv_setsv (ERRSV, exception); 2706 sv_setsv (ERRSV, exception);
2217 croak (0); 2707 croak (0);
2218 } 2708 }
2219 2709
2220 /* return value handling - mostly like entersub */ 2710 /* return value handling - mostly like entersub */
2221 /* make sure we put something on the stack in scalar context */ 2711 /* make sure we put something on the stack in scalar context */
2222 if (GIMME_V == G_SCALAR) 2712 if (GIMME_V == G_SCALAR
2713 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2223 { 2714 {
2224 dSP; 2715 dSP;
2225 SV **bot = PL_stack_base + checkmark; 2716 SV **bot = PL_stack_base + checkmark;
2226 2717
2227 if (sp == bot) /* too few, push undef */ 2718 if (sp == bot) /* too few, push undef */
2228 bot [1] = &PL_sv_undef; 2719 bot [1] = &PL_sv_undef;
2229 else if (sp != bot + 1) /* too many, take last one */ 2720 else /* too many, take last one */
2230 bot [1] = *sp; 2721 bot [1] = *sp;
2231 2722
2232 SP = bot + 1; 2723 SP = bot + 1;
2233 2724
2234 PUTBACK; 2725 PUTBACK;
… …
2267 if (PL_op->op_flags & OPf_STACKED) 2758 if (PL_op->op_flags & OPf_STACKED)
2268 { 2759 {
2269 if (items > slf_arga) 2760 if (items > slf_arga)
2270 { 2761 {
2271 slf_arga = items; 2762 slf_arga = items;
2272 free (slf_argv); 2763 Safefree (slf_argv);
2273 slf_argv = malloc (slf_arga * sizeof (SV *)); 2764 New (0, slf_argv, slf_arga, SV *);
2274 } 2765 }
2275 2766
2276 slf_argc = items; 2767 slf_argc = items;
2277 2768
2278 for (i = 0; i < items; ++i) 2769 for (i = 0; i < items; ++i)
… …
2283 2774
2284 PL_op->op_ppaddr = pp_slf; 2775 PL_op->op_ppaddr = pp_slf;
2285 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2776 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2286 2777
2287 PL_op = (OP *)&slf_restore; 2778 PL_op = (OP *)&slf_restore;
2779}
2780
2781/*****************************************************************************/
2782/* dynamic wind */
2783
2784static void
2785on_enterleave_call (pTHX_ SV *cb)
2786{
2787 dSP;
2788
2789 PUSHSTACK;
2790
2791 PUSHMARK (SP);
2792 PUTBACK;
2793 call_sv (cb, G_VOID | G_DISCARD);
2794 SPAGAIN;
2795
2796 POPSTACK;
2797}
2798
2799static SV *
2800coro_avp_pop_and_free (pTHX_ AV **avp)
2801{
2802 AV *av = *avp;
2803 SV *res = av_pop (av);
2804
2805 if (AvFILLp (av) < 0)
2806 {
2807 *avp = 0;
2808 SvREFCNT_dec (av);
2809 }
2810
2811 return res;
2812}
2813
2814static void
2815coro_pop_on_enter (pTHX_ void *coro)
2816{
2817 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2818 SvREFCNT_dec (cb);
2819}
2820
2821static void
2822coro_pop_on_leave (pTHX_ void *coro)
2823{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb));
2288} 2826}
2289 2827
2290/*****************************************************************************/ 2828/*****************************************************************************/
2291/* PerlIO::cede */ 2829/* PerlIO::cede */
2292 2830
… …
2294{ 2832{
2295 PerlIOBuf base; 2833 PerlIOBuf base;
2296 NV next, every; 2834 NV next, every;
2297} PerlIOCede; 2835} PerlIOCede;
2298 2836
2299static IV 2837static IV ecb_cold
2300PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2838PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2301{ 2839{
2302 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2303 2841
2304 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2842 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2305 self->next = nvtime () + self->every; 2843 self->next = nvtime () + self->every;
2306 2844
2307 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2845 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2308} 2846}
2309 2847
2310static SV * 2848static SV * ecb_cold
2311PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2849PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2312{ 2850{
2313 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2314 2852
2315 return newSVnv (self->every); 2853 return newSVnv (self->every);
… …
2366/* Coro::Semaphore & Coro::Signal */ 2904/* Coro::Semaphore & Coro::Signal */
2367 2905
2368static SV * 2906static SV *
2369coro_waitarray_new (pTHX_ int count) 2907coro_waitarray_new (pTHX_ int count)
2370{ 2908{
2371 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2909 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2372 AV *av = newAV (); 2910 AV *av = newAV ();
2373 SV **ary; 2911 SV **ary;
2374 2912
2375 /* unfortunately, building manually saves memory */ 2913 /* unfortunately, building manually saves memory */
2376 Newx (ary, 2, SV *); 2914 Newx (ary, 2, SV *);
… …
2427 SvREFCNT_dec (cb); 2965 SvREFCNT_dec (cb);
2428 } 2966 }
2429} 2967}
2430 2968
2431static void 2969static void
2432coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2433{ 2971{
2434 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2972 /* call $sem->adjust (0) to possibly wake up some other waiters */
2435 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2973 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2436} 2974}
2437 2975
2438static int 2976static int
2439slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2977slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2440{ 2978{
2441 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2442 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2981 SV *coro_hv = SvRV (coro_current);
2982
2983 frame->destroy = 0;
2443 2984
2444 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2445 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2446 return 0; 2991 return 0;
2992 }
2447 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2448 { 2994 {
2449 SvSTATE_current->on_destroy = 0;
2450
2451 if (acquire) 2995 if (acquire)
2452 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2453 else 2997 else
2454 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2455 2999
… …
2459 { 3003 {
2460 int i; 3004 int i;
2461 /* if we were woken up but can't down, we look through the whole */ 3005 /* if we were woken up but can't down, we look through the whole */
2462 /* waiters list and only add us if we aren't in there already */ 3006 /* waiters list and only add us if we aren't in there already */
2463 /* this avoids some degenerate memory usage cases */ 3007 /* this avoids some degenerate memory usage cases */
2464 3008 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2465 for (i = 1; i <= AvFILLp (av); ++i)
2466 if (AvARRAY (av)[i] == SvRV (coro_current)) 3009 if (AvARRAY (av)[i] == coro_hv)
2467 return 1; 3010 return 1;
2468 3011
2469 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3012 av_push (av, SvREFCNT_inc (coro_hv));
2470 return 1; 3013 return 1;
2471 } 3014 }
2472} 3015}
2473 3016
2474static int 3017static int
… …
2497 { 3040 {
2498 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3041 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2499 3042
2500 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3043 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2501 frame->prepare = prepare_schedule; 3044 frame->prepare = prepare_schedule;
2502
2503 /* to avoid race conditions when a woken-up coro gets terminated */ 3045 /* to avoid race conditions when a woken-up coro gets terminated */
2504 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3046 /* we arrange for a temporary on_destroy that calls adjust (0) */
2505 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3047 frame->destroy = coro_semaphore_destroy;
2506 } 3048 }
2507} 3049}
2508 3050
2509static void 3051static void
2510slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3052slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2518{ 3060{
2519 if (items >= 2) 3061 if (items >= 2)
2520 { 3062 {
2521 /* callback form */ 3063 /* callback form */
2522 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2523 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3065 SV *cb_cv = s_get_cv_croak (arg [1]);
2524 3066
2525 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3067 av_push (av, SvREFCNT_inc_NN (cb_cv));
2526 3068
2527 if (SvIVX (AvARRAY (av)[0]) > 0) 3069 if (SvIVX (AvARRAY (av)[0]) > 0)
2528 coro_semaphore_adjust (aTHX_ av, 0); 3070 coro_semaphore_adjust (aTHX_ av, 0);
2529 3071
2530 frame->prepare = prepare_nop; 3072 frame->prepare = prepare_nop;
… …
2554 AvARRAY (av)[0] = AvARRAY (av)[1]; 3096 AvARRAY (av)[0] = AvARRAY (av)[1];
2555 AvARRAY (av)[1] = cb; 3097 AvARRAY (av)[1] = cb;
2556 3098
2557 cb = av_shift (av); 3099 cb = av_shift (av);
2558 3100
3101 if (SvTYPE (cb) == SVt_PVCV)
3102 {
3103 dSP;
3104 PUSHMARK (SP);
3105 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3106 PUTBACK;
3107 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3108 }
3109 else
3110 {
2559 api_ready (aTHX_ cb); 3111 api_ready (aTHX_ cb);
2560 sv_setiv (cb, 0); /* signal waiter */ 3112 sv_setiv (cb, 0); /* signal waiter */
3113 }
3114
2561 SvREFCNT_dec (cb); 3115 SvREFCNT_dec (cb);
2562 3116
2563 --count; 3117 --count;
2564 } 3118 }
2565} 3119}
… …
2574static void 3128static void
2575slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3129slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2576{ 3130{
2577 AV *av = (AV *)SvRV (arg [0]); 3131 AV *av = (AV *)SvRV (arg [0]);
2578 3132
3133 if (items >= 2)
3134 {
3135 SV *cb_cv = s_get_cv_croak (arg [1]);
3136 av_push (av, SvREFCNT_inc_NN (cb_cv));
3137
2579 if (SvIVX (AvARRAY (av)[0])) 3138 if (SvIVX (AvARRAY (av)[0]))
3139 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3140
3141 frame->prepare = prepare_nop;
3142 frame->check = slf_check_nop;
3143 }
3144 else if (SvIVX (AvARRAY (av)[0]))
2580 { 3145 {
2581 SvIVX (AvARRAY (av)[0]) = 0; 3146 SvIVX (AvARRAY (av)[0]) = 0;
2582 frame->prepare = prepare_nop; 3147 frame->prepare = prepare_nop;
2583 frame->check = slf_check_nop; 3148 frame->check = slf_check_nop;
2584 } 3149 }
2585 else 3150 else
2586 { 3151 {
2587 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3152 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2588 3153
2589 av_push (av, waiter); 3154 av_push (av, waiter);
2590 3155
2591 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3156 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2592 frame->prepare = prepare_schedule; 3157 frame->prepare = prepare_schedule;
… …
2610 3175
2611static void 3176static void
2612coro_aio_callback (pTHX_ CV *cv) 3177coro_aio_callback (pTHX_ CV *cv)
2613{ 3178{
2614 dXSARGS; 3179 dXSARGS;
2615 AV *state = (AV *)GENSUB_ARG; 3180 AV *state = (AV *)S_GENSUB_ARG;
2616 SV *coro = av_pop (state); 3181 SV *coro = av_pop (state);
2617 SV *data_sv = newSV (sizeof (struct io_state)); 3182 SV *data_sv = newSV (sizeof (struct io_state));
2618 3183
2619 av_extend (state, items - 1); 3184 av_extend (state, items - 1);
2620 3185
… …
2656 /* it quickly returns */ 3221 /* it quickly returns */
2657 if (CORO_THROW) 3222 if (CORO_THROW)
2658 return 0; 3223 return 0;
2659 3224
2660 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
2661 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2662 return 1; 3227 return 1;
2663 3228
2664 /* restore status */ 3229 /* restore status */
2665 { 3230 {
2666 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
2705 dSP; 3270 dSP;
2706 3271
2707 static SV *prio_cv; 3272 static SV *prio_cv;
2708 static SV *prio_sv; 3273 static SV *prio_sv;
2709 3274
2710 if (expect_false (!prio_cv)) 3275 if (ecb_expect_false (!prio_cv))
2711 { 3276 {
2712 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3277 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2713 prio_sv = newSViv (0); 3278 prio_sv = newSViv (0);
2714 } 3279 }
2715 3280
… …
2734 3299
2735 for (i = 0; i < items; ++i) 3300 for (i = 0; i < items; ++i)
2736 PUSHs (arg [i]); 3301 PUSHs (arg [i]);
2737 3302
2738 /* now push the callback closure */ 3303 /* now push the callback closure */
2739 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3304 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2740 3305
2741 /* now call the AIO function - we assume our request is uncancelable */ 3306 /* now call the AIO function - we assume our request is uncancelable */
2742 PUTBACK; 3307 PUTBACK;
2743 call_sv ((SV *)req, G_VOID | G_DISCARD); 3308 call_sv ((SV *)req, G_VOID | G_DISCARD);
2744 } 3309 }
2745 3310
2746 /* now that the requets is going, we loop toll we have a result */ 3311 /* now that the request is going, we loop till we have a result */
2747 frame->data = (void *)state; 3312 frame->data = (void *)state;
2748 frame->prepare = prepare_schedule; 3313 frame->prepare = prepare_schedule;
2749 frame->check = slf_check_aio_req; 3314 frame->check = slf_check_aio_req;
2750} 3315}
2751 3316
… …
2763 3328
2764#if CORO_CLONE 3329#if CORO_CLONE
2765# include "clone.c" 3330# include "clone.c"
2766#endif 3331#endif
2767 3332
3333/*****************************************************************************/
3334
3335static SV *
3336coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3337{
3338 SV *coro_sv;
3339 struct coro *coro;
3340 MAGIC *mg;
3341 HV *hv;
3342 SV *cb;
3343 int i;
3344
3345 if (argc > 0)
3346 {
3347 cb = s_get_cv_croak (argv [0]);
3348
3349 if (!is_coro)
3350 {
3351 if (CvISXSUB (cb))
3352 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3353
3354 if (!CvROOT (cb))
3355 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3356 }
3357 }
3358
3359 Newz (0, coro, 1, struct coro);
3360 coro->args = newAV ();
3361 coro->flags = CF_NEW;
3362
3363 if (coro_first) coro_first->prev = coro;
3364 coro->next = coro_first;
3365 coro_first = coro;
3366
3367 coro->hv = hv = newHV ();
3368 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3369 mg->mg_flags |= MGf_DUP;
3370 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3371
3372 if (argc > 0)
3373 {
3374 av_extend (coro->args, argc + is_coro - 1);
3375
3376 if (is_coro)
3377 {
3378 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3379 cb = (SV *)cv_coro_run;
3380 }
3381
3382 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3383
3384 for (i = 1; i < argc; i++)
3385 av_push (coro->args, newSVsv (argv [i]));
3386 }
3387
3388 return coro_sv;
3389}
3390
3391#ifndef __cplusplus
3392ecb_cold XS(boot_Coro__State);
3393#endif
3394
3395#if CORO_JIT
3396
3397static void ecb_noinline ecb_cold
3398pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3399{
3400 dSP;
3401 AV *av = newAV ();
3402
3403 av_store (av, 3, newSVuv (d));
3404 av_store (av, 2, newSVuv (c));
3405 av_store (av, 1, newSVuv (b));
3406 av_store (av, 0, newSVuv (a));
3407
3408 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3409
3410 PUTBACK;
3411}
3412
3413static void ecb_noinline ecb_cold
3414jit_init (pTHX)
3415{
3416 dSP;
3417 SV *load, *save;
3418 char *map_base;
3419 char *load_ptr, *save_ptr;
3420 STRLEN load_len, save_len, map_len;
3421 int count;
3422
3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3424
3425 PUSHMARK (SP);
3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3427 #include "state.h"
3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3429 SPAGAIN;
3430
3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
3433
3434 map_len = load_len + save_len + 16;
3435
3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3437
3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3439
3440 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len);
3442
3443 map_base += (load_len + 15) & ~15;
3444
3445 save_perl_slots = (load_save_perl_slots_type)map_base;
3446 memcpy (map_base, save_ptr, save_len);
3447
3448 /* we are good citizens and try to make the page read-only, so the evil evil */
3449 /* hackers might have it a bit more difficult */
3450 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3451
3452 PUTBACK;
3453 eval_pv ("undef &Coro::State::_jit", 1);
3454}
3455
3456#endif
3457
2768MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3458MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2769 3459
2770PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
2771 3461
2772BOOT: 3462BOOT:
2773{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
2774#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
2775# if CORO_PTHREAD 3467# if CORO_PTHREAD
2776 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
2777# endif 3469# endif
2778#endif 3470#endif
2779 BOOT_PAGESIZE; 3471 /* perl defines these to check for existance first, but why it doesn't */
3472 /* just create them one at init time is not clear to me, except for */
3473 /* programs trying to delete them, but... */
3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3475 DEFSV;
3476 ERRSV;
2780 3477
2781 cctx_current = cctx_new_empty (); 3478 cctx_current = cctx_new_empty ();
2782 3479
2783 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2784 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2824 coroapi.prepare_nop = prepare_nop; 3521 coroapi.prepare_nop = prepare_nop;
2825 coroapi.prepare_schedule = prepare_schedule; 3522 coroapi.prepare_schedule = prepare_schedule;
2826 coroapi.prepare_cede = prepare_cede; 3523 coroapi.prepare_cede = prepare_cede;
2827 coroapi.prepare_cede_notself = prepare_cede_notself; 3524 coroapi.prepare_cede_notself = prepare_cede_notself;
2828 3525
2829 { 3526 time_init (aTHX);
2830 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2831 3527
2832 if (!svp) croak ("Time::HiRes is required");
2833 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2834
2835 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2836 }
2837
2838 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3528 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3529#if CORO_JIT
3530 PUTBACK;
3531 jit_init (aTHX);
3532 SPAGAIN;
3533#endif
2839} 3534}
2840 3535
2841SV * 3536SV *
2842new (char *klass, ...) 3537new (SV *klass, ...)
2843 ALIAS: 3538 ALIAS:
2844 Coro::new = 1 3539 Coro::new = 1
2845 CODE: 3540 CODE:
2846{ 3541 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2847 struct coro *coro; 3542 OUTPUT:
2848 MAGIC *mg;
2849 HV *hv;
2850 CV *cb;
2851 int i;
2852
2853 if (items > 1)
2854 {
2855 cb = coro_sv_2cv (aTHX_ ST (1));
2856
2857 if (!ix)
2858 {
2859 if (CvISXSUB (cb))
2860 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2861
2862 if (!CvROOT (cb))
2863 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2864 }
2865 }
2866
2867 Newz (0, coro, 1, struct coro);
2868 coro->args = newAV ();
2869 coro->flags = CF_NEW;
2870
2871 if (coro_first) coro_first->prev = coro;
2872 coro->next = coro_first;
2873 coro_first = coro;
2874
2875 coro->hv = hv = newHV ();
2876 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2877 mg->mg_flags |= MGf_DUP;
2878 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2879
2880 if (items > 1)
2881 {
2882 av_extend (coro->args, items - 1 + ix - 1);
2883
2884 if (ix)
2885 {
2886 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2887 cb = cv_coro_run;
2888 }
2889
2890 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2891
2892 for (i = 2; i < items; i++)
2893 av_push (coro->args, newSVsv (ST (i)));
2894 }
2895}
2896 OUTPUT:
2897 RETVAL 3543 RETVAL
2898 3544
2899void 3545void
2900transfer (...) 3546transfer (...)
2901 PROTOTYPE: $$ 3547 PROTOTYPE: $$
2902 CODE: 3548 CODE:
2903 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2904 3550
2905bool
2906_destroy (SV *coro_sv)
2907 CODE:
2908 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2909 OUTPUT:
2910 RETVAL
2911
2912void
2913_exit (int code)
2914 PROTOTYPE: $
2915 CODE:
2916 _exit (code);
2917
2918SV * 3551SV *
2919clone (Coro::State coro) 3552clone (Coro::State coro)
2920 CODE: 3553 CODE:
2921{ 3554{
2922#if CORO_CLONE 3555#if CORO_CLONE
2923 struct coro *ncoro = coro_clone (coro); 3556 struct coro *ncoro = coro_clone (aTHX_ coro);
2924 MAGIC *mg; 3557 MAGIC *mg;
2925 /* TODO: too much duplication */ 3558 /* TODO: too much duplication */
2926 ncoro->hv = newHV (); 3559 ncoro->hv = newHV ();
2927 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3560 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2928 mg->mg_flags |= MGf_DUP; 3561 mg->mg_flags |= MGf_DUP;
… …
2976void 3609void
2977list () 3610list ()
2978 PROTOTYPE: 3611 PROTOTYPE:
2979 PPCODE: 3612 PPCODE:
2980{ 3613{
2981 struct coro *coro; 3614 struct coro *coro;
2982 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
2983 if (coro->hv) 3616 if (coro->hv)
2984 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2985} 3618}
2986 3619
… …
2990 eval = 1 3623 eval = 1
2991 CODE: 3624 CODE:
2992{ 3625{
2993 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3626 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2994 { 3627 {
2995 struct coro temp; 3628 struct coro *current = SvSTATE_current;
3629 struct CoroSLF slf_save;
2996 3630
2997 if (!(coro->flags & CF_RUNNING)) 3631 if (current != coro)
2998 { 3632 {
2999 PUTBACK; 3633 PUTBACK;
3000 save_perl (aTHX_ &temp); 3634 save_perl (aTHX_ current);
3001 load_perl (aTHX_ coro); 3635 load_perl (aTHX_ coro);
3636 /* the coro is most likely in an active SLF call.
3637 * while not strictly required (the code we execute is
3638 * not allowed to call any SLF functions), it's cleaner
3639 * to reinitialise the slf_frame and restore it later.
3640 * This might one day allow us to actually do SLF calls
3641 * from code executed here.
3642 */
3643 slf_save = slf_frame;
3644 slf_frame.prepare = 0;
3645 SPAGAIN;
3002 } 3646 }
3003 3647
3004 {
3005 dSP;
3006 ENTER;
3007 SAVETMPS;
3008 PUTBACK;
3009 PUSHSTACK; 3648 PUSHSTACK;
3649
3010 PUSHMARK (SP); 3650 PUSHMARK (SP);
3651 PUTBACK;
3011 3652
3012 if (ix) 3653 if (ix)
3013 eval_sv (coderef, 0); 3654 eval_sv (coderef, 0);
3014 else 3655 else
3015 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3656 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3016 3657
3017 POPSTACK; 3658 POPSTACK;
3018 SPAGAIN; 3659 SPAGAIN;
3019 FREETMPS;
3020 LEAVE;
3021 PUTBACK;
3022 }
3023 3660
3024 if (!(coro->flags & CF_RUNNING)) 3661 if (current != coro)
3025 { 3662 {
3663 PUTBACK;
3664 slf_frame = slf_save;
3026 save_perl (aTHX_ coro); 3665 save_perl (aTHX_ coro);
3027 load_perl (aTHX_ &temp); 3666 load_perl (aTHX_ current);
3028 SPAGAIN; 3667 SPAGAIN;
3029 } 3668 }
3030 } 3669 }
3031} 3670}
3032 3671
… …
3035 PROTOTYPE: $ 3674 PROTOTYPE: $
3036 ALIAS: 3675 ALIAS:
3037 is_ready = CF_READY 3676 is_ready = CF_READY
3038 is_running = CF_RUNNING 3677 is_running = CF_RUNNING
3039 is_new = CF_NEW 3678 is_new = CF_NEW
3040 is_destroyed = CF_DESTROYED 3679 is_destroyed = CF_ZOMBIE
3680 is_zombie = CF_ZOMBIE
3681 is_suspended = CF_SUSPENDED
3041 CODE: 3682 CODE:
3042 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
3043 OUTPUT: 3684 OUTPUT:
3044 RETVAL 3685 RETVAL
3045 3686
3046void 3687void
3047throw (Coro::State self, SV *throw = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
3048 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
3049 CODE: 3690 CODE:
3050{ 3691{
3692 struct coro *coro = SvSTATE (self);
3051 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
3052 SV **throwp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3053 SvREFCNT_dec (*throwp); 3695 SvREFCNT_dec (*exceptionp);
3054 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3696 SvGETMAGIC (exception);
3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
3055} 3700}
3056 3701
3057void 3702void
3058api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3059 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
3110 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3755 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3111 3756
3112 SV *tmp = *src; *src = *dst; *dst = tmp; 3757 SV *tmp = *src; *src = *dst; *dst = tmp;
3113 } 3758 }
3114 3759
3760void
3761cancel (Coro::State self)
3762 CODE:
3763 coro_state_destroy (aTHX_ self);
3764
3765SV *
3766enable_times (int enabled = enable_times)
3767 CODE:
3768{
3769 RETVAL = boolSV (enable_times);
3770
3771 if (enabled != enable_times)
3772 {
3773 enable_times = enabled;
3774
3775 coro_times_update ();
3776 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3777 }
3778}
3779 OUTPUT:
3780 RETVAL
3781
3782void
3783times (Coro::State self)
3784 PPCODE:
3785{
3786 struct coro *current = SvSTATE (coro_current);
3787
3788 if (ecb_expect_false (current == self))
3789 {
3790 coro_times_update ();
3791 coro_times_add (SvSTATE (coro_current));
3792 }
3793
3794 EXTEND (SP, 2);
3795 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3796 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3797
3798 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current));
3800}
3801
3802void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3804 CODE:
3805{
3806 struct coro *current = SvSTATE_current;
3807
3808 if (current == coro)
3809 SWAP_SVS (current);
3810
3811 if (!coro->swap_sv)
3812 coro->swap_sv = newAV ();
3813
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3816
3817 if (current == coro)
3818 SWAP_SVS (current);
3819}
3820
3115 3821
3116MODULE = Coro::State PACKAGE = Coro 3822MODULE = Coro::State PACKAGE = Coro
3117 3823
3118BOOT: 3824BOOT:
3119{ 3825{
3120 int i;
3121
3122 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3123 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3124 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3125 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3126 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3127 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3128 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3831 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3129 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3832 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3130 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3833 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3131 3834
3132 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3133 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3836 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3134 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3837 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3135 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3136 3839
3137 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3138 3841
3139 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3140 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3141 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3142 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3845 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3143 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3846 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3144 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3847 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3145
3146 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3147 coro_ready[i] = newAV ();
3148 3848
3149 { 3849 {
3150 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3850 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3151 3851
3152 coroapi.schedule = api_schedule; 3852 coroapi.schedule = api_schedule;
… …
3162 sv_setiv (sv, (IV)&coroapi); 3862 sv_setiv (sv, (IV)&coroapi);
3163 SvREADONLY_on (sv); 3863 SvREADONLY_on (sv);
3164 } 3864 }
3165} 3865}
3166 3866
3867SV *
3868async (...)
3869 PROTOTYPE: &@
3870 CODE:
3871 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3872 api_ready (aTHX_ RETVAL);
3873 OUTPUT:
3874 RETVAL
3875
3876void
3877_destroy (Coro::State coro)
3878 CODE:
3879 /* used by the manager thread */
3880 coro_state_destroy (aTHX_ coro);
3881
3882void
3883on_destroy (Coro::State coro, SV *cb)
3884 CODE:
3885 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3886
3887void
3888join (...)
3889 CODE:
3890 CORO_EXECUTE_SLF_XS (slf_init_join);
3891
3167void 3892void
3168terminate (...) 3893terminate (...)
3169 CODE: 3894 CODE:
3170 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3895 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3171 3896
3172void 3897void
3898cancel (...)
3899 CODE:
3900 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3901
3902int
3903safe_cancel (Coro::State self, ...)
3904 C_ARGS: aTHX_ self, &ST (1), items - 1
3905
3906void
3173schedule (...) 3907schedule (...)
3174 CODE: 3908 CODE:
3175 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3909 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3176 3910
3177void 3911void
… …
3191 3925
3192void 3926void
3193cede_notself (...) 3927cede_notself (...)
3194 CODE: 3928 CODE:
3195 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3929 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3196
3197void
3198_cancel (Coro::State self)
3199 CODE:
3200 coro_state_destroy (aTHX_ self);
3201 coro_call_on_destroy (aTHX_ self);
3202 3930
3203void 3931void
3204_set_current (SV *current) 3932_set_current (SV *current)
3205 PROTOTYPE: $ 3933 PROTOTYPE: $
3206 CODE: 3934 CODE:
… …
3210void 3938void
3211_set_readyhook (SV *hook) 3939_set_readyhook (SV *hook)
3212 PROTOTYPE: $ 3940 PROTOTYPE: $
3213 CODE: 3941 CODE:
3214 SvREFCNT_dec (coro_readyhook); 3942 SvREFCNT_dec (coro_readyhook);
3943 SvGETMAGIC (hook);
3944 if (SvOK (hook))
3945 {
3215 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3946 coro_readyhook = newSVsv (hook);
3947 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3948 }
3949 else
3950 {
3951 coro_readyhook = 0;
3952 CORO_READYHOOK = 0;
3953 }
3216 3954
3217int 3955int
3218prio (Coro::State coro, int newprio = 0) 3956prio (Coro::State coro, int newprio = 0)
3219 PROTOTYPE: $;$ 3957 PROTOTYPE: $;$
3220 ALIAS: 3958 ALIAS:
… …
3226 if (items > 1) 3964 if (items > 1)
3227 { 3965 {
3228 if (ix) 3966 if (ix)
3229 newprio = coro->prio - newprio; 3967 newprio = coro->prio - newprio;
3230 3968
3231 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3969 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3232 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3970 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3233 3971
3234 coro->prio = newprio; 3972 coro->prio = newprio;
3235 } 3973 }
3236} 3974}
3237 OUTPUT: 3975 OUTPUT:
… …
3252 RETVAL = coro_nready; 3990 RETVAL = coro_nready;
3253 OUTPUT: 3991 OUTPUT:
3254 RETVAL 3992 RETVAL
3255 3993
3256void 3994void
3995suspend (Coro::State self)
3996 PROTOTYPE: $
3997 CODE:
3998 self->flags |= CF_SUSPENDED;
3999
4000void
4001resume (Coro::State self)
4002 PROTOTYPE: $
4003 CODE:
4004 self->flags &= ~CF_SUSPENDED;
4005
4006void
3257_pool_handler (...) 4007_pool_handler (...)
3258 CODE: 4008 CODE:
3259 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4009 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3260 4010
3261void 4011void
… …
3272 for (i = 1; i < items; ++i) 4022 for (i = 1; i < items; ++i)
3273 av_push (av, SvREFCNT_inc_NN (ST (i))); 4023 av_push (av, SvREFCNT_inc_NN (ST (i)));
3274 4024
3275 if ((SV *)hv == &PL_sv_undef) 4025 if ((SV *)hv == &PL_sv_undef)
3276 { 4026 {
3277 PUSHMARK (SP); 4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3278 EXTEND (SP, 2);
3279 PUSHs (sv_Coro);
3280 PUSHs ((SV *)cv_pool_handler);
3281 PUTBACK;
3282 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3283 SPAGAIN;
3284
3285 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv);
3286 } 4030 }
3287 4031
3288 { 4032 {
3289 struct coro *coro = SvSTATE_hv (hv); 4033 struct coro *coro = SvSTATE_hv (hv);
3290 4034
… …
3314rouse_wait (...) 4058rouse_wait (...)
3315 PROTOTYPE: ;$ 4059 PROTOTYPE: ;$
3316 PPCODE: 4060 PPCODE:
3317 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4061 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3318 4062
4063void
4064on_enter (SV *block)
4065 ALIAS:
4066 on_leave = 1
4067 PROTOTYPE: &
4068 CODE:
4069{
4070 struct coro *coro = SvSTATE_current;
4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4072
4073 block = s_get_cv_croak (block);
4074
4075 if (!*avp)
4076 *avp = newAV ();
4077
4078 av_push (*avp, SvREFCNT_inc (block));
4079
4080 if (!ix)
4081 on_enterleave_call (aTHX_ block);
4082
4083 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4084 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4085 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4086}
4087
3319 4088
3320MODULE = Coro::State PACKAGE = PerlIO::cede 4089MODULE = Coro::State PACKAGE = PerlIO::cede
3321 4090
3322BOOT: 4091BOOT:
3323 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4092 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3326MODULE = Coro::State PACKAGE = Coro::Semaphore 4095MODULE = Coro::State PACKAGE = Coro::Semaphore
3327 4096
3328SV * 4097SV *
3329new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
3330 CODE: 4099 CODE:
4100{
4101 int semcnt = 1;
4102
4103 if (count)
4104 {
4105 SvGETMAGIC (count);
4106
4107 if (SvOK (count))
4108 semcnt = SvIV (count);
4109 }
4110
3331 RETVAL = sv_bless ( 4111 RETVAL = sv_bless (
3332 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4112 coro_waitarray_new (aTHX_ semcnt),
3333 GvSTASH (CvGV (cv)) 4113 GvSTASH (CvGV (cv))
3334 ); 4114 );
4115}
3335 OUTPUT: 4116 OUTPUT:
3336 RETVAL 4117 RETVAL
3337 4118
3338# helper for Coro::Channel 4119# helper for Coro::Channel and others
3339SV * 4120SV *
3340_alloc (int count) 4121_alloc (int count)
3341 CODE: 4122 CODE:
3342 RETVAL = coro_waitarray_new (aTHX_ count); 4123 RETVAL = coro_waitarray_new (aTHX_ count);
3343 OUTPUT: 4124 OUTPUT:
… …
3385 XSRETURN_NO; 4166 XSRETURN_NO;
3386} 4167}
3387 4168
3388void 4169void
3389waiters (SV *self) 4170waiters (SV *self)
3390 PPCODE: 4171 PPCODE:
3391{ 4172{
3392 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
3393 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
3394 4175
3395 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
3401 for (i = 1; i <= wcount; ++i) 4182 for (i = 1; i <= wcount; ++i)
3402 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4183 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3403 } 4184 }
3404} 4185}
3405 4186
4187MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4188
4189void
4190_may_delete (SV *sem, int count, unsigned int extra_refs)
4191 PPCODE:
4192{
4193 AV *av = (AV *)SvRV (sem);
4194
4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4196 && AvFILLp (av) == 0 /* no waiters, just count */
4197 && SvIV (AvARRAY (av)[0]) == count)
4198 XSRETURN_YES;
4199
4200 XSRETURN_NO;
4201}
4202
3406MODULE = Coro::State PACKAGE = Coro::Signal 4203MODULE = Coro::State PACKAGE = Coro::Signal
3407 4204
3408SV * 4205SV *
3409new (SV *klass) 4206new (SV *klass)
3410 CODE: 4207 CODE:
… …
3422 4219
3423void 4220void
3424broadcast (SV *self) 4221broadcast (SV *self)
3425 CODE: 4222 CODE:
3426{ 4223{
3427 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
3428 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
3429} 4226}
3430 4227
3431void 4228void
3432send (SV *self) 4229send (SV *self)
… …
3440 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3441} 4238}
3442 4239
3443IV 4240IV
3444awaited (SV *self) 4241awaited (SV *self)
3445 CODE: 4242 CODE:
3446 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3447 OUTPUT: 4244 OUTPUT:
3448 RETVAL 4245 RETVAL
3449 4246
3450 4247
… …
3455 4252
3456void 4253void
3457_schedule (...) 4254_schedule (...)
3458 CODE: 4255 CODE:
3459{ 4256{
3460 static int incede; 4257 static int incede;
3461 4258
3462 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
3463 4260
3464 ++incede; 4261 ++incede;
3465 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
3481 4278
3482void 4279void
3483_register (char *target, char *proto, SV *req) 4280_register (char *target, char *proto, SV *req)
3484 CODE: 4281 CODE:
3485{ 4282{
3486 CV *req_cv = coro_sv_2cv (aTHX_ req); 4283 SV *req_cv = s_get_cv_croak (req);
3487 /* newXSproto doesn't return the CV on 5.8 */ 4284 /* newXSproto doesn't return the CV on 5.8 */
3488 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4285 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3489 sv_setpv ((SV *)slf_cv, proto); 4286 sv_setpv ((SV *)slf_cv, proto);
3490 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4287 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3491} 4288}
3492 4289
4290MODULE = Coro::State PACKAGE = Coro::Select
4291
4292void
4293patch_pp_sselect ()
4294 CODE:
4295 if (!coro_old_pp_sselect)
4296 {
4297 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4298 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4299 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4300 }
4301
4302void
4303unpatch_pp_sselect ()
4304 CODE:
4305 if (coro_old_pp_sselect)
4306 {
4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4308 coro_old_pp_sselect = 0;
4309 }
4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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