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.317 by root, Thu Nov 20 06:28:52 2008 UTC vs.
Revision 1.399 by root, Thu May 12 23:24:28 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
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
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
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
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
114#endif 68#endif
115 69
116#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
130#else 84#else
131# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
133#endif 87#endif
134 88
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
136 90
137#if __GNUC__ >= 3 91#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 94# define INLINE static inline
141#else 95#else
142# define attribute(x) 96# define attribute(x)
143# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
144# define INLINE static 98# define INLINE static
… …
156# if CORO_PTHREAD 110# if CORO_PTHREAD
157static void *coro_thx; 111static void *coro_thx;
158# endif 112# endif
159#endif 113#endif
160 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
161static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
162 127
163/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
166 132
167static U32 cctx_gen; 133static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 137static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 138static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 139static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 140
141static AV *av_destroy; /* destruction queue */
142static SV *sv_manager; /* the manager coro */
143static SV *sv_idle; /* $Coro::idle */
144
175static GV *irsgv; /* $/ */ 145static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 146static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 147static SV *rv_diehook;
178static SV *rv_warnhook; 148static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 149static HV *hv_sig; /* %SIG */
180 150
181/* async_pool helper stuff */ 151/* async_pool helper stuff */
182static SV *sv_pool_rss; 152static SV *sv_pool_rss;
183static SV *sv_pool_size; 153static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 154static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 155static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 156static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 157static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 158
190/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
191static SV *sv_activity; 160static SV *sv_activity;
192 161
162/* enable processtime/realtime profiling */
163static char enable_times;
164typedef U32 coro_ts[2];
165static coro_ts time_real, time_cpu;
166static char times_valid;
167
193static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
195 170
196enum { 171enum
172{
197 CC_MAPPED = 0x01, 173 CC_MAPPED = 0x01,
198 CC_NOREUSE = 0x02, /* throw this away after tracing */ 174 CC_NOREUSE = 0x02, /* throw this away after tracing */
199 CC_TRACE = 0x04, 175 CC_TRACE = 0x04,
200 CC_TRACE_SUB = 0x08, /* trace sub calls */ 176 CC_TRACE_SUB = 0x08, /* trace sub calls */
201 CC_TRACE_LINE = 0x10, /* trace each statement */ 177 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
222 int valgrind_id; 198 int valgrind_id;
223#endif 199#endif
224 unsigned char flags; 200 unsigned char flags;
225} coro_cctx; 201} coro_cctx;
226 202
203static coro_cctx *cctx_current; /* the currently running cctx */
204
205/*****************************************************************************/
206
207static MGVTBL coro_state_vtbl;
208
227enum { 209enum
210{
228 CF_RUNNING = 0x0001, /* coroutine is running */ 211 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 212 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 213 CF_NEW = 0x0004, /* has never been switched to */
231 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 214 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
215 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
216 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
232}; 217};
233 218
234/* the structure where most of the perl state is stored, overlaid on the cxstack */ 219/* the structure where most of the perl state is stored, overlaid on the cxstack */
235typedef struct 220typedef struct
236{ 221{
237 SV *defsv; 222 SV *defsv;
238 AV *defav; 223 AV *defav;
239 SV *errsv; 224 SV *errsv;
240 SV *irsgv; 225 SV *irsgv;
226 HV *hinthv;
241#define VAR(name,type) type name; 227#define VAR(name,type) type name;
242# include "state.h" 228# include "state.h"
243#undef VAR 229#undef VAR
244} perl_slots; 230} perl_slots;
245 231
232// how many context stack entries do we need for perl_slots
246#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 233#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
247 234
248/* this is a structure representing a perl-level coroutine */ 235/* this is a structure representing a perl-level coroutine */
249struct coro { 236struct coro
237{
250 /* the C coroutine allocated to this perl coroutine, if any */ 238 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 239 coro_cctx *cctx;
240
241 /* ready queue */
242 struct coro *next_ready;
252 243
253 /* state data */ 244 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 245 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 246 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 247 perl_slots *slot; /* basically the saved sp */
257 248
258 CV *startcv; /* the CV to execute */ 249 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 250 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 251 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 252 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro);
264 253
265 /* statistics */ 254 /* statistics */
266 int usecount; /* number of transfers to this coro */ 255 int usecount; /* number of transfers to this coro */
267 256
268 /* coro process data */ 257 /* coro process data */
269 int prio; 258 int prio;
270 SV *except; /* exception to be thrown */ 259 SV *except; /* exception to be thrown */
271 SV *rouse_cb; 260 SV *rouse_cb; /* last rouse callback */
261 AV *on_destroy; /* callbacks or coros to notify on destroy */
262 AV *status; /* the exit status list */
272 263
273 /* async_pool */ 264 /* async_pool */
274 SV *saved_deffh; 265 SV *saved_deffh;
275 SV *invoke_cb; 266 SV *invoke_cb;
276 AV *invoke_av; 267 AV *invoke_av;
277 268
269 /* on_enter/on_leave */
270 AV *on_enter;
271 AV *on_leave;
272
273 /* swap_sv */
274 AV *swap_sv;
275
276 /* times */
277 coro_ts t_cpu, t_real;
278
278 /* linked list */ 279 /* linked list */
279 struct coro *next, *prev; 280 struct coro *next, *prev;
280}; 281};
281 282
282typedef struct coro *Coro__State; 283typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 284typedef struct coro *Coro__State_or_hashref;
284 285
285/* the following variables are effectively part of the perl context */ 286/* the following variables are effectively part of the perl context */
286/* and get copied between struct coro and these variables */ 287/* and get copied between struct coro and these variables */
287/* the mainr easonw e don't support windows process emulation */ 288/* the main reason we don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 289static struct CoroSLF slf_frame; /* the current slf frame */
289 290
290/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
291 292
292#define PRIO_MAX 3 293#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 294#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 295#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 296#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 297#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 298#define CORO_PRIO_MIN -4
298 299
299/* for Coro.pm */ 300/* for Coro.pm */
300static SV *coro_current; 301static SV *coro_current;
301static SV *coro_readyhook; 302static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 303static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 304static CV *cv_coro_run;
304static struct coro *coro_first; 305static struct coro *coro_first;
305#define coro_nready coroapi.nready 306#define coro_nready coroapi.nready
307
308/** Coro::Select ************************************************************/
309
310static OP *(*coro_old_pp_sselect) (pTHX);
311static SV *coro_select_select;
312
313/* horrible hack, but if it works... */
314static OP *
315coro_pp_sselect (pTHX)
316{
317 dSP;
318 PUSHMARK (SP - 4); /* fake argument list */
319 XPUSHs (coro_select_select);
320 PUTBACK;
321
322 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
323 PL_op->op_flags |= OPf_STACKED;
324 PL_op->op_private = 0;
325 return PL_ppaddr [OP_ENTERSUB](aTHX);
326}
327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332static void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342static double
343coro_nvtime ()
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351static void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360static void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
306 379
307/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
308 381
309static SV * 382static SV *
310coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
… …
334 get_hv (name, create); 407 get_hv (name, create);
335#endif 408#endif
336 return get_hv (name, create); 409 return get_hv (name, create);
337} 410}
338 411
339/* may croak */ 412INLINE void
413coro_times_update ()
414{
415#ifdef coro_clock_gettime
416 struct timespec ts;
417
418 ts.tv_sec = ts.tv_nsec = 0;
419 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
420 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
421
422 ts.tv_sec = ts.tv_nsec = 0;
423 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
424 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
425#else
426 dTHX;
427 UV tv[2];
428
429 u2time (aTHX_ tv);
430 time_real [0] = tv [0];
431 time_real [1] = tv [1] * 1000;
432#endif
433}
434
435INLINE void
436coro_times_add (struct coro *c)
437{
438 c->t_real [1] += time_real [1];
439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
440 c->t_real [0] += time_real [0];
441
442 c->t_cpu [1] += time_cpu [1];
443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
444 c->t_cpu [0] += time_cpu [0];
445}
446
447INLINE void
448coro_times_sub (struct coro *c)
449{
450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
451 c->t_real [1] -= time_real [1];
452 c->t_real [0] -= time_real [0];
453
454 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
455 c->t_cpu [1] -= time_cpu [1];
456 c->t_cpu [0] -= time_cpu [0];
457}
458
459/*****************************************************************************/
460/* magic glue */
461
462#define CORO_MAGIC_type_cv 26
463#define CORO_MAGIC_type_state PERL_MAGIC_ext
464
465#define CORO_MAGIC_NN(sv, type) \
466 (expect_true (SvMAGIC (sv)->mg_type == type) \
467 ? SvMAGIC (sv) \
468 : mg_find (sv, type))
469
470#define CORO_MAGIC(sv, type) \
471 (expect_true (SvMAGIC (sv)) \
472 ? CORO_MAGIC_NN (sv, type) \
473 : 0)
474
475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
477
340INLINE CV * 478INLINE MAGIC *
341coro_sv_2cv (pTHX_ SV *sv) 479SvSTATEhv_p (pTHX_ SV *coro)
342{ 480{
343 HV *st; 481 MAGIC *mg;
344 GV *gvp; 482
345 return sv_2cv (sv, &st, &gvp, 0); 483 if (expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
346} 491}
492
493INLINE struct coro *
494SvSTATE_ (pTHX_ SV *coro)
495{
496 MAGIC *mg;
497
498 if (SvROK (coro))
499 coro = SvRV (coro);
500
501 mg = SvSTATEhv_p (coro);
502 if (!mg)
503 croak ("Coro::State object required");
504
505 return (struct coro *)mg->mg_ptr;
506}
507
508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
509
510/* faster than SvSTATE, but expects a coroutine hv */
511#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
513
514/*****************************************************************************/
515/* padlist management and caching */
347 516
348static AV * 517static AV *
349coro_clone_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
350{ 519{
351 AV *padlist = CvPADLIST (cv); 520 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 521 AV *newpadlist, *newpad;
353 522
354 newpadlist = newAV (); 523 newpadlist = newAV ();
… …
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 528 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 529#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 530 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 531 --AvFILLp (padlist);
363 532
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 533 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 534 av_store (newpadlist, 1, (SV *)newpad);
366 535
367 return newpadlist; 536 return newpadlist;
368} 537}
369 538
370static void 539static void
371free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ AV *padlist)
372{ 541{
373 /* may be during global destruction */ 542 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 543 if (!IN_DESTRUCT)
375 { 544 {
376 I32 i = AvFILLp (padlist); 545 I32 i = AvFILLp (padlist);
377 while (i >= 0) 546
547 while (i > 0) /* special-case index 0 */
378 { 548 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 549 /* we try to be extra-careful here */
380 if (svp) 550 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 551 I32 j = AvFILLp (av);
382 SV *sv; 552
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 553 while (j >= 0)
554 SvREFCNT_dec (AvARRAY (av)[j--]);
555
556 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 557 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 558 }
389 559
560 SvREFCNT_dec (AvARRAY (padlist)[0]);
561
562 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 563 SvREFCNT_dec ((SV*)padlist);
391 } 564 }
392} 565}
393 566
394static int 567static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 568coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 569{
397 AV *padlist; 570 AV *padlist;
398 AV *av = (AV *)mg->mg_obj; 571 AV *av = (AV *)mg->mg_obj;
572
573 /* perl manages to free our internal AV and _then_ call us */
574 if (IN_DESTRUCT)
575 return 0;
399 576
400 /* casting is fun. */ 577 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 578 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 579 free_padlist (aTHX_ padlist);
403 580
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 581 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 582
406 return 0; 583 return 0;
407} 584}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 585
412static MGVTBL coro_cv_vtbl = { 586static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 587 0, 0, 0, 0,
414 coro_cv_free 588 coro_cv_free
415}; 589};
416
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459 590
460/* the next two functions merely cache the padlists */ 591/* the next two functions merely cache the padlists */
461static void 592static void
462get_padlist (pTHX_ CV *cv) 593get_padlist (pTHX_ CV *cv)
463{ 594{
… …
474 CV *cp = Perl_cv_clone (aTHX_ cv); 605 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 606 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 607 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 608 SvREFCNT_dec (cp);
478#else 609#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 610 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 611#endif
481 } 612 }
482} 613}
483 614
484static void 615static void
… …
491 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 622 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
492 623
493 av = (AV *)mg->mg_obj; 624 av = (AV *)mg->mg_obj;
494 625
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 626 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 627 av_extend (av, AvFILLp (av) + 1);
497 628
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 629 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 630}
500 631
501/** load & save, init *******************************************************/ 632/** load & save, init *******************************************************/
633
634/* swap sv heads, at least logically */
635static void
636swap_svs (pTHX_ Coro__State c)
637{
638 int i;
639
640 for (i = 0; i <= AvFILLp (c->swap_sv); )
641 {
642 SV *a = AvARRAY (c->swap_sv)[i++];
643 SV *b = AvARRAY (c->swap_sv)[i++];
644
645 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
646 SV tmp;
647
648 /* swap sv_any */
649 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
650
651 /* swap sv_flags */
652 SvFLAGS (&tmp) = SvFLAGS (a);
653 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
654 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
655
656#if PERL_VERSION_ATLEAST (5,10,0)
657 /* perl 5.10 complicates this _quite_ a bit, but it also is
658 * much faster, so no quarrels here. alternatively, we could
659 * sv_upgrade to avoid this.
660 */
661 {
662 /* swap sv_u */
663 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
664
665 /* if SvANY points to the head, we need to adjust the pointers,
666 * as the pointer for a still points to b, and maybe vice versa.
667 */
668 #define svany_in_head(type) \
669 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
670
671 if (svany_in_head (SvTYPE (a)))
672 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
673
674 if (svany_in_head (SvTYPE (b)))
675 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
676 }
677#endif
678 }
679}
680
681#define SWAP_SVS(coro) \
682 if (expect_false ((coro)->swap_sv)) \
683 swap_svs (aTHX_ (coro))
684
685static void
686on_enterleave_call (pTHX_ SV *cb);
502 687
503static void 688static void
504load_perl (pTHX_ Coro__State c) 689load_perl (pTHX_ Coro__State c)
505{ 690{
506 perl_slots *slot = c->slot; 691 perl_slots *slot = c->slot;
507 c->slot = 0; 692 c->slot = 0;
508 693
509 PL_mainstack = c->mainstack; 694 PL_mainstack = c->mainstack;
510 695
511 GvSV (PL_defgv) = slot->defsv; 696 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 697 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 698 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 699 GvSV (irsgv) = slot->irsgv;
700 GvHV (PL_hintgv) = slot->hinthv;
515 701
516 #define VAR(name,type) PL_ ## name = slot->name; 702 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 703 # include "state.h"
518 #undef VAR 704 #undef VAR
519 705
… …
533 PUTBACK; 719 PUTBACK;
534 } 720 }
535 721
536 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 723 CORO_THROW = c->except;
724
725 if (expect_false (enable_times))
726 {
727 if (expect_false (!times_valid))
728 coro_times_update ();
729
730 coro_times_sub (c);
731 }
732
733 if (expect_false (c->on_enter))
734 {
735 int i;
736
737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
739 }
740
741 SWAP_SVS (c);
538} 742}
539 743
540static void 744static void
541save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
542{ 746{
747 SWAP_SVS (c);
748
749 if (expect_false (c->on_leave))
750 {
751 int i;
752
753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
755 }
756
757 times_valid = 0;
758
759 if (expect_false (enable_times))
760 {
761 coro_times_update (); times_valid = 1;
762 coro_times_add (c);
763 }
764
543 c->except = CORO_THROW; 765 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 766 c->slf_frame = slf_frame;
545 767
546 { 768 {
547 dSP; 769 dSP;
… …
560 { 782 {
561 while (expect_true (cxix >= 0)) 783 while (expect_true (cxix >= 0))
562 { 784 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
564 786
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 787 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 788 {
567 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
568 790
569 if (expect_true (CvDEPTH (cv))) 791 if (expect_true (CvDEPTH (cv)))
570 { 792 {
… …
589 811
590 PUTBACK; 812 PUTBACK;
591 } 813 }
592 814
593 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
594 /* we manually unroll here, as usually 2 slots is enough */ 816 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
595 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC;
598 { 817 {
599 int i; 818 unsigned int i;
819
600 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
601 CXINC; 821 CXINC;
602 } 822
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
604 825
605 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
606 827
607 { 828 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 830
610 slot->defav = GvAV (PL_defgv); 831 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 832 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 833 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 834 slot->irsgv = GvSV (irsgv);
835 slot->hinthv = GvHV (PL_hintgv);
614 836
615 #define VAR(name,type) slot->name = PL_ ## name; 837 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 838 # include "state.h"
617 #undef VAR 839 #undef VAR
618 } 840 }
… …
628# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
629#else 851#else
630static void 852static void
631coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
632{ 854{
633 PL_curstackinfo = new_stackinfo(32, 8); 855 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
634 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
635 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
636 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
637 859
638 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
… …
745#endif 967#endif
746 968
747/* 969/*
748 * This overrides the default magic get method of %SIG elements. 970 * This overrides the default magic get method of %SIG elements.
749 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 971 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
750 * and instead of tryign to save and restore the hash elements, we just provide 972 * and instead of trying to save and restore the hash elements, we just provide
751 * readback here. 973 * readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 974 */
756static int 975static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 977{
759 const char *s = MgPV_nolen_const (mg); 978 const char *s = MgPV_nolen_const (mg);
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1031 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 1032
814 if (svp) 1033 if (svp)
815 { 1034 {
816 SV *old = *svp; 1035 SV *old = *svp;
817 *svp = newSVsv (sv); 1036 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1037 SvREFCNT_dec (old);
819 return 0; 1038 return 0;
820 } 1039 }
821 } 1040 }
822 1041
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1053slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1054{
836 return 0; 1055 return 0;
837} 1056}
838 1057
839static UNOP coro_setup_op; 1058static int
1059slf_check_repeat (pTHX_ struct CoroSLF *frame)
1060{
1061 return 1;
1062}
1063
1064static UNOP init_perl_op;
840 1065
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1066static void NOINLINE /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 1067init_perl (pTHX_ struct coro *coro)
843{ 1068{
844 /* 1069 /*
845 * emulate part of the perl startup here. 1070 * emulate part of the perl startup here.
846 */ 1071 */
847 coro_init_stacks (aTHX); 1072 coro_init_stacks (aTHX);
848 1073
849 PL_runops = RUNOPS_DEFAULT; 1074 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1075 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1076 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1077 PL_comppad = 0;
1078 PL_comppad_name = 0;
1079 PL_comppad_name_fill = 0;
1080 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1081 PL_curpm = 0;
854 PL_curpad = 0; 1082 PL_curpad = 0;
855 PL_localizing = 0; 1083 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1084 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1085#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1086 PL_parser = 0;
860#endif 1087#endif
1088 PL_hints = 0;
861 1089
862 /* recreate the die/warn hooks */ 1090 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1091 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1092 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
865 1093
866 GvSV (PL_defgv) = newSV (0); 1094 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1095 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1096 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0;
870 PL_rs = newSVsv (GvSV (irsgv)); 1099 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1101
873 { 1102 {
874 dSP; 1103 dSP;
… …
889 /* this newly created coroutine might be run on an existing cctx which most 1118 /* this newly created coroutine might be run on an existing cctx which most
890 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1119 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
891 */ 1120 */
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1121 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1122 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1123 slf_frame.destroy = 0;
894 1124
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1125 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
896 coro_setup_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1127 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 1129 /* no flags etc. required, as an init function won't be called */
900 1130
901 PL_op = (OP *)&coro_setup_op; 1131 PL_op = (OP *)&init_perl_op;
902 1132
903 /* copy throw, in case it was set before coro_setup */ 1133 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1134 CORO_THROW = coro->except;
905}
906 1135
1136 SWAP_SVS (coro);
1137
1138 if (expect_false (enable_times))
1139 {
1140 coro_times_update ();
1141 coro_times_sub (coro);
1142 }
1143}
1144
907static void 1145static void
908coro_destruct (pTHX_ struct coro *coro) 1146coro_unwind_stacks (pTHX)
909{ 1147{
910 if (!IN_DESTRUCT) 1148 if (!IN_DESTRUCT)
911 { 1149 {
912 /* restore all saved variables and stuff */ 1150 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1151 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1159 POPSTACK_TO (PL_mainstack);
922 1160
923 /* unwind main stack */ 1161 /* unwind main stack */
924 dounwind (-1); 1162 dounwind (-1);
925 } 1163 }
1164}
926 1165
927 SvREFCNT_dec (GvSV (PL_defgv)); 1166static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1167destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1168{
930 SvREFCNT_dec (PL_defoutgv); 1169 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1170
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1171 {
1172 SV *old_current = SvRV (coro_current);
1173 struct coro *current = SvSTATE (old_current);
1174
1175 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1176
1177 save_perl (aTHX_ current);
1178
1179 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv);
1181
1182 load_perl (aTHX_ coro);
1183
1184 coro_unwind_stacks (aTHX);
1185
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX);
1190
1191 // now save some sv's to be free'd later
1192 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs;
1197 svf [5] = GvSV (irsgv);
1198 svf [6] = (SV *)GvHV (PL_hintgv);
1199 svf [7] = PL_diehook;
1200 svf [8] = PL_warnhook;
1201 assert (9 == sizeof (svf) / sizeof (*svf));
1202
1203 SvRV_set (coro_current, old_current);
1204
1205 load_perl (aTHX_ current);
1206 }
1207
1208 {
1209 unsigned int i;
1210
1211 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1212 SvREFCNT_dec (svf [i]);
1213
937 SvREFCNT_dec (coro->saved_deffh); 1214 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1215 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1216 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1217 SvREFCNT_dec (coro->invoke_av);
941 1218 }
942 coro_destruct_stacks (aTHX);
943} 1219}
944 1220
945INLINE void 1221INLINE void
946free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
947{ 1223{
948 if (expect_true (coro_mortal)) 1224 if (expect_true (coro_mortal))
949 { 1225 {
950 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
951 coro_mortal = 0; 1227 coro_mortal = 0;
952 } 1228 }
953} 1229}
954 1230
955static int 1231static int
956runops_trace (pTHX) 1232runops_trace (pTHX)
957{ 1233{
958 COP *oldcop = 0; 1234 COP *oldcop = 0;
959 int oldcxix = -2; 1235 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1236
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1237 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1238 {
965 PERL_ASYNC_CHECK (); 1239 PERL_ASYNC_CHECK ();
966 1240
967 if (cctx->flags & CC_TRACE_ALL) 1241 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1242 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1243 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1244 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1245 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1246 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1247 AV *av = newAV (); /* return values */
974 SV **cb; 1248 SV **cb;
… …
1011 1285
1012 if (PL_curcop != &PL_compiling) 1286 if (PL_curcop != &PL_compiling)
1013 { 1287 {
1014 SV **cb; 1288 SV **cb;
1015 1289
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1291 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1293
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1295 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1296 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1297 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1298 SV *fullname = sv_2mortal (newSV (0));
1026 1299
1027 if (isGV (gv)) 1300 if (isGV (gv))
… …
1045 } 1318 }
1046 1319
1047 oldcxix = cxstack_ix; 1320 oldcxix = cxstack_ix;
1048 } 1321 }
1049 1322
1050 if (cctx->flags & CC_TRACE_LINE) 1323 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1324 {
1052 dSP; 1325 dSP;
1053 1326
1054 PL_runops = RUNOPS_DEFAULT; 1327 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1328 ENTER;
… …
1074 1347
1075 TAINT_NOT; 1348 TAINT_NOT;
1076 return 0; 1349 return 0;
1077} 1350}
1078 1351
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1352static struct CoroSLF cctx_ssl_frame;
1081 1353
1082static void 1354static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1355slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1356{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1357 ta->prev = 0;
1087} 1358}
1088 1359
1089static int 1360static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1361slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1362{
… …
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1365 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1366}
1096 1367
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1368/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1369static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1370cctx_prepare (pTHX)
1100{ 1371{
1101 PL_top_env = &PL_start_env; 1372 PL_top_env = &PL_start_env;
1102 1373
1103 if (cctx->flags & CC_TRACE) 1374 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1375 PL_runops = runops_trace;
1105 1376
1106 /* we already must be executing an SLF op, there is no other valid way 1377 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1378 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1379 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1380 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1381
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1382 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1383 cctx_ssl_frame = slf_frame;
1114 1384
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1385 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1386 slf_frame.check = slf_check_set_stacklevel;
1117} 1387}
… …
1140 /* normally we would need to skip the entersub here */ 1410 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1411 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1412 /* PL_nop = PL_nop->op_next */
1143 1413
1144 /* inject a fake subroutine call to cctx_init */ 1414 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1415 cctx_prepare (aTHX);
1146 1416
1147 /* cctx_run is the alternative tail of transfer() */ 1417 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1418 transfer_tail (aTHX);
1149 1419
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1420 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1421 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1422 perl_run (PL_curinterp);
1153 /* 1423 /*
1154 * Unfortunately, there is no way to get at the return values of the 1424 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1425 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1426 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1427 */
1157 1428
1158 /* 1429 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1430 * If perl-run returns we assume exit() was being called or the coro
1160 * fell off the end, which seems to be the only valid (non-bug) 1431 * fell off the end, which seems to be the only valid (non-bug)
1161 * reason for perl_run to return. We try to exit by jumping to the 1432 * reason for perl_run to return. We try to exit by jumping to the
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1433 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * coroutine as Coro has no such concept 1434 * coroutine as Coro has no such concept.
1435 * This actually isn't valid with the pthread backend, but OSes requiring
1436 * that backend are too broken to do it in a standards-compliant way.
1164 */ 1437 */
1165 PL_top_env = main_top_env; 1438 PL_top_env = main_top_env;
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1440 }
1168} 1441}
… …
1245cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1246{ 1519{
1247 if (!cctx) 1520 if (!cctx)
1248 return; 1521 return;
1249 1522
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524
1250 --cctx_count; 1525 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1252 1527
1253 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1529 if (cctx->sptr)
… …
1317 /* TODO: throwing up here is considered harmful */ 1592 /* TODO: throwing up here is considered harmful */
1318 1593
1319 if (expect_true (prev != next)) 1594 if (expect_true (prev != next))
1320 { 1595 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1597 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1598
1324 if (expect_false (next->flags & CF_RUNNING))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED)) 1599 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1600 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1601
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1604 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1605#endif
… …
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1611transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1612{
1341 dSTACKLEVEL; 1613 dSTACKLEVEL;
1342 1614
1343 /* sometimes transfer is only called to set idle_sp */ 1615 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1616 if (expect_false (!prev))
1345 { 1617 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1618 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1619 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1620 }
1349 else if (expect_true (prev != next)) 1621 else if (expect_true (prev != next))
1350 { 1622 {
1351 coro_cctx *prev__cctx; 1623 coro_cctx *cctx_prev;
1352 1624
1353 if (expect_false (prev->flags & CF_NEW)) 1625 if (expect_false (prev->flags & CF_NEW))
1354 { 1626 {
1355 /* create a new empty/source context */ 1627 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1628 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1629 prev->flags |= CF_RUNNING;
1359 } 1630 }
1360 1631
1361 prev->flags &= ~CF_RUNNING; 1632 prev->flags &= ~CF_RUNNING;
… …
1367 if (expect_false (next->flags & CF_NEW)) 1638 if (expect_false (next->flags & CF_NEW))
1368 { 1639 {
1369 /* need to start coroutine */ 1640 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1641 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1642 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1643 init_perl (aTHX_ next);
1373 } 1644 }
1374 else 1645 else
1375 load_perl (aTHX_ next); 1646 load_perl (aTHX_ next);
1376 1647
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1648 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1649 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1650 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1651 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1652 && !force_cctx
1384 )) 1653 ))
1385 { 1654 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1655 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1656 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1657
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1658 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1659 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1660 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1661 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1662 next->cctx = cctx_get (aTHX);
1396 1663
1397 cctx_put (prev__cctx); 1664 cctx_put (cctx_current);
1398 } 1665 }
1666 else
1667 prev->cctx = cctx_current;
1399 1668
1400 ++next->usecount; 1669 ++next->usecount;
1401 1670
1402 if (expect_true (!next->cctx)) 1671 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1672 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1673
1405 if (expect_false (prev__cctx != next->cctx)) 1674 next->cctx = 0;
1675
1676 if (expect_false (cctx_prev != cctx_current))
1406 { 1677 {
1407 prev__cctx->top_env = PL_top_env; 1678 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1679 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1680 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1681 }
1411 1682
1412 transfer_tail (aTHX); 1683 transfer_tail (aTHX);
1413 } 1684 }
1414} 1685}
… …
1416#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1687#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1417#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1418 1689
1419/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1420 1691
1692/* this function is actually Coro, not Coro::State, but we call it from here */
1693/* because it is convenient - but it hasn't been declared yet for that reason */
1421static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1422coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1699{
1424 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_DESTROYED)
1425 return 0; 1701 return;
1426 1702
1427 if (coro->on_destroy)
1428 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1429 1704
1430 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_DESTROYED;
1431 1706
1432 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1433 { 1708 {
… …
1436 --coro_nready; 1711 --coro_nready;
1437 } 1712 }
1438 else 1713 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1714 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1715
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1716 if (coro->next) coro->next->prev = coro->prev;
1442 { 1717 if (coro->prev) coro->prev->next = coro->next;
1443 struct coro temp; 1718 if (coro == coro_first) coro_first = coro->next;
1444 1719
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1720 if (coro->mainstack
1446 1721 && coro->mainstack != main_mainstack
1447 save_perl (aTHX_ &temp); 1722 && coro->slot
1723 && !PL_dirty)
1448 load_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1725
1457 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1729 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1461 1731
1462 if (coro->next) coro->next->prev = coro->prev; 1732 coro_call_on_destroy (coro);
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465 1733
1466 return 1; 1734 /* more destruction mayhem in coro_state_free */
1467} 1735}
1468 1736
1469static int 1737static int
1470coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1471{ 1739{
1472 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1473 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1474 1742
1475 coro->hv = 0;
1476
1477 if (--coro->refcnt < 0)
1478 {
1479 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1480 Safefree (coro); 1747 Safefree (coro);
1481 }
1482 1748
1483 return 0; 1749 return 0;
1484} 1750}
1485 1751
1486static int 1752static int
1487coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1488{ 1754{
1489 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1490 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1491 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1492 1759
1493 return 0; 1760 return 0;
1494} 1761}
1495 1762
1496static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
… …
1519 1786
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1787 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1788 TRANSFER (ta, 1);
1522} 1789}
1523 1790
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1791/** Coro ********************************************************************/
1548 1792
1549INLINE void 1793INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1794coro_enq (pTHX_ struct coro *coro)
1551{ 1795{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1797
1555INLINE SV * 1798 SvREFCNT_inc_NN (coro->hv);
1799
1800 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro;
1803}
1804
1805INLINE struct coro *
1556coro_deq (pTHX) 1806coro_deq (pTHX)
1557{ 1807{
1558 int prio; 1808 int prio;
1559 1809
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1811 {
1562 return av_shift (coro_ready [prio]); 1812 struct coro **ready = coro_ready [prio];
1813
1814 if (ready [0])
1815 {
1816 struct coro *coro = ready [0];
1817 ready [0] = coro->next_ready;
1818 return coro;
1819 }
1820 }
1563 1821
1564 return 0; 1822 return 0;
1823}
1824
1825static void
1826invoke_sv_ready_hook_helper (void)
1827{
1828 dTHX;
1829 dSP;
1830
1831 ENTER;
1832 SAVETMPS;
1833
1834 PUSHMARK (SP);
1835 PUTBACK;
1836 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1837
1838 FREETMPS;
1839 LEAVE;
1565} 1840}
1566 1841
1567static int 1842static int
1568api_ready (pTHX_ SV *coro_sv) 1843api_ready (pTHX_ SV *coro_sv)
1569{ 1844{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1845 struct coro *coro = SvSTATE (coro_sv);
1578 1846
1579 if (coro->flags & CF_READY) 1847 if (coro->flags & CF_READY)
1580 return 0; 1848 return 0;
1581 1849
1582 coro->flags |= CF_READY; 1850 coro->flags |= CF_READY;
1583 1851
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1852 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1853
1590 if (sv_hook) 1854 if (!coro_nready++)
1591 { 1855 if (coroapi.readyhook)
1592 dSP; 1856 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1857
1608 return 1; 1858 return 1;
1609} 1859}
1610 1860
1611static int 1861static int
… …
1634static void 1884static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1885prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1886{
1637 for (;;) 1887 for (;;)
1638 { 1888 {
1639 SV *next_sv = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1640 1890
1641 if (expect_true (next_sv)) 1891 if (expect_true (next))
1642 { 1892 {
1643 struct coro *next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (next->flags & CF_DESTROYED)) 1894 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1647 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1895 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1648 else 1896 else
1649 { 1897 {
1650 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1651 --coro_nready; 1899 --coro_nready;
1652 1900
1653 return prepare_schedule_to (aTHX_ ta, next); 1901 prepare_schedule_to (aTHX_ ta, next);
1902 break;
1654 } 1903 }
1655 } 1904 }
1656 else 1905 else
1657 { 1906 {
1658 /* nothing to schedule: call the idle handler */ 1907 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle)))
1910 {
1911 if (SvRV (sv_idle) == SvRV (coro_current))
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1913
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready;
1917 }
1918 else
1919 {
1920 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1659 dSP; 1921 dSP;
1660 1922
1661 ENTER; 1923 ENTER;
1662 SAVETMPS; 1924 SAVETMPS;
1663 1925
1664 PUSHMARK (SP); 1926 PUSHMARK (SP);
1665 PUTBACK; 1927 PUTBACK;
1666 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1928 call_sv (sv_idle, G_VOID | G_DISCARD);
1667 1929
1668 FREETMPS; 1930 FREETMPS;
1669 LEAVE; 1931 LEAVE;
1932 }
1670 } 1933 }
1671 } 1934 }
1672} 1935}
1673 1936
1674INLINE void 1937INLINE void
… …
1745static void 2008static void
1746api_trace (pTHX_ SV *coro_sv, int flags) 2009api_trace (pTHX_ SV *coro_sv, int flags)
1747{ 2010{
1748 struct coro *coro = SvSTATE (coro_sv); 2011 struct coro *coro = SvSTATE (coro_sv);
1749 2012
2013 if (coro->flags & CF_RUNNING)
2014 croak ("cannot enable tracing on a running coroutine, caught");
2015
1750 if (flags & CC_TRACE) 2016 if (flags & CC_TRACE)
1751 { 2017 {
1752 if (!coro->cctx) 2018 if (!coro->cctx)
1753 coro->cctx = cctx_new_run (); 2019 coro->cctx = cctx_new_run ();
1754 else if (!(coro->cctx->flags & CC_TRACE)) 2020 else if (!(coro->cctx->flags & CC_TRACE))
1755 croak ("cannot enable tracing on coroutine with custom stack,"); 2021 croak ("cannot enable tracing on coroutine with custom stack, caught");
1756 2022
1757 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2023 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1758 } 2024 }
1759 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2025 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1760 { 2026 {
… …
1763 if (coro->flags & CF_RUNNING) 2029 if (coro->flags & CF_RUNNING)
1764 PL_runops = RUNOPS_DEFAULT; 2030 PL_runops = RUNOPS_DEFAULT;
1765 else 2031 else
1766 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
1767 } 2033 }
2034}
2035
2036static void
2037coro_push_av (pTHX_ AV *av, I32 gimme_v)
2038{
2039 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2040 {
2041 dSP;
2042
2043 if (gimme_v == G_SCALAR)
2044 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2045 else
2046 {
2047 int i;
2048 EXTEND (SP, AvFILLp (av) + 1);
2049
2050 for (i = 0; i <= AvFILLp (av); ++i)
2051 PUSHs (AvARRAY (av)[i]);
2052 }
2053
2054 PUTBACK;
2055 }
2056}
2057
2058static void
2059coro_push_on_destroy (aTHX_ struct coro *coro, SV *cb)
2060{
2061 if (!coro->on_destroy)
2062 coro->on_destroy = newAV ();
2063
2064 av_push (coro->on_destroy, cb);
2065}
2066
2067static void
2068slf_destroy_join (pTHX_ struct CoroSLF *frame)
2069{
2070 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2071}
2072
2073static int
2074slf_check_join (pTHX_ struct CoroSLF *frame)
2075{
2076 struct coro *coro = (struct coro *)frame->data;
2077
2078 if (!coro->status)
2079 return 1;
2080
2081 frame->destroy = 0;
2082
2083 coro_push_av (coro->status, GIMME_V);
2084
2085 SvREFCNT_dec ((SV *)coro->hv);
2086
2087 return 0;
2088}
2089
2090static void
2091slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2092{
2093 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2094
2095 if (items > 1)
2096 croak ("join called with too many arguments");
2097
2098 if (coro->status)
2099 frame->prepare = prepare_nop;
2100 else
2101 {
2102 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2103 frame->prepare = prepare_schedule;
2104 }
2105
2106 frame->check = slf_check_join;
2107 frame->destroy = slf_destroy_join;
2108 frame->data = (void *)coro;
2109 SvREFCNT_inc (coro->hv);
2110}
2111
2112static void
2113coro_call_on_destroy (pTHX_ struct coro *coro)
2114{
2115 AV *od = coro->on_destroy;
2116
2117 if (!od)
2118 return;
2119
2120 while (AvFILLp (od) >= 0)
2121 {
2122 SV *cb = sv_2mortal (av_pop (od));
2123
2124 /* coro hv's (and only hv's at the moment) are supported as well */
2125 if (SvSTATEhv_p (aTHX_ cb))
2126 api_ready (aTHX_ cb);
2127 else
2128 {
2129 dSP; /* don't disturb outer sp */
2130 PUSHMARK (SP);
2131
2132 if (coro->status)
2133 {
2134 PUTBACK;
2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
2136 SPAGAIN;
2137 }
2138
2139 PUTBACK;
2140 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
2141 }
2142 }
2143}
2144
2145static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{
2148 AV *av;
2149
2150 if (coro->status)
2151 {
2152 av = coro->status;
2153 av_clear (av);
2154 }
2155 else
2156 av = coro->status = newAV ();
2157
2158 /* items are actually not so common, so optimise for this case */
2159 if (items)
2160 {
2161 int i;
2162
2163 av_extend (av, items - 1);
2164
2165 for (i = 0; i < items; ++i)
2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
2167 }
2168}
2169
2170static void
2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
2173 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2174 api_ready (aTHX_ sv_manager);
2175
2176 frame->prepare = prepare_schedule;
2177 frame->check = slf_check_repeat;
2178
2179 /* as a minor optimisation, we could unwind all stacks here */
2180 /* but that puts extra pressure on pp_slf, and is not worth much */
2181 /*coro_unwind_stacks (aTHX);*/
2182}
2183
2184static void
2185slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{
2187 HV *coro_hv = (HV *)SvRV (coro_current);
2188
2189 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2190 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2191}
2192
2193static void
2194slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2195{
2196 HV *coro_hv;
2197 struct coro *coro;
2198
2199 if (items <= 0)
2200 croak ("Coro::cancel called without coro object,");
2201
2202 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv;
2204
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206
2207 if (expect_false (coro->flags & CF_NOCANCEL))
2208 {
2209 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro;
2211
2212 frame->prepare = prepare_nop;
2213 frame->check = slf_check_nop;
2214 }
2215 else if (coro_hv == (HV *)SvRV (coro_current))
2216 {
2217 /* cancelling the current coro is allowed, and equals terminate */
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 }
2220 else
2221 {
2222 struct coro *self = SvSTATE_current;
2223
2224 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed.
2228 * besides, I can't get the slow-but-safe version working...
2229 */
2230 slf_frame.data = 0;
2231 self->flags |= CF_NOCANCEL;
2232 coro_state_destroy (aTHX_ coro);
2233 self->flags &= ~CF_NOCANCEL;
2234
2235 if (slf_frame.data)
2236 {
2237 /* while we were busy we have been cancelled, so terminate */
2238 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2239 }
2240 else
2241 {
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 }
2246}
2247
2248static int
2249slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2250{
2251 frame->prepare = 0;
2252 coro_unwind_stacks (aTHX);
2253
2254 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2255
2256 return 1;
2257}
2258
2259static int
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{
2262 if (coro->cctx)
2263 croak ("coro inside C callback, unable to cancel at this time, caught");
2264
2265 if (coro->flags & CF_NEW)
2266 {
2267 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro);
2269 }
2270 else
2271 {
2272 if (!coro->slf_frame.prepare)
2273 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2274
2275 slf_destroy (aTHX_ coro);
2276
2277 coro_set_status (aTHX_ coro, arg, items);
2278 coro->slf_frame.prepare = prepare_nop;
2279 coro->slf_frame.check = slf_check_safe_cancel;
2280
2281 api_ready (aTHX_ (SV *)coro->hv);
2282 }
2283
2284 return 1;
1768} 2285}
1769 2286
1770/*****************************************************************************/ 2287/*****************************************************************************/
1771/* async pool handler */ 2288/* async pool handler */
1772 2289
… …
1812 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
1813 2330
1814 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1815 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1816 { 2333 {
1817 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1818 coro->invoke_av = newAV (); 2335 return;
1819
1820 frame->prepare = prepare_nop;
1821 } 2336 }
1822 else 2337 else
1823 { 2338 {
1824 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
1825 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1850 2365
1851static void 2366static void
1852coro_rouse_callback (pTHX_ CV *cv) 2367coro_rouse_callback (pTHX_ CV *cv)
1853{ 2368{
1854 dXSARGS; 2369 dXSARGS;
1855 SV *data = (SV *)GENSUB_ARG; 2370 SV *data = (SV *)S_GENSUB_ARG;
1856 2371
1857 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2372 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1858 { 2373 {
1859 /* first call, set args */ 2374 /* first call, set args */
2375 SV *coro = SvRV (data);
1860 AV *av = newAV (); 2376 AV *av = newAV ();
1861 SV *coro = SvRV (data);
1862 2377
1863 SvRV_set (data, (SV *)av); 2378 SvRV_set (data, (SV *)av);
1864 api_ready (aTHX_ coro);
1865 SvREFCNT_dec (coro);
1866 2379
1867 /* better take a full copy of the arguments */ 2380 /* better take a full copy of the arguments */
1868 while (items--) 2381 while (items--)
1869 av_store (av, items, newSVsv (ST (items))); 2382 av_store (av, items, newSVsv (ST (items)));
2383
2384 api_ready (aTHX_ coro);
2385 SvREFCNT_dec (coro);
1870 } 2386 }
1871 2387
1872 XSRETURN_EMPTY; 2388 XSRETURN_EMPTY;
1873} 2389}
1874 2390
… …
1891 2407
1892 EXTEND (SP, AvFILLp (av) + 1); 2408 EXTEND (SP, AvFILLp (av) + 1);
1893 for (i = 0; i <= AvFILLp (av); ++i) 2409 for (i = 0; i <= AvFILLp (av); ++i)
1894 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2410 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1895 2411
1896 /* we have stolen the elements, so ste length to zero and free */ 2412 /* we have stolen the elements, so set length to zero and free */
1897 AvFILLp (av) = -1; 2413 AvFILLp (av) = -1;
1898 av_undef (av); 2414 av_undef (av);
1899 2415
1900 PUTBACK; 2416 PUTBACK;
1901 } 2417 }
… …
1925 || SvTYPE (SvRV (cb)) != SVt_PVCV 2441 || SvTYPE (SvRV (cb)) != SVt_PVCV
1926 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1927 croak ("Coro::rouse_wait called with illegal callback argument,"); 2443 croak ("Coro::rouse_wait called with illegal callback argument,");
1928 2444
1929 { 2445 {
1930 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1931 SV *data = (SV *)GENSUB_ARG; 2447 SV *data = (SV *)S_GENSUB_ARG;
1932 2448
1933 frame->data = (void *)data; 2449 frame->data = (void *)data;
1934 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2450 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1935 frame->check = slf_check_rouse_wait; 2451 frame->check = slf_check_rouse_wait;
1936 } 2452 }
… …
1940coro_new_rouse_cb (pTHX) 2456coro_new_rouse_cb (pTHX)
1941{ 2457{
1942 HV *hv = (HV *)SvRV (coro_current); 2458 HV *hv = (HV *)SvRV (coro_current);
1943 struct coro *coro = SvSTATE_hv (hv); 2459 struct coro *coro = SvSTATE_hv (hv);
1944 SV *data = newRV_inc ((SV *)hv); 2460 SV *data = newRV_inc ((SV *)hv);
1945 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2461 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1946 2462
1947 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2463 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1948 SvREFCNT_dec (data); /* magicext increases the refcount */ 2464 SvREFCNT_dec (data); /* magicext increases the refcount */
1949 2465
1950 SvREFCNT_dec (coro->rouse_cb); 2466 SvREFCNT_dec (coro->rouse_cb);
… …
2047static void 2563static void
2048slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2564slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2049{ 2565{
2050 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2051 frame->check = slf_check_nop; 2567 frame->check = slf_check_nop;
2568}
2569
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void
2572slf_destroy (pTHX_ struct coro *coro)
2573{
2574 /* this callback is reserved for slf functions needing to do cleanup */
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577
2578 /*
2579 * The on_destroy above most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions.
2583 */
2584 coro->slf_frame.prepare = 0;
2052} 2585}
2053 2586
2054/* 2587/*
2055 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2056 * function to increase chances that they all will call transfer with the same 2589 * function to increase chances that they all will call transfer with the same
… …
2125 croak (0); 2658 croak (0);
2126 } 2659 }
2127 2660
2128 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2129 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2130 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2131 { 2665 {
2132 dSP; 2666 dSP;
2133 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2134 2668
2135 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2136 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2137 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2138 bot [1] = *sp; 2672 bot [1] = *sp;
2139 2673
2140 SP = bot + 1; 2674 SP = bot + 1;
2141 2675
2142 PUTBACK; 2676 PUTBACK;
… …
2175 if (PL_op->op_flags & OPf_STACKED) 2709 if (PL_op->op_flags & OPf_STACKED)
2176 { 2710 {
2177 if (items > slf_arga) 2711 if (items > slf_arga)
2178 { 2712 {
2179 slf_arga = items; 2713 slf_arga = items;
2180 free (slf_argv); 2714 Safefree (slf_argv);
2181 slf_argv = malloc (slf_arga * sizeof (SV *)); 2715 New (0, slf_argv, slf_arga, SV *);
2182 } 2716 }
2183 2717
2184 slf_argc = items; 2718 slf_argc = items;
2185 2719
2186 for (i = 0; i < items; ++i) 2720 for (i = 0; i < items; ++i)
… …
2188 } 2722 }
2189 else 2723 else
2190 slf_argc = 0; 2724 slf_argc = 0;
2191 2725
2192 PL_op->op_ppaddr = pp_slf; 2726 PL_op->op_ppaddr = pp_slf;
2193 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2727 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2194 2728
2195 PL_op = (OP *)&slf_restore; 2729 PL_op = (OP *)&slf_restore;
2730}
2731
2732/*****************************************************************************/
2733/* dynamic wind */
2734
2735static void
2736on_enterleave_call (pTHX_ SV *cb)
2737{
2738 dSP;
2739
2740 PUSHSTACK;
2741
2742 PUSHMARK (SP);
2743 PUTBACK;
2744 call_sv (cb, G_VOID | G_DISCARD);
2745 SPAGAIN;
2746
2747 POPSTACK;
2748}
2749
2750static SV *
2751coro_avp_pop_and_free (pTHX_ AV **avp)
2752{
2753 AV *av = *avp;
2754 SV *res = av_pop (av);
2755
2756 if (AvFILLp (av) < 0)
2757 {
2758 *avp = 0;
2759 SvREFCNT_dec (av);
2760 }
2761
2762 return res;
2763}
2764
2765static void
2766coro_pop_on_enter (pTHX_ void *coro)
2767{
2768 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2769 SvREFCNT_dec (cb);
2770}
2771
2772static void
2773coro_pop_on_leave (pTHX_ void *coro)
2774{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb));
2196} 2777}
2197 2778
2198/*****************************************************************************/ 2779/*****************************************************************************/
2199/* PerlIO::cede */ 2780/* PerlIO::cede */
2200 2781
… …
2274/* Coro::Semaphore & Coro::Signal */ 2855/* Coro::Semaphore & Coro::Signal */
2275 2856
2276static SV * 2857static SV *
2277coro_waitarray_new (pTHX_ int count) 2858coro_waitarray_new (pTHX_ int count)
2278{ 2859{
2279 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2860 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2280 AV *av = newAV (); 2861 AV *av = newAV ();
2281 SV **ary; 2862 SV **ary;
2282 2863
2283 /* unfortunately, building manually saves memory */ 2864 /* unfortunately, building manually saves memory */
2284 Newx (ary, 2, SV *); 2865 Newx (ary, 2, SV *);
2285 AvALLOC (av) = ary; 2866 AvALLOC (av) = ary;
2867#if PERL_VERSION_ATLEAST (5,10,0)
2286 /*AvARRAY (av) = ary;*/ 2868 AvARRAY (av) = ary;
2869#else
2287 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2870 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2871 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2872 SvPVX ((SV *)av) = (char *)ary;
2873#endif
2288 AvMAX (av) = 1; 2874 AvMAX (av) = 1;
2289 AvFILLp (av) = 0; 2875 AvFILLp (av) = 0;
2290 ary [0] = newSViv (count); 2876 ary [0] = newSViv (count);
2291 2877
2292 return newRV_noinc ((SV *)av); 2878 return newRV_noinc ((SV *)av);
… …
2330 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2331 } 2917 }
2332} 2918}
2333 2919
2334static void 2920static void
2335coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2336{ 2922{
2337 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2338 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2339} 2925}
2340 2926
2341static int 2927static int
2342slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2343{ 2929{
2344 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2345 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2346 2933
2347 /* if we are about to throw, don't actually acquire the lock, just throw */ 2934 /* if we are about to throw, don't actually acquire the lock, just throw */
2348 if (CORO_THROW) 2935 if (CORO_THROW)
2349 return 0; 2936 return 0;
2350 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2351 { 2938 {
2352 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2353 2940
2354 if (acquire) 2941 if (acquire)
2355 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2356 else 2943 else
2357 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
… …
2362 { 2949 {
2363 int i; 2950 int i;
2364 /* if we were woken up but can't down, we look through the whole */ 2951 /* if we were woken up but can't down, we look through the whole */
2365 /* waiters list and only add us if we aren't in there already */ 2952 /* waiters list and only add us if we aren't in there already */
2366 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2367 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2368 for (i = 1; i <= AvFILLp (av); ++i)
2369 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2370 return 1; 2956 return 1;
2371 2957
2372 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2373 return 1; 2959 return 1;
2374 } 2960 }
2375} 2961}
2376 2962
2377static int 2963static int
… …
2400 { 2986 {
2401 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2402 2988
2403 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2404 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2405
2406 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2407 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2408 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2409 } 2994 }
2410} 2995}
2411 2996
2412static void 2997static void
2413slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2998slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2421{ 3006{
2422 if (items >= 2) 3007 if (items >= 2)
2423 { 3008 {
2424 /* callback form */ 3009 /* callback form */
2425 AV *av = (AV *)SvRV (arg [0]); 3010 AV *av = (AV *)SvRV (arg [0]);
2426 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3011 SV *cb_cv = s_get_cv_croak (arg [1]);
2427 3012
2428 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3013 av_push (av, SvREFCNT_inc_NN (cb_cv));
2429 3014
2430 if (SvIVX (AvARRAY (av)[0]) > 0) 3015 if (SvIVX (AvARRAY (av)[0]) > 0)
2431 coro_semaphore_adjust (aTHX_ av, 0); 3016 coro_semaphore_adjust (aTHX_ av, 0);
2432 3017
2433 frame->prepare = prepare_nop; 3018 frame->prepare = prepare_nop;
… …
2457 AvARRAY (av)[0] = AvARRAY (av)[1]; 3042 AvARRAY (av)[0] = AvARRAY (av)[1];
2458 AvARRAY (av)[1] = cb; 3043 AvARRAY (av)[1] = cb;
2459 3044
2460 cb = av_shift (av); 3045 cb = av_shift (av);
2461 3046
3047 if (SvTYPE (cb) == SVt_PVCV)
3048 {
3049 dSP;
3050 PUSHMARK (SP);
3051 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3052 PUTBACK;
3053 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3054 }
3055 else
3056 {
2462 api_ready (aTHX_ cb); 3057 api_ready (aTHX_ cb);
2463 sv_setiv (cb, 0); /* signal waiter */ 3058 sv_setiv (cb, 0); /* signal waiter */
3059 }
3060
2464 SvREFCNT_dec (cb); 3061 SvREFCNT_dec (cb);
2465 3062
2466 --count; 3063 --count;
2467 } 3064 }
2468} 3065}
… …
2477static void 3074static void
2478slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3075slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2479{ 3076{
2480 AV *av = (AV *)SvRV (arg [0]); 3077 AV *av = (AV *)SvRV (arg [0]);
2481 3078
3079 if (items >= 2)
3080 {
3081 SV *cb_cv = s_get_cv_croak (arg [1]);
3082 av_push (av, SvREFCNT_inc_NN (cb_cv));
3083
2482 if (SvIVX (AvARRAY (av)[0])) 3084 if (SvIVX (AvARRAY (av)[0]))
3085 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3086
3087 frame->prepare = prepare_nop;
3088 frame->check = slf_check_nop;
3089 }
3090 else if (SvIVX (AvARRAY (av)[0]))
2483 { 3091 {
2484 SvIVX (AvARRAY (av)[0]) = 0; 3092 SvIVX (AvARRAY (av)[0]) = 0;
2485 frame->prepare = prepare_nop; 3093 frame->prepare = prepare_nop;
2486 frame->check = slf_check_nop; 3094 frame->check = slf_check_nop;
2487 } 3095 }
2488 else 3096 else
2489 { 3097 {
2490 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3098 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2491 3099
2492 av_push (av, waiter); 3100 av_push (av, waiter);
2493 3101
2494 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3102 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2495 frame->prepare = prepare_schedule; 3103 frame->prepare = prepare_schedule;
… …
2513 3121
2514static void 3122static void
2515coro_aio_callback (pTHX_ CV *cv) 3123coro_aio_callback (pTHX_ CV *cv)
2516{ 3124{
2517 dXSARGS; 3125 dXSARGS;
2518 AV *state = (AV *)GENSUB_ARG; 3126 AV *state = (AV *)S_GENSUB_ARG;
2519 SV *coro = av_pop (state); 3127 SV *coro = av_pop (state);
2520 SV *data_sv = newSV (sizeof (struct io_state)); 3128 SV *data_sv = newSV (sizeof (struct io_state));
2521 3129
2522 av_extend (state, items - 1); 3130 av_extend (state, items - 1);
2523 3131
… …
2637 3245
2638 for (i = 0; i < items; ++i) 3246 for (i = 0; i < items; ++i)
2639 PUSHs (arg [i]); 3247 PUSHs (arg [i]);
2640 3248
2641 /* now push the callback closure */ 3249 /* now push the callback closure */
2642 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3250 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2643 3251
2644 /* now call the AIO function - we assume our request is uncancelable */ 3252 /* now call the AIO function - we assume our request is uncancelable */
2645 PUTBACK; 3253 PUTBACK;
2646 call_sv ((SV *)req, G_VOID | G_DISCARD); 3254 call_sv ((SV *)req, G_VOID | G_DISCARD);
2647 } 3255 }
2648 3256
2649 /* now that the requets is going, we loop toll we have a result */ 3257 /* now that the request is going, we loop till we have a result */
2650 frame->data = (void *)state; 3258 frame->data = (void *)state;
2651 frame->prepare = prepare_schedule; 3259 frame->prepare = prepare_schedule;
2652 frame->check = slf_check_aio_req; 3260 frame->check = slf_check_aio_req;
2653} 3261}
2654 3262
… …
2661 3269
2662 XSRETURN_EMPTY; 3270 XSRETURN_EMPTY;
2663} 3271}
2664 3272
2665/*****************************************************************************/ 3273/*****************************************************************************/
3274
3275#if CORO_CLONE
3276# include "clone.c"
3277#endif
3278
3279/*****************************************************************************/
3280
3281static SV *
3282coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3283{
3284 SV *coro_sv;
3285 struct coro *coro;
3286 MAGIC *mg;
3287 HV *hv;
3288 SV *cb;
3289 int i;
3290
3291 if (argc > 0)
3292 {
3293 cb = s_get_cv_croak (argv [0]);
3294
3295 if (!is_coro)
3296 {
3297 if (CvISXSUB (cb))
3298 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3299
3300 if (!CvROOT (cb))
3301 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3302 }
3303 }
3304
3305 Newz (0, coro, 1, struct coro);
3306 coro->args = newAV ();
3307 coro->flags = CF_NEW;
3308
3309 if (coro_first) coro_first->prev = coro;
3310 coro->next = coro_first;
3311 coro_first = coro;
3312
3313 coro->hv = hv = newHV ();
3314 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3315 mg->mg_flags |= MGf_DUP;
3316 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3317
3318 if (argc > 0)
3319 {
3320 av_extend (coro->args, argc + is_coro - 1);
3321
3322 if (is_coro)
3323 {
3324 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3325 cb = (SV *)cv_coro_run;
3326 }
3327
3328 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3329
3330 for (i = 1; i < argc; i++)
3331 av_push (coro->args, newSVsv (argv [i]));
3332 }
3333
3334 return coro_sv;
3335}
2666 3336
2667MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3337MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2668 3338
2669PROTOTYPES: DISABLE 3339PROTOTYPES: DISABLE
2670 3340
… …
2675 coro_thx = PERL_GET_CONTEXT; 3345 coro_thx = PERL_GET_CONTEXT;
2676# endif 3346# endif
2677#endif 3347#endif
2678 BOOT_PAGESIZE; 3348 BOOT_PAGESIZE;
2679 3349
3350 cctx_current = cctx_new_empty ();
3351
2680 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3352 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2681 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3353 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2682 3354
2683 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3355 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2684 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3356 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2703 3375
2704 { 3376 {
2705 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3377 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2706 3378
2707 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3379 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2708 hv_store_ent (PL_custom_op_names, slf, 3380 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2709 newSVpv ("coro_slf", 0), 0);
2710 3381
2711 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3382 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2712 hv_store_ent (PL_custom_op_descs, slf, 3383 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2713 newSVpv ("coro schedule like function", 0), 0);
2714 } 3384 }
2715 3385
2716 coroapi.ver = CORO_API_VERSION; 3386 coroapi.ver = CORO_API_VERSION;
2717 coroapi.rev = CORO_API_REVISION; 3387 coroapi.rev = CORO_API_REVISION;
2718 3388
… …
2723 coroapi.prepare_nop = prepare_nop; 3393 coroapi.prepare_nop = prepare_nop;
2724 coroapi.prepare_schedule = prepare_schedule; 3394 coroapi.prepare_schedule = prepare_schedule;
2725 coroapi.prepare_cede = prepare_cede; 3395 coroapi.prepare_cede = prepare_cede;
2726 coroapi.prepare_cede_notself = prepare_cede_notself; 3396 coroapi.prepare_cede_notself = prepare_cede_notself;
2727 3397
2728 { 3398 time_init (aTHX);
2729 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2730 3399
2731 if (!svp) croak ("Time::HiRes is required");
2732 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2733
2734 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2735 }
2736
2737 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3400 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2738} 3401}
2739 3402
2740SV * 3403SV *
2741new (char *klass, ...) 3404new (SV *klass, ...)
2742 ALIAS: 3405 ALIAS:
2743 Coro::new = 1 3406 Coro::new = 1
2744 CODE: 3407 CODE:
2745{ 3408 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2746 struct coro *coro; 3409 OUTPUT:
2747 MAGIC *mg;
2748 HV *hv;
2749 CV *cb;
2750 int i;
2751
2752 if (items > 1)
2753 {
2754 cb = coro_sv_2cv (aTHX_ ST (1));
2755
2756 if (!ix)
2757 {
2758 if (CvISXSUB (cb))
2759 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2760
2761 if (!CvROOT (cb))
2762 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2763 }
2764 }
2765
2766 Newz (0, coro, 1, struct coro);
2767 coro->args = newAV ();
2768 coro->flags = CF_NEW;
2769
2770 if (coro_first) coro_first->prev = coro;
2771 coro->next = coro_first;
2772 coro_first = coro;
2773
2774 coro->hv = hv = newHV ();
2775 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2776 mg->mg_flags |= MGf_DUP;
2777 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2778
2779 if (items > 1)
2780 {
2781 av_extend (coro->args, items - 1 + ix - 1);
2782
2783 if (ix)
2784 {
2785 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2786 cb = cv_coro_run;
2787 }
2788
2789 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2790
2791 for (i = 2; i < items; i++)
2792 av_push (coro->args, newSVsv (ST (i)));
2793 }
2794}
2795 OUTPUT:
2796 RETVAL 3410 RETVAL
2797 3411
2798void 3412void
2799transfer (...) 3413transfer (...)
2800 PROTOTYPE: $$ 3414 PROTOTYPE: $$
2801 CODE: 3415 CODE:
2802 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3416 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2803 3417
2804bool
2805_destroy (SV *coro_sv)
2806 CODE:
2807 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2808 OUTPUT:
2809 RETVAL
2810
2811void 3418void
2812_exit (int code) 3419_exit (int code)
2813 PROTOTYPE: $ 3420 PROTOTYPE: $
2814 CODE: 3421 CODE:
2815 _exit (code); 3422 _exit (code);
3423
3424SV *
3425clone (Coro::State coro)
3426 CODE:
3427{
3428#if CORO_CLONE
3429 struct coro *ncoro = coro_clone (aTHX_ coro);
3430 MAGIC *mg;
3431 /* TODO: too much duplication */
3432 ncoro->hv = newHV ();
3433 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3434 mg->mg_flags |= MGf_DUP;
3435 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3436#else
3437 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3438#endif
3439}
3440 OUTPUT:
3441 RETVAL
2816 3442
2817int 3443int
2818cctx_stacksize (int new_stacksize = 0) 3444cctx_stacksize (int new_stacksize = 0)
2819 PROTOTYPE: ;$ 3445 PROTOTYPE: ;$
2820 CODE: 3446 CODE:
… …
2870 eval = 1 3496 eval = 1
2871 CODE: 3497 CODE:
2872{ 3498{
2873 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3499 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2874 { 3500 {
2875 struct coro temp; 3501 struct coro *current = SvSTATE_current;
3502 struct CoroSLF slf_save;
2876 3503
2877 if (!(coro->flags & CF_RUNNING)) 3504 if (current != coro)
2878 { 3505 {
2879 PUTBACK; 3506 PUTBACK;
2880 save_perl (aTHX_ &temp); 3507 save_perl (aTHX_ current);
2881 load_perl (aTHX_ coro); 3508 load_perl (aTHX_ coro);
3509 /* the coro is most likely in an active SLF call.
3510 * while not strictly required (the code we execute is
3511 * not allowed to call any SLF functions), it's cleaner
3512 * to reinitialise the slf_frame and restore it later.
3513 * This might one day allow us to actually do SLF calls
3514 * from code executed here.
3515 */
3516 slf_save = slf_frame;
3517 slf_frame.prepare = 0;
3518 SPAGAIN;
2882 } 3519 }
2883 3520
2884 {
2885 dSP;
2886 ENTER;
2887 SAVETMPS;
2888 PUTBACK;
2889 PUSHSTACK; 3521 PUSHSTACK;
3522
2890 PUSHMARK (SP); 3523 PUSHMARK (SP);
3524 PUTBACK;
2891 3525
2892 if (ix) 3526 if (ix)
2893 eval_sv (coderef, 0); 3527 eval_sv (coderef, 0);
2894 else 3528 else
2895 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3529 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2896 3530
2897 POPSTACK; 3531 POPSTACK;
2898 SPAGAIN; 3532 SPAGAIN;
2899 FREETMPS;
2900 LEAVE;
2901 PUTBACK;
2902 }
2903 3533
2904 if (!(coro->flags & CF_RUNNING)) 3534 if (current != coro)
2905 { 3535 {
3536 PUTBACK;
3537 slf_frame = slf_save;
2906 save_perl (aTHX_ coro); 3538 save_perl (aTHX_ coro);
2907 load_perl (aTHX_ &temp); 3539 load_perl (aTHX_ current);
2908 SPAGAIN; 3540 SPAGAIN;
2909 } 3541 }
2910 } 3542 }
2911} 3543}
2912 3544
… …
2916 ALIAS: 3548 ALIAS:
2917 is_ready = CF_READY 3549 is_ready = CF_READY
2918 is_running = CF_RUNNING 3550 is_running = CF_RUNNING
2919 is_new = CF_NEW 3551 is_new = CF_NEW
2920 is_destroyed = CF_DESTROYED 3552 is_destroyed = CF_DESTROYED
3553 is_suspended = CF_SUSPENDED
2921 CODE: 3554 CODE:
2922 RETVAL = boolSV (coro->flags & ix); 3555 RETVAL = boolSV (coro->flags & ix);
2923 OUTPUT: 3556 OUTPUT:
2924 RETVAL 3557 RETVAL
2925 3558
2926void 3559void
2927throw (Coro::State self, SV *throw = &PL_sv_undef) 3560throw (Coro::State self, SV *exception = &PL_sv_undef)
2928 PROTOTYPE: $;$ 3561 PROTOTYPE: $;$
2929 CODE: 3562 CODE:
2930{ 3563{
2931 struct coro *current = SvSTATE_current; 3564 struct coro *current = SvSTATE_current;
2932 SV **throwp = self == current ? &CORO_THROW : &self->except; 3565 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2933 SvREFCNT_dec (*throwp); 3566 SvREFCNT_dec (*exceptionp);
2934 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3567 SvGETMAGIC (exception);
3568 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2935} 3569}
2936 3570
2937void 3571void
2938api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3572api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2939 PROTOTYPE: $;$ 3573 PROTOTYPE: $;$
… …
2941 3575
2942SV * 3576SV *
2943has_cctx (Coro::State coro) 3577has_cctx (Coro::State coro)
2944 PROTOTYPE: $ 3578 PROTOTYPE: $
2945 CODE: 3579 CODE:
2946 RETVAL = boolSV (!!coro->cctx); 3580 /* maybe manage the running flag differently */
3581 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2947 OUTPUT: 3582 OUTPUT:
2948 RETVAL 3583 RETVAL
2949 3584
2950int 3585int
2951is_traced (Coro::State coro) 3586is_traced (Coro::State coro)
… …
2971 3606
2972void 3607void
2973force_cctx () 3608force_cctx ()
2974 PROTOTYPE: 3609 PROTOTYPE:
2975 CODE: 3610 CODE:
2976 SvSTATE_current->cctx->idle_sp = 0; 3611 cctx_current->idle_sp = 0;
2977 3612
2978void 3613void
2979swap_defsv (Coro::State self) 3614swap_defsv (Coro::State self)
2980 PROTOTYPE: $ 3615 PROTOTYPE: $
2981 ALIAS: 3616 ALIAS:
… …
2989 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3624 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2990 3625
2991 SV *tmp = *src; *src = *dst; *dst = tmp; 3626 SV *tmp = *src; *src = *dst; *dst = tmp;
2992 } 3627 }
2993 3628
3629void
3630cancel (Coro::State self)
3631 CODE:
3632 coro_state_destroy (aTHX_ self);
3633
3634SV *
3635enable_times (int enabled = enable_times)
3636 CODE:
3637{
3638 RETVAL = boolSV (enable_times);
3639
3640 if (enabled != enable_times)
3641 {
3642 enable_times = enabled;
3643
3644 coro_times_update ();
3645 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3646 }
3647}
3648 OUTPUT:
3649 RETVAL
3650
3651void
3652times (Coro::State self)
3653 PPCODE:
3654{
3655 struct coro *current = SvSTATE (coro_current);
3656
3657 if (expect_false (current == self))
3658 {
3659 coro_times_update ();
3660 coro_times_add (SvSTATE (coro_current));
3661 }
3662
3663 EXTEND (SP, 2);
3664 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3665 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3666
3667 if (expect_false (current == self))
3668 coro_times_sub (SvSTATE (coro_current));
3669}
3670
3671void
3672swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3673 CODE:
3674{
3675 struct coro *current = SvSTATE_current;
3676
3677 if (current == coro)
3678 SWAP_SVS (current);
3679
3680 if (!coro->swap_sv)
3681 coro->swap_sv = newAV ();
3682
3683 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3684 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3685
3686 if (current == coro)
3687 SWAP_SVS (current);
3688}
3689
2994 3690
2995MODULE = Coro::State PACKAGE = Coro 3691MODULE = Coro::State PACKAGE = Coro
2996 3692
2997BOOT: 3693BOOT:
2998{ 3694{
2999 int i;
3000
3001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3002 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3695 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3003 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3696 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3004 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3697 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3005 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3006 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3698 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3699 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3700 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3701 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3702 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3007 3703
3008 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3704 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3009 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3705 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3010 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3706 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3011 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3707 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3012 3708
3013 coro_stash = gv_stashpv ("Coro", TRUE); 3709 coro_stash = gv_stashpv ("Coro", TRUE);
3014 3710
3015 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3711 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3016 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3712 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3017 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3713 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3018 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3714 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3019 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3715 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3020 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3716 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3021
3022 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3023 coro_ready[i] = newAV ();
3024 3717
3025 { 3718 {
3026 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3719 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3027 3720
3028 coroapi.schedule = api_schedule; 3721 coroapi.schedule = api_schedule;
… …
3038 sv_setiv (sv, (IV)&coroapi); 3731 sv_setiv (sv, (IV)&coroapi);
3039 SvREADONLY_on (sv); 3732 SvREADONLY_on (sv);
3040 } 3733 }
3041} 3734}
3042 3735
3736SV *
3737async (...)
3738 PROTOTYPE: &@
3739 CODE:
3740 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3741 api_ready (aTHX_ RETVAL);
3742 OUTPUT:
3743 RETVAL
3744
3745void
3746_destroy (Coro::State coro)
3747 CODE:
3748 /* used by the manager thread */
3749 coro_state_destroy (aTHX_ coro);
3750
3751void
3752on_destroy (Coro::State coro, SV *cb)
3753 CODE:
3754 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3755
3756void
3757join (...)
3758 CODE:
3759 CORO_EXECUTE_SLF_XS (slf_init_join);
3760
3761void
3762terminate (...)
3763 CODE:
3764 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3765
3766void
3767cancel (...)
3768 CODE:
3769 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3770
3771int
3772safe_cancel (Coro::State self, ...)
3773 C_ARGS: aTHX_ self, &ST (1), items - 1
3774
3043void 3775void
3044schedule (...) 3776schedule (...)
3045 CODE: 3777 CODE:
3046 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3778 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3047 3779
… …
3075void 3807void
3076_set_readyhook (SV *hook) 3808_set_readyhook (SV *hook)
3077 PROTOTYPE: $ 3809 PROTOTYPE: $
3078 CODE: 3810 CODE:
3079 SvREFCNT_dec (coro_readyhook); 3811 SvREFCNT_dec (coro_readyhook);
3812 SvGETMAGIC (hook);
3813 if (SvOK (hook))
3814 {
3080 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3815 coro_readyhook = newSVsv (hook);
3816 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3817 }
3818 else
3819 {
3820 coro_readyhook = 0;
3821 CORO_READYHOOK = 0;
3822 }
3081 3823
3082int 3824int
3083prio (Coro::State coro, int newprio = 0) 3825prio (Coro::State coro, int newprio = 0)
3084 PROTOTYPE: $;$ 3826 PROTOTYPE: $;$
3085 ALIAS: 3827 ALIAS:
… …
3091 if (items > 1) 3833 if (items > 1)
3092 { 3834 {
3093 if (ix) 3835 if (ix)
3094 newprio = coro->prio - newprio; 3836 newprio = coro->prio - newprio;
3095 3837
3096 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3838 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3097 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3839 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3098 3840
3099 coro->prio = newprio; 3841 coro->prio = newprio;
3100 } 3842 }
3101} 3843}
3102 OUTPUT: 3844 OUTPUT:
… …
3117 RETVAL = coro_nready; 3859 RETVAL = coro_nready;
3118 OUTPUT: 3860 OUTPUT:
3119 RETVAL 3861 RETVAL
3120 3862
3121void 3863void
3864suspend (Coro::State self)
3865 PROTOTYPE: $
3866 CODE:
3867 self->flags |= CF_SUSPENDED;
3868
3869void
3870resume (Coro::State self)
3871 PROTOTYPE: $
3872 CODE:
3873 self->flags &= ~CF_SUSPENDED;
3874
3875void
3122_pool_handler (...) 3876_pool_handler (...)
3123 CODE: 3877 CODE:
3124 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3878 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3125 3879
3126void 3880void
… …
3137 for (i = 1; i < items; ++i) 3891 for (i = 1; i < items; ++i)
3138 av_push (av, SvREFCNT_inc_NN (ST (i))); 3892 av_push (av, SvREFCNT_inc_NN (ST (i)));
3139 3893
3140 if ((SV *)hv == &PL_sv_undef) 3894 if ((SV *)hv == &PL_sv_undef)
3141 { 3895 {
3142 PUSHMARK (SP); 3896 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3143 EXTEND (SP, 2);
3144 PUSHs (sv_Coro);
3145 PUSHs ((SV *)cv_pool_handler);
3146 PUTBACK;
3147 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3148 SPAGAIN;
3149
3150 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3897 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3898 SvREFCNT_dec (sv);
3151 } 3899 }
3152 3900
3153 { 3901 {
3154 struct coro *coro = SvSTATE_hv (hv); 3902 struct coro *coro = SvSTATE_hv (hv);
3155 3903
… …
3179rouse_wait (...) 3927rouse_wait (...)
3180 PROTOTYPE: ;$ 3928 PROTOTYPE: ;$
3181 PPCODE: 3929 PPCODE:
3182 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3930 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3183 3931
3932void
3933on_enter (SV *block)
3934 ALIAS:
3935 on_leave = 1
3936 PROTOTYPE: &
3937 CODE:
3938{
3939 struct coro *coro = SvSTATE_current;
3940 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3941
3942 block = s_get_cv_croak (block);
3943
3944 if (!*avp)
3945 *avp = newAV ();
3946
3947 av_push (*avp, SvREFCNT_inc (block));
3948
3949 if (!ix)
3950 on_enterleave_call (aTHX_ block);
3951
3952 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3953 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3954 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3955}
3956
3184 3957
3185MODULE = Coro::State PACKAGE = PerlIO::cede 3958MODULE = Coro::State PACKAGE = PerlIO::cede
3186 3959
3187BOOT: 3960BOOT:
3188 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3961 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3191MODULE = Coro::State PACKAGE = Coro::Semaphore 3964MODULE = Coro::State PACKAGE = Coro::Semaphore
3192 3965
3193SV * 3966SV *
3194new (SV *klass, SV *count = 0) 3967new (SV *klass, SV *count = 0)
3195 CODE: 3968 CODE:
3969{
3970 int semcnt = 1;
3971
3972 if (count)
3973 {
3974 SvGETMAGIC (count);
3975
3976 if (SvOK (count))
3977 semcnt = SvIV (count);
3978 }
3979
3196 RETVAL = sv_bless ( 3980 RETVAL = sv_bless (
3197 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3981 coro_waitarray_new (aTHX_ semcnt),
3198 GvSTASH (CvGV (cv)) 3982 GvSTASH (CvGV (cv))
3199 ); 3983 );
3984}
3200 OUTPUT: 3985 OUTPUT:
3201 RETVAL 3986 RETVAL
3202 3987
3203# helper for Coro::Channel 3988# helper for Coro::Channel and others
3204SV * 3989SV *
3205_alloc (int count) 3990_alloc (int count)
3206 CODE: 3991 CODE:
3207 RETVAL = coro_waitarray_new (aTHX_ count); 3992 RETVAL = coro_waitarray_new (aTHX_ count);
3208 OUTPUT: 3993 OUTPUT:
… …
3266 for (i = 1; i <= wcount; ++i) 4051 for (i = 1; i <= wcount; ++i)
3267 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4052 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3268 } 4053 }
3269} 4054}
3270 4055
4056MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4057
4058void
4059_may_delete (SV *sem, int count, int extra_refs)
4060 PPCODE:
4061{
4062 AV *av = (AV *)SvRV (sem);
4063
4064 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4065 && AvFILLp (av) == 0 /* no waiters, just count */
4066 && SvIV (AvARRAY (av)[0]) == count)
4067 XSRETURN_YES;
4068
4069 XSRETURN_NO;
4070}
4071
3271MODULE = Coro::State PACKAGE = Coro::Signal 4072MODULE = Coro::State PACKAGE = Coro::Signal
3272 4073
3273SV * 4074SV *
3274new (SV *klass) 4075new (SV *klass)
3275 CODE: 4076 CODE:
… …
3346 4147
3347void 4148void
3348_register (char *target, char *proto, SV *req) 4149_register (char *target, char *proto, SV *req)
3349 CODE: 4150 CODE:
3350{ 4151{
3351 CV *req_cv = coro_sv_2cv (aTHX_ req); 4152 SV *req_cv = s_get_cv_croak (req);
3352 /* newXSproto doesn't return the CV on 5.8 */ 4153 /* newXSproto doesn't return the CV on 5.8 */
3353 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4154 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3354 sv_setpv ((SV *)slf_cv, proto); 4155 sv_setpv ((SV *)slf_cv, proto);
3355 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4156 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3356} 4157}
3357 4158
4159MODULE = Coro::State PACKAGE = Coro::Select
4160
4161void
4162patch_pp_sselect ()
4163 CODE:
4164 if (!coro_old_pp_sselect)
4165 {
4166 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4167 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4168 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4169 }
4170
4171void
4172unpatch_pp_sselect ()
4173 CODE:
4174 if (coro_old_pp_sselect)
4175 {
4176 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4177 coro_old_pp_sselect = 0;
4178 }
4179

Diff Legend

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